gentoo auto-resync : 04:12:2022 - 09:02:03

806 files changed, 878 insertions, 23273 deletions

diff --git a/Manifest b/Manifest
index 4ac50d47cbea..97acc81a44e9 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29747 BLAKE2B a6eb86671142416bd960b0cf6acc48a745016268287b79a04826290f54a75cb2ba064f5a5d424f310a0627c35dc3022788bbfab34f0a802ffb4061c3a2578210 SHA512 215243f4687feeeff38049af257a0780909f2e9a330f8b9addb047537d0ab13d9b1c48311ec4be6abed33d18ba67219100ec2c7e889bda06a29606eeb33082f1
-TIMESTAMP 2022-12-04T02:12:54Z
+MANIFEST Manifest.files.gz 29782 BLAKE2B 3daf5b625e078e83f0963a218a9687e2b7736f78ebd619c2d15717c1a7546cd67f543d92adda80e0df7511dab2ad76d62599b841ed16412fd322e40136073b96 SHA512 6e7419ff5a6ed95774bc77d377ca53e7034343b4897da3e268b4edfc0d0536aace2ec4e1a9092ac07975a0ac842934ed110a19704bdf4851b21b573c47f7f77b
+TIMESTAMP 2022-12-04T08:09:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOMAiZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOMVcNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAYzw//WFhEhs9qHsGBlYiom1y3tlmd4/jIxbXwBhgCnBL4AiVonFJwd9j6YVpd
-z8WGtEUz/pXJLJ9CeNNrOGf5pJHYNwYQKJ871w0tRuJtURAU/9PiBZHWpBGsPBo7
-ouFY7gCNylgrS0al9fv1zi1LmbZ0N8JD9I8JXsHfWpEDJmMvfTjyMbSXx1n4WJae
-unOfbtnzTXKFv3JryiPx8t3qxlFWkKWgvXWWU8qAI9D/BSFKF+okyr82uii6TpV9
-ohD7Udl3irA4r/SzIQKIPXwGALb8WV5a4Wr6njpDS2FKVRNi9ylSbbU5h9iDzV0r
-VXmFIJFelaRIXbxzLi9wKDYP+Hi6ZQFh9IyIl4LO2n1E5EyusFrK8Nd2k8tW1NAJ
-u1k2t4+w8cBVLFH7Fszb7Jfhlwj1Rgba3RPWzUVsIOSLBn1KpLIHr/F2Ky6Sq50G
-pQBH+eqy8Suge574hZhwU2yNKQVkkTKSaOCyhkt6IXjQse0qNsrSXWy0q9ybKB81
-gTeYbvLq/i/o0EfIACUru6wpfVrnqsGqi18HYk7WwbimrGFythoNMJJDwBBQQQ43
-LRusTgOUFY6qD6BYuP1oi1KgIpe4qkpdhnKRaUprBIPWla8Y6Fjg7/ur3pMgyo2F
-dLdj7Iok4N2mDZ+a5fjyOXjpg6/sR6qs7bgFQD0856iT8ltSsEQ=
-=6U8J
+klA/uA//Q+vvWrqUbFgTiu+FHdXo7HsJwGvTFROMDOzWW3rjMZEegn5U2Zf2sebW
+nZ9A+SGIWpIW87n55y3mGe1p9InwZ5p+qZdgMNooCx2Xm8ew6lSXCXB4uwqlsmEL
+CQlB/uDpiu/9aldRvbcqwQkRvJTDMWwqJxELZmtvGtJuXUlPrMVN+xlpOfb3L7Op
+H+f3E+pGDjbzyb8K5+l102qh91PG00eZTFzIT/IOCOvoGwWm/S/uu3p1hNjxOQgd
+0C1sokYHKkjYt0wSW340DgWCG/l47bwoHjKbnEMMCelrFG26dF5pw49TFGU75iPJ
+y7t2Mku+ABtUJJGdj+n9kotnH5816L1x47A7XkwqwXQ2iXJstUNLWx+/0rbwB0bs
+IW+s5q0aDEATW17N9y6tGS2Yk6LspNLCvxeHRed81yYc3q17hS96Dztwf3HzujlU
+hmB/CKfhcCrgJXcqu/3oZmJIcBca5rmjLdNNWF7VPNW/hyawwLPkiEUKEIVU/9U/
+IAdoLCfbq1iFfudH2tb95jgwT3v7xxH8aEWOKnSu9UKOQiu2k5VxN2x6OEtSg4zI
+JMarrEHZK+GcLVBYuRM/l+sV9gu5B3v3Ql7R/kwDfK9rRyV47x9yXNW+OMazF3YC
+SgY/Opo2xSItkGNLvL16T4VN83LYLbKYC8MIGsWomzpmdA3FK3c=
+=jP/v
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index aa817cf35480..710c9bf5fb1f 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index df82ba780a41..d8f3fef4adac 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 49c99e610d0a..b64c05c0c54f 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,4 +1,2 @@
-DIST at-spi2-atk-2.38.0.tar.xz 97464 BLAKE2B c5a62bd157ac6dcbf19495eb8f92bd6346651b8df64e15acf4d25c1ab35790f154bead1e012714da36c700e58e164527755137a33812f3a1844aa34f0293ebf5 SHA512 2f40ecbc55b0fbaa57ade952a75583bc8fbfde234cce9248489e9ae06e0597d98c2f4c77d8279758dec29da97e06cde5708d30a1238d91bebd023b2320f38528
-EBUILD at-spi2-atk-2.38.0.ebuild 960 BLAKE2B b5dca22d3494e21559877b0d10e06d5611b017dd23c5faaa40f0a76adf737f1f8d46d99268d308172c5baef843b9f4e89bb0913a5a6a1179d08790b74d86c784 SHA512 36dbaa6aa77bd69867d31a756596015d0536a1e817d222809b257733803150d343f710a69df2aa9385840d463d82af8cd959b082a389b330dfe2194ca8838a14
 EBUILD at-spi2-atk-2.46.0.ebuild 476 BLAKE2B 76f4c3ecd0c5b6f817c40c4ad3079d1e194872a17012e247ee51eb021ab6c3cd5a09eeb793fbe2915c0eddfe665e687b5aff595308abc51e1087709a1a93aa11 SHA512 2857283202b6b146fcf2c686e11b45777bdaa945366748068235e12303e08e9d0eba3dd3e1bc7a74368da942b3d5ae8c26d8065a5525f7a65c409f89697d9605
 MISC metadata.xml 686 BLAKE2B ca44ad61b3381eacbda034c60a5bd9e7d215e4b7d792f283b61bb82e419a4d31c3c2a17a1842ea811fd472074539e90382ad1ad5060d72d3146aef66f2c3fede SHA512 20973a48f912dac88635c6df92f3237c0f800481b08014457e1876fb86670968535604127af85ca2d9fd729f1f48da2be664ab49f5520c10cadd4da06bb0db60
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
deleted file mode 100644
index 9049aca81d4b..000000000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson-multilib virtualx xdg
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.36.0[${MULTILIB_USEDEP}]
-	>=app-accessibility/at-spi2-core-2.33.2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gnome-base/gsettings-desktop-schemas
-	virtual/pkgconfig
-	test? ( >=dev-libs/libxml2-2.9.1 )
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 49e01d01be3b..88b8cb1f2f47 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,6 +1,3 @@
-AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
-DIST at-spi2-core-2.44.1.tar.xz 209780 BLAKE2B e76f0b0c478564181db774633dfc9613bdfa6c74c5c52878d877723e37605b7b7169fee45a9025b331e84bf5af8132eed50b388db9ac1aee0fec7776a633628a SHA512 8d85df75f886c4a19d829d14e5a9412b607b9cbe2d1b7ecb95b4082602f0624e90747fe955f96d378c3a52bc0e732074b97008bb34e6acc2722c7056b2c0504e
 DIST at-spi2-core-2.46.0.tar.xz 540600 BLAKE2B e3ed9915c39a9f71b64a9753c7f91208d15289fe09a9505b4766df7fa04c3e6e5cdc7b3702315eabbdf70f9fc08b4cca4546353485328ab101e2950a672885d6 SHA512 633af2c02fab3b8cb02e37f929ce80dd5ce28ca5641046ef5e25cb29299530b90028e6c6f318a0c098a4270bed3eab48fb55d6967a76bfadd2520f49de47c770
-EBUILD at-spi2-core-2.44.1.ebuild 1466 BLAKE2B 572e617a22ab16d1cfb42fbab8c318840174b8bea5e05d02fc88b7ddedb48757b587a3414cb772960b20212350931d6f9272933fb439e4cc6ea2ff6bcf7ab358 SHA512 2740ff17261253dd6a0ab6ae5e8f1aa9bdba5ebd4cf28808ed9bc055f8dd520e21094889773c8d3990a623a3344036b661b78bd772b3a93e581411ee845e37c6
 EBUILD at-spi2-core-2.46.0.ebuild 1465 BLAKE2B f80766774966d17a0118d0b3e5f843648abd1f2c17c3768a1e30c0f5ec24792fb85cbec5e34d6c9e375f69c59b4567c6163850266472e77e9f79e602eb90b236 SHA512 1cabedef0fc8bd01dff37edd018f9aff71857cd206d487a0b36d2e4442144ad95a0685cbfc5711cef20579b40e0c14b860b87a4fe33207024745ac4e49da98b8
 MISC metadata.xml 353 BLAKE2B a11426ebcc6d7d5d3b6af03001b0da28239ca8374757211ed13e13b2d23f0580a4bbd8a7bdc2f6db655dbff2f4dba8288f45385f628e8b95fb3d5f8ad74fce3b SHA512 ccd21495d004a42ffeb05aeac3667f198b2c21b10c7df7ce7cded2593c668be08c5c5dc3315f52dbda423a3236be6d1ad9a4769f9d753760d5e84a06ffb62281
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
deleted file mode 100644
index 3d5837a0a1d6..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson-multilib systemd virtualx xdg
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="X gtk-doc +introspection"
-REQUIRED_USE="gtk-doc? ( X )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.67.4:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
-		$(meson_native_use_bool gtk-doc docs)
-		-Dintrospection=$(multilib_native_usex introspection)
-		-Dx11=$(usex X)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-disable-teamspaces-test.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-disable-teamspaces-test.patch
deleted file mode 100644
index 269236d177e7..000000000000
--- a/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-disable-teamspaces-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/dbind/dbtest.c b/dbind/dbtest.c
-index e8bbb63..9843c3d 100644
---- a/dbind/dbtest.c
-+++ b/dbind/dbtest.c
-@@ -417,7 +417,7 @@ int main (int argc, char **argv)
- 
-     test_helpers ();
-     test_marshalling ();
--    test_teamspaces (bus);
-+    /* test_teamspaces (bus); */
- 
-     return 0;
- }
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index fcabe5f9a00e..a12ee451fac7 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,5 +1,3 @@
-DIST orca-42.3.tar.xz 3707048 BLAKE2B b1a03cee97ba2ad17e32b863effba46974f86e5cbdcea72235085e369189e8e92cba8b83931fd83a7b859edfc8da9236f462e250c468ad1533768479eb25aad0 SHA512 59d9d61af2e385d8e356f825fc1733d73d136f89a3a06c352eaf1e7b05cd6ebf5bd13282afb478adb4ea7981398db0138324c3e275eb372b99ba648d9fafeab6
 DIST orca-43.0.tar.xz 3758480 BLAKE2B 05c31777c1c88452e165bd7fb6fe75fe727149f5337828b5f4e7679430ed5065a03de7074536c4433bedd81c3090c72e02a775db46f4673d6e3264a57732ad7a SHA512 20248e6065c1daa9c3d6ba37515bab60a3ceb14065b862d6d0610a7659bddc04f49a1cda7850646b45bb0afb5c2a89f1894de96f505831b11b77d332adb747d3
-EBUILD orca-42.3.ebuild 1562 BLAKE2B 23c0907b11da9aca993aed45ea94f9bed04553d421fcf76bd241d582f3189943edb8d7e9dd7d09ce158573b06bd71a231126e854cab047a31a2323a52da7d484 SHA512 9ce417d9e0175bf2dd5790a85bfdc6feec6a00b919b18c6dc9ea28d4b899860cc41e8e949f1a2d441dd3d9cf0ff79442bf62b8afc6b12dbe933ff5b6ead149ce
 EBUILD orca-43.0.ebuild 1541 BLAKE2B 1b03704f5c12bac9ab5e00aa5b87bccef11f6276ddc8f57a3bab0729a1d671ea3bea65bc420758b79fba4321e675a098c719eb249675a61a67aa6a1dc8d6a031 SHA512 f0efb369bf19c8b12b7b663f6d4959e1b8213d64bd4bc1a3d5757f25e7119566bbd0a0e16eee558b55b8681483995a35a2e5e86624e64641b90b22ef7cdf888e
 MISC metadata.xml 762 BLAKE2B fca9ee6ac93d2e860f6791af78380e9d8d29ac10b254299946911a29b5893028e561a18320bc026dd7e9421f3c572e1c3ac63264276a1b292996db93e1cba4a3 SHA512 6bbe0cff5af52cb48adccbb61620fd75a0811cad313867b63cb09b5a7c259230019a54ad607ee46c986188ff11ac2f6878ef20381ef34965dfe918c88ec945d0
diff --git a/app-accessibility/orca/orca-42.3.ebuild b/app-accessibility/orca/orca-42.3.ebuild
deleted file mode 100644
index 3e8ea706bcd3..000000000000
--- a/app-accessibility/orca/orca-42.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-atk-2.34:2
-	>=app-accessibility/at-spi2-core-2.36:2[introspection]
-	>=dev-libs/atk-2.36
-	>=dev-libs/glib-2.28:2
-	media-libs/gstreamer:1.0[introspection]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
-	')
-	braille? (
-		$(python_gen_cond_dep '
-			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-			dev-libs/liblouis[python,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	dev-libs/atk[introspection]
-	$(python_gen_cond_dep '
-		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-		>=dev-python/pyatspi-2.36[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-	')
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with braille liblouis)
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize
-}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 003b47800fa6..d47aca486a76 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index b6c325cb50cf..40694fef81b0 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,5 +1,3 @@
-DIST system-config-printer-1.5.16.tar.xz 1382124 BLAKE2B 37548bd470f8e80026e014d4077a79a38ad54258d620654536890b67b688fc790c9a9a269b321f2e12d63ec21f24858866e39b41089195c528ddbdf1351bba5f SHA512 ed20a409def66bdea7de4cd5b397891eca220c841e1b5c8cab98e45f87389ae8ba881d9e24072dd07203141fc34c49c4b67cf099791857c007971e3b7d2e2fc2
 DIST system-config-printer-1.5.18.tar.xz 1396808 BLAKE2B 910e853829ee876edc597a3103b5ab857b3b8c1cb87096f25213b1088e35d9f4d320dad61f55b530283a7650b07abe028a53b4e144b33b1b66c733cb2caa8011 SHA512 33dc9c52d92f4234e055fb10a99cadd58424dcdb62554797b44bdd5319f1c3662bd2fa33417ac3a3f5ec51216d64e81e1897f3e671eb49f6be34057d7c38f3f4
-EBUILD system-config-printer-1.5.16-r1.ebuild 2074 BLAKE2B 6064a0cccc81f78fab6769164ddc870adbf2e2472421f162c0d6aa7bec9a67a8ed1cb19e7327bf8835b051a710fe5aeaca49b04722db40950631c23368728990 SHA512 0d077bc93964462ff9a79ebfcce6c5bef72e15bea4790549c9318bed814a7bf6b2702a7acd57c680010c1e76abb316099e54e53fd427985c6359c80a9ff1a3e6
 EBUILD system-config-printer-1.5.18.ebuild 2081 BLAKE2B 43644f44599ab7b26dee5d6250a006fcc21416d58c5cdaa9b8991a88d97eac7d951bf7fabb027b4641ba46d8212d1a060851c0e74dca816ec0fa8a1522b45cf2 SHA512 aa550cd4b601c7aef2e324fbfc2e6bfee02dc7c615fdfecac9527ba2154fe3fc0e3ffb6929a0a2e0a1a293dd3f1230302e8df71c7859db8d22d566f08d09d951
 MISC metadata.xml 597 BLAKE2B 4691f7f385a864b26ed00b5d05310d45aa52d1cbcfb118ec4b1323df470a761162bb7c037cc8eec253f1dd5302d0036379044e83257ba6be43d878b28ebf11e6 SHA512 e4b52d3a4070116472e4fb617796a7cdaef0b3cfc825ccdc39392b5ba63afdedad4232a9eacf89c209a3202d95c2c0cadf17ae8d3698d2e2258310cebfa89744
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.16-r1.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.16-r1.ebuild
deleted file mode 100644
index 4636baffbb83..000000000000
--- a/app-admin/system-config-printer/system-config-printer-1.5.16-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-inherit python-single-r1 systemd udev xdg
-
-DESCRIPTION="Graphical user interface for CUPS administration"
-HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
-SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="gnome-keyring policykit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-# Additional unhandled dependencies
-# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
-# python samba client: smbc
-# selinux: needed for troubleshooting
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	net-print/cups[dbus]
-	virtual/libusb:1
-	>=virtual/udev-172
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/xmlto-0.0.22
-	dev-perl/XML-Parser
-	dev-util/desktop-file-utils
-	>=sys-devel/gettext-0.20
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycups[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	')
-	gnome-keyring? ( app-crypt/libsecret[introspection] )
-	policykit? ( net-print/cups-pk-helper )
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-xmlto
-		--enable-nls
-		--with-desktop-vendor=Gentoo
-		--with-udev-rules
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	python_optimize cupshelpers
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED}"
-	python_optimize
-	python_domodule cupshelpers
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 71acfc1dab48..42600aef57d5 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 6dd530a793cd..3d01beaacc0f 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,6 +1,4 @@
 AUX 1.5-meson-git-version-is-optional.patch 1143 BLAKE2B 55152a557ec7ee282ae22c9df3bab54bae2b26fbfbf59304c48e03536d69799e02f8d5005ef567de4ee9d0cac76b0372483b9bbb05e7c0d0d04d730bbcdd5edf SHA512 85ade30168a287a3cb22b0faf12a4176e1e244b8470411e6a821fe8631f45a33b343739f9fe282b8f8fedbf2770a6b518480943a0c6bb01045c7a97d2b71cd50
-DIST gcab-1.4.tar.xz 78240 BLAKE2B 8b857c116fab636db93463cee7d6b809c3c7b2bdf3896b7b5b5b66ebf270b284b356710933ec17584143bcef5c1f5c555811dd05ea98399f327047476a33fc16 SHA512 66a2e0d0a5888c555153356ce808f602053e71b76af19794db7e3bbf9516fe791805068838b4e208698cd645ada7a08610ac95f846fa81e00a9b955016306299
 DIST gcab-1.5.tar.xz 81728 BLAKE2B ba1793a8374e2dac412ca2807343781013f5be8d79e444ef0a136fbf903dd9a47809b3dec4703ebd19d196a7046a0c8405ae8463c2f7338fdc5eaf979436e8e1 SHA512 2a9b7d2720abbb5527d478ac760898ae254d08b7aa929fbb21753296e5a07c51d62e134a3f8b1b21d9b557d4093505194e09823ddbaf58465d37b372f37534b7
-EBUILD gcab-1.4.ebuild 1123 BLAKE2B b8169f5333b10bb26ec27ce57bb3f471c96fa9678bd7ed58db34a18a938054373e07ad8d8e2e9f2b585c2acd054f337219cce083eda6d4516267dbf136767023 SHA512 70ad8b8ec248aebb03e3806e50db1b370a7040ebec8e16e481fd343591fe20f84a160b1a476acc185c9acd70f8c3de7e993d307a3f14cd793691651c49249ebd
 EBUILD gcab-1.5.ebuild 1196 BLAKE2B 0c72673f05aeeb2b570483b6a2b375f8e5c8100c152b489f9f78bc994ac7ed7a31010906508871a8bdc44e20c8ac473ad2b78c68d330f47515f42e2d0893674e SHA512 a5f7a45f445250cf8e22d249c0ac15153965e0b326fde23b4d5e6da23bcc9b24c9fc378f610bdbbd9702d7afceef220c122df90e2cb172f10b914706f17a0039
 MISC metadata.xml 345 BLAKE2B d32d83f8c7d6db7c4d0c22125c547f3e838fd8154b2aa80c230ecc9c64a5edc84814f50bbc159c5921fcd767eea8c2eb65e08217eb284094a6fe122ee5a1e34a SHA512 83301d336de47bf8ab99a9b50097981433220039e2769c4dfe4779a7c2309fa69e5613fa209470f19e21de17a40177757e6abaa73c58f4145f0ef7ef1f1af5d4
diff --git a/app-arch/gcab/gcab-1.4.ebuild b/app-arch/gcab/gcab-1.4.ebuild
deleted file mode 100644
index 8b4a5c52d717..000000000000
--- a/app-arch/gcab/gcab-1.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
-HOMEPAGE="https://wiki.gnome.org/msitools"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-IUSE="gtk-doc +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.62.0:2
-	sys-libs/zlib
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/meson-0.50.0
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection)
-		-Dnls=true
-		$(meson_use vala vapi)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 7925923fd552..996e2fe9b6d9 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index efabbbc26231..624142eb531a 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,7 +1,5 @@
 DIST gedit-42.2.tar.xz 6917596 BLAKE2B fd7b0a1c113e944b1b3f0c2bb55a061e76e7ee71ebbfe8d64c6d5b0c7e47b8dd54519bde1b7b095a1cab27a169427eecdf35d06422c1a984f51dab82e19c7cb0 SHA512 d50f021f33764e0cdd3ac51650db0e37dacb5b6edeadddfd8136e8120e83eb740db66ada25ae43eac810896714859d6f8876640a8976ddfd6e7e602c278dcc99
-DIST gedit-43.1.tar.xz 2724084 BLAKE2B 4d0227c9287d5415298a50dda72f7997a0cb65032b9d9ac045fc2abe1a1f2a6b44cd6e36277373943cf221323ffdfeb2009fcc93ad9ef863b993bce4afac882f SHA512 00cd2f2b8ce9cc932e5b0fef7acca857d570ea73219caf031aee8a7bc6c146be6c739c01d62e4c9f4c706f025c04f7849ed88e99b996f0599314196eded54bbe
 DIST gedit-43.2.tar.xz 2724036 BLAKE2B 64039018c604874945cc6835bba14d80f969b0a860c0384d969af7fc81cdc4ade568539a80571440af605f14eaf33730140a48b48b92d1bdb652199770ca3411 SHA512 447f0da946ff7474637bb6b88f41eb53e5ba886c66e8b9f8c17e67d2f52e3eb115d905a850300f70488cfebcd6654a14ce8c57044760f4fdb3394cedf4e91f23
 EBUILD gedit-42.2.ebuild 1882 BLAKE2B fd260e8df390c8bfc7fa296a3a90260df9de3d9b3594449ee485867eabf382bea8f2c8331800f1227bedea8f22c16d4c2c4d4eb8e70cf8e5975f3c4725f477ed SHA512 cf12494d027f6f150520ffb5d3966a2c801204d89071de3dfab4ab5c4eebb0d8300c11db80ee064df4538a0331c324a7f2041d3d89c7eadd699ac8be012c26d5
-EBUILD gedit-43.1.ebuild 1791 BLAKE2B 2980799025293991f32cc05296abb4241c19a35d3d5c5b233f4674f7f9cfced2567fc14f4312eb744a4a702b8529a082a365f541cb38c46ec72fcd029c650712 SHA512 0cd1b52d052fd70d57381b7ac3f771710fd03b206ac7200f7e7ac6da79b03953bae33ad75b54a3eb143ea8f3744103ae152a1e2b1bd1d98698a17a1175805b65
 EBUILD gedit-43.2.ebuild 1773 BLAKE2B 4fada813bc409e5223efa0cc3a01e80a04b3c4fc04773bd282246621fde217f0de2c717992a8722f7508674f244865cfcf5808aad8206fbfdc88c52644ebfb9f SHA512 1e9165d876e5c90b6e2454054d63a18a8677aba67c75b68fe0dbcdb3a07434e6638c9cf40ef30b04940af6a580d29b8071471233b5c938f5faa407f8d19d9641
 MISC metadata.xml 346 BLAKE2B 59226b3220bd9b1770fad0f5acf3b1888a57a3496f9e0a6eb0eb09c12b7a5aa461961753dd8a5a6f01db1cdb97af5b28d6a8d1d632b60f499f86e0864e29264f SHA512 3e1d83ad67b85a681b85f8fece9d6c2c3eab2f2f726447230dc1f2399a21cba211d97e11d8c06d0d1b1803fafe67be4b32c04b39c5f8586a421c525624f6697d
diff --git a/app-editors/gedit/gedit-43.1.ebuild b/app-editors/gedit/gedit-43.1.ebuild
deleted file mode 100644
index ecb7c41b1712..000000000000
--- a/app-editors/gedit/gedit-43.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+python gtk-doc spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.70:2
-	>=x11-libs/gtk+-3.22.0:3[introspection]
-	>=gui-libs/amtk-5.6:=
-	>=gui-libs/tepl-6.2:=
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=dev-libs/gobject-introspection-1.54:=
-
-	spell? ( >=app-text/gspell-0.2.5:0= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-
-	>=x11-libs/gtksourceview-4.0.2:4[introspection,vala]
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-"
-BDEPEND="
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		-Duser_documentation=true
-
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use python; then
-		python_optimize
-		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index 103af5e07378..1951fae7cd51 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,6 +1,4 @@
-DIST ghex-42.3.tar.xz 1003928 BLAKE2B 26bb123fc5a56fc2ff891a057ac276a36bc500a2e23f29bd26a85d6888035e2b8af7aed7f7b679a898c0a98bf042bb4e05c66e55a8fac0eb63422ee03823dc74 SHA512 9eff44892d203a2a9aab7239d85f61a860458fd7a8b4d7410f94d4f596ca5e2ff269faa81e620e7fc08bebe40c819a4c0cafefb5278121a9f2c8885bfd17c59f
 DIST ghex-43.0.tar.xz 1020716 BLAKE2B e4b6590f9af11d6fbec31266ef9959b827937697eebd02a942b85e0c0d51555ced79ab84b34c4ab42b5cbb6d6071390d00cd0177e7e712e33e240b3132749a19 SHA512 4150d33ea1dc40d0c051ba1ba4a4829d084a4aa6ed682bade5b3e039a90049c4d009183e78b06768946b516386aa9e41b888eca61c40d96336d7ab4dd37b395b
-EBUILD ghex-42.3.ebuild 1141 BLAKE2B 4115c3ce3a4d786dbc56b9d25f529306c6d9e1495dd8d8fa5544c494b2ef5c83c24935ec1de544bc0937320f80470eeb02624a7a091dc09c811ad39fdae8ed30 SHA512 ddcd5e958f36b07a77a08a57a0f63be8755047427881b1e306c28a7b2a0e92bc36cf31a32e9b88d0f070b13034f93e9e6042545fbd9d7b089a09fa3026da5ea4
 EBUILD ghex-43.0.ebuild 1288 BLAKE2B 2e9b06e1ce9246a782e342245d6fc54aaa9f1956c9fc977f5a4dbbca30fa4d6227afc9ec85af665ee798d7ba7582e03afc997e6b98c1fda6e9560808855c30d4 SHA512 b17ded2f8e373f098aac3663d7ad69035ef71b560f2a2e92550453dd7740a2da683fef08d019d4503d8c3e4c0f14259759a30027bbd8067f2ac9c225902d0648
 EBUILD ghex-9999.ebuild 1292 BLAKE2B d0d628849dd93185e7802174726c92211f999142fb2ee8359a9d22edaf522326de806e95d00b830a4b369afc3f80b1c647a3fa39f127590560e75ab812e13538 SHA512 ae01eb04a1458d233add7e73d9f9cd021b49ed5d96dcfddddf860610d0003a7cb8b9ca2a56828bac3d65f0fc847aee6add97b50f4862564eedcb64db553ac46c
 MISC metadata.xml 345 BLAKE2B 4c2385371bb42d47643f2a9d48ee5ed675267f812467fa03f69151bcdbeb996602be0a3995f976b61e0c018c8d69e3dcd37392f5927bbe24942f11c23794bac4 SHA512 c3f3cc3f436137299082ccdcaa57221d1b3f490b34febfcd6ca586769b0a8c76ce11cc5b8be823c8c88b942effc0b68d9c078ba3a28594c41419830dff04fcad
diff --git a/app-editors/ghex/ghex-42.3.ebuild b/app-editors/ghex/ghex-42.3.ebuild
deleted file mode 100644
index af0a9aa90029..000000000000
--- a/app-editors/ghex/ghex-42.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME hexadecimal editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2+ FDL-1.1+"
-IUSE="gtk-doc test"
-RESTRICT="!test? ( test )"
-SLOT="4"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0:2
-	>=gui-libs/gtk-4.0.0:4
-	dev-libs/gobject-introspection
-	!app-editors/ghex:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( dev-util/gi-docgen )
-	test? (
-		dev-util/desktop-file-utils
-		dev-libs/appstream-glib
-	)
-	dev-util/gtk-update-icon-cache
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/gtk-doc/
-		-Dintrospection=enabled
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest
index 3c9ee9ddc12b..b66b2e93b754 100644
--- a/app-editors/gnome-text-editor/Manifest
+++ b/app-editors/gnome-text-editor/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-text-editor-42.2.tar.xz 1168504 BLAKE2B 0bbd02fab92c3ac2df2a38352561dda27662b4ede30d9cfd05b54d58c4dc4824375ee427e764415dc450a2f8dd793ba539e5681df984a20b1d121bd97a3f3008 SHA512 4373b048118c7a4253fe99a6ec6091c054154399d34e5a33f933d535f0e6c659023603e08e1cbcddb972d6385632b2b9351455eaa1398dcd7c50b3b4562400ae
 DIST gnome-text-editor-43.1.tar.xz 601588 BLAKE2B 0e3b7231327898b554360cfa45c3ba9f8ff005f61b6f68f6ea431d1c9e459b429af4da794b06ce6f4618de06c96a191477f1cadd61cfa6ae9e1ae350b75658a1 SHA512 aab2fcf5d0ad705833802bec3ccacce175c16dc717b521e0b220ddf5420760ec76a90db9b4f4ee0722c2b19a40304e1c379f06f2983e4597df233ade67a0f725
-EBUILD gnome-text-editor-42.2.ebuild 1034 BLAKE2B 529a22dedf22189af0f29a43f858cf45a85407ebe0a2e3381d0822c482c3106ed306f9d566615fce747114f002d1b7ef723a22e3858a5cb8fb26b9dd21e47447 SHA512 a42fe9bc4648c8f32beb360c20531ca0df19055231467214280b50390cb22463f4b2683d12d67a22400544753fa801840ac38c45a732914ac5c845d8b60384a8
 EBUILD gnome-text-editor-43.1.ebuild 1016 BLAKE2B 6743e5ee740e1562ed725a8ff85cf61712ad3786e0433228048c5ca1ab44de0b2c3ccecd9f2b6091ed776b00a3d9ad0df02eec5aa1d598e035dac512f9e411a8 SHA512 6930ee166fa539e48ae4dc6ff7437bf50a3af305bcf8bf82a58e5b89902ed82b46c594768b00f417ec49a50e0f11049b06dee87482fdda00b1399e0e760f1134
 MISC metadata.xml 358 BLAKE2B 908c67ba226a7e65b72a1cbaea99350f05fe9f904644c99b9c4e1e0c81f795c1420a0ca9cba1d56f59fb1b841151ffcf7d088add9f36a0e88314f7f52da94fcf SHA512 5862fb965119f76e19ed997e53e651778458604f1f9b69a1ee04db8eac52bdb6352da84ecb92555b31d3b8c62aa544c57c6040ed358af3beddd35fe356744d85
diff --git a/app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild
deleted file mode 100644
index 7b3a567e5004..000000000000
--- a/app-editors/gnome-text-editor/gnome-text-editor-42.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A simple text editor for the GNOME desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-text-editor"
-SRC_URI="mirror://gnome/sources/gnome-text-editor/42/gnome-text-editor-${PV/_/.}.tar.xz"
-S="${WORKDIR}/gnome-text-editor-${PV/_/.}"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="spell"
-
-KEYWORDS="amd64"
-
-DEPEND="
-	>=dev-libs/glib-2.69:2
-	>=gui-libs/gtk-4.6:4
-	>=gui-libs/gtksourceview-5.4.1:5
-	gui-libs/libadwaita:1
-	dev-libs/libpcre
-	spell? (
-		>=app-text/enchant-2.2.0:2
-		dev-libs/icu:=
-	)
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.21
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature spell enchant)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index f2336eff28d0..4a955cb98c0f 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/consult/Manifest b/app-emacs/consult/Manifest
index 7fc27692e38f..d677a6151cb0 100644
--- a/app-emacs/consult/Manifest
+++ b/app-emacs/consult/Manifest
@@ -1,8 +1,8 @@
 AUX 50consult-gentoo.el 82 BLAKE2B 3443827f490db8caacfe842cc7f1d1315f3889dec007210f451909576a76139f70ac5795346a7a1b11befccd3152874fd3c86ad7a20c0fbf84f793f8deb595cd SHA512 dd2ba1149c847d95d6c54265bc03de36e198dfecedc10336f6879fb3a1fc9d92e2c6de190d4f9aaab6c3d15f268fb80e082b49b6e96165697ff786333a50a601
-DIST consult-0.18.tar.gz 93440 BLAKE2B cc67e8cbc49846964114a8e01a10d41454fde2e4a2e98e3af315092fab5631ea1418f649eb92ca798672c0ea153dd2862b555aee6530a1baa84ac4050df7a3c6 SHA512 74005c211ba7af0cf3c0a06fdec8d85da111ea84edb4eef2c60d231ae6eb87905298ee8bbbcdac8bf8b13a21ed9070422383b93433e422d6ad6b743c8bc80938
 DIST consult-0.19.tar.gz 94673 BLAKE2B a0bfacd0eccde14a332e85d31ad37092f418b5d250db8bc5a674881828d198fd2b26d66be1574539c33fcdc70f7165f4be84a4f920f1eb62b6bee0048b46ac54 SHA512 b1f023d57f29ec9443add83aca818a0f7f2c4954e8d5f53246fbb5a2525c03c20c71d69d8e748fe6fe6044393849b33f9589428528d2d0837e5848aab2724f4e
 DIST consult-0.20.tar.gz 96288 BLAKE2B 41d35655b75c6f3901b5b20f743bdf5119d0347a2d2a0dd6884cbf3856146ed30a224da75147063a93f4274772d54bbb6f91d4deb9fbda5f93d57d1b70083ef0 SHA512 d9f847f086e2921a769e84b10439512e0b614b87c424d6b206ed1007bbd67360072e02441a4249ac31ea6aa9ad5d36a042af27c0ebc935de3889e31d604ac8c9
-EBUILD consult-0.18.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
+DIST consult-0.29.tar.gz 98233 BLAKE2B e500e3b48609000934c82832c80c9a253ee260a67c1b7e437f792668f607aa8d8e7909bd889341bf2cfc46bd4e54ed133350862aa2e7fe51fe36948d5b5edc17 SHA512 fff55c1eb435955b48e830626e06eb657cdd7c48722e9583f47842c720d1a3bc1ee8ca97ef758ad4270709fc303ba6c76dfa4c153fc958acee348aadf1e5a1f9
 EBUILD consult-0.19.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
 EBUILD consult-0.20.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
+EBUILD consult-0.29.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
 MISC metadata.xml 359 BLAKE2B 569bd0c5fe81610f0b67c94e8c431edddb5060800a6e22d0833a4d5f120df34545dc49c879c12a6522ccbe791472df47be42af97fbb228498e79d9e0893697f3 SHA512 8e01b569f019ea43209f43c783fd41b9661a7235d300363a9441179058b10921629cf8b891874c706d2c1ec106248f6c1e0a3501df7bfcdd02000d08f7997c29
diff --git a/app-emacs/consult/consult-0.18.ebuild b/app-emacs/consult/consult-0.29.ebuild
index d2a809943fab..d2a809943fab 100644
--- a/app-emacs/consult/consult-0.18.ebuild
+++ b/app-emacs/consult/consult-0.29.ebuild
diff --git a/app-emacs/corfu/Manifest b/app-emacs/corfu/Manifest
index 919ce33e2fe5..689b047ba2fb 100644
--- a/app-emacs/corfu/Manifest
+++ b/app-emacs/corfu/Manifest
@@ -1,8 +1,8 @@
 AUX 50corfu-gentoo.el 80 BLAKE2B 030035947690cded0580337466f06e7561c996ef27d6dce32cacf28249e71f3a99083e1dcd68e8fb1e2d0bcff75a70881ca88c7f41128123876e6f34230235fa SHA512 cde0d90e0b8bafffafd8d79c6fb4bc7957d1c7e5a6eb86b2c2cdeb73910bfddb6b8b2985bd46af406e5d3f3d1e1205b37ac2bf8cb26aa3d052b06054ae7ba00e
-DIST corfu-0.27.tar.gz 39034 BLAKE2B efc1d2477bfaa891d32516d69aeb5179bfcb9332b579609319f832a7ff03416ef5836cf5124bf9ad9c8f75ad4a6c4183a17257037f6271801515636dc5bfd132 SHA512 fd143b4fe63080e6280be98b93ef84f4b12c5c1211cb1a9294ea4fddde61466f29f68e9aa24dce74c5316d7938c91fdd0b28775c688b451386daf041ac745b82
 DIST corfu-0.28.tar.gz 39100 BLAKE2B 70deefdbe6768efa0c9a8c86b441f177f1c0e6f7c344f9290fd82dd1f02752c4dea5e8810b475e73709c89cc5d62d07f3beb70814f744828700d2d30edc0956c SHA512 85de7be79cc979cd877f9f9fa0e9546f40716215393e8bfa6cfc8e8f71d1289a59702230f8051c3bbb4b968732423b1adc124fae4f661523fb4f5a78591f0c46
 DIST corfu-0.33.tar.gz 44195 BLAKE2B 7995bea510a812ca0772fb2229230ad0f1b1e1ef8ad97e832aa1bd650d7a59b4fe0412fe3f627c37d7027f094a6892856ac02b90aae583c25ce0f03577101ee4 SHA512 e9879a2ecce1fbce9a4750e85f5e5fa998e0f706e67d61b011061275bec7bdb8da3512b4da3d2fbdd6b8dc242887091bf1d68f96a465ee63f9b8e83829b5a3b8
-EBUILD corfu-0.27.ebuild 544 BLAKE2B 8e7b2e689f65d4dcca4934c53564bb8435dae6f06c364d445fce382229231e5e8553d13e25c4451359b00ed453e140a4d1286c8f5584e683474bdc0e12efaf64 SHA512 2f80fc7697c70ab5be781034220f24067b7cc9b648de2520ff159de3c87c6abca72fd7c86739767c58d5ed165525f6b2dc48c3652a60b01f01962e917621ac10
+DIST corfu-0.34.tar.gz 44586 BLAKE2B c2a056cdef8cc536f3512662c442504fd3c973649e58b382eb92fb749bc5b3de2dcdad9f13cbe929b33b001fe9fc1ee2b057620c321f32ad9aefc0b274b71983 SHA512 5a46af83eed319170687e91386d8363416682fb6017d465a2b86c8164903efc128122b9cae81482155d8c710f7b2eb1dc8ff0b636544a0a611bec574fdb188c9
 EBUILD corfu-0.28.ebuild 544 BLAKE2B 8e7b2e689f65d4dcca4934c53564bb8435dae6f06c364d445fce382229231e5e8553d13e25c4451359b00ed453e140a4d1286c8f5584e683474bdc0e12efaf64 SHA512 2f80fc7697c70ab5be781034220f24067b7cc9b648de2520ff159de3c87c6abca72fd7c86739767c58d5ed165525f6b2dc48c3652a60b01f01962e917621ac10
 EBUILD corfu-0.33.ebuild 544 BLAKE2B 8e7b2e689f65d4dcca4934c53564bb8435dae6f06c364d445fce382229231e5e8553d13e25c4451359b00ed453e140a4d1286c8f5584e683474bdc0e12efaf64 SHA512 2f80fc7697c70ab5be781034220f24067b7cc9b648de2520ff159de3c87c6abca72fd7c86739767c58d5ed165525f6b2dc48c3652a60b01f01962e917621ac10
+EBUILD corfu-0.34.ebuild 544 BLAKE2B 8e7b2e689f65d4dcca4934c53564bb8435dae6f06c364d445fce382229231e5e8553d13e25c4451359b00ed453e140a4d1286c8f5584e683474bdc0e12efaf64 SHA512 2f80fc7697c70ab5be781034220f24067b7cc9b648de2520ff159de3c87c6abca72fd7c86739767c58d5ed165525f6b2dc48c3652a60b01f01962e917621ac10
 MISC metadata.xml 357 BLAKE2B 4a324f2913cf600a98085a72ffc69263205068f54b191101ed2825d3e3c84f951e58af8ebcab481bd50908685dc3603cdba3156772f153bf5a565ab43831b201 SHA512 038f5605bc71c57700f5d34539c8474c667f4434261cdb7dacb28c1dd80a64e656c395dfc2c84329d36e6cee28aaa9986d3cceb25f46d887bf8fdc1cbb348b8c
diff --git a/app-emacs/corfu/corfu-0.27.ebuild b/app-emacs/corfu/corfu-0.34.ebuild
index 3374986f6f57..3374986f6f57 100644
--- a/app-emacs/corfu/corfu-0.27.ebuild
+++ b/app-emacs/corfu/corfu-0.34.ebuild
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 1b70cdd7d3b7..dc76674a3757 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -3,9 +3,11 @@ DIST org-9.4.6.tar.gz 4729335 BLAKE2B b88edaf8098124b2048ce57d6005d2af0de34e9b8f
 DIST org-mode-release_9.5.3.tar.gz 2049323 BLAKE2B e6a93a74d5084ca168fb85d2651c23a0afb75ac649cf6821cf825bb54d69d61ea4694584872b49a23bac1374f0b22d2d7015a346b0dd46fb0795b75c8753c655 SHA512 7062e1075567b7af9b1c39f38930fc1fbc72e53be3c063dbd25cc4e8295932ba501586fcb1e2879da1db4200e63c79a454f4225b5d53dafb1773ebb2e0340ec5
 DIST org-mode-release_9.5.4.tar.gz 2049298 BLAKE2B 7abd01bd78357b09cdc10661ad9b285c2e717c5848be2ff61df023d752659b6636881dfe17fe13486db8c9c37f576edfb02303f552c85e72594af99de7618a24 SHA512 06feb279c8e669fed263f9a3dbd8e0fa25450b1310a968d22b4f4d94b6a0515a1242758ed2c91a4d7c4c6b8315e756fe26951e9f9731ed3e7cfb7a0a8ef6999e
 DIST org-mode-release_9.5.5.tar.gz 2049730 BLAKE2B 382e6585f693fd30def29da740d1329a52b4565382df90a37e3646324ee44106f1a99c2ea0c0862d77721cc9bfbec0736cb03065b59b2fdea0a68d8f8ea37c9a SHA512 ce06bab17ae7944c1623f935bbad0379d06390c72c43633ba0de2bc04ad362e18d9aaae96103eeaa23f7ea9e4e00976a97a914da87fb7941a13746b1fa77f591
+DIST org-mode-release_9.6.tar.gz 2203782 BLAKE2B 2355202c3f570c7b9dfd2613d2cc0401d4bde086111736ec8d7e0d3203d87b3e8888ce91869cf75960f146c2f591387b9ff33a6d5b3c0ee9eba455394d8cbb11 SHA512 d81036d64a8903b33809512858dd5983b925503ca18648131a651a59e616ab2b63621964f1d6a2136ff4aa38cd56eaf099d12471dcca350acac6a240e61908fa
 EBUILD org-mode-9.4.6.ebuild 1710 BLAKE2B 7e412f50607d334b4052596fee8520b7d47c982b43f23245d64c56004a2d8910ca9fc12bf8a4ee269d6556a7406e1a297131ed7d0ff9e5ad17d04bf698575d80 SHA512 5d2004cb82270a425edd181881b0c64866a04c89203695b0d56cedd7b4f4032ec63f36e564ade12e67ed75c322f4bbfeb293ccf20b0b47749cddce277f2849fb
 EBUILD org-mode-9.5.3-r1.ebuild 1400 BLAKE2B 93d99c3e959140b0064b37d275b4b1163624748c5c8cc90caa345bb283a775feb5803cac35b7d51d5b8890da94e6a052bcdda2f8a98b285e7771dc6c6779be45 SHA512 2a97b5b025ea6edbbb3a5168609e3780b944497bed223d5de47e1d6bf5c3229edfe42476bf7264c618c00346f8c3a27021146a80d9a24d1ac172004b455c080a
 EBUILD org-mode-9.5.4.ebuild 1400 BLAKE2B 8dae635a451ccad2b84b274afe2782adf13a200a2cfb4b7f0ad72849d7c37dd51384645894596db8f0adc7a4bc0b6e0b52a4e346ad8bff238169cd3fedc6d5e8 SHA512 7ff47b6781456aed31ac6b5f11a176db98d5f76db66af3288ca970f02e06be41882d3bebb758e421fbb77425082fd2150e258070467184c3d040d957a4fe47aa
 EBUILD org-mode-9.5.5.ebuild 1406 BLAKE2B a080f0c74ce2d3120fb1e6c28e895a424acd5e45e9863c7957c380a11451b6e6d53efef5679e6440e1508e5bb5d87495fc26ef794f08eeb725d90861fd96730b SHA512 1244e80869a648c9b8e1293b7c1017f07a6151deb16c8dc9cb77cf18ea922a653f0249e5c57e1dff3d08f8a4af44133d3167ecf64a1fd7760dbd81ca5f10d20e
-EBUILD org-mode-9999.ebuild 1537 BLAKE2B a8bd3199be2117253f7e1d4009c98384cac23c3b9d3094e3285a0418e5b3ae4c910251bc278a00cc92225dd8106ba8f472ca32ead00f7fb1a6ff967f57a96400 SHA512 640f00ee00d72c2be2fa373b50b138400c5b2cc9f113eebf385d853cf477aa93d93f70ff8ebfbff5948aa4b57993425c53ab89d2cb5abb544d5a8715c40d7fb3
+EBUILD org-mode-9.6.ebuild 1414 BLAKE2B 114a9e1f8aa26bce75f68f4db0c2abe6a246365ea4d9a4a722351f573e7057e529039a2e42a9a80b3306ebc7daa5482cb8578793861615284cdedcc5df57d8a1 SHA512 38bdd3c48a52df0a64acd0615a93f3c8b877368e322e96b4a3f9b804d7eb5a0da78a43d245b9e583cbae110f28b4083d350fb14d272c10f7683d35ecfe43108d
+EBUILD org-mode-9999.ebuild 1548 BLAKE2B bf1ed3bb0ae6a50d6032f1166362806289cffc5f7846517ad77b9c8355a12d657c3d084639809be5db9c5c8f33d5084c21550fdb9cdb2928bfd28e80d792a7fc SHA512 584c1f87a553501a0fedbec2a784bf7615588505fedc486fc8c9e7bda51af5dd83dddd420837998f322b649f8c230d26a304f7cb08a17e965a8b494c6ce56c27
 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
diff --git a/app-emacs/org-mode/org-mode-9.6.ebuild b/app-emacs/org-mode/org-mode-9.6.ebuild
new file mode 100644
index 000000000000..90b1759b5191
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}-release_${PV}"
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc odt-schema"
+RESTRICT="test"
+
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake \
+		ORGVERSION=${PV} \
+		datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake pdf card
+}
+
+src_install() {
+	emake \
+		ORGVERSION=${PV} \
+		DESTDIR="${D}" \
+		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README.org CONTRIBUTE.org etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+	local DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+		so you may have to install one or more additional packages.
+		A non-exhaustive list of these dependencies may be found at
+		<http://orgmode.org/worg/org-dependencies.html>."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/org-mode/org-mode-9999.ebuild b/app-emacs/org-mode/org-mode-9999.ebuild
index f95d8ed5365f..4ec54a056a1c 100644
--- a/app-emacs/org-mode/org-mode-9999.ebuild
+++ b/app-emacs/org-mode/org-mode-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-NEED_EMACS=24
+
+NEED_EMACS=25.1
 
 inherit elisp readme.gentoo-r1
 
@@ -45,7 +46,7 @@ src_install() {
 		install
 
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc README CONTRIBUTE etc/ORG-NEWS
+	dodoc README.org CONTRIBUTE.org etc/ORG-NEWS
 	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
 
 	local DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 683f69ce6c70..0eb76c1de626 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 7882c684ffbf..d0c13ae0f269 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,5 +1,3 @@
-DIST gnote-42.0.tar.xz 3330504 BLAKE2B 847c1c66b86902c13a7e9cd349e0b1e565f046ba81809dca002bfdc07d1e3dc4e12797da90e7689d8fde886ced580da9b744ca736697d1fd933a93cc344304bd SHA512 fcdd653a29ae957faf177bacbe1bbdced186416c04a8f45f194a055914544b0679019935f482834e515a20865f358dfdfc32aa846c0fd24596cf5e569e21b997
 DIST gnote-43.0.tar.xz 3325232 BLAKE2B 9e56aa164262b710aab872be48fded2a6c70a062ddfe7c95ae633c38269390a6b3c3143c788f0ee43fb37d0229443a600d71e5edfbab1aa387a20e135210a0dc SHA512 34133ba1cef12c02a6518017f6b5b07b6781f05af787034ceb3dd8bc4d59fff2a7cdc17615511e7008c39bebf52e6b78a973840bdd5b6b1e5199226fdd12d91c
-EBUILD gnote-42.0.ebuild 1529 BLAKE2B 25b2bbbc16b22e051f3bf98dbded4ae9151b64330003b84b8b529c428fcb076d4c40f493f66a02d9138f415d7819a1dd64701785e80e3e3b961f8d501461a234 SHA512 c0e89681d3b0acb65c66d0050cedc52cdaa63c094721d57589abab87f8c7de1095d91cbfdbb0d92867d8f45eecc68e6d8f3a903001267a92d1d6caca5a0ca54f
 EBUILD gnote-43.0.ebuild 1529 BLAKE2B 25b2bbbc16b22e051f3bf98dbded4ae9151b64330003b84b8b529c428fcb076d4c40f493f66a02d9138f415d7819a1dd64701785e80e3e3b961f8d501461a234 SHA512 c0e89681d3b0acb65c66d0050cedc52cdaa63c094721d57589abab87f8c7de1095d91cbfdbb0d92867d8f45eecc68e6d8f3a903001267a92d1d6caca5a0ca54f
 MISC metadata.xml 346 BLAKE2B dd5d67f5f5f2bd3205f8087ee8abab196289213b451493bcb0e059f902482449329bf03e9cd44e13cb72a347b4ee97f6b1cdf771c0723bcb93b06dcda9a3cb00 SHA512 0f177f3c20fb7215c21a2df360abfdab37bac8cc8b1405d31cd76d552d65661762a929972b0bed0a4c46b7f9c4b053b9a544209282db688699208b5ba0ccec64
diff --git a/app-misc/gnote/gnote-42.0.ebuild b/app-misc/gnote/gnote-42.0.ebuild
deleted file mode 100644
index a448ad104dbf..000000000000
--- a/app-misc/gnote/gnote-42.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2 meson readme.gentoo-r1
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.62:2[dbus]
-	>=dev-cpp/glibmm-2.62.0:2
-	>=dev-cpp/gtkmm-3.22.20:3.0
-	>=app-crypt/libsecret-0.8
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=sys-apps/util-linux-2.16:=
-	>=app-text/gspell-1.6.0:=
-	test? ( dev-libs/unittest++ )
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	# Build system requires UnitTest++ >=1.5.1, but the .pc file doesn't
-	# specify a version
-	sed -i -e "/UnitTest++/ s/version: [^,]*,//" meson.build || die
-	if ! use test; then
-		sed -i -e "/unit_test_pp/ s/ = .*/ = disabler()/" meson.build || die
-	fi
-
-	if has_version net-fs/wdfs; then
-		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
-		synchronize notes."
-	else
-		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
-		If you want to use that functionality just emerge net-fs/wdfs.
-		Gnote will automatically detect that you did and let you use it."
-	fi
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 65f52cff2ea3..95857a4fd409 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,8 +1,5 @@
-DIST tracker-miners-3.3.1.tar.xz 7244032 BLAKE2B 0233ba74ed6c697055c12fb758fefc0f71dba7e17db0e92950491cf51e228896e46d27485e2cedd16a5a3a8e4d46eca66baf57824e6340bad9f177b206908e2e SHA512 bc0cb53a7296a2836f05d5d5413418af936ef7f0a4794705e5970699d69c27f513812d0daa182f5359d665a3b6111de06cd9fc671ad769472e0cde2550f66dcb
 DIST tracker-miners-3.4.0.tar.xz 7250524 BLAKE2B 9112c078899a7ab1aaab06d1c3ca0244410f21e13b724f1815e5334733bb851cf50c05ed424c80e62b2cfc5d7f16a1a065eeb6cb6a4befdb2d776cb7808e1cbc SHA512 0abafd3692c24683282f52e33a6b4d063a9d938b2f1b6dcb636409102890f6ebd9f33a8e406a482c1d16d26ebcf58874651d04f0c488b9d83e188feb6e5b1f91
 DIST tracker-miners-3.4.1.tar.xz 7244576 BLAKE2B a9f00a0f57b1af1a53b2552d4a1570a4c5576537c48eee9ebe2428e06170ff099e8876ec933bfe9f47adc69e7c61552e886aa2c3149bd3e02f37be8df844083d SHA512 2bd0b8450e1df40b4fa35b17f4209eba4f0d91a603b2d2f7b5bd6da07bcb60755b36d72b3b567ae6bf2d97c3a4294c8f14b1115825886c3f61528a092aa268bb
-EBUILD tracker-miners-3.3.1.ebuild 4674 BLAKE2B 31a7fc6f2b343740e48421a64f559ebd5b2ec97145a911f3fd8b65ebc6a8d697c2cd586a8c2410cc52b370c7a43110bf6d46d5cb1714521df5b0c250f9f83ffe SHA512 364bb3d7f1511617b6a5843277423db42fe9ed5922beadaa649a247a59cdfdd623b4706739850bd3068aa4a2928b808c23e15c75537107bad7b50883f8f03820
-EBUILD tracker-miners-3.4.0-r1.ebuild 4679 BLAKE2B 760b4259af5fe25b077dcc5939007093faa0def24bdfaf8839a3948ab27ee8727608c5d14fdf4b825ed50b1a0378b4c50de819498e4be396cfe1137cef55b54a SHA512 fd723f08aaab86ae3328fc11ab9306b3e102e8ae3b9a7691ec0aeeb073d01cd326affdc3ce9f754e1cce05521093512739c011b47da88012caf94efde618f412
 EBUILD tracker-miners-3.4.0.ebuild 4674 BLAKE2B 8cfffead2c5b6ce99b39715408558c3f884a5844970d19ea5f8f0cf72226b907fbd2b9a22421b3ceb058e07b2a2ce8770414343b356f72e1c6f45e2a1b41d283 SHA512 646d1bdc52973d14968f7f7bbba285e6c43524ea67527041bc98309e0c5ca68b85b4dde118bb48e4dd0691a690824dd5c059cd1c5c7533e32f7695b2cf7db15f
 EBUILD tracker-miners-3.4.1.ebuild 4679 BLAKE2B 760b4259af5fe25b077dcc5939007093faa0def24bdfaf8839a3948ab27ee8727608c5d14fdf4b825ed50b1a0378b4c50de819498e4be396cfe1137cef55b54a SHA512 fd723f08aaab86ae3328fc11ab9306b3e102e8ae3b9a7691ec0aeeb073d01cd326affdc3ce9f754e1cce05521093512739c011b47da88012caf94efde618f412
 MISC metadata.xml 835 BLAKE2B a7f0c667be6eaaebcd62fd782c72831f8f95f778d2ff1ee36c278fc3a902761ca10d73fd7e6b15afa83d36a960d5f20dc765b62dc6f85022db01d9d0d356bcbd SHA512 9d348dbec07ab8e344dab0d6f3acdc48e91d80171e411353b233f8b49989f4152817c8ed522c234d5dd9a3849cdab3d46f41256702a5d50bbf1e591f112cddd5
diff --git a/app-misc/tracker-miners/tracker-miners-3.3.1.ebuild b/app-misc/tracker-miners/tracker-miners-3.3.1.ebuild
deleted file mode 100644
index dfd20d7fe504..000000000000
--- a/app-misc/tracker-miners/tracker-miners-3.3.1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="3"
-IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
-
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
-RDEPEND="
-	>=dev-libs/glib-2.70:2
-	>=app-misc/tracker-3.2.0:3=
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0
-		>=media-plugins/gst-plugins-meta-1.20:1.0 )
-	!gstreamer? (
-		ffmpeg? ( media-video/ffmpeg:0= ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue:= )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	iso? ( >=sys-libs/libosinfo-0.2.10 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	pdf? ( >=app-text/poppler-0.16.0[cairo] )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	sys-libs/zlib:0
-	gif? ( media-libs/giflib:= )
-
-	networkmanager? ( net-misc/networkmanager:= )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/asciidoc
-	dev-libs/libxslt
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
-		gstreamer? (
-			media-libs/gstreamer:1.0[introspection]
-			|| (
-				media-plugins/gst-plugins-libav:1.0
-				media-plugins/gst-plugins-openh264:1.0
-			)
-		)
-	)
-"
-
-python_check_deps() {
-	python_has_version -b \
-		"dev-python/pygobject[${PYTHON_USEDEP}]" \
-		"dev-python/tappy[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
-	if use gstreamer; then
-		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
-	else
-		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
-	fi
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
-
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Dman=true
-		-Dextract=true
-		$(meson_use test functional_tests)
-		$(meson_use test tests_tap_protocol)
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=true
-		-Dicon=true
-		-Dmp3=true
-		-Dps=true
-		-Dtext=true
-		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		$(meson_feature networkmanager network_manager)
-		$(meson_feature cue)
-		$(meson_feature exif)
-		$(meson_feature gif)
-		$(meson_feature gsf)
-		$(meson_feature iptc)
-		$(meson_feature iso)
-		$(meson_feature jpeg)
-		$(meson_feature pdf)
-		$(meson_feature playlist)
-		-Dpng=enabled
-		$(meson_feature raw)
-		$(meson_feature tiff)
-		$(meson_feature xml)
-		$(meson_feature xmp)
-		$(meson_feature xps)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dgeneric_media_extractor=${media_extractor}
-		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/tracker-miners/tracker-miners-3.4.0-r1.ebuild b/app-misc/tracker-miners/tracker-miners-3.4.0-r1.ebuild
deleted file mode 100644
index de587e96a954..000000000000
--- a/app-misc/tracker-miners/tracker-miners-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="3"
-IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
-
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
-RDEPEND="
-	>=dev-libs/glib-2.70:2
-	>=app-misc/tracker-3.4.0:3
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0
-		>=media-plugins/gst-plugins-meta-1.20:1.0 )
-	!gstreamer? (
-		ffmpeg? ( media-video/ffmpeg:0= ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue:= )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	iso? ( >=sys-libs/libosinfo-1.10.0-r1 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	pdf? ( >=app-text/poppler-0.16.0:=[cairo] )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	sys-libs/zlib:0
-	gif? ( media-libs/giflib:= )
-
-	networkmanager? ( net-misc/networkmanager )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/asciidoc
-	dev-libs/libxslt
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
-		gstreamer? (
-			media-libs/gstreamer:1.0[introspection]
-			|| (
-				media-plugins/gst-plugins-libav:1.0
-				media-plugins/gst-plugins-openh264:1.0
-			)
-		)
-	)
-"
-
-python_check_deps() {
-	python_has_version -b \
-		"dev-python/pygobject[${PYTHON_USEDEP}]" \
-		"dev-python/tappy[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
-	if use gstreamer; then
-		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
-	else
-		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
-	fi
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
-
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Dman=true
-		-Dextract=true
-		$(meson_use test functional_tests)
-		$(meson_use test tests_tap_protocol)
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=true
-		-Dicon=true
-		-Dmp3=true
-		-Dps=true
-		-Dtext=true
-		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		$(meson_feature networkmanager network_manager)
-		$(meson_feature cue)
-		$(meson_feature exif)
-		$(meson_feature gif)
-		$(meson_feature gsf)
-		$(meson_feature iptc)
-		$(meson_feature iso)
-		$(meson_feature jpeg)
-		$(meson_feature pdf)
-		$(meson_feature playlist)
-		-Dpng=enabled
-		$(meson_feature raw)
-		$(meson_feature tiff)
-		$(meson_feature xml)
-		$(meson_feature xmp)
-		$(meson_feature xps)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dgeneric_media_extractor=${media_extractor}
-		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 07a866b23fff..72d677f785c8 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,8 +1,5 @@
-DIST tracker-3.3.3.tar.xz 1976160 BLAKE2B aa61b83ac499736b1cc6273813ef0bf44dae9c4a30d49f28d97205b31ead7e55021312297973cf37be67edc76bf66ca19edd746ae2269e59da406d23bcc018c7 SHA512 0f8ad998a5de6914d1e24da1b2021967339a2e637996b3e672fe4991177e69b750cdd9eb894e5e6f5f394d991b680d40afc05b95f69171ec38278e30c9729a15
 DIST tracker-3.4.0.tar.xz 1876476 BLAKE2B 9745a496df30ebcd2f7e4a525bcd047d48ec4f68e12ef9775958e01939b538832e4d2622498a8ffd358d1a404c67365c70437e083497e8c12e1cbbb0c07713f7 SHA512 0a765d93cbe737a9cf902d1dc1ca00463065c1e7b3f93a7a8132919dfed97acdf80d99cf8f49b61e1a2bfc77a115f74e88731b3b0739651d2f727215c83f077f
 DIST tracker-3.4.1.tar.xz 1865584 BLAKE2B 78a1c461e628095ca134241d7f8580806f8de018608c991644422503a3af6bab2c317859624cb811dd2907f2965af3ab2cfb1a58fa35017ed6a71b24e68f3c97 SHA512 102d61abd98feb6e39575c3df25cd4604e89106ed928b8edb1a3adc1bccd41f4ab92fc8bfd33d96b48c3b2cf5a3d901130ac6bf6f657faebe7339fffb95eed26
-EBUILD tracker-3.3.3.ebuild 2738 BLAKE2B 0905188614de0fc0fe90b33ed9dbdf0f4737efbdea78bfc3216c582bf672357bcdba311f19a8a5b4517f10674f809cf71190e38fe2275f5cfd9d946aac6a8289 SHA512 cf7ed294fb2b662995fb6cb4bca2bdcef3f4f6a8507e2584f24bb1553677d80eb32303721a07d1bfd81e405719393559244140387a9cf610ae1b57503bce56c3
-EBUILD tracker-3.4.0-r1.ebuild 2715 BLAKE2B daebd42de05e1141cbd4960d691609cb2d8492d3cf23dd05b0e681cf9c32308442c406303398dbbfbc754dea2b599198b8b6ec1d71d94026a7d45a728e040412 SHA512 d3a180bb54a0c96b2bf696676fcdf057598eaadf503d296098985c89ad0138fbde03e9d59aa51f52cc7b6c5b2332e39e37798565119055214e09c86686ce8d0d
 EBUILD tracker-3.4.0.ebuild 2712 BLAKE2B a670dc4329a3b3c405de6de8364f5320517bd4d71f40e3fe431686da348960bcfe21d1b5e1c94374b46086c103ddad7b20f6b5b1c1c44fafcf244adc345143bb SHA512 ad46724e1bc79f9020fda1dc6a2522b1776e52589750ee1a73fb8ed257901256279995628dd42be07e6ca7e8400df480e59a4adcd8ed71d298ef2399369a92d5
 EBUILD tracker-3.4.1.ebuild 2715 BLAKE2B daebd42de05e1141cbd4960d691609cb2d8492d3cf23dd05b0e681cf9c32308442c406303398dbbfbc754dea2b599198b8b6ec1d71d94026a7d45a728e040412 SHA512 d3a180bb54a0c96b2bf696676fcdf057598eaadf503d296098985c89ad0138fbde03e9d59aa51f52cc7b6c5b2332e39e37798565119055214e09c86686ce8d0d
 MISC metadata.xml 586 BLAKE2B 8244e6f8d9491a0c224ed84f17ee6ad64b22e0c373243a319e7911739a7db6223ce47693ed5b31053b4465f35d20108db1469d74afcebb36b4516a53cbd7f98a SHA512 0a60b0e4b077bb03d02b7990511041695c5dff7a8a0972fa80abe9968b643ad5c2ba65182c079e8d5f3d1ef72a2c4dcc659d6ec283bf80813135c94cab2dddef
diff --git a/app-misc/tracker/tracker-3.3.3.ebuild b/app-misc/tracker/tracker-3.3.3.ebuild
deleted file mode 100644
index d1996dbcddd8..000000000000
--- a/app-misc/tracker/tracker-3.3.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-VALA_MIN_API_VERSION="0.40"
-
-inherit bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="gtk-doc +miners stemmer test"
-RESTRICT="!test? ( test )"
-
-PV_SERIES=$(ver_cut 1-2)
-
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=sys-apps/dbus-1.3.2
-	>=dev-libs/gobject-introspection-1.54:=
-	>=dev-libs/icu-4.8.1.2:=
-	>=dev-libs/json-glib-1.4
-	>=net-libs/libsoup-2.40.1:2.4
-	>=dev-libs/libxml2-2.7
-	>=dev-db/sqlite-3.29.0
-	stemmer? ( dev-libs/snowball-stemmer:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	app-text/asciidoc
-	dev-libs/libxslt
-	$(vala_depend)
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.8
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
-	)
-	${PYTHON_DEPS}
-"
-PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b \
-		"dev-python/pygobject[${PYTHON_USEDEP}]" \
-		"dev-python/tappy[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
-
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dman=true
-		$(meson_feature stemmer)
-		-Dunicode_support=icu
-		-Dbash_completion_dir="$(get_bashcompdir)"
-		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
-		$(meson_use test tests)
-		-Dintrospection=enabled
-		-Dsoup=soup2
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/tracker/tracker-3.4.0-r1.ebuild b/app-misc/tracker/tracker-3.4.0-r1.ebuild
deleted file mode 100644
index 35fbb815057c..000000000000
--- a/app-misc/tracker/tracker-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="gtk-doc +miners stemmer test"
-RESTRICT="!test? ( test )"
-
-PV_SERIES=$(ver_cut 1-2)
-
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=sys-apps/dbus-1.3.2
-	>=dev-libs/gobject-introspection-1.54:=
-	>=dev-libs/icu-4.8.1.2:=
-	>=dev-libs/json-glib-1.4
-	>=net-libs/libsoup-2.99.2:3.0
-	>=dev-libs/libxml2-2.7
-	>=dev-db/sqlite-3.29.0:3
-	stemmer? ( dev-libs/snowball-stemmer:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	app-text/asciidoc
-	dev-libs/libxslt
-	$(vala_depend)
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.8
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
-	)
-	${PYTHON_DEPS}
-"
-PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b \
-		"dev-python/pygobject[${PYTHON_USEDEP}]" \
-		"dev-python/tappy[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
-
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dman=true
-		$(meson_feature stemmer)
-		-Dunicode_support=icu
-		-Dbash_completion_dir="$(get_bashcompdir)"
-		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
-		$(meson_use test tests)
-		-Dintrospection=enabled
-		-Dsoup=soup3
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/wayland-utils/Manifest b/app-misc/wayland-utils/Manifest
index 702c9231f060..fe7dc1dad8ec 100644
--- a/app-misc/wayland-utils/Manifest
+++ b/app-misc/wayland-utils/Manifest
@@ -1,5 +1,3 @@
 DIST wayland-utils-1.1.0.tar.bz2 14071 BLAKE2B b2726205c8d123a4543aa316928fe2909917f70bbde4318376581c1ec97f658f0d5743a7df091799ef2adce4c962e83aefdc805e25cf1af5429520eddff2918c SHA512 5cd842c286c1960c1f604287826625c23c87306e9e31daba23a65402d4ae0abd0cec4a701c8fb65af2aea6adbcb018660e646939062c51628a65dde41ebd64bf
-DIST wayland-utils-wayland-utils-1.0.0.tar.gz 13188 BLAKE2B b05917c611a54e157e31c6e83b026c0960189c36d71361e12ec6dbc33872184fb2ea30cf04a0c57ba6a9b776e5aa51baf286f092eb8780fdd6f0462c8e36ae87 SHA512 0e5886fc74bf84396facb79bfc2fcc4fa7ababc39f861fc62d198656c65dec31150bc7fd27773dfa8add421f08ad0dd43a7d72c9e8f6f5733ac34fb8212658cc
-EBUILD wayland-utils-1.0.0.ebuild 588 BLAKE2B dd9eb30959b6d87b21153093669f97e8b123fba85909701b541280a38601612f675f9b0d98b7eb30c9a605287564707a3a65e06c2c4dbe4e548752659d6d2f7b SHA512 877c480d53e85f9fa97a3ef5519df4792a7cc3c9729a7af6cc8b5867d4eae8999b977402bb182fe1c8719fa33301ec634afb126418f55a7eaa4dc8362b0e946b
 EBUILD wayland-utils-1.1.0.ebuild 666 BLAKE2B 5c81bb6ca195d973526a214ee59354f81fd2067591b8bee28166e1b5b79df3dffdb748c9d87e32d47174ddcc8abd66a68d661ae99fd69c9545ca333eb86413e0 SHA512 ae2ff2b5f2f527847501550f7529b02e38897a54c74290fb9718780c64518e3b0d9df349b4730f2abf0da7e5d3eed9df13c0518550d440ee5876f1b5295f25b7
 MISC metadata.xml 343 BLAKE2B 1245da4d0eed93c9bc6822719c23140406b752f84b3cd55c7787511164f9bffffafaf359b86e9fd14a52dc119d8e77a21cbaff3c4420348fef8a9a7c92430abe SHA512 12684765e5e7d6f51a0b77180e9c7dd354f29515026fd61621d10b65451d2cc007138b14aa3f5adb4a408f8805b866bfca331ca8083d8d1fe11a2d9f6fb1abc6
diff --git a/app-misc/wayland-utils/wayland-utils-1.0.0.ebuild b/app-misc/wayland-utils/wayland-utils-1.0.0.ebuild
deleted file mode 100644
index 90ca34a6ffba..000000000000
--- a/app-misc/wayland-utils/wayland-utils-1.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Display information about supported Wayland protocols and current compositor"
-HOMEPAGE="https://gitlab.freedesktop.org/wayland/wayland-utils"
-SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/archive/${P}/${PN}-${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND=">=dev-libs/wayland-1.17.0"
-DEPEND="${RDEPEND}
-	dev-libs/wayland-protocols
-"
-BDEPEND="dev-util/wayland-scanner"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 0bd993ca72bd..43aed33e37fa 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/endeavour/Manifest b/app-office/endeavour/Manifest
index 238471db047c..8428cf77de82 100644
--- a/app-office/endeavour/Manifest
+++ b/app-office/endeavour/Manifest
@@ -1,7 +1,4 @@
-AUX 42.0-build-Generate-enum-headers-first.patch 1889 BLAKE2B ce11acb08003adf6bc4cc240213f3134a0ce021a720e201ef18177097cc1953db3be0d3eb2509eeab4e9e4afc9c1f8e2246338442b5a089d3ff698a4394dc90a SHA512 3c7344205f9e71201affa162c9d9bd788054434975ac523f36330f3724628567dbcc6e04cceb199b847b58e03090a83316885af58ecd6702ce25c4cbb201e02c
 DIST Endeavour-43.0.tar.bz2 540310 BLAKE2B f878fa39220300838c350acf8924f1c9d9243ff201bbc478b6947ab482acf886f74fa760359994d27a26aded796d06f64718357c16013523f3c35d23c507fd5e SHA512 2fa544d07113f51e858e75608696bc0fee593237ff0c2681e52e802b08ee497faa2e04283b8e24450cc679fc520433285a949c411697f377fd95bd6e4777abbb
-DIST Endeavour-v42.0.tar.bz2 606645 BLAKE2B f9575eeaa67f837e465cbf8e8790a477c299bea12410ceda3c1f9ab5df69948087c7c8679cee5651eac828b69fe64f2b22ff759c2174f044166b94a25270668c SHA512 6312bad832f864adc3e4e01112efccb9c867b31485460791a1d1cf0d515586e7fdb7dd9dca3790201f764b72c39cff69626794f7020b4b084034fdbd0e07d94a
-EBUILD endeavour-42.0-r1.ebuild 1799 BLAKE2B b501bf977fbc447e1c6636a3646a00fa99e74abd813a6a2adf5c9cd6dab02a75cd2388006186946c0e6a1176253f9e5750b3c473012d1323e798b77c84e77278 SHA512 81d23bbc417ee486dbda6208e1d8dd48818e64392b987d1d73417e388a66f813f55c6541dba98b59a9765d927267893ab7885cd4b6503d0cbcdce05b577a900f
 EBUILD endeavour-43.0.ebuild 1461 BLAKE2B 449b466328edd44bb4f734154160f44e957c946313d1f197f8a699493eeba74811e65d2f5aa785788306b00f30495ad14049abc3e124c596a14f506978562bab SHA512 79c63a7ed0eebd54a7692e8762eeeed4bda451ff3f352017fadfc90b946ba80bf6a1533ed7a57c0e9a8f748469fc43f1012d2d717080575c78b8a4d6fcfc49dd
 EBUILD endeavour-9999.ebuild 1461 BLAKE2B 449b466328edd44bb4f734154160f44e957c946313d1f197f8a699493eeba74811e65d2f5aa785788306b00f30495ad14049abc3e124c596a14f506978562bab SHA512 79c63a7ed0eebd54a7692e8762eeeed4bda451ff3f352017fadfc90b946ba80bf6a1533ed7a57c0e9a8f748469fc43f1012d2d717080575c78b8a4d6fcfc49dd
 MISC metadata.xml 350 BLAKE2B 341539b054e9607ce3d11070534b024ecedd4a7384fc5607de9d7bfbf9f22d5c3a6eab618cd85c48682ad3ccad0c562c26da7ca9a648af9069234444fe4f9c16 SHA512 1a08468d736fbf0514a90dcb2e0ac6dec36e5683013f845e12ac501beee1f503e4f6e202f3fe1df6f80f06ef8d72015207eebd35fb7b670170d4999e6f3325fb
diff --git a/app-office/endeavour/endeavour-42.0-r1.ebuild b/app-office/endeavour/endeavour-42.0-r1.ebuild
deleted file mode 100644
index 9c8762fa09a2..000000000000
--- a/app-office/endeavour/endeavour-42.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Personal task manager"
-HOMEPAGE="https://wiki.gnome.org/Apps/Todo https://gitlab.gnome.org/World/Endeavour"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/World/Endeavour.git"
-	SRC_URI=""
-else
-	SRC_URI="https://gitlab.gnome.org/World/${PN^}/-/archive/v${PV}/${PN^}-v${PV}.tar.bz2"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN^}-v${PV}"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+introspection"
-RESTRICT="test" # Tests are broken in 42.0
-
-RDEPEND="
-	>=dev-libs/glib-2.58.0:2
-	>=gui-libs/gtk-3.92.0:4[introspection?]
-	>=gui-libs/libadwaita-1.2.0:1
-	>=net-libs/gnome-online-accounts-3.25.3:=
-	>=dev-libs/libpeas-1.17
-	dev-libs/libportal:0=[gtk]
-	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-build-Generate-enum-headers-first.patch
-)
-
-src_configure() {
-	# TODO: There aren't any consumers of the introspection outside gnome-todo's own plugins, so maybe we
-	# TODO: should just always build introspection support as an application that needs it for full functionality?
-	# Todoist plugin requires 3.25.3 GOA for being able to add a Todoist account
-	local emesonargs=(
-		$(meson_use introspection)
-		-Dtracing=false
-		-Dprofile=default
-
-		-Dtodo_txt_plugin=true
-		-Dtodoist_plugin=true
-		-Dunscheduled_panel_plugin=true
-		-Dbackground_plugin=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch b/app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch
deleted file mode 100644
index 6efa26dead2c..000000000000
--- a/app-office/endeavour/files/42.0-build-Generate-enum-headers-first.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From b492285e2a4fafad887df2c4fd2a5bdb53ce39fb Mon Sep 17 00:00:00 2001
-From: Jamie Murphy <hello@itsjamie.dev>
-Date: Fri, 5 Aug 2022 18:52:20 -0700
-Subject: [PATCH] build: Generate enum headers first
-
-Fixes #380, #398, !120, !110
----
- src/meson.build         | 38 +++++++++++++++++++-------------------
- src/plugins/meson.build |  3 ++-
- 2 files changed, 21 insertions(+), 20 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index deb410a2..8f621e78 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -16,6 +16,25 @@ vcs_identifier_h = declare_dependency(sources: vcs_tag)
- 
- endeavour_deps += vcs_identifier_h
- 
-+#########
-+# Enums #
-+#########
-+
-+enum_headers = files(
-+  join_paths('animation', 'gtd-animation-enums.h'),
-+)
-+
-+enum_types = 'gtd-enum-types'
-+
-+gtd_enum_types = gnome.mkenums(
-+  enum_types,
-+     sources: enum_headers,
-+  c_template: enum_types + '.c.template',
-+  h_template: enum_types + '.h.template'
-+)
-+
-+sources += gtd_enum_types
-+
- ###########
- # Plugins #
- ###########
-@@ -42,25 +61,6 @@ gtd_deps = endeavour_deps + [
-   plugins_dep,
- ]
- 
--
--#########
--# Enums #
--#########
--
--enum_headers = files(
--  join_paths('animation', 'gtd-animation-enums.h'),
--)
--
--enum_types = 'gtd-enum-types'
--
--sources += gnome.mkenums(
--  enum_types,
--     sources: enum_headers,
--  c_template: enum_types + '.c.template',
--  h_template: enum_types + '.h.template'
--)
--
--
- ################
- # Header files #
- ################
-diff --git a/src/plugins/meson.build b/src/plugins/meson.build
-index 3d7ac4e4..2a13aff5 100644
---- a/src/plugins/meson.build
-+++ b/src/plugins/meson.build
-@@ -3,7 +3,8 @@ plugins_incs = [
-   include_directories('..'),
- ]
- 
--plugins_sources = []
-+# Ensure enum types header is generated before building plugins
-+plugins_sources = [ gtd_enum_types[1] ]
- plugins_deps = [ endeavour_deps ]
- plugins_ldflags = []
- plugins_libs = []
--- 
-2.35.1
-
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index b9beae6c7cca..5ee76c2812ed 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,6 +1,3 @@
-AUX gnumeric-1.12.52-slibtool.patch 1489 BLAKE2B aff4a76659bbe81f178baeadea9967870e6a5c38f960bce1287951056eae038cf3c34c7f1e8f7b65aa5999ec9a1474d9e8732b89d432b68ce015dcc96d7a0c27 SHA512 805507509d8fa5702734b74f7c3004001ab3c84e22e14773025b2b53015d3b01bb8acfe7094812e5ad4fac73f8c3e04f2a1d78f99f619bf0f16607d2da0f02aa
-DIST gnumeric-1.12.52.tar.xz 18115444 BLAKE2B 6d8489c27b6f7bd0ffad7d255b606a48ca9660dd38973e4bb529d38797a3029db4a0a399e40f69c84ddf33b96d27cfc184fd079fbe16590b92e056c1a836b037 SHA512 3baa2d2c4ed5f740429454f988ea527991febf38f49df17f0d88affe501c676bae95149fb0cdb4b369ef8d32247c1f4fe4c0eeab9a60329e1332aaf9c566f868
 DIST gnumeric-1.12.53.tar.xz 18125272 BLAKE2B 6c25107977492391152c403d2ad6fef79161bc9045660090e12cdd281e5832b4f9e414a0ef5e67f93c10ca789097b510fafed712dcea5b6210f67428a2dc7dd7 SHA512 6e9d7b12f9448c75d39985984fac9880c61583fbac10ad9070f5ec7a5bd573874d79e13372d9a185616a5cdb5f53d3f67aeda6ca4bae33e3f5ca0a2160045d7b
-EBUILD gnumeric-1.12.52-r1.ebuild 2426 BLAKE2B 66ef68bfbb8151af8827d7228740d01fc20fb7a71fce21fefc0c74e21369b8a4f6d4d9c22f9ab1533e7c4ad2f904aa618cca474e11cfdb1093a878984b01ec28 SHA512 62349a143dcf081a2a8111b021994059a38761247bb6eb2261aa8b637aba1f64ea1bdecb97f40518cddc9b7ec781d47595953051304b32c060cab48ea10c0645
 EBUILD gnumeric-1.12.53-r1.ebuild 2369 BLAKE2B 5cf7c9edff4557c053fb404a3dd6cd4cf324deba4f8d08cdf22581beafde02c7cf93293f395f7a0bd782edbdcb7a96404b3d2ba902caf603854d9400bce72fcb SHA512 bbb45c6714c97df630551cdd739aa6b7ab9fff55071bfbdb1c503cad9c567dc92b0a4c051b4c0bb50efe827c43d6241d362b811062fc0b0ac405c158f49480dd
 MISC metadata.xml 627 BLAKE2B 6704cf7889bf073ee97e1af9145395462f326aa44ad6fa04f4cc4908bbde8a486518c0f11e3a9ab887835c0af862868b8a86ca29191ac1bdf179aa060c621020 SHA512 451313a3c0d62af5f647bcdce0ac76bf1948189bb70c555f6aa871245bf3ce62b0ad306c8835a7c42b24333c3e9ce449a209d3d6967e487ec061792969092107
diff --git a/app-office/gnumeric/files/gnumeric-1.12.52-slibtool.patch b/app-office/gnumeric/files/gnumeric-1.12.52-slibtool.patch
deleted file mode 100644
index 43e869afa7a9..000000000000
--- a/app-office/gnumeric/files/gnumeric-1.12.52-slibtool.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream-PR: https://gitlab.gnome.org/GNOME/gnumeric/-/merge_requests/25
-From 3031cc85718dde12a34be46330ef3b8c885f4f9e Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Tue, 10 May 2022 15:52:57 -0700
-Subject: [PATCH] plugins/excelplugins: Remove erroneous .libs
-
-The .libs directory is for internal usage by the libtool
-implementation only.
-
-When build gnumeric with slibtool instead of GNU libtool this
-will be a failure where slibtool is far more strict about user
-errors.
-
-rdlibtool: error logged in slbt_exec_link_create_dep_file(), line 1091: path not found: ../../src/.libs/.libs/libspreadsheet.a.disabled.
-
-Gentoo Bug: https://bugs.gentoo.org/791610
----
- plugins/excelplugins/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/excelplugins/Makefile.am b/plugins/excelplugins/Makefile.am
-index 3bc8f70b0..91e2fa765 100644
---- a/plugins/excelplugins/Makefile.am
-+++ b/plugins/excelplugins/Makefile.am
-@@ -7,7 +7,7 @@ gnumeric_plugin_excelpluginsdir = $(gnumeric_plugindir)/excelplugins
- xmldir = $(gnumeric_plugin_excelpluginsdir)
- gnumeric_plugin_excelplugins_LTLIBRARIES = plugin.la xlcall32.la
- plugin_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS)
--plugin_la_LIBADD = ../../src/.libs/libspreadsheet.la
-+plugin_la_LIBADD = ../../src/libspreadsheet.la
- plugin_la_SOURCES = excelplugins.c
- xlcall32_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS)
- xlcall32_la_SOURCES = xlcall32_emulation.c win32replacements.h xlcall.h
--- 
-GitLab
-
diff --git a/app-office/gnumeric/gnumeric-1.12.52-r1.ebuild b/app-office/gnumeric/gnumeric-1.12.52-r1.ebuild
deleted file mode 100644
index ab923ba2eb8f..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.52-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools gnome.org python-r1 xdg
-
-DESCRIPTION="The GNOME Spreadsheet"
-HOMEPAGE="http://www.gnumeric.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+introspection libgda perl"
-REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
-
-# Missing gnome-extra/libgnomedb required version in tree
-# but its upstream is dead and will be dropped soon.
-
-# lots of missing files, also fails tests due to 80-bit long story
-# upstream bug #721556
-RESTRICT="test"
-
-# Gnumeric has two python components
-# 1. The python loader for loading python-based plugins.
-#    This component is pure python 2 and a port "is not currently being worked on".
-# 2. The python gobject-based introspection API. This component is compatible
-#    with python 3.
-# Component 1. can only be re-enabled once someone has ported the upstream
-# codebase to python 3.
-# https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	>=dev-libs/glib-2.40.0:2
-	>=gnome-extra/libgsf-1.14.33:=
-	>=x11-libs/goffice-0.10.51:0.10[introspection?]
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24.0:=
-
-	>=x11-libs/gtk+-3.8.7:3
-	x11-libs/cairo:=[svg(+)]
-
-	introspection? (
-		${PYTHON_DEPS}
-		>=dev-libs/gobject-introspection-1:=
-	)
-	perl? ( dev-lang/perl:= )
-	libgda? ( gnome-extra/libgda:5[gtk] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/yelp-tools
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-slibtool.patch" # 791610
-)
-
-src_prepare() {
-	default
-
-	# Manage gi overrides ourselves
-	sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die
-
-	# Changed from 'elibtoolize' for bug # 791610
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--disable-schemas-compile \
-		--disable-static \
-		--without-psiconv \
-		--without-python \
-		--with-zlib \
-		$(use_with libgda gda) \
-		$(use_enable introspection) \
-		$(use_with perl)
-}
-
-src_install() {
-	default
-	dodoc HACKING MAINTAINERS
-
-	if use introspection; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
-	fi
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ba142f9c7604..c19553e78ff2 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 177a9b9e3034..0ad59bd0218e 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,7 +1,5 @@
-DIST evince-42.3.tar.xz 2856080 BLAKE2B 55711dd1869e9cce783845683093bb621b416de66f1d53f901353f6f66ff97ec80ce45e0d32e346b2b37d18285568d01ee96cfe851b09f893565d277651d837c SHA512 4ec212e90c3fd259a2afe191592c135938766b11c6891297a10dc34152f69bba9350a467c394ec6cacde5bd16ced02d0c38b7a112dd7d676f53b12fd1b29a62e
 DIST evince-43.0.tar.xz 2908508 BLAKE2B 5f1a9a697693a64c2b54ae5d5499ae8993b02f2df0b1706d0335770037285bb13e2af5254d7ff65ae4abb5a0c8ed6e338c61306f47e121de8c6546407c8968d5 SHA512 dd50ba45c4eb56f8af1df38f7a12c3c13747a1053bb97c8600d85cbc398e340d7bc5db73f441b68cfb8294ab985be361e48605cdc5e3dccb051d917869a12ba9
 DIST evince-43.1.tar.xz 2909512 BLAKE2B 1695320814aca28df17e5bbe6f4000b0191b9b600895c529d4ccd5628335fc4dd4fa788ddfe54c06fe37da12705add93f7df99a8c0dfb1060b8fd497aabae596 SHA512 c12d7b6e961a74c8e31b604f232483576289ba9e5a37faa766f4e5aaa95bdcbf37cf98c1d28de45ad1728452b0a2408fe4fe245dc76289a21e7664c96237d09f
-EBUILD evince-42.3.ebuild 2982 BLAKE2B e5c9636f07a3753ee22b51a7cc93c62d18f85358b659a03695956e1de463af926103b638734757d7312ab774a369e8006936e9692594d274366ee52354cedd05 SHA512 d513cd58ac2215971eabf20012122c6c16a85340f5e2990120913deab38342de25c5ff3ba44ecf6f0908cad97ba4a9b528a5fdf74bc222207bb5afcd760be79f
 EBUILD evince-43.0.ebuild 3009 BLAKE2B 09c8cbc5fdb100b545fbe141f2027a4a6b0147f49972cc176c65b17ff692ec45073a4c4f8468918cf8084675aa4eee6afd1ccefa67f78249f44d17fcbb0c54ed SHA512 e56cbd4d5e23d1eb6b5493f0e1f001b5b14893dc23859a8fdc61bef3d6f841258d61847b8ccc926ba255b290b8da652ee50b32cb439d88cb99972fbea02a827e
 EBUILD evince-43.1.ebuild 3064 BLAKE2B 689265e2bb4bc7a718349bd97583f0c244d082c8652eb85790c444b8771591afb1b65134bde32dd8b023e593cbdacf746b2abe69be2a1af5575bdff9a9f1e09d SHA512 6315c2512018573b65cb80952db3bdce35f2d043e1c980d88fec9621e2c7950a94beceea1f17b3ea59914e5c988eca6e8d114e7eb1db1d02484244edba721a2e
 MISC metadata.xml 874 BLAKE2B be19d36175d5ca322e89689e69b18ae720b40450ce63fa3e5056c3b0af6f81be3481050b6a005db2d79f3c86b3de1eb7fabdde3d3ce9d84fffb13b13c5c04eac SHA512 d3128343855fd9c76ee8b68b19ec61a8ec479ee48c539bce17a09770f0f5661b8b1eb9d27ab0d52aaa450131b81f237fa54e8854ca0cbb3a2f487073b7107433
diff --git a/app-text/evince/evince-42.3.ebuild b/app-text/evince/evince-42.3.ebuild
deleted file mode 100644
index b299f33dce27..000000000000
--- a/app-text/evince/evince-42.3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.44.0:2
-	>=gui-libs/libhandy-1.5.0:1=
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	>=x11-libs/gdk-pixbuf-2.40:2
-	>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-22.02.0[cairo]
-	>=app-arch/libarchive-3.6.0
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		>=app-text/libspectre-0.2:=
-		dev-libs/kpathsea:=
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-3.28.0 )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	spell? ( >=app-text/gspell-1.6.0:= )
-	tiff? ( >=media-libs/tiff-4.0:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10
-	)
-"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gi-docgen-2021.1
-		app-text/docbook-xml-dtd:4.3
-	)
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
-	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddevelopment=false
-		-Dplatform=gnome
-
-		-Dviewer=true
-		-Dpreviewer=true
-		-Dthumbnailer=true
-		$(meson_use nautilus)
-
-		-Dcomics=enabled
-		$(meson_feature djvu)
-		$(meson_feature dvi)
-		-Dpdf=enabled
-		$(meson_feature postscript ps)
-		$(meson_feature tiff)
-		$(meson_feature xps)
-
-		$(meson_use gtk-doc gtk_doc)
-		-Duser_doc=true
-		$(meson_use introspection)
-		-Ddbus=true
-		$(meson_feature gnome-keyring keyring)
-		$(meson_feature cups gtk_unix_print)
-		$(meson_feature gnome thumbnail_cache)
-		$(meson_feature gstreamer multimedia)
-		$(meson_feature spell gspell)
-
-		-Dinternal_synctex=true
-
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 73e8197d566b..f3ff3f6ffdaf 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,3 @@
-DIST gspell-1.11.1.tar.xz 432216 BLAKE2B aa6e6873fcb9cc7d3e7e05fe0abdd3b2e271c0483b7dc4d1c28179b87cea66b0fef86aa6ca94b7a571447ab70ac4ec55ac04b4b1f78415bea2db6c4f8fbc69ce SHA512 df13ef76340b3f644b517f05941c4a11f90212511229a4644cda0d605af428222bf7dd15dbdf51da80e07b7689249728f5739020349226b78d1990707f9706d9
 DIST gspell-1.12.0.tar.xz 433068 BLAKE2B 5726f40b07ee1d23a5a2e22ed012b52d6090a645b3141ecaf6a92cc850442be605ff2481a28ec87ee0d5b727b792fe2812a3e32ffd05978ed984d92b593910ec SHA512 7a9fea40c6b8298c48ee48cb6f67d66b0a950fd4d7902ffce0d2f620270614ea01b7ada0adba6778090b16f4561625aea6f39de76b743b2cd06a61a24520c549
-EBUILD gspell-1.11.1.ebuild 1519 BLAKE2B b12f98d398de58a2637682c055a02691d61fa4f8ce7d6716a1bf8bd711b7f3447d61d2e6b9e5b9d1c88713bc2c663572328aa7039a1316e64f17c51e01adbe6f SHA512 30a043c539861fc4fb9f6f36d46b553f5d3ee77a89dbea2538eea82605c28bb293972f685450527676924ff6d165ecad72c49c4237565951a4622a7ffd40cabf
 EBUILD gspell-1.12.0.ebuild 1519 BLAKE2B b12f98d398de58a2637682c055a02691d61fa4f8ce7d6716a1bf8bd711b7f3447d61d2e6b9e5b9d1c88713bc2c663572328aa7039a1316e64f17c51e01adbe6f SHA512 30a043c539861fc4fb9f6f36d46b553f5d3ee77a89dbea2538eea82605c28bb293972f685450527676924ff6d165ecad72c49c4237565951a4622a7ffd40cabf
 MISC metadata.xml 347 BLAKE2B 3b91db6ff2ea521010e0437fc23b5f69567011240291483423ec748b70cf2baba234824c41cc493f8d30106dad208b9e4b376e69ca3d8e495072b97dd2f271de SHA512 4691f9bc67d5e5372945a4aa319185c4478b58e463c9c1b853a2503c80ab7dacebc433c8ffc247d0fce9e7b2f0f03fd4e0216d27e135598efa26e2988ac7bc73
diff --git a/app-text/gspell/gspell-1.11.1.ebuild b/app-text/gspell/gspell-1.11.1.ebuild
deleted file mode 100644
index d342cb383354..000000000000
--- a/app-text/gspell/gspell-1.11.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Spell check library for GTK+ applications"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=app-text/enchant-2.1.3:2
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.20:3[introspection?]
-	dev-libs/icu:=
-	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/dbus )
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? (
-		app-text/enchant:2[hunspell]
-		|| (
-			app-dicts/myspell-en[l10n_en(+)]
-			app-dicts/myspell-en[l10n_en-US(+)]
-		)
-	)
-"
-# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
-# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
-# however a different backend like hspell or nuspell + their en_US dict might be fine too,
-# but we don't support them at this time (2020-04-12) in enchant:2
-
-src_prepare() {
-	use vala && vala_setup
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_test() {
-	virtx dbus-run-session emake check
-}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 7e883c76a86e..c139e5ab04ec 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -11,6 +11,6 @@ DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B b16abfd4d9ac8123f1be60350d6124b
 DIST mupdf-1.21.0-source.tar.gz 54753613 BLAKE2B bb531f165a9dd8af22aa6e1d65b57d7900bb5128d0c8ad235518ed0b1e446234b147fdd3937f3dd49f627ed2cfb49c4e325baf320f698adbbde68de466f61660 SHA512 a711489e236437e4e7c21373d8624118a5308941148be31cd57a0bbed708b44b1d4030aed71ccb82143159fc3a23e5524738e7fc6177058e6bdaf94a36beaf64
 EBUILD mupdf-1.19.1.ebuild 4490 BLAKE2B cf556d6ba654118ccd0316fb75f2f970cb96990f254bf3c51aee44405ad2bab8bd3f5245f5d04fd4d713d8befd8a84b62632a757ae69396e5291ac6c8cb6b57b SHA512 b1ee92e6e10373980739bed7bffb1bd658d9b3830f82fcc2b3153c5296828a50b487164e686a69de31df6ea25aa6e0925b5ff5c997ec91a6cef1851a7bff76af
 EBUILD mupdf-1.20.0.ebuild 4750 BLAKE2B 9675a86e5f8bbf05933f49d422adb3d3d246953c7abe80eab58d75946265b4e5b4b17ed3e64098bc4fa5b1b0537884263ce50a084bf4f9109bd8f217212a2541 SHA512 591df3401dee953bb51499fb754e13127e32737dcbde3d924b02d713b1de8a7736e2c1bc123c24e5fb31a530a49c7a7eab0fc47ae8b9a22aea1206bb8df07989
-EBUILD mupdf-1.20.3.ebuild 4786 BLAKE2B 4ddb5f44df212b9db68b4c309503c72e55d3275ed99ac4209424de700c66b8f8a5ca5a5d21dba0e0f3b0702c0f566a0d4d3e7a039570b24dc76c8e316ac689f5 SHA512 2ff50be16e6507c0619f15bfb9afc0bf809e675ae077f21f66c7897d4eb28888304359ec06a661fc8253d108501779d100f56631ae13c751a4f4398cea6b5cc8
+EBUILD mupdf-1.20.3.ebuild 4784 BLAKE2B bd11606b9838c88c91cf3702b8eb581ec6a4cca0308a0c8bb37f86f403e909644b48567ce985c14381123d4d0e2ccd373ee043fe6ff1051278b2aa6ddde498d6 SHA512 15e099d22871345aef9fb119c3f2f7c0c0137bd9da0e805f4ac229a77c08b11ffd0378a4bcbbf4c126e2526f1b664999a9ed9b0e624af2663651820dfd0194f7
 EBUILD mupdf-1.21.0.ebuild 4746 BLAKE2B c5b40eb54dcb18d611dd0b281be82ddce9562fcfbdd3f699b129c9fcab43004f5c17b44d939bb4797f22d91cc8fefc7cc30d011dfa29599278b15aea0f1c8d08 SHA512 8a8a204c8a41ebae97379b3c8a8ccfe2e512a3aa742043226cd9765bb24b1f1bf7b3af41a282722a88cc61ccd5dff3f3503bdaa695439506e2ed0c5662d5e761
 MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild
index 3658be0e67b6..4ae490af4eb7 100644
--- a/app-text/mupdf/mupdf-1.20.3.ebuild
+++ b/app-text/mupdf/mupdf-1.20.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86"
 IUSE="+javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 420c1abe787b..aae98ecec1d9 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 5a8aa7966bb6..373681823149 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,6 +1,8 @@
 AUX libgpr-2020-gentoo.patch 321 BLAKE2B fe3affe50712460474125d074936fd9db526c4392e6ecb8bbcb07091e9971042368ee134112d9550ffc9fd2a0ab23371e7bb760b3d8e53cd4ca0e54e0522f604 SHA512 2bcae85d30a41333664f17f097f31cf21b270c43092e823dda256098c928d4ccdab62f9d349b57f941b50bb676649aedf5f978a05f3afaf1ee234e4515c305b5
 DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
 DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a
+DIST gprbuild-23.0.0.tar.gz 952887 BLAKE2B a0de49e838dd41ca927d728dc2e7f23298bb3e7f865146ed6807e1da0f20fe9ce345d972ef93340f1a1fec91082ce14b575ad4e6642d759cb9d696602f291508 SHA512 d3b1af5295c0216eaa93e52b63ca51ceeaea324a3a3f40644e294f9048170f9294335e7e8ee2d77d99d4d9bb359267921632a01d43485d841b6e771143fb47a5
 EBUILD libgpr-2021.ebuild 1488 BLAKE2B 7c42a8634ccdf0ede450d9da5ea13cd3481679622970e55bfe9df22b1337133b77246df3761532f471ebc2afd094ffb5fd8bbcfdf0e457e30539d6f77df42953 SHA512 ae0870be62f04087987534045e327e06f8bdf12b708d32d91d537b124283ab02d476581021d086f91e39f1c08e65c17f0c2e11920bcf140a887b1d3c791eeba9
 EBUILD libgpr-22.0.0-r1.ebuild 1506 BLAKE2B 0ac889f56cb25111a3d58e1ece5b493bcf31fb3faaa6b0ad17bd6d7918ab4f166ed19fb552f57dc04ca8f7823251a2e4cd96973f2082c55ba0c8b9a387beae35 SHA512 a90e8d82e6fe71eedd41bb76e0c70a64953948aa099a1792bedf3e4fc4f0582f10668d1ab06dcf59a2268fe8d9053a5b12bbc1099f0e4a2f0b96932e2181fbc7
+EBUILD libgpr-23.0.0.ebuild 1506 BLAKE2B 0ac889f56cb25111a3d58e1ece5b493bcf31fb3faaa6b0ad17bd6d7918ab4f166ed19fb552f57dc04ca8f7823251a2e4cd96973f2082c55ba0c8b9a387beae35 SHA512 a90e8d82e6fe71eedd41bb76e0c70a64953948aa099a1792bedf3e4fc4f0582f10668d1ab06dcf59a2268fe8d9053a5b12bbc1099f0e4a2f0b96932e2181fbc7
 MISC metadata.xml 940 BLAKE2B aaa252e5e7455d29591e45927ccbefc9f7a21367af3f1da9a9341695f722dc6cfbf7f52ea6630e392439684fc8ecba06f2de6372c6624c2f53b2712533772490 SHA512 8bc90bfb6ae6ed3847b8809ef1e1d35ec8a1abf4a0b0353dac86c62c5fe5593a9523984988b723a3f9c9424285b2ab30bd45ef3b746956bc8be7751b63a35704
diff --git a/dev-ada/libgpr/libgpr-23.0.0.ebuild b/dev-ada/libgpr/libgpr-23.0.0.ebuild
new file mode 100644
index 000000000000..6fcb61de1f14
--- /dev/null
+++ b/dev-ada/libgpr/libgpr-23.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+inherit ada multiprocessing
+
+MYPN=gprbuild
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Ada library to handle GPRbuild project files"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="https://github.com/AdaCore/${MYPN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${MYP}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs static-pic"
+
+RDEPEND="dev-ada/xmlada:=[shared?,static-libs?,static-pic?,${ADA_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+REQUIRED_USE="${ADA_REQUIRED_USE}
+	|| ( shared static-libs static-pic )"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${PN}-2020-gentoo.patch )
+
+src_prepare() {
+	default
+	sed -i -e '/Library_Name/s|gpr|gnatgpr|' gpr/gpr.gpr || die
+}
+
+src_configure() {
+	emake setup
+}
+
+src_compile() {
+	build () {
+		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
+			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+}
+
+src_install() {
+	if use static-libs; then
+		emake prefix="${D}"/usr libgpr.install.static
+	fi
+	for kind in shared static-pic; do
+		if use ${kind}; then
+			emake prefix="${D}"/usr libgpr.install.${kind}
+		fi
+	done
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 71e9b6c93936..5e53145f08f1 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index f3a018d9323f..ef33361c9fd9 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,7 +1,5 @@
-DIST atkmm-2.28.2.tar.xz 689944 BLAKE2B 24a71e98af483ed5a5a0c517fecca775ad0206b972fc3906b9b002910ca07dd1d1ae1a9aa6f044231470b484d36d580d8d263ac7b8ddee668d3a0e1845bd47b0 SHA512 df20b89b603a6ae419db24b21acbd6a9d0e91c07e374b4b774f6a67581ce1581affb0d079a264f0d7f2e6d8b63210639dd7aa15e7e94fb5904d161e9a2aac286
 DIST atkmm-2.28.3.tar.xz 691164 BLAKE2B 07468f4bdf2b790873517907c4564ccd513bb28500c14b1db50bcfed0c51ca8401a95989c0c61460c905125e6d0c71560f59190c5fa38abdc2d133991d519f45 SHA512 ebc25e9de4b9de6df7097ab485fb0675d8c83113d99a444eec91df0908073362bfdaa9b03fc4c3e91766109d9b94b88df041851176ecde578cf932b526ef678e
 DIST atkmm-2.36.2.tar.xz 744596 BLAKE2B 2eee35605eee2e569eca1053f0c50449ce2a1cf44c5d29c17d00685da702f252e0eb9cd7d06ceceb0cb93dbe6848f4ea952aae621e5290aa69870a7ca2961766 SHA512 ad8ba4cb83a71c2998a600e015d1639d7d2ad39b450148ddb40ed750f3321e6932e81986cb1591ad3bcf914bcc50409c24300580b898f16408acc57a0ce2d914
-EBUILD atkmm-2.28.2-r1.ebuild 892 BLAKE2B ec6b8ade343a33b1fadf0306a7b03808946208d25f4e5d182bf8a334352ebc8c6682feca19eab533b932ecb84585848c6f369e8682fcd7df913b81b9ce16a0de SHA512 b380c9678a83b1e70dbdfff3e10edb8005fb2f66deec5e7f74341cbf7ed94b93fbe1bb41fe57d74187a9a8cae5b8acc9e39fd2ea9ec27dafe3e6bbcc90477c62
 EBUILD atkmm-2.28.3.ebuild 941 BLAKE2B 120af12ff5d663d0b58690d698aca8c1bcfbae2f2ccf9cd8be0fa279650b2ec7f9560044d0f34ebe7465ef7cf55e2163a5654cf2f4ab4f40ed17c375d23631b3 SHA512 14ed0f5d7003d1ca3befbbf62750a8cc8c63c026aee2e145ba2187b3583bd61f5933fbf5f9e21b33b3aad615db9c4fa3d62a59b0a90653a9d464d4e21dacf977
 EBUILD atkmm-2.36.2-r1.ebuild 890 BLAKE2B 0caf9dbdf8d1243955ae8f00e83b7800bf50e538ef222fe43c4f59820d2f5251bcfe313d0be855ec3169755d685d134c52989708164f43fe3a0de29d91869121 SHA512 3d65e5bb50b48516efa1d588b722edac9ffc7b77dedd327cba713dbac863427c6da750f45e000c634e3e27aca978bf78cbc044ee17db4af929ade6f605720fc3
 MISC metadata.xml 346 BLAKE2B 646d3c728888a3ee86d200f002a01e147bcbaae64fbc55f63e09bfeebfbc364b062160b2fcedae549f5e256fe2498b004e6cd42e501a58040cafde009efcc4bf SHA512 e755038a33f9933af455a04e88d1c468620461c6e959581fbe87ba278988e59f5adff6fbb099ff6d3fe2d672d57cb4d005e675842d97a78cb67b96a7bc98a6c1
diff --git a/dev-cpp/atkmm/atkmm-2.28.2-r1.ebuild b/dev-cpp/atkmm/atkmm-2.28.2-r1.ebuild
deleted file mode 100644
index feac60ef15cd..000000000000
--- a/dev-cpp/atkmm/atkmm-2.28.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org meson-multilib python-any-r1
-
-DESCRIPTION="C++ interface for the ATK library"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="gtk-doc"
-
-DEPEND="
-	>=dev-cpp/glibmm-2.46.2:2[gtk-doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.18.0[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[gtk-doc?,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool gtk-doc build-documentation)
-	)
-	meson_src_configure
-}
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index a9a56d221aa4..4f90404ca4a5 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,9 +1,5 @@
-DIST cairomm-1.14.3.tar.xz 604572 BLAKE2B a626ee20a229c4597622e7ead3320e5ff971632548488e970b877712d5579731093a14791a13416bec783e180a4f8432be1a743c7a5d77af2fdf30fa36ee3caa SHA512 8dc8a0de733904742c54d4935b596d4103f2e498c6735894bc6a5a81eb4962c6ea944bad94102b18b25850f78e948d38f117c566b197bc76da23a4e88b62ee4e
 DIST cairomm-1.14.4.tar.xz 618548 BLAKE2B 611e05b66e731d470c6d9a64c2eb4aee68aa73be5c05cb7e741e9a851ef15609cfc9fc27177531880b16517e62cf5c3f7669d4f7e7c5c78b9bc7d829e27f4d25 SHA512 9e2692837f55a2e66cd7e9d0a8033a35524df1c3186a53a9be75d71e899240dbc8959c914471e61e311812dabaf815e732142686b42fbdc75a71c05b41013d33
-DIST cairomm-1.16.1.tar.xz 580020 BLAKE2B 219e83fb328a73cc7c5801aa155156e65245fbccfb3899d98573266f78f9f489ef968fac3c8c577fa98fbdc61af6d873293783c41dd00046e5db327443bdeda2 SHA512 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757
 DIST cairomm-1.16.2.tar.xz 593504 BLAKE2B 6682604f5907f16e40dd497f07eaaca5a4dc8a0b90771a0631406817ec397c42eb1784a6cbf15094ea6d61591acf04818e1b4d64ede3383b6859668d3b445a76 SHA512 61dc639eabe8502e1262c53c92fe57c5647e5ab9931f86ed51e657df1b7d0e3e58c2571910a05236cc0dca8d52f1f693aed99a553430f14d0fb87be1832a6b62
-EBUILD cairomm-1.14.3-r1.ebuild 1060 BLAKE2B d385872c3d3e082f0d8087ff78198f12e6049cd1a380170b3802c5f9e1d60e2afa49de036f83491afc81b8f4c8278f64f342152530fcdee483861ece2f6703df SHA512 bab75baa02214cbea9a57e0a7ac988cd02bed80944fac08bd2c81d7f6e0a08a92dfd34b89665013a0660d2bbabce1eb90f7d2a1ca05af1cdc4f95aa435ef2140
 EBUILD cairomm-1.14.4.ebuild 1238 BLAKE2B bb8b062566a86cd68b2187a03597921d0bd64a72c5614ff7289560699da5abc8fde422beb728f956ec2e0d5012d51b2b65877b80146a754f20636c6635b643a7 SHA512 98cf6d6cefeed676850f9097564d97844339b745f383fcc03ffe56b5f755c73bc995a842487dd438496fde442d99bf34befdfcef32164cd8b1701e30b14e9164
-EBUILD cairomm-1.16.1-r1.ebuild 1055 BLAKE2B 22b8ea78868caa14c653e7d802b068b63918a9c5b9eb7d17dd97fd122ee2d3a82851a880ea716a2e5d6014ffe0706a5ef8905f8f6a341f8b9b89572d301fee18 SHA512 7623cb576b56afff48ab1acd0504fd7dc01037e7c4c17c67a039c0dc1d745fa416c61931318b4f831a8222cba5df7c74e99c57895c4f81fd4c08e3db18c6f767
 EBUILD cairomm-1.16.2.ebuild 1234 BLAKE2B 88b0eda798319571850446ae53f977920f3e0603a74dd2c4672cb5771cf90f3789cb9bae4bad160d66b8e2e25e958742b07d7f572d4c81fd33af26c80000e560 SHA512 263ae1e763d1774582562b83c00ca32a5e8bdf77f045c8177dc642249c03ba3f19a97f44358ff9566440500e5fdbd1fe4fd8e941b6d3ce28a68a984612ab063b
 MISC metadata.xml 354 BLAKE2B 89439085126a4fb94f11d8d498cf44b7024a82eb0296e7378f408a983f692bde88e1d9d4e53efdd2fa682524c12f441b2e30df64c600179ce07f488befa74cfc SHA512 2df4139278fd773753caf2030e0eff1c6d5e62fa509cb4196f3c2726a62395fc289b3439f762b677cc751a292302622658ccff73cdea100c77dcf2838637d06b
diff --git a/dev-cpp/cairomm/cairomm-1.14.3-r1.ebuild b/dev-cpp/cairomm/cairomm-1.14.3-r1.ebuild
deleted file mode 100644
index a01304aa8cd0..000000000000
--- a/dev-cpp/cairomm/cairomm-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson-multilib
-
-DESCRIPTION="C++ bindings for the Cairo vector graphics library"
-HOMEPAGE="https://cairographics.org/cairomm/"
-SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="gtk-doc test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.6.0:2[gtk-doc?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.0[X=,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[${MULTILIB_USEDEP}]
-		media-libs/fontconfig[${MULTILIB_USEDEP}]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool gtk-doc build-documentation)
-		-Dbuild-examples=false
-		$(meson_use test build-tests)
-		-Dboost-shared=true
-	)
-	meson_src_configure
-}
diff --git a/dev-cpp/cairomm/cairomm-1.16.1-r1.ebuild b/dev-cpp/cairomm/cairomm-1.16.1-r1.ebuild
deleted file mode 100644
index 1bde629f1fe6..000000000000
--- a/dev-cpp/cairomm/cairomm-1.16.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson-multilib
-
-DESCRIPTION="C++ bindings for the Cairo vector graphics library"
-HOMEPAGE="https://cairographics.org/cairomm/"
-SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.16"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="gtk-doc test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10[X=,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/boost[${MULTILIB_USEDEP}]
-		media-libs/fontconfig[${MULTILIB_USEDEP}]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool gtk-doc build-documentation)
-		-Dbuild-examples=false
-		$(meson_use test build-tests)
-		-Dboost-shared=true
-	)
-	meson_src_configure
-}
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index a4cbde499103..e868aac054f1 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,9 +1,5 @@
-DIST glibmm-2.66.4.tar.xz 7606108 BLAKE2B 5ff069110701d315c5d639e5efd824eb136b73fa29dc6e3fe5aead675e87b335bb2cbbbad2d9187285ce7086014aa316c07b672d88c5ba5fdaa3b8888e13af0a SHA512 9b1e0c09a11182384313ea4a7ba484ebab894528e08169a610387f207b5a7f8db9338466cd3e9eb3fa55e1c12817351ea27c39d6503208af67ba619f9d249c75
 DIST glibmm-2.66.5.tar.xz 7610516 BLAKE2B 766939ad6a5cd94bc642da7e9801ccb4f693d652ad4afcfc15b6e12a646b0d5d9c203a04328d13727f4e6c35730e7e9cc431f448618c75df305874dacaf0d7aa SHA512 3c1f91a1d91c23c5975254f5bf499f6752b6e3f1b056511133722cdfc853ffd2a94c375c0441dbb3f0933e7a257449ca4e365355ed580bd72d88c08d99a76684
-DIST glibmm-2.72.1.tar.xz 7921260 BLAKE2B 4078c2a6a12257a84844d3fa70c8b6a1a28b7c184f7bfbbf2adc882806099f7211378d6f7a23b1bbd18514ced9ada56642eb4ff877ee23cd70b4ee6b1a270510 SHA512 aa52c7b73e8f3437c2da9e8da74f84b9f07c7aa40a5fa232a7418b4af19575cbde01f6cbe9fb3fc3227bd9281a9439156a51d10a0c2c1a1beca226c7c93fe660
 DIST glibmm-2.74.0.tar.xz 7938292 BLAKE2B c089826f6a33c02d525d40bcb375249fd0aa1d238a2cce44b421389812345b57e41d93c8e6a5f37a8fa6f7800bdcc0d4da531ad0f3b3bf69b6f91ef7f9f496a8 SHA512 29c16a6c921fb135721c39b5328e0b45e09c500c65175199c1ec5ee75bdd5fb907072389c6980da3bf8fac0846235af5580f692706eb00d26947804daa1c99c9
-EBUILD glibmm-2.66.4-r1.ebuild 1313 BLAKE2B ec3f2682b3a1792884568b6d2d8d90e8391ab05bc685521206204e709c2dfb7adfeae6796e1a642080d1c89b54fb8549da8b5b5a7fda46a1365cbec0cc01659e SHA512 15dbfb645d1a15388724449131ec55cfd533ae14b93bf207a5014409ab8a0e855e2e750759ff15a49c691c94c67eaa37a7254cd96f8570498e27c22dd1e472f1
 EBUILD glibmm-2.66.5.ebuild 1313 BLAKE2B 93fd4c7bd9bc3875e039adcde1a1cd7a66e3fee2364a107a911d67292705d390f0a8fec864edb821ede3c6e483a81474c82f05dbee9b2f82d97cf820f9ea61c4 SHA512 a1c85322b2b0a591c4ca6dee058922e4cbcf75453473aa95eb2ebce919170b61f24650d8c929ad8706b8f73d278191f46e508756cade53d0d81f1619395793c6
-EBUILD glibmm-2.72.1-r1.ebuild 1229 BLAKE2B 943fe600b92dec6a39009587152105dbc9ec41bd4abbb6fcbc8f9fb58ce799b26a3597d9d2d2ead5c2274e8c787789ccbfb0426829b78e2f775abbe761c21e3e SHA512 e15e69706dd0bb900a9497667851159c2965eb37ccc0558ea1870e1c77c46398029a08daa241e56b79ed76f4c8c124254ab9ae5834b05af90ff3b3747e3e9fd9
 EBUILD glibmm-2.74.0.ebuild 1274 BLAKE2B 313f00e8b16ed2af7707d063b87c90bbd5fef1e68667e47644c11c0e20c351113a4a6b8f02511541d6ef7d6310f08191160a6693ede294ef0002b01667bd0588 SHA512 c0470ead24d080c135413bb2a40d7cc6413e10114f0b931fe97241315d16ad62188dd4fee4a95bea755b3875f39a275b533a67103a6dadaceccc2c395c520d1b
 MISC metadata.xml 347 BLAKE2B 0f49cb5cb997a9eaaf002de24fc194635c44b9ec75b7ca00dfb7157d6d65750dcdea3ae269fab353e06f80ee3cfd5a316e9ac909e90bbfb348b024ae66f460ce SHA512 6a9c01425d4df29d240bcc8ce91ce042f80ae8bddf78776bc1180beea36ad7657cf3337e7c2cdb0b560f3e146ab20a2ecf9d631f87004421cbfbd8d0dee2d558
diff --git a/dev-cpp/glibmm/glibmm-2.66.4-r1.ebuild b/dev-cpp/glibmm/glibmm-2.66.4-r1.ebuild
deleted file mode 100644
index 499f1f67901f..000000000000
--- a/dev-cpp/glibmm/glibmm-2.66.4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org meson-multilib python-any-r1
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="gtk-doc debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.61.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	gtk-doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-perl/XML-Parser
-		dev-libs/libxslt
-		media-gfx/graphviz
-	)
-"
-
-src_prepare() {
-	default
-
-	# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
-	sed -i -e '/giomm_tls_client/d' tests/meson.build || die
-
-	if ! use test; then
-		sed -i -e "/^subdir('tests')/d" meson.build || die
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dwarnings=min
-		-Dbuild-deprecated-api=true
-		$(meson_native_use_bool gtk-doc build-documentation)
-		$(meson_use debug debug-refcounting)
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
diff --git a/dev-cpp/glibmm/glibmm-2.72.1-r1.ebuild b/dev-cpp/glibmm/glibmm-2.72.1-r1.ebuild
deleted file mode 100644
index 69e4f1c99dc5..000000000000
--- a/dev-cpp/glibmm/glibmm-2.72.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org meson-multilib python-any-r1
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.68"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="gtk-doc debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.71.2:2[${MULTILIB_USEDEP}]
-	dev-libs/libsigc++:3[gtk-doc?,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	gtk-doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-"
-
-src_prepare() {
-	default
-
-	# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
-	sed -i -e '/giomm_tls_client/d' tests/meson.build || die
-
-	if ! use test; then
-		sed -i -e "/^subdir('tests')/d" meson.build || die
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dwarnings=min
-		-Dbuild-deprecated-api=true
-		$(meson_native_use_bool gtk-doc build-documentation)
-		$(meson_use debug debug-refcounting)
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 98c556a1fc24..a78d665d1d01 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,11 +1,7 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
-DIST gtkmm-3.24.6.tar.xz 13530384 BLAKE2B 74fdf054a69a483a25234d30cc8cb920a3c1c8609601802d92bf7c57fcdc468d29bedf32b34997fbcaa5f72a07e467bc68a0c87a481b071d95a3a068e9fcaac7 SHA512 d6fc2d0689baca2b968820d1af86cc0b175b6f38f720d315bc50663d30bd0a841da57ac4336abec236542fb2893b28b2de84087419b73aba58b41f07568d4d93
 DIST gtkmm-3.24.7.tar.xz 14813100 BLAKE2B a02d54fd8a9ace49acc503538f4d0df8cc12e57753c1463dfd9fb470b24c0db49733239fe4a51c3362953ceb98c546c29a302ba411cbaf060b3561a262faa081 SHA512 2ede6d77df5cbaa6ea3ee347d8b949e38512db7f5e9b36cb6f531eb259d5986f84ebfc6bb0cdaac1be4dc97e9d611515995184d245e2c0fab2cd8ebcae933a98
-DIST gtkmm-4.6.1.tar.xz 13911284 BLAKE2B a456d19a7a5146f6a4ba93a77a053318353f14152488703c77c5a5d8532b1caa074954af875559bea8739022e4ca2cda49ed6a424946362bf39c0acd94a3a69c SHA512 87867deb2b4b0e50841e42d5957f9030c31c4ec1178b71a884a84c3c3aca178100ceb011729559f8f8f761dbe241c3cf4d420cc16c5b5aedcdd1d78f582d006d
 DIST gtkmm-4.8.0.tar.xz 15898612 BLAKE2B 8263eca4df519cbf2de2da2505872b6ceec24b05b2f0d145e3980afa2a9e45fe864e7445a646d7027a6362c11355a817de0f783f5539c68ec07afd03981dc942 SHA512 9cc769ad7d0fdfd675306a441697c63164d4b5221ab895bf06800a7e47b48d2e28b09cce057bcca8e95d1b20112a809d313ae485d349f5450cf11bb4eab361a6
 EBUILD gtkmm-2.24.5-r1.ebuild 1536 BLAKE2B a2e3b097ac226e72ca62ee4f66cb6cab334de7422a4c61f45a30898df261d0ee7b7cdce4267ad1e2e1e1410e2eba6773d5c42a7374ba16f43a2bac27607b48a2 SHA512 552d38fbb89a06580a2f1ea7305357198e5d8b329aec1d0b38352f443442d489688d00c702181c30aba2708826a926092604cda8d5200065a792be623920cdf9
-EBUILD gtkmm-3.24.6-r1.ebuild 1447 BLAKE2B 32c69e044d0fb042d24912cfbff4f591fa9fabf1518eded64cbc15fb9473ba77f98eaaeaecf864a68b356d5758af1b6c6167deaf4cc93255695c621234edda35 SHA512 774f196a1cb01ff492f4db67ea7f5fc58d8246ba8826da7d010d2967e9da5e00fafdbd1365e7e300a9b9704e17e3a9f4c55b4da37aac5e22dec8c50f4b88be6e
 EBUILD gtkmm-3.24.7.ebuild 1447 BLAKE2B 07706a2d542a75dbf9d5207e2de68e483bf3c8aff00e49d75ace897e0fc0cd7d9da0a453869eef881622f882890bfda1ec82bcffc9fe626cd69d240ddb077b97 SHA512 3fb962f1c1e2baa72106d9f2c1a742ed22a89ebafe5fe356eeb9af58dc05bf48be35d4e5cb082b17f90906185b41d3f6b66681c9aee696e114be711a8de5afa0
-EBUILD gtkmm-4.6.1-r1.ebuild 1044 BLAKE2B d6c13c0a15e42c883a31e2abfc3bd5313487cad64b478af8e77e410749456d63c1069363b7476a033102b4969493cae5b0fe9fd2380b2cd563eaa44db4b9eeb9 SHA512 98e10d0238f8c91e68aae78e03b097a54397456fff06469a38306ed70b527050ef9c13ac74feae0a2313df6e967e1a2110add752cd49647a20b7f323064f01ef
 EBUILD gtkmm-4.8.0-r1.ebuild 1051 BLAKE2B 30c458971a788ed3206ae00bb5976822f0fdcc9236da612ce6bf1ca89897499b4d8e341771912d222b6008b24d195203e6e7d36861dd226a14b1d022cacee353 SHA512 ff400f9eb7da9d65ef1e50c565ca1b5798ad4f00225b7fc4e39075e147fcd51b66036e0475b06e1e1e0d879d692ae5cb065e06e89d3824988b9dd916901f0a2d
 MISC metadata.xml 346 BLAKE2B 590b61bebe118f44f4ac99d2590e6285138507599c79325441d534c727fa610f587d2c4eab35ef34f5a60f8c7f08346924c5ebcfcd74bafe704f81f3144710fd SHA512 2c4cca6bfad460aa0d0730f2e1355384be69fe30598145e4a2c22c46bbea4c3d9dbc46f863da35be01a54ad091a4b0d70e3f09b7e89013c1beb367eda0fb490d
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.6-r1.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.6-r1.ebuild
deleted file mode 100644
index 78ea992f159e..000000000000
--- a/dev-cpp/gtkmm/gtkmm-3.24.6-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org meson-multilib python-any-r1 virtualx
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/gtkmm"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="aqua gtk-doc test wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-cpp/atkmm-2.24.2:0[gtk-doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0:0[gtk-doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.54.0:2[gtk-doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/pangomm-2.38.2:1.4[gtk-doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[gtk-doc?,${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.2[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X=,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dbuild-atkmm-api=true
-		-Dbuild-demos=false
-		$(meson_native_use_bool gtk-doc build-documentation)
-		$(meson_use test build-tests)
-		$(meson_use X build-x11-api)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-cpp/gtkmm/gtkmm-4.6.1-r1.ebuild b/dev-cpp/gtkmm/gtkmm-4.6.1-r1.ebuild
deleted file mode 100644
index 020dcf1b410a..000000000000
--- a/dev-cpp/gtkmm/gtkmm-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org meson python-any-r1 virtualx
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="gtk-doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?]
-	>=gui-libs/gtk-4.6.0:4
-	>=dev-cpp/cairomm-1.15.4:1.16[gtk-doc?]
-	>=dev-cpp/pangomm-2.50.0:2.48[gtk-doc?]
-	>=x11-libs/gdk-pixbuf-2.35.5:2
-	>=media-libs/libepoxy-1.2
-"
-DEPEND="
-	${RDEPEND}
-	gtk-doc? ( dev-libs/libsigc++:3 )
-"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dbuild-demos=false
-		$(meson_use gtk-doc build-documentation)
-		$(meson_use test build-tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index 1b8a58278899..2b66ee4950e7 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,9 +1,5 @@
-DIST pangomm-2.46.2.tar.xz 674892 BLAKE2B ac86ef1a229dca29eeb41d3751128bed56d182cecfc6655a478b5a7473d10782fe98cdfee4db6f5afbfe9fb8adbf0e646004aa69c4c4058191078c7b5716434b SHA512 79cad137ec9f22e57a177332df6c6e735aa3baf81df36fc706e81e7a89f23ce3179337507388f65a0d0a74733990dc3547c50243a4559dfd0bb065b1828c0474
 DIST pangomm-2.46.3.tar.xz 674428 BLAKE2B 241b902e65ebb2cc213f479832503f07daad736e168ad7e841f3a22e8640e0365167cb29122cd1bf7080bf7b283ddb92aa71aee9731ea878a1ef26f88c3796c6 SHA512 c0925f295b372bca7b5ede28476ed00e691911e041632969e5e4c30fcf338bac069ba031d4f48601877524b90af47f5238e444e2de7501f1ff25dcda9dd9a9c8
-DIST pangomm-2.50.0.tar.xz 753592 BLAKE2B 0db7d43fe2d23e4cfc2b083a4d832c7875c63a261c6b10c62898bf428351ea7d8d05136a46f9498cdb78c51a0223ca988cbc3481041b997dc5d6a9f16f02ec91 SHA512 844850db93b8c4dab19dd364e674ee3d61b2fcb8e020ab3d314f240065ee17aeceea21e9ddc438a7d09d56410e3f82147a57425f76bb01e26d82872934269477
 DIST pangomm-2.50.1.tar.xz 754608 BLAKE2B 3581db044e95fb78e2f8e67868735d6626d052099076c9b46668a255bb8df2cbc152dbaf730bfe2a3b47610a1a4e1903d83950d303d59913d9ff123a882db772 SHA512 bffc55eedc4f278480a74afcf119b79a295bf5775123f582746ba425e19e2690d627baa9a9813b70db9e063db7efe959f365567dd7bcbc1fc862212ba8225a98
-EBUILD pangomm-2.46.2-r1.ebuild 960 BLAKE2B 8de280da99a46073829d04d4e68028ce1656d59bdffc5281d199b8f4266991e3a7c6dc25e589277e92317db8f2eb569baa93e71596e930d2e12c002e269a1bdb SHA512 56569431604c9429a72a5d84bb867a73ca83262fc35e143d458bb4ceb0b55c3b3c360b625c5eaa5a7cdc8d7096cc42af6002dbe9c6677c6314ae73fb39125b91
 EBUILD pangomm-2.46.3.ebuild 1012 BLAKE2B 770a98ee42e426ce2b8118df7cce05c8c302a5424ca91045b14530523feecf2f900d2ac0de071722949f57f27023edf8d63d6425157305c109aa6e867ea0c731 SHA512 7c8272cb697b3f3e35aa9f25a86615d2b9adca36969e30ecd211f38cb62ddd3e2c1bfe2dfa6b54e992e93e347b16b33b7bbd7258d7eb3f15841765b6651ec23c
-EBUILD pangomm-2.50.0-r1.ebuild 971 BLAKE2B bec0577c0c03350dc622ae825dfc51c67c91fec65428a5a329d89c147dd66784002f1cc7a3b3bb28ffbd92774d27bac7a87b6b8aa1cffa936d7a94c93c463ee5 SHA512 4ba4a0e684cd31f73ee8efbabe1dd2bb99ab1714865adb216588e34fbe42ab6ab6e7da02efae22baffb98f171e2cdbf58489c517704d4893cf738c838d4d0de2
 EBUILD pangomm-2.50.1.ebuild 1024 BLAKE2B c0372f54a4b4bdf4b529ac7ad740fcd4dd94982a152a3c4f55fc8ccf933a7a2f894110f6264791e547487960dce7cf75c8ff690ccd6f6840097d2ab374ab25c8 SHA512 d399e29100d990a30cb0adfabc9b06c58e9149c2ac634cd6d9f41c5ee3bfd7223624a2b32872269d08c5734dbc6876cf2f381edc4d3c072a3666f02b97ff7701
 MISC metadata.xml 348 BLAKE2B 1718eee689e97a9159c1372c9dc7509914a1cd11301fec1f13ab62234f063d123620c8dc524264851ed915cb5723b0925be33938f601d19b6b239963feeec0c2 SHA512 c74344baf34d5f2ace67d3f226bff6bdb8b4ccbd85c39345a4861b66765bfd666daa9aef1512b4e0d9c0cf3e4268b96b2d7abc92bb87be67ba304b2e4284888a
diff --git a/dev-cpp/pangomm/pangomm-2.46.2-r1.ebuild b/dev-cpp/pangomm/pangomm-2.46.2-r1.ebuild
deleted file mode 100644
index 7c0fce129665..000000000000
--- a/dev-cpp/pangomm/pangomm-2.46.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org meson-multilib python-any-r1
-
-DESCRIPTION="C++ interface for pango"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="gtk-doc"
-
-DEPEND="
-	>=dev-cpp/cairomm-1.2.2:0[gtk-doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.48.0:2[gtk-doc?,${MULTILIB_USEDEP}]
-	dev-libs/libsigc++:2[gtk-doc?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.45.1[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dmaintainer-mode=false
-		$(meson_native_use_bool gtk-doc build-documentation)
-	)
-	meson_src_configure
-}
diff --git a/dev-cpp/pangomm/pangomm-2.50.0-r1.ebuild b/dev-cpp/pangomm/pangomm-2.50.0-r1.ebuild
deleted file mode 100644
index f2daed7fcb79..000000000000
--- a/dev-cpp/pangomm/pangomm-2.50.0-r1.ebuild
+++ /dev/null
@@ -1,40 +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 meson-multilib python-any-r1
-
-DESCRIPTION="C++ interface for pango"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.48"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="gtk-doc"
-
-DEPEND="
-	>=dev-cpp/cairomm-1.16.0:1.16[gtk-doc?,${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?,${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-3:3[gtk-doc?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.49.4[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? (
-		app-doc/doxygen[dot]
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	${PYTHON_DEPS}
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dmaintainer-mode=false
-		$(meson_native_use_bool gtk-doc build-documentation)
-	)
-	meson_src_configure
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 47ff1dbd10ab..240805cd8fa4 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/nprolog/Manifest b/dev-lang/nprolog/Manifest
new file mode 100644
index 000000000000..eff892b49486
--- /dev/null
+++ b/dev-lang/nprolog/Manifest
@@ -0,0 +1,3 @@
+DIST nprolog-1.92.tar.gz 186417 BLAKE2B a71ae358d8d00bde69d435f88a5923045fc939ff8fb78cbd550e3ba47a92388b8d0fc2d03406932ea5245c000e96a1ee58dc94db71bc27241c3c55bfff4b6728 SHA512 784c766080dcee126667f5c6bf7e78cf1367031bafccb6ac01145961e56679b1a90a2cf2499676881473d4fcbe20a9e99f03a53d6958eeaa23999c3efa588110
+EBUILD nprolog-1.92.ebuild 641 BLAKE2B 75e91379662045c5f1a082d98a0749b0c3f7c3fa7bc28b406fdc8ad64c3492a494f18f719d80817cd3a8d95d4af39e7cbeec2f414353e6cb32eda3b969162e60 SHA512 3be76ac887a1b8a5bc8ab33d830f98c52bc859dcbaf77b78175688f8734aa332b1cdb42ca86065816f6df4728abf21d6e36c30bb7f0b3fdd087b10778aa963ea
+MISC metadata.xml 657 BLAKE2B 9331358542d57958385bc1218b4a1c5d38185ab0822d0cc68e51bcc5f8b00645a523a1a4f60d30188efc3ed7cb934f0a6a964d27bf0915c5956c69774c734590 SHA512 972ae4d1f2179887f77d8805f2e5482c17767e38b078fa9d9ee65a2f43e0b56b76fccd0166f4c5121de9a7cead4faa7683bd8e9076c257ffb2d1deb673eb276e
diff --git a/dev-lang/nprolog/metadata.xml b/dev-lang/nprolog/metadata.xml
new file mode 100644
index 000000000000..576d9f408128
--- /dev/null
+++ b/dev-lang/nprolog/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <longdescription>
+    N-Prolog(NPL) is an interpreter and compiler to be compatible with
+    Arity/Prolog32. N-Prolog is NOT ISO-Prolog. About Arity/prolog32 see
+    http://petergabel.info/ArityProlog32/ArityProlog32PredList/
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/sasagawa888/nprolog/issues</bugs-to>
+    <remote-id type="github">sasagawa888/nprolog</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-lang/nprolog/nprolog-1.92.ebuild b/dev-lang/nprolog/nprolog-1.92.ebuild
new file mode 100644
index 000000000000..98dfe542444d
--- /dev/null
+++ b/dev-lang/nprolog/nprolog-1.92.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter and compiler to be compatible with Arity/Prolog32"
+HOMEPAGE="https://github.com/sasagawa888/nprolog/"
+SRC_URI="https://github.com/sasagawa888/nprolog/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README{,-ja}.md document )
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBS="-lm -ldl ${LDFLAGS}"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe npl
+
+	insinto /usr/share/${PN}
+	doins -r example library
+
+	einstalldocs
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 84fcc0f28156..4b52ea4624ae 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 8d18ca6a29c8..1f5d874cc609 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,7 +1,5 @@
 DIST gjs-1.72.2.tar.xz 620380 BLAKE2B 5ea15bdf25c36fa0236f03adea5b2261db3923190005754119eacd070830e7baedfa842ab273219055f67f7af535d31d5844c76eddfb03a8ec1cab57297ec258 SHA512 0dd10f40e8811bbb79c541cf3dc4e3759c0e025485e4b8ad2870dc30ac8030573300bc178c78bf2d396b86733e36b33210bfbdeead6a314e592d5b3c250a16a2
-DIST gjs-1.74.0.tar.xz 638064 BLAKE2B d44f323aef9b696c7dab53fb46d6bbf142f83636bff81fe68bd30f1f897a778836d7a388c946cb86e84df15b3908d8ff14f0d994854eb2dce7af2c4e54da299b SHA512 a17947664a2bb83363ec564dcb5e619f241d0b547512042f2c0e49fbbc8ca4217b90e6b22bc2e4004e8f27e013f8520674a493f7cf3b808437b855eee3eb0408
 DIST gjs-1.74.1.tar.xz 638536 BLAKE2B 375abcaa20a538cfa271f7dcf6f3715e4324ff5a4a9482ce0dd7f78213598a715ebc034f701fe458876f841f72802db4ae2aabf0abc04dc4ac5bb39c917741fd SHA512 346667accb589df0e6a045e30782017eab928115f263d36d521b61b0af38fd268bc518b8ab5ec78e5d25e0194b744a2ee59e65668da679e138b2122858ce0614
 EBUILD gjs-1.72.2-r1.ebuild 1928 BLAKE2B dc02cffd8627c6d0c0a2f92e181699832ffb7516e72c73afe5063a1550f625f7d4071ce556647e0f9ed2f88c33cdea9404f0d0ebee73837cb16afd4efd0f3c6f SHA512 2b396a9d78a2043b04074e3de859cc854c01071971b346ed6521531c082c42b2fe9b034b0a298139e26e522cafb77c36051ac1449d7b10bf99ef842d55908420
-EBUILD gjs-1.74.0.ebuild 1966 BLAKE2B 89acc810190e14d8404093c53f04c386a3d805d5f25d73cd36645c674c29901172023cf1fd94386a09e56c1ed9b16f5749cf1bf209006ee7dcbe67f312cde6c9 SHA512 0e8f0f701841abbbf127e9c948ff3d4c38a7fb5bf1122d2057f10eae1bd59262fc96c6e5adaa41e199dea07dbf465f8ef12eecd1939a8f1c07eda80f64f958cc
 EBUILD gjs-1.74.1.ebuild 1966 BLAKE2B 89acc810190e14d8404093c53f04c386a3d805d5f25d73cd36645c674c29901172023cf1fd94386a09e56c1ed9b16f5749cf1bf209006ee7dcbe67f312cde6c9 SHA512 0e8f0f701841abbbf127e9c948ff3d4c38a7fb5bf1122d2057f10eae1bd59262fc96c6e5adaa41e199dea07dbf465f8ef12eecd1939a8f1c07eda80f64f958cc
 MISC metadata.xml 473 BLAKE2B 0d57ec402b3daaa00af170335374e711150ecccd019aea100484079a055015f36119c4564ae2d95e82e4ac8d6de6d84b83379aedfdcbfb7aaabaa752b51d8203 SHA512 a4f99ef450b30c381845a774865b4e82b2a554cc7f0a2edba7002096563943b58b290f704210cc00ca0508cf6e81a11be2fa0c6402117d2b05f0e4eb2e03a0c2
diff --git a/dev-libs/gjs/gjs-1.74.0.ebuild b/dev-libs/gjs/gjs-1.74.0.ebuild
deleted file mode 100644
index 5d158cb1470d..000000000000
--- a/dev-libs/gjs/gjs-1.74.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples readline sysprof test"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0:2
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.66.1:=
-	>=dev-lang/spidermonkey-102.2.0:102
-	cairo? ( x11-libs/cairo[X,glib] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? (
-		sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	append-cppflags -DG_DISABLE_CAST_CHECKS
-
-	# On musl, it's required that either gjs, pixman or gnome-shell to be built
-	# with a larger stack otherwise librsvg fails to render a particular SVG, as
-	# a result we fail to get gdm or gnome-shell running (greeted with a fail
-	# whale screen). The bug has been reported to librsvg. This is ideally just
-	# a temporary workaround until we understand what exactly needs a larger
-	# stack size, as it's not sufficient to do just librsvg.
-	#
-	# Please refer to:
-	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
-	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
-	#
-	# TODO: Find an actual fix instead of increasing the stack
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-		-Db_pch=True # TODO this has to go
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 86195f6fbf24..a20dab4db462 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,9 +1,7 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
 AUX glib-2.74.1-gnome-keyring-cpu.patch 3930 BLAKE2B 3da62efaa538e4685475b730626b9d76777874908340a55244e83cd70eaf6b731b5c363155b12db20c6fcf3a7692db047ca6cba65ac03f6c7f2b894af7da2ee8 SHA512 662d12afab80fb3d4af854d0ad1b477cfd27194ea86cbf5ad254a2997381d4eb327554a25d8a397b948c38011aa85d026d8ee477ce959553d292330fa01dd318
-DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
 DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b
-EBUILD glib-2.72.3.ebuild 10244 BLAKE2B 3f37fd728f89fabc8bba3a09946a069cf3220d14637089300cac575a1fafc667d9e04a4592552db64db2144c80f9ae697f0597a5110175cdb0fb3c74e95d71e2 SHA512 ad314b8967042ad94110d0c582bb08bdb4df84dbef60f6184223604abdaf311fe1eb056103df0ec19d7fda010b8e90f2054df86ca817f451e0dc6e6b695a530f
 EBUILD glib-2.74.1-r1.ebuild 10172 BLAKE2B 0920ab3c5ac1187ac6c31c6b9531fe7f5f0b4027a9f084f8620d4a0579b07baa10cf9f93fcc16bea2362bd7b43a25e67e77225702d1e2a35dc47b63e2bbe5b17 SHA512 1644fdff2f7031251b0f5b9e9d71f4ef522660fefcf9c963be73f911b9a283c7448657fc68f5dc679658861cb33c63ba5c0bd4785ecedee1429220e415e5fdb6
 EBUILD glib-2.74.3-r1.ebuild 10215 BLAKE2B b1ec264b5e77c633dc44348a27df0e5fcb6dc7d2fd01f2f37245f3033de46b176d7a1cc8992c17d39e91a497d7e3126d9e2231cfae1424544b64a2b26adde9fa SHA512 49b67bd553b6aecc82545a191add65276dff5aebf06915b5ad43baccd287d97ab3aa68f2cb280a0fc5f3079d70e9c2181d38ac725e4f1114c75f79048e07d637
 MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b
diff --git a/dev-libs/glib/glib-2.72.3.ebuild b/dev-libs/glib/glib-2.72.3.ebuild
deleted file mode 100644
index 68cfcda45393..000000000000
--- a/dev-libs/glib/glib-2.72.3.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	elf? ( virtual/libelf:0= )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.33
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	default
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=enabled # only used if host_system == 'linux'
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		$(meson_feature sysprof)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use fam)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-		$(meson_native_use_feature elf libelf)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	export TZ=UTC
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# https://bugs.gentoo.org/839807
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /usr/b
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "2.63.6"; then
-			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
-			ewarn "to restart your session for \"Open With\" dialogs to work."
-		fi
-	done
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 529f26c0a107..d3d27654cb2d 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,3 @@
-DIST gobject-introspection-1.72.0.tar.xz 1040936 BLAKE2B fd7600a927e57d5a076c203a084afe56a738d3a93109055be7bee22a96d6d5b08892300260288e5b83f883e54ca658cb24ef5c862abe435820c963bbf0cf8496 SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5
 DIST gobject-introspection-1.74.0.tar.xz 1044008 BLAKE2B 223bb9b8b452f03945f941086e47fb3b14f03f8353f4f903b21e3f494af728652a44de986752374057e90dd8111f21f5b0cd3e00bb0a8c3aa25c8261bb0b9247 SHA512 decff5dda0ec5ec0afda4d6bcd3bdadcbf34289002c0d9c0c77ecf8c5d3f15d196b24d8035041545031006acbdfe76af47c42da061c40e200c87f2c74cd301f0
-EBUILD gobject-introspection-common-1.72.0.ebuild 941 BLAKE2B 1c9d73d3088e7683201955c6b3211088f3811e6bc6788b3538a68eb8abb3bfb0b13219949b801ec7ca2f82e88e14031f891a83f7f446a1a33cf4895fc3af0b25 SHA512 2403f9f4863914f57f2cd4a9fc84911cf8c3a1121d56ab116c44662538c63de1248565b51833089d36dc8d47906b7de9e8b6774b4021e45b3055c41d2da891cf
 EBUILD gobject-introspection-common-1.74.0.ebuild 933 BLAKE2B fa5cd3f41118b786d1f70e05b37f5b3c8923c3216ac2eb14f5151278d0020e41b5f22b52aeff3dc14e7f5aa231529cc6680fa5f981d0d2513c2f2bb1d2ab5717 SHA512 21f2c5f753090a79f64dd080eb9f23616750cf89c38b68a686b8ab7e01ab06d5a211851088f2d00ab3c2032f2dcf363e92f08d108560b1a31051170c9594d883
 MISC metadata.xml 362 BLAKE2B 18f3d214e624758a552818e8c02cebcaf9340d5201cb23c6999c36247f969b65c912de4515101acdc0862338d697a510b15182b904dca7f4a7ae12e3c1b188b9 SHA512 f08d8077b802b7c95433d8e4e31d89183b072306ebf16570977f65339641c29a1917dc3c869d5268bd3a9ebba5537ed15623183a7dada64f811943a16bab676b
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild
deleted file mode 100644
index f41423be2976..000000000000
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="gobject-introspection"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
-# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
-# https://forums.gentoo.org/viewtopic-p-7421930.html
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins m4/introspection.m4
-
-	insinto /usr/share/gobject-introspection-1.0
-	doins Makefile.introspection
-}
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 350b86e950a3..93a42640ddbb 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,3 @@
-DIST gobject-introspection-1.72.0.tar.xz 1040936 BLAKE2B fd7600a927e57d5a076c203a084afe56a738d3a93109055be7bee22a96d6d5b08892300260288e5b83f883e54ca658cb24ef5c862abe435820c963bbf0cf8496 SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5
 DIST gobject-introspection-1.74.0.tar.xz 1044008 BLAKE2B 223bb9b8b452f03945f941086e47fb3b14f03f8353f4f903b21e3f494af728652a44de986752374057e90dd8111f21f5b0cd3e00bb0a8c3aa25c8261bb0b9247 SHA512 decff5dda0ec5ec0afda4d6bcd3bdadcbf34289002c0d9c0c77ecf8c5d3f15d196b24d8035041545031006acbdfe76af47c42da061c40e200c87f2c74cd301f0
-EBUILD gobject-introspection-1.72.0.ebuild 1999 BLAKE2B f1546bd879824199024c3b003d1d254ef2672024020f38405f66e8e9f9e5b1ecd3ba63e0fda08efff73141b09ae7e9a71178e6e07497a1f20b8989eed873bd1d SHA512 811556d6c7e5bb912deade744dccf7d0bbab1f633ddcac78ecae7cc9070f9579880f005f6089d294d35b34efce539037786dd47b16de3d68772faa1e3c573423
 EBUILD gobject-introspection-1.74.0.ebuild 1999 BLAKE2B c3c2885aa752d98122e5bfdde34c680aee44fad80019954cd63f7f0e006029d02467e54573d00a257a3b17c285d8a4e59a873cb82b4c756e5dcd9dad19d5863c SHA512 187f2b20a95f9ac4fed01233e402a444f473fa8876d00f9e845fbfc02a5c9d3a6b77f1fbc636fe90816ac560473e17feb3f63f5b229234f099b2caaa72938c48
 MISC metadata.xml 485 BLAKE2B 6ecc9396bcb29a8365be4058592c307ddcb0cc16ab56723ca32a378b5608b86378ab291345a6a3ccbe8225c6ffc91b6ba1e2996b5b0d1f4271d0757bf376ef8e SHA512 43a479854b1d5783c028ecfd8357a632db089f95de9e703608de7f229a37beee5e43781ff3f68b2dfa9bceac1355597373d31d209fdea0301917be5fbe7e7fbe
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
deleted file mode 100644
index c727c75006f8..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="doctool gtk-doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.58.0:2
-	dev-libs/libffi:=
-	doctool? (
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-# Wants real bison, not app-alternatives/yacc
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.19
-		app-text/docbook-xml-dtd:4.3
-		app-text/docbook-xml-dtd:4.5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	test? (
-		x11-libs/cairo[glib]
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature test cairo)
-		$(meson_feature doctool)
-		#-Dglib_src_dir
-		$(meson_use gtk-doc gtk_doc)
-		#-Dcairo_libname
-		-Dpython="${EPYTHON}"
-		#-Dgir_dir_prefix
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
-		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"/usr/share/aclocal || die
-}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 40adf43758bb..ef7fbf1dea5d 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,4 @@
-DIST libevdev-1.12.1.tar.xz 446476 BLAKE2B 3b73c50b5e0bdf6dac001c7e34338ece2ba796af711d8f6f9c2928f93a8f41ee484e067c3cb02878de49d631de87229d4b1a377123e385af5997e11f7c556510 SHA512 eefce287a665e4f89eb2e0437dfefd45ecf8925c7dac35a1bdd46158541f77f2032c6146900a30a01321751d55a9b537bd1d61777cca9cfa02c39a6e31c97be4
 DIST libevdev-1.13.0.tar.xz 451328 BLAKE2B 07b15bf46ca3b01d9a93da8d93fd60b2f1eb95961f0f202a321030e145528453375f1e4fa3458adac3f3346cc26642538251b35002f18f9802799e4732d39f3e SHA512 f30f14c44ef4d4829625aa4c28f10555f333905486f9d39c18cd3ca35e87128a0c24c1bc18ca37b6bf98bc8f7fad27e1bc68678a58e6e6fff3b8d99502ac6905
-EBUILD libevdev-1.12.1.ebuild 1124 BLAKE2B b39700425b4711359fb8e0f05f5473420ce3ad87eacd8cbeaf40c605c2c8a5853df8b60f137dbed41db5f9c401b2336835bf78af074676891c97f2461434e563 SHA512 f86f50f39388d35606ead66f16594f2bcf3c4de27649cc956b11f59bb61636b593f44aede81c4cda16b854c9d128874071df69e4afa573e87679c7bd450e9ab9
 EBUILD libevdev-1.13.0.ebuild 1124 BLAKE2B b39700425b4711359fb8e0f05f5473420ce3ad87eacd8cbeaf40c605c2c8a5853df8b60f137dbed41db5f9c401b2336835bf78af074676891c97f2461434e563 SHA512 f86f50f39388d35606ead66f16594f2bcf3c4de27649cc956b11f59bb61636b593f44aede81c4cda16b854c9d128874071df69e4afa573e87679c7bd450e9ab9
 EBUILD libevdev-9999.ebuild 1119 BLAKE2B dde6bf4c9c7fd7ff688237ec8a793d9d2303a0e78178cb79839ec0332e7a1ad3a3e139ca285b92bf55e7aef054953d58e4c8b360b99adf7af04cf36783019281 SHA512 26c9e626570a80ba6e0ba5b59932830fd4cc7817f0f2dc0f7bd6c8635c71dd1fd9f923623b4bf9d39e3f64d882187fceb4fbe4be46468589c2f85e80b857bf8c
 MISC metadata.xml 339 BLAKE2B 17485a5a6202c366cf975f0c34aeb9521d5190f2ada003bdcae8c3e561740b3b43809b177baa2cab87de46e2f234b48df5bfa6c8df5dc2674f95e6206f0e4398 SHA512 26ff955c224a24cd58bf4eed14d99a0b7cf1b078e0d93bbd115a9193656180f112cb0f27bc6d35b2ff2e062a58775fc4b4310d6ffeee322b39963143f079b3b8
diff --git a/dev-libs/libevdev/libevdev-1.12.1.ebuild b/dev-libs/libevdev/libevdev-1.12.1.ebuild
deleted file mode 100644
index 055511866150..000000000000
--- a/dev-libs/libevdev/libevdev-1.12.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit meson-multilib python-any-r1
-
-DESCRIPTION="Handler library for evdev events"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-
-DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		local HTML_DOCS=( doc/html/. )
-		einstalldocs
-	fi
-}
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index a88baf886f64..800773519df5 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,5 +1,3 @@
-DIST libgee-0.20.5.tar.xz 687440 BLAKE2B 0f9c1d42c28a080ed66a4ad4ab7e84bf4489e936a5b800a435dfd5a0d812d2ca9a47eacab28fca8862c4dfa57dab6595ddf7a0ff6955150b58c12fef77c5a26a SHA512 64d498c5323c4c0978391a01fb3a36e9a00ef9d5dc8e95e3b2dc9cc33f6ad55ec1096e18629c5cad9539b083c42917d91d068824dac4d06f53ef9a682cccc8a9
 DIST libgee-0.20.6.tar.xz 690436 BLAKE2B cdb88719e0e1bceccefd6a824823e6e514bf1f4d6b8cf5330d6d83f781649312b23554c7dfc4a6b4eeb3bbcd81ca42843666d596b85634ff95fc90e90fea44bd SHA512 05176b221274b2a0512b018b93ae730ca750482bbc7a4951376eb868c0a388950371e80a438b5af792ebe4a64b6a38e0c94ca52ebd0fc4539f0fe233e0be5903
-EBUILD libgee-0.20.5.ebuild 691 BLAKE2B 17c1bdbcdb7508eaf45dac55faaee82f6d355dba639c570d0eefbd1e9a1460c9ae92f334061589b1e03ee068a2d5ea9ed252d5ac8b7937b03abc575f23dafa2f SHA512 ece4dbd537013793cb28c2f209acd150182e6757f508fbe0f8a01c1aca4c7c5ae3152ec8551059b49db517d9c5520883f81978969cda9f9294f59df8af62c392
 EBUILD libgee-0.20.6.ebuild 691 BLAKE2B 17c1bdbcdb7508eaf45dac55faaee82f6d355dba639c570d0eefbd1e9a1460c9ae92f334061589b1e03ee068a2d5ea9ed252d5ac8b7937b03abc575f23dafa2f SHA512 ece4dbd537013793cb28c2f209acd150182e6757f508fbe0f8a01c1aca4c7c5ae3152ec8551059b49db517d9c5520883f81978969cda9f9294f59df8af62c392
 MISC metadata.xml 347 BLAKE2B c0d6f55760dc3a10dca3c4d56e1833da7bb94a048d5f1c44c4275685b441eeea003e0a858a0544d720b165e8ed0c9162dffe205b9a526b40fb428caa275899ad SHA512 93d4276fb984fb4bfd9959ceb26b88acaffdec1da9e8c4b6fe62a0c5abbfb89b1707de6d392e026d23846feb17147d3ca6baaa336cd3127747c92d778467120f
diff --git a/dev-libs/libgee/libgee-0.20.5.ebuild b/dev-libs/libgee/libgee-0.20.5.ebuild
deleted file mode 100644
index 92d774e85027..000000000000
--- a/dev-libs/libgee/libgee-0.20.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2
-
-DESCRIPTION="GObject-based interfaces and classes for commonly used data structures"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.8/2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x86-linux"
-IUSE="+introspection"
-
-# FIXME: add doc support, requires valadoc
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		VALAC="$(type -P false)"
-}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 5290fd9b4c2f..40a8d1d3e352 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,3 @@
-DIST libgit2-1.3.2.tar.gz 5824473 BLAKE2B 521512721d5959274898046e4341e000c3d0bb28cffde9c1c5f9640f73c74fb3b5330a2329b57a92490acd93f6b59f9b53d9940b50a1056c15f52632db9fdfe6 SHA512 580ad6f3e2cb992014d7fecef4d834dd0fda169c4439ec5d566322edb457b2173910b25a49ba50d5bd05518ad771ee2f42e47ab48ce417c297b6a93dd0cb502d
 DIST libgit2-1.5.0.tar.gz 5893437 BLAKE2B 4108de0e8fc6a02e4172f47cb69cdfe8c85a0a72235432ca58b02d94e0bcb8390caf0c710060772551cc3a392291778ae14b561256c6d88058d0ae5a277f2fbf SHA512 7a32b27cd32bd03ce7be6c127317f82a4ac6f16615c3234699676781f4858d057edb0410b2fe36fd2e634b00748a8b0be17f23809e09a7602ba48185134300f7
-EBUILD libgit2-1.3.2.ebuild 1698 BLAKE2B 2dc3632795ce43e35c4f8f0d8b0a9e6eece80299c6c6cae21f7a6c8fedfc9c2da3021b97495968a17b966f90bbf48072a79c39757e4adf37aa25999a9f2aad7d SHA512 0ac8c62508780fecccf0052c8545afa9fd49dc8ec908cf83ebb064f1257330009fb728c11d7f7bb19b6c59d457b526ed919dd9b1375f8b33e1945d8d8d4d7989
 EBUILD libgit2-1.5.0.ebuild 1680 BLAKE2B d34ea8d31dbe11ba71e5c7c53d6a9ec4878a9c31219ed48590a414163b0a5c28cd59e2c1d737c734301543994a3d0fa056f300bfa621650cc7c7b981ba29f4d7 SHA512 fd594dacec7a5d1d5717dd6248b81472a019f439e447c68a602fedc0c20d3d86ec9069f8cb18b80069424d1bc3e8881530b60cff424fac52aa2c6e8a016a2d5c
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.3.2.ebuild b/dev-libs/libgit2/libgit2-1.3.2.ebuild
deleted file mode 100644
index 6b1791d917a0..000000000000
--- a/dev-libs/libgit2/libgit2-1.3.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake python-any-r1
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.org/"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-S=${WORKDIR}/${P/_/-}
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
-IUSE="examples gssapi +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libpcre:=
-	net-libs/http-parser:=
-	sys-libs/zlib
-	dev-libs/openssl:0=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	cmake_src_prepare
-	# relying on forked http-parser to support some obscure URI form
-	sed -i -e '/empty_port/s:test:_&:' tests/network/url/parse.c || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace ON OFF)
-		-DUSE_GSSAPI=$(usex gssapi ON OFF)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-		-DUSE_HTTP_PARSER=system
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake_src_test -R offline
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	dodoc docs/*.{md,txt}
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 90dcc1f6f924..e6b4b442d87f 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,7 +1,3 @@
-DIST libgusb-0.3.10.tar.xz 42972 BLAKE2B 4c49aa15cbbbb56d5ee5b896adb3e34b45332cd846933fd3aa86a645e7d897418d0e7a30d9972980e6527f1e60fc6e579f5df119708a12b3e504ff695c94d922 SHA512 66bd7c292cb9df2799b02acd48dc4b07794e7339ea1bd6473ea512dfec1b8e7e58abbd40f16a2a4805240cc8df4aec050335edb4f4178ad12ac5275438b8ae59
-DIST libgusb-0.4.1.tar.xz 50384 BLAKE2B e6613758bb24710ce8326e12a6fb6a8708135c0c826a7b8f87fa95df5dba04bf5155c2daf42713d5f74478ca457f795c2f553acbdef1a8b1df0019f7832b019f SHA512 de0a74d75b00699e6b113c0ec334f7385e892317b2814047f7990fed361d78d6acdb2148ded9e602cf3537ff87e8c10017da2315923db4cb3f5c29f75418e9b8
 DIST libgusb-0.4.2.tar.xz 48440 BLAKE2B 6241271efe40a8653e417ffcbd9b7ba0463c5a1e289a39fb8aab6b6c70da75973af1bcb8afba0a6c3a1535a7015e7d0f121f22ca1dddcd74d57722af3c95c312 SHA512 c3e8e7a21f1e2f355cda5dddbde7235f9c48d4ff96c2d012e48df5bd7e1216ed41f3cc81f4a215ceead8b6e8cf0d04a85916043adfd074e543c041dbe63acd48
-EBUILD libgusb-0.3.10.ebuild 1519 BLAKE2B 63ca13cf5c6fca4a3654de2f41603a384248c5479a5fd54b25cddf5823c97be152d6b25e63ea8c29cda59738893a494083788d6f25a7e6dad6f7a32095668c72 SHA512 c19ec7712e2a532dba2b640ef9bb2e0d371a4de265ed8e5c12f23527f7300fa95a3d79e9d0b149560b51712b2596bc1a4ce3645906553f3e6edabadc35260b64
-EBUILD libgusb-0.4.1.ebuild 1735 BLAKE2B 5de8136b4e342d9283de839739a5f402d5050a840e31c847d540ce113356411ee168808a66c6c5da9017c3a365acb84ef22176253eb92b9cc2c784f42b52316f SHA512 865edaed1f11cabf1d49ec679ed3a4b4d11c28ce9c6943650aeffd9d293c9e4a805b24e009fb5444120a9ed80fc76c3bf13670bc58ababf8ff19ef0126d13d96
 EBUILD libgusb-0.4.2.ebuild 1743 BLAKE2B 55b372aaae59205856d62acdca7e478ea9fe49f9491e2a341e98fe847dc6f7be6158015b6ec85b9b9a0c3f256d551add749fbe0e2df4bc03683d868dccb4b00a SHA512 98ce48128978655573db994b92eabafc0b9da78a7574cd970fd9264508b914998e72934dcf104d6ea4570dda10501b7208993b93361515c95b3f307d969ee70c
 MISC metadata.xml 344 BLAKE2B bd362d7e89ba2d88c2f220ab47593b4ae25bc4ca486bdafda16448407213d7558d7ea807c489e5aafbb8ec83a40e8e339c8ba20d3bfc3957da33a7e7711c6898 SHA512 93166c6dd4d764901c87fc567ab1c67add1c654b7ea1f3326e7144d5c14789bdee2a1e37874f8b6158136e03363372bf1d972f49f96095b0e3e568af89c4af34
diff --git a/dev-libs/libgusb/libgusb-0.3.10.ebuild b/dev-libs/libgusb/libgusb-0.3.10.ebuild
deleted file mode 100644
index 29e94cb87a56..000000000000
--- a/dev-libs/libgusb/libgusb-0.3.10.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson-multilib python-any-r1 vala
-
-DESCRIPTION="GObject wrapper for libusb"
-HOMEPAGE="https://github.com/hughsie/libgusb"
-SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-
-IUSE="gtk-doc +introspection static-libs test +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
-	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	sys-apps/hwdata
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4
-		dev-util/gtk-doc
-	)
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	default
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_use test tests)
-		$(meson_native_use_bool vala vapi)
-		-Dusb_ids="${EPREFIX}"/usr/share/hwdata/usb.ids
-		$(meson_native_use_bool gtk-doc docs)
-		$(meson_native_use_bool introspection)
-
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libgusb/libgusb-0.4.1.ebuild b/dev-libs/libgusb/libgusb-0.4.1.ebuild
deleted file mode 100644
index ae1b186b47a5..000000000000
--- a/dev-libs/libgusb/libgusb-0.4.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson-multilib python-any-r1 vala
-
-DESCRIPTION="GObject wrapper for libusb"
-HOMEPAGE="https://github.com/hughsie/libgusb"
-SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="gtk-doc +introspection test +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
-	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
-	>=dev-libs/json-glib-1.1.1[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	sys-apps/hwdata
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/umockdev-0.17.7[${MULTILIB_USEDEP}] )"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-	gtk-doc? ( dev-util/gi-docgen )
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library=shared
-		$(meson_use test tests)
-		$(meson_native_use_bool vala vapi)
-		-Dusb_ids="${EPREFIX}"/usr/share/hwdata/usb.ids
-		$(meson_native_use_bool gtk-doc docs)
-		$(meson_native_use_bool introspection)
-		$(meson_feature test umockdev)
-
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
-		mv "${ED}"/usr/share/{doc,gtk-doc}/libgusb || die
-	fi
-}
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 247bcd1f0493..4c1ca3b3a422 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,7 +1,4 @@
 AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a49d916fcce84965c84490253c1a30e729b21eb528b3a6397cab9bb372b9afeb22bed05e278048734bc4 SHA512 d8939b9a21b838db8e34ddfba7f54f17e88c4387cc3baa15f4df6386180677b419bb9989cecd8e0757442a45bc04f83bef06df5a8df86c17f6812a41044a7eb7
-AUX 1.32.0-meson-Fix-disabling-gtk_doc.patch 862 BLAKE2B c03eba757dd14ec5d4812bc9e735dd3d3a8aa25dc2497b286b50f00dbbd282de7ea6616105b6d1ea525e13d374b28ee07b1a8c479257c04642479def27350b7b SHA512 a34c58b573db453a4082b87774290ebd63cdf88f38cd7726469bc50de174dea135c3f126c7c82099a7c41eb599f055b993ca6f3203624f742d5d2935a6d7b872
-DIST libpeas-1.32.0.tar.xz 193572 BLAKE2B a29be56dd4add53ac11e52e7a9b6f9aaf1634bec0be6efe33d99fbb1a323cdc2f9d81917f160c3d8f4b88068d13a3b6cc732aa147bba1c1e524ed5eb1e238ad9 SHA512 520a5fd8657f75dc0e28a17ccab88a2952d018f81384eaea0fc65779e66b0ebc79b0dc8ce184e49d43406381c75c2028b402c1bb9d650eae2edf35ec8617a897
 DIST libpeas-1.34.0.tar.xz 194716 BLAKE2B 8162a7475e54d43ac7d2f75e80a2ff3aa9256432ad6c2dfa4071ff3660455db3523b650f4fde7a0ede52b73fcd591323b4fa39f61e3127b19d391c00d91ec2b7 SHA512 3d8877b15d1aecdce6768bcbbd69471b8b009596e60b54a781fe961d24f18f33af62838552a98ee0aa8b2ef0855837cd10189b3b9c9040f7dc40c17f42922b1b
-EBUILD libpeas-1.32.0.ebuild 2282 BLAKE2B 4414f88356583577d30eab167627129cccebaac1c1d27805512584c0637291bc8e944e64e4e98092a79e44a6ae7e3e03a17fea21ffe9c353b00f5c0c20725882 SHA512 ea65e367976411794e10f74735e142eba05a5f43f6c71bd322562d8ed374f8bd796c54af71651d5ed256988037d288da862120687b03ca4c7a83336781104d22
 EBUILD libpeas-1.34.0.ebuild 2229 BLAKE2B ee4c1de679d6e37b4a0616ed812119f4ce9ddb9a397a437a1feb9e04f109d10ab081b8ecd2009e54472d650d42925c4170fa86fbaee7191e9022cec0f08293a3 SHA512 85152c0852e7e83a4371317b83dd547eb1d552b3a3ea330e293053a9998329e3ef5ab6032f7310d63e4d3fa69170f548b2ef0f48d63984d35e72bc8c9a02db27
 MISC metadata.xml 513 BLAKE2B 7109e274bc8a11fbaee5587e1ffe12cd38a240e991b911e80e22eaca9c435c189927d6e09904fa7d3a9354e72c2b4f5f4ff18f6ebd30607991c5292d1f52ae7b SHA512 4f66c6829aab91887f315b1cff8d70122a92e12f4c89997612507a8676f8796d275af88711c66b1f28246059847bddb2c3b388ba9d089baa9add2819d8192c9d
diff --git a/dev-libs/libpeas/files/1.32.0-meson-Fix-disabling-gtk_doc.patch b/dev-libs/libpeas/files/1.32.0-meson-Fix-disabling-gtk_doc.patch
deleted file mode 100644
index 39377b392dee..000000000000
--- a/dev-libs/libpeas/files/1.32.0-meson-Fix-disabling-gtk_doc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://gitlab.gnome.org/GNOME/libpeas/-/merge_requests/34
-
-From 1be9b5a51ca4200d9cff69642368c24225b58dd5 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Mon, 21 Mar 2022 19:13:04 -0700
-Subject: [PATCH] meson: Fix disabling gtk_doc
-
-Without this, even passing -Dgtk_doc=false will cause documentation to
-be built if gi-docgen is available.
-
-Fixes: 82119a6 ("gi-docgen: Initial commit")
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index c77b352..91b8ca8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -251,7 +251,7 @@ configure_file(
- )
- 
- # Options
--build_gtk_doc = gi_docgen_dep.found()
-+build_gtk_doc = get_option('gtk_doc') and gi_docgen_dep.found()
- 
- install_glade_catalog = get_option('glade_catalog')
- if install_glade_catalog and not gladeui_dep.found()
--- 
-2.34.1
-
diff --git a/dev-libs/libpeas/libpeas-1.32.0.ebuild b/dev-libs/libpeas/libpeas-1.32.0.ebuild
deleted file mode 100644
index 6e84aa57f353..000000000000
--- a/dev-libs/libpeas/libpeas-1.32.0.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
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libpeas https://gitlab.gnome.org/GNOME/libpeas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="glade +gtk gtk-doc lua +python vala"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.39:=
-	gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] )
-	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	lua? (
-		${LUA_DEPS}
-		$(lua_gen_cond_dep '
-			>=dev-lua/lgi-0.9.0[${LUA_USEDEP}]
-		')
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.11
-		>=dev-util/gi-docgen-2021.7
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Gentoo-specific lua tweak hack
-	"${FILESDIR}"/1.26.0-lua.patch
-
-	"${FILESDIR}"/${PV}-meson-Fix-disabling-gtk_doc.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature $(usex lua '!lua_single_target_luajit' 'lua') lua51)
-		$(meson_feature $(usex lua 'lua_single_target_luajit' 'lua') luajit)
-		-Dpython2=false
-		$(meson_use python python3)
-		# introspection was always enabled in autotools; would need readiness by consumers
-		# to USE flag it, but most need it for python plugins anyways
-		-Dintrospection=true
-		$(meson_use vala vapi)
-		$(meson_use gtk widgetry)
-		$(meson_use glade glade_catalog)
-		-Ddemos=false
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/libpeas{,-gtk}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index bda882873205..f4f30a284bdd 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -2,7 +2,6 @@ AUX libpwquality-1.4.4-musl-fgetpwent_r.patch 1260 BLAKE2B e9c9df60e0e1ba0221853
 AUX libpwquality-1.4.4-pam_pwquality-include.patch 1208 BLAKE2B d7899e6caeb8a1f4515026165d9a321e0a7840b45e4f2472a8562f7a88e35c80f7295349491f3a0037da1ff12e7c74e99236c4ef1d3334fbc477bf393bf3954b SHA512 e570c7f036a1182e43c63b852040468b0dd45ca115ff98f62bc4d3bba02b0c368cd9b1e857e39ea5fcd0b74b265cc7baea529359593512d896f65c6b658afd27
 DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
 DIST libpwquality-1.4.5.tar.bz2 433961 BLAKE2B f5326996ab607bf9d24de446d9714987ad259fd2222bc54983769abc298969e2e9a4cee78f2a5c5d963bd0e5f57ea3aa346b0ce108b465a8da82810486b37e36 SHA512 91a6febbf40047e553b6051df727857df7932c816638f15118a46b8286527a80446ca4f6a050d2b1f4e33335bf4b75290751ce358fa477cb9d06fe89a450d647
-EBUILD libpwquality-1.4.4-r1.ebuild 2088 BLAKE2B 45114a8a0e6fad03eb18ed2e8f0a7229115ed715a2c5a986e734f2cf26bdacacc4c4b357c72bf1bafdc8c733390d5fdc194bd0892fbbd6b588cff35be546dadf SHA512 eb83fcec8077595910448d3be5580438e7842e395d0066d34f4a708fffb9c766c2fe5baccc00180d0ea885f9d41ad60ae749c526bb41d14a31b6a16d5782d676
 EBUILD libpwquality-1.4.4-r2.ebuild 2270 BLAKE2B 71cf75507263df789ca13a713a71d2f1e716e9be9e3a2da76d45dcff65b57ce0382c63518d33cdab866d9d42f374f5970e7316b6bb0d4377311e248ac96a5bd1 SHA512 302c531cb70e24bb615d40a37bdb076a8a3406462a21d40493f85c82224657292b1b52520012f9d37878c1c27c1bc14e958916d60f03485c5ecb47885c966a07
-EBUILD libpwquality-1.4.5.ebuild 2235 BLAKE2B a95eebf770c7ed16e2faa4be35bad2885870cf8801ca802c02429a5dae60919f2d5f24b901b1864281453324895eb94253b67d615dac7beecd25378ab09d110e SHA512 61ffd87cbff1f496c0aa301bbcb575880ff55738a8cbee232e35dff203cea86fc5d33f490c833ebcae76f5e0bd446202c7315acf6a65cfb30b9f19c85dd91bbf
+EBUILD libpwquality-1.4.5.ebuild 2164 BLAKE2B 3a1addde1f7f9d406ca38a9ac1b98a8fa5f13be4b08f231fd6f67262cac915aa6366cb7ccd9a7985cf9264a057820e1f5c80e2e08940ab009106d2991a3ea4d7 SHA512 3cadf8114047c49c9c0d5dfbf3912245d51dac347ede63bd46c828e709c84d0a5101f3a0f0e0bfb8da0e95caacad69afc19fc9dd6e956a3f6e968b2c886606d2
 MISC metadata.xml 354 BLAKE2B c7c1c6aad6af351f12d42c720fe4372aa0966601624454febad3d0ac2c40b069acfaae7f1c77c41546c701a8ad1e242bd715f421ed2103e9c48cc5a63d7e44fa SHA512 41ecf39d00ced11f91831aa04bbca66d0a409367ae87aab765c94dbcdfc4dd8900f707b767e2fe76ad1eaa62c33e2e571027c7e5112e799104029bb773d812df
diff --git a/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
deleted file mode 100644
index 1da2d9795e4d..000000000000
--- a/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit pam python-r1 usr-ldscript
-
-DESCRIPTION="Library for password quality checking and generating random passwords"
-HOMEPAGE="https://github.com/libpwquality/libpwquality"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="pam python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=sys-libs/cracklib-2.8:=[static-libs(+)?]
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	# ensure pkgconfig files go in /usr
-	sed -e "s:\(pkgconfigdir *=\).*:\1 ${EPREFIX}/usr/$(get_libdir)/pkgconfig:" \
-		-i src/Makefile.{am,in} || die "sed failed"
-
-	if use python ; then
-		# bug #830397
-		export SETUPTOOLS_USE_DISTUTILS=stdlib
-		python_copy_sources
-	fi
-}
-
-src_configure() {
-	# Install library in /lib for pam
-	configuring() {
-		local sitedir
-		econf \
-			--libdir="${EPREFIX}/$(get_libdir)" \
-			$(use_enable pam) \
-			--with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
-			$(use_enable python python-bindings) \
-			$(usex python "--with-pythonsitedir=$(use python && python_get_sitedir)" "") \
-			$(use_enable static-libs static)
-	}
-	if_use_python_python_foreach_impl configuring
-}
-
-src_compile() {
-	if_use_python_python_foreach_impl default
-}
-
-src_test() {
-	if_use_python_python_foreach_impl default
-}
-
-src_install() {
-	if_use_python_python_foreach_impl default
-	if use static-libs; then
-		# Do not install static libs in /lib
-		mkdir -p "${ED}/usr/$(get_libdir)"
-		mv "${ED}/$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
-		gen_usr_ldscript libpwquality.so
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
-
-if_use_python_python_foreach_impl() {
-	if use python; then
-		python_foreach_impl run_in_build_dir "$@"
-	else
-		"$@"
-	fi
-}
diff --git a/dev-libs/libpwquality/libpwquality-1.4.5.ebuild b/dev-libs/libpwquality/libpwquality-1.4.5.ebuild
index b6704ac8fe51..310d2d4d8b88 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.5.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
-inherit autotools pam python-r1 usr-ldscript
+inherit pam python-r1 usr-ldscript
 
 DESCRIPTION="Library for password quality checking and generating random passwords"
 HOMEPAGE="https://github.com/libpwquality/libpwquality"
@@ -37,9 +37,6 @@ src_prepare() {
 	sed -e "s:\(pkgconfigdir *=\).*:\1 ${EPREFIX}/usr/$(get_libdir)/pkgconfig:" \
 		-i src/Makefile.{am,in} || die "sed failed"
 
-	# Needed for musl patch, drop on next release
-	eautoreconf
-
 	if use python ; then
 		# bug #830397
 		export SETUPTOOLS_USE_DISTUTILS=stdlib
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index bc01cb2f96f8..d6dd614f5c22 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,7 +1,5 @@
-DIST libsigc++-2.10.7.tar.xz 4791304 BLAKE2B f3e41a753097d55d2e6f47407033139733dc813d84ffa8ba97ca94dbb2f1abc714a541fd90347c1477736eb9be109dd25d5ffc9998430b7d0fe9c627a9b2cfde SHA512 075f120f7261eac020a92956a4b2d8bfa380a63bf4e78d057d93b035dcb0590df1ee1e2d3af59edf97e3c30cc01359d259d24e4fc69bdb99952d4c9c02eb6015
 DIST libsigc++-2.10.8.tar.xz 4998876 BLAKE2B f460652950af895fab6d4028d721e2a439b0a4dfb260515c9acc053a41435be7d7f7328fc42f64ef34b36be31c5281e5998ceee2c08970f1fcec82176fab09b0 SHA512 8b22fd8ae4eca3ebc1b65b68d4dc022e7bbde6d1d02a557e64d2fda2682e2e39b357af6d8b68e8741c287701be9fffd27125c6171790455a7657e0ea55cc08b3
 DIST libsigc++-3.2.0.tar.xz 785900 BLAKE2B 6c128a0c426814bde26b092c20f9eca1029712f5130a12088bf7cae10c56105334a12df0b26fe1234ed4c262cac576312d2e72abb926b6422e6fc111ccee8734 SHA512 91315cecc79a1ad6ea165b66a13a5afd4e5bc101842f9d4c58811ea78536c07fc8821c51aa5110a032ed71c09f85790b3a02f2ad7fe8cc3aed6e03b2bafcd70c
-EBUILD libsigc++-2.10.7-r1.ebuild 1102 BLAKE2B a64739d480cd6af3fed44ec6a3feb529592191bef05870204f372ebd2ef7cb8be89a0bf45a3e8dd06be0a7bd0aaa2b2035718453d22fad544551d3c539ecaacc SHA512 ef3fd5e44432208e4aef1cf876f41297a56444840742433ac5e36fe9be246e1b1861470a949bda9b5fa29c16a4fd9c41ae59ce02e1d6dae9c6f7732479c1a228
 EBUILD libsigc++-2.10.8.ebuild 1102 BLAKE2B a64739d480cd6af3fed44ec6a3feb529592191bef05870204f372ebd2ef7cb8be89a0bf45a3e8dd06be0a7bd0aaa2b2035718453d22fad544551d3c539ecaacc SHA512 ef3fd5e44432208e4aef1cf876f41297a56444840742433ac5e36fe9be246e1b1861470a949bda9b5fa29c16a4fd9c41ae59ce02e1d6dae9c6f7732479c1a228
 EBUILD libsigc++-3.2.0-r1.ebuild 1149 BLAKE2B 71605522a6a49529b6665b48a90d57af7043da55e1fa9572ea5c3ff03bfa89abb1645c4f85b212ff8ae7fd0b3d25b1f3d9636f75e8fc56dc66de8c27be06c56c SHA512 7367f5984cc6dd8a4e75445db59dd2d93f0fd81d0d1b11aa48dfb0de12aae399190c83eeb1645cefe99b689835903c574b737c5aae7f23a47909fea166d95210
 MISC metadata.xml 360 BLAKE2B cd5d7f32949df66ccd10d45bccf8d6433a5c0d218356bfd453037e1b0c3ad7e39a1fa1b9354a4f2c68a9340c1bed0c940f77e28ac43fb904a547bae0f4ef5b7e SHA512 0cab4a9537dbf409b15c8bcaba9653d434776292eb65c1bf9708c0ce2cf9134c23ceae09c4384950733928095735f137f51e8ad6d0253b77c9b3fafbc2b75877
diff --git a/dev-libs/libsigc++/libsigc++-2.10.7-r1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.7-r1.ebuild
deleted file mode 100644
index 1b019eb376d7..000000000000
--- a/dev-libs/libsigc++/libsigc++-2.10.7-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic gnome.org meson-multilib
-
-DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
-	https://github.com/libsigcplusplus/libsigcplusplus"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk-doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
-BDEPEND="sys-devel/m4
-	gtk-doc? ( app-doc/doxygen[dot] )"
-
-multilib_src_configure() {
-	filter-flags -fno-exceptions #84263
-
-	local -a emesonargs=(
-		$(meson_use test benchmark)
-		$(meson_native_use_bool gtk-doc build-documentation)
-		-Dbuild-examples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	# Note: html docs are installed into /usr/share/doc/libsigc++-2.0
-	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
-	:;
-}
diff --git a/dev-libs/template-glib/Manifest b/dev-libs/template-glib/Manifest
index 447f23f9c80d..dcb9b3f108ca 100644
--- a/dev-libs/template-glib/Manifest
+++ b/dev-libs/template-glib/Manifest
@@ -1,5 +1,3 @@
-DIST template-glib-3.34.1.tar.xz 57540 BLAKE2B 2ceff1ef04fe846d8b5a7c4b54d0bc572323e607fb72812bcc93152caf1d4e9de36a27705a53a0c1add924d95a92d597256bc5450f1ff598c1fd5b0157a87051 SHA512 9f518fa3331fdef808f219792e1664787150c9e4b1b1a43662badde4ba8cf6d49faf1f97f0f4faab9e31c86a3f65e637f62d752fa6725c052ae099f29f3999fc
 DIST template-glib-3.36.0.tar.xz 64132 BLAKE2B 10a9fbf8f98efaaf92b8679ea3b08dc510b9b5744239c19f180efc3a1a54f8edec2b1c6775e336d5a143fc8cac566d507337e656154a1984404a84f0b9b88c2b SHA512 51e1adf581fef05ec46ed3dd9ba61c27b02138009e2f994a0dded62216372445e59676d6f8bbca979e44825722c913a1435a8ae7b6d1e7e41dc510654420647b
-EBUILD template-glib-3.34.1.ebuild 1074 BLAKE2B 18aa25536e22f1a06ce2befb35da18dcc2d9fa3e331ee7332abb8dd167d9bff25cd27b951c3b8a934f9abc46de06737d7b332ad79dcacb778e8f103061080083 SHA512 aaacbf9fc011aae02efce78b42a4ac5ab11b8ebeae8f2fc9592dda4be8b59d6529f2a5ec8dbef806836ccc0ff3e1d9dfe8fa1f8c4b86f3dc3c51764c4ab4ef9b
 EBUILD template-glib-3.36.0.ebuild 1091 BLAKE2B e5c0ba001fc359a0c79cbaded37b895a90bfd9fb4cfa777db93b7e7de3ffb3e509bf053754086ae898b28d92c04723fbef2e01432c5aedba5e054fea71030b3b SHA512 847f3930cc72fdbe2709f483802f166bb8b4c865f89c63a371b391261cdf87b811eb1ed71f2f69a5441f8d3ffa62e13909c3ad422175b3ed231aa22c67bc88f8
 MISC metadata.xml 762 BLAKE2B a82aa17f494b2721428a999a60f16a3d86ef2b7b3310d398d6d296e1d840c6a2bd5477fa4e281678cb87d19db311077371ddda9b39ba5c98c46849479a76bf79 SHA512 122b0e14f897b1d92ed71ac0969eb1f0f5beb7ecf5b44b71444ad1f80e9477906936e1ec7ca4cafc3d0875424bcdf3473acb71900a6d323f63c21e0c77030eee
diff --git a/dev-libs/template-glib/template-glib-3.34.1.ebuild b/dev-libs/template-glib/template-glib-3.34.1.ebuild
deleted file mode 100644
index af4f286dc6d7..000000000000
--- a/dev-libs/template-glib/template-glib-3.34.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson vala
-
-DESCRIPTION="Templating library for GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 x86"
-
-IUSE="gtk-doc +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection:=
-" # depends on go-i unconditionally for own functionality, USE flag controls GIR/typelib generation
-DEPEND="${RDEPEND}"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-util/glib-utils
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_tracing=false # extra trace debugging that would make things slower
-		-Denable_profiling=false # -pg passing
-		$(meson_use introspection with_introspection)
-		$(meson_use vala with_vapi)
-		$(meson_use gtk-doc enable_gtk_doc)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index a7e07f47cf2d..582ef46743a4 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,10 +1,6 @@
-DIST wayland-protocols-1.26.tar.xz 81028 BLAKE2B 0813b8117c48b965560c3f112f67fa209f29b0c40fab2b46f46ccae227d68902277cce06281a6bd938fb3c2186e0cf4ea3670ed6d3b48b51ed655012bb1452ce SHA512 fa9c3963b548197461c8c0b9e16ebbf9cfa5b60053fc17f51b41e63a55b8c5420dd7e42313f93946b438ab47f04e1cd17bc92aae9e1074b47177dc7ce7042167
 DIST wayland-protocols-1.27.tar.xz 82604 BLAKE2B ae1c19dffcf255c88e6d646f321ec194639500994f9e5a2759bd7081dc16872777c993d35d81000796e3e5044dc62f169c9b2fe89de081fd395eaaf09e6206e2 SHA512 c0a49bc46c663c9f602998dfe2e184c09756790fbcc7acbc2bf9d9cf8f7d6dcdd00259b768222a30e5d134e6f97f7f4faf252947b544e8b32f53278b70da0390
-DIST wayland-protocols-1.28.tar.xz 84116 BLAKE2B 2b911b471ea61e34da5f0c8eb1bc67e0786261411123bffb02bfcea4e0c5e85b2ca1e8cf3f8f55fc92aae0365c30caed42e3c6037df46ce581f27952f6e38a24 SHA512 092454c6a7e5cc47729de49e9061fb91dfdc5610859e17c495642806ca14dcfb3850a5d3a7459ddb70b2adb08d2590d4b0f92c3a97600e48598682d59adb102f
 DIST wayland-protocols-1.30.tar.xz 84776 BLAKE2B 059a40c839c5775851fb31f3f4637e11dce091b1758a5eb0c375ae40c3b745321cdc549d26456edc1bf66cd7d013d370c3df8c0de64f867b899571a73e2a4233 SHA512 e1e5648387e821c190058b390d7120c06c2767b644caf2644f05a280e0fe300b677545fbb9537839d8bc569a0cc7fb51190963421281e2557d1680767899b743
-EBUILD wayland-protocols-1.26.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
 EBUILD wayland-protocols-1.27.ebuild 786 BLAKE2B 6b6c4a850fdb2fef672d38a1a613065d2333fde5c1bb9429ce282bf753d7649451979cb26a775aa27ee6483a450cc8a205705f0dea2ff0ff38896cb97d857a76 SHA512 923f620e80a299fa825864daeb86f5da84ff50dd294d4fbb79a5e7df87de06f885430d5ee7420c7966479bcf99f8df1a0bf396b42bd8a8c7dd7ccce6dbfacd13
-EBUILD wayland-protocols-1.28.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
 EBUILD wayland-protocols-1.30.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
 EBUILD wayland-protocols-9999.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
 MISC metadata.xml 347 BLAKE2B e4265a94e0261094355613ac8617c362f90dc7207188658bf37d7d3d0ea87f598d0a5367d44c95cd3688cd68aeaad6be95ca1707430d06ad8b34bfaed9395f29 SHA512 4db809b42f57946d21f5c0ece2ccba39684da283ddfb72ed2bd6c1ace305c18381904dafa2abce56950cfb2bd1ead0839124c59302b1bb71c0fd8fc8f4a52846
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
deleted file mode 100644
index 873c3dfde4c1..000000000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
-	inherit git-r3
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( dev-libs/wayland )
-"
-RDEPEND=""
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.28.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.28.ebuild
deleted file mode 100644
index 4eff41270cb0..000000000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.28.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( dev-libs/wayland )
-"
-RDEPEND=""
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 79ab1593b4d1..180cf3be270d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 86dff4c01e42..aa5bc5e9307c 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,10 +4,12 @@ DIST hypothesis-6.58.0.gh.tar.gz 9335693 BLAKE2B 8e72b1ddd2a0c3bd07e5e865147e0be
 DIST hypothesis-6.58.1.gh.tar.gz 9335673 BLAKE2B 2f4c34f89547c3e05bc9238b9daee864335b89e1c2aab81765aeb0f806c730c33a52fe4820a718df078bb502e507cb954abe4f8528ec8566a366994cadb45d2d SHA512 efcddb49239b10ae851d3c3331629fd41f19d78e30f52f7d672735b397d4cc21fc5e3cabac824046cb391d999605e80abd014d837437593215a3d71aa60b407e
 DIST hypothesis-6.58.2.gh.tar.gz 9336284 BLAKE2B 404265e82d5b2e7e131cde9a97ef08a8bbfc482ba58f44fcfca4650b59529b51968c8eba1156b0b397bafa429cfa4b4e3c9d8988a6dbecad40d96c3736a5c2da SHA512 3bfd11c2f10e2075ad756247af6ef8f7e47a79746c6103db2158a3e569319226064f108170018f3455c542308a36bcb9e46d63ec9a66d8d081fdafdb82dfe65f
 DIST hypothesis-6.59.0.gh.tar.gz 9337749 BLAKE2B 29673a769702cf80efa05c3f5a60a3dac6d1226db2afbf25e3ff71be801c396db843222dac5facff8bbb1105dbd7533e2e908188a611a6e051b757ef87498dae SHA512 8d189576a45dc527c2adc0b36781a9323292aa3ed61ab1e0747c379d170c8a1907b787889ceb767d4814422d158c3cdd542360e75295605805b22d832a999777
+DIST hypothesis-6.60.0.gh.tar.gz 9338839 BLAKE2B b50028b6960264d318135a70cdabc2f7c6bd563027c87dab12f98c240b884835a8e6e70d2372a23180c0aa3070d00e6e4ab7bd85461d60c57a68cbbea8e24f1a SHA512 674518511a8ee362b7a3ab7da83fdb02dc9bb280dfac7362d1ce64c34d01a62462026018c593c3de4b59336ffc79144dc0823c8c1ff7865c9322e61a29e63b40
 EBUILD hypothesis-6.56.4.ebuild 2132 BLAKE2B 46f1d1c0f69606e55673a002c305f72655f44ac456ea0e8cde03e7cfd12a074d915f00b29280637b150a4faa596dcd28e2527fc6762aa53893f245530c5a7eef SHA512 bb0602862ac4175e49605bb095ca8d9a027a964cda6e0cc51f03910f5186436646e25f25621cbfec777dbbf0e5fbb4f7a5a01ef646fc20bb84f75980daddf1b8
 EBUILD hypothesis-6.57.1.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
 EBUILD hypothesis-6.58.0.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
 EBUILD hypothesis-6.58.1.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
 EBUILD hypothesis-6.58.2.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
 EBUILD hypothesis-6.59.0.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
+EBUILD hypothesis-6.60.0.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.60.0.ebuild b/dev-python/hypothesis/hypothesis-6.60.0.ebuild
new file mode 100644
index 000000000000..bbb3ede19663
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.60.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 630f9068354d..aae7615408e6 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,9 +1,5 @@
-DIST Nuitka-1.2.1.tar.gz 3958041 BLAKE2B 461fd91fc2948aa131a5295f3e2f8c99d8de26b32d0dd3008ee130bdc8b722a469e458a717b5cbdbf45cd3720dfff828c3eade1d57c7f0ee391cd062105b4ad1 SHA512 98a95342a78c935ebea88446ee875122baeb66290148cf8c454c8287ecc40b092015d710a1a25b35c3b6869138800d2c654b09a3424512536f06d27860bfa2bb
-DIST Nuitka-1.2.2.tar.gz 3958127 BLAKE2B fb4fbbf3537d78b5375ef9e26c65bae5a09db2b8839308b8b1ab847c9e820586e84742fd89aa91f8c0bfb366309cc4106ed2195566762103a54951026f81c3b8 SHA512 4b11e15fbb81d3bbf9c687a05ecd71cec7b4f145ad7f1af5a98eb77ff6e4d93bac5e3af8474b9ba0a7bffb5b191f46960e317b53d315455a1ca2ea0660859357
 DIST Nuitka-1.2.3.tar.gz 3958335 BLAKE2B c2d47e7ff355492fb72f224be92445849c3fce13768ba7957cf4bbbbc9cd4e0ec7c3904e5465ad543e16d1419a01b42cd4399b816e1ff56e2c8ea5c57fddbc04 SHA512 1c842c21764bd0dc9bf68bb26506959b35e54d03c1d6d6b9c179289ec073ed07b75d6709a3c73ac3e14bb988a7b2f5a88f7dfcce55a25eab1c5e4b294b15d4f4
-DIST Nuitka-1.2.tar.gz 3957227 BLAKE2B e82c8e30ef326254db255785efd2bab1450c2c496bbef1aae35e6f6c42fee09f2454bdff366ecfcf704aa42bbe9cd62ff5a65f26065b85e95083cb0134829dbc SHA512 65c262109f2341aab607601299ec70c88df46218ecc2bb7a7d39ff66b8d4ec43e44a5d30ac936d6572fb141ca6b19e3c0e0c01975dea82d46a2ec190ed13c21b
-EBUILD nuitka-1.2.1.ebuild 1214 BLAKE2B b5c547ea636f0c56f83984808e9596f6119416150c47d49fbb77c6ba7c9ffaf8f23781fdf6a18aadabb5e7c77986c1709820583abee20d7ec6d2e53de4655653 SHA512 9c1931c4e40b695eb166bd0160c6a4cb5874873cbd1241bf275d38c823f4cb82fc335b8083b8bac4575294cdd1a7767b31533a437ae4f5364e3bc546da989cca
-EBUILD nuitka-1.2.2.ebuild 1214 BLAKE2B b5c547ea636f0c56f83984808e9596f6119416150c47d49fbb77c6ba7c9ffaf8f23781fdf6a18aadabb5e7c77986c1709820583abee20d7ec6d2e53de4655653 SHA512 9c1931c4e40b695eb166bd0160c6a4cb5874873cbd1241bf275d38c823f4cb82fc335b8083b8bac4575294cdd1a7767b31533a437ae4f5364e3bc546da989cca
+DIST Nuitka-1.2.4.tar.gz 3958942 BLAKE2B ca3be2453815949b05f8a74dc783c58125ebbda038a86f22d273c6e4ef6c8b3fe3d238b3abedb0062ace59a0f60545312f8ad8af056b13c975106ee0c7563fa7 SHA512 7a160f7b12ba9dd66af2d3c798bafd4b2d4f60068acb18be5dc9246c811df58b6f2e6b1c3610ed045d7a73042728b53b92c36b239cb88931d500c904e7018847
 EBUILD nuitka-1.2.3.ebuild 1214 BLAKE2B b5c547ea636f0c56f83984808e9596f6119416150c47d49fbb77c6ba7c9ffaf8f23781fdf6a18aadabb5e7c77986c1709820583abee20d7ec6d2e53de4655653 SHA512 9c1931c4e40b695eb166bd0160c6a4cb5874873cbd1241bf275d38c823f4cb82fc335b8083b8bac4575294cdd1a7767b31533a437ae4f5364e3bc546da989cca
-EBUILD nuitka-1.2.ebuild 1214 BLAKE2B b5c547ea636f0c56f83984808e9596f6119416150c47d49fbb77c6ba7c9ffaf8f23781fdf6a18aadabb5e7c77986c1709820583abee20d7ec6d2e53de4655653 SHA512 9c1931c4e40b695eb166bd0160c6a4cb5874873cbd1241bf275d38c823f4cb82fc335b8083b8bac4575294cdd1a7767b31533a437ae4f5364e3bc546da989cca
+EBUILD nuitka-1.2.4.ebuild 1214 BLAKE2B b5c547ea636f0c56f83984808e9596f6119416150c47d49fbb77c6ba7c9ffaf8f23781fdf6a18aadabb5e7c77986c1709820583abee20d7ec6d2e53de4655653 SHA512 9c1931c4e40b695eb166bd0160c6a4cb5874873cbd1241bf275d38c823f4cb82fc335b8083b8bac4575294cdd1a7767b31533a437ae4f5364e3bc546da989cca
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-1.2.2.ebuild b/dev-python/nuitka/nuitka-1.2.2.ebuild
deleted file mode 100644
index b55f0385d58a..000000000000
--- a/dev-python/nuitka/nuitka-1.2.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://www.nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-util/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-1.2.1.ebuild b/dev-python/nuitka/nuitka-1.2.4.ebuild
index b55f0385d58a..b55f0385d58a 100644
--- a/dev-python/nuitka/nuitka-1.2.1.ebuild
+++ b/dev-python/nuitka/nuitka-1.2.4.ebuild
diff --git a/dev-python/nuitka/nuitka-1.2.ebuild b/dev-python/nuitka/nuitka-1.2.ebuild
deleted file mode 100644
index b55f0385d58a..000000000000
--- a/dev-python/nuitka/nuitka-1.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://www.nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-util/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 1b14d5aacd4f..058b6a567c5c 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-xdist-3.0.2.tar.gz 69590 BLAKE2B b7e471e1888f78e1c91a867cd1d06f373c255018f63daab4af30fe47df816721954f484006b59bb38d58f9525712a5bc7bb6f00d190bee3580b82baf9b2cb55d SHA512 8b03dd156b7ef82b3b0c78f8aeb83410ce3014e3764aeca4161d57fe2ad557f0316ca86dbf06ac79ddc677df3dc838161fe427b0d1d9ba9446612360eb99fbf2
+DIST pytest-xdist-3.1.0.tar.gz 71977 BLAKE2B c29622377743aec0a90f0e92af866a63106b9c37abee379222fd2b5c40f0607c33010bb5d2cb5212fc90a438d787ecb435f07c31e0db7a10599696c33b309a32 SHA512 884cdd85754b36338666cbdd71575ef18465730cfc4ab7333b93aa46823c1dc33e8055117241f4c87e1b8c82492881cc0f91ef1bb2ddc164aa00bfa1e5e2d245
 EBUILD pytest-xdist-3.0.2.ebuild 1123 BLAKE2B 79d4a01654de1c96d9f12581b221e68b519e1e860858e9d836e2d636b6b93635f8b24f3ff8fb26034a55d6dfc799391a508e90dfeb2e420bbbc7f652de6f2ff7 SHA512 7a92a6e4eb4399a4837ca7453d8a4c9c56a9a05863c01bbce39e632b11d2e66ccec6f650a4c86df96a22b6a4bac52185f3bd93ce4e94261c2291cc9b10e001f5
+EBUILD pytest-xdist-3.1.0.ebuild 1131 BLAKE2B c7d846c8e378993ae77dd0f67264658ce09f748ae45eb0504afca76b0ef9bb4e91760ec4dd7c57ae4e55828b6e72941ac56ccd620a9528c115f4bc39bc7e81e8 SHA512 53dfa89a39676e42a3db1cdf785e45dba00cf8bd842f09a65fb67e8ed2f19e6bbb42061eaed90efe9ca49ff2e5da65a289e19f5fa427e4894b7c33cb147684c1
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.1.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.1.0.ebuild
new file mode 100644
index 000000000000..1079a190886e
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-3.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="
+	https://pypi.org/project/pytest-xdist/
+	https://github.com/pytest-dev/pytest-xdist/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6.2.0[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# disable autoloading plugins in nested pytest calls
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# since we disabled autoloading, force loading necessary plugins
+	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
+
+	epytest
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index b4f93be10a1b..da2612512cc3 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/io-event/Manifest b/dev-ruby/io-event/Manifest
index 46bc7a2228c6..3dc66ba5805b 100644
--- a/dev-ruby/io-event/Manifest
+++ b/dev-ruby/io-event/Manifest
@@ -1,3 +1,5 @@
 DIST io-event-1.1.2.tar.gz 34305 BLAKE2B 8e7814ada38c4a766f413373e0ef5b0c94a1b94342667a25c59bf8925fed791c3dc527bf63f02a9e40297abcdde730047a3a80104ac9d9f12ea648e5842ea851 SHA512 68a9c01f8075117767cdcacb095f9587118f86cc536d94a990b55e63e7f5213c350556486c45e2687db2ac810d48dc1d9aa28e994ef6ae0229f7b258d0b92aa2
+DIST io-event-1.1.3.tar.gz 34336 BLAKE2B bf0143c73e8d3f2929d3d86a740bb4c846558e3e605414087a5bb16b6e8d1c0b35494b9c761de8d57004b4b540b72d16916ec602a04f204f32fa5ba074a465a3 SHA512 9da7405e6d0d0b7aed30718bd52c15bd05061f73c4a1ed481bbfa037a11d75a034876e7470ad29523e8e16c5a3b69eaf8716d81b8e840fb01c6248ecab633495
 EBUILD io-event-1.1.2.ebuild 812 BLAKE2B 29277f25b5ee930d609136697016f714bce53c4d1b687f0e43f5ea7ae62d05a704b5694e73a205f6f558de5470d909de715ac8224ca76d369766f2dc4de30cae SHA512 c7df0b2b298c04cd5978e7365a9e23452d6b0dc5ebfd9c999b8bd643144380f43cc1bdd3e2773414fa39cb0286f128c795b377c53d4903662f88e36be4a82978
+EBUILD io-event-1.1.3.ebuild 812 BLAKE2B 29277f25b5ee930d609136697016f714bce53c4d1b687f0e43f5ea7ae62d05a704b5694e73a205f6f558de5470d909de715ac8224ca76d369766f2dc4de30cae SHA512 c7df0b2b298c04cd5978e7365a9e23452d6b0dc5ebfd9c999b8bd643144380f43cc1bdd3e2773414fa39cb0286f128c795b377c53d4903662f88e36be4a82978
 MISC metadata.xml 344 BLAKE2B bb572a3bebb66073283f2eea535cb9ac95d3adba0e060350609028bb47b7a03b6ddb3294293e95a6c505fe5d9c7127a37f1d1afa9abf66312bf4b4a688b4ddf9 SHA512 9c114303bb3edf528224eac75e7095403230f94baf373649442c123cceee029258616fa2ea68823814dd1ecdfe0f9c4ef73491ca449f569f12aa159b78811ef5
diff --git a/dev-ruby/io-event/io-event-1.1.3.ebuild b/dev-ruby/io-event/io-event-1.1.3.ebuild
new file mode 100644
index 000000000000..107271412ff8
--- /dev/null
+++ b/dev-ruby/io-event/io-event-1.1.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An event loop"
+HOMEPAGE="https://github.com/socketry/io-event"
+SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~sparc"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/sus-0.6:0 )"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on unpackaged covered package
+	rm -f config/sus.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S sus-parallel || die
+}
diff --git a/dev-ruby/log4r/Manifest b/dev-ruby/log4r/Manifest
index e4f66101437c..ef4f60f8eabb 100644
--- a/dev-ruby/log4r/Manifest
+++ b/dev-ruby/log4r/Manifest
@@ -1,3 +1,3 @@
 DIST log4r-1.1.10.gem 118272 BLAKE2B 32b47cd7896b4b1769c51542a4b7f98b22874d40abe59fea4859079f8af10c07810d51cad275d3962f9948b6237a3e507d6d010cf7ebca232ea282ddb108b70a SHA512 a3a9e6c9ef5b388106afc4d402455ec480729cb58054794e6ff6c963b4d819776bf5b57ef5ab7499ddc9a6b3c10f299a133f3f5986d94ee0a438b64ede5bc143
-EBUILD log4r-1.1.10-r3.ebuild 593 BLAKE2B 6f0a699509b1a36993bf3e48dda69a2dd92a0192cd222d86910d04c9ab3f34b80117e85459f2cee954ec62f678b2c51c74d260dcda911c3c42e332b165d72e88 SHA512 b9877829e327a73522f7de7286c3f9f33b346401b7d35c6841cd58f13bda5cbcbe80e20f0010b6301d83a0f8c9326a97201696696042b46ec71c54a2878c9f0c
+EBUILD log4r-1.1.10-r3.ebuild 593 BLAKE2B 559a147ca0f09bf4eb332ee15420337527af4d525f47b22b12d640f73585326eefdbc1809545cebbfacbb3eda8e6ec20f0aa2bcb4700f61764ea4fa856a4e932 SHA512 1a03225b46039c09763eef8bd6f23ec4b8b2fca70c6f76306e6755ad927ae4b54eaef68bd2a5cfa182bff2624b57b148409f57f54f00976b76ddc09ffa3b9c9d
 MISC metadata.xml 327 BLAKE2B 0f1860fc5352d7c7e1b3cfeefed9c28bf4a7fdb28420525664f4b91491d5a21dcfb7517dd3c72aa5dd32614df66d03130a602136c4b2cd3a5e2465e46e72c5c1 SHA512 512e2ca9eac8cd8cb33f815e83328795245cb5dc2df115370b6f74ad64af2235c25fdec9e3da485e13545e95247776f42a8b7b07a685be0c1f49f8dc96b7fb9b
diff --git a/dev-ruby/log4r/log4r-1.1.10-r3.ebuild b/dev-ruby/log4r/log4r-1.1.10-r3.ebuild
index e0b2e1255f04..55e624763748 100644
--- a/dev-ruby/log4r/log4r-1.1.10-r3.ebuild
+++ b/dev-ruby/log4r/log4r-1.1.10-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index f2ceda1ece74..587d10677870 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1,3 +1,5 @@
 DIST mail-2.7.1-git.tar.gz 625251 BLAKE2B c1efbb259042155e983c1971fe9821eb0dd850089bd04cb0c74513f6f17dabf8ecc3155d9e5846ae657383f522872323f8fba37d51fba4318ac682d18a6d4c50 SHA512 17c601c86715135331f750048339a11a67a17f34486dbafa3ba7e9af9970d60927a2fa95c72a398418548df1fdf5addb2ed3afe9da7dff1f0bd949438726be1b
+DIST mail-2.8.0-git.tar.gz 620136 BLAKE2B 4c115ddf92ef18c7889d391d264bf4c0be37be4849accf6e4778cc50317a4c0cd5f042c465f4f7862ca33e1de166b35bcb6d6e08e3fe44cce6aecbf1c1f9380e SHA512 ac60d72d16dd75fb5e8474900e069d5f711ce66340582a96d1f79ba582841cb82b212637053f45d1014997776ff411cbc8f9c19e06f024f6aa59b09c50c02583
 EBUILD mail-2.7.1-r1.ebuild 894 BLAKE2B c46405743d560d3b0f967628c0a87aec4214c5a6a96a7655594a3b34fc273fd3ebda48c746ccf085551f9d5ca34e0b6f34f6af47771aca7c6d37d4170c2eb787 SHA512 b55414f61b4c4a6fd1e99029a73dc2b91f05e6807e43bfb9b70cdd7aa357105035f9537702b00cd4af56c5ad85a263b5b71344905a0d493ba100e0cd2220eb04
+EBUILD mail-2.8.0.ebuild 1014 BLAKE2B 327f555e6bb0d597251c99ae609266a2164e31078bf95e549ca58d0b73ef2c70f9160802239591ce72f3e2c7c53142fed732ed9754b0aaf11f655da52783e5d4 SHA512 be895ed118818f065e86aa6d759eb400ca079ebfec3004b1f322b07548357f4d51fe95bda1edf370a82e9635652234398b2a6112113a7859f96ed940ecc374cf
 MISC metadata.xml 337 BLAKE2B edda3267d35eae7a763cb191424ad231a356da5d17ce213061d0111e9addab8d34ae9bb52e47c0ea05d58258d04befa284aa3930d316429ca4b82c2d676bb61b SHA512 06ff50f20204499fef8bf6eb3af793ec7b471c2d1a29fd30b821086f934344a6251c0304cc52c9b720af5a7b7214831a68813c33f36fe4f679deb8667d3cb7f8
diff --git a/dev-ruby/mail/mail-2.8.0.ebuild b/dev-ruby/mail/mail-2.8.0.ebuild
new file mode 100644
index 000000000000..705af4c7621c
--- /dev/null
+++ b/dev-ruby/mail/mail-2.8.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
+
+RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
+
+inherit ruby-fakegem
+
+GITHUB_USER="mikel"
+
+DESCRIPTION="An email handling library"
+HOMEPAGE="https://github.com/mikel/mail"
+SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/mini_mime-0.1.1
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
+"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
+
+	sed -i -e '/benchmark/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index 93481a27ff8e..048b9551e9d4 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,7 +1,5 @@
-DIST sexp_processor-4.15.0.gem 56320 BLAKE2B 8624b7fe28f4aa9447f42cf4f8c5b424088ca2c1628f3e785f746ceb60725449812205dc657ea856c5bead616ac18d689330315fdb44e92447ee3a89740557d1 SHA512 f7877ca59191ab39848c6d3b0cf9625c2e1c180784cd757c00a7cea67aa6eee5549ab5630641f4044c875a1aaadc89b8237f8adadc961ed86c5379cb72db33c3
 DIST sexp_processor-4.16.0.gem 56832 BLAKE2B 431005f5adc04605f6be5a34eb8933b32e4c90426f7099c670f70753381fc8892f9f9b39cba715e6192cd26a9a042ca4d7122ef7e75d2310d72772c3ba470fd2 SHA512 d6300b963782fcaa1f0854a0a10714e9fd65aac2925ba99e9c986eb62f2e940c18652f919640bcb9f8bb13ea613bee723f80a3237bd6a692bf719e726dc917f3
 DIST sexp_processor-4.16.1.gem 56832 BLAKE2B fa17cf32d67cec6a89c202d10dd18af463c70ad2e5455c891b4a68bee6fe6971577067192ae5ad2bfb7eb3f932a1988cb878ad5d901191538a69d62968c9d12f SHA512 eda019d253cce8cd6a93532745dc03e8129f7667e798543b0d38488dceb951b058e292976fe085126c421412c289c3d650ce1cf14c0fbbbafdef896b4db615b2
-EBUILD sexp_processor-4.15.0.ebuild 741 BLAKE2B ec8d3e01c498991cf2b2f3c40d5563df1604382daf0005ebeb627ab909a47f23f61a32c31a4e4c1dfa29e492d82044dbe99a3189ce3c43a81c4c1fb337e34ddf SHA512 e5278d94c67cf8a6c8a8188ca423076492abf59c0629d9bbccb85a6662924f800877f88ae85bf4027e96f22adbc9bd818880a0159355bcd45da99d8ee60202f3
 EBUILD sexp_processor-4.16.0.ebuild 748 BLAKE2B 3dfe48e470dc2f6570e4382cc0a4d44142738757b78407a2b0d464588fc7b00963cf10e309c91e140be3fbc74518721b67a76602b2a1404b18d185293a317fa4 SHA512 4c80e1a6cd8b8553ec098c9c79d686ae71f24229d4bde401eeb5893edad89ce856b142ee90d06c65333e01f46256e7dd13f59eec3a6b269ff38449af11e69220
 EBUILD sexp_processor-4.16.1.ebuild 748 BLAKE2B 3dfe48e470dc2f6570e4382cc0a4d44142738757b78407a2b0d464588fc7b00963cf10e309c91e140be3fbc74518721b67a76602b2a1404b18d185293a317fa4 SHA512 4c80e1a6cd8b8553ec098c9c79d686ae71f24229d4bde401eeb5893edad89ce856b142ee90d06c65333e01f46256e7dd13f59eec3a6b269ff38449af11e69220
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
deleted file mode 100644
index 862809482e71..000000000000
--- a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
-HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-5.5
-	)"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index 65c42e0dd445..08717942c44a 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -5,7 +5,7 @@ DIST shoulda-matchers-5.0.0.tar.gz 241021 BLAKE2B 68d70f0ac503deaf05a769b39ad905
 DIST shoulda-matchers-5.1.0.tar.gz 241567 BLAKE2B 5e778175ca80619b5e3da04fc235a6c68ef150e4abbe34520502fda5a86f44530dec3b0d4d448f87c30c54e062085a00bf6cfe3dee83c82825e238050480e10c SHA512 2abb23126aabc83d1787838468c1959442a32ecdafb244a6f20a08e382990a716ccf2219abee6f8121ff0a3f720e86a6775dee5ae351299416e51df12ad21b32
 EBUILD shoulda-matchers-3.1.3-r2.ebuild 548 BLAKE2B 86bc0cc23954bbd58a6fc99188d790ce6e3820000387e46d477fa400aa82fd269c09ec556dd275be5eb6f8ca6d9165bd984ec709857965a40f8fa099982286f0 SHA512 798f10bdd317d0b10ca600966ff1a94588ec30a575c659b76be7b195e7b19eefa0f9d21444b92fcf9122d8f73e603b7c276b292a38aa8cc77289d2529226e9ed
 EBUILD shoulda-matchers-4.4.1.ebuild 826 BLAKE2B b21f3c8ee48db9c51d002a1fa99be0777b0343f4ad2ad371b47591cbfd46e3de2b20045c6274baa98b8a08519f07d7cb4faf2bb891130031005cd56a21885930 SHA512 62f4c3f846eb2f45d1019648af158ec821e752af03ea5298808755768b3216af43d2b6a0705f506700d3bef904a654cb85be0b45d8d6202124a37dc467d757d9
-EBUILD shoulda-matchers-4.5.1-r1.ebuild 828 BLAKE2B 9eee25758297fe04d6fe2fba1152efed97db6f5f9e585b845dc5b1b10ee68a3a9c390dd5e9308d1521dafbd2116980250030b1b490e5d36ff929270989b49c8e SHA512 3e6ca8ad5db58c8e25ca2de70bd8782257543410219ed6206d2c29289583d99683cf63bdfaeeff17e97ccfdfc0d38e68bb34903a320040cf99587330d462db17
+EBUILD shoulda-matchers-4.5.1-r1.ebuild 827 BLAKE2B c9550fb724c931bbd22aea68b7768410d0050f2bdad8f9d6b9b7580ca69d4dc64c9803961b6987c34ecab7005ccfbe75952b3d83ef5a379905792ac6bb9ae9d0 SHA512 361984de3c4ef339fa20f9004788621aa018fcaed209c5eeabeb3044a44a223c5de693677cca3fb82f33c5aa58194ce16a335fbe43176ae32e595e58e0d5746a
 EBUILD shoulda-matchers-5.0.0.ebuild 835 BLAKE2B 4cd1f13995f9f8d48477b828de3ac1ab1f4df0a9b389c8f2bd01a8170d7f9606e22d32ab334702875bb5f16f7ee00761beded8326e29e9c22efa7ff70aa67ef5 SHA512 dd02b4d8c42ba5e0444102ed1441a7b62c9e606b7e767adc5c227cb9bb15cf250e5d35754c970fea5da4afa13eddd49dcdd02d4609bd8acd48042a14db104af7
 EBUILD shoulda-matchers-5.1.0.ebuild 835 BLAKE2B b0ab4ca8d9a236c5178ce76bb19e61b45b2f1ec192859af1ca26fff82c268b31e1d13084ecadc4d10a87109a97839c9c59668d2649273024f5531117174415a4 SHA512 d7631d93ba08f09715fa4fc68dd215f2daf0b710e8f0acfa74af361dc0b898788b3d2be571c11da5ef0b5ea626d1e11fa232c445a482b20380c1e59160d5edda
 MISC metadata.xml 468 BLAKE2B deac17b1815c5381c7220dfd64c5b07dfcbb40ab1e9a3d60c69113e28d4132b0347e825a7c2ed836a541f3f97a898e794f4f0a9712045959c490962c757f95fe SHA512 b6dd01f25c76a89d822835ef56d8968eb53138ccd44507d7863e45834674eaac84092b825b5ef107be02109f82c5dc5d4ce60d21729da071b375f52f8fda4c4c
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1-r1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1-r1.ebuild
index 2353fb1f39ed..28d42f93eda9 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1-r1.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
diff --git a/dev-ruby/shoulda/Manifest b/dev-ruby/shoulda/Manifest
index af1afae99f20..f1b2e6309467 100644
--- a/dev-ruby/shoulda/Manifest
+++ b/dev-ruby/shoulda/Manifest
@@ -1,6 +1,5 @@
 DIST shoulda-2.11.3.tar.gz 145068 BLAKE2B 5e6d9b78b255612ec18c78076f9c4d45265a3e02a8fd56a127ea8f235e3b344005942c4b6e53014e6328206501c178ce76e1554a9d995ba0de04f5afefe4a0f7 SHA512 0b347c4a8be177b5806364114c25dc786ca2ac95a11c93a723dbc9ea1f6d8ae62df7fb420a52d477cd1e10e8d894074072a040eef36ee8a43440e5256c8427e4
 DIST shoulda-3.6.0.tar.gz 22691 BLAKE2B 798b88e208355b0325b9e8b48f66687ad2702e1b5fc058d45504648fe7c7760b018eaf3d1c7bd45c68656c7bbba8fccc9b74d72003ee0b78ac53a277567609bb SHA512 10f7c6801eaabafa08eb2bc9c4d2a96237d4494aee7d40e5db8cf9c1abd8cccfe86aa21b0e68e2ec42cf222d285cdbec11ed2fdd804ffb8bd65ffd2efa3e72ac
 EBUILD shoulda-2.11.3-r3.ebuild 861 BLAKE2B 46daee6a79930cc885f72b24e839d42cf6f7203102d06a0b22d18910d5e8f6f3e631a18d18ce1b2d65ac36981ab1f0b9e6e4e63c68eeba967c20e842fb142e3f SHA512 61b56532a2040a922aa3c9f4a6ad9f4d52b9688eef426dc83f0a9e2936aea59713bb6f0bbce56b5c24e3e65f8c3f8f10d6d440a051f81a98aba94e64880be4e9
-EBUILD shoulda-3.6.0-r1.ebuild 924 BLAKE2B b0e4344f4255760b5ce637eb53e58af37d08e772218c77fceaafcf4f81195467cc1733ff9380f36b86d2d900378d54da046f0e1196ae6237ea5ea6fee4901fee SHA512 1a14864d13555c3631653bbf87fb5d77195e8b7c7532c889ff916a0f187c05a28f2e35ad13ab3c794bf8005a42b96e7f900195ee001b59284698f26370e8f7b4
 EBUILD shoulda-3.6.0-r2.ebuild 937 BLAKE2B bcdbd3e0af8e9a1f027bdfc38207f5284659426e59c3007341c4c6f99f060cca16d122d0b78c2d1df490687f429275ac376b78c29a6377c9fe7d6538f8a34357 SHA512 6f044ced96c54f159c64ad38cc1a94fb924d81f002f2c70bce123a79ada671936cdcc5610c1a97217e5f64e3348f6f4380584a1e4d708913431f8d643e685899
 MISC metadata.xml 345 BLAKE2B 3d5e4fa847d75a6e14084e2dd5c576409fc27ee1a39605615595eb9e1151dd7f11b3e005e3287536cf846caa9911dac0d00265c90ba593c4a46feeea593728d2 SHA512 322be4170fed150e6df894ea8346ba54b83d37de2a20de99289b34d1193ac0ed8275ef54d7cdf478381db6951457e1c27635ad6840751a1c9deb9cbabf31e83d
diff --git a/dev-ruby/shoulda/shoulda-3.6.0-r1.ebuild b/dev-ruby/shoulda/shoulda-3.6.0-r1.ebuild
deleted file mode 100644
index 88a3b81ac991..000000000000
--- a/dev-ruby/shoulda/shoulda-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="http://thoughtbot.com/projects/shoulda"
-SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# This now more or less a meta-gem and it only contains features for
-# integration tests using Appraisals, which we don't currently package.
-RESTRICT=test
-
-ruby_add_rdepend ">=dev-ruby/shoulda-context-1.0.1
-	dev-ruby/shoulda-matchers:3"
-
-all_ruby_prepare() {
-	sed -e '/executables/,/^  end/d ; /test_files/d; s/git ls-files/find . -print/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index c8379b5c13b4..1c6fb88432d3 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,5 +1,4 @@
 DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
-EBUILD slim-4.1.0-r1.ebuild 1791 BLAKE2B 7388a974e4bff14c9076261aaf4c30cfdad6d21ff490d2e598a0f1ddb2bae51fcc062c8554866f443aa26c13720fe7e219c2c807f9fad113d094a444544fca9b SHA512 c4945befb4f75827a88648bdff7635403ef4e46e6a279eaceb9f4337a1a65872b5da6d43654d689a229b605d2036693ea67478a46088f7d43188883eb805f3e2
 EBUILD slim-4.1.0-r2.ebuild 1788 BLAKE2B 9409fbbc13cdd4901732793ac7d2b72dde603bc696c060eb533f3f4ebb6d062e5b5adb71e1329de4fd0b7ed24b579c3181c039e448d0c63aef6c68ff7c4c1974 SHA512 139972932a87ab5288816657afb50511551c0d7afda284065d63074cda4138b284c5da44f1689de20fee0e8c8320df388fdea1f12f4d58ee7fde54d8e43cb2a1
 EBUILD slim-4.1.0.ebuild 1653 BLAKE2B c706e322135b0a78d2bc2fcbeb0fbaadf8c44bf4635850043b3281c560f7075ef1e8692cac6ca7df3a28f88bc176b068d1ee9e745fe88a50f89ae7f8dab62bc4 SHA512 2be3514f16ee6fd78dc2a28f2b88c737011acc7a8abaf9281cd36e2ceb3eaabdb579bf0d230cd67a88401bc2486b22037d7a31b77b5564dd1e4cee1eeb369624
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/slim/slim-4.1.0-r1.ebuild b/dev-ruby/slim/slim-4.1.0-r1.ebuild
deleted file mode 100644
index 598b0ee96d48..000000000000
--- a/dev-ruby/slim/slim-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_RECIPE_DOC="rake"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
-HOMEPAGE="http://slim-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="doc"
-
-ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
-	>=dev-ruby/temple-0.7.6:0.7
-	!!<dev-ruby/slim-3.0.9-r1"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
-
-ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sassc )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# This sinatra code expects tests to be installed but we strip those.
-	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
-
-	# Add missing include, bug 816573
-	sed -i -e "1irequire 'ostruct'" test/core/test_code_evaluation.rb || die
-
-	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
-	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
-		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
-		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
-		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
-		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
-
-	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
-		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
-}
diff --git a/dev-ruby/sus/Manifest b/dev-ruby/sus/Manifest
index 636fa286ba56..00a5959b72c4 100644
--- a/dev-ruby/sus/Manifest
+++ b/dev-ruby/sus/Manifest
@@ -1,7 +1,9 @@
 DIST sus-0.13.0.tar.gz 23399 BLAKE2B f96717409f5f14727b359e39bc1bb4726fe1cae98de46bf06e6e008df9a23746219decdb8de171cbc1c6c39ac84b4011e475daa43c7996c01968f4acc5289c84 SHA512 c0cb1b1d02e2fc812c6b3cf555af59f543bcdd82829d744d0e4fafb9043e503e8c9ebb52da33e56703d23ccaeaff583abf72e1df55a726ceca59d50d21b51eb3
 DIST sus-0.14.0.tar.gz 24207 BLAKE2B 1132e6fdf7c842ec8835613b647c837a1f5ec46c19743d186f7b57a68aff35201c29443e43242f0a375d97a0209148e483b6e8b8e44e1b94848f12a717161c42 SHA512 007eab396caa7401c028ee3b72f368810a6d01b50f84e657376ad8f7ea406b9a9cd13e3d481292197de05947a521513761da1141fc6b7e73791624966969281b
 DIST sus-0.15.0.tar.gz 25434 BLAKE2B 538ac7b81f7dcc74143e42a7b3fb5e12243b6a36228ac09cdf31549a9a666601d9e155fdd6ef079772b525e6993e07a12230ef87064d99b6ec5ddc643e9128cc SHA512 0110b08af0a94595764a9085e23d9d4b3ac1dec0b16e3c672b11520c7155d6b147890d53d25f00302812d22f95cb3ee7fc5563eae2476d8c99b7cc30aaadbc9e
+DIST sus-0.15.1.tar.gz 25680 BLAKE2B 4350023a6c2ae1c77687d0ebb66a31cd7a4d90cf955eabdca44be2282984aa3740e2f489844d7e30f448ba92cda6c949992cad1ed246c48db01c5b08ec058ad9 SHA512 f962f7f921144cca25faeb53be34a892501fdc1a2bd83dc64be7640232d1faa82b4d28c046af3440f7e142ea0fba525e1087b466952988e017ff469897dc01e4
 EBUILD sus-0.13.0.ebuild 814 BLAKE2B dca4143816b09ca42de7d48e1a8cf51f82ccf5406884a04090244221c869be29bb89c7986f896b4f0497e89d7a9e44f740dc66ac0ee58a04c6e6a5535b61eb47 SHA512 9e17bc2fdfc1f9e41f5d3775b211f538de8e48eef8075ca2ec1ff2d56be110bfa4c336b858ce6fde294f98f46cb447c7f80e70c96a1f7ba37c58cd393cfb1fb7
 EBUILD sus-0.14.0.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
 EBUILD sus-0.15.0.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
+EBUILD sus-0.15.1.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
 MISC metadata.xml 339 BLAKE2B a89a738b1bc39d01b68a8ff2f6ea0b7edbb35c6c9cad01b7762e2ee4e99b00bd72b87752832fb2a09017836a648334aefaf3009d6912917e490c13557427f963 SHA512 bcc9d407a5fb5159fc2910fa0eab40d3654d78907a0b1812351adf85cf577d3cef53550ebcd86aa40ddc6c03714df97469615dccab9ec4388728ab1106cf6cd0
diff --git a/dev-ruby/sus/sus-0.15.1.ebuild b/dev-ruby/sus/sus-0.15.1.ebuild
new file mode 100644
index 000000000000..439f98b70da2
--- /dev/null
+++ b/dev-ruby/sus/sus-0.15.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast and scalable test runner"
+HOMEPAGE="https://github.com/ioquatix/sus"
+SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Remove the sus configuration which enabled coverage checks.
+	# Its dependency is not packaged.
+	rm -f config/sus.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} bin/sus-parallel || die
+}
diff --git a/dev-ruby/terminal-table/Manifest b/dev-ruby/terminal-table/Manifest
index 69f9b13cd77c..436a720418ba 100644
--- a/dev-ruby/terminal-table/Manifest
+++ b/dev-ruby/terminal-table/Manifest
@@ -2,6 +2,6 @@ DIST terminal-table-1.8.0.tar.gz 13407 BLAKE2B cf1653a18d2b6b72757b149295e01aee8
 DIST terminal-table-2.0.0.tar.gz 14286 BLAKE2B aa4e132338a8bbdb8e665584fca947a5b92ee9b8126545b1fffd727d26c7158a9b1cf2959aa917bb93a47e01a4d605ca400d8ddb3be2f73da256ab2f96e91cde SHA512 568542f1fc60cfdb37b14f9d52d6fb6c3ccc36b5c0103c95e3d70fd5e1371c124c97cdea5a4d5a2ec63e34550624b38bd11e0af1073a8eefb3c5fd9eef427576
 DIST terminal-table-3.0.2.tar.gz 25087 BLAKE2B 302623aa95731c242d43726e35fa0998be863546dbded41ed39d43b2ef1ef3895e2896d337df14b52153606b20d01fb6d79a291b2598e533fed30e0ab7db6fbb SHA512 5e8aa375fb1a5d2789ac0a735e5b5420261700b91650658e2b084bc9544cc195a1af329d157626b6aa4e738ad59a860245da15a099940ba68bbe0e937fd2574d
 EBUILD terminal-table-1.8.0-r2.ebuild 806 BLAKE2B 7d22cd45200adf70c7e21cc7b58db8f0f73a4c71d203fe6cc9497781982849ed63be6e00b95901e73eb10ac4b873eebb8c98fc50bdf4d2121bc1e41bef37faf0 SHA512 d68792fa382212e872a056be00e115731ba10ed8d7614c2e899473b89c5c4457c125e2daca3f1b32246d401a38c83384db6e931c8de12aa34d8c91db0954f6db
-EBUILD terminal-table-2.0.0.ebuild 806 BLAKE2B 06655fbce9bc9477e1c975ae4026b9bb7e71a766175b7c36a2e3e423922fb7ca548b7ab8307a5966775d15f2aac5acb0995fd3971978fbb82fc13f77645e82b5 SHA512 a6d70d3de81c8253ee2ee43f148932a8f80048fa2f0bf6d709e46c1b82b61cf9aefcd93026cef435c10647c3acf0b80e3e249240856f1cc38414b311d3e561ef
+EBUILD terminal-table-2.0.0.ebuild 799 BLAKE2B fba9ed5482c4e64c8e82a8f23b1d3396224f01a19123c91f4ff5d00035f7ec43628adab0ca730f22a1d85bd071a3222150e961217d287e677d087626a1e42d56 SHA512 6f96d0dc1f6e4680a80b7909767ba1b817b781e1325c07bb5c01a7600b0d6966caf1d30ee8566e1ef9cdc3bd3b24a8aa7e936daf32cddd48472567d20aab8dd2
 EBUILD terminal-table-3.0.2.ebuild 864 BLAKE2B 17e484997f4c41e144fbd0c4c1aad7c73f0fd1aa1b18e250e9fd385873464d35e7d971b8f2d34347e3efe6b8f03dd65e5b66ff9a194a9527a778c914a0a8ce0e SHA512 df863482cd32d0ed3a926c5dfd0cd6893ff9741ed3abc321f3ebba8295809c345eb1506f6efa2dc8a8bcba4ebbc9b2cf05c088deb2b80e975eed3170ff0a7477
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/terminal-table/terminal-table-2.0.0.ebuild b/dev-ruby/terminal-table/terminal-table-2.0.0.ebuild
index 8e50ad85b62c..17ed5ebe4a0e 100644
--- a/dev-ruby/terminal-table/terminal-table-2.0.0.ebuild
+++ b/dev-ruby/terminal-table/terminal-table-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/vagrant_cloud/Manifest b/dev-ruby/vagrant_cloud/Manifest
index d2d3aac29070..553fdb2454b4 100644
--- a/dev-ruby/vagrant_cloud/Manifest
+++ b/dev-ruby/vagrant_cloud/Manifest
@@ -1,5 +1,3 @@
-DIST vagrant_cloud-3.0.2.tar.gz 34177 BLAKE2B 299014b569deac667429d90b8952f77a835669e17cf724ee7f5b6fd135c1a3f16b9292e203a75baf50cf117022d0ab4d31f797c432a07386097c6bcc338ae2da SHA512 c7e5050a0f3cefe95ad38e0734317a93939de0b54251163be1a52dfc413cdb08a4bf44e1c73215f81a0126552242a1d9f2cefe8fa43d9e60acf41ccdbed0ae80
 DIST vagrant_cloud-3.0.5.tar.gz 34844 BLAKE2B 2624219c470ed62e60056c825dc40611bf1bd2d1e822cc40e1592f8473517df53d814934f4426ef61d9adabbf89112bc1c44b61ee7129c4270e67b468fcf87cb SHA512 e3b138584baa956de30be5b307b7a05a728a9c84e5c4c831d9a703f0367886b82905057c8d6dda5e337b7b4256704d22a60869710e98493da8eea2074df70995
-EBUILD vagrant_cloud-3.0.2.ebuild 920 BLAKE2B baf0ef9263dcdf872aa2978bb62187d68ea1bead04049e94af26237a3f03f9a26c9a6f4b3bd12589092aefb3c81dc63041f615a2eb395160da736bb0cdf35ea3 SHA512 334260a27a1dbcee7acdb49675f7482f1cf134c6d7056b2a007653f7b0126e44ec615b876c1479166ed30b2ed39555f87918f86da4d182c66427b6dffd574df8
-EBUILD vagrant_cloud-3.0.5.ebuild 927 BLAKE2B 65253a3c43e304604f78ec0165d993c2702591b3ad2f5f2cfe350b91cf14bf682dbf7310570ae7d6a0cab8f5cfcde924069adb3c6fbd33ec722b1eb604dafcd7 SHA512 ea78745627cbd25ca1757c404abdc50ec7cc1129c3771a80610025be671900b049517802752d785db007c2d16515b7c1af490c79697c5839c3db5017b2b55a80
+EBUILD vagrant_cloud-3.0.5.ebuild 927 BLAKE2B b438365b59bf7b14bbbe960044b94aab6430aed8ecf2ef2b4e2ef13bb1887df71b94b75945e383b5205f35ee68316cf06a9939901f0b39c54b035566d60a55c3 SHA512 22446d912560cf5104a1ac07228cb46ab3bc432ce699f8d04a447750379876b0c7b80ffc758c736712eaf9681ee98ffccfe0610d519270af81dbd2fb8dcf9d92
 MISC metadata.xml 461 BLAKE2B 8c2cf50a097c308798cc3631fa3bec6f32e3d36d7b9c3c27445a43783a504c9390ea32ac5b1f419e197616728cf419d451490d3e6299ebb85eb6ae6b71542650 SHA512 c26dac7d5ce25b0f73794e9a7aa6dd2492d4b97ced106b2b76edcf4eaf9b83aea37940e918c2b22cb2f8ef019467bd30aaa9d08895aeaacccbbbb37fc28627e1
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.2.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.2.ebuild
deleted file mode 100644
index 4e3c8bb9b807..000000000000
--- a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_GEMSPEC="vagrant_cloud.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Vagrant Cloud API Library"
-HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/excon-0.73
-	>=dev-ruby/log4r-1.1.10
-"
-ruby_add_bdepend ">=dev-ruby/rake-12.3
-	test? (
-		>=dev-ruby/webmock-3.0
-	)
-"
-
-all_ruby_prepare() {
-	# # loosen dependencies
-	sed -e 's:require_relative ":require "./:' \
-		-e '/excon/s/~>/>=/' \
-		-e '/log4r/s/~>/>=/' \
-		-e '/rake/s/~>/>=/' \
-		-e '/rspec/s/~>/>=/' \
-		-e '/webmock/s/~>/>=/' \
-		-i ${PN}.gemspec || die
-}
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild
index b4616b1828d2..9100da45f0d5 100644
--- a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild
+++ b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f4221a8710a3..0355c262e3f1 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 6e545efd751a..362a4a886d40 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,11 +1,7 @@
-AUX 41.2-meson-0.61.patch 1775 BLAKE2B b169bd8ea9d84c074426219fcf9b2a37557490c1dc3a2e647016b6c46d2ecbc02000f9595da9375cf9a4b00d22c95ad831ef72fceb3192030bcefcdc073afe8c SHA512 50500f5ddaf5eafb1299f24d1b1dba4b0808c9a140f1d7c0748cc73d8da25e0a444bcd1a1293c331158a3f0f96af1ab9cb27c37498437f0bdbffb191d93777ac
 AUX 41.2-optional-introspection.patch 1196 BLAKE2B 85c451d943b23c0d0c26268b4a32ac177c9dba3b048446c0e3eb3c47fbe23e54602d3d5d5f3a72f76d8f8dc6382b4d9499a0b8c2b2d20bf9553334e205b12a27 SHA512 10aec862a82af083cadc4b182ac1e69566f4a3f9f4114fdefecf414b380a348c62edd4fefdf833300d2e2233454e17ee1092e228683f6fd30d02e2f9db3b6ef7
-AUX 41.2-webkitgtk40.patch 1174 BLAKE2B 9c93f1d8b214f8569f560de51d3e8f308e2ecb4dd00f8dc1e4daef5eef87a785289c1ab53b94de0e8e75493015fa13669c1a7b0cdfe7750617275fa13e830a47 SHA512 22b45421fe5e0e312cff0128f98fce32f76a15b5316ca8a4065db3a300dc0e12e04ac2a0a6c47e47ca7ff49c4a4e0c2e0a4accd10981f05eb6bf312860da0138
 AUX 41.3-webkitgtk40.patch 1005 BLAKE2B 59b4d5d197be0837f166ddebbaa63abd235934398b6df3c7a715ce05a13c006e20fe83ab91604ac2fce2a737e46812011f8dac7158b2b77cf1f85742a949ca17 SHA512 8afaea3f0ae6ebb64b5ea4518f091aee6fa90f63badbcfaef5d06d411300d93027c8e64ce3f3e4fcee7e7a31c53627afeaf0ce1c83797fd348163277a88726c5
-DIST devhelp-41.2.tar.xz 1455736 BLAKE2B c531af6cded6c9624581e4d14fb4d7713afbdcf173ec2a82e49789af1752568790dc346cc0293eddc68c0943fec4f742de726953de34441771711a938ba858fa SHA512 99a75ff19bf1b4613c312921452f190334e3e2036c28cda070169e3d1d352a5d2e7a56a393326efd679076257412e281dc94b628429119fcad58060d1a88ea98
 DIST devhelp-41.3.tar.xz 2303068 BLAKE2B 1c08931897a7cd1d15028d9394479297d6fffc48412aa31cc739380405b8588fec47fddbea803c80d44eb23d2fa84d5f9a42aa8b061859d459e450ccd76ee82d SHA512 91251f1d8c0380f16768a1fed2d0a0a19935a646613a966c48ae70e52bfe8b6aa0c683d2b371d9e25dfdfcaeac687ea2c83c2bfd5f4f35394bb4576e6f98b48d
 DIST devhelp-43.0.tar.xz 327508 BLAKE2B 455015ec115610f27c2a1d9c3a8a21f50d8b061de7524371d892aba35173278f3aabe623b0b6770437b1501e6af795a9a12c9cc3ae238d8691d00e27388ae1a4 SHA512 92f147659754480ac4aa02f21558572d4bb8a034251225d344a8cae16824d9c14071751dfca6439f98dc7f7884fb35ef2d9c708e42f11bb6b3dfd8648b784654
-EBUILD devhelp-41.2.ebuild 1987 BLAKE2B 6a1fce0b8bf95a811b8e19133779ba29ec708f9f19c7da726c6a4eaa75b300d8d1a885de8b7a01cfb7507f7684325200b435210e88656de508089f4a1e2a1017 SHA512 223d44651c3e98b1837e4012ad4bec4144d440e780b9cdb548e96656934b1cea06808aa0902d2aa37379e66c9485fa9d999f53c4c1c0cee8d94b1144fae9f0fa
 EBUILD devhelp-41.3.ebuild 1947 BLAKE2B 8299890f3c1e0b01aa9f058831d4a423b88d0b8daeebc4b896b15f33d12c7dfecee66f0e8f7c14051cdf979f7ee5ae24163b37ee2d1a2a9e906429b9dad4531a SHA512 861738789082d443f1641869cac127d2ed44bc628f9f21be1c69e8384e594265a39aae0a82cd8f6e2b0fd43da6dcffe15a0f92f88faed31a0c03e78794546615
 EBUILD devhelp-43.0.ebuild 1905 BLAKE2B c3674d55fe2bc7b05810badaa3300dcd3bf400be3a3f6464164c9d7b0ed0fb7c296ebf13eced5eef2ff4304f16d953d6d720d0c86070e9a93f2f6a5141eafbc7 SHA512 344001aa1709810a25b57568fa6492957fa61e05d399981230662a642531b0f6bbb25051dfe08ca5c11464346561177e8e9ce90240606d5a4689a57aded56744
 MISC metadata.xml 443 BLAKE2B 87f4012dd8dac2a075656c3da08e1c95b7d14d2182d0309c8d55136ed8acb86309f5eb76b3fb0330964bd3484d99a1b7545da30e8210b53a52ac07bd00ef6327 SHA512 5cb45a90194fd472afb7abef7907d4e77b7bbafb35d9bcf901ef6e26b36203200777b1a7f96fe504801ac52920e1fc0ca7a1411b15ddc92fa51997cdf640d368
diff --git a/dev-util/devhelp/devhelp-41.2.ebuild b/dev-util/devhelp/devhelp-41.2.ebuild
deleted file mode 100644
index 98fc2847065b..000000000000
--- a/dev-util/devhelp/devhelp-41.2.ebuild
+++ /dev/null
@@ -1,85 +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 gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-3+ CC-BY-SA-4.0"
-SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
-IUSE="+gedit gtk-doc +introspection"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} ) gtk-doc? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.64:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=net-libs/webkit-gtk-2.26:4[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? ( >=dev-util/gi-docgen-2021.6 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-optional-introspection.patch
-	"${FILESDIR}"/${PV}-webkitgtk40.patch
-
-	"${FILESDIR}"/${PV}-meson-0.61.patch
-)
-
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dflatpak_build=false
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		-Dplugin_emacs=true
-		$(meson_use gedit plugin_gedit)
-		-Dplugin_vim=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/devhelp-3 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-	use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/devhelp/files/41.2-meson-0.61.patch b/dev-util/devhelp/files/41.2-meson-0.61.patch
deleted file mode 100644
index dd75f802056a..000000000000
--- a/dev-util/devhelp/files/41.2-meson-0.61.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/43.patch
-https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/42.patch
-https://bugs.gentoo.org/831928
-
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build                 | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
--  appdata,
-   input: configure_file(
-     input: 'org.gnome.Devhelp.appdata.xml.in.in',
-     output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
--  desktop,
-   type: 'desktop',
-   input: configure_file(
-     input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
- 
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
--  plugin_info_file,
-   type: 'desktop',
-   input: plugin_info_file + '.desktop.in',
-   output: plugin_info_file,
--- 
-GitLab
-
diff --git a/dev-util/devhelp/files/41.2-webkitgtk40.patch b/dev-util/devhelp/files/41.2-webkitgtk40.patch
deleted file mode 100644
index 967d276bfa83..000000000000
--- a/dev-util/devhelp/files/41.2-webkitgtk40.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7b0ef55edd63c71be209aa3b57e2190d4ce4fb90 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 3 Oct 2021 23:52:27 +0300
-Subject: [PATCH] build: Don't automagically depend on webkit2gtk-4.1
-
-That's the libsoup3 using webkit-gtk SLOT that we don't have. Patch it out,
-so it wouldn't be picked up automagically once it's added or comes from some
-overlay.
-
-This reverts commit f9d52aad23914df9dcb404723d1c99cf7b4e1eca.
----
- meson.build | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index e57e466e..492aafed 100644
---- a/meson.build
-+++ b/meson.build
-@@ -46,15 +46,10 @@ lt_revision = 3
- lt_age = 0
- LIBDEVHELP_LT_VERSION = '@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age)
- 
--webkit_dep = dependency('webkit2gtk-4.1', required : false)
--if not webkit_dep.found()
--  webkit_dep = dependency('webkit2gtk-4.0')
--endif
--
- LIBDEVHELP_PUBLIC_DEPS = [
-   dependency('gio-2.0', version: '>= 2.64'),
-   dependency('gtk+-3.0', version: '>= 3.22'),
--  webkit_dep,
-+  dependency('webkit2gtk-4.0', version: '>= 2.26'),
- ]
- LIBDEVHELP_PRIVATE_DEPS = [
-   dependency('gsettings-desktop-schemas'),
--- 
-2.32.0
-
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index eaeda47e4a24..94025d54828b 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,13 +1,7 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
-DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
-DIST glib-2.74.0.tar.xz 5183072 BLAKE2B b21e5a72e2ce3390cbf13601aa902104f1ac1cfbd75181d30cd340f24b5875753f898b229f99c71d47d499be86cddb0191a0072c0c2decc82956a46c16255905 SHA512 5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225
 DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
-DIST glib-2.74.2.tar.xz 5182312 BLAKE2B 319a8fb793adb7343b77119d7b7839efad6f91b9c7af079f53d54b435067ab12162c4791ca6b8e9b7fd6d269975e9559951cbf80a065072541f407a0d8e2ce74 SHA512 90bb2410f038e47401fc985ff7fe6d1abecec9417254e039ac18e6b0d77e0b8539b975bef84d5f933be8e43c8ceca236bd466622504491e08e71d079d8804895
 DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b
-EBUILD gdbus-codegen-2.72.3.ebuild 2193 BLAKE2B 5bbd1717305885363c6221e48488dd2d3aa23ea8bc49c561f420f5029c63cdf528fb027027d00b42dc54386c1ec3be6958b56289ed71287d28f04224cdf908cd SHA512 54a411c57910e57f033b92a437d44f1af9f4d7fb72b361b86ecb69fc38f39cac44aa45e95dae7fccbbed94f5043e703a2c71ff9464f54cdc3a3c274559ba3684
-EBUILD gdbus-codegen-2.74.0.ebuild 2205 BLAKE2B bfafd9b08250c6a2ecdcf43150ce1e73a5830dd5b3b25d8095e60cdf2396d871698f23525a7aa9395669191a5a507c9f8cd53d2215e9b83e6d907eef2315c963 SHA512 2d7fdca3ea1983f1fde3b6b1759c68faa515995030586cb62dc4e836d7b62da0ae03686c5316fe4b8ec66e320d7cc7cd58c159b9a8009c665be51600e0134da7
 EBUILD gdbus-codegen-2.74.1.ebuild 2197 BLAKE2B 5feb327a7db8b4d345f3b1383be73dcbbf6da3d86815c8c7994bbe405b43cc92ca855ae9277ff688eca859aadcc7271bed531e1fc3ffcc329ae7caf37a976648 SHA512 8842a8eab75118b9ac6ed0843568f1e352ce31d06dd77d87512d4da2cfa08d31658bf29a6c0705cea1062f13633739880e07091f2ca5147dda97c7625f2bc433
-EBUILD gdbus-codegen-2.74.2.ebuild 2205 BLAKE2B bfafd9b08250c6a2ecdcf43150ce1e73a5830dd5b3b25d8095e60cdf2396d871698f23525a7aa9395669191a5a507c9f8cd53d2215e9b83e6d907eef2315c963 SHA512 2d7fdca3ea1983f1fde3b6b1759c68faa515995030586cb62dc4e836d7b62da0ae03686c5316fe4b8ec66e320d7cc7cd58c159b9a8009c665be51600e0134da7
 EBUILD gdbus-codegen-2.74.3.ebuild 2205 BLAKE2B bfafd9b08250c6a2ecdcf43150ce1e73a5830dd5b3b25d8095e60cdf2396d871698f23525a7aa9395669191a5a507c9f8cd53d2215e9b83e6d907eef2315c963 SHA512 2d7fdca3ea1983f1fde3b6b1759c68faa515995030586cb62dc4e836d7b62da0ae03686c5316fe4b8ec66e320d7cc7cd58c159b9a8009c665be51600e0134da7
 MISC metadata.xml 345 BLAKE2B 91a0526be5ce32d4aa4ea0827c78b2d2d45beae9a8d467916448a0a6b5459fd457e44ac900182654826328b34d37999bedb3ade42e80db92312e50f34d940014 SHA512 b11e427345fab56c77cb1f4f96473645b69054012e86840e2ca7dab221cf55041a1add1dfabce155274acf18488ac79de8149d405213daf39b807f679d4ac752
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild
deleted file mode 100644
index 111476eb0a49..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.72.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	local MAJOR_VERSION=$(ver_cut 1)
-	local MINOR_VERSION=$(ver_cut 2)
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" \
-		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
-		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.74.0.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.74.0.ebuild
deleted file mode 100644
index 6964fb9fd48a..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.74.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	local MAJOR_VERSION=$(ver_cut 1)
-	local MINOR_VERSION=$(ver_cut 2)
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" \
-		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
-		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.74.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.74.2.ebuild
deleted file mode 100644
index 6964fb9fd48a..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.74.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	local MAJOR_VERSION=$(ver_cut 1)
-	local MINOR_VERSION=$(ver_cut 2)
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" \
-		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
-		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 6e85808c1ca9..a937ad74e539 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,5 +1,4 @@
 AUX geany-plugins-1.38-libgit2-1.4.patch 4854 BLAKE2B 5605f5776186adaadbc0f861a1de217587a0cadcbd5f0844a0071246e5622ac830f759de4b1c7a5a3540d809c40822b619d0985561cb0f05c557c6d4d06a4a37 SHA512 9b35a656171a6183bbc8764622903d2e7767fafb548c3f2d3cb4e072a01c0bdbbfbeee20b65d42dc36f30bbfde28c5c2899e14f5ccdde1c8e96c877670889977
 DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339
-EBUILD geany-plugins-1.38-r1.ebuild 2910 BLAKE2B 76181571b98ee1e7296a5f2859aea3b0acb51cda51fb729e670ea9c4d3818377b5d9d54d8399a9af866a0451b82fea5198cc13eb9b233682357b64849a14bbbb SHA512 e7f18ef4f0f9ba326050e9ff48aed4bd3a493be4d71ede5e76da1952c870b78c8c56d1d9cb5401b8fdec0cf0cf2248e11e84cb5aee7f32c266dbe24441460f89
 EBUILD geany-plugins-1.38-r4.ebuild 3173 BLAKE2B 750f296457022b3c48d727eb46f77633ecb94d9332dee8d52b6c37083c4db07b526ba4194b88b20d7e8c20c8454f92bb3d1ad8a2abb1bfd85e2304f9fd00da04 SHA512 d7ffc5578ef927219028643220baa674da0f09642769183e1eb8c29a48efa99d5fdade4d763f3602a4c2fb6da8e29d49a820ee1fcbe7bef7c90fdc462d773305
 MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a
diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.38-r1.ebuild
deleted file mode 100644
index 75c0519d993a..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.38-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-
-inherit lua-single
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
-
-IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.37[-gtk2(-)]
-	x11-libs/gtk+:3
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:2.91 )
-	enchant? ( app-text/enchant:= )
-	git? ( <dev-libs/libgit2-1.4.0:= )
-	gpg? ( app-crypt/gpgme:= )
-	gtkspell? ( app-text/gtkspell:3= )
-	lua? ( ${LUA_DEPS} )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	scope? ( x11-libs/vte:2.91 )
-	soup? ( net-libs/libsoup:2.4 )
-	workbench? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}
-	scope? ( sys-devel/gdb )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanydoc
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable workbench)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-		# GTK 2 only
-		--disable-geanypy
-		--disable-multiterm
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 1c287ad9147e..a7b6fbc7d72f 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,11 +1,5 @@
-DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
-DIST glib-2.74.0.tar.xz 5183072 BLAKE2B b21e5a72e2ce3390cbf13601aa902104f1ac1cfbd75181d30cd340f24b5875753f898b229f99c71d47d499be86cddb0191a0072c0c2decc82956a46c16255905 SHA512 5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225
 DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
-DIST glib-2.74.2.tar.xz 5182312 BLAKE2B 319a8fb793adb7343b77119d7b7839efad6f91b9c7af079f53d54b435067ab12162c4791ca6b8e9b7fd6d269975e9559951cbf80a065072541f407a0d8e2ce74 SHA512 90bb2410f038e47401fc985ff7fe6d1abecec9417254e039ac18e6b0d77e0b8539b975bef84d5f933be8e43c8ceca236bd466622504491e08e71d079d8804895
 DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b
-EBUILD glib-utils-2.72.3.ebuild 2332 BLAKE2B eae0be3ecd001de535ff7db1483b93bdcc5405ed13935073cec2c4c92755bbe6628f86c9477396b54280384f16487af9b842dd92b7214e8e127e7affbfd68520 SHA512 2095a7aa280bbff2ce40745fc1e349fcc8fd890634b4303ff1b65b7410d0f8f30e6ff05f7f580650b48dbdc2c682a82475d0cf1c6e791da6c20eea2a259f9ea1
-EBUILD glib-utils-2.74.0.ebuild 2340 BLAKE2B 76f931baf38bb3e77988477867d576576aef408a629a10b20e5ae6a7fae2b4c8ff8f108d7f4cd23efc1a17c4f8809c537190394fc7cbfb3c3a777d7b9df18fcb SHA512 ad137f2ee9ea091e5ddb4d2ba7455cba82b003d748ffa0ae56cf53e6e443b029f0558b9b7632c4d50ae36a55904dff54cec99bc2d49ee609054fadac9c79f144
 EBUILD glib-utils-2.74.1.ebuild 2332 BLAKE2B eae0be3ecd001de535ff7db1483b93bdcc5405ed13935073cec2c4c92755bbe6628f86c9477396b54280384f16487af9b842dd92b7214e8e127e7affbfd68520 SHA512 2095a7aa280bbff2ce40745fc1e349fcc8fd890634b4303ff1b65b7410d0f8f30e6ff05f7f580650b48dbdc2c682a82475d0cf1c6e791da6c20eea2a259f9ea1
-EBUILD glib-utils-2.74.2.ebuild 2340 BLAKE2B 76f931baf38bb3e77988477867d576576aef408a629a10b20e5ae6a7fae2b4c8ff8f108d7f4cd23efc1a17c4f8809c537190394fc7cbfb3c3a777d7b9df18fcb SHA512 ad137f2ee9ea091e5ddb4d2ba7455cba82b003d748ffa0ae56cf53e6e443b029f0558b9b7632c4d50ae36a55904dff54cec99bc2d49ee609054fadac9c79f144
 EBUILD glib-utils-2.74.3.ebuild 2340 BLAKE2B 76f931baf38bb3e77988477867d576576aef408a629a10b20e5ae6a7fae2b4c8ff8f108d7f4cd23efc1a17c4f8809c537190394fc7cbfb3c3a777d7b9df18fcb SHA512 ad137f2ee9ea091e5ddb4d2ba7455cba82b003d748ffa0ae56cf53e6e443b029f0558b9b7632c4d50ae36a55904dff54cec99bc2d49ee609054fadac9c79f144
 MISC metadata.xml 401 BLAKE2B bdf1884a4dcf8ab8362a86ed6559bb887c026bc315bd8cbfca0b5d8def8102636965da5af0f1871096704309a4a0919028d02f168a91830aa4ed911c6583d103 SHA512 2eaaccd9c6bd6e059b3acf34c964857a9e541f2eedd191c0fa35eca3499242349184ab01becca40791ac1dcdf02ba4a75369ea9c69fa5c21f15d878b1c28c453
diff --git a/dev-util/glib-utils/glib-utils-2.72.3.ebuild b/dev-util/glib-utils/glib-utils-2.72.3.ebuild
deleted file mode 100644
index fb40867171aa..000000000000
--- a/dev-util/glib-utils/glib-utils-2.72.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glib-utils/glib-utils-2.74.0.ebuild b/dev-util/glib-utils/glib-utils-2.74.0.ebuild
deleted file mode 100644
index c715c1e6fd52..000000000000
--- a/dev-util/glib-utils/glib-utils-2.74.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glib-utils/glib-utils-2.74.2.ebuild b/dev-util/glib-utils/glib-utils-2.74.2.ebuild
deleted file mode 100644
index c715c1e6fd52..000000000000
--- a/dev-util/glib-utils/glib-utils-2.74.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 0a816ed5bc54..fc27fffed817 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,9 +1,5 @@
 DIST gnome-builder-42.1.tar.xz 13276028 BLAKE2B 657e362ab9a2df1c70d9071ecc010747e5c73bbaa1c0d903778720e4fe874361013cfca3fe162328dfae180502c4fcc68ee01f04d1329add874b9e8db41abcd1 SHA512 a04a71efb163808ed4bfc446334b8f9cabe33cd33c977c9047e4fb00042b18cf7095217b2e287a45efda863ef479fce11435a2d24d489ba1816e3f36a561244e
-DIST gnome-builder-43.2.tar.xz 10276768 BLAKE2B 52637fdcac1d455cfe84c7f8eead8ce941ff641c0af932b053afa6c346ed1eab54747edbf5b3a516cdc557cc0c2934fcd9c352ff71a1ee74830d8bd11d452af6 SHA512 39e4081bbd2aae8bb2ce152b6a907849693a7c7fc12d232b6909a15eed9dd791e58b1dabfadc92cfdc01ba2ab20c553bf0dd4f098d0441f0705e3db3bfe67869
-DIST gnome-builder-43.3.tar.xz 10283952 BLAKE2B c0200eaa4c1c31473f550765cb95e3efec292028e6878570fc606627a99765e9825550b06f52cf96c812d9f31a177535bd4b7256ec8526e1284bee7144343707 SHA512 841d7ff91206b752cdddedceea4a826475c4cf8e5ebf73a4a66df8089ea9d9483d6415b394dcc2eb4a42fb07549477dd3341edf72b186bc7075fa5548a381633
 DIST gnome-builder-43.4.tar.xz 10284936 BLAKE2B 50af653566b35525a751d1ab0698c42e205aa8ab3205b390d10625f67a984986f24e5c0a5512629d81c082265435d5f39380de2c675d64e9f0b6d47c2fc62451 SHA512 c8600aea7bd01fb8a75baf321d8670600aa0ac77f7a42cccc7107fd9d2addd0264f132a4e36c2ae66ad7dbd8dc94dfc52421655254eee93d0a3298aa2cc224db
 EBUILD gnome-builder-42.1.ebuild 8921 BLAKE2B 0b79471710a2432aa121e87e2d43bb9cceb61d70fd7d08afe99d6751f26c7bf2a5961b066c6d48aef2551b74c4f56339820fd19fce26b774c6c606d572d7f467 SHA512 882919890160bf663592ddaddd866f1c5cc9d3a10be5e96a6548cc9e379962b7a62cf958510948556261ac2239ac23ce160cefd47b1a236e77662e3696a97291
-EBUILD gnome-builder-43.2.ebuild 8709 BLAKE2B bd7fb9dba3b5a491d648e1dcb5181c7bcd4e5f0f6da8cdcd2d8a45a985ee1e8c99377746ea0b5613686a75f230fc030d141caf4ec4934af7d270c9e8d3495419 SHA512 52742ee80046072a08c27f583434d1adf44b11d304702d26abb5fa3dff27868882e97e85a7ef826a8d9ebd625f4015b3dc211750009cad5c66e5e168f2dd47d8
-EBUILD gnome-builder-43.3.ebuild 8736 BLAKE2B da77656d752e2699b54a15a61008eeb293ae61cef96408cb1dd4ee9d29302bbf2d083ed8f752955f924878ce67e6d717939a1396712db90d96aba2833b1a3807 SHA512 bd038dc96ea9e48e6b33f5fc3d4e6d824bec7653e9af1933e4f5f81c42ae339b7285151baa0b83b7647d53fbc903e622c379c5a44e40c783daa780fab42458f2
 EBUILD gnome-builder-43.4.ebuild 8736 BLAKE2B da77656d752e2699b54a15a61008eeb293ae61cef96408cb1dd4ee9d29302bbf2d083ed8f752955f924878ce67e6d717939a1396712db90d96aba2833b1a3807 SHA512 bd038dc96ea9e48e6b33f5fc3d4e6d824bec7653e9af1933e4f5f81c42ae339b7285151baa0b83b7647d53fbc903e622c379c5a44e40c783daa780fab42458f2
 MISC metadata.xml 1302 BLAKE2B 4b3d7db71bc6f2845edc145cee644fc57679da608056d2d2e8e364d1b0ea8bc321a3a61bd432a3aaf2df0214d3cd6371deabae63e8a0b7b71a01f8db00ae1ad3 SHA512 43daeda3e037db0d11071d0011ca8122d0f2ee990f4d0bf44eeba9636c1d7518615053ce5698ab1e60e44ef6651f5c0aced8d2f233ff057e97b2d8fe1da84df3
diff --git a/dev-util/gnome-builder/gnome-builder-43.2.ebuild b/dev-util/gnome-builder/gnome-builder-43.2.ebuild
deleted file mode 100644
index d2082c62d4c0..000000000000
--- a/dev-util/gnome-builder/gnome-builder-43.2.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	flatpak? ( git )
-"
-
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
-# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path.
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
-
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
-
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-RDEPEND="
-	>=dev-libs/glib-2.73.3:2
-	>=gui-libs/gtk-4.7.1:4[introspection]
-	>=gui-libs/libadwaita-1.2.0:1
-	>=gui-libs/libpanel-1.0.0:1
-	>=gui-libs/gtksourceview-5.5.2:5[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.42.0:=
-	>=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]
-	dev-libs/libportal:=[gtk,introspection]
-	>=dev-libs/template-glib-3.36.0:=[introspection]
-	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]
-	>=dev-libs/libxml2-2.9.0
-	webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] )
-	>=app-text/cmark-0.29.0:0=
-	d-spy? ( >=dev-util/d-spy-1.4.0:1 )
-	app-text/editorconfig-core-c
-	flatpak? (
-		dev-util/ostree
-		>=net-libs/libsoup-3:3.0
-		>=sys-apps/flatpak-1.10.2
-	)
-	git? (
-		dev-libs/libgit2:=[ssh,threads]
-		>=dev-libs/libgit2-glib-1.1.0[ssh]
-	)
-
-	>=dev-libs/gobject-introspection-1.54.0:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	clang? ( sys-devel/clang:= )
-	spell? (
-		app-text/enchant:2
-		dev-libs/icu:=
-	)
-	sysprof? (
-		>=dev-util/sysprof-capture-3.46.0:4
-		>=dev-util/sysprof-3.46.0:0/4
-	)
-"
-DEPEND="${RDEPEND}"
-# TODO: runtime ctags path finding..
-
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for validation with appstream-util with FEATURES=test
-BDEPEND="
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		')
-	)
-	gtk-doc? (
-		dev-util/gi-docgen
-		app-text/docbook-xml-dtd:4.3
-	)
-	test? (
-		dev-libs/appstream-glib
-		sys-apps/dbus
-	)
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
-* dev-util/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package codespell and mention here
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
-# jhbuild support
-# rust support via rust-analyzer; Go via go-langserver
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
-# stylelint for stylesheet (CSS and co) linting
-# gvls for vala language-server integration
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dchannel=other
-
-		-Ddevelopment=false
-		-Dtracing=false
-		-Dprofiling=false # not passing -pg to CFLAGS
-		-Dtcmalloc=false
-		-Dwith_safe_path=''
-		-Dgnome_sdk_version=master
-		$(meson_use doc help)
-		$(meson_use gtk-doc docs)
-		-Dnetwork_tests=false
-		-Dctags_path=''
-		$(meson_feature webkit)
-
-		-Dplugin_autotools=true
-		-Dplugin_bash_language_server=true
-		-Dplugin_blueprint=true
-		-Dplugin_buildstream=true
-		-Dplugin_c_pack=true
-		-Dplugin_cargo=true
-		$(meson_use clang plugin_clang)
-		$(meson_use clang plugin_clangd)
-		$(meson_use clang plugin_clang_format)
-		-Dplugin_cmake=true
-		-Dplugin_codespell=true
-		-Dplugin_code_index=true
-		-Dplugin_copyright=true
-		-Dplugin_ctags=true
-		-Dplugin_deviced=false # libdeviced not packaged?
-		$(meson_use d-spy plugin_dspy)
-		-Dplugin_editorconfig=true
-		-Dplugin_eslint=true
-		-Dplugin_file_search=true
-		$(meson_use flatpak plugin_flatpak)
-		-Dplugin_gdb=true
-		-Dplugin_gdiagnose=true
-		-Dplugin_gettext=true
-		$(meson_use git plugin_git)
-		-Dplugin_gopls=true
-		-Dplugin_gradle=true
-		-Dplugin_grep=true
-		-Dplugin_html_completion=true
-		$(meson_use webkit plugin_html_preview)
-		-Dplugin_intelephense=true
-		-Dplugin_jdtls=true
-		-Dplugin_jedi_language_server=true
-		-Dplugin_jhbuild=true
-		-Dplugin_make=true
-		-Dplugin_make_templates=true
-		$(meson_use webkit plugin_markdown_preview)
-		-Dplugin_maven=true
-		-Dplugin_meson=true
-		-Dplugin_meson_templates=true
-		-Dplugin_modelines=true
-		-Dplugin_mono=true
-		-Dplugin_newcomers=true
-		-Dplugin_notification=true
-		-Dplugin_npm=true
-		-Dplugin_phpize=true
-		-Dplugin_podman=true
-		-Dplugin_pygi=true
-		# -Dplugin_python_lsp_server=true # isn't recognized by meson even though it's in meson.build and meson-options.txt. See also: https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/1842
-		-Dplugin_qemu=true
-		-Dplugin_quick_highlight=true
-		-Dplugin_retab=true
-		-Dplugin_rstcheck=true
-		-Dplugin_rubocop=true
-		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
-		-Dplugin_shellcmd=true
-		$(meson_use spell plugin_spellcheck)
-		$(meson_use webkit plugin_sphinx_preview)
-		-Dplugin_stylelint=true
-		$(meson_use sysprof plugin_sysprof)
-		-Dplugin_sysroot=true
-		-Dplugin_todo=true
-		-Dplugin_ts_language_server=true
-		-Dplugin_update_manager=true
-		-Dplugin_valac=true
-		-Dplugin_vala_indenter=true
-		-Dplugin_valgrind=true
-		-Dplugin_vls=true
-		-Dplugin_waf=true
-		-Dplugin_words=true
-		-Dplugin_xml_pack=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-	if use doc; then
-		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
-		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
-		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
-		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
-		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
-		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-
-	optfeature_header "Language support"
-	optfeature "Rust's Cargo build system" virtual/rust
-	optfeature "CMake" dev-util/cmake
-	optfeature "Java Maven build system" dev-java/maven-bin
-	optfeature "Meson Build system" dev-util/meson
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-util/gnome-builder/gnome-builder-43.3.ebuild b/dev-util/gnome-builder/gnome-builder-43.3.ebuild
deleted file mode 100644
index 5dee6c02e24e..000000000000
--- a/dev-util/gnome-builder/gnome-builder-43.3.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	flatpak? ( git )
-"
-
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
-# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path.
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
-
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
-
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-RDEPEND="
-	>=dev-libs/glib-2.73.3:2
-	>=gui-libs/gtk-4.7.1:4[introspection]
-	>=gui-libs/libadwaita-1.2.0:1
-	>=gui-libs/libpanel-1.0.0:1
-	>=gui-libs/gtksourceview-5.5.2:5[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.42.0:=
-	>=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]
-	dev-libs/libportal:=[gtk,introspection]
-	>=dev-libs/template-glib-3.36.0:=[introspection]
-	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]
-	>=dev-libs/libxml2-2.9.0
-	webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] )
-	>=app-text/cmark-0.29.0:0=
-	d-spy? ( >=dev-util/d-spy-1.4.0:1 )
-	app-text/editorconfig-core-c
-	flatpak? (
-		dev-util/ostree
-		>=net-libs/libsoup-3:3.0
-		>=sys-apps/flatpak-1.10.2
-	)
-	git? (
-		dev-libs/libgit2:=[ssh,threads]
-		>=dev-libs/libgit2-glib-1.1.0[ssh]
-	)
-
-	>=dev-libs/gobject-introspection-1.54.0:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	clang? ( sys-devel/clang:= )
-	spell? (
-		app-text/enchant:2
-		dev-libs/icu:=
-	)
-	sysprof? (
-		>=dev-util/sysprof-capture-3.46.0:4
-		>=dev-util/sysprof-3.46.0:0/4
-	)
-"
-DEPEND="${RDEPEND}"
-# TODO: runtime ctags path finding..
-
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for validation with appstream-util with FEATURES=test
-BDEPEND="
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		')
-	)
-	gtk-doc? (
-		dev-util/gi-docgen
-		app-text/docbook-xml-dtd:4.3
-	)
-	test? (
-		dev-libs/appstream-glib
-		sys-apps/dbus
-	)
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
-* dev-util/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package codespell and mention here
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
-# jhbuild support
-# rust support via rust-analyzer; Go via go-langserver
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
-# stylelint for stylesheet (CSS and co) linting
-# gvls for vala language-server integration
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dchannel=other
-
-		-Ddevelopment=false
-		-Dtracing=false
-		-Dprofiling=false # not passing -pg to CFLAGS
-		-Dtcmalloc=false
-		-Dwith_safe_path=''
-		-Dgnome_sdk_version=master
-		$(meson_use doc help)
-		$(meson_use gtk-doc docs)
-		-Dnetwork_tests=false
-		-Dctags_path=''
-		$(meson_feature webkit)
-
-		-Dplugin_autotools=true
-		-Dplugin_bash_language_server=true
-		-Dplugin_blueprint=true
-		-Dplugin_buildstream=true
-		-Dplugin_c_pack=true
-		-Dplugin_cargo=true
-		$(meson_use clang plugin_clang)
-		$(meson_use clang plugin_clangd)
-		$(meson_use clang plugin_clang_format)
-		-Dplugin_cmake=true
-		-Dplugin_codespell=true
-		-Dplugin_code_index=true
-		-Dplugin_copyright=true
-		-Dplugin_ctags=true
-		-Dplugin_deviced=false # libdeviced not packaged?
-		$(meson_use d-spy plugin_dspy)
-		-Dplugin_editorconfig=true
-		-Dplugin_eslint=true
-		-Dplugin_file_search=true
-		$(meson_use flatpak plugin_flatpak)
-		-Dplugin_gdb=true
-		-Dplugin_gdiagnose=true
-		-Dplugin_gettext=true
-		$(meson_use git plugin_git)
-		-Dplugin_gopls=true
-		-Dplugin_gradle=true
-		-Dplugin_grep=true
-		-Dplugin_html_completion=true
-		$(meson_use webkit plugin_html_preview)
-		-Dplugin_intelephense=true
-		-Dplugin_jdtls=true
-		-Dplugin_jedi_language_server=true
-		-Dplugin_jhbuild=true
-		-Dplugin_make=true
-		-Dplugin_make_templates=true
-		$(meson_use webkit plugin_markdown_preview)
-		-Dplugin_maven=true
-		-Dplugin_meson=true
-		-Dplugin_meson_templates=true
-		-Dplugin_modelines=true
-		-Dplugin_mono=true
-		-Dplugin_newcomers=true
-		-Dplugin_notification=true
-		-Dplugin_npm=true
-		-Dplugin_phpize=true
-		-Dplugin_podman=true
-		-Dplugin_pygi=true
-		# -Dplugin_python_lsp_server=true # isn't recognized by meson even though it's in meson.build and meson-options.txt. See also: https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/1842
-		-Dplugin_qemu=true
-		-Dplugin_quick_highlight=true
-		-Dplugin_retab=true
-		-Dplugin_rstcheck=true
-		-Dplugin_rubocop=true
-		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
-		-Dplugin_shellcmd=true
-		-Dplugin_shellcheck=true
-		$(meson_use spell plugin_spellcheck)
-		$(meson_use webkit plugin_sphinx_preview)
-		-Dplugin_stylelint=true
-		$(meson_use sysprof plugin_sysprof)
-		-Dplugin_sysroot=true
-		-Dplugin_todo=true
-		-Dplugin_ts_language_server=true
-		-Dplugin_update_manager=true
-		-Dplugin_valac=true
-		-Dplugin_vala_indenter=true
-		-Dplugin_valgrind=true
-		-Dplugin_vls=true
-		-Dplugin_waf=true
-		-Dplugin_words=true
-		-Dplugin_xml_pack=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-	if use doc; then
-		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
-		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
-		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
-		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
-		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
-		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-
-	optfeature_header "Language support"
-	optfeature "Rust's Cargo build system" virtual/rust
-	optfeature "CMake" dev-util/cmake
-	optfeature "Java Maven build system" dev-java/maven-bin
-	optfeature "Meson Build system" dev-util/meson
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 29c3e2e71c2e..80ebb13f6484 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,5 +1,3 @@
-DIST meld-3.20.4.tar.xz 617020 BLAKE2B 70bdd7c6ecfd4dd99d1bc0b503900da65563ba74469b97590da4971d0597d4023cf74a3fd6300701d73fe7ed1b646089a5b23527e4a519313816f53c31632dad SHA512 e7b5c07e68972e7e8e4d396140fa2ee627609728533269f1bc52e9339e89a58f0949a1e8ec7b7847eec3eff5a67ea0bd5e07ad8002d2c640d173f9b0c4aa724e
 DIST meld-3.22.0.tar.xz 674212 BLAKE2B 1d5af5fa9943c46fd150bd1e1c74003579a0017dea56178e92c4ba0dd1ba0bc3348a6f2625bfe5191fe4d8394b06462a30f2173ae623ffd32c637642f9c36183 SHA512 4cc1c9a76379401c1f116292bb4730301ec0f2413cdab7b463ed519ea7ee0ee86143a9c83a13f1ef09860aad192c04769d111bfb1eb10b5e1bc81fb44c530526
-EBUILD meld-3.20.4.ebuild 1732 BLAKE2B 011373c0cb2155e968c762e1132fff049a6f34f6027b41f24352ea13cf5d603d374d754ff7008fb91ec1f332002f18e7cb7538edeedc4b15c65fe213557f4957 SHA512 1de351b39e4c3d47c7205bfaba733197960c1cc7e1709082e79cfc71a1ee2148d41654843a492bd4eeec708e8ee464fa36c366f08c638cd88cd8a7a3334f36c3
 EBUILD meld-3.22.0-r1.ebuild 1651 BLAKE2B 6d3c91c56a3c6c136c2fd23dc0912ae25351bd400117e40db6ce93ba883369af9c18b28c2a87c4dbbf921299694e158310fd99df5bb15c762c436c3d8df88463 SHA512 efc918121afa280470d7dcaaf9331412078c6828137cff8e648cabaf1320f6aa832e8d1eee70cfc70a46117f6c461a1ad3862084d34702053cc20c79e1300f8a
 MISC metadata.xml 345 BLAKE2B 3983c99529677ef9ca8365596b512eb33383219b31af470e3721379d6cd0975a9550200ee154549973849f7cc0ed16333cb91cb387e1e23dca2047faa1e0f91b SHA512 b04c508f3924cf28491c83f1cdb797332abe85bd016434805abfd082722f5a1d5616db3cdf9bbc139e2f66f91c81ccb9f4cfc0b1ce7708d06cd13e624ba11c89
diff --git a/dev-util/meld/meld-3.20.4.ebuild b/dev-util/meld/meld-3.20.4.ebuild
deleted file mode 100644
index 1a416d7610fc..000000000000
--- a/dev-util/meld/meld-3.20.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit gnome2 distutils-r1 virtualx
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	')
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.20:3[introspection]
-	>=x11-libs/gtksourceview-3.20.0:3.0[introspection]
-	>=x11-libs/pango-1.34[introspection]
-	x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	dev-util/itstool
-	sys-devel/gettext
-	$(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
-"
-# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
-# but it's mainly needed for debian and derivatives - seems the fallback
-# works fine, as we aren't a special_case, just an annoying warning.
-
-distutils_enable_tests pytest
-
-python_check_deps() {
-	has_version -b "dev-python/distro[${PYTHON_USEDEP}]"
-}
-
-python_compile_all() {
-	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}
-
-python_install() {
-	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas build )
-	distutils-r1_python_install
-	rm "${ED}"/usr/share/doc/meld-${PV}/{COPYING,NEWS} || die
-	rmdir "${ED}"/usr/share/doc/meld-${PV} || die
-}
-
-python_test() {
-	# test_gutterrendererchunk.py needs a GdkScreen for Gtk.IconTheme.get_default() to work
-	virtx epytest
-}
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index 28073f6025d0..62247ce7116b 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -1,7 +1,5 @@
 DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
-DIST sysprof-3.44.0.tar.xz 493924 BLAKE2B c3d9558df99ba23f63fbde0df54e201afce83da8f7d64166b44fcc2c70ec9e54a4abfbd0ac64171b1538af7e9d608b0f618559aba9444a3d884cd4944c4d595f SHA512 64bfe4d39e71954f7982ef06caffc39ff60d2d6005f8392a7918f83263d7c5b11bafdf7234ed86d52063586919a4dbe742c498b6f1f9db91d481337cf568451c
 DIST sysprof-3.46.0.tar.xz 518536 BLAKE2B 8925f0cbe34411cce6bd86e9f4a924d3ff627429812682898fffe0a08c2dab9228e5d8bde44b460404f90fb29961a30154af1e8240df24bfa20b70cc7a36448e SHA512 ac248e2a06d2f7905bebae4e685dd320e3ac85097e33b9c6b8482a4647a5bfcaadc4d9a1fe117b3a74cb855d6c72d9a1453a37d7b64762a223c0fe5da2653a87
 EBUILD sysprof-capture-3.36.0-r1.ebuild 744 BLAKE2B 433bfab5288a22ec0ff380cbc1a7c557acc803910be35b6545b1fda0103c6497140857a6bb79128c8e54909be9d4976f5184b2ef75fe572f8529ea47444f62ae SHA512 3ac57dd089f38aa713353e258f1414d2fe7e2f17c53a8ad3c38330751ec377086862a930b8c8d42fc5fb8549477ec49f376ebf3bd53a460f4fa2ce6adbc90bb9
-EBUILD sysprof-capture-3.44.0.ebuild 779 BLAKE2B c9f4a2318fa1620324d9f40111911c948e76141ade3790dfe6f1bc562a95858212940af64aa8d743488557d9cf6315a96fa037cea91f1ae4d1c24f2b58a9da56 SHA512 101a1faaba3c2d834bf777b1d3af2c51bdae15034a7c32918f749a2a37f2f7f4d1859078355db78257584b88af78dd1d5d345efaee41564f3b82f9e7fd6ed098
 EBUILD sysprof-capture-3.46.0.ebuild 778 BLAKE2B 18d1e2a5e29f9a4c0f016a4a953b553253c73392e38d4753dd1edf51e2081b004294b722050bac315f823edc86ff9def1231bf4118e2b686f34348fc1c787a5b SHA512 4cbda26df918fef6fd59d1c260db74f83798d2f2343c11200bcc740d962241d130082a598783b39de8b9578fc9bcacd236f1bf7327c26d3fe34f35bd72ea3479
 MISC metadata.xml 348 BLAKE2B 6d20b95f03e7ae7ac3bc5e3633757cef8d68a914da52b6d6fab3c16af3abc54e3d571c770a16772e755c4246a611d3ae20b31a2bfe5d9acf934aa28c0e64719d SHA512 b5132c2bea9fc617ac3732001154e5000c37ff1034ddc904875d8d807aeec5dec3c8d7c0a36bd3ad26bc0310a70842daae96d743d9f82a4b2f1057ef8d65e406
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.44.0.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.44.0.ebuild
deleted file mode 100644
index 382ed3e53552..000000000000
--- a/dev-util/sysprof-capture/sysprof-capture-3.44.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="sysprof"
-
-inherit gnome.org meson-multilib systemd
-
-DESCRIPTION="Static library for sysprof capture data generation"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Denable_gtk=false
-		-Dlibsysprof=false
-		-Dwith_sysprofd=none
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-		-Dhelp=false
-		-Dlibunwind=false
-		-Denable_tools=false
-		-Denable_tests=false
-		-Denable_examples=false
-	)
-	meson_src_configure
-}
diff --git a/dev-util/sysprof-common/Manifest b/dev-util/sysprof-common/Manifest
index b62936c52688..7691a1041ea6 100644
--- a/dev-util/sysprof-common/Manifest
+++ b/dev-util/sysprof-common/Manifest
@@ -1,5 +1,3 @@
-DIST sysprof-3.44.0.tar.xz 493924 BLAKE2B c3d9558df99ba23f63fbde0df54e201afce83da8f7d64166b44fcc2c70ec9e54a4abfbd0ac64171b1538af7e9d608b0f618559aba9444a3d884cd4944c4d595f SHA512 64bfe4d39e71954f7982ef06caffc39ff60d2d6005f8392a7918f83263d7c5b11bafdf7234ed86d52063586919a4dbe742c498b6f1f9db91d481337cf568451c
 DIST sysprof-3.46.0.tar.xz 518536 BLAKE2B 8925f0cbe34411cce6bd86e9f4a924d3ff627429812682898fffe0a08c2dab9228e5d8bde44b460404f90fb29961a30154af1e8240df24bfa20b70cc7a36448e SHA512 ac248e2a06d2f7905bebae4e685dd320e3ac85097e33b9c6b8482a4647a5bfcaadc4d9a1fe117b3a74cb855d6c72d9a1453a37d7b64762a223c0fe5da2653a87
-EBUILD sysprof-common-3.44.0.ebuild 506 BLAKE2B cfe8b7e9da5426aa95770b726de0827227c34a392e0653e2ffec7769909febe7275c987b8834bf7af33aa94fc7fdb20364c81fbe6ece13cdffbfaec6f540d66c SHA512 69f1acd4e1e26998cfcb087f48493cc952a24d2a2f5b4a3d546f5ea2c5e5627155fbef45c3f6c3eed75536ecdecf681d2abf63978ee429d04c7a3548372048d4
 EBUILD sysprof-common-3.46.0.ebuild 473 BLAKE2B 51861524abec8694d39fa696e527f33b7fd2f0ab6605176aeafe0e46d37b0e9fb504bc2710a3916450a9bd0f5fcc1ac7232eb26a87d9b0ffdb446ef47a3bec84 SHA512 6498df83ab524e82a4a399dce26e745a0693cc6bbfc4f7c6318bee374cb00c7be8ec9f94931bae82c937bc881e164855499ed01ce6652ca6641e9f445a686b31
 MISC metadata.xml 348 BLAKE2B 6d20b95f03e7ae7ac3bc5e3633757cef8d68a914da52b6d6fab3c16af3abc54e3d571c770a16772e755c4246a611d3ae20b31a2bfe5d9acf934aa28c0e64719d SHA512 b5132c2bea9fc617ac3732001154e5000c37ff1034ddc904875d8d807aeec5dec3c8d7c0a36bd3ad26bc0310a70842daae96d743d9f82a4b2f1057ef8d65e406
diff --git a/dev-util/sysprof-common/sysprof-common-3.44.0.ebuild b/dev-util/sysprof-common/sysprof-common-3.44.0.ebuild
deleted file mode 100644
index 0d4a854bc9e7..000000000000
--- a/dev-util/sysprof-common/sysprof-common-3.44.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="sysprof"
-
-inherit gnome.org
-
-DESCRIPTION="Static library for sysprof capture data generation"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	!=dev-util/sysprof-3.34.1-r0
-	!=dev-util/sysprof-capture-3.36.0-r0
-"
-
-src_install() {
-	insinto /usr/share/dbus-1/interfaces/
-	doins "${S}"/src/org.gnome.Sysprof3.Profiler.xml
-}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index be0b20fab29d..465482835b14 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,5 +1,3 @@
-DIST sysprof-3.44.0.tar.xz 493924 BLAKE2B c3d9558df99ba23f63fbde0df54e201afce83da8f7d64166b44fcc2c70ec9e54a4abfbd0ac64171b1538af7e9d608b0f618559aba9444a3d884cd4944c4d595f SHA512 64bfe4d39e71954f7982ef06caffc39ff60d2d6005f8392a7918f83263d7c5b11bafdf7234ed86d52063586919a4dbe742c498b6f1f9db91d481337cf568451c
 DIST sysprof-3.46.0.tar.xz 518536 BLAKE2B 8925f0cbe34411cce6bd86e9f4a924d3ff627429812682898fffe0a08c2dab9228e5d8bde44b460404f90fb29961a30154af1e8240df24bfa20b70cc7a36448e SHA512 ac248e2a06d2f7905bebae4e685dd320e3ac85097e33b9c6b8482a4647a5bfcaadc4d9a1fe117b3a74cb855d6c72d9a1453a37d7b64762a223c0fe5da2653a87
-EBUILD sysprof-3.44.0.ebuild 2319 BLAKE2B b14273539a8aa3c28f5ebe605387b029e5f855706bfe01bf37d2b7636ed9eb354f60003bda48fc6f123de72ed5dc33343ab2804d846bf53dbb231a8fc50ec3f3 SHA512 3390589cf964c8a41235f0c4e072bc7d80da5374304fe575e9ac68843da9ca82f84badc20c701c0b1141ec53657ba6ba854e54b9e9f2f1d3f1e7ef4687f6d451
 EBUILD sysprof-3.46.0.ebuild 2530 BLAKE2B f02ef42feaf6c58a7951a40ceda61e8b0a6142e4bd69ea6e9ee786c22eaabc3bc16d1c9ef67d3413e0a147193836ae8ca55433d8f67de289f5abb257eaca188a SHA512 e32874e30bf34bbb1d329ff75184d3e86df6ec1658610dec3a7d6364d3b7861ded8c8f4d0bae9ff1fb522bdaf96f9d17b2e05aab32b1d191b1077ca90beaee3b
 MISC metadata.xml 833 BLAKE2B 35f88ffbe55a8acf5322b2f30556b950d2cdf148e0e16d1dcf8eac080273419bdca505088d4cea12c01cd2644fe9129995dfb497177aac70dbd75c82ed018917 SHA512 de169c39ab639a120f4ca13d5619fdb531239cfcb2af90c7fc0c4b7d234002fca5b9f2f1cbc8ab305648a7a13bd116d2c1addd2e32f2d04e7ef37118dd2af913
diff --git a/dev-util/sysprof/sysprof-3.44.0.ebuild b/dev-util/sysprof/sysprof-3.44.0.ebuild
deleted file mode 100644
index 4d5576505ad9..000000000000
--- a/dev-util/sysprof/sysprof-3.44.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="System-wide Linux Profiler"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-API_VERSION="4"
-SLOT="0/${API_VERSION}"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="gtk +unwind"
-
-RDEPEND="
-	>=dev-libs/glib-2.67.4:2
-	gtk? (
-		>=x11-libs/gtk+-3.22.0:3
-		>=dev-libs/libdazzle-3.30.0
-	)
-	dev-libs/json-glib
-	>=sys-auth/polkit-0.114
-	unwind? ( sys-libs/libunwind:= )
-	>=dev-util/sysprof-common-${PV}
-	>=dev-util/sysprof-capture-${PV}:${API_VERSION}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# These are installed by dev-util/sysprof-capture
-	sed -i -e '/install/d' src/libsysprof-capture/meson.build || die
-	sed -i -e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' src/libsysprof-capture/meson.build || die
-	# We want to ship org.gnome.Sysprof3.Profiler.xml in sysprof-common for the benefit of x11-wm/mutter
-	sed -i -e "s|if get_option('libsysprof')|if false|g" src/meson.build || die
-}
-
-src_configure() {
-	# -Dwith_sysprofd=host currently unavailable from ebuild
-	local emesonargs=(
-		$(meson_use gtk enable_gtk)
-		-Dlibsysprof=true
-		-Dwith_sysprofd=bundled
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-		-Dhelp=true
-		$(meson_use unwind libunwind)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	elog "On many systems, especially amd64, it is typical that with a modern"
-	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
-	elog "debugging is still possible thanks to gcc4/gdb location list feature."
-	elog "However sysprof is not able to construct call trees if frame pointers"
-	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
-	elog "for the libraries and applications involved in the profiling. That"
-	elog "means a CPU register is used for the frame pointer instead of other"
-	elog "purposes, which means a very minimal performance loss when there is"
-	elog "register pressure."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index b7f3f22fc4b3..1e8242a09de1 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index e00bc0658bc8..048812ccad47 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-chess-42.1.tar.xz 663036 BLAKE2B 3e42f799d029c4122055420035dd1dadcf5d385ea363ebfe355dc25df31bd5160f2b791d715a2ab371af93e4f5f0a60ac8e818df2686b0f0fc30ae7c0f0795fc SHA512 ab84744910fbf65d50cadb7f63b9e5a5fd4af103adbacd349680c65ae70374ce9766e715656891ae8987ba3c6a694dd632b9154233a417b86a1eeacad875a61d
 DIST gnome-chess-43.0.tar.xz 658156 BLAKE2B eb8ddd9966a38ff385a93456621f250adaac1aee580475a136dc33d3182d0a772d50c2bc4bc47981e3b0dcf86ed91a2c8792ab682a5f6af4904a8f075fd520d5 SHA512 710ff09d9f5e23bb3822a203c1f5b11b85e8aa602f7c703f08e7843a79476498ec836e41122f6d601183b7220618bf2f2a2f0dcff62bcb625ae28b20a03d02c8
-EBUILD gnome-chess-42.1.ebuild 1184 BLAKE2B d5a867cb8a334a185bf8dd1b9d18df555d476fd8cbdca06eb3204636c72b530ccdf6db412de73f2bb6a5f28204b7b45f07991646b1e599106cc87a1646b0bac8 SHA512 524d1d33648157376fd332e1f19f0366feca8edf92875fdf0cfae1f82b0f2f96d9336ca5c9b398fcc31841bc1be3a60fb1afb28e98aea063f47c9ecfebd3700e
 EBUILD gnome-chess-43.0.ebuild 1108 BLAKE2B b3ddbfa91d1e58f045880a6420e70382a0fb4d7e74d82264c42ac1fd5b829dadeb7633a419247eefbd3f7df2368344e68948df6ab381194fdce40134343fc9c7 SHA512 fe4ff9d7bead883a17f2a2608c685a016a6ebd8915ed2d112c38e5b468074068d959160e09e88e2ca1026e7f8297022ca28ceae907106861c1e83d57d576d753
 MISC metadata.xml 352 BLAKE2B 074f6148ce26c919d90dab35327d5cedff08035effba8bcb241bf8498d76f4272ec9eb319b0cc4d7127bdb866c48c85b6200426ce62cd124fa9a5a53d7ea7e3b SHA512 9843fd4b8762345e40d89e8ecefdf62b40060691330d241a72516668ee12df23e035be932086f7969ef6a29aa03b55b4b3acc455274cc60a8961046f44a9bad7
diff --git a/games-board/gnome-chess/gnome-chess-42.1.ebuild b/games-board/gnome-chess/gnome-chess-42.1.ebuild
deleted file mode 100644
index 63e703237b25..000000000000
--- a/games-board/gnome-chess/gnome-chess-42.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-VALA_MIN_API_VERSION="0.52"
-
-inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 vala xdg
-
-DESCRIPTION="Play the classic two-player boardgame of chess"
-HOMEPAGE="https://wiki.gnome.org/Apps/Chess https://gitlab.gnome.org/GNOME/gnome-chess"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	gui-libs/gtk:4
-	>=gui-libs/libadwaita-1.0.0:1
-	>=gnome-base/librsvg-2.46.0:2
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	gnome-base/librsvg:2[vala]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-util/itstool
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To be able to play against a computer you will need
-to install a chess engine package, for example games-board/gnuchess"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index beb8411243da..70a6fd806b7c 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index 0d2c9d676453..020a7520e31c 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-sudoku-42.0.tar.xz 380836 BLAKE2B d496724ab20699e4cd372db02f3a71147d58e77ec8121576f889648cf084e5d87b34c639d0db6c623c9fd04c1111f421b8c350ee227f836eb657be1f99fa5734 SHA512 01f6dfdfe99a4acb4b664fd3573c64b154eea2b8b9964dd08448aa994d1ed6dbe7060157a496c3f895a049a4f267b9b5f9cfdf30b28656b6b2e63b7655d5a7b9
 DIST gnome-sudoku-43.0.tar.xz 388612 BLAKE2B 31572ca651e8c21a073bed15edd99679f33fe9dc6ce020c84014120e7c29e1ff23c16ace0e543c8ade9c4f24745641dfd540e250f1ecc45e851479eb5514e073 SHA512 159209689061c437a42e5298e8dc51ef462e1a7d94e4ec7ddb6d1364977d4ea47ae3b0ebf601fd654104d58306b99155b24d3a3a47e334800ec380ccb851ae1b
-EBUILD gnome-sudoku-42.0.ebuild 989 BLAKE2B e6b15c7c18a17728948b0e505b57de6a4ce45f257678f4f48ce096d6c7be22320387c038f7588bc474f6d81d22a9512d8aae98b97df5075c4396dda8bfef67d7 SHA512 b9dcb5c8bd0db13137dd19bb7e9fbf42dc1203032c28994849d9b1052bb170e651d40b4a01b7f7d3c657b17104c305efe60283f9c13a1fbe0b38a9480f138754
 EBUILD gnome-sudoku-43.0.ebuild 959 BLAKE2B daac6eb1abc65e26188433e3015e2cfefcee0853fd0b2fa4fb5fe41953f13b3e2c57c7cf15206e69e272fe387ad75084a1a08f176ef238cc7164bc7a02e5ff73 SHA512 6377d27b35d6e21f81b9b2bd8be08b61462ce1de9181996725c3f828604888ab3e340d858d6286408ead697522d020a29041e7c8742ad6e804bc49d9d53a69d6
 MISC metadata.xml 353 BLAKE2B e2f4d98efe0c100b16c9fb00308f35f3b386960e8123a8d6b2fc077ea41fca33db7e80b3dfe23235eedac5374d6d73a7062eabea5deded271d1985fa550f62e1 SHA512 b04099e8b16ece9bb66c5f34fb32cdaa4a07da79317e1d83aec745f4d2b970ce5de4bb506324b8c5017c103cfea82cdec01ef9d3ea1a629a880da734bd4d9a27
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild
deleted file mode 100644
index bf28d369fd3f..000000000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Test your logic skills in this number grid puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgee:0.8=[introspection]
-	>=x11-libs/gtk+-3.24.0:3[introspection]
-	dev-libs/json-glib
-	>=dev-libs/qqwing-1.3.4
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 298b5260d4ca..24d4ef6f0951 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 800c32676843..74cbee30858f 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,9 +1,7 @@
 AUX default.pa 328 BLAKE2B 558dbedcb5a0f31e0bdc01ce21deaeacb4740dee998f8b2f947361745ea6680acf8662e426adf1d3f777af714c2fb7cf5ec74b2807187c37e2d8d896e863fa0d SHA512 4f0e9c38ae0c17b8f4ee6e37b87259676c4ff4e62fd315989c9e20012a8070c5b5571f835379639f76f157530495928cdc79265473478b1d9fe6d8ad0d64785d
 AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726e247aea1b3cad2a86c0b0e95c5f9953b680a072d244140615c38becbc605998a2be0ed3332d7b5ef802f55 SHA512 63428d4605d9f4f35445f364657c1d92818125a737add7bc5e5acab424beaf8ae5895368111cd2d1c03c75f5fd8b9538d8750ea732a0990b5b82507735850e4c
 AUX gdm-40.0-meson-allow-building-with-elogind.patch 8801 BLAKE2B 358abc6b4a81523f53f6551af3c976916492c6c80fcacf8ec7c6fd90683558f1e7d898b749bdb458b2379e8a96f08293bbbebee3b8fc9126ebf249a95c514b41 SHA512 6116047fe51f0daf99de7e369028629fff88890c9627407648f2bec312df9b8b94f1ccb9b7015347258444f8193da16c6209a41de9441c848097670a13b4a7ef
-DIST gdm-42.0.tar.xz 811200 BLAKE2B 98f39fc4e80bb7160b7da57d5c606ce1fa2f66ea1ab817c82c6db7328df60b91a1e9a829f67a716c67a5e5ada9f9356e4c82e40065b2692f32aa80c545adc616 SHA512 e07a4e9233573069dd5628e7b7e6dbe462e90bd8f30267d3faf1cbe3dcb8b990afe3ad6af1edf5f0ec689c6eb245aaacd4e8565a7e4feea34cc754d43904daaa
 DIST gdm-43.0.tar.xz 830668 BLAKE2B cd9fa9864ba075a85d16128ce2faba9c360357d900719c8e7cbb6c638f91750ff80ef0d970b24d0d858aa56f8ab95b8cac0d93624bcced8e6f98ca2d1f06fbc3 SHA512 e3eaa7a50e224939b6e535963171a800bb175ed9480a88ce14034929760dd579b91c4f3117be6a4404b2de13afdee881dafe09695eebf42872d4a13fbc5fb8ba
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-42.0.ebuild 5649 BLAKE2B 6ffef32fd6113a851536fa3e8be7e8f47b246a08225ffc509f018a39686d6c26b25f5f0b8201c62a6a9d225fb3842424a358be6214337603990570325b12f655 SHA512 5b2394eddd5cfdd3841222808f6da7b9322cd4da070423022221751cd52a3402c4b7fe521ffc44b477f4bf8e71e6b1a83c85a657288d2c09f3177b4fedd32e75
 EBUILD gdm-43.0.ebuild 5729 BLAKE2B de4755b34a65f9f4d0075da082c9a20ee68c9476205d123d250660350b5a581e814b83ca33a8286ac77909fcb1d13fb9ca4f59b264f6f966b39a437ee188bea1 SHA512 b2b3ac74832e45b33e27135e8288af0d1822294e193bc85cf1c24d8279e5144d8c6b771a28fabe33728b1c5b78a60746e18ecd1752d8a0c51a0169b6a2ff2f1a
 MISC metadata.xml 862 BLAKE2B e724f454ad72da0d45935507229c85e8eed61231ddba8f43454bc1efecc92ac9b5ec435462d9471013a7be2e734865b1e43addd97582cd9fe4f00bea620695d3 SHA512 55123d13865f581b17b507b0b53cca00129710e65b469567c1736e4174fab6fc0afee06501f70fa10b4ff6c8e787f38fa5dfaef0f3af409da5e077a4a33d5670
diff --git a/gnome-base/gdm/gdm-42.0.ebuild b/gnome-base/gdm/gdm-42.0.ebuild
deleted file mode 100644
index d6c9b14f6f70..000000000000
--- a/gnome-base/gdm/gdm-42.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop gnome2 meson pam readme.gentoo-r1 systemd udev
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-BY-SA-4.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit bluetooth-sound branding elogind fprint plymouth selinux systemd tcpd test wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
-# dbus-run-session used at runtime
-COMMON_DEPEND="
-	virtual/udev
-	>=dev-libs/libgudev-232:=
-	>=dev-libs/glib-2.56:2
-	>=x11-libs/gtk+-2.91.1:3
-	>=media-libs/libcanberra-0.4[gtk3]
-	>=sys-apps/accountsservice-0.6.35
-	x11-libs/libxcb
-	sys-apps/keyutils:=
-	selinux? ( sys-libs/libselinux )
-
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-base/xorg-server[-minimal]
-	x11-libs/libXdmcp
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-
-	systemd? ( >=sys-apps/systemd-186:0=[pam] )
-	elogind? ( >=sys-auth/elogind-239.3[pam] )
-
-	plymouth? ( sys-boot/plymouth )
-	audit? ( sys-process/audit )
-
-	sys-libs/pam
-	sys-auth/pambase[elogind?,systemd?]
-
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	sys-apps/dbus
-
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	>=dev-libs/gobject-introspection-0.9.12:=
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-RDEPEND="${COMMON_DEPEND}
-	acct-group/gdm
-	acct-user/gdm
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	x11-apps/xhost
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		gnome-extra/mousetweaks
-	)
-	fprint? ( sys-auth/fprintd[pam] )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=gnome-base/dconf-0.20
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( >=dev-libs/check-0.9.4 )
-	app-text/yelp-tools
-"
-
-DOC_CONTENTS="
-	To make GDM start at boot with systemd, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	To make GDM start at boot with OpenRC, edit /etc/conf.d to have
-	DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n
-	# rc-update add xdm
-	\n
-	For passwordless login to unlock your keyring, you need to install
-	sys-auth/pambase with USE=gnome-keyring and set an empty password
-	on your keyring. Use app-crypt/seahorse for that.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-PATCHES=(
-	# Add elogind support
-	"${FILESDIR}/${PN}-40.0-meson-allow-building-with-elogind.patch"
-)
-
-src_prepare() {
-	default
-
-	# Show logo when branding is enabled
-	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
-}
-
-src_configure() {
-	# --with-initial-vt=7 conflicts with plymouth, bug #453392
-	# gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which
-	# saves on memory. However this means if we don't start on VT1, gdm doesn't start up
-	# before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1,
-	# so lets try always having it in VT1 and see if that is an issue for people before
-	# hacking up workarounds for the initial start case.
-	local emesonargs=(
-		--localstatedir /var
-
-		-Ddefault-pam-config=exherbo
-		-Dgdm-xsession=true
-		-Dgroup=gdm
-		-Dipv6=true
-		$(meson_feature audit libaudit)
-		-Dlogind-provider=$(usex systemd systemd elogind)
-		-Dpam-mod-dir=$(getpam_mod_dir)
-		$(meson_feature plymouth)
-		-Drun-dir=/run/gdm
-		$(meson_feature selinux)
-		$(meson_use systemd systemd-journal)
-		$(meson_use tcpd tcp-wrappers)
-		-Dudev-dir=$(get_udevdir)/rules.d
-		-Duser=gdm
-		-Duser-display-server=true
-		$(meson_use wayland wayland-support)
-		-Dxdmcp=enabled
-	)
-
-	if use elogind; then
-		emesonargs+=(
-			-Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
-			-Dsystemdsystemunitdir=no
-			-Dsystemduserunitdir=no
-		)
-	else
-		emesonargs+=(
-			-Dinitial-vt=1
-			-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
-			-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	if ! use bluetooth-sound ; then
-		# Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
-		# bug #679526
-		insinto /var/lib/gdm/.config/pulse
-		doins "${FILESDIR}"/default.pa
-	fi
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	local d ret
-
-	# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing ${EROOT}/var/lib/gdm ownership"
-	chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
-	for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
-		[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	systemd_reenable gdm.service
-	readme.gentoo_print_elog
-}
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 8b5a288d9d4a..7bbbe8cff03d 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-applets-3.44.0.tar.xz 9396928 BLAKE2B 03fb970e4ebe7747aed9241e7512c6fe945650ac789cac5c5bc1e49958b1636f43b59c56caaf24a01785c84617cef4c9b3fa76931ed46d6f3ea8c4b74335ca1b SHA512 8a9a75590e96d0ef6af4775d261337b41b23779b86d38080014f49666fdaee68bc9ef58eeae94e87c43bd07b0b0720b867f03f2c2d0f2d8b7daea3c66251fc7e
 DIST gnome-applets-3.46.0.tar.xz 9248780 BLAKE2B 5bc61dbbb2f6a7c96a9ad6895936996025bfc6d99ac29ff552e62e5061866b1ef30384d6adecefee933cbb533184a47cb6c40c5c8c7562d4892817aa73628dab SHA512 826abf56f76925f0246b49194b09ec9ae43963c43e3f861269ab839c08823bb2b8b1b47cd20a93495bfef0d4220ef579190f0dd491c3cb2ed70fdd0483b1f007
-EBUILD gnome-applets-3.44.0-r1.ebuild 1381 BLAKE2B 07bacca2ce92f025ded74c9d8c879f56a4be2f7298a3b55071c7ecc527a3fc619729bfa0a247bdf71117fcc8be25eb4a8f556d60ea3796c391f23a0fe18c87fd SHA512 31bd90e4b209df51dcace443651885faf577ed084c4e29af9749555d1664bbae8b55fc800e7b3f66da484c00984e6d1ca3749abe6bf9d9027b1d57031d5e320c
 EBUILD gnome-applets-3.46.0.ebuild 1293 BLAKE2B bd323cf001c8e5e043cee866fd73db854c260d18d1ea8887e49546a6ef91b0b4c3aa92595b8f442f8afcc6c6f50a6f1191aa0b80b3a5046d26f7a651df6ca729 SHA512 4989c59c3849fcb217f5e761c6b4779e4c8490c2681ebfc9a8a45b761d1a0799b31956bde4b7115a3186602e4d7fc816988dc11596bf5919f9341bdcb630708b
 MISC metadata.xml 439 BLAKE2B e738dd60ea178c00aeb74d7869576d13a5627cedade0973cef747d5ca25af196007880fb32017f6084b0add7637b2e86d775abe9063b96cc12859e0338a03a9c SHA512 ff500a2fac696462d22b6916a69cb2a9943a69b348d7ad39049f12af9908823812a2b878571937bf681d92c2513997f04433efd18239daff40fd35e1f2da56c9
diff --git a/gnome-base/gnome-applets/gnome-applets-3.44.0-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-3.44.0-r1.ebuild
deleted file mode 100644
index ab6c73be133d..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-3.44.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2
-
-DESCRIPTION="Applets for the GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
-
-LICENSE="GPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="tracker"
-KEYWORDS="~amd64 ~riscv"
-
-# FIXME: automagic wireless-tools
-# TODO: gucharmap could be optional, but no knob
-# TODO: libgweather could be optional, but no knob
-# <libgweather-4.2.0 because of libsoup:3 transition
-RDEPEND="
-	>=x11-libs/gtk+-3.20.0:3[X]
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/gnome-panel-3.41.1
-	>=gnome-base/libgtop-2.11.92:=
-	>=x11-libs/libwnck-3.14.1:3
-	>=x11-libs/libnotify-0.7
-	>=sys-power/upower-0.99.8:=
-	>=x11-themes/adwaita-icon-theme-3.14.0
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/libgweather-3.91.0:4=
-	<dev-libs/libgweather-4.2.0:4=
-	>=gnome-extra/gucharmap-2.33.0:2.90
-	>=sys-auth/polkit-0.97
-	x11-libs/libX11
-	tracker? ( app-misc/tracker:3 )
-	>=x11-libs/pango-1.50.0
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-cpufreq \
-		$(use_enable tracker tracker-search-bar)
-}
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 6096e9c9950a..0cabed26c513 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,11 +1,6 @@
-DIST gnome-control-center-42.0-patchset.tar.xz 5932 BLAKE2B 1c9311481be6a07dc2ff61fc9e65f190bc1668026fba2a1e4a8edf9a033e6b2b9019542d89aac4480323ee4802e00b765654008f5252e87040f013a990cb8048 SHA512 b76c1facd3566edcadfe33f81027966da35bb03909bfbae6faad72005b92447e291fa424611196bfae6e1dc5bf5982917f3ae14c36d87206f6bfb4af502bf1a4
-DIST gnome-control-center-42.3.tar.xz 6242028 BLAKE2B 8b757e3286acb2b40732ce601d63be4de0fe0f16fec652e3be83b6c7ed6718d89b6e15608d29ce3f295453510b8986ea410c0de96bb0d9dabb4f3b9c77c2fae5 SHA512 eb82f65b580637fa057196daed836b3ea24a223b9932a2063b2879357f8a62626a6939835dc165a6d3c5706d16b99192301d4de021e68faaabb8d2ecc2a317a3
 DIST gnome-control-center-43.0-patchset.tar.xz 5940 BLAKE2B 91f47272518175286943a160ef77338b0153aa700a75315708ec478627dda8353b21d257b2baed9961ba77700e43c5655be06591b447c442881f828dd7002622 SHA512 e4683e99f43d9c395238df02228a87df4798df53c936bc8d188e366653d9e75b5219b0b0d8eb66ad21141fc2f1a882b994b96cf523c26b8dc21edb854aa1f384
-DIST gnome-control-center-43.0.tar.xz 5693880 BLAKE2B 290e0fbdd9557954ac2fbd79fe1872653c44ddaef540dd220b049c08958e688ac42de056a659ddcd0a7c47af2fbbabc078e658640ca9771e863eec5c174b3f9e SHA512 3fbb9252fedf44ceed6b7d6f1fed5263a110adce432effe4966f793a1f1443e92e39ff11595a6a2b3179297cc17979c310a33e3e2ac9d23dae0087ee227375a7
 DIST gnome-control-center-43.1.tar.xz 5702380 BLAKE2B 646342ff6d2384fd5324a01284d4db9459db1982a127ff7c6b107cc6cc8e92cab97dd93adaafacde1e3159f9874a5a652a44da4729e5a2afc18a7fbead624d5e SHA512 aea5d137dbe25b8da13521ebfdff8858aebb210e849e2d93105df5a1d80b41f7221de493c7c343bb4bdcec29a48b9c6ddfbafc24f3ca90a44c6c63e80e5b25e5
 DIST gnome-control-center-gentoo-logo-dark.svg 14293 BLAKE2B 570e9326b8abe45849c31fd5cdb3fcfb1b2f18eac522f958928df5c3b747b0699f50a882f31cf7c0ae1f2138194f18596f738f42c942b57d340c53d46d82c551 SHA512 91227dafcf2091bb1568b0f9eec68b5e371ec64c9a6bc3605821f60d6bf2bd94dec0564f6a16a4a70d1db4d4df49fc25b6c910367bae3b85205cc609a9f2701b
 DIST gnome-control-center-gentoo-logo.svg 14288 BLAKE2B 371fc68b1015c8672db3e3858ae9077b1e3a9937e6add8690c39db36302ec031391c4d35e0c0b87094ca474a00c4187849e2d7111df34f43bc5bd7be52678527 SHA512 cf88933546de54ca15e2e830ac1086a78c4150f0ff59b8091e7e1cade5961c4e4cb83120a818a960b77841353ce3584ddc8f36b6edbde05543600283a143ad7b
-EBUILD gnome-control-center-42.3-r1.ebuild 6082 BLAKE2B 9de3d305ca558bf3f0ae09c50b7197f34e6f2e3892b7716f3297f86499ec255c42db92186283be1320fa31600495d2f9daa9926b543bc2d5125906d4387dd1b8 SHA512 d0c535ed709fdb12729ce419ae14f9e51a21078c9d346075cabcf703373c365deef75f4bc80f5d211e3a3ced90e5d97d6ac1dc7932f4987c7231c276a49680f1
-EBUILD gnome-control-center-43.0.ebuild 6665 BLAKE2B 7dc2eeba75343a7d97204a182405e2398eaa7c0f1a3d43768febee04b322de992f60e8ddf80ee343fb6c09733de32d33f94b2a71d065018ccea28dba80bdd846 SHA512 30e9840f86bf09a25b50e32246975f8dfaf1e46fab459f72a6b70c7539507a8d2688ae0ae25fdb974a28bc4f601e318b16d806a655895f8eed91e2ff0d38e720
 EBUILD gnome-control-center-43.1.ebuild 6826 BLAKE2B 93b3236a04b5f0cafde74e7e306b67ff2df49646bea6da0a52815ce00f33cf6fa5ee19e3f2a689bbcffe04b31d29ed45ceb063132250f97553c491d7b64b2f39 SHA512 d61212ef66e11c82dc72860d8631e610f69f42aec2030766cd878cfb27662ce41e10e252378809b0a761c478b42d19021e45fe0de5bd0399031850bebfc57e66
 MISC metadata.xml 610 BLAKE2B 33cb646209b89a151b412f3a5be10b29cf85cde070e8a55b50f18417b02806763f940a1f56684ec8f494f9bd07258e9219b4dc2dc01ef6710aedc03bb609d42e SHA512 1d1fd521a3901c3601d3bd4ab78ac95c44d058fc0de2506df38c5ad8ba5156ff04c4b112b7a801a13f5ed9c37243c64629cf7038ca156196fa5f3229606a1f9c
diff --git a/gnome-base/gnome-control-center/gnome-control-center-42.3-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-42.3-r1.ebuild
deleted file mode 100644
index 53efc778c9d6..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-42.3-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-42.0-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-# meson.build depends on python unconditionally
-BDEPEND="${PYTHON_DEPS}"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-DEPEND="
-	gnome-online-accounts? (
-		x11-libs/gtk+:3
-		>=net-libs/gnome-online-accounts-3.25.3:=
-	)
-	>=media-libs/libpulse-2.0[glib]
-	>=gui-libs/libadwaita-1.1:1=
-	>=sys-apps/accountsservice-0.6.39
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=dev-libs/glib-2.56.0:2
-	gnome-base/gnome-desktop:4=
-	>=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-42_alpha
-	dev-libs/libxml2:2
-	>=sys-power/upower-0.99.8:=
-	>=dev-libs/libgudev-232
-	x11-libs/libX11
-	>=x11-libs/libXi-1.2
-	media-libs/libepoxy
-	app-crypt/gcr:0=
-	>=dev-libs/libpwquality-1.2.2
-	>=gui-libs/gtk-4.4:4[X,wayland=]
-	>=sys-auth/polkit-0.114
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	networkmanager? (
-		>=net-libs/libnma-1.8.36
-		>=net-misc/networkmanager-1.24.0[modemmanager]
-		>=net-misc/modemmanager-0.7.990:=
-	)
-	bluetooth? ( net-wireless/gnome-bluetooth:3= )
-	input_devices_wacom? ( >=dev-libs/libwacom-0.27:= )
-	kerberos? ( app-crypt/mit-krb5 )
-
-	x11-libs/cairo[glib]
-	>=x11-libs/colord-gtk-0.3.0:=
-	media-libs/fontconfig
-	gnome-base/libgtop:2=
-	>=sys-fs/udisks-2.1.8:2
-	app-crypt/libsecret
-	net-libs/gnutls:=
-	media-libs/gsound
-
-	x11-libs/pango
-"
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${DEPEND}
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? ( app-admin/openrc-settingsd
-		sys-auth/elogind )
-	x11-themes/adwaita-icon-theme
-	>=gnome-extra/gnome-color-manager-3.1.2
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
-	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	x11-base/xorg-proto
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '
-		dev-python/python-dbusmock[${PYTHON_USEDEP}]
-	') )
-"
-
-PATCHES=(
-	# Patches from gnome-42 branch
-	# Makes some panels and dependencies optional
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-)
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# Mark python tests with shebang executable, so that meson will launch them directly, instead
-	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
-	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dcups=$(usex cups enabled disabled)
-		-Ddocumentation=true # manpage
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		$(meson_use ibus)
-		-Dkerberos=$(usex kerberos enabled disabled)
-		$(meson_use networkmanager network_manager)
-		-Dprivileged_group=wheel
-		-Dsnap=false
-		$(meson_use test tests)
-		$(meson_use debug tracing)
-		$(meson_use input_devices_wacom wacom)
-		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
-		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
-		-Dmalcontent=false # unpackaged
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-43.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-43.0.ebuild
deleted file mode 100644
index 672ed703a617..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-43.0.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-43.0-patchset.tar.xz"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg"
-# Logo is CC-BY-SA-2.5
-LICENSE="GPL-2+ CC-BY-SA-2.5"
-SLOT="2"
-IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-# meson.build depends on python unconditionally
-BDEPEND="${PYTHON_DEPS}"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-DEPEND="
-	gnome-online-accounts? (
-		x11-libs/gtk+:3
-		>=net-libs/gnome-online-accounts-3.25.3:=
-	)
-	>=media-libs/libpulse-2.0[glib]
-	>=gui-libs/libadwaita-1.2.0:1
-	>=sys-apps/accountsservice-0.6.39
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=dev-libs/glib-2.70.0:2
-	gnome-base/gnome-desktop:4=
-	>=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-42_alpha
-	dev-libs/libxml2:2
-	>=sys-power/upower-0.99.8:=
-	>=dev-libs/libgudev-232
-	x11-libs/libX11
-	>=x11-libs/libXi-1.2
-	media-libs/libepoxy
-	app-crypt/gcr:0=
-	>=dev-libs/libpwquality-1.2.2
-	>=gui-libs/gtk-4.4:4[X,wayland=]
-	>=sys-auth/polkit-0.114
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	networkmanager? (
-		>=net-libs/libnma-1.8.36
-		>=net-misc/networkmanager-1.24.0[modemmanager]
-		>=net-misc/modemmanager-0.7.990:=
-	)
-	bluetooth? ( net-wireless/gnome-bluetooth:3= )
-	input_devices_wacom? ( >=dev-libs/libwacom-0.27:= )
-	kerberos? ( app-crypt/mit-krb5 )
-
-	x11-libs/cairo[glib]
-	>=x11-libs/colord-gtk-0.3.0:=
-	media-libs/fontconfig
-	gnome-base/libgtop:2=
-	>=sys-fs/udisks-2.1.8:2
-	app-crypt/libsecret
-	net-libs/gnutls:=
-	media-libs/gsound
-
-	x11-libs/pango
-"
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${DEPEND}
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? (
-		app-admin/openrc-settingsd
-		sys-auth/elogind
-	)
-	x11-themes/adwaita-icon-theme
-	>=gnome-extra/gnome-color-manager-3.1.2
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper
-	)
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 )
-	)
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
-	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	x11-base/xorg-proto
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep '
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-		x11-apps/setxkbmap
-	)
-"
-
-PATCHES=(
-	# Patches from gnome-43 branch
-	# Makes some panels and dependencies optional
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-)
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# Mark python tests with shebang executable, so that meson will launch them directly, instead
-	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
-	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dcups=$(usex cups enabled disabled)
-		-Ddocumentation=true # manpage
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		$(meson_use ibus)
-		-Dkerberos=$(usex kerberos enabled disabled)
-		$(meson_use networkmanager network_manager)
-		-Dprivileged_group=wheel
-		-Dsnap=false
-		$(meson_use test tests)
-		$(meson_use debug tracing)
-		$(meson_use input_devices_wacom wacom)
-		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
-		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
-		-Dmalcontent=false # unpackaged
-		-Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg
-		-Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	insinto /usr/share/pixmaps
-	doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg
-	doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-flashback/Manifest b/gnome-base/gnome-flashback/Manifest
index ee6bed642649..cf32b00e4c79 100644
--- a/gnome-base/gnome-flashback/Manifest
+++ b/gnome-base/gnome-flashback/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-flashback-3.44.0.tar.xz 884008 BLAKE2B d9815634216537f59aa3fb7c50c4ddfcb295a85c2548bd3f5669a1924cf9a3f46fba05a4d7a1cf265f514d5f0f1611992f8b120e76771140bc4fc35908e5c688 SHA512 7a39baa5e37cd01dc6d3b5fff3ef4c99240106f9e13c68c2ce1db19c3f9a672d4c22602e3ca3c4cff28226c3bd26525500bf002fb598c1af362ce15d7a92b55e
 DIST gnome-flashback-3.46.0.tar.xz 892424 BLAKE2B f752687a07d8b5205aebed47e0ece8b77edc32aa9fa934b9e14234119d3bf074b528eb1af8ea5841ca20c2f91511eac40e6a708835542bbdc8ea4e1d364984e8 SHA512 845d9cf3551295bc6dcaeeb141875ddb875e8cf885a2a3b17c4234dd40b37b8ed5279f07414c4cc7590369b394a7270c48d34d767bd0d1ef0189f4b73e73da10
-EBUILD gnome-flashback-3.44.0-r1.ebuild 2589 BLAKE2B b2e195c27f49b70bfe541b9e14b868e6aca6608bf6b7e0be5d5826f678feff24b096b2ec6864367656785b412a04a303d75af5ecf7f8e5abd2af923f514c7180 SHA512 a40c80376f19452dba585c7789d7accc70027686262df0a1e3891edcc6c9a8fccabccce360105772f27ef636127ffcd5f0c4f5d05b6932adf287297733dfa096
 EBUILD gnome-flashback-3.46.0.ebuild 2609 BLAKE2B 45df025d26969a5db247242e2ad28f353a17a7c022aee5b93044ddbad8818a697d08537850825a32e0e58a7f98222774b18f5266721bd738a03f90a9d7cb000b SHA512 19059a3eb5e0598a4f294729d6c2896a94897c2a9cb196906c543fa1992de6afeffcbe5640c39767f9e24eb0522d348a98b2340caebe7081142676b0108a9ddd
 MISC metadata.xml 356 BLAKE2B d1e8043447992d145c9b3fc59935437a5f41efe71754c44f2dfc071e0eaa045514d2d2434c333b7189fcbd5e45a7923eddcdca148f33c7e440f8fdb7f8fe2357 SHA512 a58e073a6b045401e96ea3e386c238773f7c485c879c5ea9b67223a71f551c012a3791fe4666dd2b78c8c2c359a3a03562f41ffbdc7e2bcbc6eeec061793bee9
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.44.0-r1.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.44.0-r1.ebuild
deleted file mode 100644
index c1764084fd00..000000000000
--- a/gnome-base/gnome-flashback/gnome-flashback-3.44.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2 toolchain-funcs
-
-DESCRIPTION="GNOME Flashback session"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="elogind systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=x11-libs/gdk-pixbuf-2.32.2:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=gnome-base/gnome-desktop-3.12.0:3=
-	>=gnome-base/gnome-panel-3.35.2
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=dev-libs/glib-2.67.3:2
-	>=gnome-base/gsettings-desktop-schemas-3.31.0
-	>=sys-auth/polkit-0.97
-	>=app-i18n/ibus-1.5.2
-	>=sys-power/upower-0.99.0:=
-	>=x11-libs/libXrandr-1.5.0
-	>=x11-libs/libXxf86vm-1.1.4
-	x11-libs/libxcb
-	x11-libs/libX11
-	gnome-base/gdm
-	elogind? ( >=sys-auth/elogind-230 )
-	systemd? ( >=sys-apps/systemd-230:= )
-	net-wireless/gnome-bluetooth:2=
-	x11-libs/libXext
-	>=x11-libs/libXi-1.6.0
-	x11-libs/pango
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	x11-libs/libXfixes
-	media-sound/pulseaudio[glib]
-	sys-libs/pam
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-" # autoconf-archive for eautoreconf
-RDEPEND="${RDEPEND}
-	x11-wm/metacity
-	gnome-base/gnome-panel
-	gnome-base/gnome-settings-daemon
-"
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--without-compiz-session
-		$(use_enable systemd systemd-session)
-	)
-
-	# Below elogind DESKTOP_* and SCREENSAVER_* pkg-config calls need to match up with
-	# what upstream has each version (libsystemd replaced with libelogind). Explicit
-	# per-version die to force a manual recheck. Only update the explicit version if the
-	# "PKG_CHECK_MODULES([MENU/SCREENSAVER], ...)" blocks did not change; otherwise adjust
-	# elogind conditional block below accordingly first.
-	if ver_test ${PV} -ne 3.44.0; then
-		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
-	fi
-
-	if use elogind; then
-		local pkgconfig="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			DESKTOP_CFLAGS="$(${pkgconfig} --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
-			DESKTOP_LIBS="$(${pkgconfig} --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
-			SCREENSAVER_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
-			SCREENSAVER_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
-		)
-	fi
-
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index dfad763c4446..07004070aa11 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-panel-3.44.0.tar.xz 2852688 BLAKE2B 2d31d9456cb94f5f7d4a7f02b1be7da901f79b32a098877d7b778570b67c7f9be42105f5dbcf0ee6eacdf5359349c31140677b87eedbe9c1516f63104be668d1 SHA512 b3300f6943c970b9a2ea27b9459ab82e634226372006b7748551e6c8c24897c9df4ab2bc5528eae6758d9cd431cb2428465ef30fdcc012ddac7c69cd4f43f966
 DIST gnome-panel-3.46.0.tar.xz 2797164 BLAKE2B 48f4a070df7015a8cca2b5041329f3ebb88474abf42cd21f74514ef557426c260110916eb1e23fafec1f99ec2e339258241484a87a6cd52a293d7df6abfff001 SHA512 a49f3978bd9561973c41083006b831cf4fcb07408048106ef56dae7e0809fb3ec825c8b4a1c09e818255c7995c45a6d33aa4f47e61f778f4b1f29ccc7c9033f7
-EBUILD gnome-panel-3.44.0-r2.ebuild 2675 BLAKE2B 98c58888ad483038cd894ef950394fba176c981e288c7d400d08ea89010fa6c95cea51bf60ca40f518a544008e2bb37525c966e4e12979f6bd28e73c37d735ac SHA512 bc8a35636447d63a40bfb9d81376e09880274111b8e36202a7711bbf72f11691fd8d9a5577a0a08413394315989b514c22eb5a385ab95fd22942865af16cbf97
 EBUILD gnome-panel-3.46.0.ebuild 2605 BLAKE2B 826bf1bf7de9ca8de7e2970d7464684f28b53f326dfd20fbca36979c120c12b5bb6bd75e71fde215989736360be53cb35261741ee64839aefcbd2bcfda8b6e41 SHA512 2e0cfbdf402e6117f4063965abc39588ef7c56b3a64d6a2f3fa1e44ca23f97e9cb3a29fbb684e66d43737624075ee8a22565f4dbd8ab4d0636c4e0a67f769dc6
 MISC metadata.xml 352 BLAKE2B 3946ac6f354818168988770ba94dbc6ff59b77499f4a70ff4bdecda99bbadc0e139211b3385fff8a90402592056df695e632f955ad3641dc0863151bd095926d SHA512 2f18af94fe1f1db2e9c59b3db90c08432964355cd8d2ab59577521c4872813e5bcff75798633d7abc1a55c55b253e9dcb8ae7e95f9791ca63c940ef8b11d1c43
diff --git a/gnome-base/gnome-panel/gnome-panel-3.44.0-r2.ebuild b/gnome-base/gnome-panel/gnome-panel-3.44.0-r2.ebuild
deleted file mode 100644
index e2782d5ff07f..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-3.44.0-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2 toolchain-funcs
-
-DESCRIPTION="The GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-panel/"
-
-LICENSE="GPL-2+ FDL-1.1 LGPL-2.1+"
-SLOT="0"
-IUSE="eds elogind systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~amd64 ~riscv"
-
-# <libgweather-4.2.0 because of libsoup:3 transition
-RDEPEND="
-	>=gnome-base/gnome-desktop-2.91.0:3=
-	>=x11-libs/gdk-pixbuf-2.26.0:2
-	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.67.1:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=x11-libs/libwnck-40.0:3
-	>=gnome-base/gnome-menus-3.7.90:3
-	eds? ( >=gnome-extra/evolution-data-server-3.33.2:= )
-	elogind? ( >=sys-auth/elogind-230 )
-	systemd? ( >=sys-apps/systemd-230:= )
-	>=x11-libs/cairo-1.0.0[X,glib]
-	>=dev-libs/libgweather-3.91.0:4=
-	<dev-libs/libgweather-4.2.0:4=
-	>=gnome-base/dconf-0.13.4
-	>=x11-libs/libXrandr-1.3.0
-	gnome-base/gdm
-	x11-libs/libX11
-	x11-libs/libXi
-	sys-auth/polkit
-	x11-libs/libXi
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_enable eds)
-	)
-
-	# Below elogind MENU_* pkg-config calls need to match up with what upstream has
-	# each version (libsystemd replaced with libelogind). Explicit per-version die
-	# to force a manual recheck. Only update the explicit version if the
-	# "PKG_CHECK_MODULES([MENU], ...)" block did not change; otherwise adjust
-	# elogind conditional block below accordingly first.
-	# DO NOT just change the version, look in configure.ac in which PKG_CHECK_MODULES-sections
-	# libsystemd is used and check if there are new sections where it is used!
-	if ver_test ${PV} -ne 3.44.0; then
-		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
-	fi
-
-	if use elogind; then
-		local pkgconfig="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			ACTION_BUTTON_CFLAGS="$(${pkgconfig} --cflags gio-unix-2.0 gtk+-3.0 libelogind x11)"
-			ACTION_BUTTON_LIBS="$(${pkgconfig} --libs gio-unix-2.0 gtk+-3.0 libelogind x11)"
-			LAUNCHER_CFLAGS="$(${pkgconfig} --cflags gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
-			LAUNCHER_LIBS="$(${pkgconfig} --libs gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
-			MENU_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
-			MENU_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
-		)
-	fi
-
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 40e461c86b6a..5745378b3d73 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -4,8 +4,6 @@ AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81
 AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
 AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a5df5e8db665e43372f8c08a5ea8480e63e318befc5b2e56e4b027ca873947972aa2b19d14ba85f0ec3e SHA512 edee1126e11c3b49ebcea1e1a6929d55a28d09b6c382666d6d6a32271a4cf22af23927f7a5e15ecbd4a4cdaa41ac2f1ffc09350f4e48257e2e5e29ade08635ac
 AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2
-DIST gnome-session-42.0.tar.xz 485616 BLAKE2B 0e77ad7fa2403c6cf22d087508d98281900d2f0e83ddbc8e25e6c0905398e04a893049ce90c79aebeddfeaafdcc16d7913c546294d92e488725fe4ec4e751928 SHA512 3d340700958b5800039e3009618709add2cdbaecb58344d9d2f93e4e761a737ef003091c380c68f95386dbb078b3d12f70732f0022611ab4a10e1c1eb988b4fa
 DIST gnome-session-43.0.tar.xz 484196 BLAKE2B 2d0ce93d756f2eeac084a912c36cc68134054abc21811541d1aa2734e5e8f7b25ceb2acf69dc575a7f0e149b7b19cfa42ac77e0b783c88ce55245c48a588c3ad SHA512 9948dff9a342589b91d18e5f39f9857276e9dbfa36da452bd818d44b31e73cc4fe0e18353b537963b78ea63b39aa644d4d0864dd2f6a19f62409a644e5626aec
-EBUILD gnome-session-42.0.ebuild 3478 BLAKE2B 9b075e93943ac6fa706ffbae578c1b7b18c256f5fe6f94f85cd38ffc888dffd13e8fcfa2ec0d67d8b581b0abe415a389bd388f590b73636d43f1075e4818676c SHA512 eafc83a739ee5331fd3916d40f2036cac287b48ce3c95eed2c919b0b61bec80c38e9c2e916cc87f0dd53c31aed4771da22273ce22f5fc562691750503783425c
 EBUILD gnome-session-43.0.ebuild 3466 BLAKE2B 8d3eadee7dc87b992cee95655093df25de896e573b76c8c49fa987d544e45feceb9fe4144e965ca3d5bab69d98cc744901789a552caad74423fe42fca47531e9 SHA512 a045a00cd44e80650ce515e364e276020494e139f76e41c8fb5619157dc69eaaee6eb5d95d120f20bcd027749ee7b81fb56141792cfdceacc0123358eb00642d
 MISC metadata.xml 460 BLAKE2B a735510be82f9e08b4002cbf033f75e601ec6f35a860c92728439367e6bdedf747c4fccc0250c89d231aa8e96348ae01275f577a21c958985cdaf0ef47615216 SHA512 df3adfa8e27c264a9bb6ba74ca43345a15f1cb0984461ea1fb831d4b355c77dfa94d491fdf28b34d58fd1d9e60428cfa8c40af2402bb9be42292202b63e7a052
diff --git a/gnome-base/gnome-session/gnome-session-42.0.ebuild b/gnome-base/gnome-session/gnome-session-42.0.ebuild
deleted file mode 100644
index 3e7aedbe1b17..000000000000
--- a/gnome-base/gnome-session/gnome-session-42.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit desktop gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elogind systemd"
-# There is a null backend available, thus ?? not ^^
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=dev-libs/glib-2.46.0:2
-	>=x11-libs/gtk+-3.22.0:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=gnome-base/gnome-desktop-3.34.2:3=
-	>=dev-libs/json-glib-0.10
-	media-libs/mesa[egl(+),gles2,X(+)]
-	media-libs/libepoxy
-	x11-libs/libXcomposite
-
-	systemd? ( >=sys-apps/systemd-242:0= )
-	elogind? ( >=sys-auth/elogind-239.4 )
-"
-
-# Pure-runtime deps from the session files should *NOT* be added here.
-# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# sys-apps/dbus[X] is needed for session management.
-# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
-RDEPEND="${DEPEND}
-	>=gnome-base/gnome-settings-daemon-3.35.91
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	sys-apps/dbus[X]
-
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-"
-BDEPEND="
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	x11-libs/xtrans
-	virtual/pkgconfig
-	doc? ( app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# Install USE=doc in ${PF} if enabled
-	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddeprecation_flags=false
-		$(meson_use elogind)
-		-Dsession_selector=true # gnome-custom-session
-		$(meson_use systemd)
-		-Dsystemd_session=$(usex systemd default disable)
-		$(meson_use systemd systemd_journal)
-		$(meson_use doc docbook)
-		-Dconsolekit=false
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
-	# Set XCURSOR_THEME from current dconf setting instead of installing
-	# default cursor symlink globally and affecting other DEs (bug #543488)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
-	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-
-	if ! use systemd && ! use elogind; then
-		ewarn "You are building without systemd or elogind support."
-		ewarn "gnome-session won't be able to correctly track and manage your session."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index e46320e65c8e..f367a5bd50e1 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,11 +1,6 @@
 AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9
-AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b52652355e1de4647c277524e3f19ef6d57870e75f32b8a2be10eb4e3be4ecf885765b8f0899ab71906f71324795763effa23a SHA512 5fb17c6ffd0486e43b5451747b346e5e9feb3f918f4ef23adc517c43bf61eb5b8850b03022e84848e446de1f0b2145a9dd2b954dde9994e9da176559cd6e48a8
-DIST gnome-shell-42.4.tar.xz 1928776 BLAKE2B cd986668683a8c57b69ca6b84351d6988d5dde5b96c780ea79109db3f3cd0d032883019dd07bf6e4ea678a549fe95ea99b29e9f9b6efc8d4231fcd4cd2fa3159 SHA512 f06f390cdb55b5b5871bbd35dfc3b0057fbc79d4dcb2334b34bfa198ec46a1880de99097e42ed9052b3183266dd017457f6a9a07fc3c517277551295478cb340
 DIST gnome-shell-42.5.tar.xz 1930668 BLAKE2B 0442ef92588e9891082c024d1e3b4ddb105a01ef5b7913ac8f1d2cac1af1c2ae8efd18184c511c554e41d8c0540c8712b7ef39ba1a9cac8c6c9336bb7b4cb320 SHA512 575559b99161b7045b04fc100cde719bbca83d90f78b673acc2189f3bb5104fd14f40da7d19611b154976f1c006e0dc2ff8cc124dc816da765c933fdda0624d9
-DIST gnome-shell-43.0.tar.xz 1945812 BLAKE2B 1d0ef32324e66ca4ffcdf7d6470247f50cb80f86a4ba647d44b9bc956477f5d6899b54d63024f69bb1432b90d3cc46855424c2c463ff2bdfcd96d56f5cdc52f2 SHA512 6f3609c8bac923f052d51fce44a448dba997cac543331b56229f46b56e8770de9370deb7759d4bf0e7385794232715b9b34e41f90dd1da30e88d5cfbf3f095eb
 DIST gnome-shell-43.1.tar.xz 1947824 BLAKE2B d03bf5e970a92762724e5e1ab534e610f73b1c4af48b42fd676304f0d75808fcf5ba21ab9b9a0503cc2a806b826340d7d441da4b3ce51b881ffd4cb08132ae86 SHA512 1e41f0ce38b285aca1f9189fdb50e4d409232554da73e9c08e21b5888d35bad3e2bf4a47e93fdf20798ea6f63864223088b78cab7c63fc1105cd955701ea2e81
-EBUILD gnome-shell-42.4-r4.ebuild 7514 BLAKE2B c0a28ffb318797d8df272ea0cce0233da48fdd990f28b5be50c446910047bdb8454ff56861888d8a025b4633cd76fc524b88e38770f67e94ec119610c56b8f38 SHA512 7b122fbb501a2598a7c5db027e0d101e5c0357dc5ba4992ef310bbe324f4df0927bbc9c4ee3adc937c0024f90b05a99796402824b7fe1ea84d34fd717a819130
 EBUILD gnome-shell-42.5-r2.ebuild 7512 BLAKE2B 38c7c58e13fb94ed45205192c6da4b6f98c0bd9bd7f0b3e05cf873904e3560b5018885fdfc84f0c799a92fcc5d2314c07f1797a4dce02b29e72883eee5ac40ef SHA512 a27b74b05f7a9540eecf73fce261fd0434c8d86a321a7d53db7b11c496892b7be55f671e2d2edfacec25c8638308bc74f264e45b589f6d52e04328560941704a
-EBUILD gnome-shell-43.0.ebuild 6451 BLAKE2B 8b50ba4e49cfd516935db134bc54838d65698fb31bd99b205c35d6aabafbaac10b67eb4b7eb63ab949b39cc08bc06860d63c90a7dc8237e22e162ad0a684e21f SHA512 49102bf162ed5285ccac2718d40f84bd53788d9343ab73b941cc78c336e53a7c39ab0052c34a61b45ee9bf1a030580e3bba432b22cd455e9e127c3868f75a213
 EBUILD gnome-shell-43.1.ebuild 6433 BLAKE2B 621e39f822dfa659dbedaebcdf8eb3985565b3648646522458227f7ad455068bae108c016133236f04ce4c496c4cf725009a893e9b5f6e6aaafdf95fdbd92b27 SHA512 41ffd85589ecbb2e59a7364631eabfc51c435004916db3418c218371a974790b68aa6d679866b5ae63130d7336a6b2b13e4582ef1216b6291ea7a4d16c7e6194
 MISC metadata.xml 1187 BLAKE2B 112179de090fbd712f5af966853e0837f7b0cdd78e377fce9c8d3c6078e17ac98acfaabf93dfc738a45fb78a94f82903f5d8609bdd7f3769877e6ac24a5424a1 SHA512 f679fd454c50795c347235ebab1ce8b2e070c4afd797ce574226dee7aae25991a00e2c98000b11178f8aa943af1be8652b585937f8cab41ef349b6ee7b897d05
diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
deleted file mode 100644
index c7fe07dd69de..000000000000
--- a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 28 Feb 2019 00:50:19 +0200
-Subject: [PATCH] build: Make bluetooth support optional
-
----
- js/misc/meson.build | 2 +-
- meson.build         | 7 ++++++-
- meson_options.txt   | 6 ++++++
- 3 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/js/misc/meson.build b/js/misc/meson.build
-index 582562711..ec9c62645 100644
---- a/js/misc/meson.build
-+++ b/js/misc/meson.build
-@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
- jsconf.set('PACKAGE_VERSION', meson.project_version())
- jsconf.set('GETTEXT_PACKAGE', meson.project_name())
- jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
--jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
-+jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
- jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
- jsconf.set10('HAVE_SOUP2', have_soup2)
- jsconf.set('datadir', datadir)
-diff --git a/meson.build b/meson.build
-index 8d7478f9b..79d340840 100644
---- a/meson.build
-+++ b/meson.build
-@@ -93,7 +93,12 @@ x11_dep = dependency('x11')
- schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
- gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_req)
- 
--bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false)
-+if get_option('bluetooth')
-+  bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req)
-+  have_bluetooth = true
-+else
-+  have_bluetooth = false
-+endif
- gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
- gst_base_dep = dependency('gstreamer-base-1.0', required: false)
- pipewire_dep = dependency('libpipewire-0.3', required: false)
-diff --git a/meson_options.txt b/meson_options.txt
-index f0f2ecf6c..85fc58ea4 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,9 @@
-+option('bluetooth',
-+  type: 'boolean',
-+  value: true,
-+  description: 'Enable bluetooth support'
-+)
-+
- option('extensions_tool',
-   type: 'boolean',
-   value: true,
--- 
-2.34.1
-
diff --git a/gnome-base/gnome-shell/gnome-shell-42.4-r4.ebuild b/gnome-base/gnome-shell/gnome-shell-42.4-r4.ebuild
deleted file mode 100644
index 69c46d9d3274..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-42.4-r4.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-#  * gstreamer/pipewire support is currently automagic
-DEPEND="
-	>=gnome-extra/evolution-data-server-3.33.1:=
-	>=app-crypt/gcr-3.7.5:0=[introspection]
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.71.1[cairo]
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-42.0:0/10[introspection,test?]
-	>=sys-auth/polkit-0.120_p20220509[introspection]
-	>=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=app-i18n/ibus-1.5.19
-	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
-	bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
-	>=media-libs/gstreamer-0.11.92:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-video/pipewire-0.3.0:=
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4[introspection]
-		net-libs/libnma[introspection]
-		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib
-	)
-	systemd? (
-		>=sys-apps/systemd-242:=
-		>=gnome-base/gnome-desktop-3.34.2:3=[systemd]
-	)
-	elogind? ( >=sys-auth/elogind-237 )
-
-	app-arch/gnome-autoar
-	dev-libs/json-glib
-
-	>=app-accessibility/at-spi2-atk-2.5.3:2
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	x11-libs/libX11
-
-	>=media-libs/libpulse-2[glib]
-	>=dev-libs/atk-2[introspection]
-	dev-libs/libical:=
-	>=x11-libs/libXfixes-5.0
-
-	gui-libs/gtk:4[introspection]
-
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	media-libs/mesa[X(+)]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated from inspection of the output of:
-#  for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
-# or
-#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
-# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
-# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
-# Each block:
-# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. xdg-utils needed for xdg-open, used by extension tool
-# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 7. IBus is needed for nls integration
-# 8. Optional telepathy chat integration
-# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 10. xdg-desktop-portal-gnome for various integration, e.g. #764632
-# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-# <libgweather-4.2.0 because of libsoup:3 transition
-RDEPEND="${DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue[introspection]
-	media-libs/graphene[introspection]
-	>=dev-libs/libgweather-4.0.0:4[introspection]
-	<dev-libs/libgweather-4.2.0:4
-	x11-libs/pango[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data
-	)
-	ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
-	telepathy? (
-		>=net-im/telepathy-logger-0.2.4[introspection]
-		>=net-libs/telepathy-glib-0.19[introspection]
-	)
-	media-fonts/cantarell
-
-	sys-apps/xdg-desktop-portal-gnome
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection(+)]
-	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/gnome-browser-connector )
-"
-BDEPEND="
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17
-		app-text/docbook-xml-dtd:4.5 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
-# dev-lang/sassc
-# app-text/asciidoc
-
-PATCHES=(
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/42.0-optional-bluetooth.patch
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/40.0-defaults.patch
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# Hack in correct python shebang
-	sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dextensions_tool=true
-		-Dextensions_app=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use test tests)
-		$(meson_use networkmanager)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-		-Dsoup2=true # libslot SLOT needs to match with what libgweather is using
-	)
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-43.0.ebuild b/gnome-base/gnome-shell/gnome-shell-43.0.ebuild
deleted file mode 100644
index 4ca5b2c503d6..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-43.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="elogind gtk-doc +ibus +networkmanager systemd test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-DEPEND="
-	>=gnome-extra/evolution-data-server-3.33.1:=
-	>=app-crypt/gcr-3.90.0:4=[introspection]
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.73.1[cairo]
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-43.0:0/11[introspection,test?]
-	>=sys-auth/polkit-0.120_p20220509[introspection]
-	>=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=app-i18n/ibus-1.5.19
-	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4[introspection]
-		net-libs/libnma[introspection]
-		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib
-	)
-	systemd? (
-		>=sys-apps/systemd-242:=
-		>=gnome-base/gnome-desktop-3.34.2:3=[systemd]
-	)
-	elogind? ( >=sys-auth/elogind-237 )
-
-	app-arch/gnome-autoar
-	dev-libs/json-glib
-
-	>=app-accessibility/at-spi2-atk-2.5.3:2
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	x11-libs/libX11
-
-	>=media-libs/libpulse-2[glib]
-	>=dev-libs/atk-2[introspection]
-	dev-libs/libical:=
-	>=x11-libs/libXfixes-5.0
-
-	gui-libs/gtk:4[introspection]
-
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	media-libs/mesa[X(+)]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated from inspection of the output of:
-#  for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
-# or
-#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
-# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
-# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
-# Each block:
-# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. xdg-utils needed for xdg-open, used by extension tool
-# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 7. IBus is needed for nls integration
-# 8. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632
-# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue[introspection]
-	media-libs/graphene[introspection]
-	x11-libs/pango[introspection]
-	net-libs/libsoup:3.0[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data
-	)
-	ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
-	media-fonts/cantarell
-
-	sys-apps/xdg-desktop-portal-gnome
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection(+)]
-	>=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
-"
-BDEPEND="
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17
-		app-text/docbook-xml-dtd:4.5 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( x11-wm/mutter[test] )
-"
-# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
-# dev-lang/sassc
-# app-text/asciidoc
-
-PATCHES=(
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/40.0-defaults.patch
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# Hack in correct python shebang
-	sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dextensions_tool=true
-		-Dextensions_app=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use test tests)
-		$(meson_use networkmanager)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-		-Dsoup2=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection]
-	optfeature "Browser extension integration" gnome-extra/gnome-browser-connector
-	optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx
-	optfeature "Weather support" dev-libs/libgweather:4[introspection]
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 4fb956ee13d3..12fc6a931056 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,6 +1,4 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
-DIST gsettings-desktop-schemas-42.0.tar.xz 709372 BLAKE2B abe682b32dc3c419a65b3752b9fa6821ed0058f06a4b123728a8d095ff3b6f65b569d9b80d43aac28fa5d79439c316cb628f0c63cd500c7ebc40cc4eff704bdb SHA512 db73988a6b38857d1aa6588ccac42099c57dcc187ef01776567cc7c28aff67dc06d6a8a067e0c69167d03cd865f0c1d58e75469a40f969084bb2537b088f8664
 DIST gsettings-desktop-schemas-43.0.tar.xz 736456 BLAKE2B 8fa0866a2747af370dbdc329afc2272e998d992bb4d19079a15d8f04063bd09660cabaf19123fedced5c6ebca13a21c207e1238178344d92a3a3d60ef0aa0152 SHA512 a3acd953ec206375e99e0988438e46b42668094d1b5425ccf21a7fe451887b705e2a5efe6870ee6bfc6722f54e5aa6a422de2af2099f29a5230f415744df2cf8
-EBUILD gsettings-desktop-schemas-42.0.ebuild 1130 BLAKE2B 0f0d8ddc1f7a5de95d5c650b2c548b297f80a7487cb1fb1685f8565a3ec056890e70a08b8523188bfccbdaa6a01afce7e5056734a798387feb55a8d20d0c1e3e SHA512 47ab05a968c72c5036335b04dc6d200ff10ddffb9cca60df0292c7b92ace9b10aff5c0d4680909e0a91c01a200b286784f0b3cfee69a0ecf44e54c6a523f241b
 EBUILD gsettings-desktop-schemas-43.0.ebuild 1130 BLAKE2B 021bca1732a7d1ea337e2e85c3cc20ecb344ec166c1ce8fcfbf7c74f759b92c1eb1628a37e62de402be25bf65c0fadfae929a6216513adb408bcedbcdc1dbd56 SHA512 75aca4d58b74a81b76d7cc84e22f7077e27ac31886c394ceb5aeb2c249a2ab8e612678748a0c43697132e64564bdc417781684fd3b62a867a3f428de207ea79e
 MISC metadata.xml 366 BLAKE2B ace189d0622624dc509c7f713a397c8b823bf9d46ae172f0fa2c8e1bb63f844ec98c265d31a7493e4439ac4b088b44c3307eb03dfe4613185452af5f001b62c1 SHA512 58de08b7a1f45b56f16ef5d0b827486011011496256bb30ab0390dbcbc3de09cc817b97fd3f82b726a6c7c90876542f0a12844f0f008e6477a4535f0cb2385dd
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild
deleted file mode 100644
index e0551890bd14..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild
+++ /dev/null
@@ -1,48 +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 gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-BDEPEND="
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
-	"${FILESDIR}"/3.32.0-default-fonts.patch
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang build-aux/meson/post-install.py
-}
-
-src_configure() {
-	meson_src_configure $(meson_use introspection)
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index 590abb15ce14..6d31f41762b4 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,5 +1,3 @@
-DIST libgnomekbd-3.26.1.tar.xz 450636 BLAKE2B 241f2f9af95696600f82ab3a1f53f80c6e76f6e81636419407957f172a2758ee16f5c6d419ab1c1c37d2e054c42b65404062471eceabc0fba45099481eb7b214 SHA512 8e83522f4d96001f9635278a001e0208d6d37e74b19a8c1702ec6de651036ad37a03385e66adbd3bae01d845a9a6181bb76f45bffec31eac98d600b49ab4360c
 DIST libgnomekbd-3.28.1.tar.xz 154800 BLAKE2B 803ef97d5d9cd31d762be1f57cbe967a93097ee724bf8e6bcb11aea414947d27c78b06b02e7843f48c505e4eea7c88e79d1d3b6d0090641c7d8ebf363bc90845 SHA512 ffcabfe19289057dd3d7489170093ff1614c3344103ba8ebc6c69f5668d01fea652b7be6c7d5c66291df3a319f975df5cf5167168cd0f60cede022b76bb57cb5
-EBUILD libgnomekbd-3.26.1.ebuild 817 BLAKE2B a8060d9c87d7a7ad6cacd32233f8bc4f54ee1dfde1f87fb90f15c5d4166e74cebce818338a1caec9d981495272a206d91e8747be93d691672f58cbefb01e931d SHA512 981b9c2e0afe86f935c86a4a7867b2f57b77b2ccd94aec2228b31017edd674634dce42b6f9358253d324a2ea64e8b5d7d7bbc2bbdf4d86dfb8aec469e049d0a5
 EBUILD libgnomekbd-3.28.1.ebuild 945 BLAKE2B b8a2991c465f2b5b3c440598a97de270075440bdde120428f8d51bbc89cc61ee37fbd8232356a1cbf0b618394d9e42eea8a753bf83a065b5b6e5dc2a2f5041df SHA512 6184cf767a873aa1b7cd707fe19f22523ed47e08a5d1ff901a03b5e64120560571f01e85cc6a4f8577648158290d3dca1ac2b7a174d7140f6402411290ee6100
 MISC metadata.xml 352 BLAKE2B 27ab161765feeb4dba8279657bdd2375bf33cb6c27249352a0816cec4e5ecaffb1bf20ae50353faaefe6e779cf87a26038e58bf4183ba5dee48b4dadd226e1bf SHA512 af2faf12839686193d8a7c6f82d19bfaae48d613a9746eeb05e25246f5a59af5f01ba742a4a470829310571191ee01b2a0b43171c7a1eba8f192c7e43562a3be
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
deleted file mode 100644
index 2915ac7e9125..000000000000
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="https://www.gnome.org"
-
-LICENSE="LGPL-2+"
-SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.91.7:3[X,introspection?]
-	>=x11-libs/libxklavier-5.2[introspection?]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index bec9634674c2..8e9daa153442 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -92,8 +92,6 @@ DIST language-tags-0.3.2.crate 53420 BLAKE2B 7c6d6f6db5c79b00d9e2b70f1a33769b83e
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.132.crate 595317 BLAKE2B 1b1ae80e034d94468befcafd4bae4c41f29424cbf3770b827dd1d7099cd2364db62cf2e7343da5010e230a47fbd91d320b162f7b54fa3955fd195b6976c3fb45 SHA512 48340dd173ed4d487f6504f4c32cb3c13dac8ad4da95469c8dd79386a7564d258a9ca42ccf1b174154717bafc1d3551b87c8fe35f7e4e062c8e33da9259fec50
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
-DIST librsvg-2.54.4.tar.xz 28214908 BLAKE2B 9aab1175494e50c9b4a1b74c76c0db4f052e42d98e48842c87a5434382983fc63f41923c67dc86c31988c114c4a18056d52a99c8ac2d5c1dd90af3da4814e4ac SHA512 e3415044a4faa48ec83e25cbd86dfbe7bc997286269298fb913a61a13d55195f660bcef459950979c2b8d60b144b29e33b278b2c4da0c376de65c34f39687e9a
-DIST librsvg-2.54.5.tar.xz 22412260 BLAKE2B afe9295e242af60cf7aec2abaa55a076aef215ae9011504b626db2ccee0e0faadc35352b3aa57c756211fa76edd0929a5df59cf3d2523c0fc1dbe96adedb5960 SHA512 202af468a0f76ceee1b930570216e5c70066071e5bbbdc00440430d98919130a8549c3c907f2ab9cced8f6d0b3545223ebf76be677a26e3168dcdd56c4bc5960
 DIST librsvg-2.55.1.tar.xz 5648060 BLAKE2B a3633c4435bda2c86da6c57a4715757eef72cae3385dca4ad145e58e5dc23272be51ab215c26646b903740eccf054b99eda21a981cb16955ea496fcf5fa63a81 SHA512 ea6ddcb1bdb88dd49215d848304543c244843ff2f5bd02c55678d838c997a02ee5592a18cc341dea542243b723839919bd4934d1137a7211dd4b5dc7177e988e
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
 DIST locale_config-0.3.0.crate 20808 BLAKE2B 68b0519639c816af82b941a417d4a74896033e9c5110081d495e1cc3a3e7613ddaf2a665770c6199749b89be131a35592dc4cd7cc2789928199b22205300aa9d SHA512 c7d77156e957559172f589f90405b2e9f5306041887990a60a31630af2de81c00fbba2bcdf52bd163fe431f85694dc6d2d380671f38f2724d7e4d178d89998da
@@ -266,8 +264,6 @@ DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca2
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST xml5ever-0.16.2.crate 40971 BLAKE2B d35a265ead1e2fb1a55b3227618893a07df89ed14e9fabe8f74a8b4e35db8cb76238a89d598e50822f8d61cba5afa1242416d0785d3b5de8b548277f1bb49876 SHA512 8879ad82891cd3beddd0d5fd91c0c93378fcf3b6a1437ee8e18dc66a101fa16683cccf18186b33d949f7d592d8aec9f5beeb4c6f99312a5cf472a03044ef927a
 DIST yeslogic-fontconfig-sys-2.11.2.crate 5763 BLAKE2B 80dc12f2d668afc1a49d6ba03b26dafb11e0bb2d8d087b42be3f196a419f30ac4bbd784fb6d7f930732b06fd7e3440bbad62760f09944d34b76cbdd7b29c0fe0 SHA512 cc43091ac04bbd4bd34ee413d93f46f9b7c4188425b38dbb6cf332926ca471f0567cdc3d33c78f441b3dcaf831124a1b1b59375b7c2a8b55198ed9b6dc444b2e
-EBUILD librsvg-2.40.21.ebuild 2607 BLAKE2B e1c974514e0deb7c81ff027747a00bb8bfb1902a140711a7207e4d126c59ef5ebc0252cb64c6ff379822db65bcf3b60992ec72accf3d1d3d6681ea65d1df6b49 SHA512 a2ba181144cb049e66af4743e1b84ff3865d7aed0b4c1f06c985616fb1fc72f39845926def6b81fafef041f59bbaa8b136782be1de99127af651d2b916724ed4
-EBUILD librsvg-2.54.4-r1.ebuild 2766 BLAKE2B ff392ae16d7e3b93b9999b3b2ded915bf8f3f70073b19f9ca6b9865c0a469482ba578f169165bee8db610baf8885aea2c66ca70da725bf75c98e40b33a038369 SHA512 2240d4d92d4cde6539d1d06610e27ef8d9f3934e1e8628ff64e3bff227fb0f7afd6f71aeb3c18ef11e6f4d11fa10cbe05ba0c1313c85594cf2cd6c53077a7863
-EBUILD librsvg-2.54.5-r1.ebuild 2773 BLAKE2B 9b4836911639e911b3dce46ad3d6dae2ff2da2eaf16a8ce31ee0f783b52441daca04193714f3b531faa6e33ecd83d5f839c7536405543734bbb2ddda49f9ce35 SHA512 3376950bd14ae7d8793fcfd7d69a8d4e547beae52494af7460fc9886969f48f57115441b2f3acae97b338b01cd84180ef9ed5358423e3143ab08e0f30cce09d7
+EBUILD librsvg-2.40.21.ebuild 2571 BLAKE2B 5757c2eaff62cbeb11705a49201410f6284277e42732c1b7f41c8f8785252327c8ac6f09b397c364fe7e5e0b642197a1881620e10a5715623da6d0e129617e60 SHA512 7255fa5b9f646a3c874602695e5e6bfdbd268418a4d195307de7927a11c5cedf2d6d004b45fccec35065f01a1609cf9ddf229ec9f9b9bc662d9a37c59a67ad65
 EBUILD librsvg-2.55.1.ebuild 7948 BLAKE2B 5c6ebb5d3b85a13d9a0814f3063c20513f195304ae45c70e2ae1110926a1eec2bd5d66dc11e4f2d2d7a89b01fdac120584eb86bee15c7e4de981d27a3714fe00 SHA512 3b9d0952151794594f212830dc86cef2082f62274fb9c7b3561619d827063cead2071fcb10b13cf5fc5f473b8a0f2caeab7a69c22109edfbd71896f59125c8a0
 MISC metadata.xml 417 BLAKE2B 00dfd8b977411ede7a975386836fe9290ea89265528038d4204d800ae04bb1aed6ba6b7427e0eeef05136f2f24b0c9e14dd0690c7db37c75ca2d7f41d997486c SHA512 937c31f4a264f7095d25fbf6e9d3f78e5f2558bc69d5e3308529db301108c8b47078967e85a4fc5163fbf840a34e4e15bf6621c6b3fefe5e858cc90ce82a61c2
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index 983b8aab8e94..9ad15f4908d4 100644
--- a/gnome-base/librsvg/librsvg-2.40.21.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.21.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 GNOME2_EAUTORECONF="yes"
-VALA_USE_DEPEND="vapigen"
 
-inherit autotools gnome2 multilib-minimal vala
+inherit gnome2 multilib-minimal vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
diff --git a/gnome-base/librsvg/librsvg-2.54.4-r1.ebuild b/gnome-base/librsvg/librsvg-2.54.4-r1.ebuild
deleted file mode 100644
index 926d37cdf922..000000000000
--- a/gnome-base/librsvg/librsvg-2.54.4-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome2 multilib-minimal python-any-r1 rust-toolchain vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-IUSE="gtk-doc +introspection +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
-
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[glib,svg(+),${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.48.11[${MULTILIB_USEDEP}]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-"
-DEPEND="${RDEPEND}
-	>=virtual/rust-1.56[${MULTILIB_USEDEP}]
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	gtk-doc? ( dev-util/gi-docgen )
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-
-	dev-libs/gobject-introspection-common
-	dev-libs/vala-common
-"
-# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
-
-QA_FLAGS_IGNORED="
-	usr/bin/rsvg-convert
-	usr/lib.*/librsvg.*
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-static
-		--disable-debug
-		$(multilib_native_use_enable gtk-doc)
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable vala)
-		--enable-pixbuf-loader
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# Set the rust target, which can differ from CHOST
-			RUST_TARGET="$(rust_abi)"
-			# RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
-			# far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
-			cross_compiling=yes
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_compile() {
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.54.5-r1.ebuild b/gnome-base/librsvg/librsvg-2.54.5-r1.ebuild
deleted file mode 100644
index 7c2a1744d132..000000000000
--- a/gnome-base/librsvg/librsvg-2.54.5-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome2 multilib-minimal python-any-r1 rust-toolchain vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="gtk-doc +introspection +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
-
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[glib,svg(+),${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.48.11[${MULTILIB_USEDEP}]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-"
-DEPEND="${RDEPEND}
-	>=virtual/rust-1.56[${MULTILIB_USEDEP}]
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	gtk-doc? ( dev-util/gi-docgen )
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-
-	dev-libs/gobject-introspection-common
-	dev-libs/vala-common
-"
-# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
-
-QA_FLAGS_IGNORED="
-	usr/bin/rsvg-convert
-	usr/lib.*/librsvg.*
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-static
-		--disable-debug
-		$(multilib_native_use_enable gtk-doc)
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable vala)
-		--enable-pixbuf-loader
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# Set the rust target, which can differ from CHOST
-			RUST_TARGET="$(rust_abi)"
-			# RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
-			# far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
-			cross_compiling=yes
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_compile() {
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 088e8705faf3..f8132e2d4b30 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,12 +1,9 @@
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
 AUX 42.0-optional-gstreamer.patch 1590 BLAKE2B eb251337ef8f2cba7b0fa9e1643c1155aa36bbc9234f4c5bf6baddd7f91d69e2713172685687a0bbf8fc646a97df857cfbce2a73768beb4eb5dae32ace893d07 SHA512 5f90d946c7bea63da2ca20397b0606747383b781dc972051082596d4fd0522a22c0d40440129e41ff4faeb5e9fcdfc5abb14318a9dade5b0343003bf86c7e339
 AUX 43.0-docs-build.patch 1086 BLAKE2B 449456236c807c28905698c5fc0f4b40b26ab300f40308d65b2889fa5f37ca8225eb564e682b5055b060529903d5c68a8a620d23ff8941229da5465918fa6b1c SHA512 f5847babcaee256c6718d499070029f3582a90f9fcb472c91d53d67fec63c0ac624dd6282ba81909f742244da5c715ba1b05b740c1ad187a75bd0b92a7f4d36e
-AUX 43.0-fix-clang-build.patch 1809 BLAKE2B 75b4bbaec1781ed8d89c7c1dcd24ec2b76b8967ef59d0acccded31e0f982d5d71b2f6d4542f94316e7139c461a1574eb3f7894adf7aeeccf8a593484f4e27b3c SHA512 023a9ff1ec8e4b376c4cd2aaa08c9873768dec0a69cf1217e73e744dba90f08cef4ca5bc20aa4b903a0f7505cdabe79dc6f681258a72c7d7704fe90d8921bb09
 AUX 43.0-optional-gstreamer.patch 1269 BLAKE2B 2a4599771977e44f9e1b25d2334f838a2016d1bfd6eea48c004ce410442ec12152e69efec389b6d373d1e187f00b78ac3fd617f4992e90acaf69a5a3325b7a2d SHA512 7f578859a3c8100f4d8783851b91a40c1c3d2d702851772e91bb08bade7802271ffa0524861e968004c6ea6450060da0ca6cf917808c4542ad5853bcb7d3ae45
 DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
-DIST nautilus-43.0.tar.xz 3165200 BLAKE2B 460df75af37c1c038bbbc9442d061a45ef3fbf09b2af016cd8340674c6eddf59b37a92011cf6e46d84168c859d4cd543d95fe140b322a00e2866bfdf5421a909 SHA512 c880125c2339be02852470e45cd4d589470e0df7723acc44b80df35c18cb1375c5f85cb46c7e53efbab1b51eedb4fd51ffa455773d4913d44c59070dafa22b49
 DIST nautilus-43.1.tar.xz 3162772 BLAKE2B 5150f1453328d3861b343bdd7070ee5eaea95a96b5b52db928eeb16e0aefad05cc0281295cb26c28cf3808e6ea3d76a2efff0fd9fc670b173ef3d3ad8c9ed9f3 SHA512 f09362584f2d4a04870c7e6b64ec3d23c90f20c8d37aa7103277985f182db49f3306f6e130966c6cfc97463fd5322f454564f713e70b839fea177545214dced2
 EBUILD nautilus-42.2.ebuild 3340 BLAKE2B f2968baf0c7af84edc0d048a40e4edf84d83338d35d57a146bc6ad8dc10867ca3403c7248d0b1b8b530d451cae7299f35a201dca2b100115073acd79e208931d SHA512 465f03fa321f14ef1b8cef926e2c34b4eaa1f648a13f96e273521f193eca174b8b94539701e377f8de9119a1fa2fbbae8cf733511955db6d674007474872b5be
-EBUILD nautilus-43.0.ebuild 3350 BLAKE2B 40c2019fc34988af6593fe02a483a7de5fc1e42a07fb28c506218ff200db66a6b420b9a83829b3a1eacc7426259c859b51d6f9fbbb4081921975af4978ebdd0f SHA512 300cb5eb50a863661b79826b643e6a010fc1d6cfea548b9d3ce6d2fb0dd34a3d2bd8862988826a63e9b0739f2baab40c262ba6e6cc0bc705e9afc95c3501b480
-EBUILD nautilus-43.1.ebuild 3243 BLAKE2B def2805c28be93a142274d123d1696d87b3960d8dddb9e2ef821a4260c403d2c474db6648e3e8fb56322636cbd15e629128b616798f8365b7db283973c87acd9 SHA512 7dd3cdd99efa11b4d5422b019efb2db2581c85cb0c30691411380ad92c589a847a09b3f381ab41c22aafc208179dbcf8da72e05117031edfe1e729f3a352020c
+EBUILD nautilus-43.1.ebuild 3285 BLAKE2B c82c359d45f640c536e5cb1fc94d429e09ad3e736974d9f5905543624a39318d91eedad700b97dc3a6688b834693e3b2349d07dc3791ad341f347090a5640624 SHA512 ba790a1d6c2be8ed37e81d602abb2e53dd45fcb7a49bcf1da25d4496992a04463e54d1a14b7944bfd1533c63f1b3086445b0d0f944f2f489f480b02374cfbd32
 MISC metadata.xml 662 BLAKE2B 0d7e1a575749fe5e00899852e51bc0eb184f7b2a55f2fe0eaade6ca087961ceb673d7523b9c6b71d4ac266b8488ad599de1651fb7e6fb0b2c7c160384dc059f5 SHA512 696cc099a35c07475920b8ee5785820ab6f0505bf3a14fc67f6372d8762012f5d21e3c4fa573fee1d7e6cff4e7233dacfb9c78c5f7f025a03f50e6374f3ebb67
diff --git a/gnome-base/nautilus/files/43.0-fix-clang-build.patch b/gnome-base/nautilus/files/43.0-fix-clang-build.patch
deleted file mode 100644
index ec8fbd90ac1a..000000000000
--- a/gnome-base/nautilus/files/43.0-fix-clang-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 68b050ac0f60b1f02767276643cba8eb701f9884 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
- <leohdz172@protonmail.com>
-Date: Fri, 30 Sep 2022 17:35:50 -0500
-Subject: [PATCH] fix conflicting types for nautilus_file_get{u,g}id
-
-when building with clang
----
- src/nautilus-file.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/nautilus-file.h b/src/nautilus-file.h
-index 9b0613e98..57cca177f 100644
---- a/src/nautilus-file.h
-+++ b/src/nautilus-file.h
-@@ -244,9 +244,9 @@ gboolean                nautilus_file_can_get_owner                     (Nautilu
- gboolean                nautilus_file_can_set_owner                     (NautilusFile                   *file);
- gboolean                nautilus_file_can_get_group                     (NautilusFile                   *file);
- gboolean                nautilus_file_can_set_group                     (NautilusFile                   *file);
--uid_t                   nautilus_file_get_uid                           (NautilusFile                   *file);
-+const uid_t             nautilus_file_get_uid                           (NautilusFile                   *file);
- char *                  nautilus_file_get_owner_name                    (NautilusFile                   *file);
--gid_t                   nautilus_file_get_gid                           (NautilusFile                   *file);
-+const gid_t             nautilus_file_get_gid                           (NautilusFile                   *file);
- char *                  nautilus_file_get_group_name                    (NautilusFile                   *file);
- GList *                 nautilus_get_user_names                         (void);
- GList *                 nautilus_get_all_group_names                    (void);
--- 
-GitLab
-
diff --git a/gnome-base/nautilus/nautilus-43.0.ebuild b/gnome-base/nautilus/nautilus-43.0.ebuild
deleted file mode 100644
index be6a810c6785..000000000000
--- a/gnome-base/nautilus/nautilus-43.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="Default file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
-
-DEPEND="
-	>=dev-libs/glib-2.72.0:2
-	>=media-libs/gexiv2-0.14.0
-	>=x11-libs/gdk-pixbuf-2.30.0:2
-	gstreamer? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	>=app-arch/gnome-autoar-0.4.0
-	>=gnome-base/gnome-desktop-43:4=
-	>=gnome-base/gsettings-desktop-schemas-42
-	>=gui-libs/gtk-4.7.2:4[X,introspection?]
-	>=gui-libs/libadwaita-1.2:1
-	>=dev-libs/libportal-0.5:=[gtk]
-	>=x11-libs/pango-1.28.3
-	selinux? ( >=sys-libs/libselinux-2.0 )
-	>=app-misc/tracker-3.0:3
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-libs/libcloudproviders-0.3.1
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	>=app-misc/tracker-miners-3.0:3=
-" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
-BDEPEND="
-	>=dev-util/gdbus-codegen-2.51.2
-	dev-util/glib-utils
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		dev-util/gi-docgen
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk(+)]
-" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
-
-PATCHES=(
-	"${FILESDIR}"/43.0-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
-	"${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
-	"${FILESDIR}"/43.0-fix-clang-build.patch # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/996
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-
-	# Disable test-nautilus-search-engine-tracker; bug #831170
-	sed -e '/^tracker_tests = /{n;N;N;d}' -i test/automated/displayless/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
-		$(meson_use gstreamer) # gstreamer audio-video-properties extension
-		$(meson_use introspection)
-		-Dpackagekit=false
-		$(meson_use selinux)
-		-Dprofiling=false
-		-Dtests=$(usex test all none)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	meson_src_install
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	# TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/nautilus/nautilus-43.1.ebuild b/gnome-base/nautilus/nautilus-43.1.ebuild
index 5831492dd557..b15e42260d35 100644
--- a/gnome-base/nautilus/nautilus-43.1.ebuild
+++ b/gnome-base/nautilus/nautilus-43.1.ebuild
@@ -11,6 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+REQUIRED_USE="gtk-doc? ( introspection )"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
 
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index d8ceb7c59389..75f4f8d075ce 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index d0ee3e084f1c..ac337bd625e8 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,11 +1,9 @@
 AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.44.4.tar.xz 4784388 BLAKE2B dd5b7094af9c66b710d61de282ff7e223fd87524f0135b7fc2c962d7829a8ed25a90a5fa73d155b692e28d9d18807f8c8731efbfb32613e2e1a020008739beae SHA512 385137f1e412b5c5bcd496d493da4657f8bb6e72519f6e62ab1a683c729082ea0ddcf7b5dae8c0cdf37cb279a1cf59ffb6dd61009c693001d03a0d54264e979a
-DIST evolution-data-server-3.46.0.tar.xz 4817048 BLAKE2B 5c07137659132fca4e2e42d616d3b7e26317f44009de1c9582105a65036884c5b1f7521ac325e2a74a6493362a38b6761d78dabd00b9e64b51a352bcd1d225af SHA512 3aef4ef51e5be2c5e392a2b2781283bb75d8e7d08a3a0daae6be488d14e998779b992095d12889d2d6afe5c732394090f99fa9a866e8825eecdcde2bf6b24ec1
 DIST evolution-data-server-3.46.1.tar.xz 4843728 BLAKE2B 1053389277c9b8f83c80db382ba14db974a0674e75f728ac24a21e49f2c744c0239d19f380487487a2798db85706c5c0a7cb867508726e40034bcdcbb46da6c1 SHA512 6dbb9b192c46fdec25eb3587f90c5c2f3de902c80996d691978be519d7f7aad9946d3282c44febcf498bb8d497b639f3afeeead3f032bbb0cd1ddb380a0ca5e7
 DIST evolution-data-server-3.46.2.tar.xz 4883032 BLAKE2B 530f2cd40716373a0d865edadefb5789dae3b894f202ecfc55d2d2e9f1409e59e2914065e7247ac0749d6af54de7705720347d7f9d93a5376c967ec804c9e805 SHA512 570a14ea21c18be8626530562483c1f112c6f773b4502c7c16005abe516dd35d810985ed3cd4c89b993e5169474791ff3694999ef41a6fe53e2309450c7c7341
 EBUILD evolution-data-server-3.44.4-r2.ebuild 4510 BLAKE2B 6c70a5ced1a2c2a815898b45728162a852771f9e2dfa2b77decb8844ae7a48b3a05ac1770862136bf0b5e104365254c080ff1c66bce10dcbb6d6b30860b5f81f SHA512 2cc50e79bbaf8ba95b8cdac5a20b20aa13a89db78cb99c7fd5cd67cfd2753cdc1e6fd275a253acd1b337ab77d5295b8755e5d1edcd2830ce10498ee551831c7c
-EBUILD evolution-data-server-3.46.0-r1.ebuild 4064 BLAKE2B 19c0bc2cd9167ce2907adaa9d6e6dca2daf81f17045eb0c4e0a9b4d7f545301280088453bc83bdeaa958030f38ea79bc76074d37260f408437c753210e88a27c SHA512 0ed0a208c7750f5600f623e0fe1219430315972d4a68e1956bf610170d597cce482807ad9e41a693fee10737a0c6064357ed5bbdf496bd7e1d1aed5a765782a0
 EBUILD evolution-data-server-3.46.1-r1.ebuild 4212 BLAKE2B b5b2981a0e49a90ca0bda3a23062fa0477c5661b2abe22da8d285de07ab5fde839ef05d2629919e5ed7b709e0a8dcd5dfd7d8e5eec899479dc66875204d2009c SHA512 60aa44f3a42ebd385ab7b0267bccedf8e1b1eba315dbdc4fb894b00506abe45546398391fc9db2e68e59a5d623156a797d15090a7b99c3c720d78007894e7a36
 EBUILD evolution-data-server-3.46.2.ebuild 4202 BLAKE2B f7dcac5714a71c01514a7383885053242f1e10ecf19e2cdfd0d503eaedb625a1c906ac4266be83381b4ffa061764f17033b99c1d603085a17b0f03a1ec5e0be2 SHA512 e78bd655a8f2352fe4b4f616e926562defd84da0e5d24f6a4c375d13812b39fd02acb8c90899aa90fc60b28e9a85128a6fbb0e5be07ca104728a080d5cf660b0
 MISC metadata.xml 962 BLAKE2B 212d69424f3276f40cbd92843968374de95e0cf3b5263a0fe815628aa5fa9a3618c7104abbc0e4bb2f0a9ab6b36a674fffa36c6d020ae7ffb6fe34c6f3c035f0 SHA512 49350cc9ee65c76c248a99fb7adbfefcea02eb1c43673bb8e010af1fa78767dd2d99beb625a0164b2a2b8e8b366478b4dc1309c2044b77feb017f4bdeffa2d92
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.46.0-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.46.0-r1.ebuild
deleted file mode 100644
index 54af15fb111a..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.46.0-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake db-use flag-o-matic gnome2 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
-
-IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth vala +weather"
-REQUIRED_USE="
-	oauth? ( gtk )
-	vala? ( introspection )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
-# glib-2.70 for build-time optional GPowerProfileMonitor
-RDEPEND="
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17
-	>=dev-libs/glib-2.70:2
-	>=dev-libs/libical-3.0.8:=[glib,introspection?]
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
-	>=net-libs/libsoup-3.1.1:3.0
-	>=dev-libs/json-glib-1.0.4
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	berkdb? ( >=sys-libs/db-4:= )
-	gtk? (
-		>=x11-libs/gtk+-3.20:3
-		>=gui-libs/gtk-4.4:4
-		>=media-libs/libcanberra-0.25[gtk3]
-
-		oauth? (
-			>=net-libs/webkit-gtk-2.34.0:4.1
-			>=net-libs/webkit-gtk-2.36.0:5
-		)
-	)
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-4.2.0:4= )
-"
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend)
-		>=net-libs/libsoup-3.1.1:3.0[vala]
-		dev-libs/libical[vala]
-	)
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gperf
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Some tests fail due to missing locales.
-# Also, dbus tests are flaky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
-src_prepare() {
-	use vala && vala_setup
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-	  -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-	  -i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DWITH_KRB5=$(usex kerberos)
-		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
-		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PHONENUMBER=OFF
-		-DENABLE_SMIME=ON
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_GTK4=$(usex gtk)
-		-DENABLE_CANBERRA=$(usex gtk)
-		-DENABLE_OAUTH2_WEBKITGTK=$(usex oauth)
-		-DENABLE_OAUTH2_WEBKITGTK4=$(usex oauth)
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=ON
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_VALA_BINDINGS=$(usex vala)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 57ed19c7bc49..0623b29cee73 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,9 +1,5 @@
 DIST evolution-ews-3.44.4.tar.xz 691396 BLAKE2B 69344bec9dffe21e54e77325929b791cc89072e9a2a2f9a0fbcf5551c1f8b13c90c4a3c2bd934956c4e1b73b306fbdd6827c6fb4ef7aee182a3bdbeb450d124a SHA512 0326b274fbcc3630ccaf6517495ce22409706f0ad16c11b189f91c27ab8921a639bb07296d51063e71cb706e66bd861044adbf146b16f9fca4b4cd9cde6edb65
-DIST evolution-ews-3.46.0.tar.xz 691740 BLAKE2B 1d956a39dc0233c8a8c3a23f2be3be2e2d697eca71d4e7317db69ca4ade007a4e2ac51edb99851aa75c009ed40e5c0b149b1ddab7cd6826eb4dddcb08f62f326 SHA512 3c01e981857e02c45660bd0d8143ce0f19dd20b30916b8334c15546e6ff720efb4fd52ab0cfb312a5767958cf0eceb5e39213256b75feb15e5c1fea6755b2dd9
-DIST evolution-ews-3.46.1.tar.xz 692020 BLAKE2B 9ccabf0393842a829f5a319fcca886e1546cf1bad3e5199683822ef68c9c285430076a11e87f646f052e9e4c8ba691029d31bce4b4da833c6e291252ab0f57fd SHA512 0e258aa2af4305f46926c43dba1787cf5e577567aa385e7d039b2e18d9660e24f7571b9b4e8660a8203e6dabd3f1346670164620f73c9465cbb6516a7076ab25
 DIST evolution-ews-3.46.2.tar.xz 694936 BLAKE2B 548fdcaf0e0b9964bbb8b854a7aa7cd83f52195ddf6d9ba70b35ef9ea6f6c7606a967f3a3eece36bf7af3ecc3d7d2dfb8e6a701a6c18e85fe2523c8a3f04fea8 SHA512 dd669b8d562849d588f88dd40f981e0401a046cb5489b00894082b04462fadc43581dadb0eee87077b63998a32e80cb66ae9a5c0de99c7079bb5cbc5aa8c37bd
 EBUILD evolution-ews-3.44.4-r1.ebuild 1560 BLAKE2B f17aeee022f634c5f649d199a737508e40476732b3640664e7cc32a09d456d5b6be9f332cccb182df37110edce2f60277f06830d106b5f0eab9c773113b92967 SHA512 a0ef1eb981174aa1a43e68464bd8d074b683331387c12b0c96c4f8a847df08480ee8b94b5b317cda5e4883d74c098b936bb6dda82ad9c2d2cea06536ba1fc0c5
-EBUILD evolution-ews-3.46.0.ebuild 1569 BLAKE2B ad6d58dc251bc434f6cd5d3a8c097ab641715dcae6f63b68a33c0b2c4029d0c525aeb7128cd7d3ab3c6b0052050d3b401fc565953a755d811ce3461040d2affc SHA512 76893a81fd26c7a07ad72fc148646ad35a36a34436b448e6f13f71fc5dc35173b0696dc72df367cf21feb1d13d3cbbc2f976e32503e7519c51c369fb14df49eb
-EBUILD evolution-ews-3.46.1.ebuild 1569 BLAKE2B ad6d58dc251bc434f6cd5d3a8c097ab641715dcae6f63b68a33c0b2c4029d0c525aeb7128cd7d3ab3c6b0052050d3b401fc565953a755d811ce3461040d2affc SHA512 76893a81fd26c7a07ad72fc148646ad35a36a34436b448e6f13f71fc5dc35173b0696dc72df367cf21feb1d13d3cbbc2f976e32503e7519c51c369fb14df49eb
 EBUILD evolution-ews-3.46.2.ebuild 1569 BLAKE2B ad6d58dc251bc434f6cd5d3a8c097ab641715dcae6f63b68a33c0b2c4029d0c525aeb7128cd7d3ab3c6b0052050d3b401fc565953a755d811ce3461040d2affc SHA512 76893a81fd26c7a07ad72fc148646ad35a36a34436b448e6f13f71fc5dc35173b0696dc72df367cf21feb1d13d3cbbc2f976e32503e7519c51c369fb14df49eb
 MISC metadata.xml 354 BLAKE2B a6cf76e87956f2418a25c83542af3e5efe415943426b03750b2572129b06f977f900207a1eef805b7ae463a84204d12bf286ef9ed0a5b6990cbac2c77783260f SHA512 9f06dce58e2dfdba0a22f8a711d5fc98aba9ae1d130173bd7ef8effd0bb3c1cf046eef712f7ea7bd55c4382ca01e78d7028419ce41812d33ef38a1329978af56
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.46.0.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.46.0.ebuild
deleted file mode 100644
index d8248e7b6518..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.46.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gnome2 optfeature
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-ews"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="test"
-
-# libical-glib currently (2020-02-29) oddly behind USE=introspection
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/libical-3.0.5:0=[introspection(-)]
-	>=dev-libs/json-glib-1.0.4
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-3.0:3.0
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	test? ( >=net-libs/uhttpmock-0.9:1.0 )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-}
-
-pkg_postinst() {
-	optfeature "oauth support" gnome-extra/evolution-data-server[oauth]
-}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.46.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.46.1.ebuild
deleted file mode 100644
index d8248e7b6518..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.46.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gnome2 optfeature
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-ews"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="test"
-
-# libical-glib currently (2020-02-29) oddly behind USE=introspection
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/libical-3.0.5:0=[introspection(-)]
-	>=dev-libs/json-glib-1.0.4
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-3.0:3.0
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	test? ( >=net-libs/uhttpmock-0.9:1.0 )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-}
-
-pkg_postinst() {
-	optfeature "oauth support" gnome-extra/evolution-data-server[oauth]
-}
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 69376a684b17..10dfdfa73723 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-boxes-42.3.tar.xz 1235916 BLAKE2B 69a52117b0ef459b4f6c11287f3961283c0493522875958ae65cf1838d9359b60e1c376bf86c1bc1899e69b6b9aed72a32aa39c7e687afef6a23de50d599b8e8 SHA512 2c455830b76cffc647838b797dc7667d9dec0be45658972075b203553bd73bb54dd6b9b22891da9eb12bea7f157b26980a172685a10e1d252f32014f38eb8805
-DIST gnome-boxes-43.0.tar.xz 1232476 BLAKE2B be12499c8a155d47d4d0479b33a7947e6df0382eda0be84497c5f60391e2b36c96dca30d48840d9c23034fa79f9f2bbb2fb534403d0da92f0d653ae22382c00c SHA512 64e549694bead564fe0f3754e55576d259cf404f13f3db4fd2f1b56e80ce7c126d0e4c07a91fa168d27c511539cd0cf4b56cb39bea0c758930b61d356f9f110c
 DIST gnome-boxes-43.1.tar.xz 1231472 BLAKE2B 1c7bd9094e7ddd8f5062ccd4660f72f2b3069cf3d66f45b8713e0880f5e5d8976eb4c1c8d4dfe8418a7a51e9b1ae0b9b5c85996e179a932c43748b308819d2d0 SHA512 25865c4bb1dfd47552001eda18ba901f9501a22978ef382bd7edcb31493cc284794506f5e2ba4f28d72e6ddb35e5c6e9b5646ccc4d2e87bf41e8620c102d335e
 EBUILD gnome-boxes-42.3.ebuild 3852 BLAKE2B f077a6d89ead04038dce83f85f0c7ee1d363fc26a0a2e07db5748d65f140cde0d55d2f89e57bd566dbdaefbac9e9dda8fba3173dbd918444d9d05c30b3db01d8 SHA512 6f1ebb0dd036865f817d0c3651b4d6739967814778aecfa7039a1f7e5eb04c9258f030d94924ec2ebb56ad14c42c774b29ea17396fed4d7d68cb3262fec0364c
-EBUILD gnome-boxes-43.0.ebuild 3516 BLAKE2B 773eef692e358381f03cbb8d3524b44354b0065bf4293566074ffa5e21ea352c2af0680d18ec72b55aadf5b87a7b8603b7dd25dd4dab3fd722401a81f29ddc4c SHA512 fc8787fb0a6fc9b3681f3a245db9cd50522a91e2590f7a8023c7df550a75b5490a40810bc838784c2e605966bc8d311d006e66415073cc77c2813c1347d93818
 EBUILD gnome-boxes-43.1.ebuild 3516 BLAKE2B 773eef692e358381f03cbb8d3524b44354b0065bf4293566074ffa5e21ea352c2af0680d18ec72b55aadf5b87a7b8603b7dd25dd4dab3fd722401a81f29ddc4c SHA512 fc8787fb0a6fc9b3681f3a245db9cd50522a91e2590f7a8023c7df550a75b5490a40810bc838784c2e605966bc8d311d006e66415073cc77c2813c1347d93818
 MISC metadata.xml 352 BLAKE2B 285b6e588965df3d070f92552b36941c6346a9fde3dce831baa82d42c8ca23f62cc027e5984a27fc87bffca8181c2d13a52b064729349daef0aa815a566a885e SHA512 09baca6576a90ca57b6e0935879f1630550efc9d591b425d6944b28b1184612b34fcdbae6d835d98812c89ec7a47415af9a01678be16f35a52933bb7c374131f
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-43.0.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-43.0.ebuild
deleted file mode 100644
index 7af9bb261f0c..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-43.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
-
-DESCRIPTION="Simple GNOME application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2+ CC-BY-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
-# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
-# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
-DEPEND="
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gtk+-3.24.1:3
-	>=gui-libs/libhandy-1.5.0:1
-	>=sys-libs/libosinfo-1.10.0-r1
-	app-crypt/libsecret
-	net-libs/libsoup:3.0
-	virtual/libusb:1
-	>=app-emulation/libvirt-glib-4.0.0
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
-	app-misc/tracker:3
-	>=net-libs/webkit-gtk-2.38.0:4.1
-
-	>=dev-libs/gobject-introspection-1.56:=
-	>=dev-libs/libgudev-165:=
-" # gobject-introspection needed for libovf subproject
-# These are called via exec():
-# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
-# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
-# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
-# sys-apps/policycoreutils restorecon is used for checking selinux context
-# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
-# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
-# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
-RDEPEND="${DEPEND}
-	app-cdr/cdrtools
-	app-misc/tracker-miners:3[iso]
-	app-emulation/spice[smartcard]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	sys-fs/mtools
-	sys-auth/polkit
-"
-# This is only needed for creating the .vapi file, but gnome-boxes needs it
-BDEPEND="
-	$(vala_depend)
-	sys-libs/libosinfo[vala]
-	app-crypt/libsecret[vala]
-	net-libs/libsoup:3.0[vala]
-	app-emulation/libvirt-glib[vala]
-	net-misc/spice-gtk[vala]
-	x11-libs/vte:2.91[vala]
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddistributor_name=Gentoo
-		-Ddistributor_version=${PVR}
-		-Dinstalled_tests=false
-		-Dflatpak=false
-		-Dprofile=default
-		-Duefi=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index d337e4a28e77..1f5f0e6f47a7 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-calendar-42.2.tar.xz 578276 BLAKE2B 44684f7c1b6db6865bf0b9bc7096a990212b086d7c2e748cb41e4ac6ced4a1bec0e14f5ed3d6253f49006f4e736666578ded9cd6cd84533fcc03316c5a437b4d SHA512 6ab72017dc0230dc396c7c19cdeab633744b6a44ac4a5c2183389cadca1507bf696c5cdf39def1c0158fb0be5f1988f2a30a6fc2ea0090d6fc341adc45daddbe
-DIST gnome-calendar-43.0.tar.xz 422052 BLAKE2B 08f11b309087c80090f364fa569738a0348d609fa5c0a32b5c5ea4f32681bf53c54248fc7fc3b755f2d01f382b3a8c27511daef9f0bd59faaa148b1f6d253add SHA512 33c77b37e53132892665a44547974c44b7155e673bff27f438fcd30ee68b16b4bbabd9e6a287f3680b39e5032b19409278bc1c63ae46b1ea1191e32f81a55e32
 DIST gnome-calendar-43.1.tar.xz 423132 BLAKE2B abc68034794343a644bc61165195aa0bf5ce85d741cb5f5fdf32128e857938eba085a7a4dd7321b1c02eab6c02dadbfe00a063738ba976121e36168151b01c2d SHA512 a527cb672794a8ce452f6bd0cc389547c8293cb18ce94fc80c47d171926fbc5901f02761f723a853bf83af359fbe276e4c634ef47f94e7d72d73e25b2d725483
 EBUILD gnome-calendar-42.2-r2.ebuild 1180 BLAKE2B a74b9e76b24b3ac1166faf349097a02647aaf29292f4ef7b4b4cb03ab01dde3b0b734b2f5ff2fe849b941da81ec93b56e4ee191ea6d59b6786207c82b7a89839 SHA512 88f104ded09ca692e6b39d8a8a824051c406cc3456fb868bd6aa9f1f4ff6ea2fe56fdeafecaa5552ab34d397a3f378ec37f1b03ecaf71c9d6031fcee6baa1134
-EBUILD gnome-calendar-43.0.ebuild 1025 BLAKE2B 0732428e10f170301216a57ee562123ef58dd044d9c943e6d179ff4b05253c55b33427a731f364330fcb4015a2903ba527d28aff40ab0d26b54b0b4d87ada653 SHA512 f9fee92b332d847f479fc834837b205992ddaf7fc2242502ca6f2564cd7efc39ee5e4db7be90e860b7707b4fc180d8ac99990eed3c951dccb4e45ef6d45873c7
 EBUILD gnome-calendar-43.1.ebuild 1025 BLAKE2B 0732428e10f170301216a57ee562123ef58dd044d9c943e6d179ff4b05253c55b33427a731f364330fcb4015a2903ba527d28aff40ab0d26b54b0b4d87ada653 SHA512 f9fee92b332d847f479fc834837b205992ddaf7fc2242502ca6f2564cd7efc39ee5e4db7be90e860b7707b4fc180d8ac99990eed3c951dccb4e45ef6d45873c7
 MISC metadata.xml 641 BLAKE2B 5cdd6f1f7445a7120c135c9401ea6bacaa6386ab797191e293ce6fddb1ecd2f7829c6854f39d5ca085ae6c7c0c6f737d59da26fa8104398e3ca81c451430510a SHA512 9bd92483720db367fdeee389c7b5a0ef7c2a8c3c9970bac891ef3978c0cfd3357588b5df1cde8276763742d3f4f81dc41ea221e74a4b03618f2a5f2bb2226432
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-43.0.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-43.0.ebuild
deleted file mode 100644
index c9bb9e966775..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-43.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-libs/libical-1.0.1:0=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-	>=gnome-extra/evolution-data-server-3.45.1:=[gtk]
-	net-libs/libsoup:3.0
-	>=gui-libs/libadwaita-1.2:1
-	>=dev-libs/glib-2.67.5:2
-	>=gui-libs/gtk-4.6.0:4
-	>=dev-libs/libgweather-4.2.0:4=
-	>=app-misc/geoclue-2.4:2.0
-	>=sci-geosciences/geocode-glib-3.26.3:2
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index 2bdda8ef2ede..7d86cb23ddb8 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-characters-42.0.tar.xz 561308 BLAKE2B 454d2bbdc5e8486f50b3f21bba4a65aa0920654c2cc3376cdda62070011c1a296f240632ddcd412add7953fccb2780ba37ac3196aef138e9771cdf5a81061441 SHA512 ba6fa07ff90ede1cba0e541f0c4bda63f1d6122c18af44dafa3bfb0fa6f9580a3cd8580d0a12510e2eb95afedb4b0f350accc37eee85c3aa4422a66732dff404
 DIST gnome-characters-43.0.tar.xz 582892 BLAKE2B 20ee1a5f12242797c2c12a0ed32d809210f059dc40d986eab754e966b40625eb90544fc494867969ca426f4b0891a378a22ace52d0a1bd641c803bdd75d4c4c2 SHA512 0bb86c7763b4930695f089a65723873ec736d78fd04b56cd54fa5785c62271e3490413232c6ebd27171855f125cd1732e7357ca819227f128efed057c1c8a8c4
-EBUILD gnome-characters-42.0-r1.ebuild 884 BLAKE2B 76ceec92de38d58d52dc48ea3797bd8896d84b0d24f819ed9628ef03956914b03eb61ed08a66c0323a221eb401fa65a86431918476e409b306a81a639b4ccd8e SHA512 fea6c0e581ca05cb9e062b6a848e31a35d4d6f1e14e9c33019a6d19a9640a0d23e2993bfb796e2cd29a30cf2a3b6e36f53511e75b2ecb6578195fa5c7bab43e7
 EBUILD gnome-characters-43.0.ebuild 884 BLAKE2B 116a5697c731f3063e5c21b1be3e1ba346c192f9ecda7888991dfe6452e9202bd7f72478ba3537a3fbf75d6548b813283eaff6c8fbbec35a26a3a06e44255ed9 SHA512 7020766751532af3414b8729d67f392fc27a2d9c66a35ba2a51447125a7dce3017c559d247981fdb80ff041bce8b4f372a968b429ecb7689c50c7fc6721daae1
 MISC metadata.xml 357 BLAKE2B 1b9479f7ff139fec94e455e917e8376172adfb49ad580d6f3b612aef623a4c5617fec2e3528eb51da1d6ef39a8e37bebfd0b1d06a36173231e4e5d10b06fcb64 SHA512 34fc6316a9dffd2c9c1f671ed5e771663ea340e6cb4d933da98a8fa75932917cb827f94cfdb76e8a2a3ead67d957d94fdcf8b34924ea012b0288257a2e18e69f
diff --git a/gnome-extra/gnome-characters/gnome-characters-42.0-r1.ebuild b/gnome-extra/gnome-characters/gnome-characters-42.0-r1.ebuild
deleted file mode 100644
index fa1867e3367f..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-42.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/gjs-1.50
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libunistring-0.9.5:=
-	>=gui-libs/gtk-4.6:4[introspection]
-	>=gui-libs/libadwaita-1.0:1=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.36[introspection]
-	gnome-base/gnome-desktop:3[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index e2775c3e1aea..a61552b1f2a6 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-logs-42.0.tar.xz 461520 BLAKE2B 6c4c22b4d9b428d3d90aba851171f7ec96ddc0157ca9d03a46ff84c915d4057f4f6c0462f01285954b4d0a49c26073e03c31ac10bbc862b4a6ab3ebee73f34ab SHA512 94634006148391bf158878e845bf04f1139f90b78bc3d63bb687bb683bb07c8b5fbec9d7c1e9f7454bf5345862578d83226207d3f78611dbf96566994190766f
 DIST gnome-logs-43.0.tar.xz 589728 BLAKE2B 335a4d64a6a236eb880d9a88b7ade34a1a34ac4e032e43148b57c4ead96aabe098fe0a42fa987a609bec815937af27f8edbb2983b7b1108e6ccd00d271d123b4 SHA512 21f7453072a95e223e21ab0f577aac9f552c0afc780366b18b6cd2b8e319a85a1a8439d53dfd9ded3a7c6676e51178d4906ee61178bb571633e935fbfc9990aa
-EBUILD gnome-logs-42.0.ebuild 818 BLAKE2B 108b0b563d1fbb5aeba042ea61022dffe312ee93508286244b978d3fe9fadf845591e86bc78b1a67a26bda13b86aaadae6c2a20c4c32a63d1a303de5159b31b8 SHA512 464b6442ff72d87dd2f78114469254995c20ee4cbcb5effcdc3acae17302f26273260a9cc6bc7c3d3b1d9771ec35f326ae41572d5b7c186560408ca82efe037d
 EBUILD gnome-logs-43.0.ebuild 820 BLAKE2B 29b03b0de96bb9a934cd9e933f9c44a5e70ce5f3e69c92dad8bb5ad528c52b2326c601c8d162a2b0c3ed3f4cfff2e7d082b36920abd23262d2c7d323d33b8c11 SHA512 2e6515888d117e9aa50790641c3ee5cf3a9eecd3f1c7311e722f9d3a0f18854b229611cf18537227bb704d2d29cdb6a43368eb5ab160375505b3bf678f6fa690
 MISC metadata.xml 351 BLAKE2B 0a5f987b4515469067bd2f97ac9407b2e551810c80613aed65c745976566960102ace68856daf4c1d749441044fcfa4d5bd257eb1e91d5d300ed8df49d979640 SHA512 4d640f966a72aadeec1acae0a22f342ab02d6c8fc0dc672e648d2bd72acdd2d5c308fb4f5d2c98cef77846c8e7b4bcd9d8e8ed9376715e9f234b550dcd4baea5
diff --git a/gnome-extra/gnome-logs/gnome-logs-42.0.ebuild b/gnome-extra/gnome-logs/gnome-logs-42.0.ebuild
deleted file mode 100644
index f0bf9500b3a1..000000000000
--- a/gnome-extra/gnome-logs/gnome-logs-42.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Log viewer for the systemd journal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	gnome-base/gsettings-desktop-schemas
-	>=dev-libs/glib-2.43.90:2
-	>=x11-libs/gtk+-3.22:3
-	>=gui-libs/libhandy-1.5.0:1
-	sys-apps/systemd:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	meson_src_configure -Dman=true
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 8761390b10ec..670ee1a0a08c 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-power-manager-3.32.0.tar.xz 379136 BLAKE2B 3f9b385c37fcf1de3741781627d275057f67d489ed4b372f6f68495a707d9e67b78be9f186922a99a606a80008addd570943800ddb2ddd17d2071161b7276c49 SHA512 0ea11085dd015e30c1bdc6913000b63eabf7df76720f2d51d63b075f3b7bd2a610aaa484c53a4092d78d3c484ed8c4e81ec66603bdc6c132b0316113ec6a24a0
 DIST gnome-power-manager-43.0.tar.xz 381128 BLAKE2B 300a8a7fa29f4628dcd78d5095c5fdf71c4baff357840de88ae479c519d50d15d0e678e383ee37f4d3b2edb56ab3c3ee9b6a06b326540dd2cff0b15ad1663a07 SHA512 d82c541821f09f6a3229b59ba29b1b77a0d8d11d0e10eab27edb9fc324955cc81f49395ff752bd1ecd2df456343ff8042466e91d1edf421521364a4779d67492
-EBUILD gnome-power-manager-3.32.0-r1.ebuild 1112 BLAKE2B 11bf88b2c34953a79643c3a775f50fae4ac028f6b01f4759911cbbb99e77bf64f556a2ebe44b606829121f8d3395d1323eb80aae40b7d7fb12c2349803600534 SHA512 f98c5f5f944a8e3ec5ca7e0192750f6b0b1cbf5fc26c89f875032fdef53d3956dc56c43095b648283d0f5bff4e7bc8fa4a16e64ed61b908981063ad1c7c4a9ba
 EBUILD gnome-power-manager-43.0.ebuild 1112 BLAKE2B 11bf88b2c34953a79643c3a775f50fae4ac028f6b01f4759911cbbb99e77bf64f556a2ebe44b606829121f8d3395d1323eb80aae40b7d7fb12c2349803600534 SHA512 f98c5f5f944a8e3ec5ca7e0192750f6b0b1cbf5fc26c89f875032fdef53d3956dc56c43095b648283d0f5bff4e7bc8fa4a16e64ed61b908981063ad1c7c4a9ba
 MISC metadata.xml 719 BLAKE2B 14010ddec864c2ee3e1e0312492034970e0963b6a8c2ba5ef627d92d81602b0e0202b632232e64932bd843bb45420e93c2ecf2f4c29341059e568e05ca93dc21 SHA512 a4f03c600f15356834a0765c77e8626597b49b921d71f9f9546019511a3003350eab6697a72eca4512734bc3ce1b96853acf107d254bfbb63eb3583eedbabf57
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0-r1.ebuild
deleted file mode 100644
index 25d97722abba..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="GNOME power statistics"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-power-manager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.45.8:2
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/cairo-1
-	>=sys-power/upower-0.99.8:=
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test enable-tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index a74e100d1a79..8628832d697e 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-shell-extensions-42.3.tar.xz 225332 BLAKE2B 4a5d26ac0f8563d6e9c607ad06998470257c1c25a8d2f50207b4fed48f785b983be0fae9a6590a36652c25c1f685679af37dcbd4d5edc7d6c9ebaad0946766b4 SHA512 60b7f7d85536c2d00b69383a3c5fffe8ce13e09555c533ccbe024bcbfa1c90d97e69491d9066c5c2da64719c23990cdf88f07076ca4494841a5489deb33de7d0
-DIST gnome-shell-extensions-43.0.tar.xz 227168 BLAKE2B d7b1c93e33419dabfd52e2d3d8865d5d04e08eac4c2fafc5317cf90c787069244b78c6136f3cf0ecfb58a67921c21f383230f5c0db4a044a8d50685b2675a1fd SHA512 528fa42b47d51ee9e1fd44ae8a5466d7ffdb8010a2a6e5107f58622c0eb127476a30db4122baea63af5c3a13933e12e5a8683318eb02fa7d401a446608147d27
 DIST gnome-shell-extensions-43.1.tar.xz 226868 BLAKE2B c96902c01d5260c916e139eb31dbf71fc2dc054d18c2222898d530ee9f28cfea6a745d38cb7f4e54a7ee4a5ce8da93b5e25eebc52e6518ad99d1eae64d3e14dc SHA512 9901e738a5af5a6139da8fc928b95e5afef6e7b80b24e3284603fc4341e588d738b9c16a7bcba2a3e79af2729c468fd756b584394559b2794b335e656c092bae
 EBUILD gnome-shell-extensions-42.3.ebuild 1793 BLAKE2B 154b897688f44ce9666a2ed25b5d79e4e98020f4147532ddd0325ad18a161712f724e5391a8fbf4bd1d78a66590395c2bbb81e568335a5940139879c6272e10d SHA512 dc2527a2ea9e53682c0057712c1bc183e9365f262c5838e5bfab8895a7c887583ec794a91440ff69cba0cc559ed8f03f5e6750433585ca4840cbfc4ed3f9a774
-EBUILD gnome-shell-extensions-43.0-r1.ebuild 1817 BLAKE2B 399f61231d28cbefbb623f9ee48bd95ab05a854b644da85dd49995fe4a7b1f8213e5cec0a56876c972764ac7dbe30a6fbba95dd2ab88cdcb07e426da01dbf972 SHA512 f59933cdae91c67a634cdb33e77198c3e7f123b12b0384c7ea8bc0a88cb3ed4832569f14730a7873f521e0d70284ee45c7529ad6cf60edc422e4ff2774ae4d98
 EBUILD gnome-shell-extensions-43.1.ebuild 1817 BLAKE2B 399f61231d28cbefbb623f9ee48bd95ab05a854b644da85dd49995fe4a7b1f8213e5cec0a56876c972764ac7dbe30a6fbba95dd2ab88cdcb07e426da01dbf972 SHA512 f59933cdae91c67a634cdb33e77198c3e7f123b12b0384c7ea8bc0a88cb3ed4832569f14730a7873f521e0d70284ee45c7529ad6cf60edc422e4ff2774ae4d98
 MISC metadata.xml 363 BLAKE2B e448f61e99452c5ea32f80387d2f196bdef4003dde0423ce50202cf458a038a7b3f7d44c14d168bab0bf78c4e8c1588c9016423106eeaa5982e1cf03aaf273d1 SHA512 f548760594f1331da0aebaee8db91568697c43e04ae652cbba7beab199bc47173706c4e399928bfb195d355ab56820f24a36bb7eb57b47a31df3a335318e7078
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-43.0-r1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-43.0-r1.ebuild
deleted file mode 100644
index ff23aa710094..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-43.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org readme.gentoo-r1 meson xdg
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.26:2
-	>=gnome-base/libgtop-2.28.3[introspection]
-	>=app-eselect/eselect-gnome-shell-extensions-20111211
-"
-RDEPEND="${DEPEND}
-	>=app-accessibility/at-spi2-core-2.46.0[introspection]
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	gnome-base/gnome-menus:3[introspection]
-	=gnome-base/gnome-shell-$(ver_cut 1)*
-	gui-libs/libadwaita[introspection]
-	media-libs/clutter:1.0[introspection]
-	media-libs/graphene[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-themes/adwaita-icon-theme
-	>=x11-wm/mutter-3.32[introspection]
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Installed extensions installed are initially disabled by default.
-To change the system default and enable some extensions, you can use
-# eselect gnome-shell-extensions
-
-Alternatively, to enable/disable extensions on a per-user basis,
-you can use the gnome-extensions-app (included with gnome-shell),
-https://extensions.gnome.org/ web interface, or modify the
-org.gnome.shell enabled-extensions gsettings key from the command
-line or a script."
-
-src_configure() {
-	local emesonargs=(
-		-Dextension_set=all
-		-Dclassic_mode=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index d16f72c31769..09d2f587a021 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,11 +1,3 @@
-AUX 43.0-fwupd-Update-the-self-test.patch 1467 BLAKE2B 368b70c15ce19b67bf9625b9a6fa4768b4c26c919ce15024fdbc8fe26819973dbd404aacdab187d9afd573f9eac2f9e746de885042b40c9c81f8329ca0a98802 SHA512 b7f1a9910606f94ee532e2ab465d03eb30741fab38aae028c87df15dd0e431d8e10b68a3d50efa3e718feb3fec9ed1a45983826076b65f56881eb77cfd676bd9
-AUX 43.0-metainfo-Correct-release-information-to-pass-appstre.patch 14940 BLAKE2B 2692a3a648c6b20f3531a7e846e12ac09a9d59c86246cc4544624cb78cf7c48f568fbfaecc476e03ffc581e55389553e51ee01aef0920215f030dad5e080e4cb SHA512 5043f8b10c4f49f31ae065e326f861a83c1ae3862c21b8e7de312f04becdd75e282530df539f7320a689eb95266eb2b03c595dfeabd6b561c8e1648b1c679384
-DIST gnome-software-42.4.tar.xz 2278412 BLAKE2B beb63ba7f874b72edd3c592f0a7553a4a5ba3631ede55da4c70989604cd0433dd40dd7c75b4bafdf106f1c02285e8502a610d8e2c9edf8cc4d34ea14f75fab62 SHA512 00c70886c6e3302a59ae533034d8d75cfe05873ea40d0d05a03e15ae34101bb8a64722a7c6a6d43bb54b61033bc14af1542bb832a70ee7b1a2dab6dacb8ffd8f
-DIST gnome-software-43.0.tar.xz 2352976 BLAKE2B 8dc8b03c198aad01e73026ccb4b3e99888f39e9bbd99d9809863a2fe405865022a33458194f3769a3a5e9ff7a888beb463aca2805d90405342f9aae4485b352a SHA512 bcf64e4d3d847c660fd1c1a2356235569560bc315fb6b0d2e459dfb1bbee7bf97d9a14f7c8ef1129e01241385cd1540d1499f9cc9ad99a996965feb48e698d6a
-DIST gnome-software-43.1.tar.xz 2351032 BLAKE2B e8718817ee9a6ac458f57d5f06271136d590ba2e6a951a05f143f5f85e124b0a64e1866fd50a1ff8e28e24682ffcb6ffb72dfd2ee8fcb9f6e8dd2fa3797513a5 SHA512 5494622e1c52bcf660df8ab83cd73720ccab3c767f8870b6a23bd83c396972c508beb365e6df143055e3a7d9e77b42f01ea73a49d8dcdcf97aaeada0fe9f03e5
 DIST gnome-software-43.2.tar.xz 2356928 BLAKE2B 07cc787cc3320f84bc29164c40da8d600f011e1a1d8645be6089375f13658772562061e100f6347fa2019cc21cf27b71bd4c050fcc2850a2bb56d1160e849141 SHA512 d011418536706d2c5693581bd322008b5eb0fdf766ec96f1775135efb0fecec42dbc126ea2a66465b2169afb38b48fed1246516197e3bbf9d75b96e339d6ba33
-EBUILD gnome-software-42.4.ebuild 2800 BLAKE2B bf6d0e0f52184efe135c677289dcbaceb2a7adb7b326e0a6597dfe2e8c8aee38772a93a74cc421857a663686caac6ded75f374c07f0f900c186626cb3e641c9e SHA512 809ef0e439d4f0f908228fa4d5f71c479bd1114b2af4cee3e5f8ab67a2e3c0018441494ff56b57cd6f691acac5f4c859ee299ab70d2e5173df06a00171e363de
-EBUILD gnome-software-43.0.ebuild 2783 BLAKE2B 23bfdc781acedca00698cc41ca76c0c32004427b6fa3ec00009c5e2d653b65887329bbcf3077196f20c5660ea3844c19b6e5bdf34c82c491830e24619e8d7339 SHA512 c85670858d264d1cb33df75b4fad441c909b9b99eade5bf4ff86bfc2ca19d6e5c3374b29aeba8f99803eeb49c7ab07f15c05077906fbea3ab0fd64f408b33aa4
-EBUILD gnome-software-43.1.ebuild 2636 BLAKE2B 5407bc77db2ed2dd43fdb628faa5851b40114c56c41d1dfe920a4940b59fe81c5c732f6e1e67dbe7230f989fb12950934641e26d5e521b4ebab1300865ceb88d SHA512 ced57c7bcdccbe6294f3b7fea45de1fe73b632af5fa7d41e0f192a56a2dc3bdcaffed86bab58c40331d8fd44bbe0da8a6aa8ef01f5cd34f47ba14f5bc49f5c10
 EBUILD gnome-software-43.2.ebuild 2636 BLAKE2B 5407bc77db2ed2dd43fdb628faa5851b40114c56c41d1dfe920a4940b59fe81c5c732f6e1e67dbe7230f989fb12950934641e26d5e521b4ebab1300865ceb88d SHA512 ced57c7bcdccbe6294f3b7fea45de1fe73b632af5fa7d41e0f192a56a2dc3bdcaffed86bab58c40331d8fd44bbe0da8a6aa8ef01f5cd34f47ba14f5bc49f5c10
 MISC metadata.xml 688 BLAKE2B e157620837f5fd999b67d2a20f09cc64066317a47391ad97ae645b268964cff5a57e2e088e3040bfc98900f75ddcbffed10f1c159516c38f03d11aa1d2d00386 SHA512 9735764b439bdcb3db3b329d986530677ba87e00f10f217178d8014ea4335c3b74ec0e0051117086da92e9eac59849460a62c324ca249f621b13a3a7d50771a4
diff --git a/gnome-extra/gnome-software/files/43.0-fwupd-Update-the-self-test.patch b/gnome-extra/gnome-software/files/43.0-fwupd-Update-the-self-test.patch
deleted file mode 100644
index 71c877a133bf..000000000000
--- a/gnome-extra/gnome-software/files/43.0-fwupd-Update-the-self-test.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 14cf2c278d63863558e56bd68733b235a3490839 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Fri, 30 Sep 2022 11:23:35 +0200
-Subject: [PATCH] fwupd: Update the self test
-
-Depending on the fwupd version, an update detail differs, but the new
-thing is that the change had been reverted for a newer version.
-
-Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1919
----
- plugins/fwupd/gs-self-test.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/fwupd/gs-self-test.c b/plugins/fwupd/gs-self-test.c
-index fe4bc5a2a..f02a9f0c2 100644
---- a/plugins/fwupd/gs-self-test.c
-+++ b/plugins/fwupd/gs-self-test.c
-@@ -56,8 +56,9 @@ gs_plugins_fwupd_func (GsPluginLoader *plugin_loader)
- 	g_assert_cmpstr (gs_app_get_description (app), ==,
- 			 "This is the first paragraph in the example "
- 			 "cab file.\n\nThis is the second paragraph.");
--#if FWUPD_CHECK_VERSION(1, 7, 1)
--	/* Changes introduced in fwupd commit d3706e0e0b0fc210796da839b84ac391f7a251f8 */
-+#if FWUPD_CHECK_VERSION(1, 7, 1) && !FWUPD_CHECK_VERSION(1, 8, 0)
-+	/* Changes introduced in fwupd commit d3706e0e0b0fc210796da839b84ac391f7a251f8 and
-+	   removed for 1.8.0 with https://github.com/fwupd/fwupd/commit/0eeaad76ec79562ea3790bb377d847d5be02182f */
- 	g_assert_cmpstr (gs_app_get_update_details_markup (app), ==,
- 			 "Some of the platform secrets may be invalidated when "
- 			 "updating this firmware. Please ensure you have the "
--- 
-2.35.1
-
diff --git a/gnome-extra/gnome-software/files/43.0-metainfo-Correct-release-information-to-pass-appstre.patch b/gnome-extra/gnome-software/files/43.0-metainfo-Correct-release-information-to-pass-appstre.patch
deleted file mode 100644
index 7a5f81906848..000000000000
--- a/gnome-extra/gnome-software/files/43.0-metainfo-Correct-release-information-to-pass-appstre.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-From 165437bb8757cf138b8261f33467d200a5ddb6a6 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Fri, 30 Sep 2022 11:21:14 +0200
-Subject: [PATCH] metainfo: Correct release information to pass appstreamcli
- validation
-
-Fix issues in org.gnome.Software.metainfo.xml.in reported by
-appstreamcli 0.15.5 during validation.
-
-Also update the NEWS file, to match the new changes.
-
-Related to https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1919
----
- NEWS                                          | 24 +++----
- data/metainfo/meson.build                     |  2 +-
- .../org.gnome.Software.metainfo.xml.in        | 63 ++++++++++---------
- 3 files changed, 45 insertions(+), 44 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 008cbd234..58f3ccd81 100644
---- a/NEWS
-+++ b/NEWS
-@@ -22,7 +22,7 @@ This is a stable release with translation updates:
-  * Spanish
-  * Swedish
- 
--Version 43.rc
-+Version 43~rc
- ~~~~~~~~~~~~~
- Released: 2022-09-02
- 
-@@ -58,7 +58,7 @@ This release also updates translations:
-  * Turkish
-  * Ukrainian
- 
--Version 43.beta
-+Version 43~beta
- ~~~~~~~~~~~~~~~
- Released: 2022-08-05
- 
-@@ -87,7 +87,7 @@ This release also updates translations:
-  * Ukrainian
-  * Vietnamese
- 
--Version 43.alpha
-+Version 43~alpha
- ~~~~~~~~~~~~~~~~
- Released: 2022-06-30
- 
-@@ -181,7 +181,7 @@ This release also updates translations:
-  * Slovenian
-  * Swedish
- 
--Version 42.rc
-+Version 42~rc
- ~~~~~~~~~~~~~
- Released: 2022-03-04
- 
-@@ -217,7 +217,7 @@ This release also updates translations:
-  * Turkish
-  * Ukrainian
- 
--Version 42.beta
-+Version 42~beta
- ~~~~~~~~~~~~~~~
- Released: 2022-02-10
- 
-@@ -253,7 +253,7 @@ This release also updates translations:
-  * Spanish
-  * Ukrainian
- 
--Version 42.alpha
-+Version 42~alpha
- ~~~~~~~~~~~~~~~~
- Released: 2022-01-07
- 
-@@ -353,7 +353,7 @@ This release also updates translations:
-  * Swedish
-  * Ukrainian
- 
--Version 41.rc
-+Version 41~rc
- ~~~~~~~~~~~~~
- Released: 2021-09-07
- 
-@@ -385,7 +385,7 @@ This release also updates translations:
-  * Swedish
-  * Ukrainian
- 
--Version 41.beta
-+Version 41~beta
- ~~~~~~~~~~~~~~~
- Released: 2021-08-13
- 
-@@ -411,7 +411,7 @@ This release also updates translations:
-  * Slovenian
-  * Ukrainian
- 
--Version 41.alpha
-+Version 41~alpha
- ~~~~~~~~~~~~~~~~
- Released: 2021-07-20
- 
-@@ -481,7 +481,7 @@ Translation updates:
-  * Punjabi
-  * Serbian
- 
--Version 40.rc
-+Version 40~rc
- ~~~~~~~~~~~~~
- Released: 2021-03-12
- 
-@@ -522,7 +522,7 @@ Translation updates:
-  * Turkish
-  * Ukrainian
- 
--Version 40.beta
-+Version 40~beta
- ~~~~~~~~~~~~~~~
- Released: 2021-02-16
- 
-@@ -549,7 +549,7 @@ Translation updates:
-  * Spanish
-  * Swedish
- 
--Version 40.alpha
-+Version 40~alpha
- ~~~~~~~~~~~~~~~~
- Released: 2021-01-27
- 
-diff --git a/data/metainfo/meson.build b/data/metainfo/meson.build
-index addc70a3c..2d056ffb6 100644
---- a/data/metainfo/meson.build
-+++ b/data/metainfo/meson.build
-@@ -14,7 +14,7 @@ if get_option('tests') and appstream.version().version_compare('>=0.15.5')
-         args: ['validate',
-               '--pedantic',
-               '--no-net',
--              '--override=releases-not-in-order=info', # 42.rc > 42.0 for AppStream, which clashes with GNOME versioning
-+              '--explain',
-               'org.gnome.Software.metainfo.xml.in'],
-         workdir : meson.current_source_dir(),
-         suite: ['lib'],
-diff --git a/data/metainfo/org.gnome.Software.metainfo.xml.in b/data/metainfo/org.gnome.Software.metainfo.xml.in
-index 581f922ff..7f5fd0484 100644
---- a/data/metainfo/org.gnome.Software.metainfo.xml.in
-+++ b/data/metainfo/org.gnome.Software.metainfo.xml.in
-@@ -91,7 +91,7 @@
-         </ul>
-       </description>
-     </release>
--    <release date="2022-09-02" version="43.rc" type="development">
-+    <release date="2022-09-02" version="43~rc" type="development">
-       <description>
-         <p>This is the third unstable release for GNOME 43.</p>
-         <ul>
-@@ -129,7 +129,7 @@
-         </ul>
-       </description>
-     </release>
--    <release date="2022-08-05" version="43.beta" type="development">
-+    <release date="2022-08-05" version="43~beta" type="development">
-       <description>
-         <p>This is the second unstable release for GNOME 43.</p>
-         <ul>
-@@ -160,7 +160,7 @@
-         </ul>
-       </description>
-     </release>
--    <release date="2022-06-30" version="43.alpha" type="development">
-+    <release date="2022-06-30" version="43~alpha" type="development">
-       <description>
-         <p>This is the first unstable release for GNOME 43.</p>
-         <ul>
-@@ -263,7 +263,7 @@
-         </ul>
-       </description>
-     </release>
--    <release date="2022-03-04" version="42.rc" type="development">
-+    <release date="2022-03-04" version="42~rc" type="development">
-       <description>
-         <p>This is the third unstable release for GNOME 42.</p>
-         <ul>
-@@ -301,7 +301,7 @@
-         </ul>
-       </description>
-     </release>
--    <release date="2022-02-10" version="42.beta" type="development">
-+    <release date="2022-02-10" version="42~beta" type="development">
-       <description>
-         <p>This is the second unstable release for GNOME 42.</p>
-         <ul>
-@@ -342,7 +342,7 @@
-         </ul>
-       </description>
-     </release>
--    <release date="2022-01-07" version="42.alpha" type="development">
-+    <release date="2022-01-07" version="42~alpha" type="development">
-       <description>
-         <p>This is the first unstable release for GNOME 42.</p>
-         <ul>
-@@ -442,7 +442,7 @@
-         </ul>
-       </description>
-     </release>
--    <release date="2021-09-07" version="41.rc" type="development">
-+    <release date="2021-09-07" version="41~rc" type="development">
-       <description>
-         <p>This is the third unstable release for GNOME 41.</p>
-         <ul>
-@@ -476,7 +476,7 @@
-         </ul>
-       </description>
-     </release>
--    <release date="2021-08-13" version="41.beta" type="development">
-+    <release date="2021-08-13" version="41~beta" type="development">
-       <description>
-         <p>This is the second unstable release for GNOME 41.</p>
-         <ul>
-@@ -504,7 +504,7 @@
-         </ul>
-       </description>
-     </release>
--    <release date="2021-07-20" version="41.alpha" type="development">
-+    <release date="2021-07-20" version="41~alpha" type="development">
-       <description>
-         <p>This is the first unstable release for GNOME 41.</p>
-         <ul>
-@@ -578,7 +578,7 @@
-         </ul>
-       </description>
-     </release>
--    <release date="2021-03-12" version="40.rc" type="development">
-+    <release date="2021-03-12" version="40~rc" type="development">
-       <description>
-         <p>This is an unstable release with the following changes:</p>
-         <ul>
-@@ -621,7 +621,7 @@
-         </ul>
-       </description>
-     </release>
--    <release date="2021-02-16" version="40.beta" type="development">
-+    <release date="2021-02-16" version="40~beta" type="development">
-       <description>
-         <p>This is an unstable release with the following changes:</p>
-         <ul>
-@@ -647,7 +647,7 @@
-         </ul>
-       </description>
-     </release>
--    <release date="2021-01-27" version="40.alpha" type="development">
-+    <release date="2021-01-27" version="40~alpha" type="development">
-       <description>
-         <p>This is the first unstable release for GNOME 40.</p>
-         <ul>
-@@ -1759,7 +1759,7 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1452867221" version="3.19.4" type="development">
-+    <release date="2016-01-15" version="3.19.4" type="development">
-       <description translatable="no">
-         <p>This is an unstable release in the 3.19 development series, with the following improvements:</p>
-         <ul>
-@@ -1782,7 +1782,7 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1446724044" version="3.18.3" type="stable">
-+    <release date="2015-11-05" version="3.18.3" type="stable">
-       <description translatable="no">
-         <p>This stable release fixes the following bugs:</p>
-         <ul>
-@@ -1793,7 +1793,7 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1444908967" version="3.18.2" type="stable">
-+    <release date="2015-10-15" version="3.18.2" type="stable">
-       <description translatable="no">
-         <p>This stable release fixes the following bugs:</p>
-         <ul>
-@@ -1803,7 +1803,7 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1444738225" version="3.18.1" type="stable">
-+    <release date="2015-10-13" version="3.18.1" type="stable">
-       <description translatable="no">
-         <p>This stable release fixes the following bugs:</p>
-         <ul>
-@@ -1819,12 +1819,12 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1442827658" version="3.18.0" type="stable">
-+    <release date="2015-09-21" version="3.18.0" type="stable">
-       <description translatable="no">
-         <p>This is the first stable release for the GNOME 3.18 desktop!</p>
-       </description>
-     </release>
--    <release timestamp="1442313469" version="3.17.92" type="development">
-+    <release date="2015-09-15" version="3.17.92" type="development">
-       <description translatable="no">
-         <p>This is an unstable release in the 3.17 development series, with the following improvements:</p>
-         <ul>
-@@ -1835,7 +1835,7 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1441303652" version="3.17.91" type="development">
-+    <release date="2015-09-03" version="3.17.91" type="development">
-       <description translatable="no">
-         <p>This is an unstable release in the 3.17 development series, with the following improvements:</p>
-         <ul>
-@@ -1848,7 +1848,7 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1439990842" version="3.17.90" type="development">
-+    <release date="2015-08-19" version="3.17.90" type="development">
-       <description translatable="no">
-         <p>This is an unstable release with the following bugs fixed:</p>
-         <ul>
-@@ -1858,7 +1858,7 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1439370225" version="3.17.3" type="development">
-+    <release date="2015-08-12" version="3.17.3" type="development">
-       <description translatable="no">
-         <p>This is an unstable release in the 3.17 development series, with the following improvements:</p>
-         <ul>
-@@ -1882,7 +1882,7 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1433526589" version="3.17.2" type="development">
-+    <release date="2015-06-05" version="3.17.2" type="development">
-       <description translatable="no">
-         <p>This is an unstable release in the 3.17 development series, with the following improvements:</p>
-         <ul>
-@@ -1899,7 +1899,7 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1432590395" version="3.17.1" type="development">
-+    <release date="2015-05-25" version="3.17.1" type="development">
-       <description translatable="no">
-         <p>This is the first unstable release in the 3.17 development series, with a number of new features:</p>
-         <ul>
-@@ -1914,7 +1914,7 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1431345463" version="3.16.2" type="stable">
-+    <release date="2015-05-11" version="3.16.2" type="stable">
-       <description translatable="no">
-         <p>This release fixes the following bugs:</p>
-         <ul>
-@@ -1928,7 +1928,7 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1429029680" version="3.16.1" type="stable">
-+    <release date="2015-04-14" version="3.16.1" type="stable">
-       <description translatable="no">
-         <p>This release fixes the following bugs:</p>
-         <ul>
-@@ -1938,12 +1938,12 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1427103917" version="3.16.0" type="stable">
-+    <release date="2015-03-23" version="3.16.0" type="stable">
-       <description translatable="no">
-         <p>This stable release marks the release of GNOME 3.16!</p>
-       </description>
-     </release>
--    <release timestamp="1426498834" version="3.15.92" type="development">
-+    <release date="2015-03-16" version="3.15.92" type="development">
-       <description translatable="no">
-         <p>This unstable release adds the following features:</p>
-         <ul>
-@@ -1961,7 +1961,7 @@
-         <p>This release also updates translations for many languages.</p>
-       </description>
-     </release>
--    <release timestamp="1425309931" version="3.15.91" type="development">
-+    <release date="2015-03-02" version="3.15.91" type="development">
-       <description translatable="no">
-         <p>This unstable release adds the following features:</p>
-         <ul>
-@@ -1976,7 +1976,7 @@
-         </ul>
-       </description>
-     </release>
--    <release timestamp="1424116753" version="3.15.90" type="development">
-+    <release date="2015-02-16" version="3.15.90" type="development">
-       <description translatable="no">
-         <p>This unstable release adds the following features:</p>
-         <ul>
-@@ -1990,7 +1990,7 @@
-         </ul>
-       </description>
-     </release>
--    <release timestamp="1421625600" version="3.15.4" type="development">
-+    <release date="2015-01-19" version="3.15.4" type="development">
-       <description translatable="no">
-         <p>This unstable release adds the following features:</p>
-         <ul>
-@@ -2006,7 +2006,7 @@
-         </ul>
-       </description>
-     </release>
--    <release timestamp="1416787200" version="3.15.2" type="development">
-+    <release date="2014-11-24" version="3.15.2" type="development">
-       <description translatable="no">
-         <p>This unstable release adds the following features:</p>
-         <ul>
-@@ -2063,4 +2063,5 @@
-     <content_attribute id="money-purchasing">none</content_attribute>
-     <content_attribute id="money-gambling">none</content_attribute>
-   </content_rating>
-+  <launchable type="desktop-id">org.gnome.Software.desktop</launchable>
- </component>
--- 
-2.35.1
-
diff --git a/gnome-extra/gnome-software/gnome-software-42.4.ebuild b/gnome-extra/gnome-software/gnome-software-42.4.ebuild
deleted file mode 100644
index 8a33c46d8b6f..000000000000
--- a/gnome-extra/gnome-software/gnome-software-42.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software https://gitlab.gnome.org/GNOME/gnome-software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flatpak +firmware gnome gtk-doc sysprof udev"
-RESTRICT="test" # See TODO below
-
-RDEPEND="
-	>=dev-libs/appstream-0.14.0:0=
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	>=gui-libs/gtk-4.6:4
-	>=dev-libs/glib-2.66.0:2
-	>=dev-libs/json-glib-1.6.0
-	>=net-libs/libsoup-2.52.0:2.4
-	>=gui-libs/libadwaita-1.0.1:1
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
-	sys-auth/polkit
-	firmware? ( >=sys-apps/fwupd-1.5.6 )
-	flatpak? (
-		>=sys-apps/flatpak-1.9.1
-		dev-util/ostree
-	)
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-"
-# test? ( dev-util/valgrind )
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
-		-Dman=true
-		-Dpackagekit=false
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		$(meson_use flatpak)
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		$(meson_use udev gudev)
-		-Dapt=false
-		-Dsnap=false
-		-Dexternal_appstream=false
-		-Dvalgrind=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_popular=true
-		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
-		-Dmogwai=false #TODO?
-		$(meson_feature sysprof)
-		-Dprofile=''
-		-Dsoup2=true
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-43.0.ebuild b/gnome-extra/gnome-software/gnome-software-43.0.ebuild
deleted file mode 100644
index 1e9273245cf0..000000000000
--- a/gnome-extra/gnome-software/gnome-software-43.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software https://gitlab.gnome.org/GNOME/gnome-software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flatpak +firmware gnome gtk-doc sysprof udev test"
-
-RDEPEND="
-	>=dev-libs/appstream-0.14.0:0=
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	>=gui-libs/gtk-4.6:4
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/json-glib-1.6.0
-	>=net-libs/libsoup-3.0:3.0
-	>=gui-libs/libadwaita-1.0.1:1
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
-	sys-auth/polkit
-	firmware? ( >=sys-apps/fwupd-1.5.6 )
-	flatpak? (
-		>=sys-apps/flatpak-1.9.1
-		dev-util/ostree
-	)
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/libglib-testing )
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-metainfo-Correct-release-information-to-pass-appstre.patch
-	"${FILESDIR}"/${PV}-fwupd-Update-the-self-test.patch
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
-		-Dman=true
-		-Dpackagekit=false
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		$(meson_use flatpak)
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		-Dwebapps=true
-		-Dhardcoded_foss_webapps=true
-		-Dhardcoded_proprietary_webapps=true
-		$(meson_use udev gudev)
-		-Dapt=false
-		-Dsnap=false
-		-Dexternal_appstream=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_curated=true
-		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
-		-Dmogwai=false #TODO?
-		$(meson_feature sysprof)
-		-Dprofile=''
-		-Dsoup2=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-43.1.ebuild b/gnome-extra/gnome-software/gnome-software-43.1.ebuild
deleted file mode 100644
index 19f8b6526551..000000000000
--- a/gnome-extra/gnome-software/gnome-software-43.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software https://gitlab.gnome.org/GNOME/gnome-software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flatpak +firmware gnome gtk-doc sysprof udev test"
-
-RDEPEND="
-	>=dev-libs/appstream-0.14.0:0=
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	>=gui-libs/gtk-4.6:4
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/json-glib-1.6.0
-	>=net-libs/libsoup-3.0:3.0
-	>=gui-libs/libadwaita-1.0.1:1
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
-	sys-auth/polkit
-	firmware? ( >=sys-apps/fwupd-1.5.6 )
-	flatpak? (
-		>=sys-apps/flatpak-1.9.1
-		dev-util/ostree
-	)
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/libglib-testing )
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3
-	)
-"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
-		-Dman=true
-		-Dpackagekit=false
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		$(meson_use flatpak)
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		-Dwebapps=true
-		-Dhardcoded_foss_webapps=true
-		-Dhardcoded_proprietary_webapps=true
-		$(meson_use udev gudev)
-		-Dapt=false
-		-Dsnap=false
-		-Dexternal_appstream=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_curated=true
-		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
-		-Dmogwai=false #TODO?
-		$(meson_feature sysprof)
-		-Dprofile=''
-		-Dsoup2=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 392796bfc0da..d50eed89e04b 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-user-docs-42.0.tar.xz 10273312 BLAKE2B c3cc30d75f686bacae2f4f3789215ac6cb505483a2c2ae1bf8766e7767ea7a5d7ef922fe6117e9b6a773771ee83f32f113bc18f4056dda66848c17ccbc256c77 SHA512 524dfeaf0ca77c19906395f81f45ac2a7873fc116a6794bae53130b32c1fcdd063566ee0ec4f3e51cfc18e12db8aed5219fd8817a7de3cae6d6a68f228212905
 DIST gnome-user-docs-43.0.tar.xz 11303880 BLAKE2B c9f3e0757eaa25944198c4c07809a86642e9e879e83856aaa3f8f968b35dc45667768acda0039f1e8a6f9a57e86afbd2d8df5e21d3ab7fa41a5e79cfe0f666eb SHA512 cf14edc34049d8e770f31e34b722a3309009fac64f3ac159cdf2baaebf7bd70ea8f0c592b398c9f0e21e11c7ac10d91a97a0079376da07dd1d433c2d3703eeef
-EBUILD gnome-user-docs-42.0.ebuild 942 BLAKE2B c4811c7f2a17bb92457dd928ad91bcd5e09965652bdc1cd612f3bcca78e3b7420501af5a5db00f3e0fd7f9e0d4ba1104f26f779e1991011cf7963f157d372d5d SHA512 e613d016928f092efe90d5201cee9192ededa9d05b9f15b7b7a52530efd038ce71698928c6777aca4e773a0269ed8a938198c4518605655c64898a045f45a333
 EBUILD gnome-user-docs-43.0.ebuild 942 BLAKE2B c4811c7f2a17bb92457dd928ad91bcd5e09965652bdc1cd612f3bcca78e3b7420501af5a5db00f3e0fd7f9e0d4ba1104f26f779e1991011cf7963f157d372d5d SHA512 e613d016928f092efe90d5201cee9192ededa9d05b9f15b7b7a52530efd038ce71698928c6777aca4e773a0269ed8a938198c4518605655c64898a045f45a333
 MISC metadata.xml 356 BLAKE2B 72f06c2a1caa00e95e7af168e9f600c480b016bbfc964f4d1f6403ef0061e59766adadda0f259923817104dcd0fcd23a3ec6f34212598c195b8bcd16f22e3889 SHA512 2370c1e00eede00c31ebcdde981e76f9aa265c48da0333555f2412a90b23747068972e983511fdd4f328e38cc369f0bbc76bd967bdf115f2084fb22666bbbc67
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild
deleted file mode 100644
index 69360df4152a..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-libs/libxml2 )"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index ac6713ba3765..93719f21189f 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -1,7 +1,4 @@
-AUX fix-build-with-meson-0.61.patch 224 BLAKE2B 9c7cd30c4703eab7949ebc6ac771b72c021d0845bf4fedf2aaa046713b174bbe892dd3147fc5583b22ac29a21dbfa4f966e0f4deda189b37adff92b34fcb5b32 SHA512 48ab3d7c9f793d52b1be0f31a46cb81ff66e54a420a12a3b45fadbed1022456c859370a7832f0f2d198ec362d126e83eb888ef8e84534d33c56727deb51a27b7
 AUX gnome-user-share-3.18.1-no-prefork.patch 450 BLAKE2B 2b3f7ae96c09599e67e39bb6fec3085bfee944ef5c01a58517c4f49e8b415c10e6cc2543ca808957dc61afb6e584817a6c369f269f449ac01b707d02155ecbbf SHA512 2707eba2cbbb2cba57562dea3e2bf6ff677669aefe4c4e52c236a9f3b6bb008036ef3eefa1a8f5dc675d2ad2157415816c75817a17daaf9c2398624cd86e3946
-DIST gnome-user-share-3.34.0.tar.xz 109560 BLAKE2B 02d0788ff6b4b1a87ebd1d5dee2a853ce0418a553aa2be262227f0b8984ed8bcf84bec774b43952425e96d8b14f4100fd42e0dbec02cc91e67e0881f9155005d SHA512 7aa5f0cad4b96af41b5e4b4a125cb7a9d7a7c27ba10cdf7c4acd2aaffe5bfb3494c9319b997e547c996017827383f7653905c3e0af67c65922635b7ac49803f5
 DIST gnome-user-share-43.0.tar.xz 107912 BLAKE2B 252c6a7077710d55321a249521a856d2b45c71fb418cd7e552b0e840c74dfba70c73ba29e0e5dbbd5dc79e2a3152226b635b8956d7a4e0013da4f2e21dc81578 SHA512 a63b2ad6502a907f2e476ac9dd49beaa74da6169d929783b744877558d52087198a6e95bf206af0c3fc0d6875d3d864948374dbe94734379431399939e4749ae
-EBUILD gnome-user-share-3.34.0.ebuild 1366 BLAKE2B 260076c25d789d880b1f0f13e4670ede3af95275339f50c0189d44696a0540ddc292e3b7b8c3e0fd0796c42ab7a774a57e024819816dc310211c17db4081f6d2 SHA512 8c78cc89a475bea9c7fc6f43b85553467c37af02b76cd21c6c4bdde1ade1e4479e2315ec1d6227be8ae1ff30cfc0e7c3554cdf94cdaa1a4c0e7c9ac225bdf051
 EBUILD gnome-user-share-43.0.ebuild 1252 BLAKE2B bf795c32ace6a4ca1fe207c1be3029dcbad3cb3401608c310e905325d6e366707e8d0f0f4659ffd4b15bedc71abf3162882683b460d278ba8028835c0af05bc4 SHA512 67a3d81630c37714d52c938a19e3b2ef028ff54a449e52e835aa98cc8a79e60453816dde34fbb74f9f9bde4aae7b37d641459fa35e22992c10eac70a1ae9e8e8
 MISC metadata.xml 357 BLAKE2B 90fab3926e91383a781bcaa989eaba646fc1c48373426783e5d23a71f427d4ad7bd4bbda3ba138b0fb9649bcd2137511fd5226a188c6d94b29229459acd8fce5 SHA512 f1295627613f6b51a801fa9bf82ddeb62a214d8db174ad686f362f2370a0a104a9abda2b6721320062b427beca2e999d2dee82dc454f6bcea6f4baf9d74577d0
diff --git a/gnome-extra/gnome-user-share/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-user-share/files/fix-build-with-meson-0.61.patch
deleted file mode 100644
index 2721f2ac876f..000000000000
--- a/gnome-extra/gnome-user-share/files/fix-build-with-meson-0.61.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/831939
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -7,7 +7,6 @@ desktop_in = configure_file(
- )
- 
- i18n.merge_file(
--  desktop,
-   type: 'desktop',
-   input: desktop_in,
-   output: '@BASENAME@',
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
deleted file mode 100644
index d18fc0340e76..000000000000
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson multilib systemd xdg
-
-DESCRIPTION="Personal file sharing for the GNOME desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-share"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-# FIXME: could libnotify be made optional ?
-# FIXME: selinux automagic support
-RDEPEND="
-	>=dev-libs/glib-2.58:2
-	>=x11-libs/gtk+-3:3
-	>=gnome-base/nautilus-3.27.90
-	>=www-apache/mod_dnssd-0.6
-	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Upstream forces to use prefork because of Fedora defaults, but
-	# that is problematic for us (bug #551012)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=750525#c2
-	"${FILESDIR}"/${PN}-3.18.1-no-prefork.patch
-	"${FILESDIR}"/fix-build-with-meson-0.61.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-		-Dhttpd=apache2
-		-Dmodules_path=/usr/$(get_libdir)/apache2/modules/
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 5114d71af16f..e0684a34f721 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-weather-42.0.tar.xz 233552 BLAKE2B 64cdefbcdc93359518b4e08564eafc3235d7b2ab92d69d79b558c5d4f5ce03425d87fb8e7e351165d00983eab5807ebc05aa7c0eb604a618d135afb66170c8ff SHA512 10471a32adc148fad393e03098396a3cfccc75d1cd18985cdd2c287927213aeb493f2878ea986e1d3a3af4b1d3f439afcdb96833d849bbd5fbe7aebb1d1992e6
 DIST gnome-weather-43.0.tar.xz 234344 BLAKE2B d255fec2103f9af3ce36db64d0d294732693850c9acd6bd53ea45552ac19e577786df3b110b66ff59d0d99df9f39f53592f48b4e1cad3aabf675bb4a410e19a9 SHA512 392f9c3f41583767d3dc8f3411b36c7eacc6191648879948f87c92d0891cf7ee34090e7093a91a5d7e07b4b795235a3ff675c1f34854b61e5faa6fe7dba17b9b
-EBUILD gnome-weather-42.0-r1.ebuild 1467 BLAKE2B 1cc7e2e7b07d92962d13e236a4948a7b939093494f3bddf18f9088def0696e8dd00c0e5c78b4b939be24c133d3dd63b0f785a31ea32faca51af14661689e7d73 SHA512 fe50ea154726d9bc2bd916da62c539ac8b9b3608c61f1b16188bceeaa9a2d644ce7a18edc795d1381c7fb70b7485b8f831adea03fd4043ee77de551332f0c035
 EBUILD gnome-weather-43.0.ebuild 1382 BLAKE2B 10d81e72e47d97a031d5d67051d0b4f5583f401e4abc6e7d0ff28f75005dba584bd2dc53ad562f01009c32c4b87f08ebba79d20da0bfd61a38f02024bc02e07e SHA512 3453ceb41a5c40cede87cb0fad5e6d4067917eab116c5d862c04851789b3b5e05713a44f662d7be5cc426f80c4ab978aa982a252a8c8489bc7b19982e1f3080b
 MISC metadata.xml 354 BLAKE2B dcbc0869b8b8ca66a0363e8a1bc751252e37e9938aaa787a63cdf2d02c425c1fa62038d7140f8f1eaef708b9ddcb8bd47dfd6046c0f7261c4d8a53b56cd2d56b SHA512 b9bf0473c6f2085f429ad2dfe8b265bbf07d393c47bc0764d8205e5adf7bd6f4f349c148438126b7fe3c0d60521d28f05ccb82e1f0ec89e93f0a0cd25ea62d40
diff --git a/gnome-extra/gnome-weather/gnome-weather-42.0-r1.ebuild b/gnome-extra/gnome-weather/gnome-weather-42.0-r1.ebuild
deleted file mode 100644
index c88fadb6ed27..000000000000
--- a/gnome-extra/gnome-weather/gnome-weather-42.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A weather application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-# <libgweather-4.2.0 because of libsoup:3 transition
-DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.56:=
-	>=gui-libs/gtk-4.5:4
-	>=dev-libs/gjs-1.71.0
-	>=app-misc/geoclue-2.3.1:2.0
-	>=gui-libs/libadwaita-1.0.0:1=
-	>=dev-libs/libgweather-3.90.0:4=
-	<dev-libs/libgweather-4.2.0:4=
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-# Tests have a lot of issues, starting with reliance on a system installation,
-# accessing the network and other intermittent failures with network-sandbox disabled
-# https://gitlab.gnome.org/GNOME/gnome-weather/issues/67 (and rest not filed)
-# test dep: $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]')
-# With 3.34, this is now behind a dogtail option we can pass (and have data validation)
-
-src_configure() {
-	meson_src_configure -Dprofile=default -Ddogtail=false
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 47e394a5dc48..d45b96ef1b05 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,14 +1,9 @@
-AUX 14.0.1-fix-file-conflicts.patch 699 BLAKE2B a276814cd000ebc34b38b4031e47813935ac0a166acbdfe719e27eb3d83e50ce5eb55486dfe6dfd4bbd53bf56c28d3d213cc266148063fbe8aee06967a423622 SHA512 160d3bcf8ea27fecd51470a15e83ef29c99f9b4c86cce1286d8ba2a6432a11a0fa4ec602db80c8daba3ad5e5e24c602a876fc8ad90e07a65d968ed47e46badfc
 AUX 14.0.1-install-user-help.patch 749 BLAKE2B 954bae11770bccdbf5babea1c06cc829ef069777a52542ffb683ca0709300edbfaa452aea7da44497b900dc653c00b129bcdca0ee6808e6d5f610d43437858d6 SHA512 c1fedabf8eff11256cd4a93130db028c3e599f6f0fd249ff8a4533c1ebf7d3f8c17422b3765dbc047f25bd9c4725c43212de585642a246338c7fcd1c78c3d914
 AUX 15.0.1-fix-file-conflicts.patch 291 BLAKE2B 4ad2a65c731372de5553386bbe3136d0d2ff8dd76d27370f62d707eda83908169bb610d1e9d9687ac2a7e2f51681c07b2b446e92dbb4371b47c39a523f14be40 SHA512 9e9887b295f8b4b817904d2bdbd4dd0944c59daf4dfe1fbd1746e8db70088e40e8410965c10e8a24184407710ad19ae5fc93185e73ed7759a89aecb4ccf73a58
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
-DIST gucharmap-14.0.3.tar.gz 1931686 BLAKE2B e72b46450ad97a49519014882cbfd5792a07daf782fdf0d80e4b9221537548a57d3b43dc2b421f3f72d3b0adfee6f11c53304b4468c78b766ffee9536efebba2 SHA512 cb43265a2b54231c15331c299ed10bba8bb83bdc1860ee50764bed8a40ce1421f49edfeb7fa5814c8aac6c23f80936a966346849db83ddf7f94a370adeffc6c8
-DIST gucharmap-15.0.0.tar.gz 1936653 BLAKE2B 4ff592bca75a08e19921c2b08c19ea2693b4652986f2cf77536cf3e056353cf9bfe44e66e15b402552f5ab1b97631f53e07ac10b530164b0ba1d479f70d2b4c2 SHA512 b72f4bf5b6b4d922c91bd1fb58070a5bcdc4364f96144db7446c8a94045158bc3c9e549f1bd3db3f27bb22e6b83a130c73cbd7c737c49a2bb0e2a6a5c8756a66
 DIST gucharmap-15.0.1.tar.gz 1938073 BLAKE2B 0a6b6e76bb60648c591354394d2dfb78f56508dbf7d0b62edb945b8e79b6cbe7f333e7245d374fae9476986e06aee99bca53fe05da6a2e66629e33941fa79bd5 SHA512 77a6cd6bfa4465140a1014c8b1a9783acf6feb656925f319627f3fe5a0e091fa1819d82e3f5ca4f9eaa0c6e6bf8ace66ae6895360b9574a8f9ac7a347c37e103
 DIST gucharmap-15.0.2.tar.bz2 1480065 BLAKE2B 9fa5c024d05b25da2ec5d8a93efd2428ca0e47e88e3c5e701995664a548775ae6061fbe1bc4671c15595151a68a3e186544f671b683231461f9be02a86caf11e SHA512 5b345cd0cfe5c588ae062f402c66b45fbbdd03705c4c4900a2314ff19562279436712e19d7143d87cbf6db49e10cba825dd37c0a57aba8b1c1fd9a3e7dbe363e
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-EBUILD gucharmap-14.0.3.ebuild 1708 BLAKE2B 31654745e590266a69f0e716e884e65eafe3e211a111f4df42092f463d762a16780824710c7bfb40ce2cd85ea83dc7cfc8b81a462596fe9d9a19992d5c71a605 SHA512 af36e8e7e29d0c05db8ed6c6cd36645da80ffb7342e70c15c0f61060cd91ca6583dea5034ae3f2c01102f86f96346c6d4c6c21e826d2a754d5e069b5a847f9c4
-EBUILD gucharmap-15.0.0.ebuild 1696 BLAKE2B f2616d6fd69b90c9691dbd44ba72668c003a8d3f23cde395b924507ac2bd40d204fbb91fc7f935aa94c49babde6ad9a683fbf4995763cc634fbd664b88137dea SHA512 9939ac87a9b7b3278a24f4b7fb1de48f4560027dfdea960085d581efe05356087aa2a388fa96140140a31106267b051559b3fa853d1e6ad3b49a0d557d3194b6
 EBUILD gucharmap-15.0.1.ebuild 1689 BLAKE2B 80ac27781c43f371aeac686e6d64fc9056c5a3470232419d7452044146f913167d24ff74efa52b990e928b7bbdaef8f68df881b2bafeca0c87923e8d38678fba SHA512 190e36f01b3ee3cef9d43f3f811629b7f6006ff12364142977c6c9456cad4cb0bbdbf741000136198cad68ac0da512394cb450e60f266b1d41b09fe6baacbfe2
 EBUILD gucharmap-15.0.2.ebuild 1655 BLAKE2B 4473685955683378ce24d8ed8894cefdc219f654fbc030d2710aca23124cf1a3b1d73cd1ec3b6853ac6ac81c75d5c70f034daabdfbe47807654fea93548ba3d1 SHA512 68c023c41c25780ec5688f82d3d43fc2d6c5551ad74dab913fe19038a9efcf08d9584b715526e3c2aef5ab967c0c1c01d71dfab492ab4fedad96ae52a86894c0
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
diff --git a/gnome-extra/gucharmap/files/14.0.1-fix-file-conflicts.patch b/gnome-extra/gucharmap/files/14.0.1-fix-file-conflicts.patch
deleted file mode 100644
index 55a346271880..000000000000
--- a/gnome-extra/gucharmap/files/14.0.1-fix-file-conflicts.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 92b5a40d2d84e1989cdd091a10660e14e66c4daf Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <mart@leio.tech>
-Date: Sun, 16 Jan 2022 01:03:08 +0200
-Subject: [PATCH 3/3] build: Use API version in gettext domain
-
-Avoids file conficts with other API versions being installed on the system.
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 00cfbeec..db44e1dd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -78,7 +78,7 @@ libgucharmap_gtk4_soversion = '0'
- 
- # i18n
- 
--gucharmap_gettext_domain = gucharmap_name
-+gucharmap_gettext_domain = libgucharmap_gtk3_api_name
- po_dir = meson.current_source_dir() / 'po'
- 
- # Directories
--- 
-2.32.0
-
diff --git a/gnome-extra/gucharmap/gucharmap-14.0.3.ebuild b/gnome-extra/gucharmap/gucharmap-14.0.3.ebuild
deleted file mode 100644
index a0b9f394281e..000000000000
--- a/gnome-extra/gucharmap/gucharmap-14.0.3.ebuild
+++ /dev/null
@@ -1,74 +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} )
-VALA_MIN_API_VERSION="0.26"
-
-inherit gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap https://gitlab.gnome.org/GNOME/gucharmap/"
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="2.90"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-
-UNICODE_VERSION="14.0"
-
-IUSE="+introspection gtk-doc vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="media-libs/freetype:2
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=dev-libs/libpcre2-10.21:=
-	=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=x11-libs/pango-1.42.4-r2[introspection?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/14.0.1-install-user-help.patch
-	"${FILESDIR}"/14.0.1-fix-file-conflicts.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcharmap=true
-		-Ddbg=false # in 14.0.1 all this does is pass -ggdb3
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dgtk3=true
-		-Ducd_path="${EPREFIX}/usr/share/unicode-data"
-		$(meson_use vala vapi)
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gucharmap/gucharmap-15.0.0.ebuild b/gnome-extra/gucharmap/gucharmap-15.0.0.ebuild
deleted file mode 100644
index 464d964ef84c..000000000000
--- a/gnome-extra/gucharmap/gucharmap-15.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap https://gitlab.gnome.org/GNOME/gucharmap/"
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-UNICODE_VERSION="15.0"
-
-IUSE="+introspection gtk-doc vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="media-libs/freetype:2
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=dev-libs/libpcre2-10.21:=
-	=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=x11-libs/pango-1.42.4-r2[introspection?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/14.0.1-install-user-help.patch
-	"${FILESDIR}"/14.0.1-fix-file-conflicts.patch
-)
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcharmap=true
-		-Ddbg=false # in 14.0.1 all this does is pass -ggdb3
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dgtk3=true
-		-Ducd_path="${EPREFIX}/usr/share/unicode-data"
-		$(meson_use vala vapi)
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index d3150cfbb556..ca45c410fe4a 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,6 +1,4 @@
 AUX 1.14.49-skip-valgrind-tests.patch 716 BLAKE2B 2a65162dc1448f673afd30153d3d7d8c99391a85ae3fa77d73833c6064576eb290b19388d5fd4698c4246af90684ceaad57c2225d8bb12775e72c05e82fc04bb SHA512 30fd7729989e741ae8c1391ca88882ceffdaef7c3c9bc4d71e93225c5c7ddb213356732c7545c2ba8710c7a9b3d9f9fc6972a5697bacf65f20d0018255a5b969
-DIST libgsf-1.14.49.tar.xz 702644 BLAKE2B 05ee17200d5170380138a7996dd37d5473eb9fe9a13cfb06b68e17470525d9640a4921d111e83963f245ecf6b669116322d9358d9a0b473c8149c56ff9c983ba SHA512 a847a3c7fe26865e110bb87cb7ed74c477fdaf41fdec1c97cd3ea85ab3ba2f618e609a38fb4087a2c9b58d8d4b430c2148c93cbbb8425af41b6c751efef3298e
 DIST libgsf-1.14.50.tar.xz 702424 BLAKE2B dc6e3fa313cc99981cf521b4613ef135ea6836554be0cc557e49d77bd3259e1bf2150af1b7a41071f4b865c28a9b6153b6ef6e89d4868e4203ce7dc7da433c71 SHA512 e4a405d01440654bfe5059536524d494e5b66859235648bcf6031a74b59967504b50750f471bbe1607c4a5ef11cac98aa2ca9ebb31151cf5a19ffa340d421adb
-EBUILD libgsf-1.14.49.ebuild 1115 BLAKE2B 500861727a9918e74731406ea8e08dc4d693144a91fe70763cd3649afb627e10228550861ca59576f4a44a99b630ec77313198689e992428f3e78f9570eb34dd SHA512 41f2e5c6410d835f6327a7925246d57970fce12af0831f3c839930fc26c93cf6bfb8c25fd200d23d6ada9867bad950ad16c9fdbffa52acd3892bc978e3fb1d0c
 EBUILD libgsf-1.14.50.ebuild 1121 BLAKE2B ec987d4447648e44643bb19eab9900708d45be44316817a25a84fdf55d6f3da32d9231da407c6f58c70fed349eb9000dd48953f5f79a947dfa4c15888f313ba8 SHA512 826233d7bc22287a40aa2d6c18b29bed1924235f816bd3c55dfa46b9493dcf9b51154b12257fd9935753d6b904bf9718096c4ba8cb56f745415733b8d6d4907e
 MISC metadata.xml 425 BLAKE2B 6fbe8835fee71b4b63349023c6b9f8f68a26a5c15a02f1371c487ea2abbedcfd42503f7c696458850377b7d689c69ca734566a6217ece9798911c7df2f660810 SHA512 5cb0ca0bbc375b38e8e5eb3b98ef990e9f7597a12f15741c86718b823138155284ec19f1547dac2b72b85460e61607ac02d88b64077c2ad92553a6adfa17e56a
diff --git a/gnome-extra/libgsf/libgsf-1.14.49.ebuild b/gnome-extra/libgsf/libgsf-1.14.49.ebuild
deleted file mode 100644
index 8d6907d2c266..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.49.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libgsf"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.16:2
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	gtk? (
-		x11-libs/gdk-pixbuf:2
-		virtual/imagemagick-tools
-		)
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	dev-libs/gobject-introspection-common
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	test? ( dev-perl/XML-Parser )
-"
-
-PATCHES=(
-	"${FILESDIR}"/1.14.49-skip-valgrind-tests.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with bzip2 bz2) \
-		$(use_enable introspection) \
-		$(use_with gtk gdk-pixbuf)
-}
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index a45177fd2ce2..9e61e820ae5f 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,3 @@
-DIST yelp-xsl-42.0.tar.xz 663824 BLAKE2B bf1ceae255a6166cda81be57e0cae14c25e4668d70e16bafb3aeaf0958b2393c4c6be8a4575b24fc7560fdddd60c3790b89890015d13f4124445f037549781de SHA512 70d86bedd00fd38ffefb82962b591b710aa6ba59f9a12c968d5c47afeed9f4afecfb5e1228fbaba3acab5d5673cb6511d3d51674f7602f5001835d9c134fedda
 DIST yelp-xsl-42.1.tar.xz 667448 BLAKE2B 45f19a6cc7a0ff9f3f31e0f33935d757c07e403c77d2adfa20fda46a7f22da5b6196e7dc40a3e83ef0604f6c681c5ca99d5565d070d3fdcbf732312aa73d34c8 SHA512 90c7cc244dba038d6fcc1344adf950640a0affb8e5a1a6945a776d3308bf9b5071320856968f7a31688855a18a872f63553bd643b7776801cc68b182b455fc10
-EBUILD yelp-xsl-42.0.ebuild 586 BLAKE2B 1df2ceda3a277cb64f90f6f99e820752a51e7b451258b891e6418a3c59e273b211bf6a361848aa385f5ed7a751ddd8faa007d72af673bb0339ce4511a61e1bf8 SHA512 c1547896e1319c0a66728d63556aad4cadf1aa968c87f69cedba6000b1c9775c0996ac807b9cffbdd8b6bbaf1d26a8aed11de2724261dd4014e09f00ca652bd0
 EBUILD yelp-xsl-42.1.ebuild 586 BLAKE2B 1df2ceda3a277cb64f90f6f99e820752a51e7b451258b891e6418a3c59e273b211bf6a361848aa385f5ed7a751ddd8faa007d72af673bb0339ce4511a61e1bf8 SHA512 c1547896e1319c0a66728d63556aad4cadf1aa968c87f69cedba6000b1c9775c0996ac807b9cffbdd8b6bbaf1d26a8aed11de2724261dd4014e09f00ca652bd0
 MISC metadata.xml 349 BLAKE2B c96a25198e4abaf563ef514c3edcb162b218147130de410823349a852d8b79379a6401c21e66068b66099f710d0af5c97921dcfe7afbe55edfcb5b2a0a5512ca SHA512 992f5befc861e713494b07329a9357462e88193d070baf7282289f8774694b8138f1ffbca312f760212ec37849d0f09f7b80f27d620f1c1c8319a916819543b1
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
deleted file mode 100644
index 5547dd8cbe05..000000000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2
-
-DESCRIPTION="XSL stylesheets for yelp"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/libxml2-2.6.12:=
-	>=dev-libs/libxslt-1.1.8:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-util/itstool-1.2.0
-	>=sys-devel/gettext-0.19.8
-	app-alternatives/awk
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 433d972ce474..7fa2344e77ed 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,6 +1,4 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
-DIST yelp-42.1.tar.xz 1512620 BLAKE2B a0ba02a560c19e516c42f77a34f3296dd6dd9d3dba9b34b2243a2c7689b7117cd82dea8e169ec7001ba15860c74f1c7ace061094516391b38f5054b566e613b2 SHA512 3c8150503e828c8d2994b7af6f7c673b696b01f4a82abcbbc0395909a0e0eb2d64a9e445a5b1683a0c9aa0abc7040cc563917e55b126879ce7c4dda117bbf3db
 DIST yelp-42.2.tar.xz 1506136 BLAKE2B dbde815af6902eebae0e6dcdb12e0e0c8981fa64608e6ba3c8950b908b13981c335011ee2e2240e8a96c4aff3f8b682d630ea34215918374e231220eb87e0f2b SHA512 7fd8da347b3cdb9b24a31eebe14c4964c5e41956caa2b79e70d6ea0c829d94f8428bbd96a2472c02d56673ca0ed1c75f7c6f874a59c4eea0b1440918a99969f4
-EBUILD yelp-42.1.ebuild 1272 BLAKE2B 626fa34fbc4832e188afddd5e9e72aefffa33f45e1789ce3733611f9b994b9989101a002700618483c7b31822f4cfa55188afcaeb9d433d67484500a03e05f18 SHA512 6be9e23ad264d1ba8f132ceac58e7fc0ec29927ab0b1c8497e6a821933a4a369c407bd87a6b3e5f50b713d0c5908162367a55686e046061a3698e0803e98b70c
 EBUILD yelp-42.2.ebuild 1272 BLAKE2B 626fa34fbc4832e188afddd5e9e72aefffa33f45e1789ce3733611f9b994b9989101a002700618483c7b31822f4cfa55188afcaeb9d433d67484500a03e05f18 SHA512 6be9e23ad264d1ba8f132ceac58e7fc0ec29927ab0b1c8497e6a821933a4a369c407bd87a6b3e5f50b713d0c5908162367a55686e046061a3698e0803e98b70c
 MISC metadata.xml 345 BLAKE2B e0d968518c30308c282fe0e08f0fd9315d20cb00ec6f3284b10d977fc9ac8c79197784d25ae416052babc0434f887720a42b62e5ba65643ff2ca5352946c6ee3 SHA512 c03102f20a4cfeffbf007c3c9b62fbf4e2636f6b1734f8a4df310fb436e65ef3e29642b840deea60d44099c1e795e3cdac0d17b5f5e57f3f59561253c54a4694
diff --git a/gnome-extra/yelp/yelp-42.1.ebuild b/gnome-extra/yelp/yelp-42.1.ebuild
deleted file mode 100644
index e87454464d17..000000000000
--- a/gnome-extra/yelp/yelp-42.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	app-arch/bzip2:=
-	>=app-arch/xz-utils-4.9:=
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.67.4:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-41.0
-	>=net-libs/webkit-gtk-2.19.2:4
-	>=x11-libs/gtk+-3.13.3:3
-	>=gui-libs/libhandy-1.5.0:1
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.13
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Fix compatibility with Gentoo's sys-apps/man
-	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
-	"${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch # needs eautoreconf
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-webkit2gtk-4-0 \
-		--enable-bz2 \
-		--enable-lzma \
-		APPSTREAM_UTIL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	exeinto /usr/libexec/
-	doexe "${S}"/libyelp/yelp-groff
-}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 463e4ea45e1a..2f0075d64cc4 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/amtk/Manifest b/gui-libs/amtk/Manifest
index e89ff3dc7944..15d59ab483e8 100644
--- a/gui-libs/amtk/Manifest
+++ b/gui-libs/amtk/Manifest
@@ -1,7 +1,5 @@
 DIST amtk-5.4.1.tar.xz 58024 BLAKE2B aa65a5b8e9e4105d0ba699eef7e505ba3acb95a7014da1217b9569b68cb1ae7e7abf6debc1bd79935baa376e5a36ef197add3c3d326d97e89c7107c42ff4e582 SHA512 6257295c9c4756de622df48dd915cb591e5f3bf2d5d17dcb26f835e69c885d50e48a2634d8f7b9537638e7bdc531462670697823301ca2d257403192f6f8062c
-DIST amtk-5.6.0.tar.xz 58720 BLAKE2B 76770eef7148ce934621e8183fd0ed45e63e6078767a6af63160e406c2cb09320f6c79476d21f46e41ec2b7532216cab734931f6f3771b920e956c700145f5b8 SHA512 63e2d2a9f6d66cad9db4d18c2cfd6955aeb2cdcaf6bef7f1925f20e07507befd0d7ce9b9bee6edd9ac936cdb17c8ec5e4004ec5454b6c78740e85452b74f23f0
 DIST amtk-5.6.1.tar.xz 58472 BLAKE2B 3c31ba010c2711f8b85cd704de1595100f17b2f3471b2d6036bae1c414f5af669b11105288bcc70b07e035334575bd8e0ac35f9bf6d69affe2ba1b5491408df2 SHA512 668519d2977e951d6b5d78add44a3f829ec169ff115be1aa4ab986e902b06653568135a3793653725a4aad95ec82cb171f0e8d16a2f83485659a14ed3e932c34
 EBUILD amtk-5.4.1.ebuild 860 BLAKE2B 770b34f2620e6c958c17f363314c59c4526f715c3a688e70e7c407f8a83903cacd942ead4379e21398ac39edd33223838540e9e7fa577717a50a6334c5224e4f SHA512 3437c34a86062b3b553c8b187f40f61f27e58366e8fb0217a1c78ae26c74b8d4f440381433701755700eed3208e930887fdace1941e5d0ecff22a5a45441235a
-EBUILD amtk-5.6.0.ebuild 826 BLAKE2B 4e6b4367e24ac491ca64be10a6bd94baf71d54585237b12cd06ada38abcca734c2abb491e98c86c7b95d6a80a6f95bc3d4b7de89ee9bb54ed31c7f3c8a5c75a1 SHA512 6bde48eb82ce8a94b9b4ed6ae568a888851eab0f615e47fef30ba21bf5e931c3c9acff356939532bed17a82a81afff3c3c9e46cbf02037047a26558ca8b5daf7
 EBUILD amtk-5.6.1.ebuild 826 BLAKE2B 71de39f2fd3ad7eb8275b031a2cc06fa9ce51a76025be777fc832d953da5dd91a59ba0aa75de605dd49644ffbd195c91fcaece1db9c3dcc2b7defe3360ddc20b SHA512 49d617ea4be79257067b4c195bb1990bdf66b64d679e1c5012c2b39b4f06292ffe9c8dec1ef098fc110e310b3266fb30e621b274159b4ce3d879dca65c109072
 MISC metadata.xml 345 BLAKE2B 393354c336121233ace1e2f95bdb99432e52a9f96ec6ba1a8dd7688c38d426be8ccbee73fa182f4b463956b343cb23497b12a689d16779127881d1f4dd0e2aa8 SHA512 0052f2112bb9123acdc71c66d599c7556e8f8a076d58d02801cc534c7ef70e8f196186cb90702c77e6441c316d1895aefbebb4d06ade698ece7822bed304c664
diff --git a/gui-libs/amtk/amtk-5.6.0.ebuild b/gui-libs/amtk/amtk-5.6.0.ebuild
deleted file mode 100644
index e6e139d016da..000000000000
--- a/gui-libs/amtk/amtk-5.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2 meson
-
-DESCRIPTION="Actions, Menus and Toolbars Kit for GTK+ applications"
-HOMEPAGE="https://gitlab.gnome.org/World/amtk"
-
-LICENSE="LGPL-2.1+"
-SLOT="5/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+introspection gtk-doc"
-
-RDEPEND="
-	>=dev-libs/glib-2.56:2
-	>=x11-libs/gtk+-3.22:3
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection gobject_introspection)
-	)
-	meson_src_configure
-}
diff --git a/gui-libs/display-manager-init/Manifest b/gui-libs/display-manager-init/Manifest
index dabafa43220b..729a4aabc121 100644
--- a/gui-libs/display-manager-init/Manifest
+++ b/gui-libs/display-manager-init/Manifest
@@ -1,10 +1,7 @@
-AUX display-manager-setup.initd 224 BLAKE2B 8513295b8c315d71521ac24fc9da1878e32044ebe7b6e37afb77a25eb8ec449568a82e516fd04de7fb2b0f0b5ff355a54a257041616d0035b25d0ae191e336e4 SHA512 d0048fc5b3c0fd92a44b71f7b8132e35787e42095c22f53aa41c10505c219eb25015f76163069aab7ebb6f0ac9feeac62d1b74682fd3947e835ea5de36957727
 AUX display-manager-setup.initd-r1 246 BLAKE2B 13b3a3fac6054e2b5b3d9106994b486d42de5bcfca6899f033855c7879915b3730be3c8fc650cb5e2f0970b26401f03fc861e9567dfd168cb945c72bc4cfcc8d SHA512 916011bfd139f8261a53b637d1b75ebcfdb101bfb9d1cfbca38de6a15a9e6573b6a906997b57b7d8ac483ab02b0074e04b2730db3cb1db0b8a879dfe11ee72cc
 AUX display-manager.confd 608 BLAKE2B 814b4d36ce74d2f70a771cda31c3b9f6e21246bef681607d2687b3ed51f1baab8752fe94ad1021b9fd81b3e8444a328d2c1de83718534ea722ef9dadcbdca164 SHA512 40fb28fb6ac06b59fed9fec86816a444f53ea499bb9a7e7a072a5a932b45a29f830b9da9de0954b1f5cb21903c08ff5c997db2e32ee0bb1a300cd6c070cc8aa6
-AUX display-manager.initd-r2 6237 BLAKE2B a0bf7c7563419f14867568c111a7d3456eadf5037a0d993ed92bc2270fed6f920e1a23602f2de0d287e05844d1a0d52dfc663da9a4bfcdfd3d54615cc8282dca SHA512 084eb98fe656fdfdf669345738009b722dec8cc3eddea5d4df184a70985152e19925b4e4c00d695e5ae29cc8f93aee9d3ac353483df7f3bda25d4fbb1ceea50e
 AUX display-manager.initd-r4 5196 BLAKE2B f8ea46550a6810e9c929052eec7a7313bc49fdd70550504db66901c766b40a7f008a297d2d961dd5a62ba2c6f23239586cc2e7eaa1e0e2cab537a914fa714118 SHA512 d9265bdfc10bd75491ccd1a15e8270276e902f26451af9c2c12431aac2b7d7ed5d7bcb2baf6663a4f0766fcf709edcec17c08e19cebce468790c1442f5c6473f
 AUX startDM-r1 778 BLAKE2B 134345da401d5d75cb4e3cf79189a2594e508d4afe748bc209e8a93ea754169b205b114fcdb830ed95908788d0bf9cf071cd50de0c37df7fe5b83827f406d766 SHA512 e0cbb1f0ca6d6d3ae3f963bb5508e5b58e03682aba3f35cb2c1819c17e2d94ee240a5dc603f9fd93d22ecca060d131e46c0a0a25685aa8deac280294ff76b8c9
 AUX xdm.initd 200 BLAKE2B ec997b7080037a7197a6f75728d9075c846168115d705015afc6518e1e72d815cdf87c2e9e3f3ad950034599e548d015e530cb7821f83b9d289337908455c17a SHA512 4552215cc2cdffa3298a9136e2a22f600f55958d7f74b2d06bbf48568d8034ef24deea27ad9f8d6d100516b0efb4e2688c1f454dc556120f759b1da7fecd877c
-EBUILD display-manager-init-1.0-r4.ebuild 1678 BLAKE2B 6f660ee635bf419c54e8a72efc4f5a8a8a3044cdfdf71a94d3a170408f5e9587a68d5ca0744e8f880144c18ba20b2af70086732d9b1cdbf0fb3c3351554e21b8 SHA512 c7ecf09d9a875ed9216a9e2b343f996610d20427d4c9f5e427784a6700f8473c720c4051011ad99e5c4ea95177ead20ac0fe251adbfbdbe73e400759f066cb2a
 EBUILD display-manager-init-1.1.1.ebuild 1681 BLAKE2B 5fafe8b7c94db5fd05740da4a3d895f15a7109ba9afed2f1f3b74d746b9cd16d7a5378f4dc6058233e3cfc0603fca80c82cc0c5bebbaad169c326ff5c4c5c690 SHA512 cdd6824551b5a4203e90fa32468e31c846b77e4a07e778320ba68479c07132b218c96893ab4c4bde871032f65b7fcfe32c011f6a1cfb868c8c1e4b99645adefe
 MISC metadata.xml 259 BLAKE2B cc7abf54ed4398a2cfb77310c63f5fae3e432488b0c7466f8148c5d009d38aa4ca78eef78712f0b7b6aca6710aab1dfe3c07440f36179fde03f8a97a49b3c080 SHA512 6f50c5d3c735db431156906312a7c1dab3723d8c9e51d15148b92d97a998221c6838eb926f36c6b924c9fc8a6a64ba904e36482ff5164867c482502aa638462f
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild
deleted file mode 100644
index 4bec8e62a1cc..000000000000
--- a/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="RC init files for starting display and login managers"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	sys-apps/gentoo-functions
-	!<=sys-apps/sysvinit-2.98
-	!<=x11-apps/xinit-1.4.1
-	!<=x11-base/xorg-server-1.20.10
-	!=x11-base/xorg-server-1.20.10-r2
-"
-
-src_install() {
-	newinitd "${FILESDIR}"/display-manager-setup.initd display-manager-setup
-	newinitd "${FILESDIR}"/display-manager.initd-r2 display-manager
-	newinitd "${FILESDIR}"/xdm.initd xdm
-	newconfd "${FILESDIR}"/display-manager.confd display-manager
-	newbin "${FILESDIR}"/startDM-r1 startDM
-	# backwards compatibility
-	dosym "${ESYSROOT}"/usr/bin/startDM /etc/X11/startDM.sh
-}
-
-pkg_preinst() {
-	if [[ ${REPLACING_VERSIONS} == "" && -f "${EROOT}"/etc/conf.d/xdm && ! -f "${EROOT}"/etc/conf.d/display-manager ]]; then
-		cp -a "${EROOT}"/etc/conf.d/{xdm,display-manager} || die
-	fi
-	local rlevel using_xdm
-	using_xdm=no
-	for rlevel in boot default sysinit; do
-		if [[ -e "${EROOT}"/etc/runlevels/${rlevel}/xdm ]]; then
-			using_xdm=yes
-		fi
-	done
-	if [[ "${using_xdm}" = "yes" ]]; then
-		ewarn "The 'xdm' service has been replaced by new 'display-manager'"
-		ewarn "service, please switch now:"
-		ewarn
-		ewarn "  # rc-update del xdm default"
-		ewarn "  # rc-update add display-manager default"
-		ewarn
-		ewarn "Remember to run etc-update or dispatch-conf to update the"
-		ewarn "config protected service files."
-	fi
-}
diff --git a/gui-libs/display-manager-init/files/display-manager-setup.initd b/gui-libs/display-manager-init/files/display-manager-setup.initd
deleted file mode 100644
index 05feeee84ae6..000000000000
--- a/gui-libs/display-manager-init/files/display-manager-setup.initd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-start() {
-	if get_bootparam "nogui" ; then
-		touch /run/.nogui
-	fi
-}
diff --git a/gui-libs/display-manager-init/files/display-manager.initd-r2 b/gui-libs/display-manager-init/files/display-manager.initd-r2
deleted file mode 100644
index 285ac6a717c4..000000000000
--- a/gui-libs/display-manager-init/files/display-manager.initd-r2
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem:  if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2.  When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-#  x:a:once:/usr/bin/startDM
-#
-# and have /usr/bin/startDM start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel. Along with the "a"
-# runlevel, the "once" key word means that startDM will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM when "display-manager" is not added to the default 
-# runlevel, as was done previously.
-#
-# This script then just calls "telinit a", and init will run
-# /usr/bin/startDM after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-depend() {
-	need localmount display-manager-setup
-
-	# this should start as early as possible
-	# we can't do 'before *' as that breaks it
-	# (#139824) Start after ypbind and autofs for network authentication
-	# (#145219 #180163) Could use lirc mouse as input device
-	# (#70689 comment #92) Start after consolefont to avoid display corruption
-	# (#291269) Start after quota, since some dm need readable home
-	# (#390609) gdm-3 will fail when dbus is not running
-	# (#366753) starting keymaps after X causes problems
-	# (#768834) race condition with elogind
-	after bootmisc consolefont modules netmount
-	after readahead-list ypbind autofs openvpn gpm lircmd
-	after quota keymaps
-	after elogind
-	after sssd
-	before alsasound
-
-	# Start before GUI
-	use dbus xfs
-}
-
-setup_dm() {
-	local MY_XDM
-
-	MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
-
-	NAME=
-	case "${MY_XDM}" in
-		kdm|kde)
-			# Load our root path from profile.env
-			# Needed for kdm
-			PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
-			EXE=/usr/bin/kdm
-			PIDFILE=/run/kdm.pid
-			;;
-		entrance*)
-			EXE=/usr/sbin/entrance
-			PIDFILE=/run/entrance.pid
-			;;
-		gdm|gnome)
-			# gdm-3 and above has different paths
-			if [ -f /usr/sbin/gdm ]; then
-				EXE=/usr/sbin/gdm
-				PIDFILE=/run/gdm/gdm.pid
-				START_STOP_ARGS="--background"
-				AUTOCLEAN_CGROUP="yes"
-			else
-				EXE=/usr/bin/gdm
-				PIDFILE=/run/gdm.pid
-			fi
-			[ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
-			;;
-		greetd)
-			EXE=/usr/bin/greetd
-			PIDFILE=/run/greetd.pid
-			START_STOP_ARGS="-m --background"
-			;;
-		wdm)
-			EXE=/usr/bin/wdm
-			PIDFILE=
-			;;
-		gpe)
-			EXE=/usr/bin/gpe-dm
-			PIDFILE=/run/gpe-dm.pid
-			;;
-		lxdm)
-			EXE=/usr/sbin/lxdm-binary
-			PIDFILE=/run/lxdm.pid
-			START_STOP_ARGS="--background"
-			;;
-		lightdm)
-			EXE=/usr/sbin/lightdm
-			PIDFILE=/run/lightdm.pid
-			START_STOP_ARGS="--background"
-			;;
-		sddm)
-			EXE="/usr/bin/sddm"
-			START_STOP_ARGS="-m --background"
-			PIDFILE=/run/sddm.pid
-			;;
-		*)
-			# first find out if there is such executable
-			EXE="$(command -v ${MY_XDM} 2>/dev/null)"
-			PIDFILE="/run/${MY_XDM}.pid"
-
-			# warn user that they are doing sick things if the exe was not found
-			if [ -z "${EXE}" ]; then
-				echo "ERROR: Your XDM value is invalid."
-				echo "  No ${MY_XDM} executable could be found on your system."
-			fi
-			;;
-	esac
-
-	if ! [ -x "${EXE}" ]; then
-		EXE=/usr/bin/xdm
-		PIDFILE=/run/xdm.pid
-		if ! [ -x "/usr/bin/xdm" ]; then
-			echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/display-manager,"
-			echo "	or install x11-apps/xdm package"
-			eend 255
-		fi
-	fi
-}
-
-# Check to see if something is defined on our VT
-vtstatic() {
-	if [ -e /etc/inittab ] ; then
-		grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
-	elif [ -e /etc/ttys ] ; then
-		grep -q "^ttyv$(($1 - 1))" /etc/ttys
-	else
-		return 1
-	fi
-}
-
-start() {
-	local EXE NAME PIDFILE AUTOCLEAN_CGROUP
-	setup_dm
-
-	if [ -f /run/.nogui ]; then
-		einfo "Skipping ${EXE##*/}, /run/.nogui found or 'nogui' bootparam passed."
-		rm /run/.nogui
-		return 0
-	fi
-
-	ebegin "Setting up ${EXE##*/}"
-
-	# save the prefered DM
-	save_options "service" "${EXE}"
-	save_options "name"    "${NAME}"
-	save_options "pidfile" "${PIDFILE}"
-	save_options "start_stop_args" "${START_STOP_ARGS}"
-	save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}"
-
-	if [ -n "${CHECKVT-y}" ] ; then
-		if vtstatic "${CHECKVT:-7}" ; then
-			if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
-				ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
-				telinit a >/dev/null 2>&1
-				return 0
-			else
-				eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
-				return 1
-			fi
-		fi
-	fi
-
-	/usr/bin/startDM
-	eend 0
-}
-
-stop() {
-	local curvt retval
-
-	retval=0
-	if [ -t 0 ]; then
-		if command -v fgconsole >/dev/null 2>&1; then
-			curvt=$(fgconsole 2>/dev/null)
-		else
-			curvt=$(tty)
-			case "${curvt}" in
-				/dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
-				*) curvt= ;;
-			esac
-		fi
-	fi
-	local myexe myname mypidfile myservice
-	myexe=$(get_options "service")
-	myname=$(get_options "name")
-	mypidfile=$(get_options "pidfile")
-	myservice=${myexe##*/}
-	yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options "autoclean_cgroup")
-
-	[ -z "${myexe}" ] && return 0
-
-	ebegin "Stopping ${myservice}"
-
-	if start-stop-daemon --quiet --test --stop --exec "${myexe}" 2>/dev/null; then
-		start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
-			"${mypidfile:+--pidfile}" "${mypidfile}" \
-			"${myname:+--name}" "${myname}"
-		retval=${?}
-	fi
-
-	# switch back to original vt
-	if [ -n "${curvt}" ]; then
-		if command -v chvt >/dev/null 2>&1; then
-			chvt "${curvt}"
-		else
-			vidcontrol -s "$((curvt + 1))"
-		fi
-	fi
-
-	eend ${retval} "Error stopping ${myservice}"
-	return ${retval}
-}
-
-# vim: set ts=4 :
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index c97c2632f704..6b83b30fdd4e 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,7 +1,3 @@
-DIST gtk-4.6.7.tar.xz 22885556 BLAKE2B ff3647fbb87fb7743c6aaf84f4de463275ff5816ccdba7f29425ee5268677e53ef56507ddd71447def5a1707e7509958068d5b8a7c64816cc3a1541691d7a262 SHA512 7f9068f66b472e796c1611625a34466b13aa51bce2dfc7661928e6d8087ed39ed0f6adf47a6691609b85540c588621bebc5951e81435277071abe7d2facf28bb
-DIST gtk-4.8.1.tar.xz 20502844 BLAKE2B 2e60b4a1985c2faa6990f0a2512a14f06ee30287ee8c4cb6cabd2100a4425c8e441879dd5b6d95b1f99ad49dd07909832ccfc4cb2738a467b32dad16074bee36 SHA512 26201c2ef0de24e0a530b0cb03af5c131a85d068ecb4dcbe22c1faaedf1d5c1555ebe2bf2da794ccfa24bea7de810179957d48474fa951ae691ac957bbdfd61e
 DIST gtk-4.8.2.tar.xz 20210736 BLAKE2B 0595ee5b497cdf1b0fff3bc468a7e79d9665f5552213b3bd794f9df6354e280f3d4747820bf3cd83ee903b8709e2902f70f6c3721322573b204447017a9c0ebf SHA512 400cdde53a4b76a912f52b1300286b2198d47195902ccfc034fbc518be7bc4c5817fe6df6386d764c95686083eede2e4582cc555fb38b0bce455942ea6c5fcb5
-EBUILD gtk-4.6.7-r1.ebuild 5748 BLAKE2B 080ccac9ef219938bb0e44a670f67c635f3d9e8c58e5a3b202135a886df5c6406e374fe20914dd0929b4dba4a878d6bbebc08a5fe5b919c144e0cc4f5b65f584 SHA512 b1968a046d5e1b55dbf6c3519693da2d5b15778badca08af89ccadadb1427fc9c94f527e616e24a0dd1c38e055ec169b7e4cdc202b96db0f5fedf39c57f9c928
-EBUILD gtk-4.8.1-r1.ebuild 5650 BLAKE2B 9dfbb8bf31bdb96e56bb66e64ee7c8a79f6bd92b7b67a109b019802f1fb6ce4ef1f07e05dc0e93f5bd16ee710d4ad63f76ffa790756b3a795cfe86f0992e63ce SHA512 646ba31067e385340dfbd6636806a2e1d15bee48e7078ad52852429a0d7e3825189ff603b83029431f89d453aaebd1e94fad986cffb78b3b6a4dc56cde1bbd57
 EBUILD gtk-4.8.2.ebuild 5706 BLAKE2B 126d95d2d75a4f1cd089d1be86a76424f8dc0586578239fb9c23b1fd656a400a942ad97519809e9d44f460b0c3a7c2f3af9c22cd59c4814565520540ea0ea3cc SHA512 85af8b352886b34614990563f161f3beb034729e3c5f570eeb8cd0dede3096c0481c0786f13804afd2248a08e0dcd5b3795aa2621eea0611beb1e7e0c5924506
 MISC metadata.xml 761 BLAKE2B 9bfb7757b82761ef2285e2d912376112958df4400ed93bdfc4a3f195cada9caf927cbced29820f6db049b8e5b7f2246d9264290ade62ba3bde8975491fd6331b SHA512 6ba84b2e3eeafceb179339561ac5e9fbd94dc34b71da768d9ca909818cf0c9ec5fe04906ed33aa58bc56929323bc41272223faee908052861fd1c6f8bbad95a5
diff --git a/gui-libs/gtk/gtk-4.6.7-r1.ebuild b/gui-libs/gtk/gtk-4.6.7-r1.ebuild
deleted file mode 100644
index a33803ca3c52..000000000000
--- a/gui-libs/gtk/gtk-4.6.7-r1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
-
-DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
-
-LICENSE="LGPL-2+"
-SLOT="4"
-IUSE="aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	test? ( introspection )
-"
-
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/fribidi-0.19.7
-	>=dev-libs/glib-2.66.0:2
-	>=media-libs/graphene-1.9.1[introspection?]
-	>=media-libs/libepoxy-1.4[egl,X(+)?]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
-	>=x11-libs/pango-1.50.0[introspection?]
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/harfbuzz-2.1.0:=
-	x11-misc/shared-mime-info
-
-	colord? ( >=x11-misc/colord-0.1.9:0= )
-	cups? ( >=net-print/cups-2.0 )
-	ffmpeg? ( media-video/ffmpeg )
-	gstreamer? (
-		>=media-libs/gst-plugins-bad-1.12.3
-		>=media-libs/gst-plugins-base-1.12.3[opengl]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	vulkan? ( media-libs/vulkan-loader:= )
-	wayland? (
-		>=dev-libs/wayland-1.20.0
-		>=dev-libs/wayland-protocols-1.23
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		media-libs/fontconfig
-		media-libs/mesa[X(+)]
-		x11-libs/libX11
-		>=x11-libs/libXi-1.8
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.5
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg
-	>=x11-themes/adwaita-icon-theme-3.14
-"
-BDEPEND="
-	dev-libs/gobject-introspection-common
-	introspection? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-	dev-python/docutils
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	test? (
-		dev-libs/glib:2
-		wayland? ( dev-libs/weston[headless] )
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-}
-
-pkg_setup() {
-	use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# dev-python/docutils installs rst2man.py, not rst2man
-	sed -i -e "s/'rst2man'/'rst2man.py'/" docs/reference/gtk/meson.build || die
-	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
-	sed -i -e '/gtk4-update-icon-cache/d' tools/meson.build || die
-	# Workaround RWX ELF sections, https://gitlab.gnome.org/GNOME/gtk/-/issues/4598
-	sed -i -e 's/^ld =.*/ld = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
-	sed -i -e 's/^objcopy =.*/objcopy = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		# GDK backends
-		$(meson_use X x11-backend)
-		$(meson_use wayland wayland-backend)
-		$(meson_use broadway broadway-backend)
-		-Dwin32-backend=false
-		$(meson_use aqua macos-backend)
-
-		# Media backends
-		$(meson_feature ffmpeg media-ffmpeg)
-		$(meson_feature gstreamer media-gstreamer)
-
-		# Print backends
-		$(meson_feature cups print-cups)
-
-		# Optional dependencies
-		$(meson_feature vulkan)
-		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
-		$(meson_feature sysprof)
-		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
-		$(meson_feature colord)
-		# Expected to fail with GCC < 11
-		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
-		$(meson_feature cpu_flags_x86_f16c f16c)
-
-		# Documentation and introspection
-		-Dgtk_doc=false # we ship pregenerated API docs from tarball
-		-Dman-pages=true
-		$(meson_feature introspection)
-
-		# Demos and binaries
-		$(meson_use examples build-examples)
-		$(meson_use examples demos)
-		$(meson_use test build-tests)
-		-Dinstall-tests=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	if use X; then
-		einfo "Running tests under X"
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
-	fi
-
-	if use wayland; then
-		einfo "Running tests under Weston"
-
-		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-		compositor=$!
-		export WAYLAND_DISPLAY=wayland-5
-
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
-
-		exit_code=$?
-		kill ${compositor}
-	fi
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
-	doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-
-	if use examples ; then
-		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gui-libs/gtk/gtk-4.8.1-r1.ebuild b/gui-libs/gtk/gtk-4.8.1-r1.ebuild
deleted file mode 100644
index 48045b86652e..000000000000
--- a/gui-libs/gtk/gtk-4.8.1-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
-
-DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
-
-LICENSE="LGPL-2+"
-SLOT="4"
-IUSE="aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	test? ( introspection )
-"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/fribidi-0.19.7
-	>=dev-libs/glib-2.66.0:2
-	>=media-libs/graphene-1.9.1[introspection?]
-	>=media-libs/libepoxy-1.4[egl,X(+)?]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
-	>=x11-libs/pango-1.50.0[introspection?]
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/harfbuzz-2.6.0:=
-	x11-misc/shared-mime-info
-
-	colord? ( >=x11-misc/colord-0.1.9:0= )
-	cups? ( >=net-print/cups-2.0 )
-	ffmpeg? ( media-video/ffmpeg )
-	gstreamer? (
-		>=media-libs/gst-plugins-bad-1.12.3
-		>=media-libs/gst-plugins-base-1.12.3[opengl]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	vulkan? ( media-libs/vulkan-loader:= )
-	wayland? (
-		>=dev-libs/wayland-1.21.0
-		>=dev-libs/wayland-protocols-1.25
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		media-libs/fontconfig
-		media-libs/mesa[X(+)]
-		x11-libs/libX11
-		>=x11-libs/libXi-1.8
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.5
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg
-	>=x11-themes/adwaita-icon-theme-3.14
-"
-BDEPEND="
-	dev-libs/gobject-introspection-common
-	introspection? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-	dev-python/docutils
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	test? (
-		dev-libs/glib:2
-		wayland? ( dev-libs/weston[headless] )
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-}
-
-pkg_setup() {
-	use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
-	sed -i -e '/gtk4-update-icon-cache/d' tools/meson.build || die
-	# Workaround RWX ELF sections, https://gitlab.gnome.org/GNOME/gtk/-/issues/4598
-	sed -i -e 's/^ld =.*/ld = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
-	sed -i -e 's/^objcopy =.*/objcopy = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		# GDK backends
-		$(meson_use X x11-backend)
-		$(meson_use wayland wayland-backend)
-		$(meson_use broadway broadway-backend)
-		-Dwin32-backend=false
-		$(meson_use aqua macos-backend)
-
-		# Media backends
-		$(meson_feature ffmpeg media-ffmpeg)
-		$(meson_feature gstreamer media-gstreamer)
-
-		# Print backends
-		$(meson_feature cups print-cups)
-
-		# Optional dependencies
-		$(meson_feature vulkan)
-		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
-		$(meson_feature sysprof)
-		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
-		$(meson_feature colord)
-		# Expected to fail with GCC < 11
-		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
-		$(meson_feature cpu_flags_x86_f16c f16c)
-
-		# Documentation and introspection
-		-Dgtk_doc=false # we ship pregenerated API docs from tarball
-		-Dupdate_screenshots=false
-		-Dman-pages=true
-		$(meson_feature introspection)
-
-		# Demos and binaries
-		$(meson_use examples build-examples)
-		$(meson_use examples demos)
-		$(meson_use test build-tests)
-		-Dinstall-tests=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	if use X; then
-		einfo "Running tests under X"
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
-	fi
-
-	if use wayland; then
-		einfo "Running tests under Weston"
-
-		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-		compositor=$!
-		export WAYLAND_DISPLAY=wayland-5
-
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
-
-		exit_code=$?
-		kill ${compositor}
-	fi
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
-	doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-
-	if use examples ; then
-		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gui-libs/gtksourceview/Manifest b/gui-libs/gtksourceview/Manifest
index 8a3047c6b92c..5fdac3843a7b 100644
--- a/gui-libs/gtksourceview/Manifest
+++ b/gui-libs/gtksourceview/Manifest
@@ -1,6 +1,4 @@
 AUX 5-gentoo.lang 3898 BLAKE2B a47c411fa650a53cb9176c3b670b5189ea9ee0c268d09444e08756f49d1d73c14c9505a19d9354671254cbfe0bfdc69545c3d5b761998037ab2ec57ce58bb2d7 SHA512 fffb635074ed0de4cedb3836f37322c7b9b58b65e91a014b72bd6a41bcaf195f0b25d4031d65d60fa5abd1c7f4f5aaf19d61a77eb91ab6f59df814dacf0a0595
-DIST gtksourceview-5.4.2.tar.xz 1261496 BLAKE2B 3c7447de6d252c7fbccd5fb18222aeb25cd264b53847d3fb45a5b30a528d3a850d059f226a696e9d8462085910c67e318be10de89c0e7a554787fb25f27a6674 SHA512 eef5267bd473327f4e3e7b79d4a96c53067e221e9f171dde864a7866ccab8258ca9e13b5f59e40272fd7e3acd9e1e08bb4bea3674fa2864ec108b4a47220e9d3
 DIST gtksourceview-5.6.1.tar.xz 1261200 BLAKE2B 144876e1649087d68aff7b9c33a5de25960672f81e85a2bca9fc3e39ba238b5045965f3b267022d037c7881ecf6713290d3ce850c5a3d67d683a76b3cd92aec9 SHA512 1b3683196fc50b8db56b7ae5161bf94b383361d4364142f4a8e89ab621d700144226871431820cb0bc21d5ec6ff041c75ba7585c6fc575bd532cb7a5dc711628
-EBUILD gtksourceview-5.4.2.ebuild 1837 BLAKE2B 9d0e8e7e9c1c70f23fa4a084ca6ffc889852f6089a65a77b5c2f01824325eb4d46df77b0f19e5fdc3c8ae8b5b024f8550e218bddc0e383d0e8f9def708153afa SHA512 9b8046f6adbc152d196cb61da8d030fd5695780498d37a28cfafa300358a8ca81885a8d6cb42d45a683e5b9b59dcbb74b76ed9546c8d3d6b77cbb6b42226dfda
 EBUILD gtksourceview-5.6.1.ebuild 1837 BLAKE2B e2124ef7b6e2121874fd570bbe0e5afcb83e9f8ceb364d6fa392a06f14cbb7c7d228e1c295be118b72ff36b21183c83d2795ebc4575135377d3de08bd7f7fe8f SHA512 1bd442e4ff48efb323c708e74a18f09d2ffaa7826825de9c46e71904764c24330c0f6f6098c0f8b60ba2955803269b29d90037d98a49b0b4ce4190b9ba3aeb2a
 MISC metadata.xml 483 BLAKE2B 4a540a461cade35f65793fedf3ef6ff73d4fb73d15127f752e0878c488c837c2616d1aed9f39bc94ea1196221cc94bc3372ecc985f83bc6bffa467aef8c4d185 SHA512 366ceb666c38841efd022c74452626c98bc99cbfa649a6d79416a08e8694194c8ec00419147a79f3c7742aba9d90c77194573e9a44b72ce38435ef456e43e643
diff --git a/gui-libs/gtksourceview/gtksourceview-5.4.2.ebuild b/gui-libs/gtksourceview/gtksourceview-5.4.2.ebuild
deleted file mode 100644
index 110ffda6d7c6..000000000000
--- a/gui-libs/gtksourceview/gtksourceview-5.4.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson vala virtualx xdg
-
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-
-IUSE="gtk-doc +introspection sysprof +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.70:2
-	>=gui-libs/gtk-4.5:4[introspection?]
-	>=dev-libs/libxml2-2.6:2
-	introspection? ( >=dev-libs/gobject-introspection-1.70.0:= )
-	>=dev-libs/fribidi-0.19.7
-	media-libs/fontconfig
-	x11-libs/pango[introspection?]
-	>=dev-libs/libpcre2-10.21:=[-recursion-limit(-)]
-	sysprof? ( dev-util/sysprof-capture:4 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( dev-util/gi-docgen )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dinstall_tests=false
-		$(meson_feature introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use sysprof)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# Tests fail in test-regex with libpcre2[recursion-limit] - https://gitlab.gnome.org/GNOME/gtksourceview/-/issues/255
-	# Ensured OK via USE dep, as it would mean issues in real usage for syntax highlighting as well
-	virtx meson_src_test --timeout-multiplier=2
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/${PN}-5/language-specs
-	newins "${FILESDIR}"/5-gentoo.lang gentoo.lang
-
-	if use gtk-doc ; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/${PN}${SLOT} "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
diff --git a/gui-libs/libadwaita/Manifest b/gui-libs/libadwaita/Manifest
index 62c2335c92bb..0ce83fe1da06 100644
--- a/gui-libs/libadwaita/Manifest
+++ b/gui-libs/libadwaita/Manifest
@@ -1,5 +1,3 @@
-DIST libadwaita-1.1.3.tar.xz 2731856 BLAKE2B 743d238779da843935149871f476426933b2b27424d449a32f0ac8a844e4980d65946f9a9cc79480e688fdd73c0e43cfbbc547aef2605dc34c800977825f33a1 SHA512 ffe3f5d3277d243a17b27055856e8c111fd856c22f07e990aff5fb48cd760928ff9389943b118ffba6671655af670cd0f0b8d2d5b34ee2265ac37249ddcaca7c
 DIST libadwaita-1.2.0.tar.xz 2955492 BLAKE2B 3c53ce54132a17ba09b94a93c1e3ab49e8d696610a4f24de0ddc101686d775c4b5a60df9565eb7673f3064f59d00c18480e4243cd14a9b7a463cc3cf54ab6610 SHA512 e043c3d43bb8f842e0b78d02d7ccaccce6c00a9c8abd7b63b21c4bab1000e5269708ca83677fe235260b12b1824ba5b06cb2c9460ddfc47fce10232d1901e4c8
-EBUILD libadwaita-1.1.3.ebuild 1475 BLAKE2B b969abf4eb5707559418fb6a0bdca401ed86103473e659747711ada6ba5fc4432088c2fe47beddeb2c7565f371869bd6a26118121a99ead3c7596ace56099953 SHA512 01791235bdc31b69a84db542c48144591e9c835ece11dbb3e93e46ee909989130b8b66377350ddf4175a88512b99130d20db13e4ff427bdf85f80fddcdabdc06
 EBUILD libadwaita-1.2.0.ebuild 1509 BLAKE2B 1ea4af48939430ad675ee37f246c17ee3dd5f30f8dc953621f735f1db17c2b038f1276c642000b7ce7b5f42fd83abf21352bbd60fc38fe6d4fa787d2e3b848ba SHA512 b0cc6d4b2c8816f9a983d2e814d70602b068ef1b8d133a76cec35c550415c8912576e0d4dd7b8a0eb4c4446c9293981d3c0d5e945dd473575c307b9f89dbe55c
 MISC metadata.xml 351 BLAKE2B ae57c9eb56cb12bf754b28c2e6620c09ad7ccc79396fd0476e99e52b93bf6d3900fc84ab55fdf11d98e59ed9e247cabf6f301d45bc5e4c453c0fcffc49b144cb SHA512 dc1333518d24d60f69a180ee7369c4b783f234bda36cd65ec66d483db86f3123eca5ed10cd8aadc7a183b707d698a159d7917f7ebd1c342c212f15e90cb8d5df
diff --git a/gui-libs/libadwaita/libadwaita-1.1.3.ebuild b/gui-libs/libadwaita/libadwaita-1.1.3.ebuild
deleted file mode 100644
index 981003be6f00..000000000000
--- a/gui-libs/libadwaita/libadwaita-1.1.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-VALA_MIN_API_VERSION="0.52"
-inherit gnome.org meson python-any-r1 vala virtualx
-
-DESCRIPTION="Building blocks for modern adaptive GNOME applications"
-HOMEPAGE="https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-IUSE="+introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-
-DEPEND="
-	>=dev-libs/glib-2.66:2
-	>=gui-libs/gtk-4.5.0:4[introspection?]
-	dev-libs/fribidi
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	vala? ( $(vala_depend) )
-	>=dev-util/meson-0.59.0
-	dev-util/glib-utils
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		-Dprofiling=false
-		$(meson_feature introspection)
-		$(meson_use vala vapi)
-		-Dgtk_doc=false # we ship pregenerated docs
-		$(meson_use test tests)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test --timeout-multiplier 2
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install libadwaita API docs unconditionally, but this is intentional
-	doins -r "${S}"/doc/libadwaita-1
-}
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 364f082188f6..8c2c64005a79 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,5 +1,3 @@
-DIST libhandy-1.6.3.tar.xz 1785692 BLAKE2B e48c8724a5298d61412562f4be00e7c3198dae896d143319adc3c84296f0ce1272a46b23e432df02f184a330c342ed6c34bc072fdcc648cbf1923aa17105b3bf SHA512 bf210bc49b512fe74438759e2b8238fbba9c8ccd57e96b7a72f484df080a407da56ffcacbef3265da8de6a1edc954d4b3d77eaddbd1f62141d41db5c17253b49
 DIST libhandy-1.8.0.tar.xz 1796032 BLAKE2B 15929cfde5e01b25e0ccc4dfa94bb0d12272b02a5c5196fcb3a85a898bf8384faa4101114e14f44d53f326fa5321254bba85e3c7f41e426ebd116e2d3dfd96ca SHA512 88f37d310ddc26a26612648d9f7beff6e77347a2cf59f682690dc838c3ec1bad9408ed39571c6cd779bea3d334a9c275ba3789d45c11c0a3e454617d41cc0035
-EBUILD libhandy-1.6.3.ebuild 1294 BLAKE2B 412ba84af345fbc9d9dcffcd66f072f0ff57de5a4f649ba08f7c990d93bd0cc9b45156c8ab36194516306f2d57550dc2098d20853e7bdb0510e96aeeb9140516 SHA512 9f4222a2a43aeed63b41e3518eef9214057875f9f22a2c70ee577b165c93f412a16d220d0f3cd9f536486eb7644935c6e66af0d55ee55a17019716c61230f438
 EBUILD libhandy-1.8.0.ebuild 1310 BLAKE2B 49bf62afa3ef7679b9cfa9a60b5254e1d07a24ad6cbec63f8e9dfb398f2782d530bf32c0b2ddb1d8cece613c2547ec22ebd8785fd140c4e08cbe06413aa09c9e SHA512 6a9720e795763215c4e3157049fdc53c1e5e3ef6df24f4da1e175a4e6d4fad8f563dcac41b9e11d1819604161c8cde7c3faf917d697a6585eaa5f0aaf196cea5
 MISC metadata.xml 453 BLAKE2B 3b7a719256d86a2cb3411691777d24bb9638760fc17312e299b9895c8a75e088a438db4a16cd81846564b655ea27bdd1f27b3220571b71a264e5171f22ebdac7 SHA512 8d2ffbe79d880deef5f132e3a10ecfa4a044553a075a63904b4938b15bb47104d2ea731bdc5472bfcb816c4fcca83453b81ec1b3dff29f3ce0968a79d22c5106
diff --git a/gui-libs/libhandy/libhandy-1.6.3.ebuild b/gui-libs/libhandy/libhandy-1.6.3.ebuild
deleted file mode 100644
index 7abe90532137..000000000000
--- a/gui-libs/libhandy/libhandy-1.6.3.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
-
-inherit gnome.org meson xdg vala virtualx
-
-DESCRIPTION="Building blocks for modern adaptive GNOME apps"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="examples glade gtk-doc +introspection test +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.24.1:3[introspection?]
-	glade? ( dev-util/glade:3.10= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1
-		app-text/docbook-xml-dtd:4.3 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dprofiling=false # -pg passing
-		$(meson_feature introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use test tests)
-		$(meson_use examples)
-		$(meson_feature glade glade_catalog)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/gui-libs/libpanel/Manifest b/gui-libs/libpanel/Manifest
index e3457374f2d0..96e3d93cad45 100644
--- a/gui-libs/libpanel/Manifest
+++ b/gui-libs/libpanel/Manifest
@@ -1,5 +1,3 @@
-DIST libpanel-1.0.1.tar.xz 100852 BLAKE2B a55ac6c7c441f5c487553052dca66dd4c1efe1cc010c7202c3400df1d3fc3cfc8f886afdd796981cf14800ad34e49b8efbd274f2f97bce19600b8935a2f1f595 SHA512 5592b01e3a8c532d40e2190d1b2c332d8a104946c0813156119be98d433cd946ad839308b166ebdc399b853809e2fde90be8ea3acced053c2f11b86807163627
 DIST libpanel-1.0.2.tar.xz 101032 BLAKE2B 965140df480b4d6aad1fb008b54ce4c46e78c50136c1bbe200430e97b1f9f2f399bedb8d8695ddfdaef80fdb544be181f3e1a97bd6a4ad7bcacc2a091e00448e SHA512 3c13d7842ba1f1dc1a4bbea3e47517fffe20205c6145812659c203d065523310f1a9b991d7a70454c1333332b25b3eb52835122df14b2993a395fd2aa6046dca
-EBUILD libpanel-1.0.1.ebuild 1116 BLAKE2B 18b587a2ad9cd6d6a70e195a95bd4e3d20d30120c94a4f66e89a1765793e4905f1dc1d516025c681447343315c0c81a0031a3b18e6f84c70eb77793a8e253405 SHA512 c29a3bc104f17e5a4f02944f99809ad77bf13e1c2fbd4f27793154e275ff19bdeb39b1f074c934e3ef85659a2f1f308c2f9001cf26352fa72437c42b98030f64
 EBUILD libpanel-1.0.2.ebuild 1116 BLAKE2B 18b587a2ad9cd6d6a70e195a95bd4e3d20d30120c94a4f66e89a1765793e4905f1dc1d516025c681447343315c0c81a0031a3b18e6f84c70eb77793a8e253405 SHA512 c29a3bc104f17e5a4f02944f99809ad77bf13e1c2fbd4f27793154e275ff19bdeb39b1f074c934e3ef85659a2f1f308c2f9001cf26352fa72437c42b98030f64
 MISC metadata.xml 349 BLAKE2B 6dd4e05099ea7fdf8c070ffbb273509583382a5b163575b7e7e5c8d18cf20e52b6721e291369b1ea8cabffdb8d55a25448ca17e491f919b062c0964f9bcb1690 SHA512 76847ef0c4a539327bc23d22a24e170b8afed19cf109fa6677140792fc0a6539e371385b6be856ee8b58bde59ec52855721d343ab9bb6635e738f6e8638ab715
diff --git a/gui-libs/libpanel/libpanel-1.0.1.ebuild b/gui-libs/libpanel/libpanel-1.0.1.ebuild
deleted file mode 100644
index 9faf973952bc..000000000000
--- a/gui-libs/libpanel/libpanel-1.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="A dock/panel library for GTK 4"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libpanel"
-
-LICENSE="LGPL-3+"
-SLOT="1"
-KEYWORDS="~amd64"
-
-IUSE="examples gtk-doc +introspection +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.72:2
-	>=gui-libs/gtk-4.6:4[introspection?]
-	>=gui-libs/libadwaita-1.0:1
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use examples install-examples)
-		$(meson_feature introspection)
-		$(meson_feature gtk-doc docs)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use gtk-doc; then
-		mkdir "${ED}"/usr/share/gtk-doc || die
-		mv "${ED}"/usr/share/doc/panel-1.0 "${ED}"/usr/share/gtk-doc/ || die
-	fi
-}
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index 4b1a9132cb38..92d051b52866 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,5 +1,3 @@
-DIST libwpe-1.12.3.tar.xz 55580 BLAKE2B 1e54b86e8d7ece6218e8ff7ac5d201365c858616ac07924e0d8f4fc45c247cf3193e9abf90cced11f7e2eafcfa4f59e17dd81f26ab772d06e56749ab90e4f433 SHA512 17c1df0da6f58549630f89e63c505e0710b027f4bdeb7c10dcf738a1971893cfb02ad83959b99f62581e04e7000e1cfac196dcb070da4cbc5c9790c4d567cdee
 DIST libwpe-1.14.0.tar.xz 62928 BLAKE2B 3d74d8282548048db0814b557c14ab170a3c7603014dc94e8a7f128f043f10fdfc3877c10bfffd655396f684b012dbb7e5a43ced6a164476f79ee3de7fcf92b8 SHA512 a443bc3777239140aff140a6b98595687aa50a3506e09d872cbabf843f5a6da575b90d0b3728062b7957b73c75778fc7d3a178d267b5ceca1da58e69f8ed9fed
-EBUILD libwpe-1.12.3.ebuild 583 BLAKE2B 749ec644f94a393c557e0ab07e8d37c5645431a9f8ec8a27a33b8d9e7aaa7e7081547b587b79e33dc6ba1c333b9aca5865851695efe1e89a8dcc365cc643abfc SHA512 92aba2fbb7316e6c766f37810783d1cb145733d0f4649c54cd81ccd1eb2a0515dc2ee0274b2596ce15162015a71bd84ca878b42143429cee4d9693de4ed91835
 EBUILD libwpe-1.14.0.ebuild 610 BLAKE2B fbeeb71a20951e7d4001249bbeed4d483a2c9b6b04a192cfaca5ef0feffa67ebc518fa47c8020d04935d9f4c2d3428de9a143db59d7812bcf22d06fee2617836 SHA512 13024c84997daff5d730be6efebad6a180aeb8e916370e697d917e650238a28254bda0403e046cd2351d360052c18916987a1b546fae826b430e1a5190e8e28c
 MISC metadata.xml 358 BLAKE2B d4e80fdffa433298c517d9c0bafbef96bfb06cf0938b951e89349089c4bd651d7697133b16aaa9a99c99478ae4c02526a642e91b3934a0fbea762e08a997a75b SHA512 48a741a24d3bf6661b9656906c16625751360787116da9990e70f59a4d79bad35d93fa770b7dc85587c83d3304eb6002346378bb22c251bc54d7d7d8d2926c50
diff --git a/gui-libs/libwpe/libwpe-1.12.3.ebuild b/gui-libs/libwpe/libwpe-1.12.3.ebuild
deleted file mode 100644
index 010542306661..000000000000
--- a/gui-libs/libwpe/libwpe-1.12.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Platform-agnostic interfaces for WPE WebKit"
-HOMEPAGE="https://wpewebkit.org/"
-SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="1.0"
-
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	media-libs/mesa[egl(+)]
-	x11-libs/libxkbcommon
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dbuild-docs=false # hotdoc not packaged
-	)
-	meson_src_configure
-}
diff --git a/gui-libs/vte-common/Manifest b/gui-libs/vte-common/Manifest
index 77df9ac6ed8f..3c8b838731c0 100644
--- a/gui-libs/vte-common/Manifest
+++ b/gui-libs/vte-common/Manifest
@@ -1,8 +1,6 @@
 AUX vte-common-0.70.0-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2d95448f4ff7031142050e9286ff854a19095bb56cec471d50585302ac08ca7a1d40ad068c013d8af142b0165d4c8d2112 SHA512 a3dd31fb4fcc9c2e725cfd64bbc63def63c1c1a85b6896b4a82083d6ff985df885c3a587e8c3c001de2acae476cb950f05a1e31b33bb263ba4895d25fa1e275b
-DIST vte-0.70.0.tar.bz2 499283 BLAKE2B 694cf4dfee334e9b54bb8e47f862167acbb8ffc7ac8e81889acd4786449cb45944a87a5adaa036f46458c350ca2119bb356e90dfa71f03638c9c2b14d2ccb877 SHA512 362b71296ae39a16b55402f524a39b063f66ae237e6e161ccc89ca2bb1f2a5c43f4d706d9f3bfae12a99fdb81c4e70408c7f3eca2c01316950b0a3a1a1d79423
 DIST vte-0.70.1.tar.bz2 502044 BLAKE2B 0a9ce43c1863e823fcd073fd30fb6b2cb39e9168e850796fe12be2b9bdfc0b24ceea974b4c94bcdd10f2225613990e0e079194380241b7e625cb6dc4309a7476 SHA512 88de629b382eca8a42199b2ba9b248e231817e1de7183417aed150bcf61530084f7177d73dee9aab25fe4c3ab80d795b5fdcae336687560d3b582bd04181353d
 DIST vte-0.70.2.tar.bz2 502395 BLAKE2B ae127d8262c7038b3a2cda9a9622e9a075dfc1e06a7710810a4bb894a6646155790776553f663677cb86c3479e6d3faf92c38b5b97dd6970df37cee92dd963fa SHA512 1e113da0591830c057358dd78cfe2f814dd0bfabd037973369266823a9a4936a200b5b23faab3757ced4d08aa96a76d6b1120419815a181598493e35d2ea58d0
-EBUILD vte-common-0.70.0.ebuild 1875 BLAKE2B 33d970a32aa2880b787e24e295e55132c6ec47094d418a2c9033709507561b6e69d603d744b60bd8b821e1337c8f0e4e89a5b9251f86fadda88dbc53dfee08e8 SHA512 738d0259ebd7b68d15c682159f3cd40267e593ce9728474b8e4c5d6031e85b18f7f7508c2debdafe80948cd9dd05b44441a8ceaae715b676fc649a598ce23439
 EBUILD vte-common-0.70.1.ebuild 1930 BLAKE2B d25a4e21e0fbf154f45cf90ecf458f95bee4bffbf0544642f8b69c3997c170c3fcc30d684afb57c0d9ad5197b6bd6a692e6ed80d012f9a4875b15bbbc127e148 SHA512 51c987b876433b6da66470ba60f548cd6062e6e9ff94fe61d6f6315a7d746106a15c2e0f07d88e0d6fb7ddeae23b62ed2c1929fc7f52df0a46e3dfdbfc608a64
 EBUILD vte-common-0.70.2.ebuild 1895 BLAKE2B 39c24b684b05a46b91760ca1b94df6384542375334aa8d38f8c7a73ce8e36161703c69cab8a3b02b7fc8ea36af592457d09bdb670534a24224cd859205b7a374 SHA512 01639340ed37a8b59099874ac89ecc79c45e12e6379756f299a07e0cec26a215917ad3414d4d75593c9f6bed6fe39a2e87f6971acc01000c489a650eb15c4732
 MISC metadata.xml 524 BLAKE2B 2a7e14b63adff1385d2a1260d238c0f35854cbd7ba0579a55edf0c6367e37fba80c99fa21b911279c6b7eb7ff4d122f56d02cfc463076614adec2eb059666b68 SHA512 60c71846ff7745c3f3d4c2fb0c9b0214c7fef04d221d2b7e568d1a63b2bff56d49a442072aa5aba48b9247c1a60b1cdf3ca8e3766986e9ef1a38ee659fb65437
diff --git a/gui-libs/vte-common/vte-common-0.70.0.ebuild b/gui-libs/vte-common/vte-common-0.70.0.ebuild
deleted file mode 100644
index 23bef45e9c29..000000000000
--- a/gui-libs/vte-common/vte-common-0.70.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org meson python-any-r1
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte"
-
-# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
-LICENSE="LGPL-3+ GPL-3+"
-SLOT="2.91" # vte_api_version in meson.build
-IUSE="systemd"
-KEYWORDS="~amd64"
-
-# Upstream is hostile and refuses to upload tarballs.
-SRC_URI="https://gitlab.gnome.org/GNOME/vte/-/archive/${PV}/vte-${PV}.tar.bz2"
-
-DEPEND="
-	|| ( >=gui-libs/gtk-4.0.1:4 >=x11-libs/gtk+-3.24.22:3 )
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21
-	systemd? ( >=sys-apps/systemd-220:= )
-	sys-libs/zlib
-	x11-libs/pango
-"
-RDEPEND="
-	!<x11-libs/vte-0.70.0
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/vte-0.70.0"
-
-src_prepare() {
-	default
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.70.0-musl-W_EXITCODE.patch
-}
-
-src_configure() {
-	local emesonargs=(
-		-Da11y=false
-		-Ddebugg=false
-		-Ddocs=false
-		-Dgir=false
-		-Dfribidi=true # pulled in by pango anyhow
-		-Dglade=false
-		-Dgnutls=false
-		-Dgtk3=false
-		-Dgtk4=false
-		-Dicu=false
-		$(meson_use systemd _systemd)
-		-Dvapi=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	exeinto /usr/libexec/
-	doexe "${BUILD_DIR}"/src/vte-urlencode-cwd
-	insinto /etc/profile.d/
-	newins "${BUILD_DIR}"/src/vte.sh vte-${SLOT}.sh
-	newins "${BUILD_DIR}"/src/vte.csh vte-${SLOT}.csh
-	if  use systemd; then
-		insinto /usr/lib/systemd/user/vte-spawn-.scode.d/
-		newins "${S}"/src/vte-spawn-.scope.conf defaults.conf
-	fi
-	einstalldocs
-}
diff --git a/gui-libs/vte/Manifest b/gui-libs/vte/Manifest
index 969baa49489c..16e4c6dd8921 100644
--- a/gui-libs/vte/Manifest
+++ b/gui-libs/vte/Manifest
@@ -1,9 +1,7 @@
 AUX vte-0.66.2-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2d95448f4ff7031142050e9286ff854a19095bb56cec471d50585302ac08ca7a1d40ad068c013d8af142b0165d4c8d2112 SHA512 a3dd31fb4fcc9c2e725cfd64bbc63def63c1c1a85b6896b4a82083d6ff985df885c3a587e8c3c001de2acae476cb950f05a1e31b33bb263ba4895d25fa1e275b
 DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c3b0e5586ac80204cef8840fda935204cbc480fec1193e2a0a2782f98e2b094c3caebbfe61cf18631b16921df05cf3808afd22 SHA512 92123e7f5cb6ef876f2b2b108dbef59bce212efebd64cd790d49d9ee3215344acd848eec5d326fe2c3bd236846ed3b896148024390093491b2f6e2f7c46e2bd1
-DIST vte-0.70.0.tar.bz2 499283 BLAKE2B 694cf4dfee334e9b54bb8e47f862167acbb8ffc7ac8e81889acd4786449cb45944a87a5adaa036f46458c350ca2119bb356e90dfa71f03638c9c2b14d2ccb877 SHA512 362b71296ae39a16b55402f524a39b063f66ae237e6e161ccc89ca2bb1f2a5c43f4d706d9f3bfae12a99fdb81c4e70408c7f3eca2c01316950b0a3a1a1d79423
 DIST vte-0.70.1.tar.bz2 502044 BLAKE2B 0a9ce43c1863e823fcd073fd30fb6b2cb39e9168e850796fe12be2b9bdfc0b24ceea974b4c94bcdd10f2225613990e0e079194380241b7e625cb6dc4309a7476 SHA512 88de629b382eca8a42199b2ba9b248e231817e1de7183417aed150bcf61530084f7177d73dee9aab25fe4c3ab80d795b5fdcae336687560d3b582bd04181353d
 DIST vte-0.70.2.tar.bz2 502395 BLAKE2B ae127d8262c7038b3a2cda9a9622e9a075dfc1e06a7710810a4bb894a6646155790776553f663677cb86c3479e6d3faf92c38b5b97dd6970df37cee92dd963fa SHA512 1e113da0591830c057358dd78cfe2f814dd0bfabd037973369266823a9a4936a200b5b23faab3757ced4d08aa96a76d6b1120419815a181598493e35d2ea58d0
-EBUILD vte-0.70.0.ebuild 3174 BLAKE2B 530bb2dfcbd6f6ffca44a159ff81c985d44b38ced9b20b8d3a03fa7f77d10dc56d80f3eef72af204db70f7321d74255fa369d8d7bd4346b720ae910fa45ad0cc SHA512 1f94cf039a34b63a10c37e9157b221dae4726cb2d1685460bf86f60ac66abd09645cd63225d85e28641f1a938c5a76cfc1eebeba85a6d4d5c90e7a500ee9b6f6
 EBUILD vte-0.70.1.ebuild 3229 BLAKE2B c1b6ff5632939c5f4b98ed334317d7964abfa9a24b856b3e28a0025da4954ba4b0876970e2140f502f2addbab8b8e088f9454d1e5e88eb88529999107df26bb9 SHA512 70998abd4db6e2a54d273c1982eaa9e980c90261ee637a715cedb1b4c335a231cc7ad55650c858c46f942e0829e898f6904e36dec26ef45e4d68aa121d157c81
 EBUILD vte-0.70.2.ebuild 3195 BLAKE2B ae390bab04b0fb13a0fcd7a00e161f24bd3a142376427b9a7d87a20a9cf1d3b43f301153632fc225503ca3c3711d5a86c66ec9e7510ff85ae21c1054136fefeb SHA512 68be719825737afd27262ec8ec21a23a1edc69dcdf1d252dff1c73e4033279bf62c65d20c73661da2cbbf982e56ba87d40becc7c4991ae05ba009b105d91f179
 MISC metadata.xml 612 BLAKE2B 3243ec48375bf8e69a367e5d631cf84c0ba60b43d1f4a25c313a407bfb1c9826ddd1cd75784bc302e7d8998d1bedaac9d75c7f329255e605315d9f0bf6154a73 SHA512 0abc6f1deb0a7900b6b35620ad3dfa26a900445526cc6474f974ce5cca2dad65cb3f3c4e3b8a59540821a9922e2cafcc7011d705570e77d2a46c907f3962a73d
diff --git a/gui-libs/vte/vte-0.70.0.ebuild b/gui-libs/vte/vte-0.70.0.ebuild
deleted file mode 100644
index 8f8f7969670b..000000000000
--- a/gui-libs/vte/vte-0.70.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte"
-
-# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
-LICENSE="LGPL-3+ GPL-3+"
-SLOT="2.91-gtk4" # vte_api_version + "-gtk4" in meson.build
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~amd64"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-
-# Upstream is hostile and refuses to upload tarballs.
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.70.0-command-notify.patch.xz )"
-
-DEPEND="
-	>=gui-libs/gtk-4.0.1:4[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.52:2
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21:=
-	systemd? ( >=sys-apps/systemd-220:= )
-	sys-libs/zlib
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	x11-libs/pango[introspection?]
-"
-RDEPEND="${DEPEND}
-	~gui-libs/vte-common-${PV}[systemd?]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? ( dev-util/gi-docgen )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
-
-	if ! use vanilla; then
-		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${PN}-0.70.0-command-notify.patch
-	fi
-
-	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
-	sed -e '/ggdb3/d' -i meson.build || die
-	sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk4_api_name/' meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Da11y=true
-		$(meson_use debug debugg)
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dfribidi=true # pulled in by pango anyhow
-		-Dglade=true
-		$(meson_use crypt gnutls)
-		-Dgtk3=false
-		-Dgtk4=true
-		$(meson_use icu)
-		$(meson_use systemd _systemd)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with x11-libs/vte
-	# Remove files that are provided by gui-libs/vte-common
-	rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
-	rm "${ED}"/etc/profile.d/vte.sh || die
-	rm "${ED}"/etc/profile.d/vte.csh || die
-	if use systemd; then
-		rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
-	fi
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
-		mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/ || die
-	fi
-}
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index 9b73cc45c2da..dd866e9b0a56 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,5 +1,3 @@
-DIST wpebackend-fdo-1.12.1.tar.xz 43148 BLAKE2B 3d666cdcd68c3b9356ec58020502bf4d61c0d8651b9dcc646f50ba63aa336e475a47627712678e4a192e0502cd86ea030613199503b056efe4c7afa3a49e0490 SHA512 0464ab4eb634390591b8cc09bc3db6a3a816c68aef6f9140012230e8dba9550e44bdc4f9008ea3fecfcc5f441306d6c4d91e6f693398179ee8bf7516dd58875b
 DIST wpebackend-fdo-1.14.0.tar.xz 43068 BLAKE2B e5b06e7313a0122578fd668cb17a0f28e8f67ba4831b80616979ebedf15ee4fde94f610b5c7e4831ce90c51e11573ff8fc8f4970237230f5d3184b8aead21ce6 SHA512 9eda873adda854e1e498236215b7e240076caca52adca4f60277fb26db8ae9e6436b27a9b25ebf95612835acad82b764ccd21d8ae997e8802665dd79251083d6
-EBUILD wpebackend-fdo-1.12.1.ebuild 660 BLAKE2B 8bbdf236d6065d19832bd9e4eb37e628ce2dfa4e603454462fe4f0caaa65d71767276720e3e1f98b6a1d04c8187bd1c48c5ded29d49a599a84590c80ac9672b6 SHA512 c0273b1a3c331ae0f6794ea16ec7b7f0a79c46cfa6d840ef72b6789c5af939914da07751ea33e99dc447e95dfbcea5579f93e9c73dfd94a516d40de7a6700bf4
 EBUILD wpebackend-fdo-1.14.0.ebuild 667 BLAKE2B 6ffcfbb980921cc47cdda79aa761113ed744738f8f753abaf232d3505b8ab51d028b20a51e6abc114f4bc84447ef6ca9a87ec1441c815d5069588327f71f9e39 SHA512 3817365bb335d63365aba4ef2b7464b70783a53d5b0d341af3ff2df8604922dda845389af4e37cd9ceda101ffb2e353f01ffe25cc345c5b7b29977205170f72d
 MISC metadata.xml 350 BLAKE2B df50880a0744703272cd3aecfb9dae45d62e4233a0c5b3e1fdc06b1d05f814bd57c8b1a4b20cd88a97bc2c22a22bd84befd15c9c3ab094aeeae97346d8713ed0 SHA512 a1bdbe1182fd4545bd83a55d589dd17dce2b306510763f2305e7e43dba6c28c7c5cb85628ccc7eb3ce763b694f0b1b172b19d5aa72ad4c686e600d6ba4ebe765
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.1.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.1.ebuild
deleted file mode 100644
index d4bc83f4e2e5..000000000000
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="WPE backend designed for Linux desktop systems"
-HOMEPAGE="https://wpewebkit.org/"
-SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="1.0"
-
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	media-libs/libepoxy[egl]
-	dev-libs/glib:2
-	>=dev-libs/wayland-1.10
-	>=gui-libs/libwpe-1.6:1.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dbuild_docs=false # hotdoc not packaged
-	)
-
-	meson_src_configure
-}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 8929b9103fcc..61d84182e0d4 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 24c959058047..0a812d60cfda 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,11 +1,7 @@
 AUX 3.44.4-I-1969-EShellWindow-The-New-menu-is-not-filled-after.patch 3533 BLAKE2B 299189598870deb1031f1c060b96727c03f26bf5a92a91eab2bd1e174d68d572cd3418bc298387a00b9096d1c17db144d97124d7ec46a948d1fa402d1e43ed8d SHA512 6f235d034f92efc91be319709728436f3cd109fcdcea4432f6c96f8da94b66b6e45681907a59a098eb949bed1188d6714bbb5476ae924e858c8f5f0f28179166
 AUX 3.44.4-I-2001-Mail-Update-preview-s-iframe-height-to-match-.patch 13915 BLAKE2B 6d75a8a8d9097e74712149d48cb2872de1aaa39290c37ef371c7be45ed783c1c88d6fdf1f60015848b149f4f2c92e6931a4e20b0a9e7af444180d0b3cb7690e5 SHA512 f679b25d5b0f257c3a5aee5a6fc8fa26776e2f11a3874a91a26772b8ebe98b5cb3e1058d17faa0336fbb28a714e6ab28ef6cc5666ce4d1b63ac0ba6ef5e81220
 DIST evolution-3.44.4.tar.xz 13130588 BLAKE2B ffb6da420acbf7be7e5eb6fad44bcb9f00e9c52f99314a4f8e8e35e898eaac8a8fdc511328fd519fed5ac9ef98e63e326cfc7dde324919c1cc6e60ff17b3ad76 SHA512 1c2a30e00e4f9226ced2617cf5a69f33db914d5a94dd22223c9dc12e635952a52e2fac395d49de70c70c21004fb0d87e3ba81725aff924bb0b386ffb4901d058
-DIST evolution-3.46.0.tar.xz 13286524 BLAKE2B b9c9605d3d0fa697832fc181f25f85cccee0c1d2b37578221e0a7632b1daab4c21fbfa13142ef2ec24a4da4c7c39e182b912d803ee2ab1a9e36e7fe634d109f8 SHA512 58b532711196e7c79cffa2357245743562a94fd9629718066ba16a26889fb45f94992e4cc3cf0d3911356b700abecb05099c5c854749db282a241321c0d0c605
-DIST evolution-3.46.1.tar.xz 13287436 BLAKE2B 16e8fd77d7c1db2b1b04a4455e84054acbf8f03fb2eaadf072c4a1965b4527e709f6cdcc9f5762d8a5ed2757bedfc20e390466ce4c87437d7fc6755e2f205d30 SHA512 20b6a5663ec6ab43af6ec7c15a64b1d1070f8488aaebd3fbaca4b4cc8b70bf4b8087b047e5b75e37273818b8d1d6bde5139c708284626e9d3c15b83dc09f5d3b
 DIST evolution-3.46.2.tar.xz 13295660 BLAKE2B 7dda0049f8579cef35367435f90e31977d33b389fe823bc5e7677566bd6d3d73ef414b3419041c9183f4fc9e95ff944e5a8664445f8371c5518e40703bca8981 SHA512 f5621640503a36ee00cce4f7075d58e743c7438e019d6a26883315ea24b90c4d92c37d9c8b6d97315f5388d14aa21911883e2d06ad5a66ca20568d13cab45734
 EBUILD evolution-3.44.4-r4.ebuild 4271 BLAKE2B 06acf352f5365427448ccda1bb9cccfec50f56ef0d55bbf5b56bfe4f58d6de606ffc4af4392f4c9b805a48fefe4322c4a62ae87eb46c6c04d5c672ec6c162a89 SHA512 27a1e3ce07b730f6e2c6df74bfc2b2295bd458027f36d7e9f88846223ac1b119a5ca7a0de33f9bfb6b8bfc05108018dc615b69159ddf145386c97eeca18129e2
-EBUILD evolution-3.46.0.ebuild 4072 BLAKE2B 0eaafdd5859603750ad332269b8636abc369b9bea4c3baeb34871928eda0755f7707b0dca4a60bd2b501844d825f752373af52b65fee8254d7f173bd5c52dbd6 SHA512 8f87c2364be09526fdae555607b3e0a9b19c343f4b587ccab29a2b54f991743d336f2543f00c2a6d6928401f8e09486105a740f8747fe41a105e11ea238074e7
-EBUILD evolution-3.46.1.ebuild 4122 BLAKE2B 8409313d373cfe6fdfe0d916683c4dede1d1acc50a81b019da1dadeaaffd2f524eeaf5fcca20c480491d59fb8dd12951239e9752330ce22f9ec7ce88faaffbc8 SHA512 4c0772917fd5708a1afa92378ba6a6de5d4ed89ac7f5b36acca9425e2fdc657f9fa814a6d12e54f58939f65913b64ca139a0ada1ced0806c0991a64ba38f0ede
 EBUILD evolution-3.46.2.ebuild 4104 BLAKE2B 9c3bfe86cb59e07fc7546029a18ff1a5ce5a2810ce25e0a68378c38e63588964a00d573962cb1aa9a8951550c757195d45182d292192ed8a649a6b85f9492a94 SHA512 d0fa945b64c0e3b74ecefe43b67af032e8acd87f68f7e41029cef8be325abc522c315019222c676618458be2e18c30dd3de1554afa492a6d9633561e36ef5ded
 MISC metadata.xml 1174 BLAKE2B 745a372088a3891dee71c205ef8d512df56e338ca41cd91d861938447e1cf42f0305fe27e385b7e4f391dd26cbd5173bdba9e158b65cec1260fe9c45382465c4 SHA512 d19c6775d576c35458674c301bfc5502e1f8f62cee76fe46aa749507fd9c2a1494a21a6c9a5886f8ca7e3b2e107b3e28dee448c8ecbd999cf3c3bb800c03f405
diff --git a/mail-client/evolution/evolution-3.46.0.ebuild b/mail-client/evolution/evolution-3.46.0.ebuild
deleted file mode 100644
index 2345be6cd85e..000000000000
--- a/mail-client/evolution/evolution-3.46.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gnome2 readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-
-IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitely needed for backup plugin
-# gnome-desktop support is optional with --enable-gnome-desktop
-# automagic libunity dep
-# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
-DEPEND="
-	>=app-text/enchant-2.2.0:2
-	>=dev-db/sqlite-3.7.17
-	>=dev-libs/glib-2.66:2[dbus]
-	>=dev-libs/libxml2-2.7.3:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/libsoup-3.0:3.0
-	>=net-libs/webkit-gtk-2.38.0:4.1=[spell?]
-	>=x11-libs/cairo-1.9.15[glib]
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libnotify-0.7
-	>=x11-misc/shared-mime-info-0.22
-
-	app-text/cmark:=
-	>=app-text/iso-codes-0.49
-	dev-libs/atk
-	gnome-base/dconf
-	x11-libs/libSM
-	x11-libs/libICE
-
-	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
-	bogofilter? ( mail-filter/bogofilter )
-	geolocation? (
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.26.3:2 )
-	ldap? ( >=net-nds/openldap-2:= )
-	spamassassin? ( mail-filter/spamassassin )
-	spell? ( >=app-text/gspell-1.8:= )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11
-	)
-	weather? (
-		>=dev-libs/libgweather-4.2.0:4=
-		>=sci-geosciences/geocode-glib-3.26.3:2
-	)
-	ytnef? ( net-mail/ytnef )
-"
-RDEPEND="${DEPEND}
-	highlight? ( app-text/highlight )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DENABLE_SMIME=$(usex ssl)
-		-DENABLE_GNOME_DESKTOP=ON
-		-DWITH_ENCHANT_VERSION=2
-		-DENABLE_CANBERRA=ON
-		-DENABLE_AUTOAR=$(usex archive)
-		-DWITH_HELP=ON
-		-DENABLE_YTNEF=OFF
-		-DWITH_BOGOFILTER=$(usex bogofilter)
-		-DWITH_SPAMASSASSIN=$(usex spamassassin)
-		-DENABLE_GSPELL=$(usex spell)
-		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_CONTACT_MAPS=OFF # was $(usex geolocation), this will come back libchamplain gets it's libsoup3 port
-		-DENABLE_YTNEF=$(usex ytnef)
-		-DENABLE_PST_IMPORT=OFF
-		-DWITH_GLADE_CATALOG=OFF
-		-DENABLE_MARKDOWN=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/evolution-3.46.1.ebuild b/mail-client/evolution/evolution-3.46.1.ebuild
deleted file mode 100644
index b9d659b7c751..000000000000
--- a/mail-client/evolution/evolution-3.46.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gnome2 readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-
-IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitely needed for backup plugin
-# gnome-desktop support is optional with --enable-gnome-desktop
-# automagic libunity dep
-# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
-DEPEND="
-	>=app-text/enchant-2.2.0:2
-	>=dev-db/sqlite-3.7.17
-	>=dev-libs/glib-2.66:2[dbus]
-	>=dev-libs/libxml2-2.7.3:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/libsoup-3.0:3.0
-	>=net-libs/webkit-gtk-2.38.0:4.1=[spell?]
-	>=x11-libs/cairo-1.9.15[glib]
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libnotify-0.7
-	>=x11-misc/shared-mime-info-0.22
-
-	app-text/cmark:=
-	>=app-text/iso-codes-0.49
-	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk )
-
-	gnome-base/dconf
-	x11-libs/libSM
-	x11-libs/libICE
-
-	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
-	bogofilter? ( mail-filter/bogofilter )
-	geolocation? (
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.26.3:2 )
-	ldap? ( >=net-nds/openldap-2:= )
-	spamassassin? ( mail-filter/spamassassin )
-	spell? ( >=app-text/gspell-1.8:= )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11
-	)
-	weather? (
-		>=dev-libs/libgweather-4.2.0:4=
-		>=sci-geosciences/geocode-glib-3.26.3:2
-	)
-	ytnef? ( net-mail/ytnef )
-"
-RDEPEND="${DEPEND}
-	highlight? ( app-text/highlight )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DENABLE_SMIME=$(usex ssl)
-		-DENABLE_GNOME_DESKTOP=ON
-		-DWITH_ENCHANT_VERSION=2
-		-DENABLE_CANBERRA=ON
-		-DENABLE_AUTOAR=$(usex archive)
-		-DWITH_HELP=ON
-		-DENABLE_YTNEF=OFF
-		-DWITH_BOGOFILTER=$(usex bogofilter)
-		-DWITH_SPAMASSASSIN=$(usex spamassassin)
-		-DENABLE_GSPELL=$(usex spell)
-		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_CONTACT_MAPS=OFF # was $(usex geolocation), this will come back libchamplain gets it's libsoup3 port
-		-DENABLE_YTNEF=$(usex ytnef)
-		-DENABLE_PST_IMPORT=OFF
-		-DWITH_GLADE_CATALOG=OFF
-		-DENABLE_MARKDOWN=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index f44eced512b5..ff06e138b147 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,8 +1,3 @@
-AUX 40.0-Correct-the-conditional-comments-in-the-test-data.patch 1459 BLAKE2B 369acfc1401acefa1ae543eb840171dc821ef3f82080ec943efbb95bc50d1e96ff94dabf7b045c8e8099a3e124610975a1932125130f01fe24a74577ca91fde3 SHA512 03eb40f1ec3d17503f7ece68f03c48868a27265ef74fd7b2a8c2b6523f75b2155260db136ac4fab971292fd33c580a453b8b65664b4609442a700128e38f991f
-AUX 40.0-Fix-accessibility-issues-with-initializer-of-constan.patch 1386 BLAKE2B e7d0a5488a41c80e08073479bfb030148de6e0031532bc322073d71bf503e5c963a24ae7fec571ff0a21b3109d84933f0bef4d95a0d00d7cfd6e1fda98c10e71 SHA512 ef2b8435f13d1a5c144372f925cf6517eabf3db0f092eea04f1f0df9ef10cb1c9e6ff1ff7bb2f7c965789bd3dae7ed92cc4bc0cd1a1ce28c188b350506998df4
-AUX 40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch 849 BLAKE2B 618a25a934d92c2ea4cb2c06d05ab99e9e6ecffc782bedc8de659b084a21d4ea6e37b13a8067b3d85e45d9b9b295843372c7eb988ee5fb67f849d7de0c36deef SHA512 e657bd88cf39d715190dbce1fb8d93df2c91e7f2b7c6d1dd4ed02d177e650195fd179f23440559e84b1f5dfd0ee35e9ea75cdd4a76810f2ebfa8db7b3f9280b2
-DIST geary-40.0.tar.xz 2490940 BLAKE2B 67ff23f9a6f4760947b5d9ac3167ffb91539af7e0afbde2c6bc7b35adbf286868f24ed74b932412e9c039ab4e2e71b4162e08e8bd31fa3abc02d10fb9c1ce47d SHA512 d31716121be63a9d39caf4bffacce0109cebcc8048127c37fac6969b4103ab2cf12aac9bed73623b0f3baf7f39996b8f0b0fe9b57968054d51ae3e209f6b1522
 DIST geary-43.0.tar.xz 2476748 BLAKE2B 760820be83deae838a09c55adc4416348259073be26359bbf10e7998d8d794bd519b8601d79ff15f7980f87d68cdd1603188244b9931c227205f1db1ed014668 SHA512 71bf774aa27d4edef61932197bbf9b58b67ace8dd7969c4669fcd45e33c05a08d3d6eae280ea6a7e9f58db626f541f15b0f0d33f3162bef5fd21a368122dbba0
-EBUILD geary-40.0-r2.ebuild 2450 BLAKE2B 44fcb9c2f422165bee0b0379c925a190ab03e24a6294c2d005cd825410d5b90158854aa5522445bda80b5039c315aa0c7b8e373848b45d99ba76ed82ea9b85c0 SHA512 2aa0b488ef35199f4c79e561cbb7fa6183c3139c79a40426bd4334c91f6e3919ccbdd8fe5adaba69f428aa7a9de7cb8fd0065a623be549090eced35a51f49166
 EBUILD geary-43.0.ebuild 2144 BLAKE2B 66136d0d6f8d2b2d8bccb87e2087d02100b1db25e3060decca47620706764a18b07fa5b369be7334816fbf84a6ddf4cf81d7c12c42ae70af3df751cbb6123828 SHA512 b613944dbcb19b87c9e7c497f44dec01a31f49b5133711a02a60ea0e1b2fe8eac3f22dd974c0f45766895399ec4cfbdada2ad973b2b5c8beba7eedfddab9f606
 MISC metadata.xml 473 BLAKE2B d41a2598f4175613cfda39124c2954032d9868b6a18e9087aeb3a6ffdad736398400be4ec05fac9ec2e77ee8bab1e1c4d3a651fbdb713905527e61c9a2c407e4 SHA512 1b91b4c09e832cc0c91543125423985b73ba01a085fedd24c72e0ed5559cca2463be554c1b8c4f0d0278a6f66ce979126b4ee8d6413e9570e7e671badc20cc15
diff --git a/mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch b/mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch
deleted file mode 100644
index 5c01bf9a32f7..000000000000
--- a/mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8fb10db1de1fac2ca99fab246a276620ffd6f02b Mon Sep 17 00:00:00 2001
-From: Richard Adenling <dreeze@gmail.com>
-Date: Tue, 10 May 2022 21:18:01 +0200
-Subject: [PATCH] Correct the conditional comments in the test data
-
-This fixes the problem with libxml2 2.9.14 not considering <![ to be a
-valid way to open a tag anymore.
-
-Closes #1367
----
- test/engine/rfc822/rfc822-message-data-test.vala | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/engine/rfc822/rfc822-message-data-test.vala b/test/engine/rfc822/rfc822-message-data-test.vala
-index 613e4b9a..d5e25ea0 100644
---- a/test/engine/rfc822/rfc822-message-data-test.vala
-+++ b/test/engine/rfc822/rfc822-message-data-test.vala
-@@ -763,7 +763,7 @@ ttp://p.ebaystatic.com/aw/email/Welcome_Day_0/spacer.gif" width=3D"5" heigh=
- t=3D"1" alt=3D"" border=3D"0" style=3D"display:block; width: 5px !important=
- "></td>
- </tr>
--<![if ! gte mso 9]>
-+<!--[if ! gte mso 9]>
- <tr>
- <td style=3D"border-collapse: collapse !important;
- border-spacing: 0; !important; padding: 0"><img src=3D"http://p.ebaystatic.=
-@@ -803,7 +803,7 @@ ttp://p.ebaystatic.com/aw/email/Welcome_Day_0/spacer.gif" width=3D"5" heigh=
- t=3D"1" alt=3D"" border=3D"0" style=3D"display:block; width: 5px !important=
- "></td>
- </tr>
--<![if ! gte mso 9]>
-+<!--[if ! gte mso 9]>
- <tr>
- <td style=3D"border-collapse: collapse !important;
- border-spacing: 0; !important; padding: 0"><img src=3D"http://p.ebaystatic.=
--- 
-2.35.1
-
diff --git a/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch b/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch
deleted file mode 100644
index 3772fe81c99a..000000000000
--- a/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 30 Nov 2021 15:31:31 +0100
-Subject: [PATCH] Fix accessibility issues with initializer of constants
-
----
- src/client/application/application-client.vala | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
-index 6ce19ce2..e6ba8533 100644
---- a/src/client/application/application-client.vala
-+++ b/src/client/application/application-client.vala
-@@ -8,16 +8,16 @@
- 
- // Defined by CMake build script.
- extern const string GETTEXT_PACKAGE;
--extern const string _APP_ID;
--extern const string _BUILD_ROOT_DIR;
--extern const string _GSETTINGS_DIR;
--extern const string _INSTALL_PREFIX;
--extern const string _NAME_SUFFIX;
-+public extern const string _APP_ID;
-+public extern const string _BUILD_ROOT_DIR;
-+public extern const string _GSETTINGS_DIR;
-+public extern const string _INSTALL_PREFIX;
-+public extern const string _NAME_SUFFIX;
- extern const string _PLUGINS_DIR;
- extern const string _PROFILE;
- extern const string _REVNO;
--extern const string _SOURCE_ROOT_DIR;
--extern const string _VERSION;
-+public extern const string _SOURCE_ROOT_DIR;
-+public extern const string _VERSION;
- extern const string _WEB_EXTENSIONS_DIR;
- 
- 
--- 
-2.35.1
-
diff --git a/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch b/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
deleted file mode 100644
index 4b9ecbec18b5..000000000000
--- a/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sun, 30 Jan 2022 19:54:11 +0100
-Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument
-
----
- src/client/util/util-cache.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
-index f054e32e..ecc275e8 100644
---- a/src/client/util/util-cache.vala
-+++ b/src/client/util/util-cache.vala
-@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
-     private class CacheEntry<T> {
- 
- 
--        public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
-+        public static int lru_compare(CacheEntry a, CacheEntry b) {
-             if (a.key == b.key) {
-                 return 0;
-             }
--- 
-2.35.1
-
diff --git a/mail-client/geary/geary-40.0-r2.ebuild b/mail-client/geary/geary-40.0-r2.ebuild
deleted file mode 100644
index 6b149be7cd8b..000000000000
--- a/mail-client/geary/geary-40.0-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
-
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
-
-LICENSE="LGPL-2.1+ CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, CC licenses for some icons
-SLOT="0"
-IUSE="test ytnef"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# >=gspell-1.7 dep to ensure all libraries used use enchant:2
-DEPEND="
-	>=dev-libs/glib-2.66:2
-	>=x11-libs/gtk+-3.24.23:3
-	>=net-libs/webkit-gtk-2.30:4=
-	>=dev-libs/gmime-3.2.4:3.0
-	>=dev-db/sqlite-3.24:3
-
-	x11-libs/cairo[glib]
-	app-text/enchant:2
-	>=dev-libs/folks-0.11:0=
-	>=app-crypt/gcr-3.10.1:0=
-	>=dev-libs/libgee-0.8.5:0.8=
-	net-libs/gnome-online-accounts
-	media-libs/gsound
-	>=app-text/gspell-1.7:=
-	>=dev-libs/icu-60:=
-	app-text/iso-codes
-	>=dev-libs/json-glib-1.0
-	>=gui-libs/libhandy-1.2.1:1=
-	>=dev-libs/libpeas-1.24.0[gtk]
-	>=app-crypt/libsecret-0.11
-	dev-libs/snowball-stemmer:=
-	>=net-libs/libsoup-2.48:2.4
-	>=dev-libs/libxml2-2.7.8:2
-	ytnef? ( >=net-mail/ytnef-1.9.3 )
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/appstream-glib-0.7.10
-	dev-libs/libxml2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( net-libs/gnutls[tools] )
-
-	$(vala_depend)
-	x11-libs/gtk+:3[introspection]
-	net-libs/webkit-gtk:4[introspection]
-	dev-libs/gmime:3.0[vala]
-	app-crypt/gcr:0[introspection,vala]
-	dev-libs/libgee:0.8[introspection]
-	media-libs/gsound[vala]
-	app-text/gspell[vala]
-	gui-libs/libhandy:1[vala]
-	app-crypt/libsecret[introspection,vala]
-	net-libs/libsoup:2.4[introspection,vala]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-Fix-accessibility-issues-with-initializer-of-constan.patch
-	"${FILESDIR}"/${PV}-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
-	"${FILESDIR}"/${PV}-Correct-the-conditional-comments-in-the-test-data.patch
-)
-
-src_prepare() {
-	vala_setup
-	gnome2_environment_reset
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dprofile=release
-		-Drevno="${PR}"
-		-Dvaladoc=disabled
-		-Dcontractor=disabled
-		-Dlibunwind=disabled
-		$(meson_feature ytnef tnef)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a71389055492..03f6f25d4585 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index ca207bdb7709..e1204e6677f0 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -6,5 +6,5 @@ DIST converseen-0.9.9.6.tar.gz 290947 BLAKE2B 56772a2c1f55952d7531311fd1a9150848
 DIST converseen-0.9.9.8.tar.gz 769184 BLAKE2B 136d4454825fd64bd8129544df25213346550d4a1bf550fd8c32eef7c2c02cda5965aa235ec8f637de53462968a08c1e1b7c5db454c68ed1cac64d08c322fd54 SHA512 64ef5c5614c6536d84c6fc5ad6f9180c45a4c9d1294e492f0b09a596203d91871191f62ef80c6f888f010377c834ae76d825a29b137885756cc33a7d38d70208
 EBUILD converseen-0.9.9.0.ebuild 918 BLAKE2B a9acffbb4629cd80bc519849a9b219014c2d00466f6302354aafde0a36b46613f16bf48a5830f1a180118c99353d380768303cb8fdd0b335c8a540af137a0553 SHA512 8778b312f059d35458c6c393bb4d7939dc7a66d461679a9726cfda5ec8c448bd6ac5e42e71dc3c2d85afc76c64d1c56e897773749e9c4e7eff02caca6cbf1b45
 EBUILD converseen-0.9.9.6.ebuild 1267 BLAKE2B f26e05cbfbec5e51537eb94937481643e8b70c523845be83e41172d2d6adb4711286d1afebf94843a000e90ddc96cd8344044f6c0a779e313307ea8912f8e565 SHA512 287399af1bfe691899f9257a1be6d3a9b6c7caa70611241eb67b947e37634bb09ed7407debb48a756f9fad42519baf6f6e8cc25880c8e7e7ab28edeef9741431
-EBUILD converseen-0.9.9.8.ebuild 1342 BLAKE2B cb1f39a20f0406c128c367e7cca67fe8451b52b111ab428c5cd75183d999af3b53994c2c54799455539c7141ce2f3ee7e96d859b5711fbbc6f2d87f9283fea7d SHA512 6c2d6accbb2a07877e01a8082603e2f9204db66688b43081a4c9a2b23ccff7e0995873c70e89052045c81f6c004fbb7eb2544f664a1e8ad291e50085e42e42e5
+EBUILD converseen-0.9.9.8.ebuild 1340 BLAKE2B 78bb751dc0f18f8b6137a5217daa30556c45fb15914bcab9bac1c3eda476e235703e9aaa801004972fa11e9fb8b653bce113a3cfa3857f75d2711fd69855abcb SHA512 bca13c456769461e90b2fe34f1e7267a194fd0f4cef26ab564d58702e6beed0ce574c818f7a34b86b81599414c4c2637794b3022bf739e7b1ecc390b2e8a3d3a
 MISC metadata.xml 490 BLAKE2B 7ee59abe13eee7dff622a3e7b701f6e0128a208e3e49f5b22b3fcaf06357991a50ece3ffa9cb607675f94a7784efcec37c2176464e4c7741efbfb8b8427cb5dc SHA512 a56719d55ea41683315c5d3f98b8351d3b15b68fd8f598a9e692691c771a94bec23b8263c8a017e29d63a20a8de8b440db1acfd26558c6f8d51add12e4016ba6
diff --git a/media-gfx/converseen/converseen-0.9.9.8.ebuild b/media-gfx/converseen/converseen-0.9.9.8.ebuild
index c0754ac324ad..e33a03bbc62c 100644
--- a/media-gfx/converseen/converseen-0.9.9.8.ebuild
+++ b/media-gfx/converseen/converseen-0.9.9.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # FIXME: graphicsmagick dependency does not work properly, failures when compiling
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 5bb7a43081cf..8e88b33bde01 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,6 +1,4 @@
 AUX 42.2-build-Use-correct-variables.patch 2235 BLAKE2B 712eeea244e080961cc81cfbf13fe534f1360593832f46c6249952d0509d9aba4ee2b42eab2fab77803d943740bbe6661b09f2394247dfc06e167f9c3e9c3bba SHA512 d45b9e373ba9c73cf9cf6bd83bc05e36bc6d37471cf18b7041b443842e5d6de942dff50eb7a73939533cede2263291cf142f22052b1d89166b45daa82ab8731f
-DIST eog-plugins-42.1.tar.xz 131656 BLAKE2B e561e7b31daf950c1e1c1e1038bf40101b658583160439f7fd9050b52da2f6dd943105e1e1eeaefff7ed2aa759f8b96aad0a65130daba038733967db37158bfc SHA512 4688cb9cce044137717521a3ff2f769f960f12ec8b3f711971f276334f91915c8a3142aff2feb3d24d2eeb86223f040e9b699a1136e7fc7e96202a06b1cda1a8
 DIST eog-plugins-42.2.tar.xz 131708 BLAKE2B 7df06ca7d4d10e068b6d758ec3c29fe8cb7a2037755bab55536f1cd3581790f7a1288a9530f256df3d2adbf6d7f8c893907fa962be8adb77510cab8e9684298c SHA512 7508231c1a6b365acfedd73b37911d5ac4194e6b5c4f5d80be27529ec749774d61ddc75288f8678d879f0cc2d9117a5f725092efe30403b5b3e145c77fa3030d
-EBUILD eog-plugins-42.1.ebuild 1722 BLAKE2B b3f1e17ee4b098b2ac63a70d3cdc3f7caaf2db9d647d289ddf4e2f81b91283d917a12a1f47569deecca1c8be054ce67bb660ba36f750ca07d82c5089e1122bf2 SHA512 4d3265072000f00915e49967c2f4297c6513697d1dbd3e686ab5a09f0e5aa821fd38a684bceb8d3ea3458a9f7004957c3f7c1a41a5158defe38c2f9c4cb7e6ca
 EBUILD eog-plugins-42.2.ebuild 1857 BLAKE2B 2b1cb805b676ffffabe16619532d6134cf527ce5ec5131b6996dec73254ead69aac94320d92374742c1400ebe89de94a932dabb2104574f0167c1bcc01cd14dc SHA512 aad42ab47813fb40d6a9c58087e9cafd3ace95bab432e6273fd0f11058fae9962e1c887ac44f3951e572689ef4006a2c9623dbe30beb020d2f81c5ccd39872a0
 MISC metadata.xml 541 BLAKE2B ee4eb7e0faf9345c05620ca09bcd761ef02bd5d5b38485b6fa17cfb52f5b602dac9f598876de728e8a9d9e223f28e6a73afa34b8bcbccb376c41785a53f252f2 SHA512 46ffc768901c97363eb9cbbf3ec1b06b0ccfe8ce99be944866d4459383c0778a151f94437f16254b8955742d4c2f863fb63dc34cf49368e7fb49da8aa788612b
diff --git a/media-gfx/eog-plugins/eog-plugins-42.1.ebuild b/media-gfx/eog-plugins/eog-plugins-42.1.ebuild
deleted file mode 100644
index 606145157af2..000000000000
--- a/media-gfx/eog-plugins/eog-plugins-42.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org meson python-single-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins https://gitlab.gnome.org/GNOME/eog-plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+exif map picasa +python"
-REQUIRED_USE="
-	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=dev-libs/libpeas-1.14.1:=
-	>=media-gfx/eog-41.0
-	exif? ( >=media-libs/libexif-0.6.16 )
-	map? (
-		media-libs/libchamplain:0.12[gtk]
-		>=media-libs/clutter-1.9.4:1.0
-		>=media-libs/clutter-gtk-1.1.2:1.0
-	)
-	picasa? ( >=dev-libs/libgdata-0.9.1:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/glib[dbus]
-		dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-		gnome-base/gsettings-desktop-schemas
-		media-gfx/eog[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif plugin_exif-display)
-		$(meson_use python plugin_export-to-folder)
-		-Dplugin_fit-to-width=true
-		$(meson_use python plugin_fullscreenbg)
-		-Dplugin_light-theme=true
-		$(meson_use map plugin_map)
-		$(meson_use python plugin_maximize-windows)
-		$(meson_use picasa plugin_postasa)
-		-Dplugin_postr=false
-		$(meson_use python plugin_pythonconsole)
-		-Dplugin_send-by-mail=true
-		$(meson_use python plugin_slideshowshuffle)
-	)
-	meson_src_configure
-}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index b809d80fe27f..3a7a6fdb81e0 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,7 +1,5 @@
 DIST eog-42.3.tar.xz 4460968 BLAKE2B ce589ec50210870bf11d8737c0ca18dd7da308de59654639623f15984f9d62f36cb1b87854fa4f67b7885cb5802e576281fc91c6e2c86e9d285d9a952193a8cc SHA512 bc82830897c55769cd2cb0c0d428b9456465c0f4e793c597ea74b3c84d5c052f051b772413cb32754153714239a9815a09fe93daf928f13e16f8d997b1e58b45
-DIST eog-43.0.tar.xz 4461552 BLAKE2B 3afc0da472e9b57d6cde097c0aad08d2880ba596eb94cf8091fa99b802a2c11ee87e04b617f65e31bf11bf8885c92023dbb422ad58c2a768995eb5676b993d30 SHA512 ee9de8469f408a247577e71854cb45e0a8058f8ffd3cc42bbead67994862179d24bf9fbf7d8e18ba20ac13b3a11479053b87abe7da07358f5816d0f94b1f4f8d
 DIST eog-43.1.tar.xz 4649476 BLAKE2B 0c7225f8f7fd60ff66469c43a0d11c15fa26956cf22706ee5d2a8c06597a8b4ef51a7d3754cde968bf2f98301d5f59326db05213217c7012fe193c57f0ce04ef SHA512 10fd4f6ad07d5a0c13931cb47c3a16d208eb6aa107f288e32fa0f1fd711d17893be9d9980fa64fa530047da131ef4e10d729421ac46d3549a9ab731be45479bc
 EBUILD eog-42.3-r1.ebuild 1714 BLAKE2B 1ccacb64a090354ba8a30f496bee26fbf610b65cbffb174b54738d740cde984bff5e8536bd6c3f613b6f0c4891dea8e867c0c92ae7d0a48f656b88bece3f45cb SHA512 76631be76b513b99b5e7304166e756708111f53572c62cbe13c48040abddd7bd9c95d564e1c635c4c88d76acefdb7850d88627287aab7648966fadf429bc127a
-EBUILD eog-43.0-r1.ebuild 1748 BLAKE2B a7d7dd91bc74220bd51a2a6055e965d5cf99d5c6f03691696605e561d46a1f5740757cd822ca6e9856cd03c42a961249cb7f1d4f3945217017a220193d937c59 SHA512 f1c94a68833d22e5b5f2efaa31d0642d53cdc93602bc44f2d9b8cd8152833fc11a845d15f8ecfcbbf40d632ee16baee459084546a5e3d011027d18c9317c2df6
 EBUILD eog-43.1-r1.ebuild 1746 BLAKE2B bf9e75dcc6ff69afe25cd6ce8fd340e7b8247e8a9f25b4850750516d625a724e524fd6654663b061c929f72c97adacd1f043b73333b6151edce130798ce4e90d SHA512 1f34b10b791ae8a066ae2b6c901ecbfb2d7511e4fcdb3352eca1d1c9cfaed8c44d3a720614c095d81decf5c9fa01c15a57f6c801f30b0184e5813a9a7e121b61
 MISC metadata.xml 580 BLAKE2B 7d6bf08b37ed06abb82e92621725ab2cbc9d0b28e5c50cd9dd25e449e98212da4911da450d5e80f6d2efd3cb65981b2726e69f48ae54fc7a0dd4363c896b9086 SHA512 3ae60a59ef2e07fd78b836eb828c0b9e37e49ea6115c52215b86dafff9cb6990567659a31cfb1e06e58890cf598c98065df1e473dc7994fef0ae950081c27a54
diff --git a/media-gfx/eog/eog-43.0-r1.ebuild b/media-gfx/eog/eog-43.0-r1.ebuild
deleted file mode 100644
index b86ba98ce7f4..000000000000
--- a/media-gfx/eog/eog-43.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog"
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
-REQUIRED_USE="
-	exif? ( jpeg )
-	gtk-doc? ( introspection )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-42_beta
-	>=x11-misc/shared-mime-info-0.20
-	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
-	>=x11-libs/gtk+-3.24.15:3[introspection,X]
-	>=gui-libs/libhandy-1.5.0:1
-	sys-libs/zlib
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	lcms? ( media-libs/lcms:2 )
-	xmp? ( media-libs/exempi:2= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	svg? ( >=gnome-base/librsvg-2.44.0:2 )
-
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		dev-util/gi-docgen
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif libexif)
-		$(meson_use lcms cms)
-		$(meson_use xmp)
-		$(meson_use jpeg libjpeg)
-		$(meson_use svg librsvg)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		-Dinstalled_tests=false
-		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 0910795bbbe5..2c1276bf9086 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,8 +1,6 @@
 AUX gnome-font-viewer-41.0-fix-meson-0.61-build.patch 1127 BLAKE2B 7cb4c294ea2a2e8b117a699008075435a8d60ad970db8afe9bbd86c6b5d7fd6b423b6c4535b6ee4c4475384a7749c2efdd0530f229f9d3b61f78a08f23a82cd6 SHA512 2f339dfb9f4a566a334273730cabf983deafc062221b6170d8858780bcee20e7cdffcf95fb159afeb0def7966c105267c9469f7c06542d4d2af208c5b895a68d
 DIST gnome-font-viewer-41.0.tar.xz 179672 BLAKE2B ce9e91b319ccf2e099cd30cf13e407270775950321e2bea69703050b5797ed879320939d260aba175f3ed6f5719e23f5628c6501f362c3e367ca5ddf70902037 SHA512 09d9ddcdd18fd0023dff46e7197988473119e0d753b7814fdca0116c6831a93146301dd56ee77546121c573c8d93801b5d8fed0c46da47052e31749058c21d50
-DIST gnome-font-viewer-42.0.tar.xz 287644 BLAKE2B 273328298187c1b77882638bb292ca9340a1dc57c917d9888abeadfe8ea01c27d0f59d382823b262323000da81457fb821aafa9b1ba50792ee75ce3dd8de4ee7 SHA512 231aaf594b22741f8a138c0a6c764244eb947f9cf30385353f4dea13cfc7929f21a291f9a56810eb24862310ecab6b4555147ef6be9e7a5d3057ae05ebba76ec
 DIST gnome-font-viewer-43.0.tar.xz 291800 BLAKE2B 8d47eed603a932c47ccbd88f75b87e3df6850b89854b30ce1b75979867f5a75c8db97387833f118fc27e8f6c54c838523d6ab7f72813b9040d9100a3f46760ca SHA512 9d93cee4e62802640722294a0db7b5947d417e393a95aca9017b9904708037fbf353e35d891181c8acdb5615ed9c20ec03c26b197bb982196122bf9cb0a37fd5
 EBUILD gnome-font-viewer-41.0.ebuild 765 BLAKE2B fd4fe11ea6248a29345ba3e233fcf3cf6c1af03931c20c19b03f85b88fba22dbae2329b54b55d2e438266d00d2a692ea1efa50b5037d8a4716c7efec9950a2e8 SHA512 c46a4053b7542e9a661cb437575ba7499dd5a9c4cf9b036f5ad37b7a93a69e389df482be1b6946d91686fbaa2fa6dc52c18b077f30e8cc2fba069fa98b069075
-EBUILD gnome-font-viewer-42.0.ebuild 698 BLAKE2B ef4171fb0f805b65d12ff9347847fa34ab65c8876cfdf00eb1346a1479f1ceb705c7a367b69a5727b28ed55c1dd6f12aed58a7da6673f0da73cc1e507f9f0d75 SHA512 c099a82f422936e21ece2c07386a3d4864c12fbff49d8236725c7d61a0670468ea29b9d897f95a307237f795fcf6dc97bf011fcf33df811cb29c13a77b7741d7
 EBUILD gnome-font-viewer-43.0.ebuild 716 BLAKE2B 133f9cbc1ef61aff0be325fa98977bb91e53291dc0408e863c7ae7668f1e465064dd9362ab7563aa9bb42dcc49483479f649221c9b4387b9e1b8e99af4964f4a SHA512 f8edcdd40396c6b8cadc7093972e54b7f6e8238977549cf03d2f61d51652685998775e99a0036fafa04dcb4dada15601a594142e4726608c0b84f9708da1970c
 MISC metadata.xml 358 BLAKE2B 68c01b7096e0cddca8924d5f631ff0f3b94871244392aece19d0ca59f9bfda7c66199325fd31646c425af984118f728e54fa1ad3fcdc05149e146a5bb7de0667 SHA512 8870277e5cfae6a6c10e66359d45ef4ebde8027cf90f356096e7f78452a525fcb1e3d06f76769a1b8c875498faa79c75432e766edd495398f08d858c4d18bccf
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild
deleted file mode 100644
index 3b3d7ec9f33e..000000000000
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org meson xdg
-
-DESCRIPTION="Font viewer utility for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=gui-libs/gtk-4.5.0:4
-	>=gui-libs/libadwaita-1.0.0:1=
-	>=media-libs/harfbuzz-0.9.9:=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	gnome-base/gnome-desktop:4=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 69a14f4b644c..bf7a2d9b44b7 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,6 +1,4 @@
 AUX 0.30.16-optional-wayland.patch 2111 BLAKE2B 9d928c8b449792b198314c9f169dc2ddfddb97efbf43bf888a6e00fc47e9f60635f8d482a6b227335e0e7ef028e663b8b959a18658ba300ceb925704e977b8cb SHA512 4b6e00823a4cd271ba72b382b35694737d6944cbb123465da4243a16cb5cf6bbf3a8d3ecc707ded6e74df47ac76c5ebe1f789aebfc7c4a7b0ecd8e926d32c120
-DIST shotwell-0.30.16.tar.xz 6532812 BLAKE2B caa2ff2f4536d8f04900d7ba7c583b7ec0d0244d6253bc17971e2b4e04aa3790b17e932b3367e1be40d4a0bb566bab31396aa5dfdb6dbb5c9803272cd7f94e97 SHA512 4ed725a34b1663b9cb63dcd13c98795fb2ea9a5d79ee4541276bc9dc2f607ce6466cc9c983bab55e7418e69eef3d1598846aeb6750f00927663756bd11d9a084
 DIST shotwell-0.30.17.tar.xz 6533460 BLAKE2B 58ec94f21bf465dcc19760f40235db7d2ad7d00c214802cd3ad6cfd67cb1088a5999f183c8ae36398e492a1b387e6ea717a9b8d0f31f4ef369e67c10150ae57a SHA512 f680b6f58538fb7b584594d00da7fe997dbc766583a5b5a85943b3df905dbc7192d3e7b5c7b47b6bd1221280995aaba878ea1afff9b042995bf30fbcbce5f7ea
-EBUILD shotwell-0.30.16-r1.ebuild 1950 BLAKE2B 00e3a32e2331804079af0e3dc543ad7c2ac86bc2748e77e9c4ce9cfdc9997d08bac5fbb103cac2a4ce877a6fff71eed14783f86f87e246e04848f4a5da024343 SHA512 5aa9a7d9002e872d7b461db6c114d558fb6815996a0fa49dcf36d7c29540239804f7f6434a55f0f0e14acc71cd0572d2738f12a8bf5a4e080d780f4969dd4f02
 EBUILD shotwell-0.30.17-r1.ebuild 1922 BLAKE2B 7cb6412a63206d77e9596791ee5658c6e2a9860ccbb39a48afa2c7863a6042f0fab1bc16ec1add44de9816cac755123f48165c213aa84a4c867aedaeeefe9930 SHA512 fb3dbf7ffc1d7d8f23885a2aaa1d12cabe4511fd3f020a754b314be20d2746d37c429335f8c2f6109206e56d0dd1eb4fe23eec898b1764f8ce5c3319e109de9f
 MISC metadata.xml 794 BLAKE2B c1eb4a08828db11ba473fe21036201d3b57c2fa36a2bd39b18e7671cf5e4c42b2b9e82956456a0376a60bfc982d9af106577075d936dba3c0cb73947da46f427 SHA512 2c65cdf3c6d5a953b52ad81e0a85d1c1465f5c38c3475e5c1408baea0b14a053255e97c0efc560059c77c51dbe98b72a90c6164fe575e68cba3eb04d4774f490
diff --git a/media-gfx/shotwell/shotwell-0.30.16-r1.ebuild b/media-gfx/shotwell/shotwell-0.30.16-r1.ebuild
deleted file mode 100644
index cd40ad740af2..000000000000
--- a/media-gfx/shotwell/shotwell-0.30.16-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.54"
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
-IUSE="opencv udev wayland"
-
-DEPEND="
-	>=x11-libs/gtk+-3.22.0:3[wayland?]
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libgee-0.8.5:0.8
-	>=net-libs/webkit-gtk-2.26:4
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libxml2-2.6.32:2
-	x11-libs/gdk-pixbuf:2
-	>=dev-db/sqlite-3.5.9:3
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libgphoto2-2.5:=
-	udev? ( >=dev-libs/libgudev-145:= )
-	>=media-libs/gexiv2-0.10.4
-	>=media-libs/libraw-0.13.2:=
-	>=media-libs/libexif-0.6.16:=
-	dev-libs/libgdata
-	>=app-crypt/gcr-3:0=[gtk]
-	x11-libs/cairo
-	opencv? ( >=media-libs/opencv-2.3.0:= )
-"
-RDEPEND="${DEPEND}
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	media-plugins/gst-plugins-meta:1.0
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	net-libs/libsoup:2.4[vala]
-	media-libs/gexiv2[vala]
-	app-crypt/gcr:0[vala]
-"
-
-PATCHES=( "${FILESDIR}"/0.30.16-optional-wayland.patch )
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dunity-support=false
-		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
-		-Dextra-plugins=true
-		#trace
-		#measure
-		-Ddupe-detection=true
-		$(meson_use udev)
-		-Dinstall-apport-hook=false
-		$(meson_use opencv face-detection)
-		-Dfatal_warnings=false
-		$(meson_use wayland)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 2ddd545e0687..784b97f47fac 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,6 +1,4 @@
 AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c
-DIST simple-scan-42.1.tar.xz 1100296 BLAKE2B 86d22abb8e3f72f19ab856d8e3578f57f71bc8e34ee5bb6e3809f160bc733b7f5753b947cbd12714829b29662087cdb601687cdd9ca1b1cbba41e543ce033ed2 SHA512 c4919ade08a30ee185eb4c62f59777fc360aa35c009f033ee9a9d10e23104fc0c44016509551e3d8de2948a3657c6c4d6c2fbbd955c4c09c6698d6733a55cfce
 DIST simple-scan-42.5.tar.xz 1193500 BLAKE2B ba6299e351e12a996b55a2c0c213290ea8b1faa490e7b6950ef961ca9c6f65522370064afe655f305fbfcd8dd225b0d22def10fbe3d358584c71933030e72003 SHA512 d479d11fb735e4f63eeb1917d00befe71c1c2128dd425f57f8069c0ae7132053c7259c11139be3c59a9ad1e27367f08174a8dc2632255d105705a36b3871a7f4
-EBUILD simple-scan-42.1.ebuild 1413 BLAKE2B cee1df9054a8d58afb0d4269a8dd4ff0c60a775aa1c881ac89ead27989d58df0c89ca0ae617d2023e137d75aa9d0eb304d7d602b00e413ac79745aa26e9cd085 SHA512 1253350677b27878f491c45bd776ec1349143b1d68cd34ffb264602568cc0fc95c21ebf98689a783ea44eee5572a45c44ee3c0a050680e323b04c044bb2e8be7
 EBUILD simple-scan-42.5.ebuild 1397 BLAKE2B 629629134de248808080242e57bac3a62481e9f0cda616f723ee3124d80e1dbf649d1729056f21ca0f3ad2bdb4ddf13d13dbe0e9cc9cf76d84e43299852edbac SHA512 a766c8a235a548c0f483df22a68178b1ac2184d252edd8b8b2bfd86d0c0c3312b174897bc34f89e703ab6ec6270579b83943565cfbf7b172f5680369da595ffa
 MISC metadata.xml 646 BLAKE2B d894b0b617db9d06a787e5d1c4b8d44dd1bb7c528f1498e9ce6044b7a4e015857eb9e227257abfbdb05e628c18da4e194f3a87750969ebc2735e1715036c596a SHA512 596b4b58bbdc0c82db3f961fb21c65b2af83949195873e37f65f383d8be562e499816a76303f24d82499e4db0f4825e17c0472153f827cfd334167c23cc46df5
diff --git a/media-gfx/simple-scan/simple-scan-42.1.ebuild b/media-gfx/simple-scan/simple-scan-42.1.ebuild
deleted file mode 100644
index d24be5225422..000000000000
--- a/media-gfx/simple-scan/simple-scan-42.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.34"
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE="colord webp"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.24:3
-	>=gui-libs/libhandy-1.5.0:1=
-	>=sys-libs/zlib-1.2.3.1:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/libgusb-0.2.7
-	colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] )
-	webp? ( media-libs/libwebp )
-	>=media-gfx/sane-backends-1.0.20:=
-
-	virtual/jpeg:0=
-"
-RDEPEND="${DEPEND}
-	x11-misc/xdg-utils
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gui-libs/libhandy:1[vala]
-	dev-libs/libgusb[vala]
-	colord? ( x11-misc/colord[vala] )
-"
-
-PATCHES=(
-	# Add control for optional dependencies
-	"${FILESDIR}"/40.0-add-control-optional-deps.patch
-)
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord)
-		-Dpackagekit=false
-		$(meson_use webp)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index 19b1a3c62847..9cb7b8ee7138 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,6 +1,6 @@
 AUX backport-2ace1a1-issue-92.patch 5161 BLAKE2B a2974216dd5bfb64a53033f1a587a8d05181e3b894c3f5bbece7f3ec40014d38ee9185b8fb500dab78668319e1c91a9b8213a326a2df3ba6b347698082ed854f SHA512 58129ae687b0a8d78c0deb189519dbe3dd8b55484b3b9a6455f2bb0f607fcc5c43992ca6c841eadc576af46fac9f9ba5fb42f14b089c8864e60588ee72189ccb
 DIST xdot-1.2.tar.gz 136057 BLAKE2B 484a3513ec3d67dbc6e167f171e7f70977ba2472766f25aa7cc088235f99470bfac5fac67368ea53b633320752a928634840ff3dcccc6b96795d3b7c203db922 SHA512 b4d3b15114b982c7c38cc71c0602f6d1ba9874c7315c2b8c4a8a48bf7674e9b38bf19a0d4a2d319acc9a29cf8f177a651d4e213761e88b0b3cb26e95e8a92dda
-EBUILD xdot-1.2-r1.ebuild 1046 BLAKE2B fe71b1531cbdaab048c92065d9f2ded09393449508fc608970bc646097b06d0d009fe73de8bfe1b07244dccf0c00507dc5dc97ecceeef92e1523ef936d90af1e SHA512 da415b41e6a14508d91c55c11ccdd7c18db0f135b881ef5915449b58f49db0da5b081d3e499227450b2a555e1e25fd17b63a8bda19a7dc301a74e30f8bebd31a
+EBUILD xdot-1.2-r1.ebuild 1046 BLAKE2B 9e94034dfcbe1668fac78029248d30726a65d8b5fc504ffec4fccddd76859af8f5330b643b816036ab0685ddf06b67620da4c38dad914b26636775902cd0d414 SHA512 277d11c3bffa6693bbcfc4fdd7db4e9a4e93cf63797ac5da2b9880e48ba91015db4394960a2de655a186074e9817d8588019a4a1eedd392ac69aa7b146c6f9a5
 EBUILD xdot-1.2.ebuild 823 BLAKE2B 60d0ee6a4e0c5777eac2a713f1d2608ba27691fad256a46891223c7c77b90d53466ccc895ec6b6178abc408fdc951e3b662050695d73dc96c9cdec480dfb3a94 SHA512 ab8287df54a6a0ddc140e4ed2234ea151c3ac977440f364c9577f5b5b9c68234a2f61e9a26bd032910b145cdb5cdd0c902bfc2a0136223dea7f7ddfaf8de80e3
 EBUILD xdot-9999.ebuild 966 BLAKE2B d8e39cf4c6e592a7adeaedff68cee76f5b7dc5de846508f7b26f7a8ea1b664c19bf6c1b6455e9013e1205f805db5b6ab61edbd42d3f256430bea01584f5e92d2 SHA512 1424ace30db00a6d1b3bea96305a8754d94ca3f589b9741f0c20c6215220cf666b1e5fcb8fb77a4eeb35e01497d2bba017996ab328d46b99ac0b17f159bdc924
 MISC metadata.xml 399 BLAKE2B 06318ca9aa1bb3f53733542916d19d28c03133866e868aefeba88d7e6e1b7594a628488471fe7f6853e02402a14db8501e056f5df9ae1429c4eca66ab7b6a492 SHA512 16caf359c45841ae27bfdeee51c7fdd71d6282548773e6f519cbcbfe43f9fa39c65322a610d2b3d5cb4471129cfa3738e6ee66ff6b6e94b4263d918fd44ff30c
diff --git a/media-gfx/xdot/xdot-1.2-r1.ebuild b/media-gfx/xdot/xdot-1.2-r1.ebuild
index a2972e254b73..e82772d87b1e 100644
--- a/media-gfx/xdot/xdot-1.2-r1.ebuild
+++ b/media-gfx/xdot/xdot-1.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 MY_PN=xdot.py
 EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 73500d13a9e8..9c7a23478ce1 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 8f60b1965a27..c19add0e2024 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,6 +1,3 @@
-AUX 3.2.2-Fix-aliasing-violation.patch 2746 BLAKE2B 37dbcfbebaf7609fd292305b7fdca72439a834b5ca8b525af9a577921851de183a7906fc7d053fcf1fd8616f653fe8ce52a9044cc9c053d68bce83ba0df629fb SHA512 9f56d78528c32218e649243388c63673a2859421029011fcb098a8a792e871532c586924d30ab79a324aa32a9778108ad0499d79ef8663e9fb03d00a8f9b9c45
-DIST freeglut-3.2.2.tar.gz 397203 BLAKE2B e4151d9bd984504edb02fadf2983c750c1c81557f3467c01d4202d34e9e082a62f07d373908d3517f9b3fd3253b7b409f882cfe2187d4ff1787f3cdc09eecfe4 SHA512 190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9
 DIST freeglut-3.4.0.tar.gz 413389 BLAKE2B 47b073c4e81473417358452ede3891b6fc36e324f66eec42fcbbadebb2144680e3b52caded504135239e170fd8f30a1fe8b6666a746b06d48cd7226c98a8114e SHA512 4bb6d6c086bac7a9c0ec78062dce58987555785abe6375f462ee249f65210a964a28fb10ba7ee8a42d7fafb00eb8d196eb403d65d255f02f88467369c187228b
-EBUILD freeglut-3.2.2.ebuild 1462 BLAKE2B bfa87569994be7ae1c8a374bcb38e88db905b0a2349268df81d69a54979a80ed6ddb347821f9da6951fdde5fff07d82bc99b8d5c9f3b4136ee179069d2a64d4b SHA512 426d97d6fbf11029d1f9620ce3dcbf5fd503002c967ba70b4071778ca89a498bb5e942b4a87491e44c42150eb2fb68cd80e4848e7d2bd8f8879ace8ef5cf1290
 EBUILD freeglut-3.4.0.ebuild 1311 BLAKE2B 82d00c90dea03ee1c67d61aae9a1d155e4aeb24017c6aaea89cb49a8ab566de3065c2490a836b04aecb6ccc91900c827e479457278f2947288faad356369b3d8 SHA512 cc130f9b7ecc5276e48a5989fff1732e89b39db7ae3e1b6a79604dedfcf2dda18a598bb8f6761e71149eb85e18eb9b7cfdf63689b5b31957317e05e22260afeb
 MISC metadata.xml 594 BLAKE2B 984028f68aa76f8cfe537ea8a9f090af580cbe5ec33007c91b5b95b1f8c5396c779f67155d99fce7708e4fba8ee661f35fb01f5fd714a5ccc08794516df15820 SHA512 159f5756565afb1a55ac874afc42e49591c94519970d10eb7857159262bf4f6e372e5c0584f03ed1ad70e28bb5d328d3f36fdb0208d9de8f22e307973ee38167
diff --git a/media-libs/freeglut/files/3.2.2-Fix-aliasing-violation.patch b/media-libs/freeglut/files/3.2.2-Fix-aliasing-violation.patch
deleted file mode 100644
index d6544578bcf1..000000000000
--- a/media-libs/freeglut/files/3.2.2-Fix-aliasing-violation.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://bugs.gentoo.org/859847
-
-From 8c6f6bf3ad2fd33d15de6ee96175cd29bf804d9f Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 26 Jul 2022 15:47:02 -0400
-Subject: [PATCH] Fix aliasing violation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Noticed when compiling with link-time optimizations.
-
-include/GL/freeglut_std.h:240:18: error: type of ‘glutBitmapHelvetica18’ does not match original declaration [-Werror=lto-type-mismatch]
-  240 |     extern void* glutBitmapHelvetica18;
-      |                  ^
-src/x11/fg_glutfont_definitions_x11.c:103:27: note: ‘glutBitmapHelvetica18’ was previously declared here
-  103 | struct freeglutBitmapFont glutBitmapHelvetica18 ;
-      |                           ^
-src/x11/fg_glutfont_definitions_x11.c:103:27: note: code may be misoptimized unless ‘-fno-strict-aliasing’ is used
----
- src/x11/fg_glutfont_definitions_x11.c | 29 ++++++++++++++++++---------
- 1 file changed, 20 insertions(+), 9 deletions(-)
-
-diff --git a/src/x11/fg_glutfont_definitions_x11.c b/src/x11/fg_glutfont_definitions_x11.c
-index bec20371..d086a990 100644
---- a/src/x11/fg_glutfont_definitions_x11.c
-+++ b/src/x11/fg_glutfont_definitions_x11.c
-@@ -91,14 +91,25 @@ struct freeglutBitmapFont
- };
- 
- 
--struct freeglutStrokeFont glutStrokeRoman ;
--struct freeglutStrokeFont glutStrokeMonoRoman ;
-+static struct freeglutStrokeFont glutStrokeRoman_ ;
-+static struct freeglutStrokeFont glutStrokeMonoRoman_ ;
- 
--struct freeglutBitmapFont glutBitmap9By15 ;
--struct freeglutBitmapFont glutBitmap8By13 ;
--struct freeglutBitmapFont glutBitmapTimesRoman10 ;
--struct freeglutBitmapFont glutBitmapTimesRoman24 ;
--struct freeglutBitmapFont glutBitmapHelvetica10 ;
--struct freeglutBitmapFont glutBitmapHelvetica12 ;
--struct freeglutBitmapFont glutBitmapHelvetica18 ;
-+static struct freeglutBitmapFont glutBitmap9By15_ ;
-+static struct freeglutBitmapFont glutBitmap8By13_ ;
-+static struct freeglutBitmapFont glutBitmapTimesRoman10_ ;
-+static struct freeglutBitmapFont glutBitmapTimesRoman24_ ;
-+static struct freeglutBitmapFont glutBitmapHelvetica10_ ;
-+static struct freeglutBitmapFont glutBitmapHelvetica12_ ;
-+static struct freeglutBitmapFont glutBitmapHelvetica18_ ;
- 
-+
-+void *glutStrokeRoman = &glutStrokeRoman_ ;
-+void *glutStrokeMonoRoman = &glutStrokeMonoRoman_ ;
-+
-+void *glutBitmap9By15 = &glutBitmap9By15_ ;
-+void *glutBitmap8By13 = &glutBitmap8By13_ ;
-+void *glutBitmapTimesRoman10 = &glutBitmapTimesRoman10_ ;
-+void *glutBitmapTimesRoman24 = &glutBitmapTimesRoman24_ ;
-+void *glutBitmapHelvetica10 = &glutBitmapHelvetica10_ ;
-+void *glutBitmapHelvetica12 = &glutBitmapHelvetica12_ ;
-+void *glutBitmapHelvetica18 = &glutBitmapHelvetica18_ ;
--- 
-2.35.1
-
diff --git a/media-libs/freeglut/freeglut-3.2.2.ebuild b/media-libs/freeglut/freeglut-3.2.2.ebuild
deleted file mode 100644
index 43218afa4d37..000000000000
--- a/media-libs/freeglut/freeglut-3.2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library"
-HOMEPAGE="http://freeglut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static-libs"
-
-# enabling GLES support seems to cause build failures
-RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
-# gles? ( media-libs/mesa[egl(+),gles1,gles2,${MULTILIB_USEDEP}] )
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-Fix-aliasing-violation.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-#		"-DOpenGL_GL_PREFERENCE=GLVND" # bug 721006
-		"-DFREEGLUT_GLES=OFF"
-		"-DFREEGLUT_BUILD_DEMOS=OFF"
-		"-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)"
-	)
-#	$(cmake-utils_use gles FREEGLUT_GLES)
-	cmake-multilib_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-	cp "${ED}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die
-}
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index 6cb18851af50..a9992d7c735d 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,6 +1,5 @@
 AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a
 AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d
 DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
-EBUILD libcanberra-0.30-r6.ebuild 2493 BLAKE2B fb1d1d99a5dba9186b2944ca58f812fde2fc8e41c775f0bb126aae2b8b98d1ee0043cf24ab4496e49c39054fa57dbe8dec81cf558391a55ffbe54af28abd685b SHA512 93c16fa19212600f28eaa7e006e83025bc533284224ba58f1fbb6c70417d2586fe2a53ce628328bb7698b31464d0d2f8c7dfe438bc8ec7757e13aacd017e26ab
 EBUILD libcanberra-0.30-r7.ebuild 2481 BLAKE2B 4f7487e1f2f4a462abac0fc36570f916a42f58644fd9ab64bb95fa7ca10800360057595bfa15f49f105e8bce0ba034b2105f8c502fd13fb6f543bf5e5d2e9bc7 SHA512 c80b8259603363f6df3a93ce9c60dfdaf6d5c4d881ea436ab495375abaa2867a570b5cee900fcf61d2403a829d0a17df5f5b1b33ddd9ac1840dc0461ece298c2
 MISC metadata.xml 1743 BLAKE2B 3fc8e1231f2344d0d291573a6a42014035a12fe1ac9f69a3015236758b3f3a4ecb759ccb63e93f89037ab29ab87f405106b7fb9ba2b0966b3e5fb24c2046d340 SHA512 85f363f3f9cc6f47a876bce81675ee29e5bf61014f3c6a6f1ddacddbf24d1c3d9b1b3e3a38308fdb4fc67eed0fe01d5f78e94c55cc0369ffa7b862ac13cd6b40
diff --git a/media-libs/libcanberra/libcanberra-0.30-r6.ebuild b/media-libs/libcanberra/libcanberra-0.30-r6.ebuild
deleted file mode 100644
index 8cbe7469484c..000000000000
--- a/media-libs/libcanberra/libcanberra-0.30-r6.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal systemd
-
-DESCRIPTION="Portable sound event library"
-HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="alsa gnome gstreamer gtk2 +gtk3 oss pulseaudio +sound tdb udev"
-
-DEPEND="
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	media-libs/libvorbis[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib:=[${MULTILIB_USEDEP}]
-		udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) )
-	gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] )
-	gtk2? (
-		>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.20.0:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}] )
-	gtk3? (
-		>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[X,${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.11[${MULTILIB_USEDEP}] )
-	tdb? ( sys-libs/tdb:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}
-	gnome? (
-		gnome-base/dconf
-		gnome-base/gsettings-desktop-schemas )
-	sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="udev? ( alsa )"
-
-PATCHES=(
-	# gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland (from 'master')
-	"${FILESDIR}/${PN}-0.30-wayland.patch"
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk2 gtk) \
-		$(use_enable gtk3) \
-		$(use_enable tdb) \
-		$(use_enable udev) \
-		--disable-lynx \
-		--disable-gtk-doc \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/gtkdoc/html gtkdoc/html || die
-	fi
-}
-
-multilib_src_install() {
-	# Disable parallel installation until bug #253862 is solved
-	emake DESTDIR="${D}" -j1 install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# This is needed for desktops different than GNOME, bug #520550
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/libcanberra-gtk-module.sh 40-libcanberra-gtk-module
-}
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 9c57dddfe19d..e86b322e3a44 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,7 +1,5 @@
-DIST libglvnd-1.4.0.tar.bz2 563441 BLAKE2B 079b37571da7f1eb3cf8f87ea727aeec04a27158f015889552787ff269cc779f33c10a426a7113d4e45b13008b6540c2a2eec2ac69cb1cb5c551ac82e11475e5 SHA512 a887044b6b3b8bb2dae74f28a9b92ffa0ab7b65adc74d788e28c292b99ed618f93deb1ddc041b9a9460cf46eba5f63a4ba1c20f120dea868659a022428689287
 DIST libglvnd-1.5.0.tar.bz2 565918 BLAKE2B b81bbd231ec66e045690aac877681f1a09ee3596519d86cf8952e1c91e4b79979e8fd76867ccb713e133ae127aec37010d1f09c1c15e77a9e173878adc75b2b9 SHA512 8bb6b53a92160bcee9ab37a3bce9e51a855f1e5e94d22ef42b9ae0a04fec2c19bd29070084a021ce34938856790f505462cfc653c2f517117d166284688c4dfd
 DIST libglvnd-1.6.0.tar.bz2 565006 BLAKE2B c18909aecc9f0f59819146c2194b20dc34abe3f4fc4bae68131aef18e9eb5713aadec3785e359850d91946fcb816a0b3a0390653fd46c5058e0d5fde6209ce13 SHA512 44752ebd30b46f64c668239716eda34f54286d3dde419ca0526e057f3be34a198986ce11b4df555b62395dbadf1485412d5ba5b9c52f1c6aa8224d7ebd34efbe
-EBUILD libglvnd-1.4.0.ebuild 1437 BLAKE2B 772798de493e8afbb5b97b12aa776d86a100efafab9a4f944cad088d689f7cb262caf5074e625432377e2c1cea1f949634798e310e95eac9e22de14ab5e5628e SHA512 141e6413f34ce6febcee77a086cf137400a21f5b71465a6e97477e14fb8029d05bb6803d7b231f581664962bda92d548611bebfad9d4659ac15774e15c76d603
 EBUILD libglvnd-1.5.0.ebuild 1437 BLAKE2B 1b840da10e7e047456f24935c4e3598894a68256586f274513518e94405e4b6fe7c1f363fe226255f86b6fe2c8ac95872306f70f1189d39853241358d3591c93 SHA512 69cf76ecbd7ea65694dce792ebdbe418b992d0e5836447e47b199f11a8ecd2dcc59f0503955c92c95e6ea79c5cf5c7beb40fb5efa4d739b120532d70bb14ebbb
 EBUILD libglvnd-1.6.0.ebuild 1445 BLAKE2B 374172bbd2bb127694f05b17a8bc45f4848b3062d52444ca528699ee18d9672e18aaa6d5518c52c00e2865762a5294333afb7a2119380153aa746fa8a2b966b4 SHA512 284ab5787517368ddc6d9503934d624bebc49b04f1fa6e1c1c67e79616cefbc3eeac40de2da71cfe10318b87a5183882a7a9429a4a5cfbc74ed9f9e207580b38
 EBUILD libglvnd-9999.ebuild 1445 BLAKE2B 374172bbd2bb127694f05b17a8bc45f4848b3062d52444ca528699ee18d9672e18aaa6d5518c52c00e2865762a5294333afb7a2119380153aa746fa8a2b966b4 SHA512 284ab5787517368ddc6d9503934d624bebc49b04f1fa6e1c1c67e79616cefbc3eeac40de2da71cfe10318b87a5183882a7a9429a4a5cfbc74ed9f9e207580b38
diff --git a/media-libs/libglvnd/libglvnd-1.4.0.ebuild b/media-libs/libglvnd/libglvnd-1.4.0.ebuild
deleted file mode 100644
index 63e4908d53c2..000000000000
--- a/media-libs/libglvnd/libglvnd-1.4.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python3_{7..10} )
-VIRTUALX_REQUIRED=manual
-
-inherit ${GIT_ECLASS} meson-multilib python-any-r1 virtualx
-
-DESCRIPTION="The GL Vendor-Neutral Dispatch library"
-HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-	S=${WORKDIR}/${PN}-v${PV}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-RDEPEND="
-	!media-libs/mesa[-libglvnd(+)]
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_prepare() {
-	default
-	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
-		bin/symbols-check.py || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature X x11)
-		$(meson_feature X glx)
-	)
-	use elibc_musl && emesonargs+=( -Dtls=false )
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use X; then
-		virtx meson_src_test
-	else
-		meson_src_test
-	fi
-}
diff --git a/media-libs/libshumate/Manifest b/media-libs/libshumate/Manifest
index eafc6bcec6d0..85bb5a5b35e1 100644
--- a/media-libs/libshumate/Manifest
+++ b/media-libs/libshumate/Manifest
@@ -1,7 +1,3 @@
-DIST libshumate-1.0.1.tar.xz 109884 BLAKE2B b1a4838b3f43df00ded7973e78acaceaa1c2fa6bb3a67214e475026a980c03f610e68b8d2a992093f091731e8d8e48e954d1ba917e93071f63a984f45a3142bc SHA512 19bf8a563d9b5c9cca3adfc337ec8843c7d8b891fcdd789adecfb79a46c3ba6f674795d39199ce154c5a3f6b95eac5d6e56ba73066f2ab18c8a95d3646b9ad25
-DIST libshumate-1.0.2.tar.xz 110656 BLAKE2B 75abbfd9b4e1e7eb1044a33ff1b46391024005487f01aa4401552727322f92f28120104af4c2f90bb91c70ada6282882b9ee7f50ac62542aab8c88cc227799f8 SHA512 15539ce50462b345e4329fc27f52a5d1fb143e82821a990ce818a576fec94d1fe1fbef9926d0251d169f22394f3f21c62e56fe4d97bbdd4482429c70f22c6b2d
 DIST libshumate-1.0.3.tar.xz 110868 BLAKE2B 56d2304208dd41e1c6dc14b76bd6c5cadfb3359576c1c74405851e63be06deaa92bce4fae7bb91855fee53f561dfa84ccbb7ff61eed2f3195d6a93f76e3e2668 SHA512 dc72955bdbe6eee3d4d82dd884c5e74341fa5de25af388d3cc41a368170e4d8f5edf32acdf320e7dde9bc6ace94694e166eafb864887f66a60fb4053d12e1462
-EBUILD libshumate-1.0.1.ebuild 1441 BLAKE2B aafe203c13f50943bb4bddfc0350471c3838cb0981d86ab0fd0b49c678dd1d7d653463c734804e7fec8a7f7828a97d5928bcb7e96d52531cf6ad891f990ab6f7 SHA512 2df30a99fcd43784f78da8d6bf4e2d59b430020c8c0ab36d5db766c411945eb4bdcba8d7c8e541cbcb8508e439d3a8f88240d76ffddc2d0912d852b614334d91
-EBUILD libshumate-1.0.2.ebuild 1472 BLAKE2B 44fc3b38717f1916e9e717eada46d55051d160c0da872dc19f7b78311dedff0f3714f05222c9bed2131062d5124c5112556b4607ac965af16308863ecfdff9c1 SHA512 83a52d565a8351a22dbe7a566ad2a656e1290d08430b70b854aea7a349abc8d406d1384d2fb8fe2065fc9c200f22f13ab23581235d83b9e489e5896ceedaa78a
 EBUILD libshumate-1.0.3.ebuild 1578 BLAKE2B 1e8f71b91f0c236ce7be07b87ae1266b87885c10e5db7e00116a27fb8160aa27ccdd23ad1f47dd8cdd952022485bc25207cc3d9a4891a34ef872a8b74ce19e1b SHA512 023d3c1cf44bd4730ead0422168f6dfe96e734a4d63da951ef2585daa340d07e04f4945007fd898ec51c8249d56f68047f37534ea555e528d216c66a08d11a53
 MISC metadata.xml 351 BLAKE2B 0156fcc6cd262dc795ba78bf80f0ff69452458d8fe7116f2e3712f46c31b232cdc4a10a7d1b2fbf566a723ca7bc8a7c61b8299730e702c3bb40c6fa94c2647d7 SHA512 a4944c1629f135d09bc2d49fa0ff8d674076d669d312d7650113b2f5f89704faf67ff34ae0392684aa97459c6117b99ec8fd822817c99a6a02e4959c59dea095
diff --git a/media-libs/libshumate/libshumate-1.0.1.ebuild b/media-libs/libshumate/libshumate-1.0.1.ebuild
deleted file mode 100644
index e3f5bb4d13fb..000000000000
--- a/media-libs/libshumate/libshumate-1.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson vala virtualx
-
-DESCRIPTION="Shumate is a GTK toolkit providing widgets for embedded maps"
-HOMEPAGE="https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GNOME/libshumate"
-
-SLOT="1.0/1"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64"
-REQUIRED_USE="gtk-doc? ( introspection )"
-
-IUSE="gtk-doc +introspection vala" # vector-renderer is still experimental, maybe put in at a later release
-
-RDEPEND="
-	>=dev-libs/glib-2.68.0:2
-	>=x11-libs/cairo-1.4
-	>=dev-db/sqlite-1.12:3
-	>=gui-libs/gtk-4:4
-	>=net-libs/libsoup-3.0:3.0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
-"
-# vector-renderer? (
-#	>=dev-libs/json-glib-1.6.0[introspection?]
-#	dev-libs/protobuf-c
-# )
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
-	vala? ( $(vala_depend) )
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection gir)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		-Ddemos=false # only built, not installed
-		# $(meson_use vector-renderer vector_renderer)
-		-Dvector_renderer=false
-		-Dlibsoup3=true
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
-		mv "${ED}"/usr/share/doc/libshumate-1.0 "${ED}"/usr/share/gtk-doc/libshumate-1.0 || die
-	fi
-}
diff --git a/media-libs/libshumate/libshumate-1.0.2.ebuild b/media-libs/libshumate/libshumate-1.0.2.ebuild
deleted file mode 100644
index 44c612a7bba6..000000000000
--- a/media-libs/libshumate/libshumate-1.0.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson vala virtualx
-
-DESCRIPTION="Shumate is a GTK toolkit providing widgets for embedded maps"
-HOMEPAGE="https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GNOME/libshumate"
-
-SLOT="1.0/1"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
-REQUIRED_USE="gtk-doc? ( introspection )"
-
-IUSE="gtk-doc +introspection vala" # vector-renderer is still experimental, maybe put in at a later release
-
-RDEPEND="
-	>=dev-libs/glib-2.68.0:2
-	>=x11-libs/cairo-1.4
-	>=dev-db/sqlite-1.12:3
-	>=gui-libs/gtk-4:4
-	>=net-libs/libsoup-3.0:3.0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
-"
-# vector-renderer? (
-#	>=dev-libs/json-glib-1.6.0[introspection?]
-#	dev-libs/protobuf-c
-# )
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
-	vala? ( $(vala_depend) )
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection gir)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		-Ddemos=false # only built, not installed
-		# $(meson_use vector-renderer vector_renderer)
-		-Dvector_renderer=false
-		-Dlibsoup3=true
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
-		mv "${ED}"/usr/share/doc/libshumate-1.0 "${ED}"/usr/share/gtk-doc/libshumate-1.0 || die
-	fi
-}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d16387a6e11e..cfb4a0d38917 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,9 +1,5 @@
-DIST mesa-22.1.7.tar.xz 16109944 BLAKE2B 0d4724068eff0ad242e81808ff94b73e1b5da810d27706b5a594ad77875b54562db6d9f752b61bcfff773b26bbc64b751d4dd13cfa256106d3114377ea668d26 SHA512 447e87359445edce231761d94b316b2aa20e9ab58e4b59d75cbb1696dd0900e7164c32bebc3b75700b4070570b456f7a8cf0914181371754a52427d34e4b9120
-DIST mesa-22.2.2.tar.xz 16424508 BLAKE2B 08ab46718a767a7771affb4b5b6164fbc5430fd5a657cdf4008f16a84892673824976ba84450afbbb3a9431868dddc7f3570c11ab319f1bc9b892f46327b2c59 SHA512 a1eb67e1ae4880c79b1fdc570f4389baba0b8ba796da7e695c9af19a7d92b6c06b95570e6c796548b61355989025fb7efbf9acac74cbd695f7e297dc913b933c
 DIST mesa-22.2.3.tar.xz 16464020 BLAKE2B 8f1482983ff9de9565a7f48f22e315b022ea8a07d7157e0d202c4d027d13ad4563c40ea63e1d0a92675af7f23d5245be9ed137955c3a9dd85171a35d497a94b2 SHA512 08e9ce43392c46f9c0d122d70e118511eea81422d06f93ab6d330689b46feed3ac1c3bdcdcfd4a27cd5b9eaf26aab518d152a2c753f07b8ed19575d4ed892ad6
 DIST mesa-22.3.0.tar.xz 16878600 BLAKE2B 16b11bfad509292338fc46b36e49d747e5cd43a96c753cc2a8c0b915c7b86198a30aa78c8e2bcbaa0daf8cadd79a82046cf32ee6f6e373dcc00e2fdef554bc66 SHA512 bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da
-EBUILD mesa-22.1.7.ebuild 12037 BLAKE2B 36b57a2a4184e6788a4ccee1bab1b1281defbb1a26443266a6ede1d63fcac8f07994045b1dbcc725be4e4b1191603dc4ecf305159861fc3423799fb97652fa2e SHA512 e5b1099fc84179b3feaa4bdd94b01e286ab208cd2207bdbe61d951752b6e7f1ddc3942c260c8e24c5bd6019be2b8e0f7cb69685ef18e7271b065aba859cd5b36
-EBUILD mesa-22.2.2.ebuild 12670 BLAKE2B 183cad628fc9b0f4af0dbc1306fb1b0d3c1abfd6d7278f04b407b5f1eee3906de0e646f21ad8c0351d233d214ee61b523dfb8e3553054465dc68bbeed8532c1b SHA512 ad642794372efcd0c3588ef198c8f81a4944e92c0f3b834cd833e1fca48d2b32e2422113999f3f1c807779d057498e6d304217b4028480ef9da045ec7beb160d
 EBUILD mesa-22.2.3.ebuild 12662 BLAKE2B 1a59e0550ecb26c798779952f41b3778d8c5291ac82f1735f8ef34a0cf41f9f894623526f8ef6aa2df9b2d1c5caeb23dcdb907ee2292cf831b74a7743a94317d SHA512 2b67830be3e83ab1033d52d57300ab57b5aa85bede7e5f69bd94e9a517324c61abc719347f792596271e602a9057500eaa35ddd4f7d43278fb03bc4de0c4b5d9
 EBUILD mesa-22.3.0.ebuild 12206 BLAKE2B 362ae3d31f14fba5e638f3243b947bb80af2c9ca0da83daf48e5e0c7f1e15a77913bbeda7addea86edf7393a24ee2607e18b137b055680d045b51d445a3b4c7b SHA512 81fb7ceef610d81f3fd08b81acb48d5c14723f5d28af6f221214353ed944c77d0ddbfab990590dd9bcfb73ea86262d58e23ae6c9d1e1e78cb6ce507c0035799d
 EBUILD mesa-9999.ebuild 12206 BLAKE2B 362ae3d31f14fba5e638f3243b947bb80af2c9ca0da83daf48e5e0c7f1e15a77913bbeda7addea86edf7393a24ee2607e18b137b055680d045b51d445a3b4c7b SHA512 81fb7ceef610d81f3fd08b81acb48d5c14723f5d28af6f221214353ed944c77d0ddbfab990590dd9bcfb73ea86262d58e23ae6c9d1e1e78cb6ce507c0035799d
diff --git a/media-libs/mesa/mesa-22.1.7.ebuild b/media-libs/mesa/mesa-22.1.7.ebuild
deleted file mode 100644
index da1e8abbf2e6..000000000000
--- a/media-libs/mesa/mesa-22.1.7.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_radeonsi?   ( llvm )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="14"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature xvmc gallium-xvmc))
-	else
-		emesonargs+=(-Dgallium-xvmc=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-22.2.2.ebuild b/media-libs/mesa/mesa-22.2.2.ebuild
deleted file mode 100644
index c0bc271552b9..000000000000
--- a/media-libs/mesa/mesa-22.2.2.ebuild
+++ /dev/null
@@ -1,476 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa +proprietary-codecs selinux
-	test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_radeonsi?   ( llvm )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="15"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:15[${MULTILIB_USEDEP}]
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	vulkan? ( video_cards_radeonsi? ( dev-util/glslang ) )
-	vulkan-overlay? ( dev-util/glslang )
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature xvmc gallium-xvmc))
-	else
-		emesonargs+=(-Dgallium-xvmc=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index 6b68b3ad0d33..587d1717bb21 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -3,5 +3,5 @@ AUX nas-1.9.4-libfl.patch 349 BLAKE2B ee8d3ec8859fc47c87bf5d9a40cc2b468c136983a6
 AUX nas.conf.d 229 BLAKE2B 2ac8a6d914d02bc92258d7dfe3118e89ed6e3fe9d98e7a24eb8d72ded22dbb68a2d8129d066dc1457c0b8959f1762197b61f90502d3c60cdefd8aaeced04bbb3 SHA512 53cb9906d169b63b3592443bc0b63d59c4d0683e4b2194c60b1bc4297e6556f04b3ee9bf81da3a7f144757354de9aebe08c8445fccaa9a458a3b6537da68a2ac
 AUX nas.init.d 347 BLAKE2B 8b87c877fafd0e5993f909a4e132ed9f7042a3d8bdced8c7487afc962dfcad24a586ac754b99cbff815475f1326f44d52effb8eefd65cd0e25e6bc45991233af SHA512 556fc5d5135f789b0691de889aeaadce29319964443052787db5cb4cda480ed68c547c772de97c07ba2e0800f25cfa859376a3d80e9518995aae8136fe171468
 DIST nas-1.9.5.tar.gz 1170144 BLAKE2B 81b063f888d66534f8779d6b0534397ada703868ff711c49b998fbf56bc6e4313fa245b6168fe9913936afa0685bab595df24f9f4bd5663dfa560c4b64534466 SHA512 051b32593e7ace09cf2d12720fb80e38d4f83f36858debacfb828c759e98b3e29401c76e3e3770f57fbbd1750a84b17a18e712f0de3dbe0ff56f2505c2488d9a
-EBUILD nas-1.9.5.ebuild 2571 BLAKE2B 415750841a2437bc458f5dc846390782771547e6aa44bb4388b478b04e2bbfc3ea36dc4531915750dd23f24b9efd0483a44d09af6bb1f403794e8c36b9d1ef30 SHA512 1c48df3d2271dba620e3b71af54b5ba3f6c13647b3c80fb50b84093269a25a0106e2a465e43a3271148c465e26a00a0a27955f54cec79ef25761bd1464e6229c
+EBUILD nas-1.9.5.ebuild 2603 BLAKE2B 4161874e357c2e73de20cbfd391b68666ba9352a646b8d6a7f400a0d441a3795a021a0037cc973778ef3eaca3fe2f21379ac0977e8c0f6c47f63793aa16ffdcb SHA512 0bf8a888f6fcf38f23755c4d15ab240ce24966eb99d83011af5325ec4b21eba875074b8925a27dc398eb457167de49c3c2ef008449dcd8dc662ad227ef4c8811
 MISC metadata.xml 327 BLAKE2B 61fd2aff2796ecff70b16eb84bc90e9242cc3b08d8fb8fff9eb702310ad248ed2c0946fa3f974a420684ad9db4c47f871111ec1170e7d44eca89f263ce533f80 SHA512 bc1d1fa01d3ae21da48bc805c5f822cdff2f14f6a9c6c1ad5ee65063c265bd1c62efb3f45746fe9d1cbf55ff742c7812113f94068a47907042952016067310a7
diff --git a/media-libs/nas/nas-1.9.5.ebuild b/media-libs/nas/nas-1.9.5.ebuild
index d7e197596b34..361d40334d52 100644
--- a/media-libs/nas/nas-1.9.5.ebuild
+++ b/media-libs/nas/nas-1.9.5.ebuild
@@ -53,8 +53,10 @@ multilib_src_configure() {
 	pushd config || die
 	econf
 	popd || die
+
+	local cpp=($(get_abi_CHOST ${DEFAULT_ABI})-gcc $(get_abi_CFLAGS) -E) #884203
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(get_abi_CHOST ${DEFAULT_ABI})-gcc $(get_abi_CFLAGS) -E}" \
+		IMAKECPP="${IMAKECPP:-${cpp[*]}}" \
 		xmkmf -a || die
 }
 
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index feabf4534ee5..7adcd1b2fda4 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 7afe9c27419b..a66cbeacaf2f 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,7 +1,4 @@
-AUX 3.38.0-gst-inspect-sandbox.patch 1823 BLAKE2B 14be244c4bd9d96264ff776fb68381df5ea153fac41bf358e2253628bdb09733846a9331e6b129a1abd9186b967357549d6247d5ac021a37362a34206d8e17d8 SHA512 45f7602233b2f64debe1624442a2f6a21e0bf0b2cddf06b49dcdae7dcf0fc0ae6c3f16e5ec2603340df7cd89271501be70a31a0e0b0a737f85f667ac10c3ad53
 AUX 43.0-gst-inspect-sandbox.patch 1470 BLAKE2B e92278c4951deb89d13dc96ddc33606ba0f1d21c0e16f4d49cc637fdd15fc5905509eb040e9857ccc4e56d1f5c9f9afb0f7e7e994371928f67cf26c1ff1fddca SHA512 d248b919ac90b27f51eb2a74127013acbf59e669d83b1d4d9b177ee75881fa98714a36e94232a4caf2ca101efff8df4dde12ad9deae49a2f2072d62c3aef7781
-DIST totem-42.0.tar.xz 2476952 BLAKE2B 45eac2e586c3c17eab9f570812ae2c79812859635d1ef6df1d0d2c526436558dbab9581699ce86d3e2cd3048f5d65bbd1927c3faa5f7575a5468d0813ce68bcc SHA512 67872d06a7d691a23b97255c5ee5f8d90a1fdf2b36f064f26c10fb4958733772eea456aab4f0fe2c89d23ec987cf5b9c2383c97ba5bec45247953296f1cd6c4b
 DIST totem-43.0.tar.xz 2486304 BLAKE2B 3b43ad2cbf40472bff3b7369001b9b7784ef52244812d9aae493fffa99982a8f24770d0f5063f0b1f1fd320d6b2cec5e702ded9ccfaece51f7bdf9d862b96230 SHA512 b35d32ebadf4b9900ab234f07f8a7128edbc15593e1447c22f3c7a653fcbd4a2df9d45484e2decce5dd5ab67849fca1003a1ded338a0af0930b6560ee4f764ae
-EBUILD totem-42.0-r1.ebuild 2864 BLAKE2B 6e37f4c483fb85fd876f2303400b4dd645c923c060829cfe70b349dab33ae0c41034625a1257d79cf1ba86f1e52472ab50fb90007dba951251c70be8408f458a SHA512 e7bc37256d9dd2ceead0be928d2c578a7e5eb65a31f2af50944d479f327e5e7cc9a9c62a435dba730d796e12cb51fef691ecc70c0f19b732da8e178682ddd325
 EBUILD totem-43.0.ebuild 2999 BLAKE2B ef352de40600a0e950da7b212bb916a1c55fb25c6de429c7a1ab2942253dadaece1a6c7a4c1ef7af0dc3d85330764f41f5ad1dc6c6ab7b36b5658db6cb91505d SHA512 67aec58c1b1658bbd31233046bd8d09a4b97dba3a9140ebd49877226b664fe2e1c376184ec669dab079eb1d21143686140fecc31d1f70e0d45b4b4ea51a042d7
 MISC metadata.xml 1144 BLAKE2B 93350ee033585bcb68019b5daed10bdb6fd3f436b234fe7a077695a230868b7733cad41dec152aaa44a2b61b6aea0c057c59896ebe84b8e9bbafbba4b0aecc27 SHA512 5ec35c0372f72d88b19502b561031387b3fa1421e5cd5c642350410918b3b538b4e55fb0cf6f1ee69442ddf3865680c747e70f5196c45c7c91ea708d68a2ad15
diff --git a/media-video/totem/files/3.38.0-gst-inspect-sandbox.patch b/media-video/totem/files/3.38.0-gst-inspect-sandbox.patch
deleted file mode 100644
index ef3ea1140217..000000000000
--- a/media-video/totem/files/3.38.0-gst-inspect-sandbox.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From abb91b315f407b7e180bc00eb96f1cd6bb0ab25d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Thu, 7 Jun 2018 23:47:48 +0200
-Subject: [PATCH] Make gst-inspect calls optional at build-time
-
-Crashes on Gentoo due to plugins trying to access dri nodes which are sandboxed
----
- meson_options.txt       | 1 +
- src/backend/meson.build | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index 7070fd5d0..678b8f588 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -3,3 +3,4 @@ option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'a
- option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
- option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
- option('profile', type: 'combo', choices: ['default', 'development'], value: 'default', description: 'Build profiles')
-+option('gst-inspect', type: 'boolean', value: true, description: 'build-time test of available gstreamer plugins')
-diff --git a/src/backend/meson.build b/src/backend/meson.build
-index fbf74258b..1e025a5b9 100644
---- a/src/backend/meson.build
-+++ b/src/backend/meson.build
-@@ -1,5 +1,6 @@
- backend_inc = include_directories('.')
- 
-+if get_option('gst-inspect')
- gst_inspect = find_program(
-   'gst-inspect-1.0',
-   join_paths(gst_dep.get_pkgconfig_variable('toolsdir'), 'gst-inspect-1.0'),
-@@ -31,6 +32,7 @@ foreach plugin: gst_good_plugins
-   assert(r.returncode() == 0,
-          'Cannot find required GStreamer-1.0 plugin "' + plugin + '". It should be part of gst-plugins-good. Please install it.')
- endforeach
-+endif
- 
- sources = files(
-   'bacon-time-label.c',
--- 
-2.26.3
-
diff --git a/media-video/totem/totem-42.0-r1.ebuild b/media-video/totem/totem-42.0-r1.ebuild
deleted file mode 100644
index a91d7e1bcf24..000000000000
--- a/media-video/totem/totem-42.0-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos https://gitlab.gnome.org/GNOME/totem/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="gtk-doc +python test"
-# see bug #359379
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.22.0:3[introspection]
-	>=gui-libs/libhandy-1.5.0:1
-	>=media-libs/gstreamer-1.6.0:1.0
-	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
-	>=media-libs/gst-plugins-good-1.6.0:1.0
-	>=media-libs/grilo-0.3.0:0.3[playlist]
-	>=dev-libs/libpeas-1.1.0[gtk]
-	>=dev-libs/totem-pl-parser-3.26.5:0=[introspection]
-	gnome-base/gnome-desktop:3=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/gobject-introspection-1.54:=
-
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	media-plugins/grilo-plugins:0.3
-	media-plugins/gst-plugins-gtk:1.0[opengl]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	x11-themes/adwaita-icon-theme
-	python? (
-		x11-libs/pango[introspection]
-		>=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-"
-BDEPEND="
-	dev-lang/perl
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.5 )
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-# perl for pod2man
-# Prevent dev-python/pylint dep, bug #482538
-
-PATCHES=(
-	"${FILESDIR}"/3.38.0-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue)
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# Drop pointless samplepython plugin from build
-	sed -e '/samplepython/d' -i src/plugins/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dhelp=true
-		-Denable-easy-codec-installation=yes
-		-Denable-python=$(usex python yes no)
-		-Dwith-plugins=all # in 3.34.1 only builtin and python plugins are left, and python is extra controlled by enable-python
-		$(meson_use gtk-doc enable-gtk-doc)
-		-Dgst-inspect=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	local -x GST_PLUGIN_SYSTEM_PATH_1_0= # bug 812170
-	meson_src_install
-	if use python ; then
-		python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9fd65a7bd0f1..25fdb8d55a21 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 10acdf2b5149..68dd8c9c7e1e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Dec 2022 02:12:50 +0000
+Sun, 04 Dec 2022 08:09:34 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 27f75e6b0354..f75c37d9348c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 537682 BLAKE2B 5ea36706e9f3100f98a8bfc48465fc9c9965ad20b834454f02d0d345f47d095e5a9ed35b5f6e37007ee947d09446b720eafc19bfcbc8f9bac4db48a6a80580dd SHA512 0f5654de23f73899b445d3d10fa87c3ab643f77308df25999549e1b63748b5f101eb3f130afac8fb3e03eab64646d0e2016efd11a0f4eccc7a3b6117155d8d63
-TIMESTAMP 2022-12-04T02:12:54Z
+TIMESTAMP 2022-12-04T08:09:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOMAiZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOMVcNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC5XQ/+NUbYvVWsCU8ScF4z30tNlst3tQzVTLWVly+SgTeTFHKMZpqpoRgzXwUb
-mg9+cvLkORVrTW3k6VMbgWP/MB6+KHYe8REKI30eAb5vaeRiQg2HAZHVQJtL0YNe
-z1qRoVBW+lEV6vlY9UUoh+Fj2uAJC387kdS34wYXrWfqq2nRMQhYojNBcl40+Ppb
-6aaB/8Y/WrRsmb+fVEpT41Kiohx+fAoedz1IzlzPfgU0UPcsYwyui33VNPUPMQgw
-tHjzjzAZ0y2q8StX9MMXIWaWN1uQgo2RFidP28LX/Vlnw4JZLFSDUedpsoddy4uu
-vApGHzwshI/JOj+14PnET6Vs3plsMu0grHHP94pDLZZJzolcmFcMOumHQk++NqBp
-4rFthNbPMrE/X5UoZthFOce3sNWEWcC5z4IeEVPJcEHNDCWfqBVHpiI9808TTQim
-z623eMGnxS3JBN7Ddzvqk8t8T2GPCJji1rGjml8+0eAcWY5UBPNcRivPMET+ggvx
-xWTqzVqyxqclVeaDH9m8lt9v9bHr+pcX67fga8HrEvxbVjJwLH3kg/Nc+Ba/LUtv
-G2UyaGCUY81AS3tLoKBbm7mvuaxV1T0MtBwas5pA0upwFYmoti3YHE+5gIl0Z9tK
-buWQZWjqfCP8d563/UXCdGcii32533b/xqVTr9tRS0D7JHz+xM0=
-=YlVn
+klAl4w//acCMKeS3+fkf4fTSsttwERrSovR62iNP+cVCGj8N/zSWcF7J4ei9R2cG
+OVLwq58Udk0RP4GP04J9Km3xZ8hv/5LVrABidMCjnaYmyOLl68Y0q2pG1lx6qLmQ
+QXvfWbgnA8y4TkexfcqwIIM8s+XigiaXTz7PtuXVuKtj8wQozGrydSjTx0ZUQAoG
+HCIfIY8LGdvIsAGy8z3Nh7Ajy3PJny8xDkpjfYWPf2AzWHEj0fimB2yHG8x4Mmmy
+jGfF81zjHZuukLffiV9U24gIoXVjzFcOgt+X/FliLcKun/9/KJSHmQQGEqkFK8v1
+0kJ1FFnnAZCXsHc1clABsHzTrdQ6/yBBIz3G4wjqT+gn4pvn37UGzKCFlPl33m01
+Kg8KrBmhOetOEhNU40RPd7IFq7jqWqsJtT2O4s+VvMk8aIGSCH7pkIUaitQn7mfH
+3vAR97yZ9US7VjzrbxLZCFnxhAKavW32mCn5WRnisk+JZs0O/o6hdtIMLXaTe4U5
+Sh5mXkEZlIj8GgQd+ygv53KFLTg+sG3dWZf1AnFvReAUaTH7w3HSFTnyVMM2OBSb
+XSXRVFRZbpnKgAVNl60Z8r6dpUjdwHGjlIwZqpdgr6P1LmNUung9AGckSXP8YkLN
+p9nAM0dMySxOSJYwqpa1INmQBEgNaLzjH5BNgQhrVY8QwTHBnIc=
+=egyg
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 6750e7ab5a6e..eb9065137c12 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Dec 2022 02:12:51 +0000
+Sun, 04 Dec 2022 08:09:35 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a0bd30c2484b..8850c4862b50 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 05f9fd938ca3..fad6848ae32e 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0
deleted file mode 100644
index c900fecd7434..000000000000
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=gnome-base/gsettings-desktop-schemas virtual/pkgconfig test? ( >=dev-libs/libxml2-2.9.1 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.36.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-accessibility/at-spi2-core-2.33.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Gtk module for bridging AT-SPI to Atk
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Accessibility
-INHERIT=gnome.org meson-multilib virtualx xdg
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2.1+
-RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.36.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-accessibility/at-spi2-core-2.33.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/at-spi2-atk/2.38/at-spi2-atk-2.38.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ed8b38cd25387cf48b94c4bf23585ca7
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.44.1 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.44.1
deleted file mode 100644
index e4ddfda23515..000000000000
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.44.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.67.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=D-Bus accessibility specifications and registration daemon
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core
-INHERIT=gnome.org meson-multilib systemd virtualx xdg
-IUSE=X gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2.1+
-RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.67.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=gtk-doc? ( X )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/at-spi2-core/2.44/at-spi2-core-2.44.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b714465ff2d42798db9aa99be1eff1ab
diff --git a/metadata/md5-cache/app-accessibility/orca-42.3 b/metadata/md5-cache/app-accessibility/orca-42.3
deleted file mode 100644
index d619226a9908..000000000000
--- a/metadata/md5-cache/app-accessibility/orca-42.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) >=app-accessibility/at-spi2-atk-2.34:2 >=app-accessibility/at-spi2-core-2.36:2[introspection] >=dev-libs/atk-2.36 >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_8? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_10(-)] ) braille? ( python_single_target_python3_8? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_8(-)] dev-libs/liblouis[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_9(-)] dev-libs/liblouis[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_10(-)] dev-libs/liblouis[python,python_targets_python3_10(-)] ) )
-DESCRIPTION=Extensible screen reader that provides access to the desktop
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Orca
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 python-single-r1
-IUSE=+braille python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1+ CC-BY-SA-3.0
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) >=app-accessibility/at-spi2-atk-2.34:2 >=app-accessibility/at-spi2-core-2.36:2[introspection] >=dev-libs/atk-2.36 >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_8? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_10(-)] ) braille? ( python_single_target_python3_8? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_8(-)] dev-libs/liblouis[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_9(-)] dev-libs/liblouis[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_10(-)] dev-libs/liblouis[python,python_targets_python3_10(-)] ) ) dev-libs/atk[introspection] python_single_target_python3_8? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_8(-)] >=dev-python/pyatspi-2.36[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_9(-)] >=dev-python/pyatspi-2.36[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_10(-)] >=dev-python/pyatspi-2.36[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] ) x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/orca/42/orca-42.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=40a8f760e1653f4ce6b35a979adc36ba
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index e49eedec4bba..388f5f86efb4 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/system-config-printer-1.5.16-r1 b/metadata/md5-cache/app-admin/system-config-printer-1.5.16-r1
deleted file mode 100644
index caefd6d8d579..000000000000
--- a/metadata/md5-cache/app-admin/system-config-printer-1.5.16-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] app-text/docbook-xml-dtd:4.1.2 >=app-text/xmlto-0.0.22 dev-perl/XML-Parser dev-util/desktop-file-utils >=sys-devel/gettext-0.20 virtual/pkgconfig
-DESCRIPTION=Graphical user interface for CUPS administration
-EAPI=8
-HOMEPAGE=https://github.com/OpenPrinting/system-config-printer
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=python-single-r1 systemd udev xdg
-IUSE=gnome-keyring policykit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pycups[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/urllib3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycups[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/urllib3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pycups[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/urllib3[python_targets_python3_10(-)] ) gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/OpenPrinting/system-config-printer/releases/download/v1.5.16/system-config-printer-1.5.16.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f5301bd8cb77e0eb84d374e6c2ae24f9
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index a77cd5ee5be4..caee9697e2bd 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/gcab-1.4 b/metadata/md5-cache/app-arch/gcab-1.4
deleted file mode 100644
index a0c364597b7d..000000000000
--- a/metadata/md5-cache/app-arch/gcab-1.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/meson-0.50.0 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.62.0:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/msitools
-INHERIT=gnome.org meson vala xdg
-IUSE=gtk-doc +introspection test vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.62.0:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gcab/1.4/gcab-1.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=525480e6018e96804f8091ed053e288a
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index a02a68a90bbf..5498fd91e0c3 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/gedit-43.1 b/metadata/md5-cache/app-editors/gedit-43.1
deleted file mode 100644
index efd157da3488..000000000000
--- a/metadata/md5-cache/app-editors/gedit-43.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) app-text/docbook-xml-dtd:4.1.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1 ) dev-util/itstool >=sys-devel/gettext-0.18 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.70:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=gui-libs/amtk-5.6:= >=gui-libs/tepl-6.2:= >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/gobject-introspection-1.54:= spell? ( >=app-text/gspell-0.2.5:0= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_11(-)] dev-libs/libpeas[python,python_single_target_python3_11(-)] ) ) >=x11-libs/gtksourceview-4.0.2:4[introspection,vala]
-DESCRIPTION=A text editor for the GNOME desktop
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-single-r1 vala xdg
-IUSE=+python gtk-doc spell python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.70:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=gui-libs/amtk-5.6:= >=gui-libs/tepl-6.2:= >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/gobject-introspection-1.54:= spell? ( >=app-text/gspell-0.2.5:0= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_11(-)] dev-libs/libpeas[python,python_single_target_python3_11(-)] ) ) >=x11-libs/gtksourceview-4.0.2:4[introspection,vala] x11-themes/adwaita-icon-theme gnome-base/gsettings-desktop-schemas gnome-base/gvfs
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gedit/43/gedit-43.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b77a70411f45e4f0e1c053c77197cfdb
diff --git a/metadata/md5-cache/app-editors/ghex-42.3 b/metadata/md5-cache/app-editors/ghex-42.3
deleted file mode 100644
index 12dbda381e1b..000000000000
--- a/metadata/md5-cache/app-editors/ghex-42.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=gtk-doc? ( dev-util/gi-docgen ) test? ( dev-util/desktop-file-utils dev-libs/appstream-glib ) dev-util/gtk-update-icon-cache dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/glib-2.66.0:2 >=gui-libs/gtk-4.0.0:4 dev-libs/gobject-introspection !app-editors/ghex:2
-DESCRIPTION=GNOME hexadecimal editor
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-IUSE=gtk-doc test
-KEYWORDS=amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.66.0:2 >=gui-libs/gtk-4.0.0:4 dev-libs/gobject-introspection !app-editors/ghex:2
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=mirror://gnome/sources/ghex/42/ghex-42.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bfccd2c2b90f979984da53413c955eb9
diff --git a/metadata/md5-cache/app-editors/gnome-text-editor-42.2 b/metadata/md5-cache/app-editors/gnome-text-editor-42.2
deleted file mode 100644
index fac15cf54b58..000000000000
--- a/metadata/md5-cache/app-editors/gnome-text-editor-42.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.21 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/glib-2.69:2 >=gui-libs/gtk-4.6:4 >=gui-libs/gtksourceview-5.4.1:5 gui-libs/libadwaita:1 dev-libs/libpcre spell? ( >=app-text/enchant-2.2.0:2 dev-libs/icu:= )
-DESCRIPTION=A simple text editor for the GNOME desktop
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-text-editor
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-IUSE=spell
-KEYWORDS=amd64
-LICENSE=GPL-3+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.69:2 >=gui-libs/gtk-4.6:4 >=gui-libs/gtksourceview-5.4.1:5 gui-libs/libadwaita:1 dev-libs/libpcre spell? ( >=app-text/enchant-2.2.0:2 dev-libs/icu:= ) gnome-base/gsettings-desktop-schemas
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-text-editor/42/gnome-text-editor-42.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3cda58cca586af94dcd9c9723ea81437
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 6af492b1ab1b..8c65bbeacaa4 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/consult-0.18 b/metadata/md5-cache/app-emacs/consult-0.29
index 21f467f155ba..de9edf555a56 100644
--- a/metadata/md5-cache/app-emacs/consult-0.18
+++ b/metadata/md5-cache/app-emacs/consult-0.29
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-emacs/compat-28.1 >=app-editors/emacs-27:*
 SLOT=0
-SRC_URI=https://github.com/minad/consult/archive/refs/tags/0.18.tar.gz -> consult-0.18.tar.gz
+SRC_URI=https://github.com/minad/consult/archive/refs/tags/0.29.tar.gz -> consult-0.29.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5eafdaaa2b81a75da888a151968486c6
diff --git a/metadata/md5-cache/app-emacs/corfu-0.27 b/metadata/md5-cache/app-emacs/corfu-0.34
index 5fcf122b7336..168e50715aae 100644
--- a/metadata/md5-cache/app-emacs/corfu-0.27
+++ b/metadata/md5-cache/app-emacs/corfu-0.34
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27.1:*
 SLOT=0
-SRC_URI=https://github.com/minad/corfu/archive/refs/tags/0.27.tar.gz -> corfu-0.27.tar.gz
+SRC_URI=https://github.com/minad/corfu/archive/refs/tags/0.34.tar.gz -> corfu-0.34.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3f22940e280e7b8f4220299fb0cc70b6
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.6 b/metadata/md5-cache/app-emacs/org-mode-9.6
new file mode 100644
index 000000000000..044de9bf7e69
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/org-mode-9.6
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( virtual/texi2dvi ) >=app-editors/emacs-25.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=An Emacs mode for notes and project planning
+EAPI=8
+HOMEPAGE=https://www.orgmode.org/
+INHERIT=elisp readme.gentoo-r1
+IUSE=doc odt-schema
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )
+RDEPEND=>=app-editors/emacs-25.1:*
+RESTRICT=test
+SLOT=0
+SRC_URI=https://git.savannah.gnu.org/cgit/emacs/org-mode.git/snapshot/org-mode-release_9.6.tar.gz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=cdc05dc1260729dfed51a88e2d12d321
diff --git a/metadata/md5-cache/app-emacs/org-mode-9999 b/metadata/md5-cache/app-emacs/org-mode-9999
index 683a99f0299c..fa66b59f919a 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9999
+++ b/metadata/md5-cache/app-emacs/org-mode-9999
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( virtual/texi2dvi ) >=app-editors/emacs-24:* >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=doc? ( virtual/texi2dvi ) >=app-editors/emacs-25.1:* >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs mode for notes and project planning
 EAPI=8
@@ -7,8 +7,8 @@ INHERIT=elisp readme.gentoo-r1 git-r3
 IUSE=doc odt-schema
 LICENSE=GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )
 PROPERTIES=live
-RDEPEND=>=app-editors/emacs-24:*
+RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=test
 SLOT=0
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	2347f8fe2d392b2a091191f94be37e6f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=d1d216549b15e75475d9f7f0dff58bb3
+_md5_=b760baaa8fb368b79660d1042e7c5636
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 9d1c3e193db5..dfa57d1322f8 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/gnote-42.0 b/metadata/md5-cache/app-misc/gnote-42.0
deleted file mode 100644
index 37ee1a82016c..000000000000
--- a/metadata/md5-cache/app-misc/gnote-42.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.35.0 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.62:2[dbus] >=dev-cpp/glibmm-2.62.0:2 >=dev-cpp/gtkmm-3.22.20:3.0 >=app-crypt/libsecret-0.8 >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=app-text/gspell-1.6.0:= test? ( dev-libs/unittest++ )
-DESCRIPTION=Desktop note-taking application
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Gnote
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 meson readme.gentoo-r1
-IUSE=test
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-3+ FDL-1.1
-RDEPEND=>=dev-libs/glib-2.62:2[dbus] >=dev-cpp/glibmm-2.62.0:2 >=dev-cpp/gtkmm-3.22.20:3.0 >=app-crypt/libsecret-0.8 >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=app-text/gspell-1.6.0:= test? ( dev-libs/unittest++ ) gnome-base/gsettings-desktop-schemas
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnote/42/gnote-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f8a0b25ac246744ff6d70f28c9490f93
diff --git a/metadata/md5-cache/app-misc/tracker-3.3.3 b/metadata/md5-cache/app-misc/tracker-3.3.3
deleted file mode 100644
index 846d3d0379b7..000000000000
--- a/metadata/md5-cache/app-misc/tracker-3.3.3
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/glib-utils app-text/asciidoc dev-libs/libxslt || ( dev-lang/vala:0.56 ) gtk-doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/pygobject[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/pygobject[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/pygobject[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/pygobject[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/tappy[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/tappy[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/tappy[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/tappy[python_targets_python3_8(-)] ) ) ) || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0 stemmer? ( dev-libs/snowball-stemmer:= )
-DESCRIPTION=A tagging metadata database, search tool and indexer
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
-IUSE=gtk-doc +miners stemmer test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-PDEPEND=miners? ( >=app-misc/tracker-miners-3.3 )
-RDEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0 stemmer? ( dev-libs/snowball-stemmer:= )
-RESTRICT=!test? ( test )
-SLOT=3/0
-SRC_URI=mirror://gnome/sources/tracker/3.3/tracker-3.3.3.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5b08db26e434b84ad910e0567527cd07
diff --git a/metadata/md5-cache/app-misc/tracker-3.4.0-r1 b/metadata/md5-cache/app-misc/tracker-3.4.0-r1
deleted file mode 100644
index 5f6f57c08c9b..000000000000
--- a/metadata/md5-cache/app-misc/tracker-3.4.0-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/glib-utils app-text/asciidoc dev-libs/libxslt || ( dev-lang/vala:0.56 ) gtk-doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/pygobject[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/pygobject[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/pygobject[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/pygobject[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/tappy[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/tappy[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/tappy[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/tappy[python_targets_python3_8(-)] ) ) ) || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.99.2:3.0 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0:3 stemmer? ( dev-libs/snowball-stemmer:= )
-DESCRIPTION=A tagging metadata database, search tool and indexer
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
-IUSE=gtk-doc +miners stemmer test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-PDEPEND=miners? ( >=app-misc/tracker-miners-3.4 )
-RDEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.99.2:3.0 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0:3 stemmer? ( dev-libs/snowball-stemmer:= )
-RESTRICT=!test? ( test )
-SLOT=3/0
-SRC_URI=mirror://gnome/sources/tracker/3.4/tracker-3.4.0.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=467ec33de99e968074c45fd3775ac874
diff --git a/metadata/md5-cache/app-misc/tracker-miners-3.3.1 b/metadata/md5-cache/app-misc/tracker-miners-3.3.1
deleted file mode 100644
index f3bbd61b8625..000000000000
--- a/metadata/md5-cache/app-misc/tracker-miners-3.3.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-text/asciidoc dev-libs/libxslt dev-util/glib-utils dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/pygobject[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/pygobject[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/pygobject[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/pygobject[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/tappy[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/tappy[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/tappy[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/tappy[python_targets_python3_8(-)] ) ) gstreamer? ( media-libs/gstreamer:1.0[introspection] || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.70:2 >=app-misc/tracker-3.2.0:3= gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-plugins/gst-plugins-meta-1.20:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( media-libs/libjpeg-turbo:0= ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
-DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
-IUSE=cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.70:2 >=app-misc/tracker-3.2.0:3= gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-plugins/gst-plugins-meta-1.20:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( media-libs/libjpeg-turbo:0= ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
-REQUIRED_USE=cue? ( gstreamer )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=mirror://gnome/sources/tracker-miners/3.3/tracker-miners-3.3.1.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b5abaf0f42907ae8b4e78c8437791a99
diff --git a/metadata/md5-cache/app-misc/tracker-miners-3.4.0-r1 b/metadata/md5-cache/app-misc/tracker-miners-3.4.0-r1
deleted file mode 100644
index 737dfc455858..000000000000
--- a/metadata/md5-cache/app-misc/tracker-miners-3.4.0-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-text/asciidoc dev-libs/libxslt dev-util/glib-utils dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/pygobject[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/pygobject[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/pygobject[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/pygobject[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/tappy[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/tappy[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/tappy[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/tappy[python_targets_python3_8(-)] ) ) gstreamer? ( media-libs/gstreamer:1.0[introspection] || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.70:2 >=app-misc/tracker-3.4.0:3 gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-plugins/gst-plugins-meta-1.20:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( media-libs/libjpeg-turbo:0= ) iso? ( >=sys-libs/libosinfo-1.10.0-r1 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0:=[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
-DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
-IUSE=cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.70:2 >=app-misc/tracker-3.4.0:3 gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-plugins/gst-plugins-meta-1.20:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( media-libs/libjpeg-turbo:0= ) iso? ( >=sys-libs/libosinfo-1.10.0-r1 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0:=[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
-REQUIRED_USE=cue? ( gstreamer )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=mirror://gnome/sources/tracker-miners/3.4/tracker-miners-3.4.0.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1cde85887a7f572ab9837b6367b77e2a
diff --git a/metadata/md5-cache/app-misc/wayland-utils-1.0.0 b/metadata/md5-cache/app-misc/wayland-utils-1.0.0
deleted file mode 100644
index b036278eedfb..000000000000
--- a/metadata/md5-cache/app-misc/wayland-utils-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/wayland-1.17.0 dev-libs/wayland-protocols
-DESCRIPTION=Display information about supported Wayland protocols and current compositor
-EAPI=8
-HOMEPAGE=https://gitlab.freedesktop.org/wayland/wayland-utils
-INHERIT=meson
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/wayland-1.17.0
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/wayland/wayland-utils/-/archive/wayland-utils-1.0.0/wayland-utils-wayland-utils-1.0.0.tar.gz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a2473c6102982401e709b077ccd854db
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 227ca1cfa7fa..d2be86f8d44e 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/endeavour-42.0-r1 b/metadata/md5-cache/app-office/endeavour-42.0-r1
deleted file mode 100644
index 39a68ba2aa98..000000000000
--- a/metadata/md5-cache/app-office/endeavour-42.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/glib-2.58.0:2 >=gui-libs/gtk-3.92.0:4[introspection?] >=gui-libs/libadwaita-1.2.0:1 >=net-libs/gnome-online-accounts-3.25.3:= >=dev-libs/libpeas-1.17 dev-libs/libportal:0=[gtk] >=gnome-extra/evolution-data-server-3.33.2:=[gtk] introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-DESCRIPTION=Personal task manager
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Todo https://gitlab.gnome.org/World/Endeavour
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-IUSE=+introspection
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.58.0:2 >=gui-libs/gtk-3.92.0:4[introspection?] >=gui-libs/libadwaita-1.2.0:1 >=net-libs/gnome-online-accounts-3.25.3:= >=dev-libs/libpeas-1.17 dev-libs/libportal:0=[gtk] >=gnome-extra/evolution-data-server-3.33.2:=[gtk] introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.gnome.org/World/Endeavour/-/archive/v42.0/Endeavour-v42.0.tar.bz2
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b446f289691db00d2701c97b9e9e88c1
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.52-r1 b/metadata/md5-cache/app-office/gnumeric-1.12.52-r1
deleted file mode 100644
index ebf6de3607c5..000000000000
--- a/metadata/md5-cache/app-office/gnumeric-1.12.52-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.5 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.51:0.10[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg(+)] introspection? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) libgda? ( gnome-extra/libgda:5[gtk] )
-DESCRIPTION=The GNOME Spreadsheet
-EAPI=8
-HOMEPAGE=http://www.gnumeric.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools gnome.org python-r1 xdg
-IUSE=+introspection libgda perl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.51:0.10[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg(+)] introspection? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) libgda? ( gnome-extra/libgda:5[gtk] )
-REQUIRED_USE=introspection? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.52.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9e155ff410ad5b1d3fa542f668097024
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 86766fd2e910..1836fd8e52a5 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/evince-42.3 b/metadata/md5-cache/app-text/evince-42.3
deleted file mode 100644
index f8037b8ec2b5..000000000000
--- a/metadata/md5-cache/app-text/evince-42.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 app-text/docbook-xml-dtd:4.3 ) dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.5.0:1= >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-22.02.0[cairo] >=app-arch/libarchive-3.6.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-4.0:0= ) xps? ( >=app-text/libgxps-0.2.1:= )
-DESCRIPTION=Simple document viewer for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Evince
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson systemd xdg
-IUSE=cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.5.0:1= >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-22.02.0[cairo] >=app-arch/libarchive-3.6.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-4.0:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
-SLOT=0/evd3.4-evv3.3
-SRC_URI=mirror://gnome/sources/evince/42/evince-42.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=403dc741fb58b035db0807e70833a511
diff --git a/metadata/md5-cache/app-text/gspell-1.11.1 b/metadata/md5-cache/app-text/gspell-1.11.1
deleted file mode 100644
index 8546691569ea..000000000000
--- a/metadata/md5-cache/app-text/gspell-1.11.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.6 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) test? ( app-text/enchant:2[hunspell] || ( app-dicts/myspell-en[l10n_en(+)] app-dicts/myspell-en[l10n_en-US(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) test? ( sys-apps/dbus )
-DESCRIPTION=Spell check library for GTK+ applications
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gspell
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 vala virtualx
-IUSE=+introspection +vala test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=mirror://gnome/sources/gspell/1.11/gspell-1.11.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8662c65c666757c89cdc7fda9cbe3ebe
diff --git a/metadata/md5-cache/app-text/mupdf-1.20.3 b/metadata/md5-cache/app-text/mupdf-1.20.3
index 4fdbc3c8394a..50b99fa7e60d 100644
--- a/metadata/md5-cache/app-text/mupdf-1.20.3
+++ b/metadata/md5-cache/app-text/mupdf-1.20.3
@@ -7,11 +7,11 @@ HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop flag-o-matic toolchain-funcs xdg
 IUSE=+javascript opengl ssl X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 x86
 LICENSE=AGPL-3
 RDEPEND=dev-libs/gumbo media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext )
 REQUIRED_USE=opengl? ( javascript )
 SLOT=0/1.20.3
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.20.3-source.tar.gz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0aadd09b3707d075007c91a6fe9a1486
+_md5_=2d2087bdab7f8240445836fe2bf6d444
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 1f60a406cdf8..332c75da3c2b 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/libgpr-23.0.0 b/metadata/md5-cache/dev-ada/libgpr-23.0.0
new file mode 100644
index 000000000000..3d6376231216
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/libgpr-23.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-ada/xmlada:=[shared?,static-libs?,static-pic?,ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
+DESCRIPTION=Ada library to handle GPRbuild project files
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/
+INHERIT=ada multiprocessing
+IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-ada/xmlada:=[shared?,static-libs?,static-pic?,ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
+REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 ) || ( shared static-libs static-pic )
+SLOT=0/23.0.0
+SRC_URI=https://github.com/AdaCore/gprbuild/archive/refs/tags/v23.0.0.tar.gz -> gprbuild-23.0.0.tar.gz
+_eclasses_=ada	4770f6893bca382df11995a475063cf0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=f8837d0ecc0b7745567671ec6dab363e
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index f22dd9012e86..7efd0e0bf2e5 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/atkmm-2.28.2-r1 b/metadata/md5-cache/dev-cpp/atkmm-2.28.2-r1
deleted file mode 100644
index ddb6b1448d1b..000000000000
--- a/metadata/md5-cache/dev-cpp/atkmm-2.28.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( app-doc/doxygen[dot] dev-lang/perl dev-libs/libxslt ) || ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=dev-cpp/glibmm-2.46.2:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=C++ interface for the ATK library
-EAPI=7
-HOMEPAGE=https://www.gtkmm.org
-INHERIT=gnome.org meson-multilib python-any-r1
-IUSE=gtk-doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-cpp/glibmm-2.46.2:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=mirror://gnome/sources/atkmm/2.28/atkmm-2.28.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6a1b862d9963fa5823855b8fdac17df1
diff --git a/metadata/md5-cache/dev-cpp/cairomm-1.14.3-r1 b/metadata/md5-cache/dev-cpp/cairomm-1.14.3-r1
deleted file mode 100644
index 768dbcbbc241..000000000000
--- a/metadata/md5-cache/dev-cpp/cairomm-1.14.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( app-doc/doxygen[dot] dev-lang/perl dev-libs/libxslt ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/libsigc++-2.6.0:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.0[X=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-libs/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=C++ bindings for the Cairo vector graphics library
-EAPI=7
-HOMEPAGE=https://cairographics.org/cairomm/
-INHERIT=meson-multilib
-IUSE=gtk-doc test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/libsigc++-2.6.0:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.0[X=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.cairographics.org/releases/cairomm-1.14.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b2617cf134c67668390c9c93e658ca7d
diff --git a/metadata/md5-cache/dev-cpp/cairomm-1.16.1-r1 b/metadata/md5-cache/dev-cpp/cairomm-1.16.1-r1
deleted file mode 100644
index 795945da7a02..000000000000
--- a/metadata/md5-cache/dev-cpp/cairomm-1.16.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( app-doc/doxygen[dot] dev-lang/perl dev-libs/libxslt ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libsigc++:3[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.10[X=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-libs/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=C++ bindings for the Cairo vector graphics library
-EAPI=7
-HOMEPAGE=https://cairographics.org/cairomm/
-INHERIT=meson-multilib
-IUSE=gtk-doc test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/libsigc++:3[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.10[X=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=1.16
-SRC_URI=https://www.cairographics.org/releases/cairomm-1.16.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2c3678228d6d87618920eb6e4af8e8e1
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.66.4-r1 b/metadata/md5-cache/dev-cpp/glibmm-2.66.4-r1
deleted file mode 100644
index 90cc9ff2d1d1..000000000000
--- a/metadata/md5-cache/dev-cpp/glibmm-2.66.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) virtual/pkgconfig gtk-doc? ( app-doc/doxygen[dot] dev-lang/perl dev-perl/XML-Parser dev-libs/libxslt media-gfx/graphviz ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.61.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=C++ interface for glib2
-EAPI=8
-HOMEPAGE=https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm
-INHERIT=gnome.org meson-multilib python-any-r1
-IUSE=gtk-doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.61.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/glibmm/2.66/glibmm-2.66.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=fe5a41f7214a9695de9454022aa4a66a
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.72.1-r1 b/metadata/md5-cache/dev-cpp/glibmm-2.72.1-r1
deleted file mode 100644
index 74d8122d7c80..000000000000
--- a/metadata/md5-cache/dev-cpp/glibmm-2.72.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) virtual/pkgconfig gtk-doc? ( app-doc/doxygen[dot] dev-lang/perl dev-libs/libxslt ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.71.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libsigc++:3[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=C++ interface for glib2
-EAPI=8
-HOMEPAGE=https://www.gtkmm.org
-INHERIT=gnome.org meson-multilib python-any-r1
-IUSE=gtk-doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.71.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libsigc++:3[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=2.68
-SRC_URI=mirror://gnome/sources/glibmm/2.72/glibmm-2.72.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=973677335fd228364720f1f0c4aa2978
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.24.6-r1 b/metadata/md5-cache/dev-cpp/gtkmm-3.24.6-r1
deleted file mode 100644
index 1e9ce38fd1c4..000000000000
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.24.6-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( app-doc/doxygen[dot] dev-lang/perl dev-libs/libxslt ) || ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=dev-cpp/atkmm-2.24.2:0[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/cairomm-1.12.0:0[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.54.0:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/pangomm-2.38.2:1.4[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.35.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=C++ interface for GTK+
-EAPI=8
-HOMEPAGE=https://www.gtkmm.org https://gitlab.gnome.org/GNOME/gtkmm
-INHERIT=gnome.org meson-multilib python-any-r1 virtualx
-IUSE=aqua gtk-doc test wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-cpp/atkmm-2.24.2:0[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/cairomm-1.12.0:0[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.54.0:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/pangomm-2.38.2:1.4[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.35.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-REQUIRED_USE=|| ( aqua wayland X )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=3.0
-SRC_URI=mirror://gnome/sources/gtkmm/3.24/gtkmm-3.24.6.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=b76c02bbe47c771186d27fdeb0343045
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-4.6.1-r1 b/metadata/md5-cache/dev-cpp/gtkmm-4.6.1-r1
deleted file mode 100644
index df0402299131..000000000000
--- a/metadata/md5-cache/dev-cpp/gtkmm-4.6.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( app-doc/doxygen[dot] dev-lang/perl dev-libs/libxslt ) || ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?] >=gui-libs/gtk-4.6.0:4 >=dev-cpp/cairomm-1.15.4:1.16[gtk-doc?] >=dev-cpp/pangomm-2.50.0:2.48[gtk-doc?] >=x11-libs/gdk-pixbuf-2.35.5:2 >=media-libs/libepoxy-1.2 gtk-doc? ( dev-libs/libsigc++:3 )
-DESCRIPTION=C++ interface for GTK+
-EAPI=8
-HOMEPAGE=https://www.gtkmm.org
-INHERIT=gnome.org meson python-any-r1 virtualx
-IUSE=gtk-doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?] >=gui-libs/gtk-4.6.0:4 >=dev-cpp/cairomm-1.15.4:1.16[gtk-doc?] >=dev-cpp/pangomm-2.50.0:2.48[gtk-doc?] >=x11-libs/gdk-pixbuf-2.35.5:2 >=media-libs/libepoxy-1.2
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=4.0
-SRC_URI=mirror://gnome/sources/gtkmm/4.6/gtkmm-4.6.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=0d39bb84763f623b54ab6e6bf1a40821
diff --git a/metadata/md5-cache/dev-cpp/pangomm-2.46.2-r1 b/metadata/md5-cache/dev-cpp/pangomm-2.46.2-r1
deleted file mode 100644
index 7056b2924076..000000000000
--- a/metadata/md5-cache/dev-cpp/pangomm-2.46.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( app-doc/doxygen[dot] dev-lang/perl dev-libs/libxslt ) || ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=dev-cpp/cairomm-1.2.2:0[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.48.0:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libsigc++:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.45.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=C++ interface for pango
-EAPI=8
-HOMEPAGE=https://www.gtkmm.org
-INHERIT=gnome.org meson-multilib python-any-r1
-IUSE=gtk-doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-cpp/cairomm-1.2.2:0[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.48.0:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libsigc++:2[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.45.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=1.4
-SRC_URI=mirror://gnome/sources/pangomm/2.46/pangomm-2.46.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d054d9170f99f401c7d920aa09b0e277
diff --git a/metadata/md5-cache/dev-cpp/pangomm-2.50.0-r1 b/metadata/md5-cache/dev-cpp/pangomm-2.50.0-r1
deleted file mode 100644
index fc81dae9c68a..000000000000
--- a/metadata/md5-cache/dev-cpp/pangomm-2.50.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( app-doc/doxygen[dot] dev-lang/perl dev-libs/libxslt ) || ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=dev-cpp/cairomm-1.16.0:1.16[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-3:3[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.49.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=C++ interface for pango
-EAPI=7
-HOMEPAGE=https://www.gtkmm.org
-INHERIT=gnome.org meson-multilib python-any-r1
-IUSE=gtk-doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-cpp/cairomm-1.16.0:1.16[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.68.0:2.68[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-3:3[gtk-doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.49.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=2.48
-SRC_URI=mirror://gnome/sources/pangomm/2.50/pangomm-2.50.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e4587e5b398bcb6d5db48261621b07bf
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 5d91e1bb1460..217d04a3ba57 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/nprolog-1.92 b/metadata/md5-cache/dev-lang/nprolog-1.92
new file mode 100644
index 000000000000..2ba5b29e0ad7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nprolog-1.92
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Interpreter and compiler to be compatible with Arity/Prolog32
+EAPI=8
+HOMEPAGE=https://github.com/sasagawa888/nprolog/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://github.com/sasagawa888/nprolog/archive/v1.92.tar.gz -> nprolog-1.92.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=89bd0154cffa972ca4475f0186751093
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 962f948f256f..96144f087058 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/gjs-1.74.0 b/metadata/md5-cache/dev-libs/gjs-1.74.0
deleted file mode 100644
index 15467037f7b2..000000000000
--- a/metadata/md5-cache/dev-libs/gjs-1.74.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.66.0:2 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-102.2.0:102 cairo? ( x11-libs/cairo[X,glib] ) readline? ( sys-libs/readline:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) test? ( sys-apps/dbus >=x11-libs/gtk+-3.20:3[introspection] )
-DESCRIPTION=Javascript bindings for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
-INHERIT=flag-o-matic gnome.org meson virtualx
-IUSE=+cairo examples readline sysprof test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
-RDEPEND=>=dev-libs/glib-2.66.0:2 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-102.2.0:102 cairo? ( x11-libs/cairo[X,glib] ) readline? ( sys-libs/readline:0= )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gjs/1.74/gjs-1.74.0.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=5433727be2f6d939910682f242a3772c
diff --git a/metadata/md5-cache/dev-libs/glib-2.72.3 b/metadata/md5-cache/dev-libs/glib-2.72.3
deleted file mode 100644
index f47d754b8504..000000000000
--- a/metadata/md5-cache/dev-libs/glib-2.72.3
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) || ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] >=dev-lang/python-3.10.8_p3:3.10[xml(+)] >=dev-lang/python-3.9.15_p3:3.9[xml(+)] >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.72.3 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elf? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=The GLib library of C routines
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-IUSE=dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
-PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.72.3 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elf? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=gtk-doc? ( test )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.3.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=328a2855aa4fbc2a2decc297eaa971b4
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
deleted file mode 100644
index cb74facc1c4e..000000000000
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=gtk-doc? ( >=dev-util/gtk-doc-1.19 app-text/docbook-xml-dtd:4.3 app-text/docbook-xml-dtd:4.5 ) sys-devel/bison sys-devel/flex test? ( x11-libs/cairo[glib] python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mako[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/gobject-introspection-common-1.72.0 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mako[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ) virtual/pkgconfig python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Introspection system for GObject-based libraries
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-INHERIT=gnome.org meson python-single-r1 xdg
-IUSE=doctool gtk-doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/gobject-introspection-common-1.72.0 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mako[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ) virtual/pkgconfig python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gobject-introspection/1.72/gobject-introspection-1.72.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d3736973c5d00819fe1de97c70fafafa
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0
deleted file mode 100644
index 57add3392e13..000000000000
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Build infrastructure for GObject Introspection
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-INHERIT=gnome.org
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=HPND
-RDEPEND=!<dev-libs/gobject-introspection-1.72.0
-SLOT=0
-SRC_URI=mirror://gnome/sources/gobject-introspection/1.72/gobject-introspection-1.72.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a
-_md5_=6cc4178826029354470c0f4b803dbece
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.12.1 b/metadata/md5-cache/dev-libs/libevdev-1.12.1
deleted file mode 100644
index b3de0ca9321e..000000000000
--- a/metadata/md5-cache/dev-libs/libevdev-1.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Handler library for evdev events
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev
-INHERIT=meson-multilib python-any-r1
-IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.12.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8daa8ee502950c82b394d4861101b66d
diff --git a/metadata/md5-cache/dev-libs/libgee-0.20.5 b/metadata/md5-cache/dev-libs/libgee-0.20.5
deleted file mode 100644
index f0e6c20488b6..000000000000
--- a/metadata/md5-cache/dev-libs/libgee-0.20.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GObject-based interfaces and classes for commonly used data structures
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/Libgee
-INHERIT=gnome2
-IUSE=+introspection
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-SLOT=0.8/2
-SRC_URI=mirror://gnome/sources/libgee/0.20/libgee-0.20.5.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dac41c5d019b671e049b6d7d6ad916ee
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.3.2 b/metadata/md5-cache/dev-libs/libgit2-1.3.2
deleted file mode 100644
index db765c4abffb..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-1.3.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
-DESCRIPTION=A linkable library for Git
-EAPI=8
-HOMEPAGE=https://libgit2.org/
-INHERIT=cmake python-any-r1
-IUSE=examples gssapi +ssh test +threads trace
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
-RESTRICT=!test? ( test )
-SLOT=0/1.3
-SRC_URI=https://github.com/libgit2/libgit2/archive/v1.3.2.tar.gz -> libgit2-1.3.2.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=53a4c64bf9572e6ce8e77d461c11a7b9
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.10 b/metadata/md5-cache/dev-libs/libgusb-0.3.10
deleted file mode 100644
index 1f2fa216406a..000000000000
--- a/metadata/md5-cache/dev-libs/libgusb-0.3.10
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 dev-util/gtk-doc ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata
-DESCRIPTION=GObject wrapper for libusb
-EAPI=7
-HOMEPAGE=https://github.com/hughsie/libgusb
-INHERIT=meson-multilib python-any-r1 vala
-IUSE=gtk-doc +introspection static-libs test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.10.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5b03c215642332f0f50937fa4926e762
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.4.1 b/metadata/md5-cache/dev-libs/libgusb-0.4.1
deleted file mode 100644
index 610cf02cdadb..000000000000
--- a/metadata/md5-cache/dev-libs/libgusb-0.4.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) gtk-doc? ( dev-util/gi-docgen ) vala? ( || ( dev-lang/vala:0.56 ) ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata test? ( >=dev-util/umockdev-0.17.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=GObject wrapper for libusb
-EAPI=8
-HOMEPAGE=https://github.com/hughsie/libgusb
-INHERIT=meson-multilib python-any-r1 vala
-IUSE=gtk-doc +introspection test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata
-REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.4.1.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61
-_md5_=13afd0c05aeff657c0e8a73fe22b0a3c
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.32.0 b/metadata/md5-cache/dev-libs/libpeas-1.32.0
deleted file mode 100644
index 3af9f088d857..000000000000
--- a/metadata/md5-cache/dev-libs/libpeas-1.32.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.11 >=dev-util/gi-docgen-2021.7 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) glade? ( >=dev-util/glade-3.9.1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_luajit? ( >=dev-lua/lgi-0.9.0[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( >=dev-lua/lgi-0.9.0[lua_targets_lua5-1(-)] ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.2:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.2:3[python_targets_python3_11(-)] ) )
-DESCRIPTION=A GObject plugins library
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Libpeas https://gitlab.gnome.org/GNOME/libpeas
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org lua-single meson python-single-r1 vala virtualx xdg
-IUSE=glade +gtk gtk-doc lua +python vala lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) glade? ( >=dev-util/glade-3.9.1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_luajit? ( >=dev-lua/lgi-0.9.0[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( >=dev-lua/lgi-0.9.0[lua_targets_lua5-1(-)] ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.2:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.2:3[python_targets_python3_11(-)] ) )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libpeas/1.32/libpeas-1.32.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5fe939626885168e831b36b9bf8d2016
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1 b/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
deleted file mode 100644
index f7794b7e95ed..000000000000
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.18.2 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) )
-DESCRIPTION=Library for password quality checking and generating random passwords
-EAPI=8
-HOMEPAGE=https://github.com/libpwquality/libpwquality
-INHERIT=pam python-r1 usr-ldscript
-IUSE=pam python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.4/libpwquality-1.4.4.tar.bz2
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=099b043a395e8607f9a881de1b793359
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.5 b/metadata/md5-cache/dev-libs/libpwquality-1.4.5
index aa14f263dfe2..295f430d4ea8 100644
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.5
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.5
@@ -1,10 +1,10 @@
-BDEPEND=>=sys-devel/gettext-0.18.2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+BDEPEND=>=sys-devel/gettext-0.18.2 virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) )
 DESCRIPTION=Library for password quality checking and generating random passwords
 EAPI=8
 HOMEPAGE=https://github.com/libpwquality/libpwquality
-INHERIT=autotools pam python-r1 usr-ldscript
+INHERIT=pam python-r1 usr-ldscript
 IUSE=pam python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 split-usr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( BSD GPL-2 )
@@ -12,5 +12,5 @@ RDEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python?
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.5/libpwquality-1.4.5.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=b2e8f66267c8e669f28ae9e2bf50621e
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_md5_=da4ba56dda40f9bc6aef7df3c7ee3e79
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.10.7-r1 b/metadata/md5-cache/dev-libs/libsigc++-2.10.7-r1
deleted file mode 100644
index 7fc31075b833..000000000000
--- a/metadata/md5-cache/dev-libs/libsigc++-2.10.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/m4 gtk-doc? ( app-doc/doxygen[dot] ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=test? ( dev-libs/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Typesafe callback system for standard C++
-EAPI=8
-HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
-INHERIT=flag-o-matic gnome.org meson-multilib
-IUSE=gtk-doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/libsigc++/2.10/libsigc++-2.10.7.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f4f2b31d134429befc1aa0891d85a769
diff --git a/metadata/md5-cache/dev-libs/template-glib-3.34.1 b/metadata/md5-cache/dev-libs/template-glib-3.34.1
deleted file mode 100644
index c91ae5c12c31..000000000000
--- a/metadata/md5-cache/dev-libs/template-glib-3.34.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.56 ) ) dev-util/glib-utils sys-devel/bison sys-devel/flex >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:=
-DESCRIPTION=Templating library for GLib
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/template-glib
-INHERIT=gnome.org meson vala
-IUSE=gtk-doc +introspection vala
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:=
-REQUIRED_USE=vala? ( introspection )
-SLOT=0/1
-SRC_URI=mirror://gnome/sources/template-glib/3.34/template-glib-3.34.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61
-_md5_=7d9dc0c3910368aed432b55df9ce2bd3
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.26 b/metadata/md5-cache/dev-libs/wayland-protocols-1.26
deleted file mode 100644
index 8c32c28761d2..000000000000
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.26
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/wayland-scanner virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=test? ( dev-libs/wayland )
-DESCRIPTION=Wayland protocol files
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/
-INHERIT=meson
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.26.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=15e00772af962a9222b4bfd9cc09a6e2
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.28 b/metadata/md5-cache/dev-libs/wayland-protocols-1.28
deleted file mode 100644
index a70be63791ff..000000000000
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.28
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/wayland-scanner virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=test? ( dev-libs/wayland )
-DESCRIPTION=Wayland protocol files
-EAPI=8
-HOMEPAGE=https://wayland.freedesktop.org/
-INHERIT=meson
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.28/downloads/wayland-protocols-1.28.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7a1b62c35219faf1ea33b8357e0c808e
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 41a4a5ff51cc..e104b0b64943 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.60.0 b/metadata/md5-cache/dev-python/hypothesis-6.60.0
new file mode 100644
index 000000000000..d22f4a1c4846
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.60.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+),sqlite] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.60.0.tar.gz -> hypothesis-6.60.0.gh.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=576ea89cdacb1d979c5220c96e136d06
diff --git a/metadata/md5-cache/dev-python/nuitka-1.2.1 b/metadata/md5-cache/dev-python/nuitka-1.2.1
deleted file mode 100644
index b88b0313bedb..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
-INHERIT=distutils-r1 flag-o-matic optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-1.2.1.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=245696c80a85c4cec67db30002ad9105
diff --git a/metadata/md5-cache/dev-python/nuitka-1.2.2 b/metadata/md5-cache/dev-python/nuitka-1.2.2
deleted file mode 100644
index d78af7c5081d..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-1.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
-INHERIT=distutils-r1 flag-o-matic optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-1.2.2.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=245696c80a85c4cec67db30002ad9105
diff --git a/metadata/md5-cache/dev-python/nuitka-1.2 b/metadata/md5-cache/dev-python/nuitka-1.2.4
index a2351b2f44ee..95da2700a11b 100644
--- a/metadata/md5-cache/dev-python/nuitka-1.2
+++ b/metadata/md5-cache/dev-python/nuitka-1.2.4
@@ -11,6 +11,6 @@ RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-1.2.tar.gz
+SRC_URI=https://nuitka.net/releases/Nuitka-1.2.4.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=245696c80a85c4cec67db30002ad9105
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-3.1.0 b/metadata/md5-cache/dev-python/pytest-xdist-3.1.0
new file mode 100644
index 000000000000..ec298fb0cf15
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-xdist-3.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Distributed testing and loop-on-failing modes
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-3.1.0.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=9a9547d0d5a7febff74399843478692b
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index f23c1ff9dc63..0c6cb6afb76a 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/io-event-1.1.3 b/metadata/md5-cache/dev-ruby/io-event-1.1.3
new file mode 100644
index 000000000000..01199a9cd506
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/io-event-1.1.3
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( test? ( >=dev-ruby/sus-0.6:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/sus-0.6:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=An event loop
+EAPI=8
+HOMEPAGE=https://github.com/socketry/io-event
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~sparc
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1.1
+SRC_URI=https://github.com/socketry/io-event/archive/v1.1.3.tar.gz -> io-event-1.1.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a21b6149d4ca3654ab4379ae93da97ad
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r3 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r3
index 21dc870cc561..6c6d82d3cc54 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r3
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r3
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=A comprehensive and flexible logging library written in Ruby
 EAPI=8
 HOMEPAGE=http://log4r.sourceforge.net/
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 doc test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=LGPL-3
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/log4r-1.1.10.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=fd460ce96bb25f20307202c440d86a60
+_md5_=9b6e9c00e21f65553b8db15c9eac1ff5
diff --git a/metadata/md5-cache/dev-ruby/mail-2.8.0 b/metadata/md5-cache/dev-ruby/mail-2.8.0
new file mode 100644
index 000000000000..2e5f7348e0d4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mail-2.8.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby30(-)] dev-ruby/net-imap[ruby_targets_ruby30(-)] dev-ruby/net-pop[ruby_targets_ruby30(-)] dev-ruby/net-smtp[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby31(-)] dev-ruby/net-imap[ruby_targets_ruby31(-)] dev-ruby/net-pop[ruby_targets_ruby31(-)] dev-ruby/net-smtp[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=An email handling library
+EAPI=8
+HOMEPAGE=https://github.com/mikel/mail
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby30(-)] dev-ruby/net-imap[ruby_targets_ruby30(-)] dev-ruby/net-pop[ruby_targets_ruby30(-)] dev-ruby/net-smtp[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby31(-)] dev-ruby/net-imap[ruby_targets_ruby31(-)] dev-ruby/net-pop[ruby_targets_ruby31(-)] dev-ruby/net-smtp[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=2.8
+SRC_URI=https://github.com/mikel/mail/archive/2.8.0.tar.gz -> mail-2.8.0-git.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=11bce30021ab5876ea611f2a168a90b1
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
deleted file mode 100644
index f571cfdc9e23..000000000000
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
-EAPI=7
-HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=4
-SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7cb61dc31721aa8aae99cac362775bb0
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1 b/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
deleted file mode 100644
index e4c5f7f6bd52..000000000000
--- a/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby27(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Making tests easy on the fingers and eyes
-EAPI=7
-HOMEPAGE=http://thoughtbot.com/projects/shoulda
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby27(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.6.0.tar.gz -> shoulda-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=901683567b6c5b1df7f9d4c73103c823
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1
index b6a5289d9652..df8940630efb 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v4.5.1.tar.gz -> shoulda-matchers-4.5.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f84d4d2a36244f17502d7e6119d13f14
+_md5_=474addda306049e236ed6eacc15015e7
diff --git a/metadata/md5-cache/dev-ruby/slim-4.1.0-r1 b/metadata/md5-cache/dev-ruby/slim-4.1.0-r1
deleted file mode 100644
index dd17d900b78d..000000000000
--- a/metadata/md5-cache/dev-ruby/slim-4.1.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby27(-)] =dev-ruby/tilt-2.0*:*[ruby_targets_ruby27(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby27(-)] !!<dev-ruby/slim-3.0.9-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] dev-ruby/redcarpet[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/redcarpet[ruby_targets_ruby27(-)] dev-ruby/sassc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A template language aiming to reduce the syntax to the essential parts
-EAPI=7
-HOMEPAGE=http://slim-lang.com/
-INHERIT=ruby-fakegem
-IUSE=doc test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby27(-)] =dev-ruby/tilt-2.0*:*[ruby_targets_ruby27(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby27(-)] !!<dev-ruby/slim-3.0.9-r1[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=4
-SRC_URI=https://rubygems.org/gems/slim-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=96274fb19a92af4a17e9bd5a94df40dc
diff --git a/metadata/md5-cache/dev-ruby/sus-0.15.1 b/metadata/md5-cache/dev-ruby/sus-0.15.1
new file mode 100644
index 000000000000..8697e166fcb1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sus-0.15.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A fast and scalable test runner
+EAPI=8
+HOMEPAGE=https://github.com/ioquatix/sus
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ioquatix/sus/archive/v0.15.1.tar.gz -> sus-0.15.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=d3498f05ed0096b71e6b5f61e3a64f81
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-2.0.0 b/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
index 0b74c2751ee2..f0712be4132f 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
+++ b/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/unicode-display_width-1.1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/term-ansicolor[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/unicode-display_width-1.1.1:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/unicode-display_width-1.1.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/term-ansicolor[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/term-ansicolor[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Simple, feature rich ascii table generation library
 EAPI=7
 HOMEPAGE=https://github.com/tj/terminal-table
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/unicode-display_width-1.1.1:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/unicode-display_width-1.1.1:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/unicode-display_width-1.1.1:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/tj/terminal-table/archive/v2.0.0.tar.gz -> terminal-table-2.0.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d2d7c35e775a336621614288a946eb85
+_md5_=df19108bb9cfd3246c492cb78fec85ca
diff --git a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2 b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2
deleted file mode 100644
index c670004e0acb..000000000000
--- a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/excon-0.73[ruby_targets_ruby27(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/rake-12.3[ruby_targets_ruby27(-)] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Vagrant Cloud API Library
-EAPI=7
-HOMEPAGE=https://github.com/hashicorp/vagrant_cloud
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/excon-0.73[ruby_targets_ruby27(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vagrant_cloud/archive/v3.0.2.tar.gz -> vagrant_cloud-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1bf0098fd198cace20c0f1ff1c719435
diff --git a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5 b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
index 77b036dea9a5..8c217a2be61f 100644
--- a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
+++ b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/excon-0.73[ruby_targets_ruby27(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/excon-0.73[ruby_targets_ruby30(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/rake-12.3[ruby_targets_ruby27(-)] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( >=dev-ruby/rake-12.3[ruby_targets_ruby30(-)] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/excon-0.73[ruby_targets_ruby27(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/excon-0.73[ruby_targets_ruby30(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/excon-0.73[ruby_targets_ruby31(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/rake-12.3[ruby_targets_ruby27(-)] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( >=dev-ruby/rake-12.3[ruby_targets_ruby30(-)] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( >=dev-ruby/rake-12.3[ruby_targets_ruby31(-)] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Vagrant Cloud API Library
 EAPI=7
 HOMEPAGE=https://github.com/hashicorp/vagrant_cloud
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/excon-0.73[ruby_targets_ruby27(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/excon-0.73[ruby_targets_ruby30(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/excon-0.73[ruby_targets_ruby27(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/excon-0.73[ruby_targets_ruby30(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/excon-0.73[ruby_targets_ruby31(-)] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant_cloud/archive/v3.0.5.tar.gz -> vagrant_cloud-3.0.5.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e8f8a4db3a61a377a4f9272cc04aaf3b
+_md5_=bb21b082fd8856430f9a5d761d874db1
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 87d8b80628bc..5080204b7cc2 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/devhelp-41.2 b/metadata/md5-cache/dev-util/devhelp-41.2
deleted file mode 100644
index dcb4eda09a04..000000000000
--- a/metadata/md5-cache/dev-util/devhelp-41.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) dev-libs/libxml2:2 dev-util/glib-utils dev-util/itstool gtk-doc? ( >=dev-util/gi-docgen-2021.6 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.26:4[introspection?] gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An API documentation browser for GNOME
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Devhelp
-INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
-IUSE=+gedit gtk-doc +introspection python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~ppc64 ~sparc x86
-LICENSE=GPL-3+ CC-BY-SA-4.0
-RDEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.26:4[introspection?] gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gedit? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[introspection(+),python,python_single_target_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[introspection(+),python,python_single_target_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) )
-REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) gtk-doc? ( introspection )
-SLOT=0/3-6
-SRC_URI=mirror://gnome/sources/devhelp/41/devhelp-41.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ba0a1c5f9a3b32524e39c1734c502a3f
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.72.3 b/metadata/md5-cache/dev-util/gdbus-codegen-2.72.3
deleted file mode 100644
index acf85b7f0785..000000000000
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.72.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] )
-DESCRIPTION=GDBus code and documentation generator
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=gnome.org distutils-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.3.tar.xz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	gnome.org	429073e99d7067d3462e875bf5c6e14a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f73d335b8f4def69abea20c59aa4c212
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.74.0 b/metadata/md5-cache/dev-util/gdbus-codegen-2.74.0
deleted file mode 100644
index 7289a59bcdb5..000000000000
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.74.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] ) python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_11(-)] >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] )
-DESCRIPTION=GDBus code and documentation generator
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=gnome.org distutils-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.0.tar.xz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	gnome.org	429073e99d7067d3462e875bf5c6e14a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3503e49fd1322a4ab0f456f40c42f21f
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.74.2 b/metadata/md5-cache/dev-util/gdbus-codegen-2.74.2
deleted file mode 100644
index 095d7e9f733c..000000000000
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.74.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] ) python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_11(-)] >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] )
-DESCRIPTION=GDBus code and documentation generator
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=gnome.org distutils-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.2.tar.xz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	gnome.org	429073e99d7067d3462e875bf5c6e14a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3503e49fd1322a4ab0f456f40c42f21f
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.38-r1 b/metadata/md5-cache/dev-util/geany-plugins-1.38-r1
deleted file mode 100644
index 263e10756eb3..000000000000
--- a/metadata/md5-cache/dev-util/geany-plugins-1.38-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure install setup
-DEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:2.91 ) enchant? ( app-text/enchant:= ) git? ( <dev-libs/libgit2-1.4.0:= ) gpg? ( app-crypt/gpgme:= ) gtkspell? ( app-text/gtkspell:3= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( x11-libs/vte:2.91 ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= )
-DESCRIPTION=A collection of different plugins for Geany
-EAPI=8
-HOMEPAGE=https://plugins.geany.org
-INHERIT=lua-single
-IUSE=ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench +lua_single_target_lua5-1
-KEYWORDS=amd64 arm ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:2.91 ) enchant? ( app-text/enchant:= ) git? ( <dev-libs/libgit2-1.4.0:= ) gpg? ( app-crypt/gpgme:= ) gtkspell? ( app-text/gtkspell:3= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( x11-libs/vte:2.91 ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= ) scope? ( sys-devel/gdb )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
-SLOT=0
-SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.38.tar.gz
-_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5d7c4a9408ee4618eac9ceb7a373414e
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.72.3 b/metadata/md5-cache/dev-util/glib-utils-2.72.3
deleted file mode 100644
index f662d1e0f5c6..000000000000
--- a/metadata/md5-cache/dev-util/glib-utils-2.72.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils
-DEFINED_PHASES=compile configure install setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-DESCRIPTION=Build utilities for GLib using projects
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=gnome.org python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=LGPL-2.1+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1dee82b35e3b348107381c004eb60801
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.74.0 b/metadata/md5-cache/dev-util/glib-utils-2.74.0
deleted file mode 100644
index 8be3c6c7e084..000000000000
--- a/metadata/md5-cache/dev-util/glib-utils-2.74.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils
-DEFINED_PHASES=compile configure install setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-DESCRIPTION=Build utilities for GLib using projects
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=gnome.org python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=LGPL-2.1+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=693d8649ce56ef1e7ccf644bd7e4c655
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.74.2 b/metadata/md5-cache/dev-util/glib-utils-2.74.2
deleted file mode 100644
index f3c75e5102bb..000000000000
--- a/metadata/md5-cache/dev-util/glib-utils-2.74.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils
-DEFINED_PHASES=compile configure install setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-DESCRIPTION=Build utilities for GLib using projects
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=gnome.org python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=LGPL-2.1+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=693d8649ce56ef1e7ccf644bd7e4c655
diff --git a/metadata/md5-cache/dev-util/gnome-builder-43.2 b/metadata/md5-cache/dev-util/gnome-builder-43.2
deleted file mode 100644
index 9b814be2d00f..000000000000
--- a/metadata/md5-cache/dev-util/gnome-builder-43.2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=doc? ( python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ) gtk-doc? ( dev-util/gi-docgen app-text/docbook-xml-dtd:4.3 ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=>=dev-libs/glib-2.73.3:2 >=gui-libs/gtk-4.7.1:4[introspection] >=gui-libs/libadwaita-1.2.0:1 >=gui-libs/libpanel-1.0.0:1 >=gui-libs/gtksourceview-5.5.2:5[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.42.0:= >=dev-libs/libpeas-1.34.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.36.0:=[introspection] >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] ) >=app-text/cmark-0.29.0:0= d-spy? ( >=dev-util/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree >=net-libs/libsoup-3:3.0 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-1.1.0[ssh] ) >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_8? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) clang? ( sys-devel/clang:= ) spell? ( app-text/enchant:2 dev-libs/icu:= ) sysprof? ( >=dev-util/sysprof-capture-3.46.0:4 >=dev-util/sysprof-3.46.0:0/4 ) !!sys-devel/llvm:0
-DESCRIPTION=An IDE for writing GNOME-based software
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
-IUSE=clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=~amd64
-LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
-RDEPEND=>=dev-libs/glib-2.73.3:2 >=gui-libs/gtk-4.7.1:4[introspection] >=gui-libs/libadwaita-1.2.0:1 >=gui-libs/libpanel-1.0.0:1 >=gui-libs/gtksourceview-5.5.2:5[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.42.0:= >=dev-libs/libpeas-1.34.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.36.0:=[introspection] >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] ) >=app-text/cmark-0.29.0:0= d-spy? ( >=dev-util/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree >=net-libs/libsoup-3:3.0 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-1.1.0[ssh] ) >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_8? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) clang? ( sys-devel/clang:= ) spell? ( app-text/enchant:2 dev-libs/icu:= ) sysprof? ( >=dev-util/sysprof-capture-3.46.0:4 >=dev-util/sysprof-3.46.0:0/4 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) flatpak? ( git )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-builder/43/gnome-builder-43.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	llvm	29d5332b8530fb760c2ca71ad6706858	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9e6631f2b1ccb9d12dc82bfbde0d1294
diff --git a/metadata/md5-cache/dev-util/gnome-builder-43.3 b/metadata/md5-cache/dev-util/gnome-builder-43.3
deleted file mode 100644
index 9bd7f75a88e2..000000000000
--- a/metadata/md5-cache/dev-util/gnome-builder-43.3
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=doc? ( python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ) gtk-doc? ( dev-util/gi-docgen app-text/docbook-xml-dtd:4.3 ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=>=dev-libs/glib-2.73.3:2 >=gui-libs/gtk-4.7.1:4[introspection] >=gui-libs/libadwaita-1.2.0:1 >=gui-libs/libpanel-1.0.0:1 >=gui-libs/gtksourceview-5.5.2:5[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.42.0:= >=dev-libs/libpeas-1.34.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.36.0:=[introspection] >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] ) >=app-text/cmark-0.29.0:0= d-spy? ( >=dev-util/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree >=net-libs/libsoup-3:3.0 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-1.1.0[ssh] ) >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_8? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) clang? ( sys-devel/clang:= ) spell? ( app-text/enchant:2 dev-libs/icu:= ) sysprof? ( >=dev-util/sysprof-capture-3.46.0:4 >=dev-util/sysprof-3.46.0:0/4 ) !!sys-devel/llvm:0
-DESCRIPTION=An IDE for writing GNOME-based software
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
-IUSE=clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=~amd64
-LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
-RDEPEND=>=dev-libs/glib-2.73.3:2 >=gui-libs/gtk-4.7.1:4[introspection] >=gui-libs/libadwaita-1.2.0:1 >=gui-libs/libpanel-1.0.0:1 >=gui-libs/gtksourceview-5.5.2:5[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.42.0:= >=dev-libs/libpeas-1.34.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.36.0:=[introspection] >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] ) >=app-text/cmark-0.29.0:0= d-spy? ( >=dev-util/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree >=net-libs/libsoup-3:3.0 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-1.1.0[ssh] ) >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_8? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) clang? ( sys-devel/clang:= ) spell? ( app-text/enchant:2 dev-libs/icu:= ) sysprof? ( >=dev-util/sysprof-capture-3.46.0:4 >=dev-util/sysprof-3.46.0:0/4 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) flatpak? ( git )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-builder/43/gnome-builder-43.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	llvm	29d5332b8530fb760c2ca71ad6706858	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=aa1d7eb02701e13782f9cc2fdfa92c52
diff --git a/metadata/md5-cache/dev-util/meld-3.20.4 b/metadata/md5-cache/dev-util/meld-3.20.4
deleted file mode 100644
index 16b2808836a7..000000000000
--- a/metadata/md5-cache/dev-util/meld-3.20.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool dev-util/itstool sys-devel/gettext python_single_target_python3_8? ( dev-python/distro[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/distro[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/distro[python_targets_python3_10(-)] ) test? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] ) gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/gtksourceview-3.20.0:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme python_single_target_python3_8? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] ) gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/gtksourceview-3.20.0:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A graphical diff and merge tool
-EAPI=7
-HOMEPAGE=http://meldmerge.org/
-INHERIT=gnome2 distutils-r1 virtualx
-IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] ) gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/gtksourceview-3.20.0:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/meld/3.20/meld-3.20.4.tar.xz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=41feaa8784cc879e500d505ddca50701
diff --git a/metadata/md5-cache/dev-util/sysprof-3.44.0 b/metadata/md5-cache/dev-util/sysprof-3.44.0
deleted file mode 100644
index f0fddf9e8bf6..000000000000
--- a/metadata/md5-cache/dev-util/sysprof-3.44.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/itstool >=sys-devel/gettext-0.19.8 >=sys-kernel/linux-headers-2.6.32 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.67.4:2 gtk? ( >=x11-libs/gtk+-3.22.0:3 >=dev-libs/libdazzle-3.30.0 ) dev-libs/json-glib >=sys-auth/polkit-0.114 unwind? ( sys-libs/libunwind:= ) >=dev-util/sysprof-common-3.44.0 >=dev-util/sysprof-capture-3.44.0:4
-DESCRIPTION=System-wide Linux Profiler
-EAPI=8
-HOMEPAGE=http://sysprof.com/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson systemd xdg
-IUSE=gtk +unwind
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-3+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.67.4:2 gtk? ( >=x11-libs/gtk+-3.22.0:3 >=dev-libs/libdazzle-3.30.0 ) dev-libs/json-glib >=sys-auth/polkit-0.114 unwind? ( sys-libs/libunwind:= ) >=dev-util/sysprof-common-3.44.0 >=dev-util/sysprof-capture-3.44.0:4
-SLOT=0/4
-SRC_URI=mirror://gnome/sources/sysprof/3.44/sysprof-3.44.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=876972c4c9b4273ebc05dc8a33c3a37f
diff --git a/metadata/md5-cache/dev-util/sysprof-capture-3.44.0 b/metadata/md5-cache/dev-util/sysprof-capture-3.44.0
deleted file mode 100644
index 3c6cc18ad4b8..000000000000
--- a/metadata/md5-cache/dev-util/sysprof-capture-3.44.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen >=sys-kernel/linux-headers-2.6.32 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=Static library for sysprof capture data generation
-EAPI=8
-HOMEPAGE=http://sysprof.com/
-INHERIT=gnome.org meson-multilib systemd
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-3+ GPL-2+
-SLOT=4
-SRC_URI=mirror://gnome/sources/sysprof/3.44/sysprof-3.44.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=62cc26f687e7d4dabad48f790dded4c8
diff --git a/metadata/md5-cache/dev-util/sysprof-common-3.44.0 b/metadata/md5-cache/dev-util/sysprof-common-3.44.0
deleted file mode 100644
index df4c00e8e6d5..000000000000
--- a/metadata/md5-cache/dev-util/sysprof-common-3.44.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=install
-DESCRIPTION=Static library for sysprof capture data generation
-EAPI=8
-HOMEPAGE=http://sysprof.com/
-INHERIT=gnome.org
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-3+ GPL-2+
-RDEPEND=!=dev-util/sysprof-3.34.1-r0 !=dev-util/sysprof-capture-3.36.0-r0
-SLOT=0
-SRC_URI=mirror://gnome/sources/sysprof/3.44/sysprof-3.44.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a
-_md5_=a6d1995e38d6bfc177ed43ba30e1a239
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index f6be9abbd96b..3dab428439fc 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/gnome-chess-42.1 b/metadata/md5-cache/games-board/gnome-chess-42.1
deleted file mode 100644
index 96290ca4fbdc..000000000000
--- a/metadata/md5-cache/games-board/gnome-chess-42.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( dev-lang/vala:0.56 ) dev-util/itstool dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.44:2 gui-libs/gtk:4 >=gui-libs/libadwaita-1.0.0:1 >=gnome-base/librsvg-2.46.0:2 x11-libs/pango gnome-base/librsvg:2[vala]
-DESCRIPTION=Play the classic two-player boardgame of chess
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Chess https://gitlab.gnome.org/GNOME/gnome-chess
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 vala xdg
-KEYWORDS=amd64 arm64 ~riscv x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.44:2 gui-libs/gtk:4 >=gui-libs/libadwaita-1.0.0:1 >=gnome-base/librsvg-2.46.0:2 x11-libs/pango
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-chess/42/gnome-chess-42.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e274aea502c5f0cadd465583a8baa71a
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 68cef9975adc..918db1d2a161 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-42.0 b/metadata/md5-cache/games-puzzle/gnome-sudoku-42.0
deleted file mode 100644
index e882a6b4e28f..000000000000
--- a/metadata/md5-cache/games-puzzle/gnome-sudoku-42.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( dev-lang/vala:0.56 ) dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] >=x11-libs/gtk+-3.24.0:3[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection]
-DESCRIPTION=Test your logic skills in this number grid puzzle
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Sudoku
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=GPL-3+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] >=x11-libs/gtk+-3.24.0:3[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-sudoku/42/gnome-sudoku-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d9afdfd6c34c952682fd629b43346b4a
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 557fdfc7b61e..53582cd47321 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gdm-42.0 b/metadata/md5-cache/gnome-base/gdm-42.0
deleted file mode 100644
index f385d535984a..000000000000
--- a/metadata/md5-cache/gnome-base/gdm-42.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=gnome-base/dconf-0.20 >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( >=dev-libs/check-0.9.4 ) app-text/yelp-tools >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=virtual/udev >=dev-libs/libgudev-232:= >=dev-libs/glib-2.56:2 >=x11-libs/gtk+-2.91.1:3 >=media-libs/libcanberra-0.4[gtk3] >=sys-apps/accountsservice-0.6.35 x11-libs/libxcb sys-apps/keyutils:= selinux? ( sys-libs/libselinux ) x11-libs/libX11 x11-libs/libXau x11-base/xorg-server[-minimal] x11-libs/libXdmcp tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) systemd? ( >=sys-apps/systemd-186:0=[pam] ) elogind? ( >=sys-auth/elogind-239.3[pam] ) plymouth? ( sys-boot/plymouth ) audit? ( sys-process/audit ) sys-libs/pam sys-auth/pambase[elogind?,systemd?] >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus >=x11-misc/xdg-utils-1.0.2-r3 >=dev-libs/gobject-introspection-0.9.12:= x11-base/xorg-proto
-DESCRIPTION=GNOME Display Manager for managing graphical display servers and user logins
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GDM
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop gnome2 meson pam readme.gentoo-r1 systemd udev
-IUSE=accessibility audit bluetooth-sound branding elogind fprint plymouth selinux systemd tcpd test wayland
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
-RDEPEND=virtual/udev >=dev-libs/libgudev-232:= >=dev-libs/glib-2.56:2 >=x11-libs/gtk+-2.91.1:3 >=media-libs/libcanberra-0.4[gtk3] >=sys-apps/accountsservice-0.6.35 x11-libs/libxcb sys-apps/keyutils:= selinux? ( sys-libs/libselinux ) x11-libs/libX11 x11-libs/libXau x11-base/xorg-server[-minimal] x11-libs/libXdmcp tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) systemd? ( >=sys-apps/systemd-186:0=[pam] ) elogind? ( >=sys-auth/elogind-239.3[pam] ) plymouth? ( sys-boot/plymouth ) audit? ( sys-process/audit ) sys-libs/pam sys-auth/pambase[elogind?,systemd?] >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus >=x11-misc/xdg-utils-1.0.2-r3 >=dev-libs/gobject-introspection-0.9.12:= acct-group/gdm acct-user/gdm >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd[pam] )
-REQUIRED_USE=^^ ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gdm/42/gdm-42.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b8a8ef1aba5a8d484a03daa7e0c704d5
diff --git a/metadata/md5-cache/gnome-base/gnome-applets-3.44.0-r1 b/metadata/md5-cache/gnome-base/gnome-applets-3.44.0-r1
deleted file mode 100644
index 0207ac5400a0..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-applets-3.44.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-libs/gtk+-3.20.0:3[X] >=dev-libs/glib-2.44.0:2 >=gnome-base/gnome-panel-3.41.1 >=gnome-base/libgtop-2.11.92:= >=x11-libs/libwnck-3.14.1:3 >=x11-libs/libnotify-0.7 >=sys-power/upower-0.99.8:= >=x11-themes/adwaita-icon-theme-3.14.0 >=dev-libs/libxml2-2.5.0:2 >=dev-libs/libgweather-3.91.0:4= <dev-libs/libgweather-4.2.0:4= >=gnome-extra/gucharmap-2.33.0:2.90 >=sys-auth/polkit-0.97 x11-libs/libX11 tracker? ( app-misc/tracker:3 ) >=x11-libs/pango-1.50.0 x11-base/xorg-proto
-DESCRIPTION=Applets for the GNOME Flashback Panel
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-applets/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2
-IUSE=tracker
-KEYWORDS=~amd64 ~riscv
-LICENSE=GPL-2+ FDL-1.1
-RDEPEND=>=x11-libs/gtk+-3.20.0:3[X] >=dev-libs/glib-2.44.0:2 >=gnome-base/gnome-panel-3.41.1 >=gnome-base/libgtop-2.11.92:= >=x11-libs/libwnck-3.14.1:3 >=x11-libs/libnotify-0.7 >=sys-power/upower-0.99.8:= >=x11-themes/adwaita-icon-theme-3.14.0 >=dev-libs/libxml2-2.5.0:2 >=dev-libs/libgweather-3.91.0:4= <dev-libs/libgweather-4.2.0:4= >=gnome-extra/gucharmap-2.33.0:2.90 >=sys-auth/polkit-0.97 x11-libs/libX11 tracker? ( app-misc/tracker:3 ) >=x11-libs/pango-1.50.0
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-applets/3.44/gnome-applets-3.44.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=95aec91368b2f0667ecc9f6a4c8e9e26
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-42.3-r1 b/metadata/md5-cache/gnome-base/gnome-control-center-42.3-r1
deleted file mode 100644
index 76a19da3fd06..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-control-center-42.3-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 x11-base/xorg-proto dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/python-dbusmock[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=gnome-online-accounts? ( x11-libs/gtk+:3 >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-libs/libpulse-2.0[glib] >=gui-libs/libadwaita-1.1:1= >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.56.0:2 gnome-base/gnome-desktop:4= >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-42_alpha dev-libs/libxml2:2 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 x11-libs/libX11 >=x11-libs/libXi-1.2 media-libs/libepoxy app-crypt/gcr:0= >=dev-libs/libpwquality-1.2.2 >=gui-libs/gtk-4.4:4[X,wayland=] >=sys-auth/polkit-0.114 cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.36 >=net-misc/networkmanager-1.24.0[modemmanager] >=net-misc/modemmanager-0.7.990:= ) bluetooth? ( net-wireless/gnome-bluetooth:3= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.3.0:= media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret net-libs/gnutls:= media-libs/gsound x11-libs/pango
-DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-control-center
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
-IUSE=+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-PDEPEND=>=gnome-base/gnome-session-2.91.6-r1 networkmanager? ( gnome-extra/nm-applet )
-RDEPEND=gnome-online-accounts? ( x11-libs/gtk+:3 >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-libs/libpulse-2.0[glib] >=gui-libs/libadwaita-1.1:1= >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.56.0:2 gnome-base/gnome-desktop:4= >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-42_alpha dev-libs/libxml2:2 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 x11-libs/libX11 >=x11-libs/libXi-1.2 media-libs/libepoxy app-crypt/gcr:0= >=dev-libs/libpwquality-1.2.2 >=gui-libs/gtk-4.4:4[X,wayland=] >=sys-auth/polkit-0.114 cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.36 >=net-misc/networkmanager-1.24.0[modemmanager] >=net-misc/modemmanager-0.7.990:= ) bluetooth? ( net-wireless/gnome-bluetooth:3= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.3.0:= media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret net-libs/gnutls:= media-libs/gsound x11-libs/pango systemd? ( >=sys-apps/systemd-31 ) elogind? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme >=gnome-extra/gnome-color-manager-3.1.2 cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-REQUIRED_USE=^^ ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/gnome-control-center/42/gnome-control-center-42.3.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-42.0-patchset.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5b71591b9d5ea3066cf185e298b8a534
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-43.0 b/metadata/md5-cache/gnome-base/gnome-control-center-43.0
deleted file mode 100644
index bc356ebea962..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-control-center-43.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 x11-base/xorg-proto dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/python-dbusmock[python_targets_python3_8(-)] ) ) x11-apps/setxkbmap ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=gnome-online-accounts? ( x11-libs/gtk+:3 >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-libs/libpulse-2.0[glib] >=gui-libs/libadwaita-1.2.0:1 >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.70.0:2 gnome-base/gnome-desktop:4= >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-42_alpha dev-libs/libxml2:2 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 x11-libs/libX11 >=x11-libs/libXi-1.2 media-libs/libepoxy app-crypt/gcr:0= >=dev-libs/libpwquality-1.2.2 >=gui-libs/gtk-4.4:4[X,wayland=] >=sys-auth/polkit-0.114 cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.36 >=net-misc/networkmanager-1.24.0[modemmanager] >=net-misc/modemmanager-0.7.990:= ) bluetooth? ( net-wireless/gnome-bluetooth:3= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.3.0:= media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret net-libs/gnutls:= media-libs/gsound x11-libs/pango
-DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-control-center
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
-IUSE=+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+ CC-BY-SA-2.5
-PDEPEND=>=gnome-base/gnome-session-2.91.6-r1 networkmanager? ( gnome-extra/nm-applet )
-RDEPEND=gnome-online-accounts? ( x11-libs/gtk+:3 >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-libs/libpulse-2.0[glib] >=gui-libs/libadwaita-1.2.0:1 >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.70.0:2 gnome-base/gnome-desktop:4= >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-42_alpha dev-libs/libxml2:2 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 x11-libs/libX11 >=x11-libs/libXi-1.2 media-libs/libepoxy app-crypt/gcr:0= >=dev-libs/libpwquality-1.2.2 >=gui-libs/gtk-4.4:4[X,wayland=] >=sys-auth/polkit-0.114 cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.36 >=net-misc/networkmanager-1.24.0[modemmanager] >=net-misc/modemmanager-0.7.990:= ) bluetooth? ( net-wireless/gnome-bluetooth:3= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.3.0:= media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret net-libs/gnutls:= media-libs/gsound x11-libs/pango systemd? ( >=sys-apps/systemd-31 ) elogind? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme >=gnome-extra/gnome-color-manager-3.1.2 cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-REQUIRED_USE=^^ ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/gnome-control-center/43/gnome-control-center-43.0.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-43.0-patchset.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-gentoo-logo.svg https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-gentoo-logo-dark.svg
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c2515e675c212d278c7febc83245c2da
diff --git a/metadata/md5-cache/gnome-base/gnome-flashback-3.44.0-r1 b/metadata/md5-cache/gnome-base/gnome-flashback-3.44.0-r1
deleted file mode 100644
index dd2a8493b79d..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-flashback-3.44.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-libs/gdk-pixbuf-2.32.2:2 >=x11-libs/gtk+-3.22.0:3[X] >=gnome-base/gnome-desktop-3.12.0:3= >=gnome-base/gnome-panel-3.35.2 >=media-libs/libcanberra-0.13[gtk3] >=dev-libs/glib-2.67.3:2 >=gnome-base/gsettings-desktop-schemas-3.31.0 >=sys-auth/polkit-0.97 >=app-i18n/ibus-1.5.2 >=sys-power/upower-0.99.0:= >=x11-libs/libXrandr-1.5.0 >=x11-libs/libXxf86vm-1.1.4 x11-libs/libxcb x11-libs/libX11 gnome-base/gdm elogind? ( >=sys-auth/elogind-230 ) systemd? ( >=sys-apps/systemd-230:= ) net-wireless/gnome-bluetooth:2= x11-libs/libXext >=x11-libs/libXi-1.6.0 x11-libs/pango x11-libs/libxkbfile x11-misc/xkeyboard-config x11-libs/libXfixes media-sound/pulseaudio[glib] sys-libs/pam x11-base/xorg-proto
-DESCRIPTION=GNOME Flashback session
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-flashback/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 toolchain-funcs
-IUSE=elogind systemd
-KEYWORDS=~amd64 ~riscv
-LICENSE=GPL-3+
-RDEPEND=>=x11-libs/gdk-pixbuf-2.32.2:2 >=x11-libs/gtk+-3.22.0:3[X] >=gnome-base/gnome-desktop-3.12.0:3= >=gnome-base/gnome-panel-3.35.2 >=media-libs/libcanberra-0.13[gtk3] >=dev-libs/glib-2.67.3:2 >=gnome-base/gsettings-desktop-schemas-3.31.0 >=sys-auth/polkit-0.97 >=app-i18n/ibus-1.5.2 >=sys-power/upower-0.99.0:= >=x11-libs/libXrandr-1.5.0 >=x11-libs/libXxf86vm-1.1.4 x11-libs/libxcb x11-libs/libX11 gnome-base/gdm elogind? ( >=sys-auth/elogind-230 ) systemd? ( >=sys-apps/systemd-230:= ) net-wireless/gnome-bluetooth:2= x11-libs/libXext >=x11-libs/libXi-1.6.0 x11-libs/pango x11-libs/libxkbfile x11-misc/xkeyboard-config x11-libs/libXfixes media-sound/pulseaudio[glib] sys-libs/pam x11-wm/metacity gnome-base/gnome-panel gnome-base/gnome-settings-daemon
-REQUIRED_USE=^^ ( elogind systemd )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-flashback/3.44/gnome-flashback-3.44.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=188a822a3facfe57c490a474091f2f31
diff --git a/metadata/md5-cache/gnome-base/gnome-panel-3.44.0-r2 b/metadata/md5-cache/gnome-base/gnome-panel-3.44.0-r2
deleted file mode 100644
index f4c6df281fcf..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-panel-3.44.0-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=gnome-base/gnome-desktop-2.91.0:3= >=x11-libs/gdk-pixbuf-2.26.0:2 >=x11-libs/pango-1.15.4 >=dev-libs/glib-2.67.1:2 >=x11-libs/gtk+-3.22.0:3[X] >=x11-libs/libwnck-40.0:3 >=gnome-base/gnome-menus-3.7.90:3 eds? ( >=gnome-extra/evolution-data-server-3.33.2:= ) elogind? ( >=sys-auth/elogind-230 ) systemd? ( >=sys-apps/systemd-230:= ) >=x11-libs/cairo-1.0.0[X,glib] >=dev-libs/libgweather-3.91.0:4= <dev-libs/libgweather-4.2.0:4= >=gnome-base/dconf-0.13.4 >=x11-libs/libXrandr-1.3.0 gnome-base/gdm x11-libs/libX11 x11-libs/libXi sys-auth/polkit x11-libs/libXi x11-base/xorg-proto
-DESCRIPTION=The GNOME Flashback Panel
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-panel/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 toolchain-funcs
-IUSE=eds elogind systemd
-KEYWORDS=~amd64 ~riscv
-LICENSE=GPL-2+ FDL-1.1 LGPL-2.1+
-RDEPEND=>=gnome-base/gnome-desktop-2.91.0:3= >=x11-libs/gdk-pixbuf-2.26.0:2 >=x11-libs/pango-1.15.4 >=dev-libs/glib-2.67.1:2 >=x11-libs/gtk+-3.22.0:3[X] >=x11-libs/libwnck-40.0:3 >=gnome-base/gnome-menus-3.7.90:3 eds? ( >=gnome-extra/evolution-data-server-3.33.2:= ) elogind? ( >=sys-auth/elogind-230 ) systemd? ( >=sys-apps/systemd-230:= ) >=x11-libs/cairo-1.0.0[X,glib] >=dev-libs/libgweather-3.91.0:4= <dev-libs/libgweather-4.2.0:4= >=gnome-base/dconf-0.13.4 >=x11-libs/libXrandr-1.3.0 gnome-base/gdm x11-libs/libX11 x11-libs/libXi sys-auth/polkit x11-libs/libXi
-REQUIRED_USE=^^ ( elogind systemd )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-panel/3.44/gnome-panel-3.44.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fc5666185066c6eccba9554e96bd5b21
diff --git a/metadata/md5-cache/gnome-base/gnome-session-42.0 b/metadata/md5-cache/gnome-base/gnome-session-42.0
deleted file mode 100644
index 1e7fe8716dc9..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-session-42.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 x11-libs/xtrans virtual/pkgconfig doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.22.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl(+),gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-242:0= ) elogind? ( >=sys-auth/elogind-239.4 )
-DESCRIPTION=Gnome session manager
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-session
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop gnome.org gnome2-utils meson xdg
-IUSE=doc elogind systemd
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.22.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl(+),gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-242:0= ) elogind? ( >=sys-auth/elogind-239.4 ) >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-session/42/gnome-session-42.0.tar.xz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=352ab1b64794b7f07a5c72ab4f771968
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-42.4-r4 b/metadata/md5-cache/gnome-base/gnome-shell-42.4-r4
deleted file mode 100644
index e3057961d249..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-shell-42.4-r4
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5:0=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.71.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-42.0:0/10[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:= networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3:2 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/mesa[X(+)]
-DESCRIPTION=Provides core UI functions for the GNOME desktop
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-single-r1 virtualx xdg
-IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+ LGPL-2+
-PDEPEND=>=gnome-base/gdm-3.5[introspection(+)] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/gnome-browser-connector )
-RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5:0=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.71.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-42.0:0/10[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:= networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3:2 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] media-libs/graphene[introspection] >=dev-libs/libgweather-4.0.0:4[introspection] <dev-libs/libgweather-4.2.0:4 x11-libs/pango[introspection] net-libs/libsoup:2.4[introspection] >=sys-power/upower-0.99:=[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell sys-apps/xdg-desktop-portal-gnome
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ?? ( elogind systemd )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-shell/42/gnome-shell-42.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a573b4c41cbcbc075fc46cc97f829f17
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-43.0 b/metadata/md5-cache/gnome-base/gnome-shell-43.0
deleted file mode 100644
index ba6f2f2f05c5..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-shell-43.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( x11-wm/mutter[test] ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.90.0:4=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.73.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-43.0:0/11[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3:2 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/mesa[X(+)]
-DESCRIPTION=Provides core UI functions for the GNOME desktop
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
-IUSE=elogind gtk-doc +ibus +networkmanager systemd test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+ LGPL-2+
-PDEPEND=>=gnome-base/gdm-3.5[introspection(+)] >=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
-RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.90.0:4=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.73.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-43.0:0/11[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3:2 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] media-libs/graphene[introspection] x11-libs/pango[introspection] net-libs/libsoup:3.0[introspection] >=sys-power/upower-0.99:=[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) media-fonts/cantarell sys-apps/xdg-desktop-portal-gnome
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ?? ( elogind systemd )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-shell/43/gnome-shell-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3ec783d2cd3976d0c734113a7fe1c3ec
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-42.0 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-42.0
deleted file mode 100644
index f0983fddc542..000000000000
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Collection of GSettings schemas for GNOME desktop
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas
-INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
-IUSE=+introspection
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-SLOT=0
-SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/42/gsettings-desktop-schemas-42.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4ef64300ec8550302f671939772f91db
diff --git a/metadata/md5-cache/gnome-base/libgnomekbd-3.26.1 b/metadata/md5-cache/gnome-base/libgnomekbd-3.26.1
deleted file mode 100644
index 32aea99983fb..000000000000
--- a/metadata/md5-cache/gnome-base/libgnomekbd-3.26.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.4 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.91.7:3[X,introspection?] >=x11-libs/libxklavier-5.2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Gnome keyboard configuration library
-EAPI=7
-HOMEPAGE=https://www.gnome.org
-INHERIT=gnome2
-IUSE=+introspection test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.91.7:3[X,introspection?] >=x11-libs/libxklavier-5.2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-RESTRICT=!test? ( test )
-SLOT=0/8
-SRC_URI=mirror://gnome/sources/libgnomekbd/3.26/libgnomekbd-3.26.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cf3993db0a4a671e54ee49aa422f219b
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.21 b/metadata/md5-cache/gnome-base/librsvg-2.40.21
index 7ede96bddf27..626c5f158238 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.21
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.21
@@ -1,10 +1,10 @@
-BDEPEND=dev-libs/gobject-introspection-common dev-libs/vala-common dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 virtual/pkgconfig x11-libs/gdk-pixbuf vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils
+BDEPEND=dev-libs/gobject-introspection-common dev-libs/vala-common dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 virtual/pkgconfig x11-libs/gdk-pixbuf vala? ( || ( dev-lang/vala:0.56 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libcroco-0.6.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.38.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) tools? ( >=x11-libs/gtk+-3.10.0:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
-INHERIT=autotools gnome2 multilib-minimal vala
+INHERIT=gnome2 multilib-minimal vala
 IUSE=+introspection tools +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha arm hppa ~ia64 ~loong ~mips ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.40/librsvg-2.40.21.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9c062fca337b62502fcc2ea76e283438
+_md5_=0bdb27cfd4704e1995a2cdd1382061e4
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.54.4-r1 b/metadata/md5-cache/gnome-base/librsvg-2.54.4-r1
deleted file mode 100644
index ed68df913ec3..000000000000
--- a/metadata/md5-cache/gnome-base/librsvg-2.54.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=x11-libs/cairo-1.16.0[glib,svg(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.48.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) >=virtual/rust-1.56[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) gtk-doc? ( dev-util/gi-docgen ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) dev-libs/gobject-introspection-common dev-libs/vala-common >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg
-INHERIT=gnome2 multilib-minimal python-any-r1 rust-toolchain vala
-IUSE=gtk-doc +introspection +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2+
-RDEPEND=>=x11-libs/cairo-1.16.0[glib,svg(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.48.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://gnome/sources/librsvg/2.54/librsvg-2.54.4.tar.xz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5ae61005d4b050c1c4f43fe5bfc7b0db
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.54.5-r1 b/metadata/md5-cache/gnome-base/librsvg-2.54.5-r1
deleted file mode 100644
index b621e31e2a8b..000000000000
--- a/metadata/md5-cache/gnome-base/librsvg-2.54.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=x11-libs/cairo-1.16.0[glib,svg(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.48.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) >=virtual/rust-1.56[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) gtk-doc? ( dev-util/gi-docgen ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) dev-libs/gobject-introspection-common dev-libs/vala-common >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg
-INHERIT=gnome2 multilib-minimal python-any-r1 rust-toolchain vala
-IUSE=gtk-doc +introspection +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=x11-libs/cairo-1.16.0[glib,svg(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.48.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://gnome/sources/librsvg/2.54/librsvg-2.54.5.tar.xz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=15be26d3cf005d3b619a095d8de49600
diff --git a/metadata/md5-cache/gnome-base/nautilus-43.0 b/metadata/md5-cache/gnome-base/nautilus-43.0
deleted file mode 100644
index 08de4b51fb3b..000000000000
--- a/metadata/md5-cache/gnome-base/nautilus-43.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/gdbus-codegen-2.51.2 dev-util/glib-utils gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.72.0:2 >=media-libs/gexiv2-0.14.0 >=x11-libs/gdk-pixbuf-2.30.0:2 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.4.0 >=gnome-base/gnome-desktop-43:4= >=gnome-base/gsettings-desktop-schemas-42 >=gui-libs/gtk-4.7.2:4[X,introspection?] >=gui-libs/libadwaita-1.2:1 >=dev-libs/libportal-0.5:=[gtk] >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libcloudproviders-0.3.1 introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-DESCRIPTION=Default file manager for the GNOME desktop
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
-IUSE=gnome +gstreamer gtk-doc +introspection +previewer selinux sendto test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc
-LICENSE=GPL-3+ LGPL-2.1+
-PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
-RDEPEND=>=dev-libs/glib-2.72.0:2 >=media-libs/gexiv2-0.14.0 >=x11-libs/gdk-pixbuf-2.30.0:2 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.4.0 >=gnome-base/gnome-desktop-43:4= >=gnome-base/gsettings-desktop-schemas-42 >=gui-libs/gtk-4.7.2:4[X,introspection?] >=gui-libs/libadwaita-1.2:1 >=dev-libs/libportal-0.5:=[gtk] >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libcloudproviders-0.3.1 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) >=app-misc/tracker-miners-3.0:3=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/nautilus/43/nautilus-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bc35cfe2a911f5bb2089773626a76bbc
diff --git a/metadata/md5-cache/gnome-base/nautilus-43.1 b/metadata/md5-cache/gnome-base/nautilus-43.1
index 64aeb99e9c75..f9e6f533b62c 100644
--- a/metadata/md5-cache/gnome-base/nautilus-43.1
+++ b/metadata/md5-cache/gnome-base/nautilus-43.1
@@ -11,8 +11,9 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc
 LICENSE=GPL-3+ LGPL-2.1+
 PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
 RDEPEND=>=dev-libs/glib-2.72.0:2 >=media-libs/gexiv2-0.14.0 >=x11-libs/gdk-pixbuf-2.30.0:2 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.4.0 >=gnome-base/gnome-desktop-43:4= >=gnome-base/gsettings-desktop-schemas-42 >=gui-libs/gtk-4.7.2:4[introspection?] >=gui-libs/libadwaita-1.2:1 >=dev-libs/libportal-0.5:=[gtk] >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3 >=dev-libs/libxml2-2.7.8:2 >=net-libs/libcloudproviders-0.3.1 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) >=app-misc/tracker-miners-3.0:3=
+REQUIRED_USE=gtk-doc? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/43/nautilus-43.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d47a2634cdd2cf3fb54e7a864d2660c6
+_md5_=0249e03aabe0a6118c4487481bdba024
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 3a4b7682a3f3..65d0732ff1b9 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.0-r1 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.0-r1
deleted file mode 100644
index 200c5d506456..000000000000
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.0-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=net-libs/libsoup-3.1.1:3.0 >=dev-libs/json-glib-1.0.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=x11-libs/gtk+-3.20:3 >=gui-libs/gtk-4.4:4 >=media-libs/libcanberra-0.25[gtk3] oauth? ( >=net-libs/webkit-gtk-2.34.0:4.1 >=net-libs/webkit-gtk-2.36.0:5 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-4.2.0:4= ) vala? ( || ( dev-lang/vala:0.56 ) >=net-libs/libsoup-3.1.1:3.0[vala] dev-libs/libical[vala] )
-DESCRIPTION=Evolution groupware backend
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake db-use flag-o-matic gnome2 vala virtualx
-IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth vala +weather test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
-RDEPEND=>=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=net-libs/libsoup-3.1.1:3.0 >=dev-libs/json-glib-1.0.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=x11-libs/gtk+-3.20:3 >=gui-libs/gtk-4.4:4 >=media-libs/libcanberra-0.25[gtk3] oauth? ( >=net-libs/webkit-gtk-2.34.0:4.1 >=net-libs/webkit-gtk-2.36.0:5 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-4.2.0:4= )
-REQUIRED_USE=oauth? ( gtk ) vala? ( introspection )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=0/63-26-20
-SRC_URI=mirror://gnome/sources/evolution-data-server/3.46/evolution-data-server-3.46.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	db-use	867a9246a45efc09934e0f8e3380c813	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c2f6a28fdcd7df8bfa6189d3e0bd0e20
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.46.0 b/metadata/md5-cache/gnome-extra/evolution-ews-3.46.0
deleted file mode 100644
index 1a5c0d731f69..000000000000
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.46.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.68:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.46.0:0= >=mail-client/evolution-3.46.0:2.0 >=net-libs/libsoup-3.0:3.0 >=x11-libs/gtk+-3.10:3 test? ( >=net-libs/uhttpmock-0.9:1.0 )
-DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-ews
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake gnome2 optfeature
-IUSE=test
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.68:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.46.0:0= >=mail-client/evolution-3.46.0:2.0 >=net-libs/libsoup-3.0:3.0 >=x11-libs/gtk+-3.10:3
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/evolution-ews/3.46/evolution-ews-3.46.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=216f805c665c66d1c52f721058fa608b
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.46.1 b/metadata/md5-cache/gnome-extra/evolution-ews-3.46.1
deleted file mode 100644
index 59c4417e8ddc..000000000000
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.46.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.68:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.46.1:0= >=mail-client/evolution-3.46.1:2.0 >=net-libs/libsoup-3.0:3.0 >=x11-libs/gtk+-3.10:3 test? ( >=net-libs/uhttpmock-0.9:1.0 )
-DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-ews
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake gnome2 optfeature
-IUSE=test
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.68:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.46.1:0= >=mail-client/evolution-3.46.1:2.0 >=net-libs/libsoup-3.0:3.0 >=x11-libs/gtk+-3.10:3
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/evolution-ews/3.46/evolution-ews-3.46.1.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=216f805c665c66d1c52f721058fa608b
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-43.0 b/metadata/md5-cache/gnome-extra/gnome-boxes-43.0
deleted file mode 100644
index 31dd72e7be74..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-43.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) sys-libs/libosinfo[vala] app-crypt/libsecret[vala] net-libs/libsoup:3.0[vala] app-emulation/libvirt-glib[vala] net-misc/spice-gtk[vala] x11-libs/vte:2.91[vala] dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=gui-libs/libhandy-1.5.0:1 >=sys-libs/libosinfo-1.10.0-r1 app-crypt/libsecret net-libs/libsoup:3.0 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.38.0:4.1 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:=
-DESCRIPTION=Simple GNOME application to access remote or virtual systems
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
-KEYWORDS=~amd64
-LICENSE=LGPL-2+ CC-BY-2.0
-RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=gui-libs/libhandy-1.5.0:1 >=sys-libs/libosinfo-1.10.0-r1 app-crypt/libsecret net-libs/libsoup:3.0 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.38.0:4.1 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= app-cdr/cdrtools app-misc/tracker-miners:3[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-boxes/43/gnome-boxes-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0bf52edd8ba67e0e2d1df4a8dff9a815
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-43.0 b/metadata/md5-cache/gnome-extra/gnome-calendar-43.0
deleted file mode 100644
index a97e451b5c85..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-43.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.45.1:=[gtk] net-libs/libsoup:3.0 >=gui-libs/libadwaita-1.2:1 >=dev-libs/glib-2.67.5:2 >=gui-libs/gtk-4.6.0:4 >=dev-libs/libgweather-4.2.0:4= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.26.3:2
-DESCRIPTION=Manage your online calendars with simple and modern interface
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson virtualx xdg
-IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.45.1:=[gtk] net-libs/libsoup:3.0 >=gui-libs/libadwaita-1.2:1 >=dev-libs/glib-2.67.5:2 >=gui-libs/gtk-4.6.0:4 >=dev-libs/libgweather-4.2.0:4= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.26.3:2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-calendar/43/gnome-calendar-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=43bb1757c5c0dc8abda9467a7c2423a5
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-42.0-r1 b/metadata/md5-cache/gnome-extra/gnome-characters-42.0-r1
deleted file mode 100644
index 901ad2510379..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-characters-42.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5:= >=gui-libs/gtk-4.6:4[introspection] >=gui-libs/libadwaita-1.0:1= x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.36[introspection] gnome-base/gnome-desktop:3[introspection]
-DESCRIPTION=Unicode character map viewer and library
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+ BSD
-RDEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5:= >=gui-libs/gtk-4.6:4[introspection] >=gui-libs/libadwaita-1.0:1= x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.36[introspection] gnome-base/gnome-desktop:3[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-characters/42/gnome-characters-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=edaca0449375198f836c00574f4e225b
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-42.0 b/metadata/md5-cache/gnome-extra/gnome-logs-42.0
deleted file mode 100644
index ca57c15801a0..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-logs-42.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 app-text/docbook-xml-dtd:4.3 dev-libs/libxml2:2 dev-libs/libxslt dev-util/itstool virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=gnome-base/gsettings-desktop-schemas >=dev-libs/glib-2.43.90:2 >=x11-libs/gtk+-3.22:3 >=gui-libs/libhandy-1.5.0:1 sys-apps/systemd:=
-DESCRIPTION=Log viewer for the systemd journal
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Logs
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=GPL-3+
-RDEPEND=gnome-base/gsettings-desktop-schemas >=dev-libs/glib-2.43.90:2 >=x11-libs/gtk+-3.22:3 >=gui-libs/libhandy-1.5.0:1 sys-apps/systemd:=
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-logs/42/gnome-logs-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=60de8305c4fe63c180198121e3cf2fcb
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.32.0-r1 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.32.0-r1
deleted file mode 100644
index c74fcfd5bc95..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.32.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig test? ( sys-apps/dbus ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99.8:= x11-base/xorg-proto
-DESCRIPTION=GNOME power statistics
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-power-manager
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson virtualx xdg
-IUSE=test test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99.8:= x11-themes/adwaita-icon-theme
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-power-manager/3.32/gnome-power-manager-3.32.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1f39d15f984d227949bcbe2f5fbe430d
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-43.0-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-43.0-r1
deleted file mode 100644
index 33b4eba95347..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-43.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211
-DESCRIPTION=JavaScript extensions for GNOME Shell
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org readme.gentoo-r1 meson xdg
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=app-accessibility/at-spi2-core-2.46.0[introspection] >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-43* gui-libs/libadwaita[introspection] media-libs/clutter:1.0[introspection] media-libs/graphene[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme >=x11-wm/mutter-3.32[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-shell-extensions/43/gnome-shell-extensions-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=66ea2c77671192fb1ba7ae8884d84f13
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-42.4 b/metadata/md5-cache/gnome-extra/gnome-software-42.4
deleted file mode 100644
index 0fadb1fadce3..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-software-42.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.66.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-2.52.0:2.4 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
-DESCRIPTION=Gnome install & update software
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Software https://gitlab.gnome.org/GNOME/gnome-software
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson virtualx xdg
-IUSE=flatpak +firmware gnome gtk-doc sysprof udev test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.66.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-2.52.0:2.4 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-software/42/gnome-software-42.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=669aa5b5a98bee46d362b91c563b8821
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-43.0 b/metadata/md5-cache/gnome-extra/gnome-software-43.0
deleted file mode 100644
index 4c14918c1cc0..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-software-43.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.70.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-3.0:3.0 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5 test? ( dev-libs/libglib-testing )
-DESCRIPTION=Gnome install & update software
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Software https://gitlab.gnome.org/GNOME/gnome-software
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson virtualx xdg
-IUSE=flatpak +firmware gnome gtk-doc sysprof udev test test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.70.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-3.0:3.0 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-software/43/gnome-software-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=31a4c94b15cf23acf4dd2d056c69581b
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-43.1 b/metadata/md5-cache/gnome-extra/gnome-software-43.1
deleted file mode 100644
index 57361c960e3e..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-software-43.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.70.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-3.0:3.0 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5 test? ( dev-libs/libglib-testing )
-DESCRIPTION=Gnome install & update software
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Software https://gitlab.gnome.org/GNOME/gnome-software
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson virtualx xdg
-IUSE=flatpak +firmware gnome gtk-doc sysprof udev test test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.70.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-3.0:3.0 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-software/43/gnome-software-43.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=55184892485e7d2976b943f5e9316d82
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-42.0 b/metadata/md5-cache/gnome-extra/gnome-user-docs-42.0
deleted file mode 100644
index ede9a045bae7..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-user-docs-42.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DESCRIPTION=GNOME end user documentation
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-user-docs
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=CC-BY-3.0
-RESTRICT=binchecks strip !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-user-docs/42/gnome-user-docs-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=06e8886ad60c582519c55cc79ad71f87
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-share-3.34.0 b/metadata/md5-cache/gnome-extra/gnome-user-share-3.34.0
deleted file mode 100644
index 2e62185b1445..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-user-share-3.34.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-3.27.90 >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Personal file sharing for the GNOME desktop
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-user-share
-INHERIT=gnome.org gnome2-utils meson multilib systemd xdg
-KEYWORDS=amd64 arm64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-3.27.90 >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-user-share/3.34/gnome-user-share-3.34.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c4b7165481f82feb563f281726c83165
diff --git a/metadata/md5-cache/gnome-extra/gnome-weather-42.0-r1 b/metadata/md5-cache/gnome-extra/gnome-weather-42.0-r1
deleted file mode 100644
index c29d6ee86f9f..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-weather-42.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.56:= >=gui-libs/gtk-4.5:4 >=dev-libs/gjs-1.71.0 >=app-misc/geoclue-2.3.1:2.0 >=gui-libs/libadwaita-1.0.0:1= >=dev-libs/libgweather-3.90.0:4= <dev-libs/libgweather-4.2.0:4=
-DESCRIPTION=A weather application for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Design/Apps/Weather
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.56:= >=gui-libs/gtk-4.5:4 >=dev-libs/gjs-1.71.0 >=app-misc/geoclue-2.3.1:2.0 >=gui-libs/libadwaita-1.0.0:1= >=dev-libs/libgweather-3.90.0:4= <dev-libs/libgweather-4.2.0:4= gnome-base/gsettings-desktop-schemas
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-weather/42/gnome-weather-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4e7b40aa68ddfc64660706cfbf7254df
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-14.0.3 b/metadata/md5-cache/gnome-extra/gucharmap-14.0.3
deleted file mode 100644
index 88e2b49c367f..000000000000
--- a/metadata/md5-cache/gnome-extra/gucharmap-14.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) app-text/docbook-xml-dtd:4.1.2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( >=dev-util/gtk-doc-1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) vala? ( || ( dev-lang/vala:0.56 ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/libpcre2-10.21:= =app-i18n/unicode-data-14.0* >=x11-libs/pango-1.42.4-r2[introspection?] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Unicode character map viewer and library
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap https://gitlab.gnome.org/GNOME/gucharmap/
-INHERIT=gnome2-utils meson python-any-r1 vala xdg
-IUSE=+introspection gtk-doc vala
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-3+
-RDEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/libpcre2-10.21:= =app-i18n/unicode-data-14.0* >=x11-libs/pango-1.42.4-r2[introspection?]
-REQUIRED_USE=vala? ( introspection )
-SLOT=2.90
-SRC_URI=https://gitlab.gnome.org/GNOME/gucharmap/-/archive/14.0.3/gucharmap-14.0.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=064b28e64ef2a2e07a1e7bbdb06c7476
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-15.0.0 b/metadata/md5-cache/gnome-extra/gucharmap-15.0.0
deleted file mode 100644
index f33e4c56ab3a..000000000000
--- a/metadata/md5-cache/gnome-extra/gucharmap-15.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) app-text/docbook-xml-dtd:4.1.2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( >=dev-util/gtk-doc-1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) vala? ( || ( dev-lang/vala:0.56 ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/libpcre2-10.21:= =app-i18n/unicode-data-15.0* >=x11-libs/pango-1.42.4-r2[introspection?]
-DESCRIPTION=Unicode character map viewer and library
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap https://gitlab.gnome.org/GNOME/gucharmap/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2-utils meson python-any-r1 vala xdg
-IUSE=+introspection gtk-doc vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/libpcre2-10.21:= =app-i18n/unicode-data-15.0* >=x11-libs/pango-1.42.4-r2[introspection?]
-REQUIRED_USE=vala? ( introspection )
-SLOT=2.90
-SRC_URI=https://gitlab.gnome.org/GNOME/gucharmap/-/archive/15.0.0/gucharmap-15.0.0.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=35d0a5c4d1c1872d3872641b0611eb27
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.49 b/metadata/md5-cache/gnome-extra/libgsf-1.14.49
deleted file mode 100644
index ef7aca543f2a..000000000000
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.49
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= ) >=dev-util/gtk-doc-am-1.12 dev-libs/gobject-introspection-common >=sys-devel/gettext-0.19.6 virtual/pkgconfig test? ( dev-perl/XML-Parser )
-DESCRIPTION=The GNOME Structured File Library
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/libgsf
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2
-IUSE=bzip2 gtk +introspection test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
-RESTRICT=!test? ( test )
-SLOT=0/114
-SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.49.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=163be577cae276982f1609631f0adead
diff --git a/metadata/md5-cache/gnome-extra/yelp-42.1 b/metadata/md5-cache/gnome-extra/yelp-42.1
deleted file mode 100644
index ab95d007f5a2..000000000000
--- a/metadata/md5-cache/gnome-extra/yelp-42.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.13 dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.67.4:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-41.0 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 >=gui-libs/libhandy-1.5.0:1 x11-themes/adwaita-icon-theme
-DESCRIPTION=Help browser for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Yelp
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.67.4:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-41.0 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 >=gui-libs/libhandy-1.5.0:1 x11-themes/adwaita-icon-theme
-SLOT=0
-SRC_URI=mirror://gnome/sources/yelp/42/yelp-42.1.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=05ee493d70abed269ab159d2422556e1
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-42.0 b/metadata/md5-cache/gnome-extra/yelp-xsl-42.0
deleted file mode 100644
index f3ec8b3207d8..000000000000
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-42.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/itstool-1.2.0 >=sys-devel/gettext-0.19.8 app-alternatives/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
-DESCRIPTION=XSL stylesheets for yelp
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/yelp-xsl
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
-RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
-SLOT=0
-SRC_URI=mirror://gnome/sources/yelp-xsl/42/yelp-xsl-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2745faf8c0d0111f236bfffe01412cb7
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 2ac394b8cbef..6234c1d119b5 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/amtk-5.6.0 b/metadata/md5-cache/gui-libs/amtk-5.6.0
deleted file mode 100644
index 4c81cd6baa7f..000000000000
--- a/metadata/md5-cache/gui-libs/amtk-5.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3 introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-DESCRIPTION=Actions, Menus and Toolbars Kit for GTK+ applications
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/World/amtk
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 meson
-IUSE=+introspection gtk-doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3 introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-SLOT=5/1
-SRC_URI=mirror://gnome/sources/amtk/5.6/amtk-5.6.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a28e2aca7511c4bac7b497ffa2e18517
diff --git a/metadata/md5-cache/gui-libs/display-manager-init-1.0-r4 b/metadata/md5-cache/gui-libs/display-manager-init-1.0-r4
deleted file mode 100644
index 3695f1ea0b9f..000000000000
--- a/metadata/md5-cache/gui-libs/display-manager-init-1.0-r4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install preinst
-DESCRIPTION=RC init files for starting display and login managers
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:X11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-apps/gentoo-functions !<=sys-apps/sysvinit-2.98 !<=x11-apps/xinit-1.4.1 !<=x11-base/xorg-server-1.20.10 !=x11-base/xorg-server-1.20.10-r2
-SLOT=0
-_md5_=698a8c853d4295298cfa9779b410e4ee
diff --git a/metadata/md5-cache/gui-libs/gtk-4.6.7-r1 b/metadata/md5-cache/gui-libs/gtk-4.6.7-r1
deleted file mode 100644
index 1544f1ee1ae7..000000000000
--- a/metadata/md5-cache/gui-libs/gtk-4.6.7-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) dev-python/docutils >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig test? ( dev-libs/glib:2 wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfaces
-EAPI=8
-HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
-IUSE=aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
-KEYWORDS=amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2+
-PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
-RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
-REQUIRED_USE=|| ( aqua wayland X ) test? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=mirror://gnome/sources/gtk/4.6/gtk-4.6.7.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4593cd7f1162d8e6718c13b4220804eb
diff --git a/metadata/md5-cache/gui-libs/gtk-4.8.1-r1 b/metadata/md5-cache/gui-libs/gtk-4.8.1-r1
deleted file mode 100644
index 36b79956a56e..000000000000
--- a/metadata/md5-cache/gui-libs/gtk-4.8.1-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) dev-python/docutils >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig test? ( dev-libs/glib:2 wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.6.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.25 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfaces
-EAPI=8
-HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
-IUSE=aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+
-PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
-RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.6.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.25 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
-REQUIRED_USE=|| ( aqua wayland X ) test? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=mirror://gnome/sources/gtk/4.8/gtk-4.8.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fed0bb30e4541ea14f4d389f24edd403
diff --git a/metadata/md5-cache/gui-libs/gtksourceview-5.4.2 b/metadata/md5-cache/gui-libs/gtksourceview-5.4.2
deleted file mode 100644
index cf5d094338ac..000000000000
--- a/metadata/md5-cache/gui-libs/gtksourceview-5.4.2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.70:2 >=gui-libs/gtk-4.5:4[introspection?] >=dev-libs/libxml2-2.6:2 introspection? ( >=dev-libs/gobject-introspection-1.70.0:= ) >=dev-libs/fribidi-0.19.7 media-libs/fontconfig x11-libs/pango[introspection?] >=dev-libs/libpcre2-10.21:=[-recursion-limit(-)] sysprof? ( dev-util/sysprof-capture:4 )
-DESCRIPTION=A text widget implementing syntax highlighting and other features
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson vala virtualx xdg
-IUSE=gtk-doc +introspection sysprof +vala test
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.70:2 >=gui-libs/gtk-4.5:4[introspection?] >=dev-libs/libxml2-2.6:2 introspection? ( >=dev-libs/gobject-introspection-1.70.0:= ) >=dev-libs/fribidi-0.19.7 media-libs/fontconfig x11-libs/pango[introspection?] >=dev-libs/libpcre2-10.21:=[-recursion-limit(-)] sysprof? ( dev-util/sysprof-capture:4 )
-REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://gnome/sources/gtksourceview/5.4/gtksourceview-5.4.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c943abc1052aa96910368f60b7330b12
diff --git a/metadata/md5-cache/gui-libs/libadwaita-1.1.3 b/metadata/md5-cache/gui-libs/libadwaita-1.1.3
deleted file mode 100644
index ba903aab868f..000000000000
--- a/metadata/md5-cache/gui-libs/libadwaita-1.1.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) vala? ( || ( dev-lang/vala:0.56 ) ) >=dev-util/meson-0.59.0 dev-util/glib-utils sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.66:2 >=gui-libs/gtk-4.5.0:4[introspection?] dev-libs/fribidi introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-DESCRIPTION=Building blocks for modern adaptive GNOME applications
-EAPI=8
-HOMEPAGE=https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita
-INHERIT=gnome.org meson python-any-r1 vala virtualx
-IUSE=+introspection test +vala test
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.66:2 >=gui-libs/gtk-4.5.0:4[introspection?] dev-libs/fribidi introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=1
-SRC_URI=mirror://gnome/sources/libadwaita/1.1/libadwaita-1.1.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=aa83f8a581d7e8feacf30c001ce20a67
diff --git a/metadata/md5-cache/gui-libs/libhandy-1.6.3 b/metadata/md5-cache/gui-libs/libhandy-1.6.3
deleted file mode 100644
index b7b7cf0f53a4..000000000000
--- a/metadata/md5-cache/gui-libs/libhandy-1.6.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( >=dev-util/gi-docgen-2021.1 app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Building blocks for modern adaptive GNOME apps
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/libhandy/
-INHERIT=gnome.org meson xdg vala virtualx
-IUSE=examples glade gtk-doc +introspection test +vala test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=1
-SRC_URI=mirror://gnome/sources/libhandy/1.6/libhandy-1.6.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9b89b7e256562042351c78d0df16684f
diff --git a/metadata/md5-cache/gui-libs/libpanel-1.0.1 b/metadata/md5-cache/gui-libs/libpanel-1.0.1
deleted file mode 100644
index 253eab58b503..000000000000
--- a/metadata/md5-cache/gui-libs/libpanel-1.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.72:2 >=gui-libs/gtk-4.6:4[introspection?] >=gui-libs/libadwaita-1.0:1 introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-DESCRIPTION=A dock/panel library for GTK 4
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/libpanel
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson vala xdg
-IUSE=examples gtk-doc +introspection +vala
-KEYWORDS=~amd64
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/glib-2.72:2 >=gui-libs/gtk-4.6:4[introspection?] >=gui-libs/libadwaita-1.0:1 introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
-SLOT=1
-SRC_URI=mirror://gnome/sources/libpanel/1.0/libpanel-1.0.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cbc65d0dc24cb8afea5a182d995ac012
diff --git a/metadata/md5-cache/gui-libs/libwpe-1.12.3 b/metadata/md5-cache/gui-libs/libwpe-1.12.3
deleted file mode 100644
index ea1e2c11ae81..000000000000
--- a/metadata/md5-cache/gui-libs/libwpe-1.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=media-libs/mesa[egl(+)] x11-libs/libxkbcommon
-DESCRIPTION=Platform-agnostic interfaces for WPE WebKit
-EAPI=8
-HOMEPAGE=https://wpewebkit.org/
-INHERIT=meson
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=BSD-2
-RDEPEND=media-libs/mesa[egl(+)] x11-libs/libxkbcommon
-SLOT=1.0
-SRC_URI=https://wpewebkit.org/releases/libwpe-1.12.3.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a2438a0d81dc9e701a84d9d3ec565fd6
diff --git a/metadata/md5-cache/gui-libs/vte-0.70.0 b/metadata/md5-cache/gui-libs/vte-0.70.0
deleted file mode 100644
index 9c3226f3864f..000000000000
--- a/metadata/md5-cache/gui-libs/vte-0.70.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) dev-libs/libxml2:2 dev-util/glib-utils gtk-doc? ( dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=gui-libs/gtk-4.0.1:4[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?]
-DESCRIPTION=Library providing a virtual terminal emulator widget
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson python-any-r1 vala xdg
-IUSE=+crypt debug gtk-doc +icu +introspection systemd +vala vanilla
-KEYWORDS=~amd64
-LICENSE=LGPL-3+ GPL-3+
-RDEPEND=>=gui-libs/gtk-4.0.1:4[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?] ~gui-libs/vte-common-0.70.0[systemd?]
-REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
-SLOT=2.91-gtk4
-SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.70.0/vte-0.70.0.tar.bz2 !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.70.0-command-notify.patch.xz )
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fa268dc541471602622a8ae09ffbae8b
diff --git a/metadata/md5-cache/gui-libs/vte-common-0.70.0 b/metadata/md5-cache/gui-libs/vte-common-0.70.0
deleted file mode 100644
index 2ad2311b0f33..000000000000
--- a/metadata/md5-cache/gui-libs/vte-common-0.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( >=gui-libs/gtk-4.0.1:4 >=x11-libs/gtk+-3.24.22:3 ) >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21 systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib x11-libs/pango
-DESCRIPTION=Library providing a virtual terminal emulator widget
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte
-INHERIT=gnome.org meson python-any-r1
-IUSE=systemd
-KEYWORDS=~amd64
-LICENSE=LGPL-3+ GPL-3+
-RDEPEND=!<x11-libs/vte-0.70.0
-SLOT=2.91
-SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.70.0/vte-0.70.0.tar.bz2
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=93e609bd13145aeec6519d7fd0ca45d8
diff --git a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.12.1 b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.12.1
deleted file mode 100644
index 36908eb0073d..000000000000
--- a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/wayland-scanner virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.6:1.0
-DESCRIPTION=WPE backend designed for Linux desktop systems
-EAPI=8
-HOMEPAGE=https://wpewebkit.org/
-INHERIT=meson
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=BSD-2
-RDEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.6:1.0
-SLOT=1.0
-SRC_URI=https://wpewebkit.org/releases/wpebackend-fdo-1.12.1.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=676eefc40d8f1fb4df717974946add7e
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index e2bed86c4809..e756067a9ec6 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/evolution-3.46.0 b/metadata/md5-cache/mail-client/evolution-3.46.0
deleted file mode 100644
index 5b3bc196cd16..000000000000
--- a/metadata/md5-cache/mail-client/evolution-3.46.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.66:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.46.0:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-3.0:3.0 >=net-libs/webkit-gtk-2.38.0:4.1=[spell?] >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7 >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.26.3:2 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) weather? ( >=dev-libs/libgweather-4.2.0:4= >=sci-geosciences/geocode-glib-3.26.3:2 ) ytnef? ( net-mail/ytnef )
-DESCRIPTION=Integrated mail, addressbook and calendaring functionality
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake gnome2 readme.gentoo-r1
-IUSE=archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
-RDEPEND=>=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.66:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.46.0:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-3.0:3.0 >=net-libs/webkit-gtk-2.38.0:4.1=[spell?] >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7 >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.26.3:2 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) weather? ( >=dev-libs/libgweather-4.2.0:4= >=sci-geosciences/geocode-glib-3.26.3:2 ) ytnef? ( net-mail/ytnef ) highlight? ( app-text/highlight )
-SLOT=2.0
-SRC_URI=mirror://gnome/sources/evolution/3.46/evolution-3.46.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f06324e030a887451245df4b7a3b5e38
diff --git a/metadata/md5-cache/mail-client/evolution-3.46.1 b/metadata/md5-cache/mail-client/evolution-3.46.1
deleted file mode 100644
index eb8386c952ce..000000000000
--- a/metadata/md5-cache/mail-client/evolution-3.46.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.66:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.46.1:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-3.0:3.0 >=net-libs/webkit-gtk-2.38.0:4.1=[spell?] >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7 >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.26.3:2 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) weather? ( >=dev-libs/libgweather-4.2.0:4= >=sci-geosciences/geocode-glib-3.26.3:2 ) ytnef? ( net-mail/ytnef )
-DESCRIPTION=Integrated mail, addressbook and calendaring functionality
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake gnome2 readme.gentoo-r1
-IUSE=archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
-RDEPEND=>=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.66:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.46.1:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-3.0:3.0 >=net-libs/webkit-gtk-2.38.0:4.1=[spell?] >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7 >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.26.3:2 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) weather? ( >=dev-libs/libgweather-4.2.0:4= >=sci-geosciences/geocode-glib-3.26.3:2 ) ytnef? ( net-mail/ytnef ) highlight? ( app-text/highlight )
-SLOT=2.0
-SRC_URI=mirror://gnome/sources/evolution/3.46/evolution-3.46.1.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f48b7c9fe26327225f6e30481d275056
diff --git a/metadata/md5-cache/mail-client/geary-40.0-r2 b/metadata/md5-cache/mail-client/geary-40.0-r2
deleted file mode 100644
index 0332b471930a..000000000000
--- a/metadata/md5-cache/mail-client/geary-40.0-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=dev-libs/appstream-glib-0.7.10 dev-libs/libxml2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( net-libs/gnutls[tools] ) || ( dev-lang/vala:0.56 ) x11-libs/gtk+:3[introspection] net-libs/webkit-gtk:4[introspection] dev-libs/gmime:3.0[vala] app-crypt/gcr:0[introspection,vala] dev-libs/libgee:0.8[introspection] media-libs/gsound[vala] app-text/gspell[vala] gui-libs/libhandy:1[vala] app-crypt/libsecret[introspection,vala] net-libs/libsoup:2.4[introspection,vala] app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.66:2 >=x11-libs/gtk+-3.24.23:3 >=net-libs/webkit-gtk-2.30:4= >=dev-libs/gmime-3.2.4:3.0 >=dev-db/sqlite-3.24:3 x11-libs/cairo[glib] app-text/enchant:2 >=dev-libs/folks-0.11:0= >=app-crypt/gcr-3.10.1:0= >=dev-libs/libgee-0.8.5:0.8= net-libs/gnome-online-accounts media-libs/gsound >=app-text/gspell-1.7:= >=dev-libs/icu-60:= app-text/iso-codes >=dev-libs/json-glib-1.0 >=gui-libs/libhandy-1.2.1:1= >=dev-libs/libpeas-1.24.0[gtk] >=app-crypt/libsecret-0.11 dev-libs/snowball-stemmer:= >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.7.8:2 ytnef? ( >=net-mail/ytnef-1.9.3 )
-DESCRIPTION=A lightweight, easy-to-use, feature-rich email client
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Geary
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
-IUSE=test ytnef test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+ CC-BY-3.0 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.66:2 >=x11-libs/gtk+-3.24.23:3 >=net-libs/webkit-gtk-2.30:4= >=dev-libs/gmime-3.2.4:3.0 >=dev-db/sqlite-3.24:3 x11-libs/cairo[glib] app-text/enchant:2 >=dev-libs/folks-0.11:0= >=app-crypt/gcr-3.10.1:0= >=dev-libs/libgee-0.8.5:0.8= net-libs/gnome-online-accounts media-libs/gsound >=app-text/gspell-1.7:= >=dev-libs/icu-60:= app-text/iso-codes >=dev-libs/json-glib-1.0 >=gui-libs/libhandy-1.2.1:1= >=dev-libs/libpeas-1.24.0[gtk] >=app-crypt/libsecret-0.11 dev-libs/snowball-stemmer:= >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.7.8:2 ytnef? ( >=net-mail/ytnef-1.9.3 ) gnome-base/gsettings-desktop-schemas
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/geary/40/geary-40.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=14cec082c34e3bf7867c2a9e6f284f9f
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 2c38712aeff1..592faf642d0b 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/converseen-0.9.9.8 b/metadata/md5-cache/media-gfx/converseen-0.9.9.8
index 9442002da770..1d1caea5ead9 100644
--- a/metadata/md5-cache/media-gfx/converseen-0.9.9.8
+++ b/metadata/md5-cache/media-gfx/converseen-0.9.9.8
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://converseen.fasterland.net/ https://github.com/Faster3ck/Converseen/
 INHERIT=cmake xdg-utils
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-gfx/imagemagick:=[cxx]
 SLOT=0
 SRC_URI=https://github.com/Faster3ck/Converseen/archive/v0.9.9.8.tar.gz -> converseen-0.9.9.8.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=baa60f00bf760b12e88c4762e5a638b1
+_md5_=2e4e57b01df77c7b76187832f16eb741
diff --git a/metadata/md5-cache/media-gfx/eog-43.0-r1 b/metadata/md5-cache/media-gfx/eog-43.0-r1
deleted file mode 100644
index 9c20dbc79a27..000000000000
--- a/metadata/md5-cache/media-gfx/eog-43.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=gtk-doc? ( dev-util/gi-docgen app-text/docbook-xml-dtd:4.1.2 ) dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-42_beta >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.24.15:3[introspection,X] >=gui-libs/libhandy-1.5.0:1 sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2= ) jpeg? ( media-libs/libjpeg-turbo:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
-DESCRIPTION=The Eye of GNOME image viewer
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-IUSE=+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-42_beta >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.24.15:3[introspection,X] >=gui-libs/libhandy-1.5.0:1 sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2= ) jpeg? ( media-libs/libjpeg-turbo:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
-REQUIRED_USE=exif? ( jpeg ) gtk-doc? ( introspection )
-SLOT=1
-SRC_URI=mirror://gnome/sources/eog/43/eog-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=11257431e629b5b54d30dd366cccc997
diff --git a/metadata/md5-cache/media-gfx/eog-plugins-42.1 b/metadata/md5-cache/media-gfx/eog-plugins-42.1
deleted file mode 100644
index b3818de96ef5..000000000000
--- a/metadata/md5-cache/media-gfx/eog-plugins-42.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.7 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-1.14.1:= >=media-gfx/eog-41.0 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) dev-libs/glib[dbus] dev-libs/libpeas:=[gtk,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
-DESCRIPTION=Eye of GNOME plugins
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome/Plugins https://gitlab.gnome.org/GNOME/eog-plugins
-INHERIT=gnome.org meson python-single-r1
-IUSE=+exif map picasa +python python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-1.14.1:= >=media-gfx/eog-41.0 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) dev-libs/glib[dbus] dev-libs/libpeas:=[gtk,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
-REQUIRED_USE=map? ( exif ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/eog-plugins/42/eog-plugins-42.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4b2d0d7e054392da902a1d09a4244dd7
diff --git a/metadata/md5-cache/media-gfx/gnome-font-viewer-42.0 b/metadata/md5-cache/media-gfx/gnome-font-viewer-42.0
deleted file mode 100644
index c30f0274c040..000000000000
--- a/metadata/md5-cache/media-gfx/gnome-font-viewer-42.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/glib-2.56.0:2 >=gui-libs/gtk-4.5.0:4 >=gui-libs/libadwaita-1.0.0:1= >=media-libs/harfbuzz-0.9.9:= media-libs/fontconfig:1.0 media-libs/freetype:2 gnome-base/gnome-desktop:4=
-DESCRIPTION=Font viewer utility for GNOME
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-font-viewer
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson xdg
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=gui-libs/gtk-4.5.0:4 >=gui-libs/libadwaita-1.0.0:1= >=media-libs/harfbuzz-0.9.9:= media-libs/fontconfig:1.0 media-libs/freetype:2 gnome-base/gnome-desktop:4=
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-font-viewer/42/gnome-font-viewer-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=536e357845a37c08b92282b1f1ff938f
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.30.16-r1 b/metadata/md5-cache/media-gfx/shotwell-0.30.16-r1
deleted file mode 100644
index 8d9fcdf3df26..000000000000
--- a/metadata/md5-cache/media-gfx/shotwell-0.30.16-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( dev-lang/vala:0.56 ) dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig net-libs/libsoup:2.4[vala] media-libs/gexiv2[vala] app-crypt/gcr:0[vala] app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=x11-libs/gtk+-3.22.0:3[wayland?] >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8 >=net-libs/webkit-gtk-2.26:4 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=dev-libs/libgudev-145:= ) >=media-libs/gexiv2-0.10.4 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16:= dev-libs/libgdata >=app-crypt/gcr-3:0=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-2.3.0:= )
-DESCRIPTION=Open source photo manager for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-IUSE=opencv udev wayland
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/gtk+-3.22.0:3[wayland?] >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8 >=net-libs/webkit-gtk-2.26:4 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=dev-libs/libgudev-145:= ) >=media-libs/gexiv2-0.10.4 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16:= dev-libs/libgdata >=app-crypt/gcr-3:0=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-2.3.0:= ) media-plugins/gst-plugins-gdkpixbuf:1.0 media-plugins/gst-plugins-meta:1.0
-SLOT=0
-SRC_URI=mirror://gnome/sources/shotwell/0.30/shotwell-0.30.16.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=36e39324a7b1f21116b2d47704059861
diff --git a/metadata/md5-cache/media-gfx/simple-scan-42.1 b/metadata/md5-cache/media-gfx/simple-scan-42.1
deleted file mode 100644
index 319b4fe0ae1d..000000000000
--- a/metadata/md5-cache/media-gfx/simple-scan-42.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( dev-lang/vala:0.56 ) dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig gui-libs/libhandy:1[vala] dev-libs/libgusb[vala] colord? ( x11-misc/colord[vala] ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.24:3 >=gui-libs/libhandy-1.5.0:1= >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0=
-DESCRIPTION=Simple document scanning utility
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/simple-scan
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-IUSE=colord webp
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.24:3 >=gui-libs/libhandy-1.5.0:1= >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0= x11-misc/xdg-utils
-SLOT=0
-SRC_URI=mirror://gnome/sources/simple-scan/42/simple-scan-42.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c4c929e85d70b1f32ad99874c33d65cf
diff --git a/metadata/md5-cache/media-gfx/xdot-1.2-r1 b/metadata/md5-cache/media-gfx/xdot-1.2-r1
index 8e5cd048035a..861580218e0a 100644
--- a/metadata/md5-cache/media-gfx/xdot-1.2-r1
+++ b/metadata/md5-cache/media-gfx/xdot-1.2-r1
@@ -1,17 +1,17 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/graphviz test? ( x11-libs/gtk+:3 )
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz test? ( x11-libs/gtk+:3 )
 DESCRIPTION=Interactive viewer for Graphviz dot files
 EAPI=7
 HOMEPAGE=https://github.com/jrfonseca/xdot.py
 INHERIT=distutils-r1 virtualx
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2+
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/graphviz test? ( x11-libs/gtk+:3 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz test? ( x11-libs/gtk+:3 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jrfonseca/xdot.py/archive/1.2.tar.gz -> xdot-1.2.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=8751b4ac0b7aba958c5146905f01341a
+_md5_=7eceafb516cae9ec6a76889ab8bb2f59
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 6955fe4a24c7..2fcc1079832c 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/freeglut-3.2.2 b/metadata/md5-cache/media-libs/freeglut-3.2.2
deleted file mode 100644
index e7422a99af56..000000000000
--- a/metadata/md5-cache/media-libs/freeglut-3.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
-DESCRIPTION=A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library
-EAPI=7
-HOMEPAGE=http://freeglut.sourceforge.net/
-INHERIT=cmake-multilib
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=mirror://sourceforge/freeglut/freeglut-3.2.2.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cdcf49767a77c8fc1a0fdbebff97687f
diff --git a/metadata/md5-cache/media-libs/libcanberra-0.30-r6 b/metadata/md5-cache/media-libs/libcanberra-0.30-r6
deleted file mode 100644
index 1c5e0632d1b3..000000000000
--- a/metadata/md5-cache/media-libs/libcanberra-0.30-r6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk2? ( >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.20.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tdb? ( sys-libs/tdb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Portable sound event library
-EAPI=7
-HOMEPAGE=http://0pointer.de/lennart/projects/libcanberra/
-INHERIT=multilib-minimal systemd
-IUSE=alsa gnome gstreamer gtk2 +gtk3 oss pulseaudio +sound tdb udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk2? ( >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.20.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tdb? ( sys-libs/tdb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnome? ( gnome-base/dconf gnome-base/gsettings-desktop-schemas ) sound? ( x11-themes/sound-theme-freedesktop )
-REQUIRED_USE=udev? ( alsa )
-SLOT=0
-SRC_URI=http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=163c0631ec66b6e13b35a1f33cd2904e
diff --git a/metadata/md5-cache/media-libs/libglvnd-1.4.0 b/metadata/md5-cache/media-libs/libglvnd-1.4.0
deleted file mode 100644
index 5a924e7ee912..000000000000
--- a/metadata/md5-cache/media-libs/libglvnd-1.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) test? ( X? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!media-libs/mesa[-libglvnd(+)] X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
-DESCRIPTION=The GL Vendor-Neutral Dispatch library
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/glvnd/libglvnd
-INHERIT=meson-multilib python-any-r1 virtualx
-IUSE=test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=!media-libs/mesa[-libglvnd(+)] X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v1.4.0/libglvnd-v1.4.0.tar.bz2 -> libglvnd-1.4.0.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=572d8b7a4f1d8c7c6c33a627c0bc6031
diff --git a/metadata/md5-cache/media-libs/libshumate-1.0.1 b/metadata/md5-cache/media-libs/libshumate-1.0.1
deleted file mode 100644
index 753a57053f03..000000000000
--- a/metadata/md5-cache/media-libs/libshumate-1.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.68.0:2 >=x11-libs/cairo-1.4 >=dev-db/sqlite-1.12:3 >=gui-libs/gtk-4:4 >=net-libs/libsoup-3.0:3.0 introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
-DESCRIPTION=Shumate is a GTK toolkit providing widgets for embedded maps
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GNOME/libshumate
-INHERIT=gnome.org meson vala virtualx
-IUSE=gtk-doc +introspection vala test
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.68.0:2 >=x11-libs/cairo-1.4 >=dev-db/sqlite-1.12:3 >=gui-libs/gtk-4:4 >=net-libs/libsoup-3.0:3.0 introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
-REQUIRED_USE=gtk-doc? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=1.0/1
-SRC_URI=mirror://gnome/sources/libshumate/1.0/libshumate-1.0.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=078bc7023c8dc31b7b067e247f54afaa
diff --git a/metadata/md5-cache/media-libs/libshumate-1.0.2 b/metadata/md5-cache/media-libs/libshumate-1.0.2
deleted file mode 100644
index f69112648b3b..000000000000
--- a/metadata/md5-cache/media-libs/libshumate-1.0.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.68.0:2 >=x11-libs/cairo-1.4 >=dev-db/sqlite-1.12:3 >=gui-libs/gtk-4:4 >=net-libs/libsoup-3.0:3.0 introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
-DESCRIPTION=Shumate is a GTK toolkit providing widgets for embedded maps
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GNOME/libshumate
-INHERIT=gnome.org meson vala virtualx
-IUSE=gtk-doc +introspection vala test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.68.0:2 >=x11-libs/cairo-1.4 >=dev-db/sqlite-1.12:3 >=gui-libs/gtk-4:4 >=net-libs/libsoup-3.0:3.0 introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
-REQUIRED_USE=gtk-doc? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=1.0/1
-SRC_URI=mirror://gnome/sources/libshumate/1.0/libshumate-1.0.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=f147328da4be5bb1897ba476b8b5765e
diff --git a/metadata/md5-cache/media-libs/mesa-22.1.7 b/metadata/md5-cache/media-libs/mesa-22.1.7
deleted file mode 100644
index f9a6d9fafe94..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=8
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-INHERIT=llvm meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
-REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.1.7.tar.xz
-_eclasses_=linux-info	7a3f8b289bc442b8151fb29bfefe3b76	llvm	29d5332b8530fb760c2ca71ad6706858	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=df82907a6bedf17074caf2df58f1aafd
diff --git a/metadata/md5-cache/media-libs/mesa-22.2.2 b/metadata/md5-cache/media-libs/mesa-22.2.2
deleted file mode 100644
index 24a869fb52af..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) vulkan? ( video_cards_radeonsi? ( dev-util/glslang ) ) vulkan-overlay? ( dev-util/glslang ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=8
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-INHERIT=llvm meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
-REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.2.2.tar.xz
-_eclasses_=linux-info	7a3f8b289bc442b8151fb29bfefe3b76	llvm	29d5332b8530fb760c2ca71ad6706858	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ee2a700942e96d1229aeeba68426e551
diff --git a/metadata/md5-cache/media-libs/nas-1.9.5 b/metadata/md5-cache/media-libs/nas-1.9.5
index 52cd3c05bff4..fd862f85f95e 100644
--- a/metadata/md5-cache/media-libs/nas-1.9.5
+++ b/metadata/md5-cache/media-libs/nas-1.9.5
@@ -12,4 +12,4 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau[abi_x86_3
 SLOT=0
 SRC_URI=mirror://sourceforge/nas/nas-1.9.5.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c165a9c20a55010babde69a7164a2b57
+_md5_=c302bdaa1941e5390ff118b12cc3061c
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 1065c18d5c70..905ccd13477b 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/totem-42.0-r1 b/metadata/md5-cache/media-video/totem-42.0-r1
deleted file mode 100644
index e20a4902f726..000000000000
--- a/metadata/md5-cache/media-video/totem-42.0-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.5 ) dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=gui-libs/libhandy-1.5.0:1 >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.26.5:0=[introspection] gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=dev-libs/gobject-introspection-1.54:= python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_10(-)] ) )
-DESCRIPTION=Media player for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Videos https://gitlab.gnome.org/GNOME/totem/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson virtualx xdg python-single-r1
-IUSE=gtk-doc +python test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=gui-libs/libhandy-1.5.0:1 >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.26.5:0=[introspection] gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=dev-libs/gobject-introspection-1.54:= python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_10(-)] ) ) media-plugins/grilo-plugins:0.3 media-plugins/gst-plugins-gtk:1.0[opengl] media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( x11-libs/pango[introspection] >=dev-libs/libpeas-1.1.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/totem/42/totem-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d47464200c0136ef8580e3a081714efd
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 1f4dd269ba62..199c17bc4f9f 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.72.2 b/metadata/md5-cache/net-libs/glib-networking-2.72.2
deleted file mode 100644
index fc1435613237..000000000000
--- a/metadata/md5-cache/net-libs/glib-networking-2.72.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( sys-apps/dbus ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.69.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/gnutls-3.7.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas ) test? ( net-libs/gnutls[pkcs11] )
-DESCRIPTION=Network-related giomodules for glib
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/glib-networking
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson-multilib xdg
-IUSE=+gnome +libproxy +ssl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.69.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/gnutls-3.7.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib-networking/2.72/glib-networking-2.72.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3a3fa6d475e3962d086cd329cd3818b6
diff --git a/metadata/md5-cache/net-libs/gupnp-1.6.0 b/metadata/md5-cache/net-libs/gupnp-1.6.0
deleted file mode 100644
index b7f27a355c9a..000000000000
--- a/metadata/md5-cache/net-libs/gupnp-1.6.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) dev-libs/libxslt app-text/docbook-xsl-stylesheets virtual/pkgconfig !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) ) vala? ( || ( dev-lang/vala:0.56 ) >=net-libs/gssdp-1.5.2:1.6[vala] net-libs/libsoup:3.0[vala] ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] ) >=dev-libs/glib-2.69:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gssdp-1.5.2:1.6=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.99.0:3.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson-multilib python-single-r1 vala xdg
-IUSE=connman gtk-doc +introspection networkmanager +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] ) >=dev-libs/glib-2.69:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gssdp-1.5.2:1.6=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.99.0:3.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ?? ( connman networkmanager ) gtk-doc? ( introspection )
-SLOT=1.6/1.6-0
-SRC_URI=mirror://gnome/sources/gupnp/1.6/gupnp-1.6.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5b71901266d2509dd7106542d78ce49f
diff --git a/metadata/md5-cache/net-libs/gupnp-1.6.1 b/metadata/md5-cache/net-libs/gupnp-1.6.1
deleted file mode 100644
index ce9b7545e67f..000000000000
--- a/metadata/md5-cache/net-libs/gupnp-1.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) dev-libs/libxslt app-text/docbook-xsl-stylesheets virtual/pkgconfig !connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) ) vala? ( || ( dev-lang/vala:0.56 ) >=net-libs/gssdp-1.5.2:1.6[vala] net-libs/libsoup:3.0[vala] ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] ) >=dev-libs/glib-2.70:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gssdp-1.5.2:1.6=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.99.0:3.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson-multilib python-single-r1 vala xdg
-IUSE=connman gtk-doc +introspection networkmanager +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] ) >=dev-libs/glib-2.70:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gssdp-1.5.2:1.6=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.99.0:3.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ?? ( connman networkmanager ) gtk-doc? ( introspection )
-SLOT=1.6/1.6-0
-SRC_URI=mirror://gnome/sources/gupnp/1.6/gupnp-1.6.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e1e3faf8aa3b4eb5e63c754720c72a18
diff --git a/metadata/md5-cache/net-libs/libnma-1.8.40-r1 b/metadata/md5-cache/net-libs/libnma-1.8.40-r1
deleted file mode 100644
index a49de629623e..000000000000
--- a/metadata/md5-cache/net-libs/libnma-1.8.40-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxml2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.56 ) net-misc/networkmanager[vala] ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-3.14:0=[gtk] ) introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-DESCRIPTION=NetworkManager GUI library
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg vala
-IUSE=gtk-doc +introspection +pkcs11 vala
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-3.14:0=[gtk] ) introspection? ( >=dev-libs/gobject-introspection-1.56:= ) !<gnome-extra/nm-applet-1.16.0
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libnma/1.8/libnma-1.8.40.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bda289d27e47202789cee43a793c292a
diff --git a/metadata/md5-cache/net-libs/libsoup-2.74.2 b/metadata/md5-cache/net-libs/libsoup-2.74.2
deleted file mode 100644
index 91b4a39fe511..000000000000
--- a/metadata/md5-cache/net-libs/libsoup-2.74.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/glib dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.58:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( >=app-arch/brotli-1.0.6-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/libpsl-0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) samba? ( net-fs/samba ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=HTTP client/server library for GNOME
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/libsoup
-INHERIT=gnome.org meson-multilib vala xdg
-IUSE=brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.58:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( >=app-arch/brotli-1.0.6-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/libpsl-0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) samba? ( net-fs/samba ) >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=2.4
-SRC_URI=mirror://gnome/sources/libsoup/2.74/libsoup-2.74.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bfaa97962d458c8b924c3511fcd83b0b
diff --git a/metadata/md5-cache/net-libs/libsoup-3.2.1 b/metadata/md5-cache/net-libs/libsoup-3.2.1
deleted file mode 100644
index ec9fe8346534..000000000000
--- a/metadata/md5-cache/net-libs/libsoup-3.2.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-libs/glib dev-util/glib-utils gtk-doc? ( >=dev-util/gi-docgen-2021.1 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) test? ( >=net-libs/gnutls-3.6.0[pkcs11] ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.69.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( >=app-arch/brotli-1.0.6-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/libpsl-0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) samba? ( net-fs/samba )
-DESCRIPTION=HTTP client/server library for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/libsoup
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson-multilib vala xdg
-IUSE=+brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.69.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( >=app-arch/brotli-1.0.6-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/libpsl-0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) samba? ( net-fs/samba ) >=net-libs/glib-networking-2.70_alpha[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=3.0
-SRC_URI=mirror://gnome/sources/libsoup/3.2/libsoup-3.2.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=418024338019f85887a0286840b9d671
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.36.8 b/metadata/md5-cache/net-libs/webkit-gtk-2.36.8
deleted file mode 100644
index 933ba6b9783d..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.36.8
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] >=dev-lang/python-3.10.8_p3:3.10[xml(+)] >=dev-lang/python-3.9.15_p3:3.9[xml(+)] >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.32 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
-DESCRIPTION=Open source web browser engine
-EAPI=8
-HOMEPAGE=https://www.webkitgtk.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
-REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.36.8.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f1078a866e3bd0ac8ffec30d463ca0b3
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.0 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.0
deleted file mode 100644
index 86d8592ff07d..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] >=dev-lang/python-3.10.8_p3:3.10[xml(+)] >=dev-lang/python-3.9.15_p3:3.9[xml(+)] >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
-DESCRIPTION=Open source web browser engine
-EAPI=8
-HOMEPAGE=https://www.webkitgtk.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
-REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.0.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0be527b69b4802c55b5a7224c1584159
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.0-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.0-r410
deleted file mode 100644
index 079f5b5d1988..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.0-r410
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] >=dev-lang/python-3.10.8_p3:3.10[xml(+)] >=dev-lang/python-3.9.15_p3:3.9[xml(+)] >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
-DESCRIPTION=Open source web browser engine
-EAPI=8
-HOMEPAGE=https://www.webkitgtk.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
-REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4.1/0
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.0.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=892f2375c3bb9a9b3807585197fd1431
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.0-r500 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.0-r500
deleted file mode 100644
index f05577b10b4d..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.0-r500
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] >=dev-lang/python-3.10.8_p3:3.10[xml(+)] >=dev-lang/python-3.9.15_p3:3.9[xml(+)] >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
-DESCRIPTION=Open source web browser engine
-EAPI=8
-HOMEPAGE=https://www.webkitgtk.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
-REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=5/0
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.0.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=09e557aea574dc04a988868120cefdeb
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.1 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.1
deleted file mode 100644
index 4912c0185aba..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] >=dev-lang/python-3.10.8_p3:3.10[xml(+)] >=dev-lang/python-3.9.15_p3:3.9[xml(+)] >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 || ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 ) media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
-DESCRIPTION=Open source web browser engine
-EAPI=8
-HOMEPAGE=https://www.webkitgtk.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 || ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 ) media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
-REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.1.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7ae3977eb83f6cd00d7944718d7b7c3b
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r410
deleted file mode 100644
index 5e33d156fb83..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r410
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] >=dev-lang/python-3.10.8_p3:3.10[xml(+)] >=dev-lang/python-3.9.15_p3:3.9[xml(+)] >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 || ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 ) media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
-DESCRIPTION=Open source web browser engine
-EAPI=8
-HOMEPAGE=https://www.webkitgtk.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 || ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 ) media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
-REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4.1/0
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.1.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=046cbe418b22c308ebcd4cba3e0d051e
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r500 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r500
deleted file mode 100644
index 9d03d714355e..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.1-r500
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] >=dev-lang/python-3.10.8_p3:3.10[xml(+)] >=dev-lang/python-3.9.15_p3:3.9[xml(+)] >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 || ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 ) media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
-DESCRIPTION=Open source web browser engine
-EAPI=8
-HOMEPAGE=https://www.webkitgtk.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 || ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 ) media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
-REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=5/0
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.1.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f345864bbe7b2d9c3b05986f18896cb9
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 3a908a98ed6d..d9b3fd3d0984 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/gnome-remote-desktop-43.0 b/metadata/md5-cache/net-misc/gnome-remote-desktop-43.0
deleted file mode 100644
index ae55f42c8259..000000000000
--- a/metadata/md5-cache/net-misc/gnome-remote-desktop-43.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig doc? ( app-text/asciidoc ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.8.0:=[server] >=sys-fs/fuse-3.9.1 >=x11-libs/libxkbcommon-1.0.0 aac? ( media-libs/fdk-aac ) ) vnc? ( net-libs/libvncserver )
-DESCRIPTION=Remote desktop daemon for GNOME using pipewire
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-remote-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson systemd xdg
-IUSE=aac doc +rdp systemd +vnc
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.8.0:=[server] >=sys-fs/fuse-3.9.1 >=x11-libs/libxkbcommon-1.0.0 aac? ( media-libs/fdk-aac ) ) vnc? ( net-libs/libvncserver ) x11-wm/mutter[screencast]
-REQUIRED_USE=|| ( rdp vnc ) aac? ( rdp )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-remote-desktop/43/gnome-remote-desktop-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d0e9220757fd4cc9ce586dcb28bb507d
diff --git a/metadata/md5-cache/net-misc/gnome-remote-desktop-43.1 b/metadata/md5-cache/net-misc/gnome-remote-desktop-43.1
deleted file mode 100644
index b5140ecf88a3..000000000000
--- a/metadata/md5-cache/net-misc/gnome-remote-desktop-43.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig doc? ( app-text/asciidoc ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.8.0:=[server] >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 aac? ( media-libs/fdk-aac:= ) ) vnc? ( net-libs/libvncserver )
-DESCRIPTION=Remote desktop daemon for GNOME using pipewire
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-remote-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson systemd xdg
-IUSE=aac doc +rdp systemd +vnc
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.8.0:=[server] >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 aac? ( media-libs/fdk-aac:= ) ) vnc? ( net-libs/libvncserver ) x11-wm/mutter[screencast]
-REQUIRED_USE=|| ( rdp vnc ) aac? ( rdp )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-remote-desktop/43/gnome-remote-desktop-43.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=994ab546b1c9af1679feb991cedb62ee
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.18.10-r1 b/metadata/md5-cache/net-misc/modemmanager-1.18.10-r1
deleted file mode 100644
index a7bc3432b890..000000000000
--- a/metadata/md5-cache/net-misc/modemmanager-1.18.10-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) vala? ( || ( dev-lang/vala:0.56 ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.56.0:2 udev? ( >=dev-libs/libgudev-232:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.26.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection?] ) qmi? ( >=net-libs/libqmi-1.30.8:=[qrtr?] ) qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 )
-DESCRIPTION=Modem and mobile broadband management libraries
-EAPI=8
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 python-any-r1 readme.gentoo-r1 systemd udev vala
-IUSE=elogind +introspection mbim policykit +qmi +qrtr systemd test +udev vala
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.56.0:2 udev? ( >=dev-libs/libgudev-232:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.26.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection?] ) qmi? ( >=net-libs/libqmi-1.30.8:=[qrtr?] ) qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) policykit? ( acct-group/plugdev )
-REQUIRED_USE=?? ( elogind systemd ) qrtr? ( qmi ) vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.10.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1eb4f980e9f9f41eff4e44d852325d21
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.38.4 b/metadata/md5-cache/net-misc/networkmanager-1.38.4
deleted file mode 100644
index 1f813a949cba..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.38.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.56 ) ) test? ( >=dev-libs/jansson-2.7 || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-INHERIT=gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.38/NetworkManager-1.38.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=67ba7e16fe7cbfca46c5efd21dc191a8
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.40.0 b/metadata/md5-cache/net-misc/networkmanager-1.40.0
deleted file mode 100644
index 19cf31bd644e..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.40.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.56 ) ) test? ( >=dev-libs/jansson-2.7 || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-INHERIT=gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.40/NetworkManager-1.40.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=13c989b1c86c61a0e397991eb7af2758
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.40.4 b/metadata/md5-cache/net-misc/networkmanager-1.40.4
deleted file mode 100644
index fe08e9c39769..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.40.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.56 ) ) test? ( >=dev-libs/jansson-2.7 || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-INHERIT=gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.40/NetworkManager-1.40.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=13c989b1c86c61a0e397991eb7af2758
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 16843e3346bd..1b76c53f9bb5 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.18 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.18
deleted file mode 100644
index dd2425954b87..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.18
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 >=gui-libs/gtk-4.0:4 >=net-libs/libnma-1.8.36 )
-DESCRIPTION=NetworkManager OpenVPN plugin
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/NetworkManager-openvpn https://gitlab.gnome.org/GNOME/NetworkManager-openvpn
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2
-IUSE=gtk test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 >=gui-libs/gtk-4.0:4 >=net-libs/libnma-1.8.36 ) acct-group/nm-openvpn acct-user/nm-openvpn
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.18.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=281574739bfd5c2c2218d7585ed77618
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.8 b/metadata/md5-cache/net-vpn/strongswan-5.9.8
index 8bf6bfa9d3fd..610e1c87805f 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.9.8
+++ b/metadata/md5-cache/net-vpn/strongswan-5.9.8
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.strongswan.org/
 INHERIT=linux-info systemd
 IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_gcm +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_kdf strongswan_plugins_addrblock strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_error-notify strongswan_plugins_forecast strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist strongswan_plugins_xauth-noauth
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2 RSA DES
 RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=https://download.strongswan.org/strongswan-5.9.8.tar.bz2
 _eclasses_=linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=501b27dc7d3877d4fa6b5fa4db4abac0
+_md5_=f9816938d91b8068b32998dffa341ffb
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 2ae1a215a442..14e8c5bc419d 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.5 b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.5
index 5942ea18d97e..7814e9e6e470 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.5
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.5
@@ -4,7 +4,7 @@ DEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.12:3[introspection?] media-libs/
 DESCRIPTION=Bluetooth graphical utilities integrated with GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeBluetooth
-INHERIT=gnome.org gnome2-utils meson python-any-r1 udev xdg
+INHERIT=gnome.org meson python-any-r1 udev xdg
 IUSE=gtk-doc +introspection test
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.12:3[introspection?] media-libs
 RESTRICT=!test? ( test )
 SLOT=2/13
 SRC_URI=mirror://gnome/sources/gnome-bluetooth/3.34/gnome-bluetooth-3.34.5.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d499b13f06d6af3a4f2d314661009514
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b0279f5eac247000d3460458abc89f85
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-42.3 b/metadata/md5-cache/net-wireless/gnome-bluetooth-42.3
deleted file mode 100644
index 668ae61cccd7..000000000000
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-42.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.9 ) virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-python/python-dbusmock-0.26.0[python_targets_python3_11(-)] dev-python/dbus-python[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-python/python-dbusmock-0.26.0[python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-python/python-dbusmock-0.26.0[python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 >=dev-python/python-dbusmock-0.26.0[python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=>=dev-libs/glib-2.44:2 >=gui-libs/gtk-4.4:4[introspection?] media-libs/gsound >=gui-libs/libadwaita-1.1:1 >=x11-libs/libnotify-0.7.0 virtual/libudev:= >=sys-power/upower-0.99.14:= introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-DESCRIPTION=Bluetooth graphical utilities integrated with GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeBluetooth
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson python-any-r1 xdg
-IUSE=gtk-doc +introspection sendto test
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
-LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.44:2 >=gui-libs/gtk-4.4:4[introspection?] media-libs/gsound >=gui-libs/libadwaita-1.1:1 >=x11-libs/libnotify-0.7.0 virtual/libudev:= >=sys-power/upower-0.99.14:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) acct-group/plugdev virtual/udev >=net-wireless/bluez-5 sendto? ( !net-wireless/gnome-bluetooth:2 )
-RESTRICT=!test? ( test )
-SLOT=3/13
-SRC_URI=mirror://gnome/sources/gnome-bluetooth/42/gnome-bluetooth-42.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5ff9cd30d392044f23f1ac8a67e62a92
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index b3a59992cd73..1cfdf05c6c19 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-43.0 b/metadata/md5-cache/sci-geosciences/gnome-maps-43.0
deleted file mode 100644
index 5b8013e894a4..000000000000
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-43.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
-DESCRIPTION=A map application for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Maps
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-maps/43/gnome-maps-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=64a91046246fe95623957e83d1c0bdb6
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-43.1 b/metadata/md5-cache/sci-geosciences/gnome-maps-43.1
deleted file mode 100644
index 3196023e6a3c..000000000000
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-43.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
-DESCRIPTION=A map application for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Maps
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-maps/43/gnome-maps-43.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=64a91046246fe95623957e83d1c0bdb6
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 277605da2aa5..90b1065fd8f7 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/baobab-42.0 b/metadata/md5-cache/sys-apps/baobab-42.0
deleted file mode 100644
index 11139d9e4bdf..000000000000
--- a/metadata/md5-cache/sys-apps/baobab-42.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( dev-lang/vala:0.56 ) >=gui-libs/libadwaita-1.0.0:1=[vala] dev-util/itstool >=sys-devel/gettext-0.21 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.44:2 >=gui-libs/gtk-4.4.0:4 >=gui-libs/libadwaita-1.0.0:1=
-DESCRIPTION=Disk usage browser for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Baobab
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.44:2 >=gui-libs/gtk-4.4.0:4 >=gui-libs/libadwaita-1.0.0:1=
-SLOT=0
-SRC_URI=mirror://gnome/sources/baobab/42/baobab-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a57e75f09e564763a9ecdd80a0e9bcf5
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-42.0 b/metadata/md5-cache/sys-apps/gnome-disk-utility-42.0
deleted file mode 100644
index fa20768d3ac7..000000000000
--- a/metadata/md5-cache/sys-apps/gnome-disk-utility-42.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=media-libs/libdvdread-4.2.0:0= >=dev-libs/glib-2.31:2 >=x11-libs/gtk+-3.16.0:3 >=media-libs/libcanberra-0.1[gtk3] >=gui-libs/libhandy-1.5.0:1= >=app-arch/xz-utils-5.0.5 >=x11-libs/libnotify-0.7:= >=app-crypt/libsecret-0.7 >=dev-libs/libpwquality-1.0.0 >=sys-fs/udisks-2.7.6:2 elogind? ( >=sys-auth/elogind-209 ) systemd? ( >=sys-apps/systemd-209:0= )
-DESCRIPTION=Disk Utility for GNOME using udisks
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Disks
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-IUSE=fat elogind gnome systemd
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=media-libs/libdvdread-4.2.0:0= >=dev-libs/glib-2.31:2 >=x11-libs/gtk+-3.16.0:3 >=media-libs/libcanberra-0.1[gtk3] >=gui-libs/libhandy-1.5.0:1= >=app-arch/xz-utils-5.0.5 >=x11-libs/libnotify-0.7:= >=app-crypt/libsecret-0.7 >=dev-libs/libpwquality-1.0.0 >=sys-fs/udisks-2.7.6:2 elogind? ( >=sys-auth/elogind-209 ) systemd? ( >=sys-apps/systemd-209:0= ) x11-themes/adwaita-icon-theme fat? ( sys-fs/dosfstools ) gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-disk-utility/42/gnome-disk-utility-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d7ef54bfb6bc85f8e3db84ea88254d57
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20220516 b/metadata/md5-cache/sys-apps/osinfo-db-20220516
deleted file mode 100644
index 9241f7d613a6..000000000000
--- a/metadata/md5-cache/sys-apps/osinfo-db-20220516
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=sys-apps/osinfo-db-tools
-DEFINED_PHASES=install unpack
-DESCRIPTION=osinfo database files
-EAPI=8
-HOMEPAGE=https://libosinfo.org/ https://gitlab.com/libosinfo/osinfo-db
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20220516.tar.xz
-_md5_=2f18bc44c02e792114262fd49d4a41df
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20220830 b/metadata/md5-cache/sys-apps/osinfo-db-20220830
deleted file mode 100644
index d85342754f5d..000000000000
--- a/metadata/md5-cache/sys-apps/osinfo-db-20220830
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=sys-apps/osinfo-db-tools
-DEFINED_PHASES=install unpack
-DESCRIPTION=osinfo database files
-EAPI=8
-HOMEPAGE=https://libosinfo.org/ https://gitlab.com/libosinfo/osinfo-db
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20220830.tar.xz
-_md5_=4d53015e95ce9432bd5e9df0895c3f95
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gnome-42.3 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-gnome-42.3
deleted file mode 100644
index 1704b4588b8a..000000000000
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gnome-42.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:4= gui-libs/libadwaita:1 media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.7 >=sys-apps/xdg-desktop-portal-gtk-1.14.0 gui-libs/gtk:4[wayland?,X?]
-DESCRIPTION=Backend implementation for xdg-desktop-portal using GNOME
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson systemd xdg
-IUSE=wayland X
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:4= gui-libs/libadwaita:1 media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.7 >=sys-apps/xdg-desktop-portal-gtk-1.14.0 gui-libs/gtk:4[wayland?,X?]
-SLOT=0
-SRC_URI=mirror://gnome/sources/xdg-desktop-portal-gnome/42/xdg-desktop-portal-gnome-42.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=46f3fd4c08dc922a55ec6375341246ee
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gnome-43.0 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-gnome-43.0
deleted file mode 100644
index b53b11cf4412..000000000000
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gnome-43.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:4= gui-libs/libadwaita:1 media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.15.0 >=sys-apps/xdg-desktop-portal-gtk-1.14.0 gui-libs/gtk:4[wayland?,X?]
-DESCRIPTION=Backend implementation for xdg-desktop-portal using GNOME
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson systemd xdg
-IUSE=wayland X
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:4= gui-libs/libadwaita:1 media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.15.0 >=sys-apps/xdg-desktop-portal-gtk-1.14.0 gui-libs/gtk:4[wayland?,X?]
-SLOT=0
-SRC_URI=mirror://gnome/sources/xdg-desktop-portal-gnome/43/xdg-desktop-portal-gnome-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=baeb4ca1bdc742d6e2dc8122dee69850
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 04d8df34d3d7..f05c7ddd02fa 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/bdftopcf-1.1-r1 b/metadata/md5-cache/x11-apps/bdftopcf-1.1-r1
deleted file mode 100644
index 3bb7c402c909..000000000000
--- a/metadata/md5-cache/x11-apps/bdftopcf-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-base/xorg-proto
-DESCRIPTION=X.Org bdftopcf application
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/bdftopcf
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/bdftopcf-1.1.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=8966a2093db5ae5cf98352d84d234a20
diff --git a/metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1 b/metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1
deleted file mode 100644
index d33fe98df575..000000000000
--- a/metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libFS x11-base/xorg-proto
-DESCRIPTION=list fonts served by X font server
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/fslsfonts
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libFS
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/fslsfonts-1.0.5.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=e646858ffc7df237bcdf9a0c2fb471ee
diff --git a/metadata/md5-cache/x11-apps/ico-1.0.5 b/metadata/md5-cache/x11-apps/ico-1.0.5
deleted file mode 100644
index 0fe6f648c8b7..000000000000
--- a/metadata/md5-cache/x11-apps/ico-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libX11
-DESCRIPTION=animate an icosahedron or other polyhedron
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/ico
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/ico-1.0.5.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=d799731fc7af191c5d31791757c4c680
diff --git a/metadata/md5-cache/x11-apps/oclock-1.0.4 b/metadata/md5-cache/x11-apps/oclock-1.0.4
deleted file mode 100644
index da8e60df5151..000000000000
--- a/metadata/md5-cache/x11-apps/oclock-1.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile
-DESCRIPTION=round X clock
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/oclock
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/oclock-1.0.4.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=a91b4d9cba66e8a107d7b0665eb4f138
diff --git a/metadata/md5-cache/x11-apps/rgb-1.0.6-r1 b/metadata/md5-cache/x11-apps/rgb-1.0.6-r1
deleted file mode 100644
index 804ae0ca84bd..000000000000
--- a/metadata/md5-cache/x11-apps/rgb-1.0.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=x11-misc/util-macros sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-base/xorg-proto
-DESCRIPTION=uncompile an rgb color-name database
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/rgb
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/rgb-1.0.6.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=77d10922fb83ba73343ab386f3d35339
diff --git a/metadata/md5-cache/x11-apps/sessreg-1.1.2 b/metadata/md5-cache/x11-apps/sessreg-1.1.2
deleted file mode 100644
index 81851b388c34..000000000000
--- a/metadata/md5-cache/x11-apps/sessreg-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-base/xorg-proto
-DESCRIPTION=manage utmp/wtmp entries for non-init clients
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/sessreg
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/sessreg-1.1.2.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=333253d1108b904a958466f5eb1a8e09
diff --git a/metadata/md5-cache/x11-apps/showfont-1.0.5 b/metadata/md5-cache/x11-apps/showfont-1.0.5
deleted file mode 100644
index a5e0f21f3379..000000000000
--- a/metadata/md5-cache/x11-apps/showfont-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libFS
-DESCRIPTION=font dumper for X font server
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/showfont
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libFS
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/showfont-1.0.5.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=a5ad28d9185b951156cf5e554e7b27db
diff --git a/metadata/md5-cache/x11-apps/smproxy-1.0.6-r1 b/metadata/md5-cache/x11-apps/smproxy-1.0.6-r1
deleted file mode 100644
index 800c58dcbad6..000000000000
--- a/metadata/md5-cache/x11-apps/smproxy-1.0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libXt x11-libs/libXmu x11-base/xorg-proto
-DESCRIPTION=Session Manager Proxy
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/smproxy
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXt x11-libs/libXmu
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/smproxy-1.0.6.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=a17606c342c0e7c26b5ddd06b9a807d2
diff --git a/metadata/md5-cache/x11-apps/viewres-1.0.6 b/metadata/md5-cache/x11-apps/viewres-1.0.6
deleted file mode 100644
index 05e82c19ddbb..000000000000
--- a/metadata/md5-cache/x11-apps/viewres-1.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-base/xorg-proto
-DESCRIPTION=graphical class browser for Xt
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/viewres
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXmu
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/viewres-1.0.6.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=c15f6bda868db2ba5debd55e6a323433
diff --git a/metadata/md5-cache/x11-apps/x11perf-1.6.1 b/metadata/md5-cache/x11-apps/x11perf-1.6.1
deleted file mode 100644
index 5b3b219e564f..000000000000
--- a/metadata/md5-cache/x11-apps/x11perf-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext x11-base/xorg-proto
-DESCRIPTION=X rendering operation stress test utility
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/x11perf
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/x11perf-1.6.1.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=291c08e381cd0573885b94b59d750192
diff --git a/metadata/md5-cache/x11-apps/xditview-1.0.5 b/metadata/md5-cache/x11-apps/xditview-1.0.5
deleted file mode 100644
index ad124ccee6d8..000000000000
--- a/metadata/md5-cache/x11-apps/xditview-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
-DESCRIPTION=display ditroff output
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xditview
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xditview-1.0.5.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=6d5f2b958483b5eb65397a208acb300e
diff --git a/metadata/md5-cache/x11-apps/xgc-1.0.5 b/metadata/md5-cache/x11-apps/xgc-1.0.5
deleted file mode 100644
index 454e02b3a706..000000000000
--- a/metadata/md5-cache/x11-apps/xgc-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt
-DESCRIPTION=X graphics demo
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xgc
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXt
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xgc-1.0.5.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=1ab24faad6880e0138bd8d1a2a4508a9
diff --git a/metadata/md5-cache/x11-apps/xisxwayland-1 b/metadata/md5-cache/x11-apps/xisxwayland-1
deleted file mode 100644
index d15cca59b841..000000000000
--- a/metadata/md5-cache/x11-apps/xisxwayland-1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-base/xorg-proto
-DESCRIPTION=Tool to determine whether the X server in use is Xwayland
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/xorg/app/xisxwayland
-INHERIT=meson
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXrandr
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/app/xisxwayland-1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=22b7652605592c243fa14c45f8e5b620
diff --git a/metadata/md5-cache/x11-apps/xkbprint-1.0.5 b/metadata/md5-cache/x11-apps/xkbprint-1.0.5
deleted file mode 100644
index 39d05cf58dac..000000000000
--- a/metadata/md5-cache/x11-apps/xkbprint-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libxkbfile >=x11-libs/libX11-1.6.9 x11-base/xorg-proto
-DESCRIPTION=Print an XKB keyboard description
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xkbprint
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libxkbfile >=x11-libs/libX11-1.6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xkbprint-1.0.5.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=35d3ac34d398323589f8e70c2efe85e4
diff --git a/metadata/md5-cache/x11-apps/fstobdf-1.0.6 b/metadata/md5-cache/x11-apps/xrandr-1.5.2
index 2c690d3d0bd8..b8fe87e30a5e 100644
--- a/metadata/md5-cache/x11-apps/fstobdf-1.0.6
+++ b/metadata/md5-cache/x11-apps/xrandr-1.5.2
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libX11 x11-libs/libFS
-DESCRIPTION=generate BDF font from X font server
+DEPEND=>=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=primitive command line interface to RandR extension
 EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/fstobdf
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xrandr
 INHERIT=xorg-3
-KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libFS
+RDEPEND=>=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libX11
 SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/fstobdf-1.0.6.tar.bz2
+SRC_URI=https://www.x.org/releases/individual/app/xrandr-1.5.2.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=e6a433ee41163bd65d0ed5afa091ff2f
+_md5_=a56789b2c3c3237200ab8d8125e1ee7a
diff --git a/metadata/md5-cache/x11-apps/xset-1.2.5 b/metadata/md5-cache/x11-apps/xset-1.2.5
new file mode 100644
index 000000000000..9b6d5f5e5141
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xset-1.2.5
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-base/xorg-proto
+DESCRIPTION=X.Org xset application
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xset
+INHERIT=xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xset-1.2.5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
+_md5_=c45e32d8a70447fdedcc5f8a21ba2a5a
diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.2-r1 b/metadata/md5-cache/x11-apps/xsetroot-1.1.2-r1
deleted file mode 100644
index 8fb676b71bd7..000000000000
--- a/metadata/md5-cache/x11-apps/xsetroot-1.1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libX11 x11-libs/libXcursor x11-libs/libXmu x11-misc/xbitmaps x11-base/xorg-proto
-DESCRIPTION=X.Org xsetroot application
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xsetroot
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXcursor x11-libs/libXmu x11-misc/xbitmaps
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xsetroot-1.1.2.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=bfa8fec0c624d3a382f16589e52ba64e
diff --git a/metadata/md5-cache/x11-apps/xstdcmap-1.0.5 b/metadata/md5-cache/x11-apps/xstdcmap-1.0.5
new file mode 100644
index 000000000000..56cf89fabc31
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xstdcmap-1.0.5
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
+DEPEND=x11-libs/libXmu x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=X standard colormap utility
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xstdcmap
+INHERIT=xorg-3
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libXmu x11-libs/libX11
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xstdcmap-1.0.5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
+_md5_=38a5d931807296e02d6e67293b4c05a2
diff --git a/metadata/md5-cache/x11-apps/xvinfo-1.1.5 b/metadata/md5-cache/x11-apps/xvinfo-1.1.5
new file mode 100644
index 000000000000..5609aaa24c14
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xvinfo-1.1.5
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
+DEPEND=x11-libs/libXv x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=Print out X-Video extension adaptor information
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xvinfo
+INHERIT=xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libXv x11-libs/libX11
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xvinfo-1.1.5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
+_md5_=4cd919ce5d68f84351ef5068950881e0
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index edfde596e38d..a07f3a673210 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2022.1 b/metadata/md5-cache/x11-base/xorg-proto-2022.1
deleted file mode 100644
index 72a82e93710c..000000000000
--- a/metadata/md5-cache/x11-base/xorg-proto-2022.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( || ( ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/python-libevdev[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/python-libevdev[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/python-libevdev[python_targets_python3_8(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DESCRIPTION=X.Org combined protocol headers
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/xorg/proto/xorgproto
-INHERIT=meson python-any-r1
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2022.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=65e4d8ae1af6318f4f30f776002ac896
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.3 b/metadata/md5-cache/x11-base/xwayland-22.1.3
deleted file mode 100644
index 11a2cc72f02c..000000000000
--- a/metadata/md5-cache/x11-base/xwayland-22.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=8
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.3.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=fc7ea351ee8bdebc781d540e919f18da
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.4 b/metadata/md5-cache/x11-base/xwayland-22.1.4
deleted file mode 100644
index 4c46a4b44ca9..000000000000
--- a/metadata/md5-cache/x11-base/xwayland-22.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=8
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.4.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=eef35da6e842e56a006c53a8511bc9ff
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 0597a62cf59a..b5738840c242 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
deleted file mode 100644
index bc9041431538..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
+++ /dev/null
@@ -1,14 +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-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
-DESCRIPTION=VMWare mouse input driver
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-vmmouse
-INHERIT=udev xorg-3
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=4910fe4bffaeba358a392a285963827f
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1 b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
deleted file mode 100644
index 8ee2edad7ef2..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-base/xorg-server x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
-DESCRIPTION=null input driver
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-void
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-base/xorg-server x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-void-1.4.1.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=88888f0b381056c386fbc9a0bbab0ffc
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 5aff6829befa..893da4692bde 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.8 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.8
deleted file mode 100644
index 724fe8c5c1de..000000000000
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 dev-libs/glib:2 dev-libs/libxslt dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Image loading library for GTK+
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gdk-pixbuf
-INHERIT=gnome.org gnome2-utils meson-multilib multilib xdg
-IUSE=gtk-doc +introspection jpeg tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<x11-libs/gtk+-2.90.4:3
-SLOT=2
-SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.8.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2b5b4dab3e2e22092cfe82248fe6803f
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.9 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.9
deleted file mode 100644
index bf16cb5d1b29..000000000000
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.9
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 dev-libs/glib:2 dev-libs/libxslt dev-python/docutils dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( media-libs/libjpeg-turbo:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-DESCRIPTION=Image loading library for GTK+
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gdk-pixbuf
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson-multilib multilib xdg
-IUSE=gtk-doc +introspection jpeg test tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( media-libs/libjpeg-turbo:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.9.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=465ac7a6e51373d0864c2f8bb2951c5b
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.52-r1 b/metadata/md5-cache/x11-libs/goffice-0.10.52-r1
deleted file mode 100644
index 931ac7dc8d3b..000000000000
--- a/metadata/md5-cache/x11-libs/goffice-0.10.52-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35 virtual/perl-Compress-Raw-Zlib virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/pkgconfig app-arch/xz-utils >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.4.12:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=x11-libs/cairo-1.10:=[svg(+)] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= x11-libs/libXext:= x11-libs/libXrender:= introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
-DESCRIPTION=A library of document-centric objects and utilities
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/goffice/
-INHERIT=gnome.org libtool
-IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.4.12:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=x11-libs/cairo-1.10:=[svg(+)] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= x11-libs/libXext:= x11-libs/libXrender:= introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
-SLOT=0.10
-SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.52.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7d3701bbf8354aac7d86be74b8e1dd18
diff --git a/metadata/md5-cache/x11-libs/libFS-1.0.8 b/metadata/md5-cache/x11-libs/libFS-1.0.8
deleted file mode 100644
index 9b8033f46d23..000000000000
--- a/metadata/md5-cache/x11-libs/libFS-1.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-base/xorg-proto x11-libs/xtrans
-DESCRIPTION=X.Org FS library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libFS
-INHERIT=xorg-3
-IUSE=ipv6
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libFS-1.0.8.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=c5488fdd5e697922b56d138e72e9b238
diff --git a/metadata/md5-cache/x11-libs/libICE-1.1.0 b/metadata/md5-cache/x11-libs/libICE-1.1.0
new file mode 100644
index 000000000000..10331210a4cd
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libICE-1.1.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 test unpack
+DEPEND=x11-base/xorg-proto x11-libs/xtrans
+DESCRIPTION=X.Org Inter-Client Exchange library
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libICE
+INHERIT=xorg-3
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=x11-base/xorg-proto x11-libs/xtrans elibc_glibc? ( || ( >=sys-libs/glibc-2.36 dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libICE-1.1.0.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
+_md5_=dd631e4959ca5b1cc0721251fa1a0628
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.9-r1 b/metadata/md5-cache/x11-libs/libXau-1.0.9-r1
deleted file mode 100644
index 7c9623d85e32..000000000000
--- a/metadata/md5-cache/x11-libs/libXau-1.0.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto
-DESCRIPTION=X.Org X authorization library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXau
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXau-1.0.9.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=82a1adcd0c8f635cbfe83a6515fa4191
diff --git a/metadata/md5-cache/x11-libs/libXaw3d-1.6.3 b/metadata/md5-cache/x11-libs/libXaw3d-1.6.3
deleted file mode 100644
index 7b84477b94be..000000000000
--- a/metadata/md5-cache/x11-libs/libXaw3d-1.6.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex app-alternatives/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm ) x11-base/xorg-proto
-DESCRIPTION=X.Org Xaw3d library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXaw3d
-INHERIT=xorg-3
-IUSE=unicode xpm
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=fbcd75490857b53c612067ae73cd4566
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.4 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.4-r1
index 7cc6bb6a372f..b7b0ed929520 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.4
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.4-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=elibc_glibc? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x11-base/xorg-proto
+DEPEND=elibc_glibc? ( || ( >=sys-libs/glibc-2.36 dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) x11-base/xorg-proto
 DESCRIPTION=X.Org X Display Manager Control Protocol library
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXdmcp
@@ -8,8 +8,8 @@ INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
-RDEPEND=elibc_glibc? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=elibc_glibc? ( || ( >=sys-libs/glibc-2.36 dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXdmcp-1.1.4.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=f1ee96e9c52f51c5c2746ce8d9410c20
+_md5_=5390b2c10bc01001d601b0a1f623b014
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.4 b/metadata/md5-cache/x11-libs/libXext-1.3.4
deleted file mode 100644
index 70aa984b3b87..000000000000
--- a/metadata/md5-cache/x11-libs/libXext-1.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
-DESCRIPTION=X.Org Xext library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXext
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=>=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXext-1.3.4.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=896978803752fb15d4a11f2de4f1463a
diff --git a/metadata/md5-cache/x11-libs/libXfont2-2.0.5 b/metadata/md5-cache/x11-libs/libXfont2-2.0.5
deleted file mode 100644
index c37d3086ac19..000000000000
--- a/metadata/md5-cache/x11-libs/libXfont2-2.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=sys-libs/zlib dev-libs/libbsd x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 ) x11-base/xorg-proto x11-libs/xtrans
-DESCRIPTION=X.Org Xfont library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxfont
-INHERIT=xorg-3
-IUSE=bzip2 ipv6 truetype doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=sys-libs/zlib dev-libs/libbsd x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXfont2-2.0.5.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=1bc1223b67ff752aca6b68d208c121f8
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.4 b/metadata/md5-cache/x11-libs/libXft-2.3.4
deleted file mode 100644
index f97c90f36433..000000000000
--- a/metadata/md5-cache/x11-libs/libXft-2.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 test unpack
-DEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/ttf-fonts >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
-DESCRIPTION=X.Org Xft library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXft
-INHERIT=xorg-3
-IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/ttf-fonts >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXft-2.3.4.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=7ed99978d8a595f7797b03e3f1af575d
diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.4-r1 b/metadata/md5-cache/x11-libs/libXinerama-1.1.4-r1
deleted file mode 100644
index 850834715599..000000000000
--- a/metadata/md5-cache/x11-libs/libXinerama-1.1.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=X.Org Xinerama library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXinerama
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXinerama-1.1.4.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=c3cd40103b83cae661e414be52b95e5b
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.3 b/metadata/md5-cache/x11-libs/libXmu-1.1.3
deleted file mode 100644
index 06ece86ed6e0..000000000000
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
-DESCRIPTION=X.Org Xmu library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXmu
-INHERIT=xorg-3
-IUSE=ipv6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXmu-1.1.3.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=668ea3d7c9a986815006703d612acb28
diff --git a/metadata/md5-cache/x11-libs/libXpresent-1.0.0-r1 b/metadata/md5-cache/x11-libs/libXpresent-1.0.0-r1
deleted file mode 100644
index 19d045250b9b..000000000000
--- a/metadata/md5-cache/x11-libs/libXpresent-1.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
-DESCRIPTION=X Present Extension C Library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXpresent
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXpresent-1.0.0.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=b9420f509bad5c1cea00c1b1c9449d40
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.10-r2 b/metadata/md5-cache/x11-libs/libXrender-0.9.10-r2
deleted file mode 100644
index 4d981f8ebe52..000000000000
--- a/metadata/md5-cache/x11-libs/libXrender-0.9.10-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=X.Org Xrender library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXrender
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXrender-0.9.10.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=2772bb7b9d1bc19848ff67b0e1402dd9
diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.3-r2 b/metadata/md5-cache/x11-libs/libXtst-1.2.3-r2
deleted file mode 100644
index 18265b094d8a..000000000000
--- a/metadata/md5-cache/x11-libs/libXtst-1.2.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
-DESCRIPTION=X.Org Xlib-based client API for the XTEST & RECORD extensions library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXtst
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXtst-1.2.3.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=609f80e4627e50c46bd3a4123205e5c7
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2
deleted file mode 100644
index 7a26bcf9304f..000000000000
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=X.Org Xxf86vm library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXxf86vm
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXxf86vm-1.1.4.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=7551ec513497969530c3c96752f40428
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.112 b/metadata/md5-cache/x11-libs/libdrm-2.4.112
deleted file mode 100644
index e0312b9c6e2e..000000000000
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.112
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=X.Org libdrm library
-EAPI=7
-HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
-INHERIT=python-any-r1 meson-multilib
-IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.112.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b805ac6996cb878ac9cc814ae9fd3392
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.113 b/metadata/md5-cache/x11-libs/libdrm-2.4.113
deleted file mode 100644
index eb6ade1e4260..000000000000
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.113
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=X.Org libdrm library
-EAPI=8
-HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
-INHERIT=python-any-r1 meson-multilib
-IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.113.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=50a1ff59cd70f497ad3bc2293d644515
diff --git a/metadata/md5-cache/x11-libs/libfontenc-1.1.4 b/metadata/md5-cache/x11-libs/libfontenc-1.1.4
deleted file mode 100644
index 66cabbb7f886..000000000000
--- a/metadata/md5-cache/x11-libs/libfontenc-1.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=sys-libs/zlib x11-base/xorg-proto
-DESCRIPTION=X.Org fontenc library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libfontenc
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libfontenc-1.1.4.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=c869155dfed8c390e677fe5d861d351d
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.16-r1 b/metadata/md5-cache/x11-libs/libpciaccess-0.16-r1
deleted file mode 100644
index a16176da1349..000000000000
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.16-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=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 test unpack
-DEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Library providing generic access to the PCI bus and devices
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libpciaccess
-INHERIT=xorg-3
-IUSE=zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-apps/hwdata
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libpciaccess-0.16.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=871c569c862bff759df92b7cf1685b98
diff --git a/metadata/md5-cache/x11-libs/libwnck-2.31.0-r1 b/metadata/md5-cache/x11-libs/libwnck-2.31.0-r1
index 4e7e2b64d8a6..61963502ffb5 100644
--- a/metadata/md5-cache/x11-libs/libwnck-2.31.0-r1
+++ b/metadata/md5-cache/x11-libs/libwnck-2.31.0-r1
@@ -4,12 +4,12 @@ DEPEND=>=x11-libs/gtk+-2.19.7:2[introspection?] >=dev-libs/glib-2.16:2 x11-libs/
 DESCRIPTION=A window navigation construction kit
 EAPI=7
 HOMEPAGE=https://www.gnome.org/
-INHERIT=flag-o-matic gnome2
+INHERIT=gnome2
 IUSE=+introspection startup-notification
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/gtk+-2.19.7:2[introspection?] >=dev-libs/glib-2.16:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) startup-notification? ( >=x11-libs/startup-notification-0.4 )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libwnck/2.31/libwnck-2.31.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cd222f5dc0a6adc9c50716e65b1cdc38
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=23a7e559630df9adce95190637f00149
diff --git a/metadata/md5-cache/x11-libs/libwnck-40.1 b/metadata/md5-cache/x11-libs/libwnck-40.1
deleted file mode 100644
index 3e282a649afe..000000000000
--- a/metadata/md5-cache/x11-libs/libwnck-40.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=gtk-doc? ( >=dev-util/gtk-doc-1.9 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=x11-libs/cairo[X] >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.22:3[X,introspection?] startup-notification? ( >=x11-libs/startup-notification-0.4 ) x11-libs/libX11 x11-libs/libXres introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/libXi dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A window navigation construction kit
-EAPI=7
-HOMEPAGE=https://developer.gnome.org/libwnck/stable/
-INHERIT=gnome.org meson xdg
-IUSE=gtk-doc +introspection startup-notification tools
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=x11-libs/cairo[X] >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.22:3[X,introspection?] startup-notification? ( >=x11-libs/startup-notification-0.4 ) x11-libs/libX11 x11-libs/libXres introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-SLOT=3
-SRC_URI=mirror://gnome/sources/libwnck/40/libwnck-40.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3ce3e4bd0313a75089c58ee653fd698d
diff --git a/metadata/md5-cache/x11-libs/libxkbfile-1.1.0 b/metadata/md5-cache/x11-libs/libxkbfile-1.1.0
deleted file mode 100644
index c6c4e0545c71..000000000000
--- a/metadata/md5-cache/x11-libs/libxkbfile-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 test unpack
-DEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
-DESCRIPTION=X.Org xkbfile library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxkbfile
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libxkbfile-1.1.0.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=32943d4810d80f5c916fdace2f848a15
diff --git a/metadata/md5-cache/x11-libs/libxshmfence-1.3-r2 b/metadata/md5-cache/x11-libs/libxshmfence-1.3-r2
deleted file mode 100644
index 165d3792c240..000000000000
--- a/metadata/md5-cache/x11-libs/libxshmfence-1.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 test unpack
-DEPEND=x11-base/xorg-proto
-DESCRIPTION=Shared memory fences using futexes
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxshmfence
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libxshmfence-1.3.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=fe34cc8f99e62a84e59f622025a7513c
diff --git a/metadata/md5-cache/x11-libs/pango-1.50.9 b/metadata/md5-cache/x11-libs/pango-1.50.9
deleted file mode 100644
index b361b84e7be1..000000000000
--- a/metadata/md5-cache/x11-libs/pango-1.50.9
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/glib-utils sys-apps/help2man virtual/pkgconfig test? ( media-fonts/cantarell ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.62.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.13.0:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.10:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
-DESCRIPTION=Internationalized text layout and rendering library
-EAPI=8
-HOMEPAGE=https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=flag-o-matic gnome2-utils meson-multilib xdg
-IUSE=debug +introspection sysprof test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.62.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.13.0:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.10:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://ftp.gnome.org/pub/GNOME/sources/pango/1.50/pango-1.50.9.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fb50e8d684c108cc05967c0f4b2ba96d
diff --git a/metadata/md5-cache/x11-libs/pixman-0.40.0 b/metadata/md5-cache/x11-libs/pixman-0.40.0
deleted file mode 100644
index d73e2c9cb12b..000000000000
--- a/metadata/md5-cache/x11-libs/pixman-0.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DESCRIPTION=Low-level pixel manipulation routines
-EAPI=7
-HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
-INHERIT=flag-o-matic meson-multilib multiprocessing toolchain-funcs
-IUSE=cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.40.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2ee01d4de1b87d91a9822faf06bde7fe
diff --git a/metadata/md5-cache/x11-libs/vte-0.70.0 b/metadata/md5-cache/x11-libs/vte-0.70.0
deleted file mode 100644
index a39d79541b38..000000000000
--- a/metadata/md5-cache/x11-libs/vte-0.70.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) dev-libs/libxml2:2 dev-util/glib-utils gtk-doc? ( dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=x11-libs/gtk+-3.24.22:3[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?]
-DESCRIPTION=Library providing a virtual terminal emulator widget
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson python-any-r1 vala xdg
-IUSE=+crypt debug gtk-doc +icu +introspection systemd +vala vanilla
-KEYWORDS=~amd64
-LICENSE=LGPL-3+ GPL-3+
-RDEPEND=>=x11-libs/gtk+-3.24.22:3[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?] ~gui-libs/vte-common-0.70.0[systemd?]
-REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
-SLOT=2.91
-SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.70.0/vte-0.70.0.tar.bz2 !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.70.0-command-notify.patch.xz )
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f101fd54b448c037d9f39367eb1457f2
diff --git a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r4 b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r4
deleted file mode 100644
index 0ec23d9f1cbf..000000000000
--- a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/gperf-3.0.1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 test unpack
-DEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-renderutil-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-base/xcb-proto-1.8-r3:= x11-base/xorg-proto
-DESCRIPTION=X C-language Bindings sample implementations
-EAPI=7
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-renderutil-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/xcb/xcb-util-cursor-0.1.3.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=7c1964187ea4df2a58fc75be7cada66c
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0-r2 b/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0-r2
deleted file mode 100644
index c00dd5b36d9c..000000000000
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 test unpack
-DEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-0.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
-DESCRIPTION=X C-language Bindings sample implementations
-EAPI=7
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-0.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/xcb/xcb-util-image-0.4.0.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=6afc99b5a3d9d9904f71e5ce9d03fe2d
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0-r2 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0-r2
deleted file mode 100644
index 388746645879..000000000000
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 test unpack
-DEPEND=x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
-DESCRIPTION=X C-language Bindings sample implementations
-EAPI=7
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/xcb/xcb-util-keysyms-0.4.0.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=305311c32ff1990bf448d515fd441bb0
diff --git a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r3 b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r3
deleted file mode 100644
index b79beab68771..000000000000
--- a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 test unpack
-DEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
-DESCRIPTION=X C-language Bindings sample implementations
-EAPI=7
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/xcb/xcb-util-renderutil-0.3.9.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=ecc3aaba96e2102fabf5c463f54a2443
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r3 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r3
deleted file mode 100644
index 80f3f9276db8..000000000000
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 test unpack
-DEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
-DESCRIPTION=X C-language Bindings sample implementations
-EAPI=7
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/xcb/xcb-util-wm-0.4.1.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=a21a325ce27de9709c801d7d833ad3ae
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 3abb292c3194..df4c0e3528ed 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.8-r1 b/metadata/md5-cache/x11-misc/imake-1.0.8-r1
deleted file mode 100644
index 0b7fc3a2b558..000000000000
--- a/metadata/md5-cache/x11-misc/imake-1.0.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=x11-base/xorg-proto sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DESCRIPTION=C preprocessor interface to the make utility
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/imake
-INHERIT=toolchain-funcs xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-misc/xorg-cf-files
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/util/imake-1.0.8.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=4a65d22d7b8438784bd242ff8f11f886
diff --git a/metadata/md5-cache/x11-misc/makedepend-1.0.6 b/metadata/md5-cache/x11-misc/makedepend-1.0.6
deleted file mode 100644
index a05d92a0de19..000000000000
--- a/metadata/md5-cache/x11-misc/makedepend-1.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 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 unpack
-DEPEND=x11-base/xorg-proto
-DESCRIPTION=create dependencies in makefiles
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/makedepend
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/util/makedepend-1.0.6.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=1adfa46caa6dba40c25f3a00b12fdd82
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.36 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.36
deleted file mode 100644
index d5dc88ba7103..000000000000
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.36
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) dev-lang/perl dev-libs/libxslt sys-devel/gettext >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DESCRIPTION=X keyboard configuration database
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
-INHERIT=meson python-any-r1
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.36.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=af8b063819b46b5af38bf7bbc5e1291c
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index fd590bfed2ad..6bff4c79378a 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.46.2 b/metadata/md5-cache/x11-terms/gnome-terminal-3.46.2
deleted file mode 100644
index d412d4428cc0..000000000000
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.46.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) dev-libs/libxml2:2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.70.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-43.0 )
-DESCRIPTION=A terminal emulator for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
-IUSE=debug +gnome-shell +nautilus vanilla
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.70.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-43.0 )
-SLOT=0
-SRC_URI=https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/3.46.2/gnome-terminal-3.46.2.tar.gz !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/gnome-terminal-3.46.2-cntr-ntfy-autottl-ts.patch.xz )
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b38b0b69765e63c583ccb68daef0d11c
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.46.6 b/metadata/md5-cache/x11-terms/gnome-terminal-3.46.6
deleted file mode 100644
index 9cdb285c32a3..000000000000
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.46.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) dev-libs/libxml2:2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.70.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-43.0 )
-DESCRIPTION=A terminal emulator for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
-IUSE=debug +gnome-shell +nautilus vanilla
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.70.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-43.0 )
-SLOT=0
-SRC_URI=https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/3.46.6/gnome-terminal-3.46.6.tar.bz2 !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/gnome-terminal-3.46.2-cntr-ntfy-autottl-ts.patch.xz )
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6a36831cb48c966f20232108eacdacdc
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index ac249f7849df..c45ac2ccdb7c 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0_p2 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0_p2
deleted file mode 100644
index 0b369b794885..000000000000
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0_p2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=gnome-base/librsvg-2.48:2 sys-devel/gettext virtual/pkgconfig x11-libs/gtk+:3 >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10
-DESCRIPTION=GNOME default icon theme
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/adwaita-icon-theme
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 python-any-r1
-IUSE=branding
-KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
-RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=gnome-base/librsvg-2.48:2
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gnome/sources/adwaita-icon-theme/42/adwaita-icon-theme-42.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) mirror://debian/pool/main/a/adwaita-icon-theme/adwaita-icon-theme_42.0.orig-41.tar.xz mirror://debian/pool/main/a/adwaita-icon-theme/adwaita-icon-theme_42.0-2.debian.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0b4470e71d9f98a257bbdeadf7a777db
diff --git a/metadata/md5-cache/x11-themes/gnome-backgrounds-42.0 b/metadata/md5-cache/x11-themes/gnome-backgrounds-42.0
deleted file mode 100644
index bf58d1a90de0..000000000000
--- a/metadata/md5-cache/x11-themes/gnome-backgrounds-42.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=A set of backgrounds packaged with the GNOME desktop
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-backgrounds
-INHERIT=gnome.org meson
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-backgrounds/42/gnome-backgrounds-42.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a4d9726b00fc2dc0751cfc6cbdd47bb1
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 24f5f256a8fb..8c7c213c3957 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/metacity-3.44.0 b/metadata/md5-cache/x11-wm/metacity-3.44.0
deleted file mode 100644
index 710824a1647b..000000000000
--- a/metadata/md5-cache/x11-wm/metacity-3.44.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=vulkan? ( dev-util/vulkan-headers ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.67.3:2 >=x11-libs/gtk+-3.24.6:3[X] >=x11-libs/pango-1.2.0 >=x11-libs/libXcomposite-0.3 >=gnome-base/gsettings-desktop-schemas-3.3.0 x11-libs/libXfixes x11-libs/libXrender x11-libs/libXdamage x11-libs/libXres x11-libs/libXpresent libcanberra? ( media-libs/libcanberra[gtk3] ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) x11-libs/libXrandr x11-libs/libXext x11-libs/libICE x11-libs/libSM gnome-extra/zenity vulkan? ( media-libs/vulkan-loader ) x11-base/xorg-proto
-DESCRIPTION=GNOME Flashback window manager
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/metacity/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2
-IUSE=+libcanberra vulkan xinerama
-KEYWORDS=~amd64 ~riscv
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.67.3:2 >=x11-libs/gtk+-3.24.6:3[X] >=x11-libs/pango-1.2.0 >=x11-libs/libXcomposite-0.3 >=gnome-base/gsettings-desktop-schemas-3.3.0 x11-libs/libXfixes x11-libs/libXrender x11-libs/libXdamage x11-libs/libXres x11-libs/libXpresent libcanberra? ( media-libs/libcanberra[gtk3] ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) x11-libs/libXrandr x11-libs/libXext x11-libs/libICE x11-libs/libSM gnome-extra/zenity vulkan? ( media-libs/vulkan-loader )
-SLOT=0
-SRC_URI=mirror://gnome/sources/metacity/3.44/metacity-3.44.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d348195c12b78339b9b65da8c9218071
diff --git a/metadata/md5-cache/x11-wm/mutter-42.4-r1 b/metadata/md5-cache/x11-wm/mutter-42.4-r1
deleted file mode 100644
index c4bec039c0df..000000000000
--- a/metadata/md5-cache/x11-wm/mutter-42.4-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/wayland-scanner dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/python-dbusmock[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.5 x11-misc/xvfb-run ) wayland? ( >=sys-kernel/linux-headers-4.4 x11-libs/libxcvt ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb:= x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0:= elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232 >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-DESCRIPTION=GNOME compositing window manager based on Clutter
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 udev xdg
-IUSE=doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb:= x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0:= elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232 >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) gnome-extra/zenity !<gui-libs/gtk-4.6.4:4 !<x11-libs/gtk+-3.24.34:3
-REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
-RESTRICT=!test? ( test )
-SLOT=0/10
-SRC_URI=mirror://gnome/sources/mutter/42/mutter-42.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bff1b93015c6448a7a788073eba6810e
diff --git a/metadata/md5-cache/x11-wm/mutter-43.0 b/metadata/md5-cache/x11-wm/mutter-43.0
deleted file mode 100644
index e8750998f9af..000000000000
--- a/metadata/md5-cache/x11-wm/mutter-43.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/wayland-scanner dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-python/python-dbusmock-0.28[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-python/python-dbusmock-0.28[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-python/python-dbusmock-0.28[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 >=dev-python/python-dbusmock-0.28[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.5 x11-misc/xvfb-run ) wayland? ( >=sys-kernel/linux-headers-4.4 x11-libs/libxcvt ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=media-libs/lcms-2.6:2 >=x11-misc/colord-1.4.5:= >=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libxkbcommon-0.4.3 x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.26 >=dev-libs/wayland-1.21.0 x11-libs/libdrm >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0:= elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232 >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb:= x11-libs/libXinerama x11-libs/libXau x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-DESCRIPTION=GNOME compositing window manager based on Clutter
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 udev xdg
-IUSE=doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=media-libs/lcms-2.6:2 >=x11-misc/colord-1.4.5:= >=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libxkbcommon-0.4.3 x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.26 >=dev-libs/wayland-1.21.0 x11-libs/libdrm >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0:= elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232 >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb:= x11-libs/libXinerama x11-libs/libXau gnome-extra/zenity !<gui-libs/gtk-4.6.4:4 !<x11-libs/gtk+-3.24.34:3
-REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=mirror://gnome/sources/mutter/43/mutter-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d202a76b62da4357cbfb767fdd1a95eb
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e109e1fb1dcc..42f0415e1e04 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14599 BLAKE2B aa7561b35b3a906adb3ee194869ba11db4d8bf246ffbe64bb40e842e4206cd3dc1a9a483b23806e663dc2b6dadcf28cb76ae0c680aedb396cf4cc94ea51667c7 SHA512 0a2754da6017ade39957bf3272d6f9c7b55980889c20509b7c191037e097312158a2f4435ce79f798fd09ca4ab22aebea18ef44a3f8006ce02798af82523be49
-TIMESTAMP 2022-12-04T02:12:54Z
+TIMESTAMP 2022-12-04T08:09:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOMAiZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOMVcNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD/Gg/+I4N0L5eTV7x7hcBL/v/MH0H4GYGP/bikzpBFGWv5kHbeXS+/XLLUi9jU
-FHp1cNI5OkU4QSq2zhEsfFlVqXalQIrU/uyk6a0lOQSZNXYHUNEBEe8aMMPrBltc
-MEXpOjuk9Inw1ubFhXBIWSbqzf8lwDVIClbH+xYRJwS9V9SKHi0qNWnP9Cu4+X1z
-Jdn6gOz8/YnK5Dcf+5zaXUw4ZqxcUDRHWt0gWL2Sznaqo6qVbrPfFyZQHckK0lFq
-0J6hfTtM1/p9WFHk5hwcKgCQpyIg6dFCTNhfTsNrWWQc58kDvMQEw/OE/ITgqbbR
-Gt9O/iafsygIPKlDF78UGfm+WpiZD52103XHuZw3l4lf2a5nkwuvE9WS3G8huBde
-6Y556rSY3tZ3izgnjjD9+/DlywySutf4bCqO74kT/WSto6JkXJPorpruFKYHQdhA
-2UXRnTvLi0GUX9ktDuR+CmaVoSOP7HuIf4qZLPD8lcUIW2obpbZi8NlDfPBkxUDy
-5Y/3V+EIGeFE9znn2QaIPkgy433n/OBClCXZHWFTw4WcowgDtV8kElXGHvlKwGkl
-Lk+N2fBYlhqxnfSeHkfwz/RzsmImV+eeAjEn/8y9Tj6q+uar1KvTRjtAMVjDlvDV
-/e+9ipJic1bMAroJPMqoo6+FTopG5dUM6Oetyy4dvo0iQYFzK8k=
-=/9O0
+klAPDg//aQ+jKhuYex+Zb/iu9ZiU+8Tm4o4NPvoAeEZLd580jk6nVrJ9AFwsxgcG
+UphQdTdAjhvuJvcaIZEydB09Ps+uRV+XxIORkxYcDTsf3b5xRhC/cZjkraVGAvaJ
+snidgImxV5/jpXrQ6CBQS/rC5japaByG7nvNoIRR8ZNkjg0VkZbeMx7EMihcgY50
+wrvqwmHubP6lM+SXbNdXNwvny9ZYiNINfUAzrIHJ/S21JBfNPs7VYEO7BRxzYm6d
+g2TH6DqYa8w/e5TvYm4WnXrZQmjMFUhxoto6CkyEIoNhl+xyMgmfrwhfvK8x96Bn
+nV6zhgZiS64g+WIvQjgArT2van43DHHhU06TXsHqhXHJ2UhXQE7myRBA0OIpGkZm
+YCt2Kl3/sj2+chMN8oHQEivz2BxhsvigbnqfeIVuBITLyhUzAkIjVwnRVenRi9Q3
+TrIv9/9bjtKTn+dHe/Uj6Fj76dkvXktgzMp3CIo32JVLw16cjDOyLV44QJm6r8Ui
+6w635OkX5USFAH8Vwrk4RmfVhlJLqWwBGAV7UO5M2lhYyqZvEGAUOMZV8t6zgbiq
+X++rLwA1vBKPcsLemq9U0ZT5t6bZ0WLqzPUEAk0PofDwMo2xuUj3EOv2eEs7NFVQ
+yQBSK3gQri3SZq7hybtCR6n64Jvw0nboH3DC6TatBlWmiBpwKiA=
+=+uxk
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6750e7ab5a6e..eb9065137c12 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Dec 2022 02:12:51 +0000
+Sun, 04 Dec 2022 08:09:35 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 687e3c6c007c..fc5727cc18fc 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Dec  4 02:12:50 AM UTC 2022
+Sun Dec  4 08:09:34 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 347825254e64..d6129c4f0c41 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Dec 2022 02:15:01 +0000
+Sun, 04 Dec 2022 08:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 879b1c018eab..f245399cefab 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-0a3e2a263da5428879d76a6a597d51d7782f47e9 1670111349 2022-12-03T23:49:09+00:00
+631ba8eaf47d7d7d5daac2299ba99c35c02373d6 1670140366 2022-12-04T07:52:46+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index a6c0b8e923db..872addfc11bf 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1670119801 Sun 04 Dec 2022 02:10:01 AM UTC
+1670141401 Sun 04 Dec 2022 08:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 10acdf2b5149..68dd8c9c7e1e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Dec 2022 02:12:50 +0000
+Sun, 04 Dec 2022 08:09:34 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 1e73d8c29263..b68acb1d7eef 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 007830cb706d..232abfdee278 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,6 +1,4 @@
 AUX glib-networking-2.74.0-gnutls-tls-1.3-test.patch 4342 BLAKE2B 5957d92382127f1f340f35fefa2e8b85355bc559985e950ae2ec89582832c3b603966a2bb1dd73562032f1970ceb4d5a6159fadaa6a11a8e02b09e862cfedf3c SHA512 a5fe07d92794e2917c7ae5c28323173d94e01b2cad71e88b79924774836a04cba0d1b373e1b28e1da51445b226f06acd64f95346ed0fe5ea3173105cc74ab334
-DIST glib-networking-2.72.2.tar.xz 265268 BLAKE2B 90e6eee44faeb495e26a61d15fab66034784637f43d2184901099a6daa69e36d39f732cd5ccd5262f213f19329982264138592b60a08009f4ff034a3ad20922a SHA512 b2837f1521ea8312fb508d3000d465898d409bb48033a63430609331f45628f6b49eaaf16278f2ef48c41b9fccf38f78a85374d23e9ea75692a11cbd7ef058ec
 DIST glib-networking-2.74.0.tar.xz 277232 BLAKE2B d0027a3beff276b2d0b008d1ed0bdeef231d8fb03c26c2e301a3eaef76ad4b704a5db36f6265c5516d73c5dbdb98c7c0919b6924038506dad0123f5ec77577b2 SHA512 f266c106f2c9379b95773a852c1b5c62ae1d6a758d25c436c3558f620d8e0a211201b3c4dfd89cdbe28b88430bba0cca621e62c01ea23d473983e203919bb1e6
-EBUILD glib-networking-2.72.2.ebuild 2004 BLAKE2B 7940597d2b326c67ce959273b033da365eb5f46825e837b02104947ec7557cd578b7b38605c495ed9fb89f8f0f827a64638a8f48846ae66965b61fb1dee9e470 SHA512 afdd73225c34ee65730ef93815a45de4787c8d42fab4212d4f24612c5935a43dd4980e421a6563efdd02b8089c737b507b43eaad30c98ef787b15a41a58401ec
 EBUILD glib-networking-2.74.0.ebuild 2111 BLAKE2B fb19e3208b9939fed7a89bc729b8552003d2734e22cd0135f35954c03f02bea86737dcf10de3f111ce0ca4d6eda5e228ff35f3a5da414b4bffd460121755eee8 SHA512 e5c30da45361b5415083ed9ff172514c0c4734cc8e3ac52e33e44a1b92581cb340eaaec1d192a519beed4732ad3836b931f5921d0543698ce9eb38e20da2bb5b
 MISC metadata.xml 590 BLAKE2B c74ff24be718581a894745c99a4a6ace914fd396958f988986ea55ca4c2e271e1a417a27c7b63a9e3496260985fde1796a0f2fd9c0b5ee212eb2c8d0d33076a2 SHA512 c83668d49e2353f4608e15c0a5ba3b3700a042e8aa94e4214e5246db6fe31f6d668e5d190c9c3032798ece3725508b7063461dee9bbf039c1cf54dc2230f4b6a
diff --git a/net-libs/glib-networking/glib-networking-2.72.2.ebuild b/net-libs/glib-networking/glib-networking-2.72.2.ebuild
deleted file mode 100644
index d5891f0bed16..000000000000
--- a/net-libs/glib-networking/glib-networking-2.72.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson-multilib xdg
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/glib-networking"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+gnome +libproxy +ssl test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.69.0:2[${MULTILIB_USEDEP}]
-	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}]
-	ssl? ( app-misc/ca-certificates )
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-"
-DEPEND="${RDEPEND}
-	test? ( net-libs/gnutls[pkcs11] )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	if ! use test ; then
-		# Don't build tests unconditionally
-		# This is a hack to avoid needing gnutls[pkcs11] when USE=-test
-		# It may become a real runtime dependency in future
-		# Please check!
-		# bug #777462
-		sed -i "/^subdir('tests')/d" tls/meson.build || die
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dgnutls=enabled
-		-Dopenssl=disabled
-		$(meson_feature libproxy)
-		$(meson_feature gnome gnome_proxy)
-		-Dinstalled_tests=false
-		-Dstatic_modules=false
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	multilib_pkg_postrm() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index edf18b0ce65e..0ee5ac512e43 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,9 +1,5 @@
 DIST gupnp-1.4.3.tar.xz 154812 BLAKE2B b41a8805853061399412f5eb7267e9913adb3054ebf8a3bd78f6df4c1607d4a944654f3bc6e154fefa98f1289a80055d0feb0168801d83a1ad59c25f5fcac784 SHA512 1963ce917458168c8bc5d669ee30a4071d83d3768ce1be8cbbd81c767853ca01950623a88628a0b1e403d1cce1f0bbc9df80acf4b75f91bfc0403e0d0e6bcedb
-DIST gupnp-1.6.0.tar.xz 2212044 BLAKE2B bc10b405f79845dd6a86c9110d26430bd6c67d36c761e38ddeee01135c27d196dbdc32fe09f322f9c0e19d2d424bb4f8b042531c81ce9da18e3f3d4f2d93e255 SHA512 5cf7a6c27f5b183e4f4387e478cb6f3ccdf4169a8e6a878f087ebf61aa41d31181480a42a8c38155af8a410c342dc6140a9cc44e30295f8f10333fd12fa53cc4
-DIST gupnp-1.6.1.tar.xz 2215460 BLAKE2B 8bac4cfbe2fde421746be093db0043cf7333d647963a7a79c470247c6adbe58eee164b1b70f349e7aedeb7ccefb29d963beab02fc1e752306bf8587357154f4c SHA512 eccdf79eb4291af0720cda8aaf0d352eb71816ace5483bc68ede899d42d1d0b359558cc74017ceff8d0bf591b188794735b3d10d71ba85cb2b376038c7de1761
 DIST gupnp-1.6.2.tar.xz 2215220 BLAKE2B 457a334a6fe07c8038e83e63472809211751f4292a0ab176e61275d77ab904a91845bc2302dba6f320e3bc4dce5cef768489b81083e21a0cad0ed4961296aebd SHA512 52024295b86fa180cb8676541da8350cbba0758a19c90c26bc922cea68bb4584a5fc414915e73449ba10107492684edec25dcf60b1af203727c59944aa2cac34
 EBUILD gupnp-1.4.3.ebuild 2078 BLAKE2B 07c0680c2f1c545f0c0b267cae4f59cbcb327d2a15506c7161abd9fe0ca3b5ac373c5812c21b9df015ad2bf231102c672a0edc670568f4bcdf3320aba130b2bb SHA512 cdb9a04c79744b52159061ee1ac947188abb391168c1769b4dda4798bc8cd9bf187de67dc9606b1f99cf743e80fcf806f2c19ffe0f76cb2bcbb159adf5ba49f7
-EBUILD gupnp-1.6.0.ebuild 2218 BLAKE2B 135a4a491604f7f87277e59c10bfaff28c8684520f27bba0db3270a791563a0bb2e3094497a878e1e3218a2c9bb3fdb26270b36e7c0ce8c3020a23b527c42236 SHA512 86ea839b604c3860facbe74aaf330cf940c43fe972c236d12eb6906704321481c433198b1719bf995bffdda49c74b03eaeb828de9eb62ee8b4948ddc9fced9e7
-EBUILD gupnp-1.6.1.ebuild 2157 BLAKE2B 514b3ae4c5c1d1c80b8ac681f0d68e4e28853508e15068ba2badd7853e69c40e01a71bcaf2767e4170dd18ede0ff6a0f86f5bf9213a007731d9a93b7976393c0 SHA512 41d26fb6d104db12130baef2a3b48755734038f4f0263687b9f0ef5816b211e04cf90fbd09fedb052a29d45e6c9eb4bd95988291038e222b4f9693978f2e8ad1
 EBUILD gupnp-1.6.2.ebuild 2157 BLAKE2B 514b3ae4c5c1d1c80b8ac681f0d68e4e28853508e15068ba2badd7853e69c40e01a71bcaf2767e4170dd18ede0ff6a0f86f5bf9213a007731d9a93b7976393c0 SHA512 41d26fb6d104db12130baef2a3b48755734038f4f0263687b9f0ef5816b211e04cf90fbd09fedb052a29d45e6c9eb4bd95988291038e222b4f9693978f2e8ad1
 MISC metadata.xml 346 BLAKE2B c0c2d7c5a0f1906cc1789a30daec476919e7332f2a8aed9ec78e824be2776e7a18202b8fe19e519340cc9437d4147e223eb6830460c2a4c499cd483c77524cd5 SHA512 84998e9f5ebf374d1bfea85f7eb4b89f8459ee62ec89dc8b9bd36de354a307ad854cd7521eecd31b410659d5128a4dd9545ab7037eb5b7f8b41efdb8054b9b2c
diff --git a/net-libs/gupnp/gupnp-1.6.0.ebuild b/net-libs/gupnp/gupnp-1.6.0.ebuild
deleted file mode 100644
index 9dbf892fc913..000000000000
--- a/net-libs/gupnp/gupnp-1.6.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit gnome.org meson-multilib python-single-r1 vala xdg
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp"
-
-LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
-SLOT="1.6/1.6-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="connman gtk-doc +introspection networkmanager +vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( connman networkmanager )
-	gtk-doc? ( introspection )
-"
-
-# prefix: uuid dependency can be adapted to non-linux platforms
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.69:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-1.5.2:1.6=[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.99.0:3.0[introspection?,${MULTILIB_USEDEP}]
-	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	virtual/pkgconfig
-	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
-	vala? ( $(vala_depend)
-		>=net-libs/gssdp-1.5.2:1.6[vala]
-		net-libs/libsoup:3.0[vala]
-	)
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-multilib_src_configure() {
-	local backend=system
-	use kernel_linux && backend=linux
-	use connman && backend=connman
-	use networkmanager && backend=network-manager
-
-	local emesonargs=(
-		-Dcontext_manager=${backend}
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.6
-	if use gtk-doc ; then
-		mkdir "${ED}"/usr/share/gtk-doc || die
-		mv "${ED}"/usr/share/doc/gupnp-1.6/{reference,html} || die
-		mv "${ED}"/usr/share/{doc,gtk-doc}/gupnp-1.6 || die
-	fi
-}
diff --git a/net-libs/gupnp/gupnp-1.6.1.ebuild b/net-libs/gupnp/gupnp-1.6.1.ebuild
deleted file mode 100644
index 14582c85caaa..000000000000
--- a/net-libs/gupnp/gupnp-1.6.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit gnome.org meson-multilib python-single-r1 vala xdg
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp"
-
-LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
-SLOT="1.6/1.6-0" # <API version>-<soname>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="connman gtk-doc +introspection networkmanager +vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( connman networkmanager )
-	gtk-doc? ( introspection )
-"
-
-# prefix: uuid dependency can be adapted to non-linux platforms
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.70:2[${MULTILIB_USEDEP}]
-	>=net-libs/gssdp-1.5.2:1.6=[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=net-libs/libsoup-2.99.0:3.0[introspection?,${MULTILIB_USEDEP}]
-	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	virtual/pkgconfig
-	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
-	vala? ( $(vala_depend)
-		>=net-libs/gssdp-1.5.2:1.6[vala]
-		net-libs/libsoup:3.0[vala]
-	)
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-multilib_src_configure() {
-	local backend=system
-	use kernel_linux && backend=linux
-	use connman && backend=connman
-	use networkmanager && backend=network-manager
-
-	local emesonargs=(
-		-Dcontext_manager=${backend}
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		-Dexamples=false
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.6
-	if use gtk-doc ; then
-		mkdir "${ED}"/usr/share/gtk-doc || die
-		mv "${ED}"/usr/share/{doc,gtk-doc}/gupnp-1.6 || die
-	fi
-}
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 3a3086f1ceeb..ec2c743fc4e4 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -1,7 +1,5 @@
 DIST libnma-1.10.2.tar.xz 1360128 BLAKE2B 8caff2baaf1d7e0cb7a6cefee4917b5f294517cc3ee22446f0bbea0301664969bdf43d10fcdf15e938bdae07467ad0a048687e61c3c494c4f042a1f6800d5745 SHA512 f8ac5f73ee8bc918325d2beec3e1eea61fed18110103ba9c3eb21da02fbd054895aa5ce332942a9113bb4860d59958dbf9c3b91885663b6225daec25cadf7458
 DIST libnma-1.10.4.tar.xz 1351932 BLAKE2B 0178407d04fed680b260ea7e4615f0d939483504209b4bc721e2a4fe49ecbf49d9ffde0476b4352973cda9de4f088ac50d557c12f67d970f21031c1741f692e3 SHA512 4fe0d6b0e5b3c1bd7654e03dce747ee390de76d6641eb317fecb901ed6768bf48785e4a99e6fc8f12864066d06a64e308a8dbb2081a2d57e3f1509ca712deccc
-DIST libnma-1.8.40.tar.xz 1350560 BLAKE2B 9c5124a1dcaa801c7d0135ef64dedccd098988fdd199938e2409e80bee86df71bf368cada113dceae4046a5c2c5fe954aa9fc0c19519721a4e8ec7b8f7ea8d44 SHA512 28f4704f97941308f43b27a309fd14050e8ac7e0c6665cada3cc08a759e140f043a80b21ccfe02ce348f8490cad8107b4fe27026dbaafed46ec1c7c46824e3b8
 EBUILD libnma-1.10.2.ebuild 1720 BLAKE2B b8097044c991d5ad1de2501c578ed57566c07843ca27c21c746e30df2298c83fc3e8a8ead3e38fc05ba9030ee3a82e02cde9cf963b18ba57808920811ae6968c SHA512 6c824e780fb011d73cda9eccafcd3e13c3dab86f1d59ef7c889199fdb24490e028e48f417996da4f525fd0d106169d57b6aeb7e0acc3903b5a2eebe30d8b2c3f
 EBUILD libnma-1.10.4.ebuild 1779 BLAKE2B 562d5c55285df7911789d00604001b1411a57d7e98b42a54f9fd499c4d1df0a24ccb6200c6ed8aa9b1a6a23e639d45a9f16621b15136246443c21e097ec9403c SHA512 ff1d4013c5464bd1569df5c649e70d1960eb1f8cd6581e9c24c13e2a4ea2094460c844c060889338370be7ab7d94f10fe1c7fa9246494a85d2a6f790927a1c89
-EBUILD libnma-1.8.40-r1.ebuild 1682 BLAKE2B 5f43c3715201f41b473902dca9cbcbf998b198b4148bff0469109de04a59cd0d58f5a170a055104225a3079cedc566f63b7c9c061d63bc0ab8df20d22864c7dd SHA512 7bb061ad2e9e508b1f3adcb270d9e2217d48d5116fb17fa906f07596c9ea8de434903e9970eaa11812d787166acbf8de6c482234b8ba8a1590231e2b83456725
 MISC metadata.xml 470 BLAKE2B 634b69ece62b9f3f8aa9e82b1df56009823dffd8dd45a46b6ac58c3580179c7c6c87965c8da5d653188e81bfbe5c26c956d15181d23f23ec17b468ba3b585cbd SHA512 a15b193fd01eda0a1408af3ad93660ed7cf859e3837e8e83c5c76031cf50aa3634e8a4d2a47f8db8c311cb36b1eb2fb8a89f8c7adfb9fd6d596eb6e9e5e8bea6
diff --git a/net-libs/libnma/libnma-1.8.40-r1.ebuild b/net-libs/libnma/libnma-1.8.40-r1.ebuild
deleted file mode 100644
index af22040e877f..000000000000
--- a/net-libs/libnma/libnma-1.8.40-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="NetworkManager GUI library"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
-IUSE="gtk-doc +introspection +pkcs11 vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-DEPEND="
-	>=gui-libs/gtk-4.0:4
-	app-text/iso-codes
-	net-misc/mobile-broadband-provider-info
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.12:3[introspection?]
-	>=net-misc/networkmanager-1.7[introspection?]
-	pkcs11? ( >=app-crypt/gcr-3.14:0=[gtk] )
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-RDEPEND="${DEPEND}
-	!<gnome-extra/nm-applet-1.16.0" # gschema moved to here before nm-applet-1.16.0
-BDEPEND="
-	dev-libs/libxml2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	vala? ( $(vala_depend)
-		net-misc/networkmanager[vala]
-	)
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dlibnma_gtk4=true
-		$(meson_use pkcs11 gcr)
-		-Dmore_asserts=0
-		-Dgcr_gtk4=false
-		-Diso_codes=true
-		-Dmobile_broadband_provider_info=true
-		-Dld_gc=false
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 69aff7c3c7ed..e23368d7b8b6 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,10 +1,6 @@
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
-DIST libsoup-2.74.2.tar.xz 1497356 BLAKE2B b05e5d06e20a95042334c79e3a633ec43db0e7444b425f8577045fbdee7b78bd697e743f4283ed79265bbe538145a541ef2ef55636ae235667a89d00910d5bf2 SHA512 6f9da3296364e210103093cef9ef34fb40f694a8ef90966fc1fbd834c11f3db1031784a0901e9181bf3124e0682708148bd3598a31d60f1cce61eaae2e19ba7a
 DIST libsoup-2.74.3.tar.xz 1504804 BLAKE2B 91f441197414314bb78cf15e7c13b54714e669145784812fb7a68cc41c8965ea29c53dc686d690e00f28f711be9f767038e5cc43b11aa0136f190dd2d41ec2a0 SHA512 72f8a055df984cb35105fe67f4ca67d3fb110d40a9cacb660fccd89f93b06bc32e25d94375dcc76608a245f7c5e081d968d7aaf5952eb16013d81c741247cb4c
-DIST libsoup-3.2.1.tar.xz 1520736 BLAKE2B 57a040bab530e2a1bb67aea65291205c151bd3b490c200c2d2fd4ca77fab9f62e9fada5ea143c9581065a332be57d753dbe2cabb9228ca06a35d6327277e5fbf SHA512 e5f60fd700f4cda041d869eec50e787b2fbe9323949b90710405cff296e108bab6d1323ab96e89855c5396ce73c7b7574b424dbe957ae10b48740b272889be51
 DIST libsoup-3.2.2.tar.xz 1530460 BLAKE2B 8df66651a0bdcdb3337ced0031e4e8a32883241f6b7310a2b91396883368fa849d1e7dbab3766ec38ec05fdd81fafabd1f165cfe22a168e87db9a431ca86274d SHA512 1f2b49244f8bac4d112b39ac9c6a942acbc1ae1cff33262ed02e7682af3994cf6ba6741b365b3c80c45c6427d391599fa6f31df6caa4ffefe7d078ac373bad1b
-EBUILD libsoup-2.74.2.ebuild 2942 BLAKE2B 83795dff978db6701967be68903382ce13f25a138a7d851cdaf25c18d0a21813ef8366c38102ed9cad349b2a4aae3492e89830029128a7ac3c7e4c64b46f780c SHA512 4d018f152a378112785f6af8d040a969a3ba8bcb81423261126f3971d8118e4e5ea550690b1d48b9b3f1c7ecd98271d0f30334264b5ac7281c6ce24e2c3ef005
 EBUILD libsoup-2.74.3.ebuild 2942 BLAKE2B 83795dff978db6701967be68903382ce13f25a138a7d851cdaf25c18d0a21813ef8366c38102ed9cad349b2a4aae3492e89830029128a7ac3c7e4c64b46f780c SHA512 4d018f152a378112785f6af8d040a969a3ba8bcb81423261126f3971d8118e4e5ea550690b1d48b9b3f1c7ecd98271d0f30334264b5ac7281c6ce24e2c3ef005
-EBUILD libsoup-3.2.1.ebuild 3137 BLAKE2B c8302c2b2a869080491c97e0203d61054b3bfa999fa8fe4ace0c46cf1f2661ed2ce738d938225090e0de7e283bf4dee1c54399c5923780528e14772caa934a79 SHA512 b2efeace7ee8e5d03f13a17b38cc147293fca5627248c39ae48955b1dffd38a59c43871ee065031b1962c051524537a342e638e0b790725fc939adfc6765f479
 EBUILD libsoup-3.2.2.ebuild 3144 BLAKE2B c9bd754be2cd0588a49ad79784a25e0de64f24e60466a8fd45bcbe55afdd2855de6bd1b8b64b7b45c0dfb4d115dcf96fe251f62d3728c78a7401efa23ca9e4d7 SHA512 5a2dd8b32d83b91a59cb28af3e78035e4f464f0addaa914695143bd99cb074199abae2e1a291854fb8eb00005d5ec2098148c5e6a755484951c1805d0100251b
 MISC metadata.xml 679 BLAKE2B f79b04bbd3151df84b7db423394b22eb402fca45fc5386ced6ef1990af7fb02f645bbcbe2fdcf49c4bc8526b19695af6864705c70e36d9e31b56cbd947828633 SHA512 404eca4f62dbd1afe64719d5a2429a2ffc3cd89087ecb2de6fb5bfd00b207ae3f3a7810a51c4f4681c4342b1ae8fe0002d8d9b3c6bf60df715526a65a122b0eb
diff --git a/net-libs/libsoup/libsoup-2.74.2.ebuild b/net-libs/libsoup/libsoup-2.74.2.ebuild
deleted file mode 100644
index 7cb4a1169afb..000000000000
--- a/net-libs/libsoup/libsoup-2.74.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="HTTP client/server library for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.4"
-
-# TODO: Default enable brotli at some point? But in 2.70.0 not advertised to servers yet - https://gitlab.gnome.org/GNOME/libsoup/issues/146
-IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="
-	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-	sys-libs/zlib
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	samba? ( net-fs/samba )
-"
-RDEPEND="${DEPEND}
-	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
-"
-BDEPEND="
-	dev-libs/glib
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-PATCHES=(
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	"${FILESDIR}"/disable-apache-tests.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-	# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
-	sed -e '/hsts/d' -i tests/meson.build || die
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	# But necessary while apache tests are disabled
-	#addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature gssapi)
-		-Dkrb5_config="${CHOST}-krb5-config"
-		$(meson_feature samba ntlm)
-		$(meson_feature brotli)
-		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
-		-Dtls_check=false # disables check, we still rdep on glib-networking
-		-Dgnome=false
-		$(meson_native_use_feature introspection)
-		$(meson_native_use_feature vala vapi)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		$(meson_feature sysprof)
-	)
-	meson_src_configure
-}
diff --git a/net-libs/libsoup/libsoup-3.2.1.ebuild b/net-libs/libsoup/libsoup-3.2.1.ebuild
deleted file mode 100644
index 9b2de0509056..000000000000
--- a/net-libs/libsoup/libsoup-3.2.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-VALA_MIN_API_VERSION="0.54" # requires gio-2.0.vapi generated from glib-2.70+
-
-inherit gnome.org meson-multilib vala xdg
-
-DESCRIPTION="HTTP client/server library for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-
-IUSE="+brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-DEPEND="
-	>=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}]
-	net-libs/nghttp2:=[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-	sys-libs/zlib
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	samba? ( net-fs/samba )
-"
-RDEPEND="${DEPEND}
-	>=net-libs/glib-networking-2.70_alpha[ssl?,${MULTILIB_USEDEP}]
-"
-BDEPEND="
-	dev-libs/glib
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gi-docgen-2021.1
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? ( >=net-libs/gnutls-3.6.0[pkcs11] )
-"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-PATCHES=(
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	"${FILESDIR}"/disable-apache-tests.patch
-)
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-	# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
-	sed -e '/hsts/d' -i tests/meson.build || die
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	# But unnecessary while apache tests are disabled
-	#addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature gssapi)
-		-Dkrb5_config="${CHOST}-krb5-config"
-		$(meson_feature samba ntlm)
-		$(meson_feature brotli)
-		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
-		-Dtls_check=false # disables check, we still rdep on glib-networking
-		$(meson_native_use_feature introspection)
-		$(meson_native_use_feature vala vapi)
-		$(meson_native_use_feature gtk-doc docs)
-		-Ddoc_tests=false
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		$(meson_feature sysprof)
-		$(meson_feature test pkcs11_tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/libsoup-3.0 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4033ac921e60..f6cd170da53e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,16 +1,6 @@
 DIST webkitgtk-2.36.7.tar.xz 26594424 BLAKE2B 1f7450e47bffa3875aa4448925a013ec90bdaa6c813aa181d14c9a5636c58140ce55d5b5288a65cfbe9e363cd9d00f62de74665182ab9f856baa4b2ffcec6dba SHA512 e27975cf55b6be4cde2b34ed03fc717e6550dc495b444c781b3af0b32f7d580451de27ed41d74c6ff734b876118f22847096131168b0c8325031be84c1972888
-DIST webkitgtk-2.36.8.tar.xz 26610100 BLAKE2B d3862fdf18b6095c32af517b7bd175797375fff8a9d68f04d773375c0c3cea284c23466f25e3e53811ef622974f58211b4b11cb32a47ff08951cdd65b085b815 SHA512 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
-DIST webkitgtk-2.38.0.tar.xz 32997240 BLAKE2B 6612d2192b8865af625af297c88caf02e329d51e9c166b931b8bc6061f36fb1f1f2b06407adad0aa7bf5beaafe707c1d9a64d437e2ed99ed8ff1865c09f8e0dc SHA512 8380d11eedec3c4eedf3a0f5591fd279ee42b28a38aaa13d7eb88f8a004cbe8aac7dc8f19409440e5c1272ad1555a781f1242bca6c89beed2dc5fd2de5f3d525
-DIST webkitgtk-2.38.1.tar.xz 33006384 BLAKE2B 404ff4e52331f9fe929922a23bed8ab5a70cb2a6523ae23c390415bfbd3c88797f91f95b74c9c8301f462bff708c85dc7155d6b37d2c3a66d4794ca184e1ca7c SHA512 d81e85a5a43c33a63f88964907053888bb971c8fa1fe7fc90f71461c440458a21e09730c558be2b5efe42e02eb1c3d789a2571dc6d795f9c6d95fd499683a9e2
 DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37
 EBUILD webkit-gtk-2.36.7.ebuild 7425 BLAKE2B 1f261d15a60f1d07895652c369cdf572cea2bdd19236abd2a2de2b31b1f8994a644d85185368a07a708c7c4e956f4547b12ae14a8befd5b1c33fd02ebfb1b9fa SHA512 459a52070c6c83950dd278c3325bc83d184314ec4e613ccf3f34fc9cd4ce7d45d854a892452e9f620da37937050c470e21614daac03189cf082cfb07f50d92a6
-EBUILD webkit-gtk-2.36.8.ebuild 7431 BLAKE2B dae5715e2d558348b040967a2aec6bb48da85da9a308322c8c7c56a511a0e9a95dc5e7fc4e58ffb175d5a239da017da4a0de8fc905c7997689d87ad85a1e8e75 SHA512 7681c899912ed9e2c4d2418d8363f7f17d76c04905dc71acd1f51709fb10766b6765d4f306d22eb6f5cf00166c72151d41b6154052203edf67d58a5e47b58efc
-EBUILD webkit-gtk-2.38.0-r410.ebuild 7759 BLAKE2B d410fc8f19be0435fe429d70943345fb45f3f0cddf851d79498f6f3dce2cebe15e7ede05aa064f85bf07a2173875d1d85e2b1412fee7e4f0eb5af77f1fd53fc9 SHA512 779f2f9c4073cc294d7e3b907a843b3c9452c83140da0e6519eab4f69aab0b81106a6151df2ba066a21c396444b53e0cea6f984f5997374a888aaaaf4ed24b95
-EBUILD webkit-gtk-2.38.0-r500.ebuild 7637 BLAKE2B 60d17bec45a04003cd20682d89534267ba7620703478411c6b42d86a5f3bcbf2a12f2971f3fce9b33677a81ff21c9654c55e37cadda64bcce168f9d2dd745d0f SHA512 fe2ba86ac2cbfefeb84093045aa5dff3b29e8c7fa70929ad744098fa4d62292267e58cb65d2400858305c5d8ff884e29c172b99a4d9d86192e7216338558d1be
-EBUILD webkit-gtk-2.38.0.ebuild 7485 BLAKE2B a748a1089fe164a8a827e262040ba316d856777d6607dea2f6c2a21ebcf62859bc7ff4318e044bcb58998a572bdc974e5414b1f773e8f73b27a1e1d974598a0e SHA512 753ebb1f3942dc3b574960369f985de8a6c781d505c21ace58cc29ab4be7f9bb5d1dfd29b2870c2734f04cef4f8f04e06e7cbdfcf03de15c912355485c952055
-EBUILD webkit-gtk-2.38.1-r410.ebuild 7808 BLAKE2B e7f002be09d32397ad11090bb0b2b8ef75fec74a2502cb9f426e9e4ab47f25de54914225edd53cc056e8dab32b70c74885f635bb8921582726963f83ef04f1b4 SHA512 cea61f06a256c54eeeb023da302b42a0487d41d0740ba8dc3970b14434367a0237d8db27d9db141b1b8ebdd881d5064145b7c17c61bb8f85c849e25da5f820ad
-EBUILD webkit-gtk-2.38.1-r500.ebuild 7687 BLAKE2B fd64d39a1168369187cf12db3a4f37d8ccb278aa5786111216d92b656a55313c8172acfc434edf912962ac612e6126f37078eb02e45b6b6d4576abe8f7446e57 SHA512 9779819e48b1f5837ddc6e25108645fd56f48203e0327d52611a826559665f32bb7796eee8986dc2275d328e63183d12e45471c0c822f26e89e0a68681be7cfd
-EBUILD webkit-gtk-2.38.1.ebuild 7534 BLAKE2B d600cc109f42ff2d6bc1f39233db47fff1b699da865f96a7143c89d62100ee9829da1a9349c734dbc92e97a225404bbe9c8cdcc5295d92c46e34db5214b6564d SHA512 56c0a953ec79956fed0cfe68042eaa66ef2fea96ac5f65c51123e0383cc283c42d00dac1c5a452e01899d91951e1e7af958a99b2ef85331fa0ebaf97d8528a51
 EBUILD webkit-gtk-2.38.2-r410.ebuild 7813 BLAKE2B 1b428ecd3d3ebbdd9001f2d84cf570a3d8bcc7fcfce9280215e052b08f446814c3833fb0c7cfa3168d9e6d847183b16795ad42c71605ba0ee33455e05e89fe98 SHA512 02aab8f6a0e8a5cba84156a11d9eab4c35b677c02cae6fa5762cb4c42fa733cfb81518b83574bfe5a0f192980d68a262a0745741e90d7612cbfb14a50f107771
 EBUILD webkit-gtk-2.38.2-r500.ebuild 7692 BLAKE2B ee284ac313e5fdcbd00a744957e787d708a3a45cea858421aec0e0e4443f0480a33f467dfe3da2563a3d8718f8beb0db487ccfd46f82427877e169903bb05828 SHA512 15ced5b987317cc76bd8471463a75e8215df3946b572f6013cb2d7db52a9a5a59471b792f570fd22f9ca5c2c78391baaed41d4b67e13179e32c78fb34f75d20b
 EBUILD webkit-gtk-2.38.2.ebuild 7539 BLAKE2B 90d4bd642a7d512cb22cc5e2be83d63acd3b8fade2a714d91522463cbaf3a76552b5a4f71e083051fd785a42ab10cc90c28d02f2ef45189aef72f9a4fd441ec6 SHA512 9fff20b27bb349e5657c8b3948d9498f772d1e0dd18b85e0ef74223aedf166a5b2757d23be413698d2584a9310a3054416a95b200390b869b305011830e461ce
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.8.ebuild
deleted file mode 100644
index 3891152a3b59..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.8.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_ANGLE_WEBGL=OFF
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.0-r410.ebuild
deleted file mode 100644
index f7ae48a1c9d7..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.0-r410.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=ON
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.0-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.0-r500.ebuild
deleted file mode 100644
index 1346c001c23b..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.0-r500.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=ON # wbkit2gtk-5.0
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.0.ebuild
deleted file mode 100644
index c37062df4a5e..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.0.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild
deleted file mode 100644
index 0992b464692b..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 )
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=ON
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild
deleted file mode 100644
index 6b8fac2e5658..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 )
-
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=ON # wbkit2gtk-5.0
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild
deleted file mode 100644
index ed868176aaa5..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 )
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a77680fc458f..71ad3d5fa8d3 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index e8ad47acb910..16edbfb73064 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-remote-desktop-43.0.tar.xz 195212 BLAKE2B ccfb43075ce6e36de4bcf3f92265e6596b78831393e3d6b079ef71ae729a9d48fdf177673b4b7e67db8c92a0d397461c60727780f18ff78c671eac6a01229ab4 SHA512 d774d85ef15b02f6c668806e8d7b036c3063decbec81a8cf253aaa01e13a49d802f4338e677744867e2e1ab3dc02ed30c8d8edbca2a9c428b783d5a4cdd8d110
-DIST gnome-remote-desktop-43.1.tar.xz 195740 BLAKE2B b73f0e72f72c45169deb1018dd19cbac779effc2bafc53b8db21cb72c48f5871ef64e3a085509aa859550b4fb54713506e2b6410e211eba7ee8850649af7c39f SHA512 5e0164092da0fdb4877c8a1b40f1df609315390468522efaaad8f30f5c8e29111b021c1a7f3b8ce25627dfbe7937a4876d6673a816d81fdc191d30d4553a0596
 DIST gnome-remote-desktop-43.2.tar.xz 195984 BLAKE2B 7f6bcf142f98a1b6f357cbc6bb651c63bcae5360a52a83ac44b8eea8f0f3bcdb29c23ec4d973ee40b29ebc0ff59958468a236238b50e68a886e31334a45f5c5c SHA512 e7e9c36e04a7273cb1700859d59ab8130bca7103c3def7f51a6df31b98f6021b9ceb15d2f9e71fef2464141dcd01d467e126731028d7dd6b6ec843dd52b1e8d4
-EBUILD gnome-remote-desktop-43.0.ebuild 1362 BLAKE2B 8e0b92def7905f3e36e56664eb7c192de4acfaa8da21af45ad3dec7b563c52715baddae6cb68a0ce2405a484b347e286d7f7f4b8ec9bbc3bebd2c3af4d9008a5 SHA512 6d21560f9d01cbfef4d36c3d361c2803df0812b5a1c0c522b02dd4085e3b642270a9c4827bd57389e1cb9fa0fb8b9f17015a882996184a110b7eff0a9e3b310f
-EBUILD gnome-remote-desktop-43.1.ebuild 1368 BLAKE2B b579aab040bebf357e960ba6f65813026023a63dc5023f4079dc5b7b3fe38d71fe7c1dd549ea541d90bb5f23c017e89900c56987eefbaf96e5868e152efefd33 SHA512 68ec11a3b414a8847900f9900af4beeacd9a6e45b0958afda0e4fa5351a539ba2caede34e0a6bb9649d56d4a113bd1e20e7fc55cabf8da2e0240d65d70846651
 EBUILD gnome-remote-desktop-43.2.ebuild 1368 BLAKE2B b579aab040bebf357e960ba6f65813026023a63dc5023f4079dc5b7b3fe38d71fe7c1dd549ea541d90bb5f23c017e89900c56987eefbaf96e5868e152efefd33 SHA512 68ec11a3b414a8847900f9900af4beeacd9a6e45b0958afda0e4fa5351a539ba2caede34e0a6bb9649d56d4a113bd1e20e7fc55cabf8da2e0240d65d70846651
 MISC metadata.xml 488 BLAKE2B 14e2e29779ea62269e8c473a877b3da316a60b6b970ac784e6cd853610ac81a981ed9dd4104a99d5e7c48f4146f74efdbab9f71d81c405baf24f3cb3e9a1702c SHA512 7d9b8b371cc0f609e77baa3a3eff701a5a68922e5405995d5c3f70bc92af0308ca409bc05e28480ab8f008b879e417cd679bb0ec5494f17d3abb8a7b52248a06
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.0.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.0.ebuild
deleted file mode 100644
index 3d5f335effcc..000000000000
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="aac doc +rdp systemd +vnc"
-REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )"
-RESTRICT="test" # Tests run xvfb-run directly
-
-DEPEND="
-	x11-libs/cairo
-	x11-libs/libdrm
-	>=media-libs/libepoxy-1.4
-	>=dev-libs/glib-2.68:2
-	x11-libs/libnotify
-	app-crypt/libsecret
-	>=media-video/pipewire-0.3.49:=
-	app-crypt/tpm2-tss
-	rdp? (
-		>=media-libs/nv-codec-headers-11.1.5.0
-		>=net-misc/freerdp-2.8.0:=[server]
-		>=sys-fs/fuse-3.9.1
-		>=x11-libs/libxkbcommon-1.0.0
-
-		aac? (
-			media-libs/fdk-aac
-		)
-	)
-	vnc? (
-		net-libs/libvncserver
-	)
-"
-RDEPEND="${DEPEND}
-	x11-wm/mutter[screencast]
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	virtual/pkgconfig
-	doc? (
-		app-text/asciidoc
-	)
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc man)
-		$(meson_use aac fdk_aac)
-		$(meson_use rdp)
-		$(meson_use vnc)
-		$(meson_use systemd)
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.1.ebuild
deleted file mode 100644
index 90f943fab5e7..000000000000
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="aac doc +rdp systemd +vnc"
-REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )"
-RESTRICT="test" # Tests run xvfb-run directly
-
-DEPEND="
-	x11-libs/cairo
-	x11-libs/libdrm
-	>=media-libs/libepoxy-1.4
-	>=dev-libs/glib-2.68:2
-	x11-libs/libnotify
-	app-crypt/libsecret
-	>=media-video/pipewire-0.3.49:=
-	app-crypt/tpm2-tss:=
-	rdp? (
-		>=media-libs/nv-codec-headers-11.1.5.0
-		>=net-misc/freerdp-2.8.0:=[server]
-		>=sys-fs/fuse-3.9.1:3
-		>=x11-libs/libxkbcommon-1.0.0
-
-		aac? (
-			media-libs/fdk-aac:=
-		)
-	)
-	vnc? (
-		net-libs/libvncserver
-	)
-"
-RDEPEND="${DEPEND}
-	x11-wm/mutter[screencast]
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	virtual/pkgconfig
-	doc? (
-		app-text/asciidoc
-	)
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc man)
-		$(meson_use aac fdk_aac)
-		$(meson_use rdp)
-		$(meson_use vnc)
-		$(meson_use systemd)
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 5ff0e3448529..ec2b45123131 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,7 +1,5 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4
-DIST ModemManager-1.18.10.tar.xz 2611480 BLAKE2B ca6c690f2365917b5c879c1bd80ec2752880fb4ffe779c0dae7e2b0852d5f77bb403b5cc1f529e254818fd3e6df2698cd77493d801f5c55d5fe60c817df1e713 SHA512 4615ddb852b750ba0ca62224b669145a408a22b841937d42271638a73bf59dff5fb8b73553388afee8e7d2b2126c61f51af3f8fcb4475a2e2ea313d438443f9b
 DIST ModemManager-1.18.12.tar.xz 2589020 BLAKE2B e82db0a62d29753e22b9f9c09e60d8f5dca070cbac27b6df54ff8cd166cbb837dca3b162ac06afea0e75abdc8d407253a28cee58dacd739d4b485fa9f5485acb SHA512 7ee3b091ca2350a1d52f1ff0c0657c9f279594ffbff5ea57be59ca024331cafbac34901ca9ed4ef2b71e8c51b594526f921d3aeee6e8748cd0532a16218c5d6c
-EBUILD modemmanager-1.18.10-r1.ebuild 4126 BLAKE2B dd2403ed41d414cdb23b4797a60b916e585acadaddda8e2cf9ca77f041d87852d65dbd21764465ef8a454d93d732528a181536c4fce1aa72917abd2b92c3e536 SHA512 01e8fb11dd7bbc598cea707c50ff7c947204b60322a8fe39d618f3abba4947ebb4f7b691efe0f3010288c380c94dd39f889cad2ed03d0d0f86839b1596cfb5e1
 EBUILD modemmanager-1.18.12.ebuild 4126 BLAKE2B dd2403ed41d414cdb23b4797a60b916e585acadaddda8e2cf9ca77f041d87852d65dbd21764465ef8a454d93d732528a181536c4fce1aa72917abd2b92c3e536 SHA512 01e8fb11dd7bbc598cea707c50ff7c947204b60322a8fe39d618f3abba4947ebb4f7b691efe0f3010288c380c94dd39f889cad2ed03d0d0f86839b1596cfb5e1
 MISC metadata.xml 644 BLAKE2B 7805fa5c0d2371193d85e2129cf717315654a8c965f3cbef44985a56ada40e2f15752fd1818c7d03cc20ae6c34e3fd0d998c5e2637205e43e662f9352351e5fe SHA512 8c93bfeb1ac6b1c73039d89355f061fcf04491195149efe06f3655a663c03fbd5be3465509d80d8270642565abba9c1fa408276210a05a3093d95c93ed1352b6
diff --git a/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild b/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild
deleted file mode 100644
index d651e931039f..000000000000
--- a/net-misc/modemmanager/modemmanager-1.18.10-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome2 python-any-r1 readme.gentoo-r1 systemd udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="elogind +introspection mbim policykit +qmi +qrtr systemd test +udev vala"
-REQUIRED_USE="
-	?? ( elogind systemd )
-	qrtr? ( qmi )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	udev? ( >=dev-libs/libgudev-232:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	mbim? ( >=net-libs/libmbim-1.26.0 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection?] )
-	qmi? ( >=net-libs/libqmi-1.30.8:=[qrtr?] )
-	qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
-	elogind? ( sys-auth/elogind )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-RDEPEND="${DEPEND}
-	policykit? ( acct-group/plugdev )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-python_check_deps() {
-	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	DOC_CONTENTS="
-		If your USB modem shows up only as a storage device when you plug it in,
-		then you should install sys-apps/usb_modeswitch, which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_setup
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		--disable-Werror
-		--disable-static
-		--with-dist-version=${PVR}
-		--with-udev-base-dir="$(get_udevdir)"
-		$(use_with udev)
-		$(use_enable introspection)
-		$(use_with mbim)
-		$(use_with policykit polkit)
-		$(use_with systemd systemd-journal)
-		$(use_with qmi)
-		$(use_with qrtr)
-		$(use_enable vala)
-	)
-	if use systemd || use elogind; then
-		myconf+=(--with-systemd-suspend-resume)
-	else
-		myconf+=(--without-systemd-suspend-resume)
-	fi
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/modemmanager.initd" modemmanager
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	if ! use udev; then
-		ewarn "You have built ModemManager without udev support. You may have to teach it"
-		ewarn "about your modem port manually."
-	fi
-
-	use udev && udev_reload
-
-	systemd_reenable ModemManager.service
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 4907cb76ebea..18eeb5dba44e 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,14 +2,8 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
-DIST NetworkManager-1.38.4.tar.xz 5446860 BLAKE2B c7b1e456a33ff136137cf0bd615fffdbc2d24b853bbe31dcab143c2748baf0a8f25fcc55af1811f4a179c5d85d86a09dcb2cdd3b374996b013be1acfea580316 SHA512 b36b35f1292df9888a5930cb28aca693ee566eec9216520adf3f5aeb9631d4d399bb0ea06641ab488f025584df438b69b2be01a3a7782e20267b60165f9159b6
-DIST NetworkManager-1.40.0.tar.xz 6580984 BLAKE2B 7c5288afd791dbf02af783540cc6c316ca061c5d9bfcc222918928c74c519a852206ed61101c1f105a0907c8ec640cb6a024c6d1055e326c0fd1c042e9d83a5e SHA512 2e51a70a6ef5c0c7ba9af400b9af8e6956c9a23dd93566a7c07efe531bb6253bf3544ac2a61e147fc17145eaaeeb25d7e58c1cb7daf7e7bf7b8ae6742545417e
 DIST NetworkManager-1.40.2.tar.xz 6585760 BLAKE2B 12bd809e0d5140ecb1f52f61680fbd21044350d0c265bfff2ac812f977a7db5c5342a0302b6f02b057ce675ab917f449106e4bb1bb9b1d187066e076785ed951 SHA512 b79119d11ad98262a22a3f78a7dfa979a7890682f97ed8154552f7ceb964402fc9c2dcda082bf80ba45d7f717f541d3145e40f7f6c4fbb8f2858272cc9505761
-DIST NetworkManager-1.40.4.tar.xz 6594472 BLAKE2B 1ba9d530c7365eed3b9ba9d24f746fee0afae96dde281f022b98eed2f2594438c03f889f8067afe2362876e5135a7e0857cbde5e709d21481b742ff27e9d6480 SHA512 612a479aed0ee00643e57e569354d16e00047ad94c88885536a2fa25ea40b947e169e1e2c1e13c4076b6361c010e290b92551271e1c44e65f861166ef16e22b0
 DIST NetworkManager-1.40.6.tar.xz 6596776 BLAKE2B 32e2a496d68d183a44a15f9ecfef18f5c7fcbc7ba5e27e0eb62825edb0ebbcf8ec34dcdd6d4da953aa46029d7063197f549cae13eb3622dd1f52c92aa5961941 SHA512 cd8ced0598ea4224cfde23a157108c872bb3935e539029571110b6a0bb4bf3637ad8e3afe8e5f162890ed557e8b42a803bc4e18db00e1de840dd0fa20643e036
-EBUILD networkmanager-1.38.4.ebuild 12537 BLAKE2B 8af417bbd3f64c646ed02434062d19a589cd689af48f1859a27e7779bf015ee53379a7282c0169d9e92b8e7ac6cde236f124ec458933d28161651bec161aeb77 SHA512 916840e7a60a301e1c15f191254fcd5c981707d6baffc4aef85956d93dd1268a1e009384c0581c96548a9aaede52bf22d3b71e58e86e6ae9fc0a6d25e9bda77b
-EBUILD networkmanager-1.40.0.ebuild 12496 BLAKE2B 7d3547a7aeb1d96148169b63c375476e782649f79ac26a3ef270068caad14da72e3433b2129ec5c9b150e86560d95f8d0cdc5af0956729e2ba05e8cf7211f671 SHA512 f7fbc29511fff6496535b896b7100dd0e939a8d033ff3882d003177fb7649825ba4204124b0fe67b0dd95ac93cc287b1c335226f7f2cfa7d651faa00f5adc7e9
 EBUILD networkmanager-1.40.2.ebuild 12490 BLAKE2B b3d81d5bb1a99c214195939d024014027deac7d14672f47aff691fdd51ff0cf30109660f4d32fe459e33afa3453b20cd9ce74bcc5918ffb28a826ae8065b044b SHA512 a2c9aed9f711bb1e3345115e72a3d297e1e7cc2c79635f718c3cb45ace4587bdcc64fdfb11398eab32adccba1e487af17081e9e96b62e00ce1ce43466c249abe
-EBUILD networkmanager-1.40.4.ebuild 12496 BLAKE2B 7d3547a7aeb1d96148169b63c375476e782649f79ac26a3ef270068caad14da72e3433b2129ec5c9b150e86560d95f8d0cdc5af0956729e2ba05e8cf7211f671 SHA512 f7fbc29511fff6496535b896b7100dd0e939a8d033ff3882d003177fb7649825ba4204124b0fe67b0dd95ac93cc287b1c335226f7f2cfa7d651faa00f5adc7e9
 EBUILD networkmanager-1.40.6.ebuild 12535 BLAKE2B 121488dea0a92b9e720e556fa51188b5005f2a20426c75615ca70cf78ea61e5fb5c7db244a6602dc62fd212c266a3401419422e407f81ef2f4bf72593e25f568 SHA512 419e4932a983ba0e4473af16b790d4d815d7697d29be5aea26d2a9f32f23d65df15060d77b56cb64934ad2a35d901e75b1f77d1c1b70710d16f20932a5208d3b
 MISC metadata.xml 2430 BLAKE2B 564983bc42e2b87533286f90ad5e3988356169cf65436ec853a63183ae1086e5672afd7552c9a06fd17018158bab09acaedf015998eb4d10a9c11db1897b49a4 SHA512 39ae015637e571dc8268c750a6cf56c185a0716113670f58e4d33848c7d6c33b8decba6201a0600ab689d2bcc7d44a123003bcfc8696fd8b46eea376b498d6e2
diff --git a/net-misc/networkmanager/networkmanager-1.38.4.ebuild b/net-misc/networkmanager/networkmanager-1.38.4.ebuild
deleted file mode 100644
index 697765c019e4..000000000000
--- a/net-misc/networkmanager/networkmanager-1.38.4.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="NetworkManager"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	gtk-doc? ( introspection )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( gnutls nss )
-	?? ( elogind systemd )
-	?? ( dhclient dhcpcd )
-	?? ( syslog systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-COMMON_DEPEND="
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	elogind? ( >=sys-auth/elogind-219 )
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	net-libs/libndp
-	systemd? ( >=sys-apps/systemd-209:0= )
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? (
-		sec-policy/selinux-networkmanager
-		sys-libs/libselinux
-	)
-	audit? ( sys-process/audit )
-	teamd? (
-		>=dev-libs/jansson-2.7:=
-		>=net-misc/libteam-1.9
-	)
-	policykit? ( >=sys-auth/polkit-0.106 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	gnutls? (
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
-	)
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	modemmanager? (
-		net-misc/mobile-broadband-provider-info
-		>=net-misc/modemmanager-0.7.991:0=
-	)
-	bluetooth? ( >=net-wireless/bluez-5 )
-	ofono? ( net-misc/ofono )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( virtual/resolvconf )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	psl? ( net-libs/libpsl )
-	concheck? ( net-misc/curl )
-	tools? (
-		>=dev-libs/newt-0.52.15
-		libedit? ( dev-libs/libedit )
-		!libedit? ( sys-libs/readline:= )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		>=dev-libs/jansson-2.7
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-
-	# bug 809695
-	if tc-is-clang && use lto; then
-		eerror "Clang does not support -flto-partition"
-		die "Please use gcc or turn off USE=lto flag when building with clang"
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	default
-	use vala && vala_setup
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-meson_nm_program() {
-	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-meson_nm_native_program() {
-	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		--localstatedir="${EPREFIX}/var"
-
-		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
-		-Dsystem_ca_path=/etc/ssl/certs
-		-Dudev_dir=$(get_udevdir)
-		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
-		-Dkernel_firmware_dir=/lib/firmware
-		-Diptables=/sbin/iptables
-		-Dnft=/sbin/nft
-		-Ddnsmasq=/usr/sbin/dnsmasq
-		#-Ddnssec_trigger=
-
-		-Ddist_version=${PVR}
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool policykit config_auth_polkit_default)
-		-Dmodify_system=true
-		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool systemd systemd_journal)
-		-Dhostname_persist=gentoo
-		-Dlibaudit=$(multilib_native_usex audit)
-
-		$(meson_native_use_bool wext)
-		$(meson_native_use_bool wifi)
-		$(meson_native_use_bool iwd)
-		$(meson_native_use_bool ppp)
-		-Dpppd=/usr/sbin/pppd
-		$(meson_native_use_bool modemmanager modem_manager)
-		$(meson_native_use_bool ofono)
-		$(meson_native_use_bool concheck)
-		$(meson_native_use_bool teamd teamdctl)
-		$(meson_native_use_bool ovs)
-		$(meson_native_use_bool tools nmcli)
-		$(meson_native_use_bool tools nmtui)
-		$(meson_native_use_bool tools nm_cloud_setup)
-		$(meson_native_use_bool bluetooth bluez5_dun)
-		-Debpf=true
-
-		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
-		-Dconfig_plugins_default=keyfile
-		-Difcfg_rh=false
-		-Difupdown=false
-
-		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
-		-Dnetconfig=no
-		-Dconfig_dns_rc_manager_default=auto
-
-		$(meson_nm_program dhclient "" /sbin/dhclient)
-		-Ddhcpcanon=no
-		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
-
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc docs)
-		-Dtests=$(multilib_native_usex test)
-		$(meson_native_true firewalld_zone)
-		-Dmore_asserts=0
-		$(meson_use debug more_logging)
-		-Dvalgrind=no
-		-Dvalgrind_suppressions=
-		-Dld_gc=false
-		$(meson_native_use_bool psl libpsl)
-		-Dqt=false
-
-		$(meson_use lto b_lto)
-	)
-
-	if multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=systemd )
-		emesonargs+=( -Dsuspend_resume=systemd )
-	elif multilib_is_native_abi && use elogind; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=elogind )
-		emesonargs+=( -Dsuspend_resume=elogind )
-	else
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=no )
-		emesonargs+=( -Dsuspend_resume=auto )
-	fi
-
-	if multilib_is_native_abi && use syslog; then
-		emesonargs+=( -Dconfig_logging_backend_default=syslog )
-	elif multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dconfig_logging_backend_default=journal )
-	else
-		emesonargs+=( -Dconfig_logging_backend_default=default )
-	fi
-
-	if multilib_is_native_abi && use dhclient; then
-		emesonargs+=( -Dconfig_dhcp_default=dhclient )
-	elif multilib_is_native_abi && use dhcpcd; then
-		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
-	else
-		emesonargs+=( -Dconfig_dhcp_default=internal )
-	fi
-
-	if use nss; then
-		emesonargs+=( -Dcrypto=nss )
-	else
-		emesonargs+=( -Dcrypto=gnutls )
-	fi
-
-	if use tools ; then
-		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
-	else
-		emesonargs+=( -Dreadline=none )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx meson_src_test
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-	if ! multilib_is_native_abi; then
-		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
-	fi
-}
-
-multilib_src_install_all() {
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
-
-	insinto /usr/lib/NetworkManager/conf.d #702476
-	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
-	rmdir "${ED}"/usr/share/doc/NetworkManager || die
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	udev_reload
-
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-misc/networkmanager/networkmanager-1.40.0.ebuild b/net-misc/networkmanager/networkmanager-1.40.0.ebuild
deleted file mode 100644
index 5908684d1937..000000000000
--- a/net-misc/networkmanager/networkmanager-1.40.0.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="NetworkManager"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	gtk-doc? ( introspection )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( gnutls nss )
-	?? ( elogind systemd )
-	?? ( dhclient dhcpcd )
-	?? ( syslog systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-COMMON_DEPEND="
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	elogind? ( >=sys-auth/elogind-219 )
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	net-libs/libndp
-	systemd? ( >=sys-apps/systemd-209:0= )
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? (
-		sec-policy/selinux-networkmanager
-		sys-libs/libselinux
-	)
-	audit? ( sys-process/audit )
-	teamd? (
-		>=dev-libs/jansson-2.7:=
-		>=net-misc/libteam-1.9
-	)
-	policykit? ( >=sys-auth/polkit-0.106 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	gnutls? (
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
-	)
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	modemmanager? (
-		net-misc/mobile-broadband-provider-info
-		>=net-misc/modemmanager-0.7.991:0=
-	)
-	bluetooth? ( >=net-wireless/bluez-5 )
-	ofono? ( net-misc/ofono )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( virtual/resolvconf )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	psl? ( net-libs/libpsl )
-	concheck? ( net-misc/curl )
-	tools? (
-		>=dev-libs/newt-0.52.15
-		libedit? ( dev-libs/libedit )
-		!libedit? ( sys-libs/readline:= )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		>=dev-libs/jansson-2.7
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-
-	# bug 809695
-	if tc-is-clang && use lto; then
-		eerror "Clang does not support -flto-partition"
-		die "Please use gcc or turn off USE=lto flag when building with clang"
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	default
-	use vala && vala_setup
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-meson_nm_program() {
-	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-meson_nm_native_program() {
-	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		--localstatedir="${EPREFIX}/var"
-
-		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
-		-Dsystem_ca_path=/etc/ssl/certs
-		-Dudev_dir=$(get_udevdir)
-		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
-		-Dkernel_firmware_dir=/lib/firmware
-		-Diptables=/sbin/iptables
-		-Dnft=/sbin/nft
-		-Ddnsmasq=/usr/sbin/dnsmasq
-
-		-Ddist_version=${PVR}
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool policykit config_auth_polkit_default)
-		-Dmodify_system=true
-		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool systemd systemd_journal)
-		-Dhostname_persist=gentoo
-		-Dlibaudit=$(multilib_native_usex audit)
-
-		$(meson_native_use_bool wext)
-		$(meson_native_use_bool wifi)
-		$(meson_native_use_bool iwd)
-		$(meson_native_use_bool ppp)
-		-Dpppd=/usr/sbin/pppd
-		$(meson_native_use_bool modemmanager modem_manager)
-		$(meson_native_use_bool ofono)
-		$(meson_native_use_bool concheck)
-		$(meson_native_use_bool teamd teamdctl)
-		$(meson_native_use_bool ovs)
-		$(meson_native_use_bool tools nmcli)
-		$(meson_native_use_bool tools nmtui)
-		$(meson_native_use_bool tools nm_cloud_setup)
-		$(meson_native_use_bool bluetooth bluez5_dun)
-		-Debpf=true
-
-		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
-		-Dconfig_plugins_default=keyfile
-		-Difcfg_rh=false
-		-Difupdown=false
-
-		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
-		-Dnetconfig=no
-		-Dconfig_dns_rc_manager_default=auto
-
-		$(meson_nm_program dhclient "" /sbin/dhclient)
-		-Ddhcpcanon=no
-		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
-
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc docs)
-		-Dtests=$(multilib_native_usex test)
-		$(meson_native_true firewalld_zone)
-		-Dmore_asserts=0
-		$(meson_use debug more_logging)
-		-Dvalgrind=no
-		-Dvalgrind_suppressions=
-		-Dld_gc=false
-		$(meson_native_use_bool psl libpsl)
-		-Dqt=false
-
-		$(meson_use lto b_lto)
-	)
-
-	if multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=systemd )
-		emesonargs+=( -Dsuspend_resume=systemd )
-	elif multilib_is_native_abi && use elogind; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=elogind )
-		emesonargs+=( -Dsuspend_resume=elogind )
-	else
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=no )
-		emesonargs+=( -Dsuspend_resume=auto )
-	fi
-
-	if multilib_is_native_abi && use syslog; then
-		emesonargs+=( -Dconfig_logging_backend_default=syslog )
-	elif multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dconfig_logging_backend_default=journal )
-	else
-		emesonargs+=( -Dconfig_logging_backend_default=default )
-	fi
-
-	if multilib_is_native_abi && use dhclient; then
-		emesonargs+=( -Dconfig_dhcp_default=dhclient )
-	elif multilib_is_native_abi && use dhcpcd; then
-		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
-	else
-		emesonargs+=( -Dconfig_dhcp_default=internal )
-	fi
-
-	if use nss; then
-		emesonargs+=( -Dcrypto=nss )
-	else
-		emesonargs+=( -Dcrypto=gnutls )
-	fi
-
-	if use tools ; then
-		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
-	else
-		emesonargs+=( -Dreadline=none )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx meson_src_test
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-	if ! multilib_is_native_abi; then
-		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
-	fi
-}
-
-multilib_src_install_all() {
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
-
-	insinto /usr/lib/NetworkManager/conf.d #702476
-	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
-	rmdir "${ED}"/usr/share/doc/NetworkManager || die
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	udev_reload
-
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-misc/networkmanager/networkmanager-1.40.4.ebuild b/net-misc/networkmanager/networkmanager-1.40.4.ebuild
deleted file mode 100644
index 5908684d1937..000000000000
--- a/net-misc/networkmanager/networkmanager-1.40.4.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="NetworkManager"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	gtk-doc? ( introspection )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( gnutls nss )
-	?? ( elogind systemd )
-	?? ( dhclient dhcpcd )
-	?? ( syslog systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-COMMON_DEPEND="
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	elogind? ( >=sys-auth/elogind-219 )
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	net-libs/libndp
-	systemd? ( >=sys-apps/systemd-209:0= )
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? (
-		sec-policy/selinux-networkmanager
-		sys-libs/libselinux
-	)
-	audit? ( sys-process/audit )
-	teamd? (
-		>=dev-libs/jansson-2.7:=
-		>=net-misc/libteam-1.9
-	)
-	policykit? ( >=sys-auth/polkit-0.106 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	gnutls? (
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
-	)
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	modemmanager? (
-		net-misc/mobile-broadband-provider-info
-		>=net-misc/modemmanager-0.7.991:0=
-	)
-	bluetooth? ( >=net-wireless/bluez-5 )
-	ofono? ( net-misc/ofono )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( virtual/resolvconf )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	psl? ( net-libs/libpsl )
-	concheck? ( net-misc/curl )
-	tools? (
-		>=dev-libs/newt-0.52.15
-		libedit? ( dev-libs/libedit )
-		!libedit? ( sys-libs/readline:= )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		>=dev-libs/jansson-2.7
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-
-	# bug 809695
-	if tc-is-clang && use lto; then
-		eerror "Clang does not support -flto-partition"
-		die "Please use gcc or turn off USE=lto flag when building with clang"
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	default
-	use vala && vala_setup
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-meson_nm_program() {
-	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-meson_nm_native_program() {
-	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		--localstatedir="${EPREFIX}/var"
-
-		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
-		-Dsystem_ca_path=/etc/ssl/certs
-		-Dudev_dir=$(get_udevdir)
-		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
-		-Dkernel_firmware_dir=/lib/firmware
-		-Diptables=/sbin/iptables
-		-Dnft=/sbin/nft
-		-Ddnsmasq=/usr/sbin/dnsmasq
-
-		-Ddist_version=${PVR}
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool policykit config_auth_polkit_default)
-		-Dmodify_system=true
-		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool systemd systemd_journal)
-		-Dhostname_persist=gentoo
-		-Dlibaudit=$(multilib_native_usex audit)
-
-		$(meson_native_use_bool wext)
-		$(meson_native_use_bool wifi)
-		$(meson_native_use_bool iwd)
-		$(meson_native_use_bool ppp)
-		-Dpppd=/usr/sbin/pppd
-		$(meson_native_use_bool modemmanager modem_manager)
-		$(meson_native_use_bool ofono)
-		$(meson_native_use_bool concheck)
-		$(meson_native_use_bool teamd teamdctl)
-		$(meson_native_use_bool ovs)
-		$(meson_native_use_bool tools nmcli)
-		$(meson_native_use_bool tools nmtui)
-		$(meson_native_use_bool tools nm_cloud_setup)
-		$(meson_native_use_bool bluetooth bluez5_dun)
-		-Debpf=true
-
-		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
-		-Dconfig_plugins_default=keyfile
-		-Difcfg_rh=false
-		-Difupdown=false
-
-		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
-		-Dnetconfig=no
-		-Dconfig_dns_rc_manager_default=auto
-
-		$(meson_nm_program dhclient "" /sbin/dhclient)
-		-Ddhcpcanon=no
-		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
-
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc docs)
-		-Dtests=$(multilib_native_usex test)
-		$(meson_native_true firewalld_zone)
-		-Dmore_asserts=0
-		$(meson_use debug more_logging)
-		-Dvalgrind=no
-		-Dvalgrind_suppressions=
-		-Dld_gc=false
-		$(meson_native_use_bool psl libpsl)
-		-Dqt=false
-
-		$(meson_use lto b_lto)
-	)
-
-	if multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=systemd )
-		emesonargs+=( -Dsuspend_resume=systemd )
-	elif multilib_is_native_abi && use elogind; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=elogind )
-		emesonargs+=( -Dsuspend_resume=elogind )
-	else
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=no )
-		emesonargs+=( -Dsuspend_resume=auto )
-	fi
-
-	if multilib_is_native_abi && use syslog; then
-		emesonargs+=( -Dconfig_logging_backend_default=syslog )
-	elif multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dconfig_logging_backend_default=journal )
-	else
-		emesonargs+=( -Dconfig_logging_backend_default=default )
-	fi
-
-	if multilib_is_native_abi && use dhclient; then
-		emesonargs+=( -Dconfig_dhcp_default=dhclient )
-	elif multilib_is_native_abi && use dhcpcd; then
-		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
-	else
-		emesonargs+=( -Dconfig_dhcp_default=internal )
-	fi
-
-	if use nss; then
-		emesonargs+=( -Dcrypto=nss )
-	else
-		emesonargs+=( -Dcrypto=gnutls )
-	fi
-
-	if use tools ; then
-		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
-	else
-		emesonargs+=( -Dreadline=none )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx meson_src_test
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-	if ! multilib_is_native_abi; then
-		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
-	fi
-}
-
-multilib_src_install_all() {
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
-
-	insinto /usr/lib/NetworkManager/conf.d #702476
-	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
-	rmdir "${ED}"/usr/share/doc/NetworkManager || die
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	udev_reload
-
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index b970ed66b9a0..1b3a42c24ff9 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index c744866e54c8..e7599ebe9d0c 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,7 +1,5 @@
 DIST NetworkManager-openvpn-1.10.0.tar.xz 698340 BLAKE2B 3061aa0525897fe1321ac2843f1dd07b34d6f322b32db9811cb66afd7784d5a50c877ce91d5620d80fa33a74832486426c742f186fb86626bda862c4513d830d SHA512 f7c3b44cf2b7651ac940d3d0547ca3a38d0af415cf580d9fde3780b2320ba022710c2cc1efeddcbc983a7d3e02ab869b36d44ca2ae05df3443f06471d405c679
 DIST NetworkManager-openvpn-1.10.2.tar.xz 701652 BLAKE2B c6cef27e57320dc68c168248981f54d2a8eb0a2b19524e11b2c25da04dc98f2a4e00e07b9b83d92d1654c26685d46d8f152c95462e4d73f853872fa3553735bb SHA512 469aa4eeab169ccabd04b18b425ab2f8ad095e19c80dfca528855e1c66314e3ac129145ce5e62f5ccbb7a01cd7ba7f657571c3f4ec57b15ecb95aeaa765f5c4a
-DIST NetworkManager-openvpn-1.8.18.tar.xz 592488 BLAKE2B 01880d834b8eee62d66a81652cc3a6904afc0ad926193b9f346298bfc66fb05922d49a19bfa2c788f76026df1a052e2c0727021ded22ba63545ab669a9250296 SHA512 4cdbd6e6fc6ae1849b45e18bbad29748ee7a538c753901f871de350f08d861acb24770ec74dfb288136b0307b36e6ca784f51f982ade26babaa60e4a1e2f31fd
 EBUILD networkmanager-openvpn-1.10.0.ebuild 1069 BLAKE2B 8258ba34da5c3f06db1a5eed64fa0812c7e4d502e6ef4096404e31ae35a43989a81139ad383ee4dfe142235f274d0f22269e7947cc94f744ab6de242016a46db SHA512 f612333eb01d0c8f320cd36928c106518b3fbf59efc5df9d7ce571ee7058c78a5aeda82fce738768cfc77cddf51696c361733fe4cb7db3e4207a82fd132e95f7
 EBUILD networkmanager-openvpn-1.10.2.ebuild 995 BLAKE2B 37ae91916da59dbace0a99299e7f1535cc6a428b897fc12bf09207158a9059769adad971e3e70f037b2bf382d4dd12aa524ecd4315224be60b234efdcd51fecf SHA512 96e0e44e652bee3b3460abf295673f40380e0bd7a765a0707ad6f4b1d4e4171d7a1461b928fcf1197a492a2f4ba9c0f8bf356177e54054681686bee83c654248
-EBUILD networkmanager-openvpn-1.8.18.ebuild 1113 BLAKE2B 7e7a35d8810107d138394a61f47b9d596670bd47b6f3a1b10d93b0210aae89f9152120c583d4a164ce510ae09105c28c0c62c57e8e139963f01851ae46e43818 SHA512 c9f4b0e5db24f0e9ca997e8d7e90e22d11219341104f23962bf45c42cc6afd7457232578fd4fbf8e09bf33b96219d163ab09dc1deeda02c443372fd19a5a47e2
 MISC metadata.xml 363 BLAKE2B 2ff0b1a3948001faad595b1e106a906aee729c0f576a6f7b66f766bcb309f4ef1f12ba3d24af1cf130db8e734d913402f74e9a12adef51bfcd77cdb532ab81ae SHA512 6b05e736c4c25efc495d219779f29c570a1e45ab6f259751c44e28a6c7fc94dae1b8d7ebd21d4297e11f64a591f8e72576e20711f52f3364e9fdbc727cf133e9
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.18.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.18.ebuild
deleted file mode 100644
index a50a42de9c7d..000000000000
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.18.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/NetworkManager-openvpn https://gitlab.gnome.org/GNOME/NetworkManager-openvpn"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="gtk test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.34:2
-	dev-libs/libxml2:2
-	>=net-misc/networkmanager-1.7.0:=
-	>=net-vpn/openvpn-2.1
-	gtk? (
-		>=app-crypt/libsecret-0.18
-
-		>=net-libs/libnma-1.7.0
-		>=x11-libs/gtk+-3.4:3
-
-		>=gui-libs/gtk-4.0:4
-		>=net-libs/libnma-1.8.36
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/nm-openvpn
-	acct-user/nm-openvpn
-"
-
-BDEPEND="
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		$(use_with gtk gtk4) \
-		--without-libnm-glib
-}
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index 46fbccd02508..1a69f7fd6e96 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -5,5 +5,5 @@ DIST strongswan-5.9.7.tar.bz2 4741967 BLAKE2B 062f80431aefabfa4ba03454c3ab80e278
 DIST strongswan-5.9.8.tar.bz2 4747096 BLAKE2B 2a7e346931f909aefa17a7e2f4a2d5b491979dd21519eaffa5d14ac0e54d86207009526aed903bfadbec2d4d449a23077f391106ed9ac02851a081b563c72eb0 SHA512 16d3afc80704f896f3f97addf452b4bb29fc1911c54e980f76ac48bdbe2340ce3bd4e79024848cb7961bbe9ad5458d93389343878ca042af658d51b11219666b
 EBUILD strongswan-5.9.6-r1.ebuild 9607 BLAKE2B ed1cb96767c1346f4e3f845ef57fe72aa0682b84a4f854afc3f4587e2a9be251b12b48da9cc8e726eb4003708af08f27443b82eeed109f63afbddd8c44d0da73 SHA512 aea8184e77cdff7e9047f1e44238e1e6e03f57db3ba09071e78502fa9a5b494138f40ac5e399b52fe2d40a5b7edf9bbed8efb8c3a3f1df031ae639f8ee7de9f0
 EBUILD strongswan-5.9.7.ebuild 9554 BLAKE2B fe1e8cd92adfb8eec4f041c98cad3d9071973cee60e56e6a5a4a14e8408486b01c0137161cebb214c1e65edf27e930369a30ce27f15f2a05cc85a12511f7845a SHA512 0a194ff7799484896f4218b3cecb7fc3565eeb02dc2a42a7412aa4cc478572f0427ea80921aa169b7a18e11791f8f89ff639595a18316a8018b2461a6480f940
-EBUILD strongswan-5.9.8.ebuild 9564 BLAKE2B 7903d51715971f83b76e06901f888a71007de30ce6c493723a8fe1593d4d24e3147adc4c2745cb71c5ce7cfc5c3bab1e12e4413ff1fd85c8302989a02d63325c SHA512 47012c1de3edf96c56885e9c2bed37a67336d68330db497625181ab4d55dda2a212845e9ce77a87539713c3be81d97077955c6c14e36c3217ef44a2bd0cd6a7a
+EBUILD strongswan-5.9.8.ebuild 9562 BLAKE2B 5c5caa5a3c5282366512576908ae82d2f6a9d4dd1fe9d08e3e712e093e5a4152db11fe3ad8e18885b23aaf1dc789e1e76bbcbf25c3885c1d99e7c65b34835c4b SHA512 5595f8f5d5297942e9e5761f8cbd5571f2e30fc75c1c2b73d4e4061eb0176e46a7ce97f16c84b3d749f1c6e4977b7c3eeff125eff08be6e03ece79ffb82308d4
 MISC metadata.xml 4888 BLAKE2B ffb26d9fec8ad8c5fbb68ae92a92efbf32c40b4a0a4b829d8fd287ebc80d135e3ca95ca50663acb6fc7d629570ed7f4264921a8838e2ff0a8e5dbbadb3f0fc50 SHA512 84491cbd33b325b1d960c32eafb479927d5651244fb13ee9ec8b2abddfff71f1b90b18524e044dd0cc63ccd49ef9bb0c2437ab6cf504994b8ad0a9137cd04fb4
diff --git a/net-vpn/strongswan/strongswan-5.9.8.ebuild b/net-vpn/strongswan/strongswan-5.9.8.ebuild
index 5cdfe7c002a2..665e5c0b126c 100644
--- a/net-vpn/strongswan/strongswan-5.9.8.ebuild
+++ b/net-vpn/strongswan/strongswan-5.9.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="gcm led lookip systime-fix unity vici"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index de1f79d7e0c8..301f65b421b1 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 936103e9517f..4d9b8896c179 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,9 +1,7 @@
 AUX 61-gnome-bluetooth.rules 399 BLAKE2B ba3dd9fdc3834ce6a3460d8abff179d08c1258f7ba43e2350ed2c7e88aaf6fef4b06c51b6212650523c4de577cb3a85946bae9b955cf6c17a0c984431abd5d2b SHA512 74fd95e2afb3d3f13df72bb593ae6644a3a4975e43f5f50c622f14f756861596ef92aa331200d9fce6ff3976e8a1ed57e4053186b7a9716039ace971a6dfed0d
 AUX gnome-bluetooth-3.34.5-meson-0.61-build.patch 549 BLAKE2B 85812555ab5cc25ae3b766455934f8760c6002cf6426265c1a464086330627e9985345fbccecd9cbc8026a90468eebfde4a0d32c716a8f5d0ba56e64f68a9449 SHA512 727bcf24e07f92c7705f1fcc11e56d52dac7aa2826b7b9e39a3df87ee79c253aeb98dbebc998eada2fc346a086dece16c9029ecec2b114f939e917e3b099ad00
 DIST gnome-bluetooth-3.34.5.tar.xz 353936 BLAKE2B 40300752830f71d436591e22a64a282745d8419ee46de534f76c4871a86a4c8f7b2203e3ddc4ca08d26348b97bf4a68315802ffa09c69265c55001e4806c7f1e SHA512 48431b3d19083705a6623442c5cd2d6c14962cdf30fc599ba47dceb6612b80142af77e1b6df142b530cb1015638081a06de38a3034177e0d05a354c40f19d9e5
-DIST gnome-bluetooth-42.3.tar.xz 303604 BLAKE2B bf73d31d6fd40bafa22133caac6a612951fd2b09cc7b1501df5d0256e6d769553d01a951b7ff731cab96669a7935fe41c50e15c4b2ec97cd347abc79b9efbe75 SHA512 e07aa4edc6ebe4ea2690d4271be75ec84bf3d38fb6f9f87d6833ef0a3c3015bc063ff091755761f554ae18e40eb2dd98ae0ed77163016e671d63b944c553c310
 DIST gnome-bluetooth-42.4.tar.xz 304048 BLAKE2B 7451c893496f04e38d36ba93aa7c9650144c020bf1ce156e11fbf62a3a2d5ee637ebdea2b397ee2affb96da8568a6f7456c5fb181a9c752b5deb7e14371f9e84 SHA512 5dab59e6ba3e291cb7630b6bc2da3a776ad044565ace3b9fcc30c357f2740f4ba73fca23a099b1717f8d181a3af67b33c0934a35cd680a149c2168e2380410aa
-EBUILD gnome-bluetooth-3.34.5.ebuild 1884 BLAKE2B 5d76a26723cb8ddbe4d8cb9ba19feebcef1c637037e698f048799ff16f1d457d1963adc43489f1645a3f29ba123bcef60a62cd7ef66a89c3c592372f47be1a75 SHA512 e13a32f323a3fb8fd49a7996e352a0d9ff3a1328d2faaa7a5a4b1673d21e4fe099d889012ad0c97267a99b0013c10b3dc18e2ad2816a5b52c652eebdabcba24a
-EBUILD gnome-bluetooth-42.3.ebuild 1661 BLAKE2B 4886d572399c2a8258770400413d43018acfb4232e6bc8dabecb44139c83ad26e07881ff8cf6d09cc6a7b6e049f35854484a11c1acd1faea4411c0dea428cead SHA512 b0cb5724f0e3397f0c8a2a48556354708246b8f0db639beec8dec7089e631a2288afcb5d75985160d765cc8cf8fb449efd9273648c23a193ca6baf9a24fe6bb1
+EBUILD gnome-bluetooth-3.34.5.ebuild 1871 BLAKE2B e627aaa16a73b1521e4a3b80bc1d91c02a62fe5b58a4cec38e008188b4cc139a3b7360a6246316d98f52909341927c670811e1deddca0d003753dc50ed4ca651 SHA512 dda90f9ecc6106e486f7bec3d31c828fbd13a30d6d7a1be91d2e61b3f24ea5976d8b0588094b110439ee45192625f4d1d38312b6f61f0c5571c03ff8ef46c560
 EBUILD gnome-bluetooth-42.4.ebuild 1661 BLAKE2B 4886d572399c2a8258770400413d43018acfb4232e6bc8dabecb44139c83ad26e07881ff8cf6d09cc6a7b6e049f35854484a11c1acd1faea4411c0dea428cead SHA512 b0cb5724f0e3397f0c8a2a48556354708246b8f0db639beec8dec7089e631a2288afcb5d75985160d765cc8cf8fb449efd9273648c23a193ca6baf9a24fe6bb1
 MISC metadata.xml 486 BLAKE2B f7080e058845d3931203b7912dfe5c31ecf36573241f33878cba7ca2ae240d62d067ea470845f6dfbb261631550916d430656040b8efcaec20123eb2be9ad5e4 SHA512 7b7f53d1648ad533caa02a18b859a3498e62a964f24a0e321f7661feecf95c02516f0ec65f23891a375a834d625dba7222c8e0919bc721558e747d582b6a4197
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
index 9c4601c54641..57095facb17c 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
+inherit gnome.org meson python-any-r1 udev xdg
 
 DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.3.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.3.ebuild
deleted file mode 100644
index 75e875ce4ef2..000000000000
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome.org meson python-any-r1 xdg
-
-DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version
-IUSE="gtk-doc +introspection sendto test"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.44:2
-	>=gui-libs/gtk-4.4:4[introspection?]
-	media-libs/gsound
-	>=gui-libs/libadwaita-1.1:1
-	>=x11-libs/libnotify-0.7.0
-	virtual/libudev:=
-	>=sys-power/upower-0.99.14:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	acct-group/plugdev
-	virtual/udev
-	>=net-wireless/bluez-5
-	sendto? ( !net-wireless/gnome-bluetooth:2 )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.9 )
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep '
-			>=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}]
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	if use test; then
-		python_has_version ">=dev-python/python-dbusmock-0.26.0[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	# Check for python is unconditional
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use sendto)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index bd59911adc5c..ae0051b540ed 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index e6aaace2c608..dd962f88047f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,17 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2022-12-04)
+# Obsolete slot without reverse dependencies. Use a newer
+# selenium-webdriver slot instead. Masked for removal in 30 days.
+dev-ruby/selenium-webdriver:3
+
+# Hans de Graaff <graaff@gentoo.org> (2022-12-03)
+# ruby27-only packages with no other reverse dependencies.
+# Last releases in 2013 and 2015. Removal in 30 days.
+dev-ruby/textpow
+dev-ruby/ultraviolet
+
 # Hans de Graaff <graaff@gentoo.org> (2022-12-03)
 # Obsolete slot without reverse dependencies. Use a newer vcr
 # slot instead. Masked for removal in 30 days.
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 3aa8beee5a3b..919e1f194d20 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index d174b1acf53b..15eb6d5cc214 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,10 +1,6 @@
 AUX 43.0-tests-timeTest-Fix-tests-for-time-formats-with-diffe.patch 2232 BLAKE2B 3bc646e4e8403dc38d942c0f589ff9db44240216e420a2d0b184311e10d7286d1c4ccb042d8ab0482a6d59b75bd1e9dc5c66a92ee42250d699f01f6880a8087f SHA512 0f6d921f6fbd82e4a2a8f8072180cf6136d64530f66af7d85b9b5d7a8033469bb608d7982849d27e5574b41234ac9c815577a735e40a05e8e64fc9a797a4890d
 DIST gnome-maps-42.3.tar.xz 2317328 BLAKE2B 365eb5cb8f7b20e2069338249418f5fad1abd47a1ab7ecda2d671dc97dfa45fb9f5687ae01fd605613c7ecf6eb9048aef6ab121cac0f455a42df9156581c87e2 SHA512 e52509603914de8f345a874f931beb68d11f718827b956a48464fe804c42559d977eacb0bbd5d4346b6329ab3f9169ac9afa8ef681f040c5b6a82b440b9786cb
-DIST gnome-maps-43.0.tar.xz 2330656 BLAKE2B 117a3558e29abe6a1bd29cf347b20a9e33f2b1cabd5310f28e387685e0bde96d1ce371c88616914f298e25ffbbc72b4d29e4fa721994b184e88289c6d0236ea0 SHA512 70966d6a092a67eb6a3a62627666376a71767d9296e00489a5aff281793425d9edd5e978deaf47bbd7d6b0ce37b53cf724b73487e101554c7984456661e193fc
-DIST gnome-maps-43.1.tar.xz 2329212 BLAKE2B 6597597dcf5b056a33670f502c3ab0b9658b6cac5e72896f5363034649ddf01fe9ae2a275dbd1a298b0dd1850b8a9c625fff02a15c998fd0e296f794aedf7b0e SHA512 f4eafdf6b81a23567d526ae51842e391c7b3e585967abb2b6a38ab1a361de77a69ebbf01939f3a328990fe3f623f4bd40a720f776c27af07acb27b2222b75a12
 DIST gnome-maps-43.2.tar.xz 2334324 BLAKE2B a8daacd9874e9b8d44ae6107b7cc1a0a4a168d579b4101e4da408c08e2509f7da782605b27d089331d3628584783f3fd1d43c26d3bc7b09325810dec7b9b1648 SHA512 dfd7eba5fc0cc38152753d2d3b5ba13cdc614b96fe3f8e6629dc6c56515108fc6f2469f32629ffaba97667b15da294d874653d9133dd13592738379d5fb91c78
 EBUILD gnome-maps-42.3-r3.ebuild 1571 BLAKE2B d89dd8060f01ab68fc9c33d84d1a4c320389f8a06621379bbc41dfcfbdfaedd018fbcd18c8de9204e08a8a732e5913f236ecce1050923fffca5bc69b1364983e SHA512 f2d232245df8b3cd350c448a2312e17eda7a509652124cf6b6aed4ebf9b4834a2478bfdcfc200060e5b0370e89b0ac7fb9c8cbf42b9688007937c65d56f59e5f
-EBUILD gnome-maps-43.0.ebuild 1214 BLAKE2B dae6bf86bb7024b419cc575409378b28ef9b445f70237413e679d7ca0ef69a9e526590be6df9225f5720bcc69bf2da95f3b19401b365c9d047459eaca4acbe33 SHA512 d5cfd0d485e26d399ee291e5e9cdf8214bfd396268631e26c367be3ad5a052aba6bc7c36e725054e78c0bcd653467ea4b8db2d8fb54466712dce273f690d6205
-EBUILD gnome-maps-43.1.ebuild 1214 BLAKE2B dae6bf86bb7024b419cc575409378b28ef9b445f70237413e679d7ca0ef69a9e526590be6df9225f5720bcc69bf2da95f3b19401b365c9d047459eaca4acbe33 SHA512 d5cfd0d485e26d399ee291e5e9cdf8214bfd396268631e26c367be3ad5a052aba6bc7c36e725054e78c0bcd653467ea4b8db2d8fb54466712dce273f690d6205
 EBUILD gnome-maps-43.2.ebuild 1306 BLAKE2B c31d9b4ae6a46aab702ae772249e50f6974529b8d5917686bdc0c9d1af53a67f5842c29f0d4d61ffe339fdeec5129100daed1ad5eadada8e7447d019c3540a98 SHA512 19d23d4e470fe184b725df7ce0858c575948ed863d827bda6bceff5d1e9a767030ac36677624a54633f6a9bf29a70ed5bbbac26b9058f0f425f96cb846ce3a57
 MISC metadata.xml 351 BLAKE2B 720552be0df0a6687b1c65211e4532bcdf2f76a1dbc2cfedf801876006bdef781b6e7a3caab9f61a6d5a17fcb73caaa194bb54d356fd903c6ba3d8849c1e8ae5 SHA512 cb4a26c3d4dbcdc7e6ba7cd7136cddf8633002eab39741c4fe5d033bd3154d17d002d475c8f5370aae652ba1b34f952ce1401ea8d71d22ad4ea4aae364fe9645
diff --git a/sci-geosciences/gnome-maps/gnome-maps-43.0.ebuild b/sci-geosciences/gnome-maps/gnome-maps-43.0.ebuild
deleted file mode 100644
index 60b7b5097144..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-43.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A map application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-# Pure introspection dependencies found by grepping imports in ${S}
-RDEPEND="
-	>=dev-libs/glib-2.66.0:2
-	>=dev-libs/gjs-1.69.2
-	>=dev-libs/gobject-introspection-0.10.1:=
-	gui-libs/gtk:4[introspection]
-	>=app-misc/geoclue-0.12.99:2.0[introspection]
-	>=gui-libs/libadwaita-1.0:1[introspection]
-	>=dev-libs/libgweather-4.2.0:4=[introspection]
-	>=sci-geosciences/geocode-glib-3.15.2:2[introspection]
-	>=media-libs/libshumate-1.0:1.0=[introspection]
-	dev-libs/libxml2:2
-	>=net-libs/rest-0.9.1:1.0[introspection]
-
-	app-crypt/libsecret[introspection]
-	media-libs/graphene[introspection]
-	net-libs/libsoup:3.0[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/sci-geosciences/gnome-maps/gnome-maps-43.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-43.1.ebuild
deleted file mode 100644
index 60b7b5097144..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-43.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A map application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-# Pure introspection dependencies found by grepping imports in ${S}
-RDEPEND="
-	>=dev-libs/glib-2.66.0:2
-	>=dev-libs/gjs-1.69.2
-	>=dev-libs/gobject-introspection-0.10.1:=
-	gui-libs/gtk:4[introspection]
-	>=app-misc/geoclue-0.12.99:2.0[introspection]
-	>=gui-libs/libadwaita-1.0:1[introspection]
-	>=dev-libs/libgweather-4.2.0:4=[introspection]
-	>=sci-geosciences/geocode-glib-3.15.2:2[introspection]
-	>=media-libs/libshumate-1.0:1.0=[introspection]
-	dev-libs/libxml2:2
-	>=net-libs/rest-0.9.1:1.0[introspection]
-
-	app-crypt/libsecret[introspection]
-	media-libs/graphene[introspection]
-	net-libs/libsoup:3.0[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6844b987d580..c8d468e166e8 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index f96855c83acd..b0ad830a47ad 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,7 +1,5 @@
 DIST baobab-41.0.tar.xz 586228 BLAKE2B 8c06dd4c62dd377e2338df280dd1f78dcd6e0c13713f06bb126f96e658e42b9ed5f1cffa9f7445f2d854cf42c09b93d72f4ff82a80df5dd4a4d395978fe2ecff SHA512 4f41cac42491afb98855771a621573689f2b35c0a2602799af9f88adf901a5c62c9f8e4b70be43ed27024deba860b128bc22b8a7782ac207a5746b4df6b65aa0
-DIST baobab-42.0.tar.xz 588392 BLAKE2B ec2525b6643a9ab2ecedcbb7b7a54419859116808d9287bfcc694cf22d314b5dc34e71483718353685f3a246c87b4b492e7c3fb69c7044dea605ae3e8737d0f1 SHA512 21837bfe901034ed3450f6937d3ede1e567d16a5ae308db91029dc2ff4bb523b36f9408f7489c6798140de039e928f49969a1ed741027da0ae8377be6352ba08
 DIST baobab-43.0.tar.xz 594832 BLAKE2B 1cf42a475bf08ddf85d3fb2944f80e274eeb47d1e3f44fcfba9e53c9302a5c3f5fcbe9378dc74059199e2ed38945af16eca2456f7cede9b45228b90e14ae8b96 SHA512 d368bde1ba1fafbe908c5e8e0e5cd9d593d3f3cc551a7b1f3be68624bd7ee8b1dac6374fc9031c7d4c53240dda739974b5c71653227251bb5b8fbcd332900b91
 EBUILD baobab-41.0.ebuild 854 BLAKE2B 6e723adedb979773babe606eb4ed3052d84219d787b770048811f2740219ed5404860ee7e91d4cd97a963168e3a313d3f9135c4190e43d44a6c141fbfb2bc005 SHA512 b38a58f149cd86dbf2b34a9c541cc5d1c0dc310895792a6f86e25cf651c15667f279610826e56d7289313b46a561061af102d2392d65946abd1065a6e4956f03
-EBUILD baobab-42.0.ebuild 859 BLAKE2B 0f3863b0420f9e26de47c5df7196485275b5f7d43f77796552d4593362f029c3a6f7681754d4152b33c8b61ef869153ef013be8ab3efc0709620b5b7eddb4287 SHA512 96a67fd627c121803c1ed8d272c4b1821ca9fac7dcaed8f4358b37c27f6802e0e2ad1abb65e0455c65ff830c82442922d201366553a3a327d983d2af90f40d05
 EBUILD baobab-43.0.ebuild 855 BLAKE2B 5a876530624b9c63b9210ca902051580629ae56a5f93f1383f941701aedb1b3ebd347f658b738c55accea3bef055a8bced1f8413067514fe6114f0fa03967fce SHA512 4e5645e2806926ef574bf261528bcbf9a908b22de49616e22587eb89bcc0a1c83d63bde77df60dc0f8e10f4a6a6ac0ef5587e884b344afa639c3bda165babf95
 MISC metadata.xml 347 BLAKE2B 983e64fe7491b1205d37910affc27542fd793cf95bddc6b6584ec859b99e0751b11a92886c4bc6da63f7fee20c6a470272a18df2e88edfc4f8260f8b6fd971f8 SHA512 543d1c0b086cff34c3f5b66dd5ed9f6c91e3ef7599a6bdff7121454e934bbd55c20180fde028839dfe1537c468ed85b61efa7708229369261836fea5bbc0bdce
diff --git a/sys-apps/baobab/baobab-42.0.ebuild b/sys-apps/baobab/baobab-42.0.ebuild
deleted file mode 100644
index 4f8edab65309..000000000000
--- a/sys-apps/baobab/baobab-42.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Disk usage browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=gui-libs/gtk-4.4.0:4
-	>=gui-libs/libadwaita-1.0.0:1=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	>=gui-libs/libadwaita-1.0.0:1=[vala]
-	dev-util/itstool
-	>=sys-devel/gettext-0.21
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index e00bc76c16be..bb19689bbd49 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-disk-utility-42.0.tar.xz 1740332 BLAKE2B 4d05876364a475d1e16651569862fe3e9bb97549463146e69722c55922c0609069334e198eff91208448dc0baf7fcefe6bab56612e89fd7412fea42ba20549d2 SHA512 c47c37262295ba455b483a7ebe7799e92f94b97d177327817bb088cddcc3ff1f5840c3e270651287ff6a88257ec7cfcd1abe4167bf7454bbf55e145c8f1dc7c9
 DIST gnome-disk-utility-43.0.tar.xz 1752240 BLAKE2B 906183e7f61c4e9d2206fe2c99034f06a0aa3869d253587325ae18b336dffc6d8523a2f4d89c4338ed64947e73c5a24de15dfdb15a9d42d77fe51fd2321bf159 SHA512 8cb1b10fba21c90bceec9521103defe092dea9a4c89a39ae44e4d5981dd0d1958649e7a2743535f0135a3c9179cad0e0aced98dfc805e19bdec81651abcecf48
-EBUILD gnome-disk-utility-42.0.ebuild 1407 BLAKE2B eef5ba0d244ecdcd3a995c52280934e2136f0851e2ab13cc1f290788bc6c6901722f5cf8e25c8ac1fdfff3a1074aa959c55b3c9bd62ecce75e17ed3eb01cab93 SHA512 85156c76e9eed9e9b1f3f8d1c26fa65ace2785892e999ccc9b0396c5d66648d1a2faf53491e334cde2d46b18b26f8ecf7b0beee5ccccb389f866ef3b56868fba
 EBUILD gnome-disk-utility-43.0.ebuild 1404 BLAKE2B 38e0f76004764c61e637287671297c19061e231291b992ff1f95963c933cd0f85697e816cb59b28d8f0754533b0b6183e7e75984a0bb29bcc4fbff691ece2ede SHA512 eae8e7135443d55e1015010a3784daecade77b0cb2009a90d5d492f65d39583460d47f7bde7b7a1ac22dce22f4b77438f2ab3b350f8415e7b35f21c14de0136d
 MISC metadata.xml 725 BLAKE2B 173521fe25d9d15cc28c6c4abb434b246222a2c6e15392fdf655e4be1006f83026e9fabf7d29f9d41421c5f13f114c6649971defe18bde1ae1c40f7355859902 SHA512 88e461ac9ac3c8d2a321ef3a1ad44d17b8b3e4355f92320857c77b1a5c6d707d3b3613518dda5cfec9fe4e44067f97a9bac9b1b56ac037b7f0d86da82ecc93b3
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild
deleted file mode 100644
index 24e660b41759..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="fat elogind gnome systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-DEPEND="
-	>=media-libs/libdvdread-4.2.0:0=
-	>=dev-libs/glib-2.31:2
-	>=x11-libs/gtk+-3.16.0:3
-	>=media-libs/libcanberra-0.1[gtk3]
-	>=gui-libs/libhandy-1.5.0:1=
-	>=app-arch/xz-utils-5.0.5
-	>=x11-libs/libnotify-0.7:=
-	>=app-crypt/libsecret-0.7
-	>=dev-libs/libpwquality-1.0.0
-	>=sys-fs/udisks-2.7.6:2
-	elogind? ( >=sys-auth/elogind-209 )
-	systemd? ( >=sys-apps/systemd-209:0= )
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-	fat? ( sys-fs/dosfstools )
-	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-"
-# libxml2 for xml-stripblanks in gresource
-BDEPEND="
-	dev-libs/libxml2:2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
-		$(meson_use gnome gsd_plugin)
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 3a45ec54b658..7f840e2723c7 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,9 +1,5 @@
-DIST osinfo-db-20220516.tar.xz 129272 BLAKE2B 47f6eb2e1ae0cad277be71fb0955415c4afdb27e3b80e36c98ce5b7c8d22efcab91047e93c586045baa233ac61dc08113a5aedb626db4f24bf0472455826e481 SHA512 44c56824c774e68bd79633c415c71155e814c1f928fceba845ab649f8cb0dd325ad06b91a2d720cb25fd62e67d7ea17774cc395995b4f201527c4a6aa447a744
-DIST osinfo-db-20220830.tar.xz 136300 BLAKE2B 8710ed459db0573c436e2f25bd22d9dc7761b23a9046a406ffb2b106e7623010f8c9134ce24fe7fa096c6da698d9ec6749df9755c75e43af4d1be1140d2ab1b9 SHA512 8d728ce1afab9855430fa40595f8c156e72c155cd91e0064a9922a49e948116d5f49a75c89b642c5804b7f43f73e4d81ba179f8dc8cbeef8f10ccef7f9a696fb
 DIST osinfo-db-20221018.tar.xz 136440 BLAKE2B 819e3debffb2381242047d8e93cb8eff04b3b7b77b2490e9a94a1326586114ac8113410795663179a9922d78123c59f93d492e678111388d97b72a8d5863a248 SHA512 5a74d05ff1b2c7ac3693c8b4678a2464268f53efa41fce9920d3d030cf3c8b719d696353144f867fcf00d7462b4c37768d569277b73865df258532b51c971ee1
 DIST osinfo-db-20221130.tar.xz 135936 BLAKE2B 34fbbf6eded6d6e53c361ed8e5fc2a45eba546ae6aff3e02f31d321150ff1d7e05be9430d2a8c3a482139e21c73f310ec583d74827c38d206c219ee25f889cf4 SHA512 c0e7cf305d113c61e40f315521e606e73373ffa819ba059cb5ef245784fbf23e247180e8da1da366c96f1595470a870f193ed93a643675dda356b2c79f798015
-EBUILD osinfo-db-20220516.ebuild 692 BLAKE2B 6a023a7d52c7ac117481e628e0a0d8aabf43e2a18ef0daeca80503b3e3256ddb13ff063d45c4f11d4e58e3d871d47871559b68ce4e9be6fcdbe7920289cbb575 SHA512 f98f2d6cbd7c52c5c149030f4983d2a27ce24639b2886062f1205ca4636823df0bb1de63de08fec2bfa0eb9a95a4530b30d3aae540abe05d930ae549dccfe049
-EBUILD osinfo-db-20220830.ebuild 695 BLAKE2B 320bab52572b923ba2de94d64fc029461fadf1c5c709396ae570dd20015cce555226e839c2cd4e80afc089c96a3508d2afa8b20c3ff061334f0e69ac877189d2 SHA512 22dcc990da0b6c5159e8e598641630ab84a45697c99aaf1e71de3a6efbf0ecc9423caaf9cc251c356e941260b62fc722b418ba8e239e661288d1eda838e5c529
 EBUILD osinfo-db-20221018.ebuild 692 BLAKE2B 6a023a7d52c7ac117481e628e0a0d8aabf43e2a18ef0daeca80503b3e3256ddb13ff063d45c4f11d4e58e3d871d47871559b68ce4e9be6fcdbe7920289cbb575 SHA512 f98f2d6cbd7c52c5c149030f4983d2a27ce24639b2886062f1205ca4636823df0bb1de63de08fec2bfa0eb9a95a4530b30d3aae540abe05d930ae549dccfe049
 EBUILD osinfo-db-20221130.ebuild 695 BLAKE2B 320bab52572b923ba2de94d64fc029461fadf1c5c709396ae570dd20015cce555226e839c2cd4e80afc089c96a3508d2afa8b20c3ff061334f0e69ac877189d2 SHA512 22dcc990da0b6c5159e8e598641630ab84a45697c99aaf1e71de3a6efbf0ecc9423caaf9cc251c356e941260b62fc722b418ba8e239e661288d1eda838e5c529
 MISC metadata.xml 348 BLAKE2B fcfdacef0e6fc650338b935811d7b2ff4460497bb332b87312bd4c69c7ac260d9dc5288b383be27b1522a9ff9717a51fd4b2bd8d97f67e359ca8e5ff6c2c5c64 SHA512 4519bf98303033ae9fa40088f38eb6d703053eb6896d939756669dcf50404c5dac577fd3870afa4be5e40da4d4901b65f452b6779dac886d1673866b3e0f6f2c
diff --git a/sys-apps/osinfo-db/osinfo-db-20220516.ebuild b/sys-apps/osinfo-db/osinfo-db-20220516.ebuild
deleted file mode 100644
index b121959cf21f..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20220516.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="https://libosinfo.org/ https://gitlab.com/libosinfo/osinfo-db"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-BDEPEND="sys-apps/osinfo-db-tools"
-
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
-	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/osinfo-db/osinfo-db-20220830.ebuild b/sys-apps/osinfo-db/osinfo-db-20220830.ebuild
deleted file mode 100644
index 28ae854564ac..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20220830.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="https://libosinfo.org/ https://gitlab.com/libosinfo/osinfo-db"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-BDEPEND="sys-apps/osinfo-db-tools"
-
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
-	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/xdg-desktop-portal-gnome/Manifest b/sys-apps/xdg-desktop-portal-gnome/Manifest
index 71d17bea714a..34080e4c781b 100644
--- a/sys-apps/xdg-desktop-portal-gnome/Manifest
+++ b/sys-apps/xdg-desktop-portal-gnome/Manifest
@@ -1,7 +1,3 @@
-DIST xdg-desktop-portal-gnome-42.3.tar.xz 119228 BLAKE2B 1cafeda9e9ad5431eb52520db19350e9ee4c9f65e0923f6f320561893a29e32fc5033f3da540dd492c3341a8cb6bf29687cbf04b027e68ee388d102ac7023cac SHA512 0704eb29af5464fa0598cb4a05451866c8bacc20ad0638f7e799e7abdb4bbd86c41efbad963c493767190ae55f9d9c5d28360ee5fbbe1c42881969d03c7e84f5
-DIST xdg-desktop-portal-gnome-43.0.tar.xz 123836 BLAKE2B 304655c999cf938de6cff23e190835d3a902dce81e64b041dfd2ceed817ec239cb67479dc3fca979659dc15d31acb12e36f38499408c6a063e412760f28266ac SHA512 57dc455b19fc0c22aac9fb9fab375964999e99d96d2c6452ffecde3081e3a5a860eaf04dbada5ed87d43ae35119d1ab4d4fdfce3d1a9dc54b20862166984c2b3
 DIST xdg-desktop-portal-gnome-43.1.tar.xz 125248 BLAKE2B 5290041b3b0d24c6d62c1433c492fa5b04af80493d192392d6b89839356c1a4f2c74aba5509476bd5df5383375889d50636216b52e2448de1b3c8360501cb16b SHA512 fc9b2a0bf5483194326308099be0cb76245644bfc26546a4e63679eb695400cf254aa9e85de1b168e07ba7f05eb4f9fe4fde31853bcee4bd8bfb94063933ebc3
-EBUILD xdg-desktop-portal-gnome-42.3.ebuild 830 BLAKE2B 856d89e8fb635f5747c36611bfdcd7b8be3e22567551c3782eefe031ae14c8477a534fc211002d68db87ff9842bf01e68958653b14b38620cdd745bdd576f464 SHA512 3e336678ed9103c04d21b9f8c1f09b987b20cefc33d957f9aecaa4d924080d5e06c5d8d316fa1c732e944e7204f2b129f29a4717fa7adf51a5aa59ee2a674b0c
-EBUILD xdg-desktop-portal-gnome-43.0.ebuild 836 BLAKE2B 4dd124fe920c5f8a8ff97fde3a6fce9db0ba103be50c6dac5df38122d0e53a2e7a4c26ff8df07335615b0e2c562938e3ed231b596f57a08010fa0d0de47e76fa SHA512 cbfb4ea7e1e7b7ce3441fc91c73175fc058e34ff5a5dcf3b42cb82ac42aad3d2dcf7b6157d77f9e91873979d40abac4f3935fdd91895dc5bf5636f7712339f8a
 EBUILD xdg-desktop-portal-gnome-43.1.ebuild 833 BLAKE2B fc1bfbcd80ec123f7b909b1baca1772e33b7c362371a1afa179f05fb3450b1ebb2ed48419b9f60aab1ca12e84cd3b27d96bbac3b456ba617b6b0bcf55dca58f3 SHA512 144499e267d7cd112d0eee9486b13f8f0c9699ab0b87af7972b9ee8ec5a869d57dd0d36e9fb3d4b5e9ffd624048cc09c48338e40f2e4d0d72fbaa0a649a60bfb
 MISC metadata.xml 365 BLAKE2B 2e19983c4095f43cd1c2c15ffadd6d2fec127291bc3017b788cad8f54eda2767ba7bacb73ebd64b3d63f9e6ced1d95c07ad1c7f48f5b0e45ae1c7439b8ca849f SHA512 be38ae716e9291da42d39c6c756f8c7f4d0e65fc10fc405d5dc086643d2cddc5b6e101be1fadae9aa5508085964c550262703b949b03d29b130744d760ad4eb7
diff --git a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.3.ebuild b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.3.ebuild
deleted file mode 100644
index 5e2de2bb4629..000000000000
--- a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson systemd xdg
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal using GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="wayland X"
-
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	gnome-base/gnome-desktop:4=
-	gui-libs/libadwaita:1
-	media-libs/fontconfig
-	sys-apps/dbus
-	>=sys-apps/xdg-desktop-portal-1.7
-	>=sys-apps/xdg-desktop-portal-gtk-1.14.0
-	gui-libs/gtk:4[wayland?,X?]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-	)
-
-	meson_src_configure
-}
diff --git a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-43.0.ebuild b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-43.0.ebuild
deleted file mode 100644
index a29af51cf559..000000000000
--- a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-43.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson systemd xdg
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal using GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="wayland X"
-
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	gnome-base/gnome-desktop:4=
-	gui-libs/libadwaita:1
-	media-libs/fontconfig
-	sys-apps/dbus
-	>=sys-apps/xdg-desktop-portal-1.15.0
-	>=sys-apps/xdg-desktop-portal-gtk-1.14.0
-	gui-libs/gtk:4[wayland?,X?]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-	)
-
-	meson_src_configure
-}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 8cc0508c2a07..e1be4943df1c 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index f5a1bc1be81c..4e3dc45452e0 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -1,5 +1,3 @@
 DIST bdftopcf-1.1.1.tar.xz 142716 BLAKE2B bef730ac65c0234ce027965d18b9e6e2bcfb8ebbd9e84a5a80d3cfc782a2f4b4124a833097867912592fc4a2accf3c067500a6b9c1f99383041a2df042df9ca6 SHA512 257dc9ae29f2cf1496aad91ccba534348d87f881d75431aa6611a8154cb817d17588c464ab6c6c6bc51e6060baa8dcfcb9fd8c037cdaea8d18287651fa6b7ea9
-DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
-EBUILD bdftopcf-1.1-r1.ebuild 396 BLAKE2B ce09228426902ecf0345999518ad885f67a17b858e080699f8f6f1202f210e14d6cf0d4de569db535f339ffaed13e7cb10be004b78435ba311accf264a38a1f7 SHA512 485a56998546fb42b9d905736f77fa53f19a5f3527fa0748fcc8eb7ac3f6255e9282e7a2f3e8e2ca0224c826dbb0b68ea6c7c9cbcf1b5c3a8a7ab10919927fbc
 EBUILD bdftopcf-1.1.1.ebuild 471 BLAKE2B 1d1e22e5d8c23a29717f410629e636e8a4c981f9c673125822babe84ee4f6b9fd1fd312f6d73c954ec6df682ee98acf20104a014d5a1d559d2ee2ffb68052064 SHA512 713584b0238b64b0bfe92ba572b46d9b7f798a9aa22ad2df15b5331e9deca2616f31c3fc2cefa362bd3abbfc31f5557124f25d84e330dc16b4ac14f26daf8915
 MISC metadata.xml 340 BLAKE2B 2e0a214bb6e8a4a625ab5222d9c8a2a8724dfc846447f0515657fc9a1f9548b4212b12f021a26e0eb1f4ac0abce71ed131ce697882c83ae8128ae9de8ec39287 SHA512 1dacbc8993cc6b005ce5f0d26f0a6d7d08bbb629f25a2358a80607c84c5368856f63949f068747415128d1a880199d22636bc00184fa11d6aafe711cc2e505b8
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
deleted file mode 100644
index 72961e52d62a..000000000000
--- a/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org bdftopcf application"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="x11-base/xorg-proto"
-RDEPEND=""
diff --git a/x11-apps/fslsfonts/Manifest b/x11-apps/fslsfonts/Manifest
index 46d2ce7b0afd..6ffe25042f94 100644
--- a/x11-apps/fslsfonts/Manifest
+++ b/x11-apps/fslsfonts/Manifest
@@ -1,5 +1,3 @@
-DIST fslsfonts-1.0.5.tar.bz2 125650 BLAKE2B df08689dc452d07e895a93d5e755b3820b21c1df997b5269835ac04ac81beb09d98ebdcf7030d3e6c7ae288b3e7388b136a8b7b58f95ce3958e12923bab50620 SHA512 3a30598ace981c7396bfe44f0d8f76d40fca3f77158dceb3914a524594a12187dcad0b0f225fa81f251f0b7896bf046cec4ba610b4676da9be311eec5d8c6cc2
 DIST fslsfonts-1.0.6.tar.xz 123484 BLAKE2B af894405cad7351574c546bd3055dad9483b091eb2d9296e69167c1939d235cb8e539abf96b5c36c05a988b88e3cb70a20191bbdb7d9eec95534bd7b2fb68d6a SHA512 1181a8e6cc820410d1deac98b3e5097506e4168c6515307b6b9aaf705cb57193a009cb331a51d46ce68e9548712f122b5c942d5a1bc1e01bdd191b7b1beab09e
-EBUILD fslsfonts-1.0.5-r1.ebuild 301 BLAKE2B c5b4fa40580a60c7ce374069f070925150fb9e9632f294c81bc6840b5d146037efdb3c035c74445930f77a460314e3533a55d1fa7646764081be137dc76c80ab SHA512 eac96bf8e6653d2bd932d88aefe5e356ce1767b1713c019246ee96bea1149c1d70c69cb51ac65db994f15424000e2667091c93ec030588778e318bee8a61e0a7
 EBUILD fslsfonts-1.0.6.ebuild 324 BLAKE2B c561318b9a993e02670c01eac713ef34cb68671251d0b8d76bce7de1e1502e634016de047821f1428f1ee5e2abe67408265d866c37ce06f943914124cbd0dd16 SHA512 f421e49a842366f7cff74ce20905b036872a869957b7a1a0885d99ecddb628ecb69ad4df22566597e871d3348f29f6ccf4d05dfae2de4c4a9d34c8bdc16fd3be
 MISC metadata.xml 340 BLAKE2B 458367aba4b0a63c95da034806307a960cdb987ab8772e4f7eff50344a2977bf83ffd9662d64aa1c43a2aadbfba51532dab1726468ee97ab26205ae6149b44f3 SHA512 a5c5fc1a50e0edfc9a0e56ceda4929fdaf9b938ae5a404b3f650370b359cc645193a667e26e926be0bc1de793d7ca4e2072f1e460641517a0aecf2fb181b8fa8
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
deleted file mode 100644
index 208786d2e835..000000000000
--- a/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="list fonts served by X font server"
-
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="x11-libs/libFS"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
index de47b3e96083..9bc13a72a609 100644
--- a/x11-apps/fstobdf/Manifest
+++ b/x11-apps/fstobdf/Manifest
@@ -1,5 +1,3 @@
-DIST fstobdf-1.0.6.tar.bz2 127170 BLAKE2B 89ed63541386d9f46ef839fb78be1cbfae4b51d824781325e33566a027a5a44671cdae84ec6ed81eb23b6a89f6868726b35781f2626a407753129ffd4c0af86f SHA512 ec5b8f62019ba51725bb47241d4fc244412f354e7c12094ed884109a88e3db9d25d41a6142fd002e6c49877b4c7f2c5dde549682dcc05f7ce102621d2c71671f
 DIST fstobdf-1.0.7.tar.xz 122432 BLAKE2B a7d736a16fb8e7992c46ca2d74ac1897c0e2171d18f56837812f903db7035da5b8aa811ef7be8845717ee5c558bc88434e5f74a848d2d31c91bba5fb507e4ce7 SHA512 b303cc2060e8ccaa139e855a7d377d28877158efa1087eeeebf9f30f7c9962764eceab5c4044b4b508890413cf38546da9b26756dd27a142b806dcd6fdb6ba59
-EBUILD fstobdf-1.0.6.ebuild 298 BLAKE2B 5ffbf7a947e8c8e6ce7aa3e7e1a72bc5b192ecca5681fc8d34859b6a10f978ab2206ac95225bf4168bd1f4c944c6cbfbda268327dd33da32fbce77fac7cf51df SHA512 4f3b43276bc32c423d119a4525c7445725f3a07355339e24f95c68f65e404d96e414b6e2c66ae1b30885799d38b760432b0f6afa494a97c4d043e41669a0b7b6
 EBUILD fstobdf-1.0.7.ebuild 343 BLAKE2B 052e289e2289aa3a654d1801b7aef00274820cce9a80943666b44222198c6eb86fc75e2c1ff90fd598a174e29d54d8ff32330ca2dec1b3b72c046d1a0c7c5049 SHA512 3bc0c2f1dfaf1dcf173a3696652bad47c277eb257c7b3070cb600cde46c04c0bd524229d787e653e7c9664cdbb9af522b0d00eebae14e202ea05b16f155dcc6d
 MISC metadata.xml 338 BLAKE2B 35d24ced4c0ed7e1232e0fe4ebe8c8156c9e0bc9243e8e65c6e301a37c5d99b72bdcd9e7d743372af7c213bab42aa31e30a261d742fb86de9c17a17e9fdce527 SHA512 de461c750d88627357aaae23e3b1bee9dea65397c418f79d0e3256942945790584852c777a8056a544b00b760e42023f621e667168dd25409e9354e2e083a6ed
diff --git a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
deleted file mode 100644
index 5638ad52e4fd..000000000000
--- a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="generate BDF font from X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libFS"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/ico/Manifest b/x11-apps/ico/Manifest
index f406a97b63ce..d76a9a63b1bd 100644
--- a/x11-apps/ico/Manifest
+++ b/x11-apps/ico/Manifest
@@ -1,5 +1,3 @@
-DIST ico-1.0.5.tar.bz2 136727 BLAKE2B 6c6d0a3e9521d9dad9f17f20ca7e1ccb52da31b6a5c5879bbe3d63e58231956cb2ff665b109191185a9af8ee9d2b87f034d349d4d3b33d18dc7b52e0d0640972 SHA512 93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6
 DIST ico-1.0.6.tar.xz 130032 BLAKE2B 21ee058ee22493832499fdbac327e51a10c468e47eb6f9dd6f5a3ec26af1533295bc16c0d7b212af49e85ba079a42813acd4e3ba8864c9ead0e7a31c062af724 SHA512 0ada451b8026ea10d1a5633f847b7bf833292e4cd01e3f1079d82c91fd142c06c6c4005b7146900ee34ac7acc8fd981db37ada9052dff49c2cfce995b9146c8c
-EBUILD ico-1.0.5.ebuild 301 BLAKE2B f82eb2b8b3c0214a8287eeaae5b0f2e7d026254287395929a6ce6cfdf6599510d59ab6f4b69cc7651272fde31f1804df1d7ed9e5221c10152d52b903c503b5fd SHA512 9cd528c4ec19e012fea9e4fa61eef12494a73cfd8d75f8dc23c5f47da921cc26e471d0d1d1dec7f1cc16f84e6c0399ddaf1068e45aacf7d95aa3936f8de6e508
 EBUILD ico-1.0.6.ebuild 347 BLAKE2B d451a2d66947fb40b16323c998ad7def5fd465cd4b899830958a7d6288c285751146780fbf69946a700b3478446e5345e1491638b414ed930097f0cdde81f8d8 SHA512 214f938a4b0af20f3484b670b993907511f1d25ad73e5a76802848f2d968de71ccf4f376b7e82d48329b404512230d97f9cd5f6404cac3efc2f730c6d4dc1903
 MISC metadata.xml 334 BLAKE2B 5c7174321960a48b75488e5aea0d5efac55063be3e219c2006bd3a9489379beba8d49cca34531baf80f7a01703fe932f1ac86e2ad07b5897e4ae01deee4f20c2 SHA512 8b13420f7d36d24a9d34db6253534e5a3f26c2962182576507e48e88be6507545359638f649900e7db42b2beed94f2ca8506b051cf2ae472a82f38c28d1421b3
diff --git a/x11-apps/ico/ico-1.0.5.ebuild b/x11-apps/ico/ico-1.0.5.ebuild
deleted file mode 100644
index bbdf3fb6e6e1..000000000000
--- a/x11-apps/ico/ico-1.0.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="animate an icosahedron or other polyhedron"
-
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/oclock/Manifest b/x11-apps/oclock/Manifest
index 832f9eb755e7..9894c2475357 100644
--- a/x11-apps/oclock/Manifest
+++ b/x11-apps/oclock/Manifest
@@ -1,5 +1,3 @@
-DIST oclock-1.0.4.tar.bz2 132835 BLAKE2B 8547aeb06ac33917d44f318ffaa38bd899b78176e4ecd0e4446706cdcb3fe30933b4a63cc465601268d8d868e90d498c0fc6a27f8c0feb304fb7ca1f44492d4d SHA512 6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7
 DIST oclock-1.0.5.tar.xz 126404 BLAKE2B 50bb5e1db1b2d268f1937e4cf9452208c5c1c72d6deeb08ceb7a639b43f7754b643827f757c168c8d9c81a30576b44b11f571fe4f3ac37a99eda01ce1f07d5fb SHA512 a87e89afdb25a91c36077e030b05c3907ddc063c6bdc0715a01bfc16edef8730b3b5a0347399ef4c8b2a13e70e068cba9ec5fe8d411f08548c0aa790a1873aff
-EBUILD oclock-1.0.4.ebuild 369 BLAKE2B 5eb189f12b5c763910228b34a3d3b8889285575fbef9708d9257775bda35f289499c59d4ffd742505175c84a8e87fa9a8d1e4f698a92a7bcb41390c54e74ef49 SHA512 c0895a5212451aac1d3f408323033077edb3b02fd984a08ff54b7fa69ce4dce50ed37dbbe031bfd84a9ca56859661e14db8cbcaa1fb90c2b23c9594f1d48235b
 EBUILD oclock-1.0.5.ebuild 415 BLAKE2B 9b23101bce5e2107dbdab71f7ae2a4d8919ac374d691b0fe65d544cc5e179d13dc7be443ad148629ffb0645ab2a47ab9a32de012a181c9db37291c3f27786fa0 SHA512 b0c2dcc48d42dbe120f56bc8426cdc4c87e5584923aa22392e7c5a772907f680a1eacd59d948bf7de1d266fdf57961f9099a13021377b369e63c79bccb80b781
 MISC metadata.xml 337 BLAKE2B 1100cd4cba6d169fed0fc11e972b52e8c4582cf92a6505cc3aca1a5f077be6f5aceb15b3f3bdae463b724bf9c96a4fec7ec8e73e3df7734ee55790e62258b351 SHA512 555191541442af37fb67f2c2454fc318d3b63bde0d957234262425debf1297040f4b252209b0cace3594812e6158d4a27a62d00c02714c56b5f3a234d7d01ec2
diff --git a/x11-apps/oclock/oclock-1.0.4.ebuild b/x11-apps/oclock/oclock-1.0.4.ebuild
deleted file mode 100644
index 00d5c6932221..000000000000
--- a/x11-apps/oclock/oclock-1.0.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="round X clock"
-
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index cde7aa58a843..1aaab28fa869 100644
--- a/x11-apps/rgb/Manifest
+++ b/x11-apps/rgb/Manifest
@@ -1,5 +1,3 @@
-DIST rgb-1.0.6.tar.bz2 139225 BLAKE2B 25e20d0be23a46d869869e47169d86dd50a99bc65551bf83800119c7f9cd242f41d5ecdb611467eaf9aeba909cebbfab8f578e0a5dc63380482f324124064bb4 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e
 DIST rgb-1.1.0.tar.xz 132824 BLAKE2B 117ce69f384066285aef900a135918d58bb7fe27e5c0dc494bb82a9cfbe889f87f856da3a5a04223858e097405593b66aa1e9c9482d075f6a2c40aa9b1268022 SHA512 640888d64b2d328fff4a1652ba1299436e348bc3cbc90710d79c635acfa7f2fce0018adb818123b41ca008197ff1cbf87aab60501de36c163bed2d80d8556008
-EBUILD rgb-1.0.6-r1.ebuild 448 BLAKE2B f93871844f4493cfb4566fcd3115f4ccf3b4c6767d8c1d6f997b5e390c758b319c316d4fd7bc347d99bdb982d0a762dbb38e438b7e0a302b6ea7e8c23a9b6d3b SHA512 dd5226c5aad6a665f2023c79488507c4f594eb494be0829cd6b960dfb37aa51254ed0ba367c660b5a733b7801600fab69aa42606d7bcca3c06242f6e6d1014db
 EBUILD rgb-1.1.0.ebuild 473 BLAKE2B 3645359025e613bd60aac3203e6b63bf71184e8829e6869b38b5a630a416784ddd9dad63c4a4034a18d7d4182fd49e44353a66c6941584bb34b0f72344f2d4c6 SHA512 3b48d81f708799a8a40c1bf333f87d0765542eaab041b81b2b2595945f8e95845cb099932497e05c56ae444b8f5e3f6cf90720d2e8c3e613918361db7a619767
 MISC metadata.xml 334 BLAKE2B 68a0b63d285bd840a4e3e0c0f01705d8adda0e16a4920e6591e60628e57897185d7a5b57959d02bea0ea24f92ee92a4f9b20d4394c0a187799cbf23d25210d97 SHA512 b8de5eb177f9002f75e2843cb0cb99e24fcefd5705f32c9a365c9111cd6559572689627ff30a0e004a1c27077cc1b856f4b44f116134c815e9b747398467339b
diff --git a/x11-apps/rgb/rgb-1.0.6-r1.ebuild b/x11-apps/rgb/rgb-1.0.6-r1.ebuild
deleted file mode 100644
index 243afedcbdcf..000000000000
--- a/x11-apps/rgb/rgb-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="uncompile an rgb color-name database"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="x11-misc/util-macros"
diff --git a/x11-apps/sessreg/Manifest b/x11-apps/sessreg/Manifest
index b63a51a4f73d..d269d7b685bb 100644
--- a/x11-apps/sessreg/Manifest
+++ b/x11-apps/sessreg/Manifest
@@ -1,5 +1,3 @@
-DIST sessreg-1.1.2.tar.bz2 137612 BLAKE2B 0fe6484b83255bc2b917645ea841ad43b927131a8ef3fa9a47e7864984259140579c462c8d03645928ffd4667e7c46f36c5eb1aa35ce916ab65126c55f6bdde1 SHA512 7e3c2bdcadb7133aace463b58d8c6108d315ec95d2a42509073eeddc7f02644092a4b3168bd3b426c041736a016291092e0bf8368acd620dbeff96d53d12f98c
 DIST sessreg-1.1.3.tar.xz 131184 BLAKE2B 9da6b8c44db96edb5151856edffe37691004c1df0ae5bc7c32becb78595f8ff907291f090a708acb5bdf49dffc866385298a9de00df0e31533f61cbaa5296719 SHA512 bc1e83afc598ac5b4c6ab0861799b6c8727c123ee662c1fb9cbdd9ee926973b7a00cc62e32f6b4e462c0da3516f8b824337d9cf17587ebabd3f4753502641a60
-EBUILD sessreg-1.1.2.ebuild 342 BLAKE2B 18dd410d61579aae559212f87da1df1eab6341a4ec58ef5dbeeecb156cd8b5c39e6cf47436572ddc14b45dabdecee230b51f829c90af05275899aa023ca7881a SHA512 adbb2682970e45f0051a0e0b1c4e1f79e6af1df46a14e023f9ae742e6fd80f8d8d7c334382ecf4b8e0fc77842a112eae12384ff03253e0c6e6fb865daf8209de
 EBUILD sessreg-1.1.3.ebuild 359 BLAKE2B e8bf654ac25045d3b5f21bb237dbc08cece022437c47189fc3cd06df171e9c329ea137e38427c5e393afe73031a3d4e64cdb8ef15a06e237845ba6ddca365f7e SHA512 74a34f0a4d929f1474bb5fa68c282de64690d63570fe0e85ff244a95828a867b0897824a5ba9d1535683b93d1b67c537a6b0a18ab7e9a8974b6472dba9f561d8
 MISC metadata.xml 338 BLAKE2B e25dd0f7e3bbffd2051258e976e618fd2b23dac5617e5623cbf3dc65dea14e2c92691ec4e4b82e9edc9b4ecef097255a94cd9ab822f59b29249d5f01fa16b913 SHA512 662e6497348739394cff1b169d96c777a0a247d041f04eac5180fafb04c790fff97fa5f8f5a460b213e4f280665e9bc9d9a6bc38e2e80d08da26bbc8a2f9ea8d
diff --git a/x11-apps/sessreg/sessreg-1.1.2.ebuild b/x11-apps/sessreg/sessreg-1.1.2.ebuild
deleted file mode 100644
index b0a4ea3d3f6c..000000000000
--- a/x11-apps/sessreg/sessreg-1.1.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="manage utmp/wtmp entries for non-init clients"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/showfont/Manifest b/x11-apps/showfont/Manifest
index 657c7d4d5e53..a03386c6725f 100644
--- a/x11-apps/showfont/Manifest
+++ b/x11-apps/showfont/Manifest
@@ -1,5 +1,3 @@
-DIST showfont-1.0.5.tar.bz2 125618 BLAKE2B dd3f97e3f2dff934f1cff4bfda0f8a06be3b8549b8572f3a163dbc638fa753eb14b65e8b11e19a56e687a306f3602f99b91fc458c22543d5622f870e518b77cd SHA512 d90d6d99ca573f2632435ccfd46de606994e3792deb58bab6261ff950481ec71eef032b828da0ee5333d6946c5f54594dfb2dadf930825971d3f4baa5c0ff6fd
 DIST showfont-1.0.6.tar.xz 121588 BLAKE2B 963040ca15db4e990aab19616a4b5cca5a9454ca9df57a7bf92f3adf44eed08e14182a98697f6a135b1ed509e6fa15826044af43541bbcbc9434fa25db0a363d SHA512 21a318519492f4ba46a8bcb3590097fc5f96fe01fdb557257ae56bae813671952a2aad6c0df8cd69659e06708571c398e6d97969224cf692e22c8a35c8e6c363
-EBUILD showfont-1.0.5.ebuild 273 BLAKE2B 9635b9757eabeec523ed1ed75e5078e23691024b1c1dc9b611d5a6d213166b88de625f6ec4f4e9601fa2b946bff9086e483dd5faef83eb7638f03966b0db287d SHA512 d153546ba7c0eafefd5fdaaebc79559e9612548e34db414aa1e0d657597b35ec1ee5f035752dde35d3671690ed90b9dffb75976941ff1bed020b33276810d6b1
 EBUILD showfont-1.0.6.ebuild 319 BLAKE2B c0069935f546eeb1858643a34719f65bb81fe2cd20e943403deb27d7f134f50e29f5aed97122329c19ffd89383b0d3f4020f029d12ab3b3ecf5572fa726ab862 SHA512 cf896fecaa05f234e00db4183006d4b529b7ea1ae584acdf85c0de3efd40cc04a0fbbfc008e63b761d6c831b143a88fe2da00f333b52ac62b23bcabd417c1c25
 MISC metadata.xml 339 BLAKE2B ccdf2af178e2b17d9ec110e4aa32cf7c8da303266ba94b8443baaccf4fa18cda7a618c8658cbdf30cf26c4305a458cd7619786846105bc812890720dac91c837 SHA512 638081d732d89aa286cb6254d44c5b7d86b05e6f59c3b312f6fe8fc3900175bd035797e32e1b49052cd11e25e83ab8320f1cc2ce5f473cf24bd6b82d30010be7
diff --git a/x11-apps/showfont/showfont-1.0.5.ebuild b/x11-apps/showfont/showfont-1.0.5.ebuild
deleted file mode 100644
index a2c947085670..000000000000
--- a/x11-apps/showfont/showfont-1.0.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="font dumper for X font server"
-
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="x11-libs/libFS"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
index 2247fefd0b35..9015acbedcdd 100644
--- a/x11-apps/smproxy/Manifest
+++ b/x11-apps/smproxy/Manifest
@@ -1,5 +1,3 @@
-DIST smproxy-1.0.6.tar.bz2 132046 BLAKE2B b1eeba52730da79ed9f374636631c0400df997b2c5ab5ce18f1644ea6de7c55ba2914978d0b8b88f0cc455a0b5a65513fd7e29d2a374e7464fed14e007f8cf96 SHA512 4945c92c0f07c5dba5698889f415e78ce406939f4a36eb977309488c27385ce4ce04235c4e850a90a451fea8d7885ded7c6b18db71335c7731b38aaeefa9fcb7
 DIST smproxy-1.0.7.tar.xz 129044 BLAKE2B dd1736d972d079487bd45f77272523c2772a7aad612ffe719aa9c190df112ec68a372e2b7e673263f246be57f199ec288f5077faad8b6a3936cbbf7fa5b9b433 SHA512 cd6a6933b74f76ae65fb16504e57871724bc1102eae1d02e801e99c3fe73fe44e27f87cef3fbf9f75f369d18197b53bb677d637d94cc8185b55acae0cbd44f21
-EBUILD smproxy-1.0.6-r1.ebuild 336 BLAKE2B ebd5110cb97ccef35627ba0b855cb2d906525608daa0a070b68aa521f00c8cf76eef6f6ff4635acdf89cea926e8dd0fcb7818673ded6798d9855995087f959a9 SHA512 de2ad44843f626b5998b53b1c77ef99683b29d74a2563c4e7a05d4699817d00160968d658dd5c8a89c7371f9800599266e6ca19c89c84f49c976a44737a97e91
 EBUILD smproxy-1.0.7.ebuild 393 BLAKE2B 57414c044bd5c75defb68c7246c3fee6d5b26d88225b4e059e0cd6a42fc82cb1f22852f8d24d02625ce0eaa2ac1a056810e33697a3279f4b57f73f91eb4b82e6 SHA512 befbd1e11a3c692dba1f6f9fb2e341f6a0afd5a005062c95204d6a95d9d73762187e25d7b299858b21e29dbec58dc26755e1ca6bb77df29dc74eb9d32ad8635f
 MISC metadata.xml 338 BLAKE2B 0745dbd18fe715122bbf07d279e42eff3928b296ac64e2977228ca4d1604e53e562e9417f4005f90461ef005fa8680b5dda2e8e58d77b8e9f56b292a358cbd3a SHA512 afa160655b2ac6bf64937275e35e9a6c4b289ab005c39871225e7e581826507ec3a5dbfbd7022e2062235193d336f1278139a749b75d4b64a9e11d5eede99ceb
diff --git a/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild b/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild
deleted file mode 100644
index 077ef8a30e06..000000000000
--- a/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="Session Manager Proxy"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libXt
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/viewres/Manifest b/x11-apps/viewres/Manifest
index 3ab2e5bbe77a..1b26ff0e260a 100644
--- a/x11-apps/viewres/Manifest
+++ b/x11-apps/viewres/Manifest
@@ -1,5 +1,3 @@
-DIST viewres-1.0.6.tar.bz2 135200 BLAKE2B 96677c7c02e56be5da7f8f9d492f22cca5c6ea83a783725fd9fd86381b00062f3b83cbdb88c4030d9f0a52ccb8f06978232adb8e5f0002db06abcb7ff6d35ac9 SHA512 3f4cfc61608bc6c9b35ef66ceb473661ca01946d3306d54040d32803e8e0eec506a0ce37ea22bfe514544a6ba9645fd30f39b20c063aff696b3c0fda3fe95dff
 DIST viewres-1.0.7.tar.xz 128608 BLAKE2B 95a994cdbfa0943c76298df8c2d7e0fc2aab8cf7c1c31cc76538ab7a9f5a22ff1bb515c8f8c9ebfdfcc490600696bd5184029182edf52d3af311cf4a4825624d SHA512 75878faee001163891adf8472c79b31273f794e23dd775c80b33acdd1ce76df708eb27a49c20f79b7101ad676e1d50d9c857c2e2e0930c6209eeb7af8a11397c
-EBUILD viewres-1.0.6.ebuild 361 BLAKE2B 2c6ba35641dc4d54116cff5452c2dc845ca69920aeb23b0fa0e2bb39aec7d73b575037851b67dd9ef33216c350ad8451c0602d6f677e88aef08aadbe4c08a752 SHA512 42269351eac7360477b2ac320a4ea5f6aec999f6f4c82035b6e2e174f292c6905fb7e0dbc7e44fb707ac0decf7ca12c8dbbf71b46692412fc8b064b7e1da5fcf
 EBUILD viewres-1.0.7.ebuild 378 BLAKE2B 9fee2ea5ad98f2f5dd93c02d3866c73328fc78c4ad72efc5514d28ea7cb28a9f81175b79c90b6ebf7a5d517085956ae60ab79600461dce53f7f9aa5b93700590 SHA512 5aea97e3436a4b11d4bf82b0065fdea6a873b8ea518b4369c4dc2918bf8f2526776a18bcb7dbc76aa8ce88548acbbca454c13f699d9e3e8fcc49479ffa2927c5
 MISC metadata.xml 338 BLAKE2B 48e179eff46c263194c44cb537af6b6df0331aaa617be04e5197a0031bdcd22df2f3959f46039990d7afcff2777a2a32def7079edf536e6bae5afa11e27c0fb3 SHA512 de9c770f9ad6e65d52c45c7a69693a7ffdd9d9f5264d32dd3cb98422c9478b710b91f17b074822fb918e4519122cd041606197b92723acef08ee444d9868e9d6
diff --git a/x11-apps/viewres/viewres-1.0.6.ebuild b/x11-apps/viewres/viewres-1.0.6.ebuild
deleted file mode 100644
index 20d189645d94..000000000000
--- a/x11-apps/viewres/viewres-1.0.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xorg-3
-
-DESCRIPTION="graphical class browser for Xt"
-
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
index ea821d4d5b5a..23b1092da1ea 100644
--- a/x11-apps/x11perf/Manifest
+++ b/x11-apps/x11perf/Manifest
@@ -1,5 +1,3 @@
-DIST x11perf-1.6.1.tar.bz2 189446 BLAKE2B 2a36bea5e1c9a414d9a1ce798e4f0481aeab86522c5924fb7520c0bc917b832f3e4c63c70a5430cd3fd92cac4374691a64db4542180e0917a0617bae7f783a6f SHA512 b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b
 DIST x11perf-1.6.2.tar.xz 173800 BLAKE2B daccac808d62b8b3d423c34faa00e41e4e259ac7bf7a1f6d337602d60c31b63db1b332f2b0eca368c3b2fb91486882e8a90ee8d1aaa20a0e10a747eae5faa34c SHA512 5be9e601071a42d103adbab5f30c1900a3779a5b2c06c709df99a85487c9790d36b835d43f5c6d74cc7d950cc3ad06927210d7b1f58939cfd0b4a6f3e5e32112
-EBUILD x11perf-1.6.1.ebuild 420 BLAKE2B 95e84c67ff78ce3e8fd08d0b40aafbaf29e380e57298898000e2e1308040178ef993801ad9777fd7bc8cf9d324dce91e29513fbb0a47a2231dec46fc06e29f29 SHA512 e0a76ffc2c21e03e447cb0e27a3069d3ae4982afa32ec739cfba779f41ab08981d878c1ec72c96ca2fbed4e66e911b85d164a4eb23106e812fed9f8dc69107f7
 EBUILD x11perf-1.6.2.ebuild 487 BLAKE2B 582461dcd1d7b143c486122ebde38834075d93ef3c989fb780e14dd97caa59181382766d89017c4791a878ff051c94522d90fe637a46d622e598a5c1c001d583 SHA512 bcf6f1d43f02b26feefed57507f09f3f66545ea8634471e9829ec68c3c962c6ce714401e66a7ad273d172fdd80544c78af420fd392cf9b70ce88881d1b1df079
 MISC metadata.xml 338 BLAKE2B 62d4735813b8ae204a544bc5abb18554b0622568be416752d0c63800344c9afdc22aac562bcc9f5a3f174a93ace3773c972cd0a9980a478afaef60399d843f09 SHA512 557400e93681a240b176ff5ede69df4720d4845da0ec55b547e294ec3775b0bb33eb0a05007d1b528d41742cacfd2aee65d835b4a5484fd49041d211a3b40c39
diff --git a/x11-apps/x11perf/x11perf-1.6.1.ebuild b/x11-apps/x11perf/x11perf-1.6.1.ebuild
deleted file mode 100644
index 63af041b6162..000000000000
--- a/x11-apps/x11perf/x11perf-1.6.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X rendering operation stress test utility"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXft
-	x11-libs/libXrender
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xditview/Manifest b/x11-apps/xditview/Manifest
index 794d531502df..a12cd040f077 100644
--- a/x11-apps/xditview/Manifest
+++ b/x11-apps/xditview/Manifest
@@ -1,5 +1,3 @@
-DIST xditview-1.0.5.tar.bz2 151313 BLAKE2B 53d96b874230dde6f4f13a7a61420e1b9da86fea18e49e7084212353d9de64aab30bda6bc790282127af961db66873d6fafec1f6c7a986776c30eaad260ad98f SHA512 e20c903f38394b496111267e142d84d11e69a3b89f91869652d1f2ee5c997a13f90bfa2966651b42cd3979a330b348a6e397cc6a74c45b1f3f91643e7c06765d
 DIST xditview-1.0.6.tar.xz 143848 BLAKE2B bf832e17631a12f58ad194b1ddcf7a63a31e04f005ce883798f892284c8ad64ae40f15f5c1d781179333ce212e989de9b45cc53881079818e5c2f0b6087e3b5c SHA512 249769d27980e9a69ac8f056f329dfa514f3ab6267d6ed69814c5695f315d2a7021c560a0e26fdd2568290a071793d7f2eafdd92f9981ed556047deb244ebf5a
-EBUILD xditview-1.0.5.ebuild 330 BLAKE2B f5301dbaef435197d301b261e0150cb23d98bcc5b19317fc4479a96a5a125601a6bdc81cdab95e6cb6b44a3b1e1b29a30a1d9610db9cbfd7f68113bef9dde9e5 SHA512 a5b0490ae1bf34cded726c847e4ecb873cd17c696c26a3ee2e59bab40d9b7cbae53e50ac81433e071a9f1b5309638117a6a09420491ee2e1d98c7e71e794bb7d
 EBUILD xditview-1.0.6.ebuild 369 BLAKE2B de241176b80ec2cc177a1ee5a235c2935883cd6c72078386711bfff378f113b67276c03ba0af0b3386e321a064e968447fe2bb993c9b20476de87b6735232df3 SHA512 785ad5202f9c173c3c079cf904e99798f54e1aa50b8c59833d0f27468b3f86d08b380b1dfe9e971258543486effb434cf768966020e60cfd0eb2ff7e493c87d1
 MISC metadata.xml 339 BLAKE2B 20bb995c62d6ae40b62505bdffd3c58cea8ee7ff77cab23fd8b17f05fc40fde108afe9c27218bfbfc214c2cbbabf9ec3f849082895ec6e6b60deaf0658930be3 SHA512 680956394474d91911730ddd716df4f3a4e005c689c9a75c0504faa77bb193bcdba492ea2ac3ea86c53de676bf40734f5787da0ebc5e710d62553edcc7220955
diff --git a/x11-apps/xditview/xditview-1.0.5.ebuild b/x11-apps/xditview/xditview-1.0.5.ebuild
deleted file mode 100644
index 4f07d90eb4dd..000000000000
--- a/x11-apps/xditview/xditview-1.0.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="display ditroff output"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xgc/Manifest b/x11-apps/xgc/Manifest
index 2b4e185478ff..59a92f4bd02b 100644
--- a/x11-apps/xgc/Manifest
+++ b/x11-apps/xgc/Manifest
@@ -1,5 +1,3 @@
-DIST xgc-1.0.5.tar.bz2 188307 BLAKE2B 8e3906ee07898c1382c692d3ccb7541de40be55dbc88c0ed40ab3e78a638c6e475bf38f3a34d626507d34270208cc59cb7bdf727869c9907a00fca6280b5b39e SHA512 5943d13b9e0ed5e1b66d26eaa4b39d16d71f0df23e3ea93bfc397b6303516b161c2b60b24679ed75b640bf2493e66682d35efc7cedd41c5b57caa65f309a8314
 DIST xgc-1.0.6.tar.xz 177228 BLAKE2B 3277463250f472ac3dcecbd4a723d59a5485c7ddd8df585ec2c80dd94e63ac1c462644cd57a15065c398c725bf558e0e948796dc0ae44ff65dd49b750fb391be SHA512 f449b9b2d313aeba1fe9bf33fef90291776403f1fdf4afc507c4b973045c97fc8ded65ddec4f8c58727e7e4c7c4ad6a65ae79581eb4bdfe9c79a5f909dbc0a1f
-EBUILD xgc-1.0.5.ebuild 284 BLAKE2B 9900bb11a8031b0d264101b94c471a687ac80e2cfb076dfb2240282ff2e75683260a538850b208d13b4d5ec31abba3bc560bdb5b987c6ac811953441ed9ce2c5 SHA512 20480f920022099036d88aef0503348674dd3343958c1a0e6d843ef697a90d580b5cc0f7b0b898c3da34e9b4712bf56585f08ff87319da288a2b653bf45f3449
 EBUILD xgc-1.0.6.ebuild 329 BLAKE2B f541d6b4b45d68e9fb8a6dd8754fd0a4cdbf6b3144b5a8cf9a01bd1f668c0a97230f9eb690f6c4094f742bd258d5524d1107774e7f158548bf9c8151cac013ee SHA512 875a769acd5eb290fe64a3115b9fce5d7b4560c539a0cb3d2f1934e036b0996f6f02b2a2fe0760ab6d09ac6e9fe7edc215eaad2112bb496bf871933fdd8000dc
 MISC metadata.xml 334 BLAKE2B 8227ce2611baa3baf275bd4235d3201758bc24834511e3641845c692241630f69b3da64258030a25c67f124b683d49668f8595d9b53f4644e6f3610d8a0572f1 SHA512 a7016e57975ad009d45ad6de0edffa558f737f7ae3ba13a587f5e8fe569b8bafec874a9376339b0336906b6e6fdbfd7bf225c879749891cf57097742ff6f8eea
diff --git a/x11-apps/xgc/xgc-1.0.5.ebuild b/x11-apps/xgc/xgc-1.0.5.ebuild
deleted file mode 100644
index ccb06e5e8d79..000000000000
--- a/x11-apps/xgc/xgc-1.0.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X graphics demo"
-
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xisxwayland/Manifest b/x11-apps/xisxwayland/Manifest
index 0110a45b6822..2ec51ea82868 100644
--- a/x11-apps/xisxwayland/Manifest
+++ b/x11-apps/xisxwayland/Manifest
@@ -1,6 +1,4 @@
-DIST xisxwayland-1.tar.xz 4168 BLAKE2B a8e4a658427f5b03e3d05b25772c4f136c13be47a68619a6beab3db72a70e836e495fcbc8a19d5f9347f3336a1dc9b353f483fb75e47ebfdbb9b8409e63444f0 SHA512 9514442313cff4df0c71fed445ba0e3fe52f3c84ebbec81725a590f68cc42ea01ac96b23736a0108fe206da3aee48434c5c30d1c58905bfc75db35205c288bca
 DIST xisxwayland-2.tar.xz 5220 BLAKE2B 47bd626ad2cbeb5b0e114a4f603858c82f4f870f16de038bcadd3010f90e140fb8a3b0531e4102da7527c49bcc6bae6039aa6b42c6182da80467d5a3f040b817 SHA512 b89e19c85a5cd7e62a52e22772f80f03bfea069e31412ca11ac38174c4a2994be559e9d5fb49e6d1921b3f1b06ee71b50ede48990a1e7804a96207b08fc7827f
-EBUILD xisxwayland-1.ebuild 657 BLAKE2B 65944553932a15bf773973fabe34c678792a16e9a2fc34dc30bb2badedbbffb125ec608c64c25c276ad907187e324e609d328ae4bf7a46e99746450c6888d984 SHA512 0ee7a3b984ce49d10bb3c5c4df0a1f7c4f53f9aa9a38149f36d4684baefba0e96533b1158b05abf88939faab6b4011b71836298f88ffc223b01a00dac16055ba
 EBUILD xisxwayland-2.ebuild 661 BLAKE2B 1990f4d4c829ffb120c0e9569aeba483b7219f995510435e937916d239c0d8f1ce0cf36269aeb435c86827c1bd018672f9c5363ac3222be30d0999388857aff5 SHA512 cad417e156f38b595593ca102e77e5908d96e3b7434e14aa0de6d7e9055f6acd878ee89ed8b3204ebacf46aab52a34fef0b0c6f082771a0810e5ff93b890b924
 EBUILD xisxwayland-9999.ebuild 662 BLAKE2B 635fcfe4558cb05792fc914001592ea832245db9e5d1edb540160ca07cdd6a31b282f04b92d42e0bb633112cdfccccecb78424ddd20fc1af21443a064a84abcd SHA512 59b4d65e59ac2476d165837473c1f467c94ac4ea30e142f788ec071c83240832a806e065b479d7a3ca79f0f1fd25a17988fd6f9695e36a478192a534f2385a7e
 MISC metadata.xml 342 BLAKE2B 22542ce434659a09b234891625d25ab44fb54fb27fc81950a9682ae3250c9b2826c6387460111227f8295ebfe5207a8f7ccb60b80ad79e96c47bfe5ae132170f SHA512 401c20493181e036e7117caa4562c0cf8075b17e1ee384b5e5d6d22a301d6e901fd0936a2cd1f52b50b79e2932f80ceb1a9fd47fc6ede220ce37c9bb2d50aeec
diff --git a/x11-apps/xisxwayland/xisxwayland-1.ebuild b/x11-apps/xisxwayland/xisxwayland-1.ebuild
deleted file mode 100644
index 804cb52d3fb4..000000000000
--- a/x11-apps/xisxwayland/xisxwayland-1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/app/${PN}.git"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-DESCRIPTION="Tool to determine whether the X server in use is Xwayland"
-HOMEPAGE="https://gitlab.freedesktop.org/xorg/app/xisxwayland"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="amd64"
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/app/${P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xkbprint/Manifest b/x11-apps/xkbprint/Manifest
index 83a7b6fa0149..a061da100990 100644
--- a/x11-apps/xkbprint/Manifest
+++ b/x11-apps/xkbprint/Manifest
@@ -1,5 +1,3 @@
-DIST xkbprint-1.0.5.tar.bz2 166856 BLAKE2B 99d375e88a871ff440ebed587b01961a6e2fa196a28c267dbaa6cdd10bacdc99767f12032411eb8448e8a2f7c6792c2f7b6f428d208a9263f94b4c959d2a0431 SHA512 ac3870352f3a595b5b8a8cb64f39e9bea81b17572c73cfbf72482477a2f576d0ffcdcf735cb3c66b8a88a7fe0f7aece6738cbac87df5641e44fae1ab9b97111f
 DIST xkbprint-1.0.6.tar.xz 156920 BLAKE2B 88a62e3138e0d68df4cdd335f82734037649acbd951ef5997382216f7472560b2ad6e4cd0790e4260baba9864754b54b4a7cb9c42444f44caffef92aae392b40 SHA512 a1c2401b2a2ef4c6bd2efc18923ecb176adcf38b6c5dfdce25f22f1f5ab21e25f494b25dac25b1765fb9a0f6acc24d191cd41b9a098a9e3c6eaf9a9df490be29
-EBUILD xkbprint-1.0.5.ebuild 341 BLAKE2B d21d39d6cb05f4222f80473f010164e340487e80e9defe0f4dea30b20a2165aebdfc4ab19f44321b041f5f73b367bb0c2608848d0ada83763e767b28fd52d864 SHA512 6b40b3b2baf05a46f74c6920af5dfbe3d4e5346fe40e6294b9894812942d135e3e9b3b6e1a6b0c6d5b06b10ca0650c0875f07deec3cbfc5992e7bf3e7d691393
 EBUILD xkbprint-1.0.6.ebuild 360 BLAKE2B e6612ed30a7042d3d22d6ee5003202b9bee5593241332a26be48dfb6f84b5e7f4bd387968f192742d696eed43216d87e0ea40fe5c4c9f6f9f8782183f93786d1 SHA512 79eff253ed8a1720336ae998a63d833a1077fac6e498473fb8d85bfdb4a3086ba002dcd32a603e96690229bcffbc981ea455d9160880fa51bfdb1b8448553bb1
 MISC metadata.xml 339 BLAKE2B b4471ac13275ceb75150f72b824061f25431023c0b782e6390cc2e714c9d642cb5e758adab4efc23b650f165d606e39c4516945e8ac404d95c9e7487d67f931f SHA512 fea33866702190c4f038e6f46ad52e0ca07bf92d910204a2aa847c188e6a5aaebf8c73bb1ccde195382fd6d08852a103ef16027225faee81d48e8705a17d1e4a
diff --git a/x11-apps/xkbprint/xkbprint-1.0.5.ebuild b/x11-apps/xkbprint/xkbprint-1.0.5.ebuild
deleted file mode 100644
index 32c7fe52c495..000000000000
--- a/x11-apps/xkbprint/xkbprint-1.0.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="Print an XKB keyboard description"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libxkbfile
-	>=x11-libs/libX11-1.6.9"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index 6d0b55b29017..c11bc1cb0454 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,3 +1,5 @@
 DIST xrandr-1.5.1.tar.xz 171200 BLAKE2B 69cc080da24b8d00fcf60e9fb2d4c03d7b80b46d18888fa726ad4ba5847fcfcea4abeefa298fb833febe0549aec0636ed9087c8ef065f5166df6bd7f270dac1a SHA512 3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922
+DIST xrandr-1.5.2.tar.xz 174012 BLAKE2B 7c4afea6b8bc4361bde2565e930db98abb925b51d717e23c3ec95853aacf58b465f8c858652b8eebd7b0fdb289b4da4ab9235e571f61c8f77e4818efcb12de07 SHA512 b536e8f1e04094894aa52ae496725c58691b043860b3327c41d737b07b642a939733321b62f698032b11ba857208a6177600a3ca3295ff1be6ade4341cdc2747
 EBUILD xrandr-1.5.1.ebuild 539 BLAKE2B 5773bca54f849c30697d2ce4095b54ddbba938163888399107d1655453be463558b251c203628570848442f5beded1103f8481b0b9aa2b542d6a80a9a181b3b1 SHA512 2f4403ba2d7f44f7c1c638874d7d58945aab39b5010059710c4a2d5784cff52577341b7a90ff01869aca6ec96de3967b362573aa2485b9e3835e6ca37297784e
+EBUILD xrandr-1.5.2.ebuild 546 BLAKE2B 66800e7f8d453eb1da3b40524d80e58444860dadccd4abcd67a2e1f3b123f84224a4c6ee55e3a4c0234f1a23b99007c25740567d9f8869b17999dfc5fdf10e30 SHA512 9dc6f9e7e9385fe819f63a6b41c4ccdd393feebf40fbb678c6611e6dbbf9c005a4c7701436ea89da369790559f8390f2aefcad36e105496bf30ac8c8b451cfcd
 MISC metadata.xml 337 BLAKE2B 3003fb3f334179c653f32ef2a864a609df08a585981e15adb49cb63209530479c22c0ed5c5e62e64d3647b25b57e28af7a41d948af012ed450ad1afd6be23374 SHA512 e51bf78854aaa4634a164f04408ccc202983e118f987cb90469feefefe51ee4671ba9b3a329b71ab6806022c0e6beb32ff27c7ee35682945a3bb8fd1a40636c2
diff --git a/x11-apps/xrandr/xrandr-1.5.2.ebuild b/x11-apps/xrandr/xrandr-1.5.2.ebuild
new file mode 100644
index 000000000000..6588b0e6070d
--- /dev/null
+++ b/x11-apps/xrandr/xrandr-1.5.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+XORG_TARBALL_SUFFIX="xz"
+
+inherit xorg-3
+
+DESCRIPTION="primitive command line interface to RandR extension"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrandr-1.5
+	x11-libs/libXrender
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_install() {
+	xorg-3_src_install
+	rm -f "${ED}"/usr/bin/xkeystone || die
+}
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index 039c4699e3b2..b72f6c4cf7f6 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,3 +1,5 @@
 DIST xset-1.2.4.tar.bz2 145546 BLAKE2B df4ae52046af7f632e2f60386bd3b8d90b27db3e53ceb68f1056c9c5df2ee9c6d83d109a444eb99ddc031e35b91db0249ee56eba3180bc9a8a002935db213605 SHA512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
+DIST xset-1.2.5.tar.xz 138776 BLAKE2B 81d93de0bd2a5f0d76937109a8f16f5e1d5074ec5209ea373d9f4b3f5064ac15a9e3c9cdc850cbe6103469fcdfc4d69df033ce7bbf80e22b507d3664e49911a9 SHA512 12b53d7cd6b7ccf6515c03f68151490fce6b2629e99b8d85ac5d760f4ed93394a457213c3947533809fbbb04acd1ed260aeea1256099a10397660eef3088150d
 EBUILD xset-1.2.4-r1.ebuild 498 BLAKE2B dee38daaff7090a63edb987d7bbc021d8da1dce560e0b25dbffe2ae932aabd794e37801d7326c784af7670aa41a29ca9b01c3019f5277b0140eece6dd42724dc SHA512 c73867c040b67947dc07be89cb97dc5e07f3a80add6db92c7d5e1d8bdb359a31aa77b7678cde728d80d39e4f05441fda64c9c85060abe04bbbb5f09c5f29f33d
+EBUILD xset-1.2.5.ebuild 529 BLAKE2B a81d4e0e596d5aa8d56ea17234098755408fb3fdcbafdb7d44c1820d35162a5cd135fcd44ce44359701dbc0485d3f1c12eda7d75acc0257ba34a67372a6cd503 SHA512 3565d1e74e6d485f3159ed192df3a94eebd6302fa4e93bd1d3aaf542288c5a917a70029fffa63d94d5cb0d72eeb8e0d645ed045a26ade30125b5873142703bf8
 MISC metadata.xml 335 BLAKE2B 0357932e52392a9db9b83a4bf85461087dd73b63f05a382d473c52b4cefa20b0bae168d199518efa8aa09784a80842921b1159b28382ceb7214ee7fee2aeead2 SHA512 5a6e4a1ea4c8361c182e8be913921351f624930a50995ff82c1d101df72a2dee496a06494c3251faed6bab41c2af0e9d3a0e032f87ab4128746a0a52d0a4732d
diff --git a/x11-apps/xset/xset-1.2.5.ebuild b/x11-apps/xset/xset-1.2.5.ebuild
new file mode 100644
index 000000000000..bd6ac94cdc11
--- /dev/null
+++ b/x11-apps/xset/xset-1.2.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org xset application"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+XORG_CONFIGURE_OPTIONS=(
+	--without-xf86misc
+	--without-fontcache
+)
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index 3b32cf8b32cd..b9e5d6404807 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,5 +1,3 @@
-DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
 DIST xsetroot-1.1.3.tar.xz 123200 BLAKE2B 807c927c8c055877ad83af7559d897daa34f86a9ff70250997cc933065bb24ecb88fac01a62edb59a9c497630dbe351eccedb1f324668153dad67bcb461dd7a9 SHA512 f333d1bfd92bb943044da36331ae2cf68a811c8f3891719d9ebc1749e2dd0c67068f86face0794c3c4ae584c4dd189bad4998dccb38fe1ac37a8921e5713e7c0
-EBUILD xsetroot-1.1.2-r1.ebuild 420 BLAKE2B e0f7615fafa6b7a153fe6a94dd934ecce2249c67cc4271f34baaab721588aafdf1be1390b94f08ae5e645002ed8ef0e4196aed55c65b1cab3ab0b74b6067c2a9 SHA512 56c121de543e73c04717306607233a6a717970725cd6d62a9fd758528094b3b7bebe9a46e1f1491aae5dac3cacc840762cc4201a4fb1e664574527023f678d9a
 EBUILD xsetroot-1.1.3.ebuild 445 BLAKE2B 506402246f3bdc2bdbde02a4f0b6ec8e7a7025f19441dcbc066aae9d4176d5fd5c01576b375a7e724e76dd90c9f8a7c5d083b7a7e6cd750c86b43c62d7f5a566 SHA512 c45e28b167b206399d522ce51991d69b4f4e8660490ceb4e594828556cb7428d657278058bfc3cd71530e05992a598a7ea41a5380564d2abe7c03418d74e5af4
 MISC metadata.xml 339 BLAKE2B 56f6030268da9a408d503b75be7f6bec93ecacc5900cdc3effdfd456c2dcad9f6f5942830694c52aa82cb0e6784818d83ee067600b191cc37a7edac3786a92f3 SHA512 abf3560395a5de920a6dad35390023cdd5f98c63aa0efc3faad2322a63428c9c82623b50cff01b0f33b68ceed63816c894d7ef5a48a0c71191a9011354e91100
diff --git a/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild b/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
deleted file mode 100644
index 1e975ad11dd8..000000000000
--- a/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org xsetroot application"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXmu
-	x11-misc/xbitmaps"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xstdcmap/Manifest b/x11-apps/xstdcmap/Manifest
index 3f30ea9fe958..3e83cbe7c465 100644
--- a/x11-apps/xstdcmap/Manifest
+++ b/x11-apps/xstdcmap/Manifest
@@ -1,3 +1,5 @@
 DIST xstdcmap-1.0.4.tar.bz2 126269 BLAKE2B 5c2fccbc374871738ae03d722a045cc3ffd6bc431774d76525653e70c5ddb9a4281b2372996ff492807f9d4aee414eac1016f2696ea4e1979407a5b7cf37e1b5 SHA512 2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f
+DIST xstdcmap-1.0.5.tar.xz 120796 BLAKE2B 0b36b787ba6f69f944598ae3d94418cf7775e22279070db9471738709639ca3552d985525d05c750399d29e1b58a152da0d37be8bff3479a05265e45d85bf554 SHA512 3f2047af1d328a34d38ededc13de00298db3300eab1d1dbdff7d2aa4a3cd543a79305bfbd2e6424c5e023cf866a4f7a70aa9a3014444d543268d2f812a322a49
 EBUILD xstdcmap-1.0.4.ebuild 302 BLAKE2B 15a03780278eb9af6b3a77193db49c20f048546bbea905be08122486ca8af141998855700750474d2382e84b5d4334ccb590e49816dd52824d51986e57891006 SHA512 039ba92d34171f7d8c269636e50d9ab3c26004c35a8ade26e286349af106bf27ee87c0d38f3ad06a6cb7f79bbb48e7430a3b331df6d12b696b6e86762c8823b9
+EBUILD xstdcmap-1.0.5.ebuild 346 BLAKE2B f1a6928fb85f3eb9824384901bec7420d0a0a8527b3136be101aa7825f9f0ddeaf7d4ddfe3c80a9e8fc0a88a9708939fb40a318c75c6fe1aeec2d8236b4a4dd1 SHA512 dfa293168bf9959323894a6aa884187194252fb51ea9f7293a15eebab01f259018621ee9f037f3dbdbfaf347c90151653067a13590c99c12f83e9c1699a03e03
 MISC metadata.xml 339 BLAKE2B f26dc73fbaa175ceb478adcb596265c742db7b21996b4a7ca19ec6dea9a71c42de14574b7805c1f63e848208cf9afc4efda2ea0efb86db1356fbd742f5d06ffb SHA512 2dbdeaf1c60d66f0aafe578fd8b9c32aed6dfbb513c7312af0df5e23770ddf8041434023952b0df99c3f41dabf1dee82198d59473387bc70d1c0d13ae3851b27
diff --git a/x11-apps/xstdcmap/xstdcmap-1.0.5.ebuild b/x11-apps/xstdcmap/xstdcmap-1.0.5.ebuild
new file mode 100644
index 000000000000..231c6c848861
--- /dev/null
+++ b/x11-apps/xstdcmap/xstdcmap-1.0.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X standard colormap utility"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xvinfo/Manifest b/x11-apps/xvinfo/Manifest
index 898e0da1c34a..4b0114249fd2 100644
--- a/x11-apps/xvinfo/Manifest
+++ b/x11-apps/xvinfo/Manifest
@@ -1,3 +1,5 @@
 DIST xvinfo-1.1.4.tar.bz2 126503 BLAKE2B 54a1e08913cd51cfeaced1c704834e0348d02cfb2e606f2cbb103acfdf649595a77680364bfb5bbe684a15c743d2d18b6031e77150d0e9fb0d3405d474accc3c SHA512 85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e
+DIST xvinfo-1.1.5.tar.xz 120700 BLAKE2B 37ee9a5df13e47535fbef51878e9b0da7cd6cef378f7e69810beefb5aceb15e279a930313edff43a901eed9cb8750bb33e2ca4a3e7cdc25895630253efcc63a0 SHA512 18467161b248c68f6bde15e1c1b4b8cf812daf46777602558aee5fb7cb4d2649218de88fa93842fea4f316d954440f03a37d71fa4fda92eda3c7d80970e19cbb
 EBUILD xvinfo-1.1.4.ebuild 348 BLAKE2B 460e39f0b110420a75d2660ed07a4fc7be890beeba8c503dbd3d63de9f874ad5cb9b2e164eb3f0b20af352529224ee2f78133e4fec5642ac7d3f343f1d69281e SHA512 c7940d5d1ee16283cb742392a3795dd76da876f766b889e0af0e17112d20fb5c1d75622b9544112b73abb6b84c216946a0ad93103546da241eac0b0aaea2c59e
+EBUILD xvinfo-1.1.5.ebuild 392 BLAKE2B 66cf78e0c226a9ff40ab2d02a6f753413b775fe0c706e19f3b2842108599677504cc4a2602678271b8348227829c3301a0c443ede1c14628ef4dc521487ab146 SHA512 7ddc7e732e09b2740bead9c2b97c6c02eb3f974f45ef77688e83e54b0599693e0e913e4c2bae73a6ee5084471fc9624da4c1eecbb4543b2aef888f45ee60f4de
 MISC metadata.xml 337 BLAKE2B a8de915c2860cc9f715c08a44e4c8f969c5d2cc2f722faabc259e69b95048d61ebf6d08f6cd57f836ab65aa2ec2d5af3e7865d6396b1e225408d73f43543ef9c SHA512 76f875225a492741190e51f99d980c6fe7a4e3220b971ef0f46553e07c545778af94a45dd1fb86ab454d06b414b194e39ea852f6ffc6be519ad0917de2918ddb
diff --git a/x11-apps/xvinfo/xvinfo-1.1.5.ebuild b/x11-apps/xvinfo/xvinfo-1.1.5.ebuild
new file mode 100644
index 000000000000..faa2af05699b
--- /dev/null
+++ b/x11-apps/xvinfo/xvinfo-1.1.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="Print out X-Video extension adaptor information"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libXv
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 48cf8baacf8f..30799629c866 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 6611454b17ef..3261c6cbcd45 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,6 +1,4 @@
-DIST xorgproto-2022.1.tar.gz 1107316 BLAKE2B b7c60d77978f95b62208c5c5974c7310a9b6197c8b14218ba319eb44660f20c5eb33ef106beccae16f79a0530a20bd38b6aa2de81329c4b48a2da285ab903c31 SHA512 e34404eb9f7edfebdecbf38c66491fbca91929c59b5762d3266b2808cdae3f4e65589001d29bf5374effc56173a5467f5a107bf4fe05acae69839b841e83f72c
 DIST xorgproto-2022.2.tar.xz 757080 BLAKE2B 0fee7910fced83548780fd1c7bfd214c932c7c5064c6ebd40ac9285d071837056b9eca24dadb53a572a05768f8762c4dd81ac58fcf6b43028f557ed56a98f7f9 SHA512 8e6108110600d076a94cc6d0e465b2e9adfbbe8d7e6b75fae9c5262d99dc6074ab1ed561a74d6d451f00f5b7af9f507a6317be9c0770efeed9e60b64beb7a1c9
-EBUILD xorg-proto-2022.1.ebuild 1185 BLAKE2B 7b495eaa17baf2c49837b6113a5a304549269e7a424e7878925831b982f4e092358e6524181ffa6058e80b5dced4624b3d7a084700ba48430def4ad01d6d719b SHA512 5a81ee8c4a7af16ddf9bf5b84247487f7b78a9eb31d97369c9b2640a1e5f3f572dee40cbc12fc92372be638106e517a2d57159120e21cb51bb96e5dd43aac907
 EBUILD xorg-proto-2022.2.ebuild 1185 BLAKE2B f01d78b1d73148f011975ea83edc41c738bf049efd6af80245ba5b496513b88268e45537d2746702c831e5758caa4ac062730080929340baffbbe1d88dd64225 SHA512 907fb82964919eb7d898b4a0ebf0955bbf57123f10ccec1c1659ff1cd788fec78695a1c7340319eaea24c362b7ed9969af4144e1a195639eeb0b5c42883fc722
 EBUILD xorg-proto-9999.ebuild 1204 BLAKE2B a0a87857280db4120afdbf323969ae6b1b62a8d2a351f785384e31cb7164b8893a7d69874893b685a04ec57facb35b040ba710796ade194032bf4bb72f785ce8 SHA512 de7d5b0e82334295d2be5fadbbc04311705ca6df160b3b3fc198e5e22f212d7eb3093b94b64ffe10943d441e5ce7892875f131e32413e4b70c235e28add37d76
 MISC metadata.xml 342 BLAKE2B 86fa6d992d56d65a60c04ece61c97dcdd3cb0807dd7d895d907d83fe78427df05b15b5924d7b96a38164003e11a7de78470829c72238acfa35473d2f536b5363 SHA512 03783fc18d1dc17283ec540947907d98ecae2c6cb4350701d1976350aa39e1784d91e698fbb0d672d9be50c53ad9aa8e3d0e14ddc24d495654768709d8675826
diff --git a/x11-base/xorg-proto/xorg-proto-2022.1.ebuild b/x11-base/xorg-proto/xorg-proto-2022.1.ebuild
deleted file mode 100644
index cc92a19d2a28..000000000000
--- a/x11-base/xorg-proto/xorg-proto-2022.1.ebuild
+++ /dev/null
@@ -1,53 +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} )
-
-MY_PN="${PN/xorg-/xorg}"
-MY_P="${MY_PN}-${PV}"
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson python-any-r1
-
-DESCRIPTION="X.Org combined protocol headers"
-HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_install() {
-	meson_src_install
-
-	mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die
-}
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 6cbb5da95410..a6455ab7dd3e 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,10 +1,6 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
-DIST xwayland-22.1.3.tar.xz 1272440 BLAKE2B 5f35d6675ee90d910ed39921b4590e7a5325f941238c69b09d6b7063bcded992d1e4425327ae4626e8e9cead7dc17b4d892642a1a3bdb3a4de797f8f733202c4 SHA512 be15cb398f9a8aad70352d09b0745c827d4766d5996e817b92c828b5ede27b10186c7ee319901abdc5e141da97170a3ace039269146461d4e2ceb5002a7c35b4
-DIST xwayland-22.1.4.tar.xz 1273552 BLAKE2B c492968f335ebd5b194d91729476047760b85620366fc587cace5f1cdef8cb22576293fb3799eedfe4a9c1eeff78dd18abaead67422caeb04b1ceb419509fbc6 SHA512 a1301df1687ac276172565c98b1fb3d5f35f67d47f625b81fce485d1818cf4896f88c2750b4e93596fa6f7fd515e258d201ca3d0cc39943b576f2d2c3f9be8cd
 DIST xwayland-22.1.5.tar.xz 1273444 BLAKE2B a6773f2b9655d0651a0a686f5e1fa41bdeaba998dc3e42c2c24dcc262d2affdb055c7ab0cf32b94ba11c82cbfe91bfcf10eb651f678feda95fccb55cc21d2e4f SHA512 806219692be297419777ad5343158f72473a691f7c8be4468fac185a3bc5e3b6811755de3133c12f3694480e51529ac3fa409b22640a80a233925716fec24c06
-EBUILD xwayland-22.1.3.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839
-EBUILD xwayland-22.1.4.ebuild 2154 BLAKE2B e76ecab4126e3bd7a4f37633ab56773759de72653e2d04ed8a58c278720770d38efac5dba2ae53acbbf560d3b3494de34d0dc4a32370bde9daa03fce940645ab SHA512 3216ab44000ff2bda753586a506251a3ec7ba3320497d347a3888f7638ba93622abec5ad03b7951a88915bc7ecc53afd67eef8c6d9192d10c35a1c4d24454924
 EBUILD xwayland-22.1.5.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839
 EBUILD xwayland-9999.ebuild 2221 BLAKE2B 79ebcf371891bcf3000095f61b53459279b78e1461e6ce361532452f6d20a5f5a204d1c366fe5cdd36093d40237932866d08a62edfca2aa7b82960285d1360f2 SHA512 67fad119e1bef87751bdb1ebff8d349e122875a9940bd2557d93ce2db99209d663e9f3c74486775d6cb9258d692642bc9472344e5bf4063d34ceb8ea6fe9456a
 MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
diff --git a/x11-base/xwayland/xwayland-22.1.3.ebuild b/x11-base/xwayland/xwayland-22.1.3.ebuild
deleted file mode 100644
index afcd2774aad0..000000000000
--- a/x11-base/xwayland/xwayland-22.1.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	>=dev-libs/wayland-protocols-1.22
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-base/xwayland/xwayland-22.1.4.ebuild b/x11-base/xwayland/xwayland-22.1.4.ebuild
deleted file mode 100644
index 384312c2aa5c..000000000000
--- a/x11-base/xwayland/xwayland-22.1.4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	>=dev-libs/wayland-protocols-1.22
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 50859f766791..04d90de591d4 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-vmmouse/Manifest b/x11-drivers/xf86-input-vmmouse/Manifest
index 08bb50b295ca..b936484dcc38 100644
--- a/x11-drivers/xf86-input-vmmouse/Manifest
+++ b/x11-drivers/xf86-input-vmmouse/Manifest
@@ -1,6 +1,4 @@
-DIST xf86-input-vmmouse-13.1.0.tar.bz2 319188 BLAKE2B dddcee47a0d667555ba8a85a4a86c9f922a68ff716f836ac38bb0dbc643011debfbbd2d2054bb8df2f04cc94f2da95cfff7b0ccfb30879e07ca571a9b3aa840a SHA512 38e09c5d7da971eb25ed79fc2daac3b8e1f5e6ec1096424696652c975ea653ed4a49d7779e7735d81a512c12c0a30829d5443ca78a275f3181ebd1740dd2dfd4
 DIST xf86-input-vmmouse-13.2.0.tar.xz 284684 BLAKE2B a63caa3959b47ee4b43dd4e90e7b68706fc39da2d4018965112218c372b4107cbbcebb19fae8fea05a7c95c86a4a793b414ff6cd49e1391fbce04341b7a9eb9c SHA512 26a01347a679db058abdc7cbd9a363bb4fccd1a727dc18e279d15b8a0dce71f67af5ff54df28b908391da8d2fc311d8c1813f26dcded4e9a2668db7b55ca5687
-EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 567 BLAKE2B 452739edaf39b5794a4d4eb301d09b033f1dea53b0d2ff6068d6be063983df7dd94d570ff1ea9308024c3694ea356824c94d7c03c7d6a6156e2ae46e56b72a6f SHA512 dc8f159983ef6ae0ba06152a52fedb5ee53608d80b42d48f26edfecc1e1aa6f20edd68702538080c4d309f7a6bdaa399944b86c40aa099ee98315639b628ae61
 EBUILD xf86-input-vmmouse-13.2.0.ebuild 591 BLAKE2B 996c3535c2b5f61f470299704a7ee77d61e9eb552f5d125935339588ef778295c931ecfdbc4378cc4cd2a80d1528859a08489d86aa297f46339d3528573272a3 SHA512 5b10b9b2ecd468dfa98b5b8dc12ad9af6c7a3759967753867a1bc5f4f51714e259ba592ea92150a67156986531797ed341ab4af3e611c6876a1f3d3bdbd01af2
 EBUILD xf86-input-vmmouse-9999.ebuild 569 BLAKE2B d10e2679e2991969744610ddce72d11b667496c4c6416e42ffe238d33f3b8f5f8a44f3005f309a78dfd20cab89bddaefd82c8fd8d24d5a69585463905f050fc9 SHA512 d636fae99cfa1e4c2015215bee24188d0f4043a865fe037b7cd416290650fc150a765bc551691bdec98e900d4ea221e4acd57c326123e8ab50ab1695fad0a856
 MISC metadata.xml 352 BLAKE2B 4d53cab0dd8b53840a59e6f6d2ecfbc56d7759346c3daec4d0c4b1c3ff36d2442aa2e08b9e051a356142e2cffc1acc5bd70264a96223699d0080496f64b70405 SHA512 917fa2af528fc5c6081bb63e8c142cbc907c210e9bef41a48c3152604e6ed8aeb4cf9f3b6cbe416cccdb73dcb660e70444f93d7784594d9024d3752a512a1ee7
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
deleted file mode 100644
index c531152cd25f..000000000000
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev xorg-3
-
-DESCRIPTION="VMWare mouse input driver"
-
-KEYWORDS="amd64 x86"
-
-DEPEND="x11-base/xorg-proto"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--with-hal-bin-dir=/punt
-		--with-hal-callouts-dir=/punt
-		--with-hal-fdi-dir=/punt
-		--with-udev-rules-dir=$(get_udevdir)/rules.d
-	)
-	xorg-3_src_configure
-}
-
-src_install() {
-	xorg-3_src_install
-	rm -r "${ED}"/punt || die
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/x11-drivers/xf86-input-void/Manifest b/x11-drivers/xf86-input-void/Manifest
index 707f14e9c6fe..83354cf73c4b 100644
--- a/x11-drivers/xf86-input-void/Manifest
+++ b/x11-drivers/xf86-input-void/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-void-1.4.1.tar.bz2 271597 BLAKE2B c78d829dfc9aed788fc2e527f796c697546dfa9687189f5f36043fb017515307303d1bc419458e909107fdb30f6f534e9086e86708d4b8bf2447ed941d223011 SHA512 3cbcba9510635fc4a3b610fb940584417d4b3fcace88670b1289906a7da15614e9a286590cecd1840af4bb3bd0c62f246522b1203700067ec384c3cc11b7e94a
 DIST xf86-input-void-1.4.2.tar.xz 257888 BLAKE2B 864ef551c09af5a9726094d3ce7e1a0d948e0a06d23784270a43e81c4b8904b3bb1abb0e1d9efa59d9c445dcc2be7515c45d956c2e669e2e0d7ccad23c10f30b SHA512 f266494bd0ab62d2e20048d5557cb4724cc704be06b7f04f55970aad070887ca8940341c4a4929bb48a46b4d040e03c4d09ce3ae85b94ce23c70faf28486005d
-EBUILD xf86-input-void-1.4.1.ebuild 324 BLAKE2B b9c5f0ada2c4fbdc5a3db207b5b35d966b2c5fcda697a44650890bff87ff0c67a45c5af2f0ad0e1303da31881ddc156053463170fb6dacd60f121bcd13123eac SHA512 32bb6adad975b983b0c953f14b515b6e7d9644f08a5127cfbb28f276b2a04766aa3cf69b745ea705814c8ad78c5beb5a7764f9f80e936d03e1f5b3ac5dd0f8de
 EBUILD xf86-input-void-1.4.2.ebuild 350 BLAKE2B 6107bc2ab9c1700304cec6ec808251ad624b21ac3e217e01119841ea714044193eec89a14801ba0a8e039ad72ef2d3bc2cf7ddd580a6e4424c313546abecb8f0 SHA512 0b2c0c3cd214076fc154975cc77da6430c526b82aa33f1bd2b0e4d35794c4da0ad21fc32c37d3f81fb71e602bfe01cc98646343a725034dfc192b2cb9b2dd34b
 MISC metadata.xml 349 BLAKE2B dc72b7a2d45385cafd33536becbd94b8b46e74a3d3120a9041c771552c79e02cfc33ac511faff1915750470ffa13225fe886805e8dc17c92990b426e74f1639c SHA512 b58b32e319f3e1c523cffd920398c5effbdac8dc115d04f62d3ffbab2eca90adbcccecdaf6011c2ef325397a92cfc4547868a3f8a7aa81404b8129f9f1e44f48
diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
deleted file mode 100644
index d6b4daf361d6..000000000000
--- a/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="null input driver"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="x11-base/xorg-server"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 65f1121e02a5..154bd3599875 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index bfcfcf6a438f..4c60c124f84d 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,8 +1,3 @@
-AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
 DIST gdk-pixbuf-2.42.10.tar.xz 6519776 BLAKE2B b6bec388b70a971ea5b336001920fdf433bcbc539d54e62c7b6198e968f0bd3560ef9adc94215b64b01e7d5db69c95d5a1d32654b38b051fceb75e93666b3385 SHA512 ad64963b61ef8cc84ae450328ec8c90a852f974e29ffdd42263ed32de47af93c058f3ffdf91c5d6e9bba815f4e8e8fe5a19422ac1bfb079666339814ac059b3a
-DIST gdk-pixbuf-2.42.8.tar.xz 8503020 BLAKE2B 39960043c5aa980f311d2705c868c170c90c7b580ac9ae849a3fdfc6a5faffcc24be23b82ca8fefb1cd5c28d2a02bfb87b1c5c5d1eab7b897f5e551a57577f7c SHA512 994a1374becec6235d347f4980afcc8b85f43ac373e4d7e00b7445880d0a51932e63b54429b28ab5af09e7c4437f9d6008e1c25b2d44a2c9ef7cc9821b478387
-DIST gdk-pixbuf-2.42.9.tar.xz 6596068 BLAKE2B f464a6b326aee185b30b24f66267ad7eacd12e8b3bd07e7cebfb42a496791561cdd71cd937282d72f1fc55ee1e86b531f7e737a2dd00f2187d705865be177919 SHA512 032869c98d22cc4add05198baec5a64d29af247a99a084d7c498f82f467fb2a2008a8d0d4564ee5d963f6965dc9b3ff61b6c07377f67fec70ddf14e5373abfb3
 EBUILD gdk-pixbuf-2.42.10.ebuild 2672 BLAKE2B c060df034f0bb78ee777df4f0126968b1a06d7341ee8f9f96b5457941e3a373a6b9dac78c1067da30be472aed10391bf2574342016eb5ac23e6c71ec5011d8d4 SHA512 b3406584b5330a8f01fa6d12b31129ff941fde9c13f9c2219eca0cb6a0cbd79e01abc56400ab9f950b3e2de3643453ad1f59091bdee341602d9511297043bed2
-EBUILD gdk-pixbuf-2.42.8.ebuild 3459 BLAKE2B 76c75c89dbaf850cb2943962ccf72eaab6c2ebb5bd78f4f3f214f64be80adf41f3204167aa2e6ce2be2cfb46d5917d50676f0a3ee54320956b914786cfc8e5dd SHA512 293bf38a0ca34fd3c9669e56631e0823aca22fd48308f94961c7acb32de7d7670d7302b43f486d3f93c49a86190a3fcc2df942342dc2d27d108103bbd732cf6b
-EBUILD gdk-pixbuf-2.42.9.ebuild 2801 BLAKE2B affdad5c20e4106b9e21c61b697f524f3f5e4a849db5e5a564339fd18faefe9e0055394900f1dfa5650ee320a2a157c340b34df7352e0fd27827d5970b46bb5b SHA512 58138905a87ac0d673d37585bd52cbdbf55c868ed327bda4025a09888b65048a3836d507b4316d3ee46ec94b1d8f717809dcc875ca273b37b5505e84f2b5166f
 MISC metadata.xml 413 BLAKE2B ef1599cbeba0cb882a3c2f3b1783ce2dbd965e86106c85531033d609d4535108522454c17b6384a458d723d9c8751c3880896a3f67cf09add1e4649db36adc16 SHA512 3527aab03be85d82f776f1a05887a69cf91c803692dd88d848d3a3878d41e9acce6b2294dd64eb9756b9b450893e542d62fc80b7544823a70e7573533c3b0a39
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch
deleted file mode 100644
index 77ea7e75521e..000000000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 21b8eb73d9272e06707ad6d0357f3034b8d9a46f Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Wed, 14 Oct 2015 16:18:19 -0400
-Subject: [PATCH] tests/pixbuf-lowmem.c: Do not run pixbuf-lowmem test on
- uClibc
-
-pixbuf-lowmem.c depends on GNU libc internals and does not build
-on musl or uClibc.  Commit e1fd25a fixes this issue for musl by
-testing if __GLIBC__ is set.  However, uClibc sets __GLIBC__ and
-so this check is insufficient there.  We expand the check so that
-we run pixbuf-lowmem on glibc, while avoiding it on both musl and
-uClibc.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
- tests/pixbuf-lowmem.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c
-index 9e9571f..ec7504f 100644
---- a/tests/pixbuf-lowmem.c
-+++ b/tests/pixbuf-lowmem.c
-@@ -24,7 +24,7 @@
- #include <time.h>
- #include <string.h>
- 
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- #define PRETEND_MEM_SIZE (16 * 1024 * 1024)
- #define REMAINING_MEM_SIZE 100000
- 
--- 
-2.4.9
-
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild
deleted file mode 100644
index b4f614c7b16c..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson-multilib multilib xdg
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk-doc +introspection jpeg tiff"
-
-# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
-DEPEND="
-	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	!<x11-libs/gtk+-2.90.4:3
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/glib:2
-	dev-libs/libxslt
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
-)
-
-PATCHES=(
-	# Do not run lowmem test on uclibc
-	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
-	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# This will avoid polluting the pkg-config file with versioned libpng,
-	# which is causing problems with libpng14 -> libpng15 upgrade
-	# See upstream bug #667068
-	# First check that the pattern is present, to catch upstream changes on bumps,
-	# because sed doesn't return failure code if it doesn't do any replacements
-	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng12', 'libpng13', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
-	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng12', 'libpng13', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng12', 'libpng13', 'libpng10' \]/" -i meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dpng=enabled
-		$(meson_feature tiff)
-		$(meson_feature jpeg)
-		-Dbuiltin_loaders=png,jpeg
-		-Drelocatable=false
-		#native_windows_loaders
-		-Dinstalled_tests=false
-		-Dgio_sniffing=true
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_feature introspection)
-		$(meson_native_true man)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/gdk-pixbuf "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/gdk-pixdata "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make sure loaders.cache belongs to gdk-pixbuf alone
-		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
-		if [[ -e ${EROOT}/${cache} ]]; then
-			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-
-	multilib_foreach_abi multilib_pkg_preinst
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
-	fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.9.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.9.ebuild
deleted file mode 100644
index 7f32ba6a4b85..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.9.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson-multilib multilib xdg
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk-doc +introspection jpeg test tiff"
-RESTRICT="!test? ( test )"
-
-# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
-DEPEND="
-	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
-	jpeg? ( media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/glib:2
-	dev-libs/libxslt
-	dev-python/docutils
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# dev-python/docutils installs rst2man.py, not rst2man
-	sed -i -e "s/'rst2man'/'rst2man.py'/" docs/meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dpng=enabled
-		$(meson_feature tiff)
-		$(meson_feature jpeg)
-		-Dbuiltin_loaders=png,jpeg
-		-Drelocatable=false
-		#native_windows_loaders
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Dgio_sniffing=true
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_feature introspection)
-		$(meson_native_true man)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/gdk-pixbuf "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/gdk-pixdata "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make sure loaders.cache belongs to gdk-pixbuf alone
-		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
-		if [[ -e ${EROOT}/${cache} ]]; then
-			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-
-	multilib_foreach_abi multilib_pkg_preinst
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
-	fi
-}
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 5b02dac2fabe..d24069cf2be5 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,5 +1,3 @@
-DIST goffice-0.10.52.tar.xz 2436944 BLAKE2B 13c2d28cd9bd081d4636325e3df14193d5ffad913f4f9fa78251d848f293eeca5ee265058b2c9662b5bd48957b39f31714eb41469f3228359dba1923f918bea5 SHA512 8636bdfd436a0b5853aead6ecf09ae39c5059b2d9044cf04c9f2e0f4d2572aaa07e51cfd123b0dd153877d1c0d5f4af78a031d63b03c724bf1e8282d2e1cc841
 DIST goffice-0.10.53.tar.xz 2442336 BLAKE2B 8fda50c5d9f8223c082ea9f03334313b051bce47d18b3879c2d8a7c2bbce753f468b5135f0a3c49c54b8a695ee6f1dc355dc806c92e77f41f2d0c64b2bc30bf0 SHA512 cd2d0f49f803cb2f01b3a690bfbe3ea4be5c09e00e8ef643055f56c16549529b7c2c098b87286062d3a5048c1f64d600f74082f53710d8ed8cbb34cb6829dafd
-EBUILD goffice-0.10.52-r1.ebuild 1429 BLAKE2B 9f34e672561a8d776a16c4dcf47eab567f2f09152c886183760f6e2f4257d12bcb2c5f9d1877a867c85c512c72eeff497aa79f5a369f7653bb25b9529191c0c8 SHA512 9d89656ae9e638d96d6fe341cd1d7bc1f8dd65da85d5220234e84c349e3b43810e9ef2e5a8c74bcd4cd1170d016a630ef6855310ddb3ae4a2f60b602e9179b5c
 EBUILD goffice-0.10.53-r1.ebuild 1429 BLAKE2B 9f34e672561a8d776a16c4dcf47eab567f2f09152c886183760f6e2f4257d12bcb2c5f9d1877a867c85c512c72eeff497aa79f5a369f7653bb25b9529191c0c8 SHA512 9d89656ae9e638d96d6fe341cd1d7bc1f8dd65da85d5220234e84c349e3b43810e9ef2e5a8c74bcd4cd1170d016a630ef6855310ddb3ae4a2f60b602e9179b5c
 MISC metadata.xml 653 BLAKE2B 5dcfe5914dc4466682862c4171d1d54f8547a8bab5794bf1e95c709e84d52e4aced8c7376674d85937d424766205f317de0de199595fbca15c817b6c3c4a3b25 SHA512 49d62e1f37f3d50f9e3d9ad50c69da19289cf1aac03afdfaa2f472c77e9277c76d81f59b26f2a84ce42e690341a3a26854814f0ca125b4f05a55670cc260e715
diff --git a/x11-libs/goffice/goffice-0.10.52-r1.ebuild b/x11-libs/goffice/goffice-0.10.52-r1.ebuild
deleted file mode 100644
index 3d6aaaec16b0..000000000000
--- a/x11-libs/goffice/goffice-0.10.52-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org libtool
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="+introspection"
-
-# FIXME: add lasem to tree
-RDEPEND="
-	>=app-text/libspectre-0.2.6:=
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libxml2-2.4.12:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.22:2
-	>=gnome-extra/libgsf-1.14.24:=[introspection?]
-	>=x11-libs/cairo-1.10:=[svg(+)]
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/pango-1.24:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	introspection? (
-		>=dev-libs/gobject-introspection-1:=
-		>=gnome-extra/libgsf-1.14.23:=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35
-	virtual/perl-Compress-Raw-Zlib
-	virtual/perl-Getopt-Long
-	virtual/perl-IO-Compress
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--without-lasem \
-		--with-gtk \
-		--with-config-backend=gsettings \
-		$(use_enable introspection)
-}
-
-src_install() {
-	default
-	dodoc MAINTAINERS
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index 5ea5cabda626..17de3b36b17c 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1,5 +1,3 @@
-DIST libFS-1.0.8.tar.bz2 347880 BLAKE2B 74f9079f4ac98ad8cc83e73a162f4e308c49b643dc11ab6d68d36afe5f70b9326023fafb7a17ab14a083bbda20f99d6e140bf85facc4a3177d356b7c5dd6e126 SHA512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f
 DIST libFS-1.0.9.tar.xz 287416 BLAKE2B b4425ab4ce1c9e4e0c283419231e2966f462a6c9225ff8bd056b5ec41c7a6a96e35bd2edd47ce6bfad87040c6042f19619f32f8f045262da5609af5c55b03fe4 SHA512 7d012e62736c6d567931bad982eec221199d296f0fe41e1e7fde5575b8b928e9a8c644aa8746242bdfe72393635320b58774d9a519285765bd26d633588092b8
-EBUILD libFS-1.0.8.ebuild 393 BLAKE2B c626c506df5346d77d67f4f86644e9b3e98cfac0bae7721e1156f38ce9e84fca65a707760ef6f69d2c8192baa9bb5acd70119879f139acf26b15d40fa2d73018 SHA512 809f22b13acc18d2a296b2462b9530e64979dcb19639740df7343abf5963b472a344927b860a2ccdcd74d86c259b388737ca25f20ec882e9d21b60c02d0dcb08
 EBUILD libFS-1.0.9.ebuild 401 BLAKE2B 8cbb7b868580ad33bc9136dba1d63d2bdfa59f052f4de8c3b70ad679970c0220777c5deb4653b65a4971e9c1be1e93f3dd1ecdf26475bb86db5a9be1415f7f7c SHA512 f2941f1f394049e3b16b4b06d011233eda2c51944a9eee43293526609e880dbbce3e666fcb76ec028f91a45310575405d62454e1435fbe85c16771ff4ab9fb8a
 MISC metadata.xml 336 BLAKE2B 63758b2250f1678012f938bfb7826c03e447991e3aba5c233e16df68dbaae033b1f14d77833c85238efe0eedd90314f5e8b2e1cfcac824bd5a034e7e575f244f SHA512 f2b85263c274822c779720160b79a4c243896f7169c9aa88181ed805c3f5808cd48aec07eeb0e2faedfb1b3ef467846243e2cfec925e8eeafb58f6d228a3aac1
diff --git a/x11-libs/libFS/libFS-1.0.8.ebuild b/x11-libs/libFS/libFS-1.0.8.ebuild
deleted file mode 100644
index fcc892130f92..000000000000
--- a/x11-libs/libFS/libFS-1.0.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org FS library"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="ipv6"
-
-DEPEND="
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index e86faa936ea1..e084ac610151 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,3 +1,5 @@
 DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
+DIST libICE-1.1.0.tar.xz 335864 BLAKE2B c18ae08d61632d6a495b479045cafadaabb556fc55d5107b8b6c323cc7523a153d083a89016e2a84aa810735c542ba7bac7fa70620036b74125f65bdf920c40d SHA512 bf8ca11a20bc120337003a8ef1c190e26e3650dede653287aae7893abd8c72191401d90ddc4bb9b367ae832eee23a22d02b0d4a3b9071c392f865379034b2838
 EBUILD libICE-1.0.10-r1.ebuild 705 BLAKE2B ec84151d3792e185d97aee46735e9702f5396623b1ecb184b6efd125f534e2420686570e7e7153f1f52cebd90f45ee7551b749107ca5f9980995d6f9fe3d5d37 SHA512 5400d1d21ac457b08b33c0b78104fe2e1d4563465803853c119b412c33b7dabd8010f68a2f30ea2e0b532e8a82f8472bbad9cd7d0164d9e89fe37b5c44da11d0
+EBUILD libICE-1.1.0.ebuild 699 BLAKE2B 8a4aed4393d107ba69e7d7b23a81999e9176acc168aa283133454bbedb6fb841df39241649aff8197e2e29877b8331c644a4500221ade297ff55e1872937503e SHA512 2362caae0fde4fcd8ebb5696cd7ec44da8122282bd165b0d8dd49c49870bc082be4f9643d916ed4b8b15c27b118ec0b890264db76aa0df6a83f0f8f77ec1479c
 MISC metadata.xml 337 BLAKE2B c895594110c07848bd58cf4a28df82dbdc5f26671689386a667afd32f3925d4b401887d992282416213be51536ee4d24fd00c0f85d52c98eb71d66854209055b SHA512 2718c47a51ba70e9622bd3bf5e6d987fa2f57d122e25aa972f71585ddf3dbdb8bf34eaa0492846e6230d951f8d557948e1d7e3f54ee27765b63e8f9f2e6fe604
diff --git a/x11-libs/libICE/libICE-1.1.0.ebuild b/x11-libs/libICE/libICE-1.1.0.ebuild
new file mode 100644
index 000000000000..4166e1d11bec
--- /dev/null
+++ b/x11-libs/libICE/libICE-1.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_MULTILIB=yes
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org Inter-Client Exchange library"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+DEPEND="x11-base/xorg-proto
+	x11-libs/xtrans"
+RDEPEND="${DEPEND}
+	elibc_glibc? (
+		|| ( >=sys-libs/glibc-2.36 dev-libs/libbsd[${MULTILIB_USEDEP}] )
+	)
+"
+
+XORG_CONFIGURE_OPTIONS=(
+	--enable-ipv6
+	--disable-docs
+	--disable-specs
+	--without-fop
+)
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 084c0f14899a..e3051147e777 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,5 +1,3 @@
 DIST libXau-1.0.10.tar.xz 271724 BLAKE2B 391296f1a59ab6cf93323bbd6e297c88ace6bc769eaed1d9ed3047ac8ab49498c7e9022708597e071da342fc3581de37f347d1049dce9c80c3191a89e2f147c1 SHA512 e56a862a7bbccb108c9683eeb8b643d2587a121dd96982e1e7edc5bd0b676302d244bfaa750afc7fb2ad31df8b825095d779b6e2ab2c76f94e47095d90071ebb
-DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
 EBUILD libXau-1.0.10.ebuild 484 BLAKE2B 7db594594fcf1d8634aed71a0378c90ea89c1aa7b9e5a845075ee563239773c5efc0b858650fddf1dbb5a810dc94027d6d912eafe90cdd4f566bea8be9aea70b SHA512 3ff6b92b19efe828022d19c3dacac4ba77d38559dad70bfbc2cea1df857dd3655f065c75b89f0a465538a0b77f0e8897dd9ec2912c2ba4890f272809ef9a4c57
-EBUILD libXau-1.0.9-r1.ebuild 459 BLAKE2B 93aee0f1328b9bf949277e691222d056b04de66629524356f708b7fbaf1de0ab4e43b0cce11598a9eae63bb38292c192c1b6c32360ffb0299ad35cebf4bc7f5b SHA512 0a517b4aaeb3336b921efcb2e87d0d25384e2f81cd38e84b6a03833aff32cbb4786593a016aebed6987a86fbdd4beb79c2a23d98b12c1805018fe3e133221330
 MISC metadata.xml 337 BLAKE2B bccad5dd3ea84c6ca278438b94fbfc3e94b65b1808a5004c71c10023c774528084e5afd9e17bc852d2e0b8cc966539d02985ba4485e05e92c7b404277250e50c SHA512 8c81a02a3f99267055e0d044a99b3add40e6737236718e1d5cca35b21b417295a4eae9405c6becd7b42792bb1e387c44bf9c3c31f163f8414da265ff21f41904
diff --git a/x11-libs/libXau/libXau-1.0.9-r1.ebuild b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
deleted file mode 100644
index b369a281fc0c..000000000000
--- a/x11-libs/libXau/libXau-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org X authorization library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 99fd1102ab49..b8e3684a55fc 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -1,5 +1,3 @@
-DIST libXaw3d-1.6.3.tar.bz2 561594 BLAKE2B 85f3fb6d39a9a0ccb7d2c529eff84a4a9e85bf81be16487f2119da0a670e40c2d328e17b06ca237f69029e8d43daf6eeba8488029e6e4d2f56bc1093a2f305ad SHA512 f79f997ff8442563c74f38c7d76fab2c9253691743ca3143047ce698adb4c126d02dc968be7bdc79ab3052b785fd705375d2f01171e3a3266736beb531c91424
 DIST libXaw3d-1.6.4.tar.xz 482168 BLAKE2B a1e2e66ef4c5d102523080beae903b21b9b6bd0a5e4bd1e685bbfc4e1eaa3dc594f65f357d027f93808fd34d7e05ed8631fe33b6849760fc1fcc919c8b85d526 SHA512 388e905871a823d0f87fbc29e9ea2de95ac13ccaf50e031a01602d8d388d61bcf1823b4ded8c1a06bdce382e8ddcbc1b0182ccef00cde8064b09176163283dba
-EBUILD libXaw3d-1.6.3.ebuild 759 BLAKE2B 2568551275ff66404d60a0e348ea5cf356883d15b300df8adbdc071bcd4574e5deff3ca7600dc5ce10a66f8e70be5fcd4f6f0c13d1bd0e147c229d3ec22ae8d9 SHA512 0dacdd31f3523332bf3ccb8c8d632c4cc6206da2e4055263999aab865215ad24892783f948d9f007ef8e7f980430ec874cb17029c8f43c6dbf9940bcab8d5125
 EBUILD libXaw3d-1.6.4.ebuild 763 BLAKE2B bf842e8576b3f3e3dc6d004ac6980e0a5bb3d22090bbd193a13aa7509670880517017cc358cb947af48e36485a95863a262a97f39e1ce1950fc1e3308d163461 SHA512 d3d61b60c14238f6c1d2bf9974ed639e1d02a1d750409e2323f389b020436ed9aa1e8dcc96c874231e0b2fbc0f87c2665908543faed93749ab0468beaf756fb8
 MISC metadata.xml 339 BLAKE2B 60635a05848869d4aba7783f45cb02a672045a8a9b1bed933f1587ecd0ab81aa32ecc63e8a6742b4eee50a14c3e32b17b6bf14b3797e5f11e0dd74a8b582b4bf SHA512 1ed17cca85445b70786acfd900c7a75eb765001e7218e576356ef76d3e9e6399df3a45413f4650e555d2404d0c9e5f0f20f814c1bc1d08e1e8138aedbacfe50d
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
deleted file mode 100644
index 36f5efb6e7d2..000000000000
--- a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org Xaw3d library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="unicode xpm"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="
-	sys-devel/flex
-	app-alternatives/yacc"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable unicode internationalization)
-		$(use_enable xpm multiplane-bitmaps)
-		--enable-arrow-scrollbars
-		--enable-gray-stipples
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 89c4081ca923..6d07e2eae90b 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,5 +1,5 @@
 DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
 DIST libXdmcp-1.1.4.tar.xz 295184 BLAKE2B 9360125a98bb38175be488a815eeb559e432dc2d2f60545b11dc315777de27ad68d34df7e73b0b7c14e58eaa8d92bf5a4055184df95df08cfb39dd896acc9f02 SHA512 83b384d43bfb034c395f83f97d1c6e73aa3d5faa8f8756b08e697c0b9c3c87189651b51e8213fbd1f5f9cbc2d8136cbf143627481744345d78cfe0ff2ad074a9
 EBUILD libXdmcp-1.1.3-r1.ebuild 696 BLAKE2B 6943d863478b2d1e4cfba163e8973fc4796e64408c2dab29f41529482f94de12fbf62743caaed4e2e6ebe69f087aab91d3ddd1239a23ac7e52c83b935e2de2a8 SHA512 a5dae45dc67bd0aef5ae538862732226a47e9a03b72c660347fe2cf0662eaeb8e1ff0c0041ac53bd2fa3147501c977f5f44728193a948920f238f59e5d567221
-EBUILD libXdmcp-1.1.4.ebuild 729 BLAKE2B 0c89f34c7d7fafa4b923522b308705091a7a848aa804d2e6c464953f40fd936a711dfedf1fd2d4cf92fd39a16d1012ded17dee6cbdd2b0ef0c1136844518f5ee SHA512 451955eceb1d8bc59df70bd0b3689414ca389efac016a44d5e3de6f744f9eb8efd74cd8a1974bd9936902f93924bc278be5ce0d334c2d0f64ca887794209a9aa
+EBUILD libXdmcp-1.1.4-r1.ebuild 763 BLAKE2B f5a553a4a2f766610fc6a168a033d12f1b9358ca2ec8e4a1d2233b8eb71b1dbf196928d306f2f65af28c7e94626e7c3235d74e7b67b5d270dcb8e15a8a9cac53 SHA512 94c87c1c262ffc2ffe3b1cb4a6ad17086f11c716b639145d4ecee633760115780e33ab150c021ba99f920847d4038c9b2be841ac8267889443649376cad7e347
 MISC metadata.xml 399 BLAKE2B cc623f4c1293d011af9a0afaac1d5cdd0635f4db48b55c3f59070ee8ab14e96967afa925160680e8253b36654ff04d171db430ad90e5f13c72497d83fcd9408e SHA512 c5b696febaefea9d236c5f0a13502547350c87a410e57474574d3d2e463c9f07bbdad9a9c0994801dc96f25d2711702a8710f3112e96eb302ac46bc2602f7e96
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.4.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.4-r1.ebuild
index 8e7fa3f51ee9..dfb9f2e02d51 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.4.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.4-r1.ebuild
@@ -12,7 +12,10 @@ DESCRIPTION="X.Org X Display Manager Control Protocol library"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
-RDEPEND="elibc_glibc? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	elibc_glibc? (
+		|| ( >=sys-libs/glibc-2.36 dev-libs/libbsd[${MULTILIB_USEDEP}] )
+	)"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index f27908347b0c..3ec84fc0437b 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,5 +1,3 @@
-DIST libXext-1.3.4.tar.bz2 389114 BLAKE2B 941ebf63583a05f40063ec0d2350a40ccc656c6463e58a347489f7dcd8dc5ae5c3b24b561d74a0af2661c2e3c941bd4ffd90295273c248f22e52f23e8d7c0ec9 SHA512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a
 DIST libXext-1.3.5.tar.xz 340108 BLAKE2B 0041ef38ba363ff82105f4e626851d2ef7db35804ca80de84e5ed99d97b4f5dd9877b9a43f8690d9040fadc7ee075fca640752bcdde4f7be0e220c1a5e0058e8 SHA512 fd9805982dabfb14b1526c0cb71f94508003fa3fcd60560d387465afd891c1dca61927ae86278436d53f4b840cacd1f412071fdc3dce1d6f730610a9c163d59b
-EBUILD libXext-1.3.4.ebuild 660 BLAKE2B c2baba213eb3773be896f83953b9d05b24509c83fda354732da0cbf3e7a3deea73038f2e65e948ed4b9a506918ba715d84f4fe78c9acefef5b611165ed6e0922 SHA512 94d9f6e467e971741d8eaae4ad2987cf559e9db0977076fc98f07c9d30bb23602dbec3f552d3ac47054d10a8e25d55353be5eadaf7e3a9aaaa26c2a5a0cacf92
 EBUILD libXext-1.3.5.ebuild 683 BLAKE2B 73abbc6732a5a5371292634a3c417910ac9b5653458e78c1c8b4a14fa1dfc91ca7bc4f2ec67519967eea6ffaa917a029fc212172bac660b7ef323f2da0475ecd SHA512 58bc952189e64f420414cc913c94b0eb78d0110a1c5daee05b069a022919e00626037b02e536b83f4a693d22f42a00480002873ea9433635e5fe2e2a7cecdb3e
 MISC metadata.xml 338 BLAKE2B e957bc4dbc63892fdac35dbe1488c4e18f696adb7710ca4b0892f29043219dc12270fee2cd9a40e409ecc4ad9b5d6b738292a194a28e2a9b4c92cf8a4c3b32e1 SHA512 9b7112ebcf1981913c9596c1a5e05a4623833f2f4f2cd936b9ff0c277cddeec49aec35c4a44cb2aed4d737213d7ea0b363f64a8ffe44feae2623500def047ccc
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
deleted file mode 100644
index 8360b6d1928b..000000000000
--- a/x11-libs/libXext/libXext-1.3.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xext library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 4bae7c7ade69..8b2e0e0f0343 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,5 +1,3 @@
-DIST libXfont2-2.0.5.tar.bz2 524868 BLAKE2B 0b26d4c93452bcb3f5c740ac8984b9873a8241405d270e2d3fa5f440be820db417c9eff59c7a1a8c175513e40df70ada9c037d45c3a9ae2ccf62eb12f81c1d8f SHA512 64d0635d14676bb645d61932afb177eb3808a46525b26e7ee31abc975eca75207743e85523fdd82b08010ce124eb4802338b508ee7b126875d2a3c12f8ac4faa
 DIST libXfont2-2.0.6.tar.xz 446848 BLAKE2B 77e1fd0af5dae4f7d7cec5b9cbd20414df2c66699270ae46f81f6d21f6725b56bb0df9cea504a7a930084a4a759d7dcc3e204ab6c94dfcf0ff0006289f09a68d SHA512 24d6baeef8dc2ca2730925c6b790a97f4a3f46ea7b4d908555e7df29cee6e27b63d638b50c88dd30c853cecff7d9b079402cb617f4498f96410c5770b8815cbd
-EBUILD libXfont2-2.0.5.ebuild 826 BLAKE2B adba9366e26d8dc9746e31fe2a19dc9792df1acfa39b413e70bd1f5defecde31458243242efb16d60942d38344d1c039fa76ac1de40fd53fa8270c591b787449 SHA512 43c63a4f5fa23892a214393a97164729e8e07c62a1203ccd191073e2b36121180464869d84488ac7a21648f23f85fee6f58087d21faeb09dfa198588e2a1dace
 EBUILD libXfont2-2.0.6.ebuild 841 BLAKE2B 738ec8d01c53bfac03c78acf1a3b9cdaa7fc848d567beb8505d8d62c0db78ad7976c24fdf027e85f8a946ebd123901ebac4050aaa437139d03d036e5c9a62aef SHA512 257d91bf266168cdabe964efbac5729470cc8ad189cb735f8c66793bd1faa2fd503baf6613ba9d5230663775fbeba81fb2368ba3c7fc4cfb5ab2551c2a09ef79
 MISC metadata.xml 574 BLAKE2B 7dd74ab652b5e72d852ab5e826d9025c8a81d1eb475d7b936e87f5baf9a726275475cf1e016816165c4a12b124b3fa238b84093c29115b98fcfd196181a4ed11 SHA512 788a597733e4defd54b0a4667b9b83a04991b3519442d2cb180ca1eb775c76c3936be572820d84b1c8db568b59d1288cc03e362a68ccd1e544042acc8b7af550
diff --git a/x11-libs/libXfont2/libXfont2-2.0.5.ebuild b/x11-libs/libXfont2/libXfont2-2.0.5.ebuild
deleted file mode 100644
index 609463032ec1..000000000000
--- a/x11-libs/libXfont2/libXfont2-2.0.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_PACKAGE_NAME=libxfont
-XORG_DOC=doc
-inherit xorg-3
-
-DESCRIPTION="X.Org Xfont library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 ipv6 truetype"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/libbsd
-	x11-libs/libfontenc
-	bzip2? ( app-arch/bzip2 )
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc devel-docs)
-		$(use_with doc xmlto)
-		$(use_with bzip2)
-		$(use_enable truetype freetype)
-		--without-fop
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 1dfa117d64b1..b433446f37c2 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,5 +1,3 @@
-DIST libXft-2.3.4.tar.bz2 359088 BLAKE2B 37f8522ad744e99ae8372f4292017eed1f2c2a84169497441c3c12696cbb7b3cf33e04864b50433e46f8723cc6c6006226c743a0d491a3784baf3f21ea062399 SHA512 5bb019750982ed4643880efd7368bc226ad49cfa8c0c8c6d4614dfeed74f588c65e1ba69adcc12284ec07d841e5b58fc1c27f3fddf83fe1a2837b29dd9ecec51
 DIST libXft-2.3.6.tar.xz 304252 BLAKE2B 8a27bbbc2c8e8c89789ff5694da180dddc3c0dfb344fd5da33e311d093f1b3eee74caa357a48cbe81cf40c5acc1e42f6e91aadb6868e42782c288bf97e1bda33 SHA512 732f8c635fcac6010012ba8c10c23d2dd6ec79b0f096d6bcc9b7e36d2ca0817387faa7ee5bb6f43cff02adc68e4234c1b8f95021ebc548f61c492e0b76836d90
-EBUILD libXft-2.3.4.ebuild 718 BLAKE2B 043ca86642ccd0914675ea0a01a8976c4e872987192fdf126a5f0ef2673385befe419cea7ad344f7dcdb208aec8a809c3cd18366fb50417788e215ca85a01090 SHA512 6dc48a7c440655f0e383a92f758b12615aa953ed8b169c648eb377bb96cb7c747ce668832dd97c38c668af53045c0804989196f7bd350a032924844df26f2c8f
 EBUILD libXft-2.3.6.ebuild 743 BLAKE2B 800f5f2bd4ab225ef3340882069ea8bab00d9f7a5473890de3f5c6ea3b1576685d3a3b7556c7c4c393f75262cea9e1e9256e6f5ded64b4ff1c6761de710de303 SHA512 2d0a6a094b537af5b9751b1a0ad15955e8f6343e6712ca35543303cd9ca94f16919c11d6144e7de02fd01aa13a335391e99b62086aca9f6eaeebfc9c36e7f60c
 MISC metadata.xml 337 BLAKE2B fdbaff607a3822084f5c65042d10c95df36c061790f13afef59f55a6a5d324f9781ea39e2d0510292eabdd8e1c1088e4f0b960bcd68c5debab2b6b0df5303528 SHA512 aae7659a8f73d6e6722fff3ad19f61ad545e5a3b0c1512823812e0e0bef046ed7d7aad39446c9fb08d0de4d9570922ef4c4cd9b8ea474de3c3ac04d62a3d1db3
diff --git a/x11-libs/libXft/libXft-2.3.4.ebuild b/x11-libs/libXft/libXft-2.3.4.ebuild
deleted file mode 100644
index fba743a27448..000000000000
--- a/x11-libs/libXft/libXft-2.3.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xft library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc"
-
-RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
-	virtual/ttf-fonts
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index 2bcbe323b694..a9b168fa67c4 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,5 +1,3 @@
-DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14
 DIST libXinerama-1.1.5.tar.xz 260272 BLAKE2B fd51aad9c9d42634a246130a8ae0a155e34b67a2225b5f5a30b2bcebed0a9a98f19646625e9e423f0a9318a1358ad5251eb27a20eeb60eabc9ccd330ebdeba92 SHA512 735b5320de4782005b379e409bf2f976131c17d496b297d33a0e127ca1443034778586b6b25c077b2ad73a4ab34d440d7510475e0041f38202bb40f15fb08ff7
-EBUILD libXinerama-1.1.4-r1.ebuild 514 BLAKE2B d56e83a301b856fdffd5fa24116e3da2905e20738eff786f8111bc87a904081812b6064183b0d252702617d5df8320b1a6d42969ab0fcc4acd3ab079f8408bdc SHA512 2803c88a66a8879dd349bbe8983377ab490145298339b4d89d360bfc2aa7bdb250760b90bfab692022cdd86a384fc59226422594ca94ce8c5fa658f339486440
 EBUILD libXinerama-1.1.5.ebuild 541 BLAKE2B 22d9582efb0c79f0c880605bc0762dedeff157c758a9a51f4a6ea19d235d5eb0d4dff2f2346864d92106b171a15819d2e68a8ad0971e9a573ca3baebdce7e721 SHA512 425f98bb4f48ca0c1a9c2ad6467ef4da737144b9d2eb0395def838a0b26dcb1b4c59a491600f7e8615193af0bd09ad28ad812426cbc9e38d6d5da5c72ea8913f
 MISC metadata.xml 342 BLAKE2B 6c24aaa27568e06b0d2a5a8ad74449acf8f858010376f684a670a4fa183b9ad55bafe99f68930f9431e689719299437f5d725f116d32d2dabc85c7614bf63405 SHA512 7e4811d37aa49ed0bc020f677e73a292e43ad0db7efd2027cde9839bc6ca77eba21b1a80575accdc0938dc85fd779f22a7dc15ad5c059f36ee10c273ff88a559
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
deleted file mode 100644
index 8667d4155c22..000000000000
--- a/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xinerama library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 95a09274def1..5e9e899ae08c 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,5 +1,3 @@
-DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2d22a12cc30bc7f5528b004c1f73370d25b023b68772081f1c58b4813293971f8f08ca8f2b9508adb4c3925c94 SHA512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762
 DIST libXmu-1.1.4.tar.xz 349264 BLAKE2B fe78cd3f529402394c19842b31b2451da2b16dc768b5aac1d157feea0af06b04dbe2be879d17c7ccff08630c0bdab0abbb853bc5672340f55da0cd1412db9df6 SHA512 3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1
-EBUILD libXmu-1.1.3.ebuild 770 BLAKE2B b5ac9331167dfd10ed20674cec210b87bbf603ab6048baf9f47635a581b545137fed0f7183d1057e13b9d33230c0787fb7d2ac2f3b2a6e80b37f12ef891c49a2 SHA512 a1c7a3b8583c3b9a4bcb57642990cc355c881a84fce80eda0bebe9e5801c5d39da0bdcd2928f2c20c6dd9ee1807cee065e3857f1dbc3f22d4b21d9687c629a94
 EBUILD libXmu-1.1.4.ebuild 762 BLAKE2B 34fe8a443957fdc00382ae9eb04faf3f93b42ea4fe8294ba1ba8a88f256bdb3190bc33e01e62eef5495d3d386300fe73929a1476a4a7a2b21fbaf9824117f938 SHA512 32b213de6efe717e22bfea72dbaa17c8ee5d88e2a6cacff53d66f360eaa48a5ef63debb2dca5bfb457fd5ba7141b866cac42220f2baf5600771a806828011f81
 MISC metadata.xml 337 BLAKE2B b3db98afa249caf8d23a610701683c053a774b136ba51d685c87c3630710500bf1926bc93b7c793cf57e0041aee5219f25ec0ce8d0cef5e1387000853c62d272 SHA512 ffccc841608e1f4aaebb2a4bf72fae9f6893268b2497686f0b3037c2cea6b8e11555d6576cb3684d44735ef117e80bb1fcb32d758471e0d92df8257fd3dbc705
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
deleted file mode 100644
index be739ccc9b8b..000000000000
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xmu library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ipv6"
-
-RDEPEND="
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index ee02cc3befff..50a44ecbc32f 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -1,6 +1,3 @@
-AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cffbf33ccbf010d0517c9b697f576fbafd55c57aa2263ca93ad748c8d36c93834323ff9a78b1352b9003ba4b96c3a8b3f4acafae744b7e025bc9c SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4
-DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b
 DIST libXpresent-1.0.1.tar.xz 257136 BLAKE2B 22c66f595f8f42ed8a7bcf60c4ae5689e590e443d9e99785fc8747dabe7aa20031f303c72950c8fdd64b347776f84d17156d539cb83900d60a11dae3b6c21df8 SHA512 a4551f49a68f4487eb70dc5b50b7f745fbc8b6842cfa60422afe3834af41c504a37bcfddb4e7e9ee084b250df256034290776c8eb7d8838e392eb626fff55d25
-EBUILD libXpresent-1.0.0-r1.ebuild 613 BLAKE2B b5bd0e821c72f5ef6a08e4e20f623dbe3e3e6f15a6f5cc388fe198c1baef04a83c7360c62c46b3d5175521989f127de0a3bbde4662d080f579a175d6bfd92ece SHA512 2c83556a69460223df78b019a9002e60edf3050b023c2e90fb16708e392db9efb81459e9f3d08e83884a873024d435ee3e63e643d12af85186ac258797f4581e
 EBUILD libXpresent-1.0.1.ebuild 575 BLAKE2B ae377aef75c086eedb403aac84c9f3afb9e686951b55f640de4185f6a2e9041abe541b8758f0e0f7d9d2d3d9fc465a95722aeb1e071ae0378c364d3bdb7155b3 SHA512 e949ebfbd5f6a929043eae43ac9ceee1d72d92bbf0a73516defb2bdf869ab8c0a538a96b7894d82141a1592c8a58a298a3271d8e6520e5e6cff78436ef50eee5
 MISC metadata.xml 342 BLAKE2B af23e78e091dbf21e4c15d30aefa5af059e6ad211e296efd62d3718c8dc4131fa64a9175a9c915b860ade14d1a42cf4ab13f23cb3125980b5003ec1d4f4eb4a7 SHA512 03f60a6bdd8101b5b89c4784a654aff54be725d9479e9cf25426e0ddd67ea7d3b564d5893cfa9bfd80a8d561ce348247759284db197bc50d6a6e9da771466bc7
diff --git a/x11-libs/libXpresent/files/libXpresent-1.0.0-add-depends-to-pkgconfig.patch b/x11-libs/libXpresent/files/libXpresent-1.0.0-add-depends-to-pkgconfig.patch
deleted file mode 100644
index 1b5be70a4f3c..000000000000
--- a/x11-libs/libXpresent/files/libXpresent-1.0.0-add-depends-to-pkgconfig.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-[mattst88] Dropped configure.ac changes. ebuild depends on these.
-
-From dd6771cdf6f04cde37eb14891573c0e55be83241 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sun, 26 Apr 2015 17:53:15 +0200
-Subject: configure, xpresent.pc: require xext, xfixes and xrandr
-
-include/X11/extensions/Xpresent.h:#include <X11/extensions/Xfixes.h>
-include/X11/extensions/Xpresent.h:#include <X11/extensions/Xrandr.h>
-include/X11/extensions/Xpresent.h:#include <X11/extensions/sync.h>
-
-v2: also add requirement in xpresent.pc since we include those in our
-    public header
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
-
-diff --git a/xpresent.pc.in b/xpresent.pc.in
-index d5d0d38..8f6047a 100644
---- a/xpresent.pc.in
-+++ b/xpresent.pc.in
-@@ -7,6 +7,6 @@ Name: Xpresent
- Description: X Present  Library
- Version: @PACKAGE_VERSION@
- Requires: xproto presentproto >= @PRESENTEXT_VERSION@
--Requires.private: x11
-+Requires.private: x11 xext xfixes xrandr
- Cflags: -I${includedir}
- Libs: -L${libdir} -lXpresent
--- 
diff --git a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
deleted file mode 100644
index 25304ed45ad4..000000000000
--- a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X Present Extension C Library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-add-depends-to-pkgconfig.patch )
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index 8df50fa51392..35b38d71de67 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1,5 +1,3 @@
-DIST libXrender-0.9.10.tar.bz2 308318 BLAKE2B c9e250e16118a4878e7439fdb37549596abfd6a17f50e4e88242579fc285d0ef5b0c8d5d0fb592c7dbcd6e77c5fb284e6644e4edf9b12118cbfc0f179e274313 SHA512 16ea0cf638b32d7df54b270457ef8c9d9a80da27fa845b105b560cb31027b4c7fe799cf23d6b6bac492be5961264e96d7845d316a9af4de9ff38bf40885ea6fe
 DIST libXrender-0.9.11.tar.xz 302900 BLAKE2B b603118a02bc0bd64a98ac9820e6fd46a0613441b630d10aa8955c3a5e364c283f3d7323f7cd64e6c3a4c599409ae9d7c847751edc3250946342008abb66a015 SHA512 2327cc1b530382d81df29b8d579f801f1f990202107cc84506986bcf5d15010d414e9418987b200e3f222d188afce46f0d7754febcdca62a5fc1e541b3bb82de
-EBUILD libXrender-0.9.10-r2.ebuild 492 BLAKE2B 4d6168dbe0f0b42c8648c54dc17a984f11bd73681f03f84086def1cbbfafd86f548883a1b82a82432d04cb71dde7dc5a54948c70f9df6365a42aee12afd3998e SHA512 b320b7b5eaacc83ad59224f088e0d1aca8249adef7927baf169cfe3931482ae4b8c3af2504245b228477aa2647166e4aad57456e04806ff16fe2d1a2b46e6774
 EBUILD libXrender-0.9.11.ebuild 519 BLAKE2B 9810d94f33a05543430cdca6d5f5044cb0daba6509b5ed099df7f5bc07fd03bc6d4ed16a22ca210adf2a0f9cc6cdef79058b856e89d81ea7b0954fc0ea3b8f2e SHA512 99fdb3fcbf561436a9fa1015458ad43e5df0f06de777e7a5994578ee7be77f76097ccdc43d146214b28ca5a90cca9ef0ed4630338245b44e9c9500f295eaa1cc
 MISC metadata.xml 341 BLAKE2B 02c79694315c5ca33c90a8854cbf506addc7b69a68fe066f99a45c3fbe7764ebc69c03808215e056c2bd0f7b0261ec173d02a623e8c91c3a090b9ae77a1c83a8 SHA512 158a1a560ef016f8fd5c85a6dc65fae5ce9e960f65be43913a58a4218b2f24ef4cd925a490140f8463b206fb50d5c18243c9dc0ea56b0639f5ad9e5fbc0cb31c
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
deleted file mode 100644
index 74f8bf2bae66..000000000000
--- a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xrender library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index 85a2d3e69de2..a7f2a620ae29 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,5 +1,3 @@
-DIST libXtst-1.2.3.tar.bz2 321819 BLAKE2B 92a75d6ea9000fa7736093ce479d275c57a4a5bf849df2d6afae9478a53a07ba395013ba6676c2ea7dcb6a1f34475967ed6508b7c304b887f83ec44a611b8e6c SHA512 6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765
 DIST libXtst-1.2.4.tar.xz 287636 BLAKE2B 6c3e6154f221530158b8275ee638934c633f2e812333df0093a01663c416ded0b6be509578cca78d51c6b540ab17379e1e0503bf296abe3112f1afeda12e4af9 SHA512 f2f4e01239b892b8e26284cede90feb4fe7738beb243bca0f6adb349029f8bf87b5a482911edcd2401733c92ef78eec07fcd455b92e5b8c4828374769e60098d
-EBUILD libXtst-1.2.3-r2.ebuild 627 BLAKE2B e353486f424db1cb32ee99f072cf715d093a675d462d90e4052ecad45c8ff03e2ef34a4836f1c38c957b281cdda22621cd7fda1b988e98bf63742c969ce6af66 SHA512 5a1a8ba0b1f0fbf1bdea9d50c4c2ac4dadacfa90d60307aa6de383954aa5ae5a067b58e7c8d6107eaa97dc94dc89a762bb67fbc2942831a208b2a0fdfce8474a
 EBUILD libXtst-1.2.4.ebuild 652 BLAKE2B 54ebbd9b015702f66328380386c9b95c5e6a1d66156d6b723a52e0d367d49141b2845642392da394f40dd835703d6ed45e06bcd8eafe5d7f3248d3962c898ec9 SHA512 373aa3a71cb8d70caeb6e36148caa1ec91fcdfd90bffdca9dfe1837d79d6a8eb6f4b5ae93ee6d13fca04750517443bab0bb535775dfafc41c9a82073eb3a3ea6
 MISC metadata.xml 338 BLAKE2B 87a7a857c72d92a698c6ca2b9d6274b3a03edda1e5b4b84cb66f6c581f1ac428a7ad912c7c63ecc2554bda3c84fcaeeff108504237562499452934ef6ae4cf49 SHA512 6957dbdc6e6fe3186ff4ef7979cbf1f237ee942c1c6b3534b2833db2a799e765c244f1d6531f20d97011cb8901939dffc43e34d8f22ce4d977730fcff51f3e23
diff --git a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
deleted file mode 100644
index df0de07bcb8a..000000000000
--- a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 840b2af7b66c..64a68b013e30 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,5 +1,3 @@
-DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
 DIST libXxf86vm-1.1.5.tar.xz 265384 BLAKE2B 4e94267ad815cf47ec558959ca122d89b5f8b54ead2b2cb93dc3ef7f9bc694b515978a0b2301bb8e48d32bc768595b50cd8cb71e7a65c65a752699b80c2c079b SHA512 68226fcb9773a583ea417ab413146203dd7db6ff8a4d388285da972353355e11e179861a77c9fa284aefac025bb3bbf5a9537fa0bf246c782e0116a667c9d9b6
-EBUILD libXxf86vm-1.1.4-r2.ebuild 523 BLAKE2B 882d2297b0583b91984abec38afb1bdc324b3297d8efb9880558a83dcf97e4081d94e1b1f06339e41ff87345be06cc4b8edcc60aea85e86bc62bcc5f074496ac SHA512 b868dd8bcc9aa94298572190eb6bf6d9e4d3623fdb661a96d15da81381b88172c35f31e8b7e81c9dea6f6eaa0e5dbbb4a4a9031c94602a9736357689436667d9
 EBUILD libXxf86vm-1.1.5.ebuild 550 BLAKE2B cb2638689654e34e47e049e38bd8bf7b11e391388f6854fb7b9451bf8daa1bde5888a34b335f4cb0c6a9d29ee92490c1fc1c1eece6911c3c18e6ad7388649b2a SHA512 035a4e3bc6f768b4b8f4a95354f0f33460f1eaa688930802822dc650565156278c2c68ff1355d59116f5d3be9d634f875307d60f8aa8e256e0197c0413e7ad95
 MISC metadata.xml 341 BLAKE2B 0fde03018f6bd9fe5ab8a01f13387fce7e15707acbb3bc7fec3c9f444f0b374a4b388f786f5b0b1bf8cc84a5cbbd4655a4980a716a7d47db7ee9bf3347e9898a SHA512 34043e9c37357b1a6a1ac66f2c159e3393ed6c4ac0e3ffabf5ccbe48c85d7ee62e98c7d6a022685bf6b2f30a8886e386f402f4fbbdafca7343c828ca316bdc12
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
deleted file mode 100644
index 03723cd53adc..000000000000
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xxf86vm library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 80498261f123..86a8c13fefc7 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,8 +1,4 @@
-DIST libdrm-2.4.112.tar.xz 451872 BLAKE2B a41cbd714e169edd8c6bc6bba5cec8a7a703f553665575c35f43909e2927ed3c1652ddba25b98e63974f0734ca26e818e6ee75613159eb68ea85ba45934df393 SHA512 df8a207d9cce220ee2cf67877eda65394733fbfd0ff85fdbadb2b20ba9bacc41421b32452506c8caecddaf8361564ca68cd6c74d4faf3b1569ab30a3243e4340
-DIST libdrm-2.4.113.tar.xz 457064 BLAKE2B 30dab032f047a4bd3646b53c64c118d02855ee003025bb97b904f95101d2e945b0ed3d9ae00eb733f9a273afca3c18d10fa215b67c9c364a9819140a99d40115 SHA512 fca9834ce090f63ce6dc6d04491a2c5e86162fdddfc8ea70d55a6cdeb401be656388aae1577e58f463a78d8dc502be0a641908784819874e20bbec9a39a057e0
 DIST libdrm-2.4.114.tar.xz 471664 BLAKE2B d44d51311d2d33dd77f467c508448ac26e1561720535215eac5f834545eae2dd0a8842465bd78b8441cdf5f0931e9b51e000a4bdddd9b07a099ee6e88c99daee SHA512 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644
-EBUILD libdrm-2.4.112.ebuild 1946 BLAKE2B 331f6d44600bdeb4a397e6f7fe630d481eb02658279e391cb237e2e1bb5856c7ff87e4910ce65d9e6281abe76c402c0bc24c84dc22d53f7ac092f269d1d12d9f SHA512 f1e10b879303377ec4060565865a8b3cd342a26b49c4aabf28dacca835ae8baaa818783b40d5f6bce1db9afc7cf495484bf7e9c36d41990eebac70a2a7dbdc3d
-EBUILD libdrm-2.4.113.ebuild 2043 BLAKE2B cfdef7c119fc261d57730dc157fcf05aedb81e36cf98ba78ddfe368ae74aec136da38dd910b321955fefd7bfd6dd7bc18e5d6b732ad1583370fad2d35efb3fbd SHA512 caf7a1667a174ef2fa6855cc174dd3c4e4627c9c024239e2a7130bea5aeae84a90cffdaad19438898e5e58a3413613c3261b3bdb901aecb576fb0fa1b505967f
 EBUILD libdrm-2.4.114.ebuild 2035 BLAKE2B 79a5b6332da2666cc49001de9047c14785781614ae5166160a5a5545cd41f14a2bbfeff3c0b64bb5f97f5b9b704a057b4127d373b7a29d8239a15a615af31ccb SHA512 7ab8920f9c00b100b64bae207c8d167d8f088ca55288195485d1aadcc464e724d8fb2aaaa823604738506d980141be3bf39e2fb01016c57e9dc66cc39759c7b9
 EBUILD libdrm-9999.ebuild 2043 BLAKE2B cfdef7c119fc261d57730dc157fcf05aedb81e36cf98ba78ddfe368ae74aec136da38dd910b321955fefd7bfd6dd7bc18e5d6b732ad1583370fad2d35efb3fbd SHA512 caf7a1667a174ef2fa6855cc174dd3c4e4627c9c024239e2a7130bea5aeae84a90cffdaad19438898e5e58a3413613c3261b3bdb901aecb576fb0fa1b505967f
 MISC metadata.xml 413 BLAKE2B ffe1394ed3fb669c1ee0c1c0ebee429a80aac7dd3a3086316703784f991ef3a6e663c3c29a828bc75f53e9a35abd8bf84421dcde0765cb6f9ef7c473c4f2a7b5 SHA512 e5e802e47f115161f521ddaf0fda3196a43454f8d741de176676a1adce61dbf7db001491d79a466ab8b9e67f4b61e3803f0ce1a2c5f14ab84d51f746bee3e6ee
diff --git a/x11-libs/libdrm/libdrm-2.4.112.ebuild b/x11-libs/libdrm/libdrm-2.4.112.ebuild
deleted file mode 100644
index 4e431334b047..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.112.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{8..11} )
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} python-any-r1 meson-multilib
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
-
-python_check_deps() {
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		$(meson_use video_cards_amdgpu amdgpu)
-		$(meson_use video_cards_exynos exynos)
-		$(meson_use video_cards_freedreno freedreno)
-		$(meson_use video_cards_intel intel)
-		$(meson_use video_cards_nouveau nouveau)
-		$(meson_use video_cards_omap omap)
-		$(meson_use video_cards_radeon radeon)
-		$(meson_use video_cards_tegra tegra)
-		$(meson_use video_cards_vc4 vc4)
-		$(meson_use video_cards_vivante etnaviv)
-		$(meson_use video_cards_vmware vmwgfx)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.113.ebuild b/x11-libs/libdrm/libdrm-2.4.113.ebuild
deleted file mode 100644
index efae644e1d3b..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.113.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{8..11} )
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} python-any-r1 meson-multilib
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
-
-python_check_deps() {
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=disabled
-		$(meson_feature video_cards_amdgpu amdgpu)
-		$(meson_feature video_cards_exynos exynos)
-		$(meson_feature video_cards_freedreno freedreno)
-		$(meson_feature video_cards_intel intel)
-		$(meson_feature video_cards_nouveau nouveau)
-		$(meson_feature video_cards_omap omap)
-		$(meson_feature video_cards_radeon radeon)
-		$(meson_feature video_cards_tegra tegra)
-		$(meson_feature video_cards_vc4 vc4)
-		$(meson_feature video_cards_vivante etnaviv)
-		$(meson_feature video_cards_vmware vmwgfx)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dtests=false # Tests are restricted
-	)
-	meson_src_configure
-}
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 166ce88c0f84..397426c49d2f 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,5 +1,3 @@
-DIST libfontenc-1.1.4.tar.bz2 320492 BLAKE2B 34da17e220789f5078e870329390c0e3ee665598db3432ef5a33e78d1db4b12460c7467bcbcc1dad67e9f6ade0173f9fad915a2fbbee51f0be23feedc242e7bd SHA512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582
 DIST libfontenc-1.1.6.tar.xz 272520 BLAKE2B ccfe4f9524655862e2e5ceed8edccd7da8ec1872b3a8166803540b69fe4f42f1b5b6f2128a00b702368f9009e1bb1edcec5d28c36815abd6d591dc9fc46cd291 SHA512 524247caf035e5d69280575c79ec5a3259c4cd0a4afa375b01985fedf800b42ecd75102e38f85cdce5591d020d361ffa9390adcb7906e939df289e5131088683
-EBUILD libfontenc-1.1.4.ebuild 523 BLAKE2B 0407b0dc7bf0cf4296158378e6fff9d632e25b9b99f4fd4ecf6217701288877547d47c7339980443a9c35de76161dc51088707124def05da1ccc5d0cdfcd27db SHA512 9dce3b3f5d9f717a6ea73537cb27e516b6266af937ec8e468cd046b60631068fec4501277872b9d9e63c340c7551987c4641c68c3ee2fddeaf13f598d4f81164
 EBUILD libfontenc-1.1.6.ebuild 540 BLAKE2B d7a9a68c2e53f687d626f17aeb401f3568c389073c878fec0ea5962d19ca502fb5c4e3512053a1b5f584c3c60dc7a5f4687c336235db714bf4852c3191def02b SHA512 8d419e99814129452573aad90c58a4b7a91e61b302314ffb6512bc53dce4d16de3dea19647662784b82b461a52333c3b4a0a473aee2d2852eed9c74cdfb1344d
 MISC metadata.xml 341 BLAKE2B 8eef39a5f51bea7f961c5605b9bf18c25ecc2a3937f3610275212ef0d6e99903102e7f9cd16c632b7bc22f4968cb259f63470e1e4594eec09752d3985538a3ec SHA512 4c3d24add9b54f986acaa2aceb12df8e59571d0df7370a4fba731d89618d4bfe443fb766f3305f45d46164fe7d465ec65bfe7b617b22e5151f075f8b133a04dc
diff --git a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
deleted file mode 100644
index f330039add95..000000000000
--- a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org fontenc library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
-)
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 15c143eb714b..f44af12ec5f1 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,5 +1,3 @@
-DIST libpciaccess-0.16.tar.bz2 366603 BLAKE2B aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad SHA512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1
 DIST libpciaccess-0.17.tar.xz 331768 BLAKE2B 41539b3d6385fe7c42b562c7602f87b07730bbbeea7d65d3cc8e5af974ed5f9985b0779d51891493dd241a36bb171a3744e3b1f3fd30bee8a19bb5bd785f4c5f SHA512 8484605c66ef18c8d8a3e029a6d33e26fcaa450c1263790d89ac8b0a160ffb2dfceaa6140ac9ad7d8087283ecbec8ac801f757e44890d547c3cbecd2c922ca47
-EBUILD libpciaccess-0.16-r1.ebuild 806 BLAKE2B d04d81707315e16c5b2e5d6fa03b58ee943df4c5b1fdb83e52daac51eab9ad8db6d9920e170a6cf209cf64f3e9411ce07579e1a24c3c078332b26154e17a1126 SHA512 c9c8a66de9c2d3b3bb7156573ab86f54d54603361e1da0ed8dad188c9e582a10bc7d2ec19f172c3ef30a05b5af6e710f3857f34e3d440a3d28d80201c13cfeef
 EBUILD libpciaccess-0.17.ebuild 709 BLAKE2B 779c55305a8a2bb73899291d8299df720751ebcaad90cc90ea8c50c52a10e57bb7d05bc540131dd31c1a49143797b931c57566a78393af0f77c620371350662f SHA512 98448d8ffd67aead1d2a1edb84922ed98d9ebc8c77c448273ce4d315a834d2a44aaf3ad346770699db85e44fbe572118e8779eeb4f32c1b3e85504dd72d2af57
 MISC metadata.xml 343 BLAKE2B 841587af1693a1a28bc87d7785e79805abf10ea86b5b2bc117b786f005eb18c2d4369a6b7668c7ae6d41de19f2820d2957007b3c5417706713b26ffb5e67ece5 SHA512 89fe0feea88e2fca82867d6ef538a88576626681d6cc1e14c96784d0f0ff7ac9f09434440e8aec295a4fc5e4b07a3b681592129c26777e6182d3369e0720b035
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16-r1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16-r1.ebuild
deleted file mode 100644
index af7549a15507..000000000000
--- a/x11-libs/libpciaccess/libpciaccess-0.16-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-XORG_EAUTORECONF=yes
-inherit xorg-3
-
-DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="zlib"
-
-DEPEND="
-	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	sys-apps/hwdata"
-
-src_prepare() {
-	# Let autotools install scanpci (#765706)
-	sed 's@^noinst_@bin_@' -i scanpci/Makefile.am || die
-	xorg-3_src_prepare
-}
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_with zlib)
-		--with-pciids-path="${EPREFIX}"/usr/share/hwdata
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index be7d274b6e36..0a57abced82e 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,7 +1,5 @@
 DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9
-DIST libwnck-40.1.tar.xz 455624 BLAKE2B dd069cba299b9006a10de3311da87958f14a9defcc02a936cb0be38431eda9210aa8cff36ae63858235380a75c1d5266ce0612b5f93f47de21d48a5324af8a6d SHA512 50ba20547e95280d10f1f66f36eea6c649b59d385da7a9217c295150520099585a5ff43c08a552afb8b0db3ee7305bbb2c38d0baed84cc6dc0942f3ca1e43e29
 DIST libwnck-43.0.tar.xz 455464 BLAKE2B 591b7a9016f5149a2493d36ed8ec8a7e2a59b13043aed23bf87ef67520954d2e5cab0edb6f427c36f33fe80478ad363c9db6f4dacbc7c6d4295e79191e7f5043 SHA512 f6c14b0a650c6d5ab4d4013e6add3972a0f0bcdedfb9785f64199c9a65713d11c9d936e8b04d0f04707c3d165dd345bfa806f654bf82eabb765546b8914d68d2
-EBUILD libwnck-2.31.0-r1.ebuild 1209 BLAKE2B 5bf316bc3ab03afbc54fbcf4095804721f86b24c81be44e416d5e1107d65954b9142a739e8d46ff07a27657b174b078a364e52640cec50a8676cdb7916f34888 SHA512 adcd8a2024f44730082de7a27bea6fdea598f3ba5495fe18f86df09e23d21218cf9fa4403a4ad665d0ca218e2aa5d1187643bb68cc57187e9825a9f558cd4eba
-EBUILD libwnck-40.1.ebuild 1417 BLAKE2B 03b3cd2b320b1699aad725de8dd7cd52782c3b876c699783685639a924093f8d64c2268d3b4501f60fab9748f173552326ca7b4b525e3c9a9fd1375a6742df89 SHA512 8549fddc4440b2e10479161d1531a42a90cf322c91658440f5fd9516355d41513f9e933808b14eecc8e962e254199b2961c37d9f527fd4e1cc05e83f3d0a24bf
+EBUILD libwnck-2.31.0-r1.ebuild 1196 BLAKE2B f56f8e7d5661881c72b186a0f6b994408e7a255e604d7de96e70eae0df046c69908391666c649af5f5f96146990d4f71dbccf692f50e92adb4e097cb8d533e70 SHA512 712e14bfbdaba36227d35d6e8ce441471c465edb8b44fd07c372ed0056ac6d261d539adcd70bd0dd48b30d9538ff7374d47f0d915a191b90999c939febcf74f5
 EBUILD libwnck-43.0.ebuild 1432 BLAKE2B c2679d12329ddc74b9487fe76600378f7f9b5dd6ac75a623fb0290f37eb16d77596299fed6728313865e144731c6499dfadab32d87276ebcc2135de4773efa05 SHA512 688a7a27ae27079fa6b526c59e032e225c81c3602a6dedc82457a9625e4cf4ac6ec9f138d682f751fb155c48e36d85e90076ebc96fa26e9becffc04fd3332c7e
 MISC metadata.xml 460 BLAKE2B 891b6b8e3c900dd4e0d285bb440976a1539c2272e1dd5d269c6d840a410bc9fb511458dea304a96cfdb38437df99e1557a78e6d8610a2c47c9420d0eed73b562 SHA512 c9cead188269942beacef6ea2dfebd829f9851d7f41b4b4fb1f9659cc2b64a2eb8b71a4b536446fd26485c215d601f5d5db2e41fb6cc40222c6e87c085313ce3
diff --git a/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild b/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
index 2ed5aa52ec25..aaa4b7bc3773 100644
--- a/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic gnome2
+inherit gnome2
 
 DESCRIPTION="A window navigation construction kit"
 HOMEPAGE="https://www.gnome.org/"
diff --git a/x11-libs/libwnck/libwnck-40.1.ebuild b/x11-libs/libwnck/libwnck-40.1.ebuild
deleted file mode 100644
index d1d0d39aaa99..000000000000
--- a/x11-libs/libwnck/libwnck-40.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg
-
-DESCRIPTION="A window navigation construction kit"
-HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-
-IUSE="gtk-doc +introspection startup-notification tools"
-
-RDEPEND="
-	x11-libs/cairo[X]
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.22:3[X,introspection?]
-	startup-notification? ( >=x11-libs/startup-notification-0.4 )
-	x11-libs/libX11
-	x11-libs/libXres
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-# libXi header used by wnckprop.c, which is compiled even with USE=-tools (just not installed then)
-DEPEND="${RDEPEND}
-	x11-libs/libXi"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gtk-doc-1.9
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Don't collide with SLOT=1 with USE=tools
-	sed -e "s|executable(prog|executable(prog + '-3'|" -i libwnck/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddeprecation_flags=false
-		$(meson_use tools install_tools)
-		$(meson_feature startup-notification startup_notification)
-		$(meson_feature introspection)
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index a9736bfc6b3c..f365235a7f0a 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,5 +1,3 @@
-DIST libxkbfile-1.1.0.tar.bz2 364678 BLAKE2B 577da1c43e6ce681630676f3f52f40b1f31d01862a891d4c1bd853056d90b03d9993299714c5e63a903b243165a1e299e1e014cd94614eacb50aeef363be8990 SHA512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826
 DIST libxkbfile-1.1.1.tar.xz 308832 BLAKE2B cc3042a05dc4859edf96235b8ce95b7da33878e9c9b8b7f82f83280f84cbb215f5d3bc32c7f77d8667f0dad7a9500abc68695c8e784dcc7e83e4b30196bc0257 SHA512 2902d21860e27a27159123a19f7d4e0cf9cf8933685f1d2477e69ec647f0f8629b58bbfc391ed45e8b51a10033f18a9d0f16f7f519da9923cd7ed3bd497cf1a2
-EBUILD libxkbfile-1.1.0.ebuild 491 BLAKE2B 9c30eb17f71629266a92ed9a8b626f179543f7395417e98913e9cce1ce9777b66d49d6f57cbd29ff6bde2ae6ec564415c631e0a3fd5f1787e391855a8d67ae34 SHA512 6544ec1c2c28581a28729b78fe8f314935601e8f6ba940c418e9fc5a6a57c2e2f93de58f64aca5d828ff534719484c8d21e7080ad3a369a6962183d65f8d4fc2
 EBUILD libxkbfile-1.1.1.ebuild 508 BLAKE2B b010b2ab9a6f8dcfec3235a4b123818a90e1e1dda0a974889e044c91564df8097407df901abd29456f46e8834dc6bdb17c47fa5cca7aafc330996518099bf573 SHA512 20c86965706e6c6720a990ac60a7e91366165fa625aeda8fe2eb6541a3b6a9d975c86d6ab51aacc97b33b407d9b5bff2bbeffdfb811dc55eb4d1addaf5057920
 MISC metadata.xml 341 BLAKE2B 6bdfd118881a6eae282b380680ff6484fe69747cb1b1d0cabb00607d1cf06535de084ed07bb8664bc5027db274f263ed34175881cefb7464124891a9eb38e117 SHA512 436ec0aaca5f4a4392dfca223787672744e65354de323e5a6222e6a3eda53cfdbee00dcdacd375e587eb8a9277a0fb8da1c0f84723e577d8764ff884f37ccba9
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
deleted file mode 100644
index e98c13f63376..000000000000
--- a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org xkbfile library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index dc5f73642ded..c81bb9509b60 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,5 +1,3 @@
 DIST libxshmfence-1.3.1.tar.xz 257104 BLAKE2B 22c5ac15340e4aeac25e3f9e92ce25055ea668c60d1c8fb0d8a0801c6a83a3e405dcc32f733a89c8f6f689ca3c205c500ffec41dff000699a29369d8c6a8455d SHA512 f0c33b97204d62dc8352e2728ce12694bdb83ccbd1fd11c19db17246cd62bcd3e675f5b5b88a4e14bda59b4174003c758c24a3d93abc4bf574fdadc3bf07da71
-DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
-EBUILD libxshmfence-1.3-r2.ebuild 389 BLAKE2B aeb95497e2e636a6613f5802575a947f6a384b6398ecf14340094350b69848411b73b16a3a29d4d8ffc162486f65e86a276a194b2199bf755abeeaae893c7361 SHA512 d54e306ca2145961fd7c6cb00f7af8f954636e51dc113cc98b81c686b569d99a93a86cd523c4c8a5da3e0b1580ac5e485a676ac4f389740766c703d8c2cd982e
 EBUILD libxshmfence-1.3.1.ebuild 414 BLAKE2B 73f42e6ea33b0744426be88e7fa3e6bdb03a24cf4658a37ec6ce7aaf3f04e638a62a87b89fdfe83a22a350bc2a16dc3e4c058c9efc719217aec515b359eefa81 SHA512 7d0bb347be47d5a0c19aa75656d3bc941833ef080f9ab90c589958ebc4f0193a919cb8613b2c251d731f018bd8224d44bb55aea76a70ac1cae83e140e4d8f6af
 MISC metadata.xml 343 BLAKE2B 4b6c3bd00d5e71b96c4cb0c1eebd1606f5a7e219882a4310251f7b68b0230b4cb76ce1d5ea7f3911fe57a33c07c08ee5bd2ca6ac9d1fe690713a2ed39b0e199e SHA512 f58bff9c90477bd61d09f59b3e92b9d899d0329a1be77a76b3ac74c89e4a20a8b88daa37f4c64a06e5367fd25a40bc9709e98d141be271652185e4f2a3c350aa
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
deleted file mode 100644
index ca0d7b1940c5..000000000000
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="Shared memory fences using futexes"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index d122e3dde2b4..43e136abf574 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -5,9 +5,7 @@ DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 DIST pango-1.50.11.tar.xz 4263184 BLAKE2B f496f66ed996dd4125f2de7b0ea9635e7199e54de3038e6475c4677f04183442a27acc9c8b353f9207145b8c86e0f725f1b888fbe5e8df40929a70d9290bc376 SHA512 00d08477b8bff62cfa298d2871d3e58bc0411ea6a36330743b49533e6065ce5c3ae511246c299800b542ca446f31f2fb342f41c1183069946adccd13adb14ef8
 DIST pango-1.50.12.tar.xz 4272856 BLAKE2B 60a06416f82e8e5419bca7c89cae17bcd60605b944f483bc7a4ce4405710f00dd40c78abfbe9fdbf8d4786780540f92adfde45e615be4175450e608ba618df08 SHA512 488a55e875487ded8c298151d67a3a7ec4653f2c311145fe83b1297417b1154d5e86b199013ee986c7d2575c889fafcb2f148ee4e5ff9ca143f9fb716a71512d
-DIST pango-1.50.9.tar.xz 4262208 BLAKE2B 13495015a7b22fb33d6c06e2fd2f325f30a80ee88a9ae7306aea477bc0551762ef20b3ebb4d8c4a45e791f25e675264a1d1973b703e131b4caab42369e4bd293 SHA512 f108274174c0ff5eabedddd8a3ed23ba124c85b72dbc9c003fee388fe8775deb0946ad3dfd7c96e70a30268cbd390e29c4c184ff30300d99add70ba0ead59b3e
 EBUILD pango-1.42.4-r2.ebuild 2317 BLAKE2B 7bbc0227f8b846c1e51cc142e7a3088ec88c2fdc35fff8970daf3699e94e369de66380fc140aca039accd546270be27c809e13c0a71d42ae8df19f64198d22c8 SHA512 8c1c0f11ad9ecbe7f464e7b839de614e4f266d2674b843d133489b882270f02754c61b05f2624a2b4c9d571b7824d2a142ccc2105e2c7e968fc26e97e2936c1d
 EBUILD pango-1.50.11.ebuild 2409 BLAKE2B 8a80f3286eff5f0588692a19d8d1e84385448d8a640725ab1b5c4085d5dddca37595a8efc7b3500438618206167d537e61a58f9906c7a6aab597c484dce6f21a SHA512 306725b129979a7688df2133b302e3f62e8900917a0c584180be9603e286c621ca40fe6f2ba080b9149b038a1e3b859fd8af2520419bcab86124f9bc3be7b6e2
 EBUILD pango-1.50.12.ebuild 2417 BLAKE2B 8325fa1e7dbda26331ee4f72671d760e87eecdb13793b0447dbb0ab8c0459099004b2cc542bc192c57c14be2325596a287885677cc5d04e60523e82dee31ea18 SHA512 47aa5c1f725622aba3ffa195d19876b9da3647b36242ee97f87f0fa20022c68c0f6236c69e834b5975353ae3633e34d79ff384ba71e7154a53af49663ada5770
-EBUILD pango-1.50.9.ebuild 2409 BLAKE2B 8a80f3286eff5f0588692a19d8d1e84385448d8a640725ab1b5c4085d5dddca37595a8efc7b3500438618206167d537e61a58f9906c7a6aab597c484dce6f21a SHA512 306725b129979a7688df2133b302e3f62e8900917a0c584180be9603e286c621ca40fe6f2ba080b9149b038a1e3b859fd8af2520419bcab86124f9bc3be7b6e2
 MISC metadata.xml 604 BLAKE2B 94690ca7900ce8d6418fdbaaabf9da8a85471f575a8bf81ab73523e3910d4c8db227bf653be30fe068f9c7c2e2295aa6af52c3e8da2780aaed0947c2b76b3b2a SHA512 314a9b5ad763a0077acfe0afc46fb82e26b28cec783077765f8b42e0828a059fc18804dfa522f9cb3628bf63cce1ac27af3b244c2b2166cfc9e1e5b465dd2f06
diff --git a/x11-libs/pango/pango-1.50.9.ebuild b/x11-libs/pango/pango-1.50.9.ebuild
deleted file mode 100644
index 262982813a4f..000000000000
--- a/x11-libs/pango/pango-1.50.9.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic gnome2-utils meson-multilib xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-IUSE="debug +introspection sysprof test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	dev-util/glib-utils
-	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( media-fonts/cantarell )
-"
-
-PATCHES=(
-	"${FILESDIR}"/1.50.8-harfbuzz-4.patch
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DPANGO_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS
-	fi
-
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		-Dgtk_doc=false # we ship pregenerated docs
-		$(meson_native_use_feature introspection)
-		-Dinstall-tests=false
-		-Dfontconfig=enabled
-		$(meson_feature sysprof)
-		-Dlibthai=disabled
-		-Dcairo=enabled
-		$(meson_feature X xft)
-		-Dfreetype=enabled
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/gtk-doc/html
-	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
-	doins -r "${S}"/docs/Pango*
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if has_version 'media-libs/freetype[-harfbuzz]' ; then
-		ewarn "media-libs/freetype is installed without harfbuzz support. This may"
-		ewarn "lead to minor font rendering problems, see bug 712374."
-	fi
-}
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 442ce8e0c064..0cd2a2afb7e2 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,6 +1,4 @@
-DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
 DIST pixman-0.42.2.tar.xz 652984 BLAKE2B 6286a9d064a5a24017fccbb0a6e9f6ef932077c2e33ec043826d4a7a6c707c9111d3de4b806cbcdb47fc2794f1f930d24d078de1ff2912061967db0890540957 SHA512 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8
-EBUILD pixman-0.40.0.ebuild 2005 BLAKE2B 443ba3024143ba6106054358c3ecd28e4e3951f378d15740fed4141fa65908fe99b3ba074914b6860f03b5c30c855bfd84bad78d2fcbe6a9241ca452d93491f4 SHA512 1bdf7a0d33ef2b3bf03fa5d2e91b6d71e58336ad9b602869a54a5cf27c2303c4303916223740d1f5d79dae5280c92a12d3717950c5f8071bb2f90d45c0c9cfa0
 EBUILD pixman-0.42.2.ebuild 2180 BLAKE2B a417ddba249c7725c4c35041743e4aa9c922bfaf20403ee2123613bb5e59832bebad9689ed9d2cc2caa2d806895c36a3bc466a1ae53dcd267a737287444431f0 SHA512 290c48bd31e147e7862c3c439b4dd888f95e3611c03948ecc6b41b0feb8fe2972e2a7ca8ec5443fcfb26994cd0c25b79629e2919d0665d30a2adc491ad40b241
 EBUILD pixman-9999.ebuild 2188 BLAKE2B 395e1175954276713a15612c19224199befe1f0aded08e9a1db6b24c11a2109216c4ba3f637688e5db176e92103f396c49d02438613c8295d5080bf1dd30e774 SHA512 89dd2c9ee883d92e61ffd0fb8ee00b4dae5110e35ebd66d643471544183c0249f373bc46fb9d6c367f5244abebe8d0eb920ad0d396edc818c282b33bf5c0df7c
 MISC metadata.xml 483 BLAKE2B 4302fc025e7ce3dfb1b2f099371f0b3263942203ffd50730c40afe491feb003d2ec17cbf8ddd4ad3c1c0d752c46b87dd944e907b6c31a6ffdcaab7b518c247fb SHA512 f4777b9c1ae7527be4f354836c51142b095ab27dd56b173a6e0b7146ad68257136f326ff7c0fa564706dcc53aebe9171d8f844bab026c139cab717c559bf2a5e
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
deleted file mode 100644
index 795b17992f52..000000000000
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs
-
-DESCRIPTION="Low-level pixel manipulation routines"
-HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test"
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp
-}
-
-multilib_src_configure() {
-	if use arm && tc-is-clang ; then
-		# See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46
-		append-cflags $(test-flags-CC -fno-integrated-as)
-	fi
-
-	local emesonargs=(
-		$(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
-		$(meson_use     cpu_flags_arm_iwmmxt2 iwmmxt2)
-		$(meson_feature cpu_flags_x86_mmxext mmx)
-		$(meson_feature cpu_flags_x86_sse2 sse2)
-		$(meson_feature cpu_flags_x86_ssse3 ssse3)
-		$(meson_feature cpu_flags_ppc_altivec vmx)
-		$(meson_feature cpu_flags_arm_neon neon)
-		$(meson_feature loongson2f loongson-mmi)
-		$(meson_feature test openmp) # only used in unit tests
-		-Ddefault_library=$(usex static-libs both shared)
-		-Dgtk=disabled
-		-Dlibpng=disabled
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export OMP_NUM_THREADS=$(makeopts_jobs)
-	meson_src_test -t 100
-}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index db7247a5ff23..5c375caece08 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -3,11 +3,9 @@ AUX vte-0.66.2-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2
 DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B de2d4c9b7f2c2b21518984f818d0052c0084398f5f4ee30d766a6adb9c4536fdec5027c753d3d710fb7432e67472b7f8ca44f1dd5f51aaef48d9124708975d24 SHA512 89be91cdba36749f97bac872f0f2196be7d36a58beaf94fa24a3ae9c266bdfbf4f4fbf1d10f43a276540653fff7062eb844107016e7f014437f2903d251dc1d7
 DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e SHA512 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1
 DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c3b0e5586ac80204cef8840fda935204cbc480fec1193e2a0a2782f98e2b094c3caebbfe61cf18631b16921df05cf3808afd22 SHA512 92123e7f5cb6ef876f2b2b108dbef59bce212efebd64cd790d49d9ee3215344acd848eec5d326fe2c3bd236846ed3b896148024390093491b2f6e2f7c46e2bd1
-DIST vte-0.70.0.tar.bz2 499283 BLAKE2B 694cf4dfee334e9b54bb8e47f862167acbb8ffc7ac8e81889acd4786449cb45944a87a5adaa036f46458c350ca2119bb356e90dfa71f03638c9c2b14d2ccb877 SHA512 362b71296ae39a16b55402f524a39b063f66ae237e6e161ccc89ca2bb1f2a5c43f4d706d9f3bfae12a99fdb81c4e70408c7f3eca2c01316950b0a3a1a1d79423
 DIST vte-0.70.1.tar.bz2 502044 BLAKE2B 0a9ce43c1863e823fcd073fd30fb6b2cb39e9168e850796fe12be2b9bdfc0b24ceea974b4c94bcdd10f2225613990e0e079194380241b7e625cb6dc4309a7476 SHA512 88de629b382eca8a42199b2ba9b248e231817e1de7183417aed150bcf61530084f7177d73dee9aab25fe4c3ab80d795b5fdcae336687560d3b582bd04181353d
 DIST vte-0.70.2.tar.bz2 502395 BLAKE2B ae127d8262c7038b3a2cda9a9622e9a075dfc1e06a7710810a4bb894a6646155790776553f663677cb86c3479e6d3faf92c38b5b97dd6970df37cee92dd963fa SHA512 1e113da0591830c057358dd78cfe2f814dd0bfabd037973369266823a9a4936a200b5b23faab3757ced4d08aa96a76d6b1120419815a181598493e35d2ea58d0
 EBUILD vte-0.68.0.ebuild 2741 BLAKE2B 66debeedcbd37b16ed63f2618bebc1c0b611855016a18dd51e54be535130843c58c1bd2a583f83563268fbb33cb40c4070352518be8aa0e1168f72c63b2b2d57 SHA512 93344cd296bc3ee4ff50df052c0118fa4529efd5f2b72c0904258f090d42ab640eb4ffd8616a085d90a13f9af04d7d9cad90acc8855573879318a4b45e348744
-EBUILD vte-0.70.0.ebuild 3183 BLAKE2B a82a76018feda98c892290f2ef5c91098040613bffbded0629067622ee07a88cdebe343d9b9c60b3ba494bce561071652ef4332ed24b83a9b5498f78de59d331 SHA512 834488332f71b0742143cc2baa64ec91f724d43e0fdea0dcca9f0c005296e8417d8ea3524b536642c433ec76b2ab21a8332be9cc70f67bf6c1eec6b5dfbe46a0
 EBUILD vte-0.70.1.ebuild 3238 BLAKE2B cf1118c7d64de1a0eef5df7fd508f244181a9fe75223d2c09790878bed9aa2fbeb51f57bb3c55170cda5ad74563cc2deba72dc8c78c88f007e695d1e0b6f4ecd SHA512 d79fd280c968673cf60d4d7e72dff80c1e49788520ddd4bff939e20990f70a711fb263f481f33d0b7d0e5123bd838e3646848ea70ba196d0239b5d6e30cd5873
 EBUILD vte-0.70.2.ebuild 3204 BLAKE2B 89defe23b9ac9ad44e55067fac843ba0573cf6cc8b903d00a72ab83f17db460d8a791477512ef2875a349c9a54e5590ec96bef38f550c06627135f5e30b7d4a6 SHA512 d6327012c84886266c1c2de903797610c3c34c1f3c89f65218252da56bed6ac4d70b8d36d23178a8cfa75cdd8873eaea5b94ec63a263090977cbc38889549c09
 MISC metadata.xml 612 BLAKE2B 3243ec48375bf8e69a367e5d631cf84c0ba60b43d1f4a25c313a407bfb1c9826ddd1cd75784bc302e7d8998d1bedaac9d75c7f329255e605315d9f0bf6154a73 SHA512 0abc6f1deb0a7900b6b35620ad3dfa26a900445526cc6474f974ce5cca2dad65cb3f3c4e3b8a59540821a9922e2cafcc7011d705570e77d2a46c907f3962a73d
diff --git a/x11-libs/vte/vte-0.70.0.ebuild b/x11-libs/vte/vte-0.70.0.ebuild
deleted file mode 100644
index 49b766e1be02..000000000000
--- a/x11-libs/vte/vte-0.70.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte"
-
-# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
-LICENSE="LGPL-3+ GPL-3+"
-SLOT="2.91"      # vte_api_version in meson.build
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~amd64"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-
-# Upstream is hostile and refuses to upload tarballs.
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.70.0-command-notify.patch.xz )"
-
-DEPEND="
-	>=x11-libs/gtk+-3.24.22:3[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.52:2
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21:=
-	systemd? ( >=sys-apps/systemd-220:= )
-	sys-libs/zlib
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	x11-libs/pango[introspection?]
-"
-RDEPEND="${DEPEND}
-	~gui-libs/vte-common-${PV}[systemd?]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? ( dev-util/gi-docgen )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
-
-	if ! use vanilla; then
-		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${PN}-0.70.0-command-notify.patch
-	fi
-
-	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
-	sed -e '/ggdb3/d' -i meson.build || die
-	sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Da11y=true
-		$(meson_use debug debugg)
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dfribidi=true # pulled in by pango anyhow
-		-Dglade=true
-		$(meson_use crypt gnutls)
-		-Dgtk3=true
-		-Dgtk4=false
-		$(meson_use icu)
-		$(meson_use systemd _systemd)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with gui-libs/vte
-	# Remove files that are provided by gui-libs/vte-common
-	rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
-	rm "${ED}"/etc/profile.d/vte.sh || die
-	rm "${ED}"/etc/profile.d/vte.csh || die
-	if use systemd; then
-		rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
-	fi
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
-		mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die
-	fi
-}
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index a86faacd86ac..0485bea683b1 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,5 +1,3 @@
-DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
 DIST xcb-util-cursor-0.1.4.tar.xz 265508 BLAKE2B 8d7eac0116652833e1835e9c7454bc859901e146b06985b3926fd5f7568d92f2249ef6ea17c2202fa247e36bb998ba5b76fa519e92ca5cd51eb778169c88218c SHA512 d27dd59a4d7ded9994dca77774421dd9533e3ee823b880af35d3219bd7340c89fbc61d1d0fa10e2991de2cac9e6395e09497769d7b8728eedc691e76649107b1
-EBUILD xcb-util-cursor-0.1.3-r4.ebuild 1025 BLAKE2B e1cee4ee659ea5ecdf9c3d315e1c7fa0ee4c2593353524a7de929031fc629b3030a1ce2f9998e9d6dfcf1335e9adf9b7cb6db28aa8e01e20bf45263933237a3a SHA512 7c2ba922ab6841a56c63ae67003bc962cf0b3ccdb76896f76b269c7d2c89464da6d2a6c1c183bf0828a706c884eb46f99af6e8deb1080a775559d62580fe673b
 EBUILD xcb-util-cursor-0.1.4.ebuild 1050 BLAKE2B 2da98bc3762598952bd05781a8468475ded921294097878fabdb79ee47eda0726eba15c2ae1fc9ae60b3d152e4914cdd605ed422803b5cf2abf4ed11b9106304 SHA512 6ac389edb8db5cefe332cf1d4fb2313912f6e651ee32f2342f7175d43638190f97d0a94346453fbf329e433121bfd25f5bd48c221fe12159eda51acd6c7e79ff
 MISC metadata.xml 344 BLAKE2B 7350bdaa3994406d2c539c1e580759e17729eba1b935c15802e0fcdcb5194ffc2655148bc0a5b1c40329b887e9c41fb26964286e8fc5a29cfae2ce721cb00f01 SHA512 38736ab0f5b649781a67f911269e622c22b8ff75963818552aa772ef460691285260c057581226e00b2ebb9a7ff94c3bca863351ec1d916bd9e0a50537a8caa9
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild
deleted file mode 100644
index 74557c463405..000000000000
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3:=
-	x11-base/xorg-proto"
-BDEPEND=">=dev-util/gperf-3.0.1"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
-)
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index dc22cb6ebe07..e6ae1e75fcca 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,5 +1,3 @@
-DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f
 DIST xcb-util-image-0.4.1.tar.xz 289016 BLAKE2B 7f1c7c3da950604adf4a22146e9bd3b77fb3b0d35f0a1bb17a1eefeb1ba5546d58a3e40ac0c130d67ebcbc8bdaf40ef734ff19434f66bd57bc4a4a849a88cf82 SHA512 9b47ba38b91196d76541b6ccabeaf291d3b91036f15422909cd6a79b3fd1a9786d5b1728e411bc41cfdf3d60a253485f4ef7c65ffa6ae646fa93439ec782746e
-EBUILD xcb-util-image-0.4.0-r2.ebuild 608 BLAKE2B 4123fca7764fbaaff2b1baddf56c96112fcaddf502019f8fe081ec7330a47ab0745509b8f50e4279903130599b6b8e6d59821f963155bb59ca901f2f5f2e4e47 SHA512 7aa88b81b2ed0b2f18277e997e8d4799a7912da98b3edf9a0284ecc2fe20a04991811dd3c0f81be5d5bcd2a892e12b12fdba046f2595a82d43ed0a171e214c6b
 EBUILD xcb-util-image-0.4.1.ebuild 631 BLAKE2B 2e4ad10bd4b2a369b3cd9b379413e07c8e3c5ce7a6b90ac96d0f9ccfae88b6ac603eb084ce875834d6b1a1bcb54575974a91ff3e944fa1e538cf519feae73cda SHA512 0c064e2b9e01af1943b054c10e21d29b0e3f50bee35b122730e3619dfa66830683261fbdb6d50c0e4892ec33b62b7f2a3048340e8a982902135abf2f50615953
 MISC metadata.xml 343 BLAKE2B f43656c79094ea2102119fdfae5e8a9fd2bef2ede1e4536f637d9041fb46cff927e8207fa25a65437cd5ddccbaea4afd3f2555b7b31eb9db9bbe68c557b0e35c SHA512 a39c03ef5043b4576a7ab27203268f6bebfdc06b1888f819560ea052d66ad49775a6787163fc47db1fa96b81fa8a19b3729b6af4f6391c448f53360e48dea6cb
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
deleted file mode 100644
index a4d59bd27cef..000000000000
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index d7f61f1bb1c9..e62e990ca14d 100644
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -1,5 +1,3 @@
-DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 BLAKE2B 5f55706fc74ed5c096ca0e8a8411ba392a023ab7f3c8185088c31570e5873345e16d72b693596b0983011350ecdb7cb30ae5fca118f4758710ee2fc2441883ca SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4
 DIST xcb-util-keysyms-0.4.1.tar.xz 259860 BLAKE2B 15d08761c673647fda2d8faf7fd47b817f7068cde157384d7ea879b0a50983eb97ea6f4b593c26d631419ee59a128f7fb5b3ca029dedf14f6629096fcb49ed7b SHA512 dd53a36b52647f22bf0da8cded4b2974a51899eaac799797017ed8534f14bc2d2d339a14fa5ef387ae4528b7d9a5d31920bb0c71b09ca34f58e5081e768e2bbf
-EBUILD xcb-util-keysyms-0.4.0-r2.ebuild 553 BLAKE2B 005d0de891f6e413ea14a9a3fade43ba68d4f366b16c92df22e36e558948c0ec622b2e041dba4b7c42fa93906d69dec92c2fcdccbbf391ff1c887a2d0409331e SHA512 40a39f29c48278f655ac46c51aad955fa8f8245ba5afe1357f6910dad2f47ce5cfc36cc679293945f8c4a1ed9069d1b8146d4011727850fffaeb6efc05da17c5
 EBUILD xcb-util-keysyms-0.4.1.ebuild 578 BLAKE2B 144c9d7c6a196dd9d3454e296f8f7656ca156a08873bb02b7b2332f952fc57c6e939e7053f53531fd9412cc7f461a426a23738f62fe3fb11f4ab5aeba9e5ea23 SHA512 f0f645e2027b9753af85b368a3bbb2a19a2a9c5ca8ddad5ac1fb499f8aac447f0b8a52e94dddd1c1430bb2d48b3b5d3fb690706bbf8d2ccd613110d21286ea7c
 MISC metadata.xml 345 BLAKE2B 95d38918c502f2397c09c9f07ba88f9059889f51b6339656a48437f149c946b79c8868abb2715bcf78c1d5890ac75d22a1a7e58ab61fdd73a680b351a09fe298 SHA512 467331b043b4dc8aa2a97d6a73fc51aadaaf550f31c0c4095e06315b4d6909cf1cfbeaa6bd14d933b57522143b678a0cbcd7da3320ad22501ea3153e90a6fde8
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
deleted file mode 100644
index 5760d088e8d7..000000000000
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
-
-RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index 7da92073c66b..05959fa4e532 100644
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -1,5 +1,3 @@
 DIST xcb-util-renderutil-0.3.10.tar.xz 262028 BLAKE2B 49b017fed34cd1c8cceae697bf76dc17c34c32dcc05acaff87c75f74fcd486bc0abc9fe4699cc989c1afd13ac33fc04092719209e9d48aceb5e35d64a5790393 SHA512 9cfa9201be2df7c0b832e1e1fe506e7c7a1e0f2b1b1d4a4b58620eadc241190a36478fa3ea27c32047fa79bf199f17dcd0b106853dbf5eda8cd584f3fc2b0c15
-DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 BLAKE2B 8de259f918f1ffcd82d054bd751baf3f0fe3514da86bc736b68c74ca1f285fb41dca364ca49153e1464691c10fb65f16a53eec0ec8102c1abade9ad7c80629e4 SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc
 EBUILD xcb-util-renderutil-0.3.10.ebuild 590 BLAKE2B fbc51e0cf1ade445a352b5cd665b573506a0acc15b57b7591edece9bbe89f7d08ba8aaa574bb3ac274b0760df62d861cb193e26a7af3cc0f8071b7d00f41834f SHA512 35687d08427ec80fc97b927fc4feca7fa45886c849e9d9e28289af9af72065b33bca896725d708d01cc00b0624f61b8ce16ed5b4c2064b9dd22d4341fc6f1958
-EBUILD xcb-util-renderutil-0.3.9-r3.ebuild 565 BLAKE2B 42a83b2be25357c84b670c19a4e1c6abf8936cfd5276eb47e42b0e00b965a9c691ec58f55f778fdd82742e2b5bd0c50c04a37110e1fd9221854232e1b9f5e918 SHA512 ad2172bf30d196a7fc8c4fa176a5f5249a3cf65e5dcc2b6ab3d2681af70dc6cdd304e0b78b8fc886df6cab5f6c1b95af219fe9bd806634bbc1c1e4a6290a267a
 MISC metadata.xml 349 BLAKE2B 49f5b4e390ba8e82461e662b0ab228113caa86ba25683d6cea931936c4002627a4eca860fdf6fe77eb3209aeaa24a0d25b4e132d943267912a158d14a628dc66 SHA512 9f5ad281542dcca4ffae5d5f4c5659f47f83a340effe36eea06031721fffee77340bdd63905d47ad82b72f035aa906f6dc37a9188847406a2460726241c93462
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
deleted file mode 100644
index d25739bae2d0..000000000000
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index 691028517d45..2e1c5a471ec1 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -1,5 +1,3 @@
-DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326
 DIST xcb-util-wm-0.4.2.tar.xz 285152 BLAKE2B 091bdfe318d0ab37df934dd4ea75382a8792577e60471dd6bfb3de8966a9ac9c25c8776a9fa7afb0a0b924f952ebc17084070f1fcfe9665cb5c0e1b2d576d39b SHA512 eab6588e6a47d28a3b25ecd13b5018529419db6b49c74458c093699b60a194933be1e1f6f7799abf03344f7ebc7af88586ff2935938d53644bdd5c763a7fa9b0
-EBUILD xcb-util-wm-0.4.1-r3.ebuild 556 BLAKE2B 56a680e11eb5055f49cb7a66add8672bef850fbc61dbb93f5502693177db94fe78309636aff0f8e61951a692cb5c2de5e86a11a996266af9349b82c950f872db SHA512 0ba1838703bb1f13f73b3fbb623712edf8bae3907196194621fc73b0eee8f7c57fd14b9797478511fb2098e8c269f1245ca248f95fa17eaa995c53432d5b8557
 EBUILD xcb-util-wm-0.4.2.ebuild 581 BLAKE2B 131350632c3459d31392e6a143e3a61aae98eb972a2d635e3b8a5b051f1a816a05b76ed22a0d8ea2c34bd1582f9318f56ff2e224f9e52b25f57dc2b8c34de24c SHA512 930f8752041a9667cd34646428f5ef128e26b4652769c6eb04b1d4132fba396374743c4648a89186c83995a624f64f471e716c02633378627eb60311af5da955
 MISC metadata.xml 340 BLAKE2B 73178674ca632e4da2c664fadb411eef0375dc8d9f3be935eaca1696dbe83af995dc5158403808f6377ff857191d15a606816acf5c569e87b95b26d1d2eaa2db SHA512 7ef425868fd0f352e8f88fb415427a5d98ec6cf5332f75af969d1a74a99f6bc2c1c6c9f3c649d7dcde72971e2171b45cacc6a08b0e1bf634cbd1bdb6248ca21a
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
deleted file mode 100644
index 360f334ef8ed..000000000000
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c415b0377460..e0139f6ac2ea 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 26785051aa7b..c22972bba146 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,10 +1,7 @@
 AUX imake-1.0.8-cpp-args.patch 388 BLAKE2B fe6640775ff72b135f882d6e4c00a6571670372f06af974ad47a88906e5863fdbe2a461eaccf94fbcc60fbb2cad362bf71003a49fb27a1b09d0cd086d38c8fdf SHA512 60664a5e53489de391121bfa8869b4d56d4753a1218d2ea6f4fe84cf730db67a1ae1e511759a51c02240edadc80d4f06d6339c444f29f590c4c8630eb3cc7729
-AUX imake-1.0.8-no-get-gcc.patch 860 BLAKE2B 712c3c150ddcc57fea50d8eda31933c0cb039bcaad5da3e017c329c5123e8541a8380ff393d94839a3f1590836205f130d53da409c09902b81e435ba283d2263 SHA512 72e6617454378eae9a5b35356c15e3be7f9dddf294c937da6f70815cb33be5b775f05f51246e78fed0a17a2dfc95e14ffc578d6fd70a2b259471473e21bca3f5
 AUX imake-1.0.8-respect-LD.patch 379 BLAKE2B 1b031fc8cbc884cd975b338f57ef9de554a67a426a77a0c4733f5b7bed990b7a2e5e59e524ea907c7b215b2232cf9674dddfa29974a90768487ddfa97399ac21 SHA512 1e5034209290387b3e0320f85eab876a5ed571896072c3da940e6fa13eb4a2ecb6b325104125738ae3502f420b5aaf00797ca9b71a832dcfda72a911df5e5029
 AUX imake-1.0.8-xmkmf-pass-cc-ld.patch 461 BLAKE2B 643264da121725cd2424e3e6d3dc7af05d9068ada3a53ca5b92f6af7beb17caf7eb7de5bc4187a7ebdfed508f242d13bcba9876533d2d7cc52dbd0f9c80ab701 SHA512 c73feb329adcda1f08051965a0ce0ba6031a8b8aceef19d10d11e475a603337da661ff4af72620924e1efb76ed9347fc0535b31ac3e98707aee298a36e715bdf
 AUX imake-1.0.9-no-get-gcc.patch 1048 BLAKE2B 0ff949e2e12afcb59cefc81b60e9801d14bf9b98f19ebe62b6a5ad857ea3b1e1bd3244309953eb450b7f3e29ae9663c695ff790fbaa6a8d202dc062734c21381 SHA512 67f5e4789b739c4d53d331592e83b9455a1e01ff29f9b95db04a25225f70549ced920010dd09b6f9f6e1b70017e1864f7b344fdc4fcd8962f2a9a2853e0b0644
-DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
 DIST imake-1.0.9.tar.xz 153332 BLAKE2B d9de997016112833e50d1151448366c538b9796622630724552cc0476deed165621edc1a01318a83b577a85fcfc78b753e6fa9fbdf4c71413319abe542f1beca SHA512 e7587cf80369c8f4fcc1207c13bcb74a53d838b504ac8a7f3b98fb8f5f595cc7b8e5e9fad50cadcf40cf27bd02ef4eae7fe458854bbed7bea27d474d66520644
-EBUILD imake-1.0.8-r1.ebuild 676 BLAKE2B 9b48c875622fcb42052cc9b24e2b83f9ca52ba51013388b49666bf96cdce506417bff63b7254750e2815ce40c3e71f184ccf05b904db508b5eeba76c617abeeb SHA512 97a9f6a495354e3a32ecad68b7b3a6004e847d9152255a495bdcaaff42d18c98e4ea1ab27a3f68a359c177464f2f60184518d27b6413d94a04823c866ac9be7d
 EBUILD imake-1.0.9.ebuild 727 BLAKE2B 38d1667a4f4bf5ca350a8a797ae1082eeb8b296adadb7f5cca0e0708fbc28d4a948f8e8df726487f3c022ab1388e656ea7acde02a521198cf85bbaa313565138 SHA512 bb34e4e8a11e4fa5c1fa7c441fab7a3720ba1237c4ae7ae6bb7beb5f512643c6386d66b7167f911c454d0419c8c1712e4f9ceb9d9f664b3ad7e766a3fefbb4cf
 MISC metadata.xml 337 BLAKE2B 33b94ed7ed8c8068a9fa1e2e3a49b51760e5e19003102a8ff5b76a0f449cc77fbf2aacaa8351a39caf2ab538645eca7862a383e7e4413a59efa69dabf8950c32 SHA512 9e59ae6ff8bef63e98e08ce8eff2d35a1ed3b815b60140523f07f85ea62a3bad952deea65a822393628db1605f2a8ac5ba35c3bb277e85a3cb64dba74936f470
diff --git a/x11-misc/imake/files/imake-1.0.8-no-get-gcc.patch b/x11-misc/imake/files/imake-1.0.8-no-get-gcc.patch
deleted file mode 100644
index 155200461157..000000000000
--- a/x11-misc/imake/files/imake-1.0.8-no-get-gcc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-If /usr/bin/cc exists then get_gcc() is always true on Linux (and many
-others), but will fail in the event it's missing (-native-symlinks).
-
-get_gcc_version does not execute gcc and merely sets defines, so
-call it without using get_gcc(). Validity of using NULL should be
-verified if there's ever a new version.
---- a/imake.c
-+++ b/imake.c
-@@ -1341,4 +1341,5 @@
- #endif
- 
-+#if defined CROSSCOMPILE
- static boolean
- get_gcc(char *cmd)
-@@ -1394,5 +1395,4 @@
- }
- 
--#ifdef CROSSCOMPILE
- static void
- get_gcc_incdir(FILE *inFile, char* name)
-@@ -1640,12 +1640,14 @@
- #  endif
- 	{
-+#  if defined CROSSCOMPILE
- 	  char name[PATH_MAX];
- 	  if (get_gcc(name)) {
- 	      get_gcc_version (inFile,name);
--#  if defined CROSSCOMPILE
- 	      if (sys != emx)
- 		  get_gcc_incdir(inFile,name);
--#  endif
- 	  }
-+#  else
-+	  get_gcc_version(inFile,NULL);
-+#  endif
- 	}
- # endif
diff --git a/x11-misc/imake/imake-1.0.8-r1.ebuild b/x11-misc/imake/imake-1.0.8-r1.ebuild
deleted file mode 100644
index b121c1a2505f..000000000000
--- a/x11-misc/imake/imake-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xorg-3
-
-DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="x11-misc/xorg-cf-files"
-BDEPEND="x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cpp-args.patch
-	"${FILESDIR}"/${P}-no-get-gcc.patch
-	"${FILESDIR}"/${P}-respect-LD.patch
-	"${FILESDIR}"/${P}-xmkmf-pass-cc-ld.patch
-)
-
-src_configure() {
-	econf CPP="$(tc-getPROG CPP cpp)" #722046
-}
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index d9a63c3dcd3d..08994d6caa4a 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,5 +1,3 @@
-DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
 DIST makedepend-1.0.7.tar.xz 140528 BLAKE2B 673f4a6e212d3929648e69698a1344ac9f803b20a7fb77ba73c052ee13e3a58741f08cc02f262fad51c3aafd8de1257f02c15fee9da6723e49d4658f29b7fec7 SHA512 fd575de737aa56ef8e475d1ddb7b2392e730ee1b23c0b853bbb21975b757c3fc56f94d57ecc5a784dceed2be653feb10909e86fd96fdc074b50fbbd0e27a19db
-EBUILD makedepend-1.0.6.ebuild 403 BLAKE2B 74a1bbc478bd21b67b23cd250d6537aff7be94916f1249fe8da5f37afa5a6e66858a0d60ec4b122affa349ee66e13ff78619ee42ce658593d8ea8ca6110b6afb SHA512 6486ab09ad4a850802bbe4f3dc61ebdd92c462098e43d6cb67a2a830d42a11cf23b3f01794a0900450479da210bc96cd18920abbd609cf8e406a06c3c7a3816f
 EBUILD makedepend-1.0.7.ebuild 421 BLAKE2B ef20b3055c8d130282fd1e7a794b117aea28ff38328d22d9c284d07c29b5b5728cf6de7c301304186ba9e2c8e0ddc573e9101b175964d678baf931fa950d4846 SHA512 9cf8614d7640f5b886d085d4ed35e2a17fa58997facd6307f98b91299ba561440ca664a18743cf877334f462280d8fa3c4b58b1c04aaa523c5a7efd887f9d330
 MISC metadata.xml 342 BLAKE2B a49c408048104b512588271539321c424bfc08a8f54bb82437429662bf85b3f5a09e3a93e0eb1c3a980d571cb08c1fbce58ab5f97f160923ff253c0608206056 SHA512 d2bab9cef77003c68547c0ccf1a454953d0d55edea087963d67f7b6e8ecfc78b811f8f740aa1a7d6374d5a417c66963427b9fe2b1fc1b88d2d1d669eae583d3a
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
deleted file mode 100644
index ab0b176326a8..000000000000
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xorg-3
-
-DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 9d7b30adcb2f..203fe2b70e8f 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,4 @@
-DIST xkeyboard-config-2.36.tar.xz 880776 BLAKE2B 3ce6d9e5a1e763beb15614cd1b559ff6d56c2f6438b1c0680755a029ac90e48de4a939b1bcc0054a510cc0e08f6ffa6db98fecd4bf11e01510b151aa664425c3 SHA512 a81054ff6b7928a445a913b80fad995056559feff7bc1f4926657f171a102108b6e22958dc6c814ae2a25445f65c94485f13399628016f1358cf3840e235e3de
 DIST xkeyboard-config-2.37.tar.xz 879744 BLAKE2B 58cc62d48a857b0935bfe7415b4a28921d02218402ca0125e8644be04a14f897e357a224fed12f9a85c6d147b4fa659241004bf49ac16c19b7f5fceb2b6d3295 SHA512 3b2da77996d48bf7b6a5f5784bbcb62070ba6ab8eabb6f255d1addd7fa58080a329464010050e894c9acc901e42e3669333db2966140c78802efb8a86620ac0e
-EBUILD xkeyboard-config-2.36.ebuild 1030 BLAKE2B a0bcd6d3b409bfeeb9b987d57e7edd9dbc131ff7cd78cd2741def7c6a70581ea5fbafca2954d85779ece93731573e00dd259d46332b6b8def5f58d424696a6a5 SHA512 77b303d931dca500ae748271ebef479a793392d85da59c9fd5b565d74ce59a2d798ddf1a16d5ecd0e3c6678604b1b1760f91dd1c82a9f1b4ea5fcc57c4e65945
 EBUILD xkeyboard-config-2.37.ebuild 1030 BLAKE2B a0bcd6d3b409bfeeb9b987d57e7edd9dbc131ff7cd78cd2741def7c6a70581ea5fbafca2954d85779ece93731573e00dd259d46332b6b8def5f58d424696a6a5 SHA512 77b303d931dca500ae748271ebef479a793392d85da59c9fd5b565d74ce59a2d798ddf1a16d5ecd0e3c6678604b1b1760f91dd1c82a9f1b4ea5fcc57c4e65945
 EBUILD xkeyboard-config-9999.ebuild 1038 BLAKE2B 8ddae88b4c7009cb60dec8707cbe239054a49bd713079aaf28b1c10b31f8458b9dea63415dcf197008f3827a203ca9489117d474c9dc7e48061584ae0f2415b7 SHA512 38ff78bfc51cd3f8bfe2a0cfb6262f2f46a12f17868ac5b3cb6fb0cabe44e6b0ac562ea7cb39a208f743f24f5a7da67f43b98fb822020eb6371c0682e2373eaa
 MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
deleted file mode 100644
index fa640550337b..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit meson python-any-r1
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND=""
-RDEPEND=""
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-libs/libxslt
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
-		-Dcompat-rules=true
-	)
-	meson_src_configure
-}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 320e6560bace..5a134987ed22 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 0c026f4554af..1fd3d7fb1e9e 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -3,13 +3,9 @@ AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c
 DIST gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz 37248 BLAKE2B b3599386e7272fc5b742c11663f09bbfafa84cc855bd13fd602d679601fbb4126f36cdb157db37db335bf9edfe7d2b85e534baf837c5817984ec17baa4cdbb6c SHA512 6422a774abfee18b2681115344f508b72ead1bb9f27b5b1596b419a9ce5a137d41e2d749b6d784170225e7f21f15c109f7eb74cc3164371d53dee7790bf99187
 DIST gnome-terminal-3.44.1.tar.xz 1813032 BLAKE2B 3e001139aa0516bd27f7215c692c048393d6ad41737b8817f212529d3c530f6417d05601f63e6265e3fb84e788322341c25784a0a26ee7434f1d4bccd31c1eea SHA512 afaa9a1b4fa86fea853a242f167d1ba3438efe4e049336bae138cb800d43c3325f624849463f16c9d4e34360916377c4edbfd2f3977212b51e35a41cca88b283
 DIST gnome-terminal-3.46.2-cntr-ntfy-autottl-ts.patch.xz 34980 BLAKE2B 97a634da8f586fe03770540a00480f04de5d3210bb45e9af216ac876a85a8199d2d9ed651cae6631a0b432c96d28b5a07202baf79765a2b3767160c1df5cb84a SHA512 96591f7e1f4febfce9d8b10a0fc8aebc09ad07cb2fb36876affaa47f19360944c37e63c173af6f07807247c6f60f34e4e39590ccb1632a64d6e5dbf3912bea74
-DIST gnome-terminal-3.46.2.tar.gz 2881209 BLAKE2B 191e9f2f074e2965e85708e92608903173228e9c8df8df3f67eea33a95ab0726f5a0e10c80839d735c57f47ee5388fe70b2eedff21c1d73019ede95d6a00fd78 SHA512 b5a6507f9e908d9bdd4659d961e9618ff75ed5c6e02c6818d8399d4ea355dff7ea1b8bafb4304501d5a46e83e5f8633524c7851d42a39b1bdea5a1545ca1d31d
 DIST gnome-terminal-3.46.3.tar.gz 2881211 BLAKE2B a5c0aea858692bbab3ed20d4daa54dc97c98d4b920b09fa0aa52963658f6a327e90398c45ae5ed4dd3a40823ba84eff208f6df5e5e0731a1b1e7d8e531ad7b73 SHA512 d1408bfaf0a7c0b090f140c5ac12fe406fcfb18ddda5745616f209e196cc0b29887a312afa29a8ce319cbc7a0093908305a0fc95c357f8c714084cc696c8e79c
-DIST gnome-terminal-3.46.6.tar.bz2 1680801 BLAKE2B 1abb2f7c0ead350904be19b5de8dd53524430a9702ad1d3268849cc3b05a64c06e4e9e03a01a0780d31cc088a9565c88c5a0c26dc0c14bd1552f93c58a6b2159 SHA512 c16238cf7891eb4ca61aa3bf9c951dd8bce0e6cc45e0ee23e24dc04a23cf7378eebe79cd6f4d7e70a8be5364c8f1e66e5f43b7d96e6f9e8e7b3ef023b5dfa51f
 DIST gnome-terminal-3.46.7.tar.bz2 1681251 BLAKE2B 579ccc58cf55e04a0ef43bc840b3623ef3451c60d210f773fc93b4dc0bc6dc3cda63f4cac182d4295bb6dc1df0f78e8509c28d365db16f6a20f92ad5abe73aaa SHA512 b53ec9fd1bd18e51dfc9d5d957082fb1478a824ceb098b0dda2ed8417c4cae4727435f4bce22a949214bdd39abc87821beb36c9e9863691ae0a20f11b34e3335
 EBUILD gnome-terminal-3.44.1.ebuild 2953 BLAKE2B dd07246a8212d5c03274d63cd91ca2a5b74ecce4b1e14fb156b02bc7c3dd17b16bc24b8c4fde71c40138573092fcba4c30b20175209a1d3f2019e6ffbf381fc6 SHA512 a227e96ef2ce12def2a85ca071dd789c6c13a60e15add1a4fba9ef19228406eb2616b0192b92b37a22339f6c4c76ce4bea564a7b9278f2f3d6cf916e997df67e
-EBUILD gnome-terminal-3.46.2.ebuild 2981 BLAKE2B ffb040b8f7b8840ef8177cabe0e2d7b6933805ca040399d9121f7e8ce51f339c877ada98ed4e86ba138aade83052044b38d6e893b603f14cb236c4338c36a036 SHA512 1251905a80fd114277e3533f55ca4ae30c510e1df4069c99f303a5a2442bc9d1f9f1d161755871b909fc42bf2d6c3316b3f2d3267f4d8962fc8557cadc30bd02
 EBUILD gnome-terminal-3.46.3.ebuild 3036 BLAKE2B de2d63490e36b30d671a65427bca8117559f79724c6a4ce4178d2341f5f6f535ecfa704fcbd56b9b1d329dcb1f091f707065d4e250e41fcf9bc04447f322417a SHA512 a446ae90b8cad00cb07b211925efd877dbbd8ef2b5b7a4297f5680ee022351290cdeeb487e0eadd1129bb9e7574671e2a2de47eaed9540ad2a5baa6f0de4f22d
-EBUILD gnome-terminal-3.46.6.ebuild 3038 BLAKE2B c4ee3729b0d8a2b2c750cb8112cc30db3c395d0d208a24befb0df9a5931137e5a2b4f55429f754c7d12d1fc30c1fdb2de608b03d5cdbe31de582f520bbc360d3 SHA512 d9fb12a15b51e949479ae7e5691a225053549ac9768719034e3a11801856b2c12c56d24153fa58c343b42d10d16ff39483edef396f0bd5c1098520e9d138c0e0
 EBUILD gnome-terminal-3.46.7.ebuild 2991 BLAKE2B 21945f17c00d6313113ccaab7aa74875aa6b021c2ea3750451a88e7c5b6169d4c9aa7ccaba6323dc07410a13da9b69b9fb91358d9fe5e0da625d3e38834d4662 SHA512 ea6f02205efb73658b813f57e4362626875cbb7d2884710e2a20e69fc29d2f9d6ce1d0cb86ca5c088d1c31beaae353d8b0ec495a8f56b9caa5b37029027c266e
 MISC metadata.xml 544 BLAKE2B 9e4dda0925c1f09a6109a01a522965c0bd2d811d91e19054fecf09e2d732f6f03245410e7472c3accf83bc015e2747cf96dcf3ededb62cf4733ece3241e51389 SHA512 e53acf30ece7ccb0307f9bb750ccfb3e90bf5d468098fe42112f4efa0fd1823d10124d8f50bf1ac56fbe4ad188bb7446e1627f1a05188f602e6e11a33496b75d
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.46.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.46.2.ebuild
deleted file mode 100644
index 465352fb409b..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.46.2.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..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="A terminal emulator for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-
-# Upstream is hostile and refuses to upload tarballs.
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
-SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch.xz )"
-
-KEYWORDS="~amd64"
-
-# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gtk+-3.22.27:3
-	>=x11-libs/vte-0.70.0:2.91[!vanilla?]
-	>=dev-libs/libpcre2-10
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	sys-apps/util-linux
-	gnome-shell? ( gnome-base/gnome-shell )
-	nautilus? ( >=gnome-base/nautilus-43.0 )
-"
-DEPEND="${RDEPEND}"
-# itstool required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
-	notifications of long-running commands finishing, you will need
-	to add the following line to your ~/.bashrc:\n
-	. /etc/profile.d/vte-2.91.sh"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-3.44.1-fix-missing-wexitcode.patch
-	if ! use vanilla; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
-		# Fedora patches:
-		# Restore transparency support (with compositing WMs only)
-		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
-		# Restore "Set title" support
-		# Automatic title updating based on currently running foreground process
-		# https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
-		# Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
-		eapply "${WORKDIR}"/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch
-	fi
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use debug dbg)
-		-Ddocs=false
-		$(meson_use nautilus nautilus_extension)
-		$(meson_use gnome-shell search_provider)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if ! use vanilla; then
-		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
-		insinto /usr/share/glib-2.0/schemas
-		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.46.6.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.46.6.ebuild
deleted file mode 100644
index f8d7ad79a616..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.46.6.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..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="A terminal emulator for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-
-# Upstream is hostile and refuses to upload tarballs.
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
-SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch.xz )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gtk+-3.22.27:3
-	>=x11-libs/vte-0.70.0:2.91[!vanilla?]
-	>=dev-libs/libpcre2-10
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	sys-apps/util-linux
-	gnome-shell? ( gnome-base/gnome-shell )
-	nautilus? ( >=gnome-base/nautilus-43.0 )
-"
-DEPEND="${RDEPEND}"
-# itstool required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
-	notifications of long-running commands finishing, you will need
-	to add the following line to your ~/.bashrc:\n
-	. /etc/profile.d/vte-2.91.sh"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-3.44.1-fix-missing-wexitcode.patch
-	if ! use vanilla; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
-		# Fedora patches:
-		# Restore transparency support (with compositing WMs only)
-		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
-		# Restore "Set title" support
-		# Automatic title updating based on currently running foreground process
-		# https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
-		# Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
-		eapply "${WORKDIR}"/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch
-	fi
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use debug dbg)
-		-Ddocs=false
-		$(meson_use nautilus nautilus_extension)
-		$(meson_use gnome-shell search_provider)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if ! use vanilla; then
-		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
-		insinto /usr/share/glib-2.0/schemas
-		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 8e3ad240aadd..1f786242135c 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 9bcb899273fa..5f4e6f36593c 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,12 +1,8 @@
 DIST adwaita-icon-theme-3.32.0.tar.xz 18540012 BLAKE2B a82ca6758cdbf459ac617d3b3d834e4147c3a3c5e6ca7c705ed2d16e8cf0a1255f5ae999d7e930b9716585b8c498c220f1ab40fec929dde7679efd56f3b18a45 SHA512 9609732cd51c6794d4d86598818bb2a589b0f4b6b795e57f3507dad69b21ef1b2fc2e83e24e937428bbace32fcccf587a5771cbc02c5768206e704f0456a6d1d
-DIST adwaita-icon-theme-42.0.tar.xz 10407000 BLAKE2B 1ec998731b8da4ed17d7bb5887faba7a33721955836265c67efeffcf16bbb82e6f20750245b9b6d7dc4e816ec0e6ae71cb51a839debb0e070edf5d347d6260d5 SHA512 521bfd44fdc253f5fd01fcdfaa485669849ad73c35354ccfe9b358ba433cfa40ee6d68b70ec2268a4ce0631a48670b03b30811ca68e2e19f9430082454e02015
 DIST adwaita-icon-theme-43.tar.xz 10399380 BLAKE2B a8822d162f4c2c1ae0970a8c33175a5881748fb9868afe0d690cbf2b937d6f42cc37f8c4fffafd110557b62f17563c038126bc75c31364a6396074fce34c95bf SHA512 fe0c186c2dbe87ccf2373bde1bc5ab658e8cd64bf0e5a3b9cd1117d5c1bf2ef5cc83b76b7fae54fde1566a07b572d8bb9441f437e44813338195e191dbb2a021
-DIST adwaita-icon-theme_42.0-2.debian.tar.xz 38420 BLAKE2B 49d88218881bd064394faa320a90e0ce1ef3a1295fbb1fbb276fb79f99f1caf7a6b1b1600ad6c648a6cb479e7bc429101cd0c327bcb8da64d50c7ea1e7a1c8fe SHA512 0bcbad6e63a05b3e916b76e6e6e5b629cf859d7bfa8e0edb53112967921cc00b9217270b663aadd36bde4bea38769345ea54593337cc0c524cf998266a4a3f65
-DIST adwaita-icon-theme_42.0.orig-41.tar.xz 17086916 BLAKE2B 6899bf734a3f708e6596a4aeb2df426041dd46232a3cbd55f530fab2cc92277db74322a31a443e251a06c74bf7fad7d5f9394b63edb33fced5ce8987e5c87d3e SHA512 2a540f2b53cb64433780029ea70c2cfe8417ae7e619d8eefa59825e3ebcb8585acd4ccae25344c8e146a0ee0705ccbb39a2cb729a162534fd86a4ff24e505c86
 DIST adwaita-icon-theme_43-1.debian.tar.xz 38772 BLAKE2B a91929be7348e076e4210463489c812860a8fc85d1e31ef250b2be5f240a592dcb50da596debca9d384293e11fedf7ffa928e02473374335a65611f8d3f22cae SHA512 fc1a982d9f5d25d6b0f58798ee7df507d59f3bb4b5dc8e388e83c5cdf9994f2cbe321c0ec7a89bb45bd7dd41479791b5e7d9eb1b12518ea0c2cdf12c98624b1d
 DIST adwaita-icon-theme_43.orig-41.tar.xz 17086916 BLAKE2B 6899bf734a3f708e6596a4aeb2df426041dd46232a3cbd55f530fab2cc92277db74322a31a443e251a06c74bf7fad7d5f9394b63edb33fced5ce8987e5c87d3e SHA512 2a540f2b53cb64433780029ea70c2cfe8417ae7e619d8eefa59825e3ebcb8585acd4ccae25344c8e146a0ee0705ccbb39a2cb729a162534fd86a4ff24e505c86
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD adwaita-icon-theme-3.32.0.ebuild 1608 BLAKE2B 9fe50b4414ed37f44d8db02017e263c2ebbda88304422d56cead5eb65a0ffa74262241e5f41333ac823d6b0bdb04fcb28746ef7058be7fed349bcc34853f12e4 SHA512 a145ffb05832fbb569efa21c166cb004f94605dcfcc7c1b2a10080e9ae641902357d6f9d7a773bae3f43fa024c6ce3bf9231a93fc0366f46bda961930b5e2112
-EBUILD adwaita-icon-theme-42.0_p2.ebuild 3738 BLAKE2B ac74d2d5709b54dab08e1f1ead63ebea770f5b90615416a8dab2b75b790304525c227530b70f105dae1e8b7b0ebacf5ba5872fe3847a6b8c3303993e93b4c940 SHA512 b40d2ba13317c8c2d8ea149a066f836acb4d968d9e8eceb63ddf921492e0d278d086b7680dc6e0a5a157ed75f1a573fcfde4c5f5928afcf4bb8e2ac3e18f78d9
 EBUILD adwaita-icon-theme-43_p1.ebuild 3023 BLAKE2B 7bc74a6939afa3561f43c80a6a982cc72fb64916c58eae3c0f60bdcdd0fd290e9c6f33973fed3c708194086aa8e0c6f11b41a6143256a6ca01892124948b17c2 SHA512 7c6bba299405a5f246403b52920d2a135cc635dbc6ae156ada090a1060d2cb1534f61443e6f617ac578bd43ec057b5569be17c1018ec0a3b8f457a450129437b
 MISC metadata.xml 384 BLAKE2B f5445038d2ce25be0dc9990f704a7eaeb202de544fca1c588e4eb2f6ac945df58ffc1402bc0ba689069ad818b728842afa033931885423abe26eb357d8bac0fa SHA512 e3b17fac8cb1d27b39795745049ee81f5ac3499c198b6a1eee08298499b9e124526828a5cbcfefe7744f1efdc65e869ef0124b5341dc09228c11c742f295780d
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0_p2.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0_p2.ebuild
deleted file mode 100644
index 9fbfb4524373..000000000000
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0_p2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome2 python-any-r1
-
-DESCRIPTION="GNOME default icon theme"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-
-# Rely on Debian workaround until all involved upstreams agree on how to
-# fix this: https://gitlab.gnome.org/GNOME/evolution/-/issues/1848
-SRC_URI="${SRC_URI/_p*}.tar.xz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig-41.tar.xz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-LICENSE="
-	|| ( LGPL-3 CC-BY-SA-3.0 )
-	branding? ( CC-BY-SA-4.0 )
-"
-SLOT="0"
-IUSE="branding"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-# gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
-# librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
-DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
-RDEPEND="${DEPEND}
-	>=gnome-base/librsvg-2.48:2
-"
-BDEPEND="${PYTHON_DEPS}
-	>=gnome-base/librsvg-2.48:2
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-libs/gtk+:3
-"
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${P/_p*}"
-
-src_prepare() {
-	if use branding; then
-		for i in 16 22 24 32 48; do
-			cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
-			"${S}"/Adwaita/${i}x${i}/places/start-here.png \
-			|| die "Copying gentoo logos failed"
-		done
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
-	einfo "Configuring legacy icons"
-	cd "${WORKDIR}/${PN}-41.0" && gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
-}
-
-src_compile() {
-	gnome2_src_compile
-	einfo "Compiling legacy icons"
-	cd "${WORKDIR}/${PN}-41.0" && gnome2_src_compile
-}
-
-pkg_preinst() {
-	# Needed until bug #834600 is solved
-	if [[ -d "${EROOT}"/usr/share/cursors/xorg-x11/Adwaita ]] ; then
-		rm -r "${EROOT}"/usr/share/cursors/xorg-x11/Adwaita || die
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Gentoo uses the following location for cursors too, but keep
-	# upstream path to prevent issues like bugs #838451, #834277, #834001
-	dosym ../../../../usr/share/icons/Adwaita/cursors /usr/share/cursors/xorg-x11/Adwaita
-
-	# Fix until https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/706d29cc5ca35bef6d0b3e682ae1752f33bf2705
-	# is in a release
-	dosym ../../../../../../usr/share/icons/Adwaita/scalable/actions/media-seek-backward-symbolic.svg /usr/share/icons/Adwaita/scalable/actions/media-seek-forward-symbolic-rtl.svg
-	dosym ../../../../../../usr/share/icons/Adwaita/scalable/actions/media-seek-forward-symbolic.svg /usr/share/icons/Adwaita/scalable/actions/media-seek-backward-symbolic-rtl.svg
-	dosym ../../../../../../usr/share/icons/Adwaita/scalable/actions/media-skip-backward-symbolic.svg /usr/share/icons/Adwaita/scalable/actions/media-skip-forward-symbolic-rtl.svg
-	dosym ../../../../../../usr/share/icons/Adwaita/scalable/actions/media-skip-forward-symbolic.svg /usr/share/icons/Adwaita/scalable/actions/media-skip-backward-symbolic-rtl.svg
-
-	# Install missing icons, bug #844910
-	# https://gitlab.gnome.org/GNOME/evolution/-/issues/1848
-	einfo "Installing legacy icons"
-	cd "${WORKDIR}/${PN}-41.0"
-	emake DESTDIR="${WORKDIR}/debian/tmp-41" install
-	"${PYTHON}" "${WORKDIR}/debian/move-subset.py" \
-		--icon-names-from-file="${WORKDIR}"/debian/legacy-icons-41.txt \
-		--icon-names-from-file="${WORKDIR}"/debian/removed-icons-41.txt \
-		"${WORKDIR}"/debian/tmp-41 \
-		"${ED}" || die
-}
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index d0e1cce813a4..283a3a92c551 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-backgrounds-42.0.tar.xz 51639368 BLAKE2B 3dc288732a91d53e2db9cfca5e529c3a6bda4d272645090751349485836a3c6807bdc071a9ae9ae58032265155a04c2b381cb7479fe913608cf9e39ff0ae79ed SHA512 31cfbc52ec96bc4ce77960620a895af7f10c1fc4d474b589d49f3d1198b41792ab443bf8d7a661e71778455ab066f034c7fb6655e96db028990de0788e464e1d
 DIST gnome-backgrounds-43.tar.xz 32816552 BLAKE2B b6b954ed102afd81e7ca1c370acb449b2ab4acec458306b4a740f2669037a9a8f741a9b4403cb509ad6df04cfa39ba6bed6b771e0b7d20d974a436480967de71 SHA512 e41e87e20da6a7d4c88d6b68832615709c3cf5d28fbb1a9c1a2af1db7e9c1db56ede141ac45df2164c6d919cb72f81e6e7d014bfe1f340759cd386c3a05217c2
-EBUILD gnome-backgrounds-42.0.ebuild 458 BLAKE2B b0cb22b5b5a6485ce1347604702bb665d737e5b7d95bf1e521897ac39c4f9b03300e15f1453de6c02085ae43dc2b7fd8330c818de6c8f1b2ef86a99737ea0c9c SHA512 1a79002a2840421cfa343882a05b40e9a4e68c9640fb8f221c239d270fa7de553295775abf00695c1c3bbf9fe814a496e61db5f2a653ca08a57b1bfc1c7928be
 EBUILD gnome-backgrounds-43-r1.ebuild 481 BLAKE2B 3ec106dee2fa0c41dbfd47530612f7cc5591164349d817949e3d92f22437b3d3a11db6d596824c4fe25c34a5dcbabc42e1fd15e6855eb8b01d962a9933b0c591 SHA512 7da9e139c06fe4227e9d01513972fbb06f45ff9a01dc909aec67366cdc4a9d95ec41f78c754dc92183b047e9ec283169b70e8478088719f0b4015819f013084e
 MISC metadata.xml 358 BLAKE2B 7d666491973a405a7657f7c54ed78082aa3f13f1ada5a38957ede5894c1e849cab4d04f71809ed1fddd64964bc7881b5098d44b61415803ae7c08a05d4359ef1 SHA512 b8bb7ac7eb7d24e475163e633997b1c14e720933bae10927aca0a88f853e610f81d041c98bc24b95b84c782aca60c7549c89cb0361f68134efdfe660cb8da937
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-42.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-42.0.ebuild
deleted file mode 100644
index f35589d4838f..000000000000
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-42.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson
-
-DESCRIPTION="A set of backgrounds packaged with the GNOME desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
-
-LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND=">=sys-devel/gettext-0.19.8"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 3d1ac1d69e26..96a0145e2d26 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index e3ebb27b4c68..efca44292032 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,5 +1,3 @@
-DIST metacity-3.44.0.tar.xz 1973772 BLAKE2B 24582202543d8f1c29632843615b841be1ec9b03fded4f22d92b50249d7ad9c2978f290633e5a9483f3dec0005b48d8f824e5dd1e4f6f42a52963285b8245f42 SHA512 3538a08633e13f727f8a8ff0c4dcf8cee411d3c4fa011b2391d94e47f3c27516b1fce9f742abb2d845571ae9c148097ced94b33d152919981eda4133e2eaa87e
 DIST metacity-3.46.0.tar.xz 1958124 BLAKE2B f7db5d38ab2c9aef8809f02ada76a453e712a471d59c3c991d0e1a5cfa1b9d37f901f38ef9057301a6232fca49846af0e80c6792bb5dcffa85694f64983d918f SHA512 5a203a4190dc919ec83fa3f4f7a86aa1594c82051b4e5afb76eb11acb38c573367deca85dead64564e2e96304903cd84eb5b4fc904ddc0672677114103d299b2
-EBUILD metacity-3.44.0.ebuild 1289 BLAKE2B 6f454bb3677428e6b63f868d2be60bcd7aab5c568a89592445ee11f52c87d1906c540537ec6f8cbc52f0874ac63691b35764ccd559ebd35439c2d3c8092a3a37 SHA512 a336d179dec5dadc00d749a4f0dffafc5c01c59414ed1d7c790f1157d663d18ab2484e693b69dde4ecefac743d68dc3d9718e406908ee8ecdd848728038f0692
 EBUILD metacity-3.46.0.ebuild 1295 BLAKE2B a5074328f70255fc349b80bda1229498c7c45111f002978ef6d9af8bdff738fabd5932affbc3c37103494b9feb2fd1dbb094df31e437535c44a943c56e861648 SHA512 d508ed8fc03f232aab0d9a652ee264a1d729dac264e18835a8f0b8b31e1e08055043bd43aa764ecb8842dce17ac07b11b4a6d84210cf98e29b0f48885dfb6b4c
 MISC metadata.xml 587 BLAKE2B b3cf07b5d226dba9d333ca3c897727b165663ddbd112924fe6d751ded222054f560bbf3b541f3d884040a8e25ef672f912d20e4b8cb2290e9888567a2b418f9f SHA512 07f9e9ecdc9d2934c6ec6d2d314336a1887ac1a39b7384cc994a745113949850411c5b0707c61dd6c902dae5fb0578768cf1a03c76daf5ff1071a0b4bb42d6fb
diff --git a/x11-wm/metacity/metacity-3.44.0.ebuild b/x11-wm/metacity/metacity-3.44.0.ebuild
deleted file mode 100644
index 842bd646d0ef..000000000000
--- a/x11-wm/metacity/metacity-3.44.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2
-
-DESCRIPTION="GNOME Flashback window manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+libcanberra vulkan xinerama"
-KEYWORDS="~amd64 ~riscv"
-
-# TODO: libgtop could be optional, but no knob
-RDEPEND="
-	>=dev-libs/glib-2.67.3:2
-	>=x11-libs/gtk+-3.24.6:3[X]
-	>=x11-libs/pango-1.2.0
-	>=x11-libs/libXcomposite-0.3
-	>=gnome-base/gsettings-desktop-schemas-3.3.0
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXdamage
-	x11-libs/libXres
-	x11-libs/libXpresent
-	libcanberra? ( media-libs/libcanberra[gtk3] )
-	>=x11-libs/startup-notification-0.7
-	x11-libs/libXcursor
-	gnome-base/libgtop:2=
-	x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libICE
-	x11-libs/libSM
-	gnome-extra/zenity
-	vulkan? ( media-libs/vulkan-loader )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	vulkan? ( dev-util/vulkan-headers )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-" # autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable libcanberra canberra) \
-		$(use_enable xinerama) \
-		$(use_enable vulkan)
-}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index a25a1fc0676c..e29f5c5347ff 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,12 +1,8 @@
 AUX mutter-42.0-Disable-anonymous-file-test.patch 765 BLAKE2B 7d223e0dc98963b61cb0bc26ec22775e87942f88f97af7dbcde63e0d960f5b41afc3de0b358b0c6252de90af4451d4fd6c75b7815ab573c7199b0c82cdd1eb7d SHA512 c066d1b5541078c6cc8d2788b36935b9aff0f1fbb800f39fa4674755a6842be66736c57b43d5edb00e5c18a33c1ff17d54a546134e5aae8ebd9a8967cd46b164
 AUX mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch 3102 BLAKE2B 8adfd306044014776bdfe46bcc45f1333af2ae5ee7ab195fed0c6f1f852723670f90aa0fd7476bd59f0b1c76a4b91521f3a19f9ba0f584f4699075b484aa0dfc SHA512 e751600b5f82ae1330f888c891f302c107fd5da1227392774e8ef2aa681c528be28c78ffd64f832e8aaf31179eeecc12575bc34e3d80d2ab638f3aae099c8cbf
 AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e7c2f30dc143100b1f564d816084cf06043439d44697602f042e4905121e949c7a5397556a32815eaae9bd2d671d1fdcdb6ca863fb7d4b1 SHA512 b1a9e7c01e35c1c00f34412f7522cdd601cf3af569a571fe9353839429cf76bf6d9b847da500663834c4eae6e05031eaa4ec770ee89807978a784db4b1bc813b
-DIST mutter-42.4.tar.xz 2747580 BLAKE2B 8627e1de8ea93498ff0abd0605836c5b70bb9e51e50ade93b6dd332393892c167aa0cc58f45621e9838ea885834d915ecf2c75c8493fbd154930d4c7427c1010 SHA512 fad80c2c3e6674c00e35783c69886ed728c732743ec967756329c5fd3dd7c1b5695aa0dca7e5d8a3bcb72d03ec06bbdc45c14cc775d40db2852b2299c8b0df03
 DIST mutter-42.5.tar.xz 2743636 BLAKE2B 87ee26ccee6c21404ac069e7b35d2b93ef38d0eda0963107c08a72599915fba56a653968fe456afa42f4eeb28aed5526d23d344f7e1f9f4fdf9cf35b5a66fca5 SHA512 cd7ef29211a1568f5f8d43182da6569db22005c0b67204a300edb4952d9c18f73def1558843a009a7475a82d7ce9754bd8741b214a931764798dbeaaecbbec49
-DIST mutter-43.0.tar.xz 2768452 BLAKE2B 4b5cddbadf0e71b26f37725cb301235e0ae33e627d95b5ef730a3787e0af4cd260cea47563ccc39d24d7baf835ae545928ee69fe30327347ffc1b476f92c6a21 SHA512 e7169dcefbc5f1d47581981ceec4d6ac47d75ed9d4ef0b18adfe1dc632645217c4546fdf004544902642b3e0dbb48f6025ab9a5ad9670765ccd972c6409e8611
 DIST mutter-43.1.tar.xz 2779416 BLAKE2B 1b7bf1ec44f6e47a859e84adb93a869be261ef3699ab773014e1497ea6c944e91d7a1766a2f126c79c1b21ba78e1ba25314c32113bc194f580d847e8617ae0d3 SHA512 6553ee855ebb3bb88bc12f823a5813c6b1b6ff983f1af716521b5e04903bc30112954e3e5d781516b087e247088cced1f560fce54eac28207a6cbc61d78b05b7
-EBUILD mutter-42.4-r1.ebuild 5461 BLAKE2B 0a61cd1d21dcfa3173f00934f07feed6bbef60eb3f290a71cc960fa1f91d3fa2901685d54a5829c640a385bcdbd5674b49c7bd3d6c94e7dc189c1d88697f5bc1 SHA512 ca7fa2ca79d0763f2ebcf2a7372f302d25ffc94063cd3ba38d371aa032ea0b79fa0fb21d5239fd9f7dd60be67ced1440cde709426436db672aa9f755f30aae53
 EBUILD mutter-42.5.ebuild 5467 BLAKE2B 3920ecf49ae942051a6211d72fe2b06553446837e6d97beca4be50b9f4f3ce1b8675ae84bda39c30864b6c5c84f9ca25ff6032a53f85a95584f3bbb949bc52c4 SHA512 d88f49dced450e61b7b7472238d2543939a5eccf1b45cf4cf2150a5d8715444f89a1811d87af241a211c451db0ace8285506da74b322832ab8a9dce528ea87b0
-EBUILD mutter-43.0.ebuild 5780 BLAKE2B 886592ce31a257b3b34f9633b6cffcfd84b78d8f63f30ef0a1aed891b512395fdf124600fa4b10a98d7b54aab783991a48eac83d20400f293a3d61fefb9c0970 SHA512 c1468a1cda7bd194221e249d7bb98b35924be62d8dd14beb315af8cdf2641e3c139a62411fbdc0762a4abc01c7a86dc111c0dea56568fe2a68d8a97887fc310f
 EBUILD mutter-43.1.ebuild 5793 BLAKE2B 444a74c57ac9385683c3105d20b9d4cef536a8ce0058c2f9c80b56e7973e0274edea1dd2dad0407048102fa6df2772567f63462b7ea172f347c5bbb1f7aa3207 SHA512 6ed94cc3411bb1481efab7242f8b1ee79b37e8fcd3940784dff2fc01525abc22e267111ed80e100708eeb49a2123b3c307c577dd94d75d66d73cc35042d15b95
 MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87
diff --git a/x11-wm/mutter/mutter-42.4-r1.ebuild b/x11-wm/mutter/mutter-42.4-r1.ebuild
deleted file mode 100644
index d19b0a688094..000000000000
--- a/x11-wm/mutter/mutter-42.4-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=x11-libs/libX11-1.7.0
-	>=media-libs/graphene-1.10.2[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
-	>=dev-libs/glib-2.69.0:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb:=
-	x11-libs/libXinerama
-	x11-libs/libXau
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	gnome? ( gnome-base/gnome-desktop:3= )
-	media-libs/mesa[X(+),egl(+)]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	systemd? ( sys-apps/systemd )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.21
-		>=dev-libs/wayland-1.18.0
-		x11-libs/libdrm
-		>=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
-		>=dev-libs/libinput-1.18.0:=
-		elogind? ( sys-auth/elogind )
-		x11-base/xwayland
-		video_cards_nvidia? ( gui-libs/egl-wayland )
-	)
-	udev? ( >=dev-libs/libgudev-232
-		>=virtual/libudev-232-r1:=
-	)
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	doc? ( >=dev-util/gi-docgen-2021.1 )
-"
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-
-	!<gui-libs/gtk-4.6.4:4
-	!<x11-libs/gtk+-3.24.34:3
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-		app-text/docbook-xml-dtd:4.5
-		x11-misc/xvfb-run
-	)
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-42.0-Disable-anonymous-file-test.patch
-	"${FILESDIR}"/${P}-backend-native-Don-t-warn-on-EACCES-if-headless.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_configure() {
-	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
-	local emesonargs=(
-		-Dopengl=true
-		#opengl_libname
-		#gles2_libname
-		$(meson_use wayland gles2)
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use systemd)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		-Dlibgnome_desktop=true
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use doc docs)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		-Dnative_tests=false
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		-Dkvm_tests=false
-		-Dtty_tests=false
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-
-	if use wayland && use video_cards_nvidia; then
-		emesonargs+=(
-			-Degl_device=true
-			-Dwayland_eglstream=true
-		)
-	else
-		emesonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-43.0.ebuild b/x11-wm/mutter/mutter-43.0.ebuild
deleted file mode 100644
index 283a4e11b4e7..000000000000
--- a/x11-wm/mutter/mutter-43.0.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=media-libs/lcms-2.6:2
-	>=x11-misc/colord-1.4.5:=
-	>=x11-libs/libX11-1.7.0
-	>=media-libs/graphene-1.10.2[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
-	>=dev-libs/glib-2.69.0:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	>=x11-libs/libxkbcommon-0.4.3
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	gnome? ( gnome-base/gnome-desktop:3= )
-	media-libs/mesa[X(+),egl(+)]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	systemd? ( sys-apps/systemd )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.26
-		>=dev-libs/wayland-1.21.0
-		x11-libs/libdrm
-		>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,gles2]
-		>=dev-libs/libinput-1.18.0:=
-		elogind? ( sys-auth/elogind )
-		x11-base/xwayland
-		video_cards_nvidia? ( gui-libs/egl-wayland )
-	)
-	udev? ( >=dev-libs/libgudev-232
-		>=virtual/libudev-232-r1:=
-	)
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	doc? ( >=dev-util/gi-docgen-2021.1 )
-"
-# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
-#	X? (
-DEPEND+="
-		>=x11-libs/libXcomposite-0.4
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		>=x11-libs/libXfixes-3
-		>=x11-libs/libXi-1.7.4
-		x11-libs/libXtst
-		x11-libs/libxkbfile
-		x11-misc/xkeyboard-config
-		>=x11-libs/libxkbcommon-0.4.3[X]
-		x11-libs/libXrender
-		>=x11-libs/libXrandr-1.5.0
-		x11-libs/libxcb:=
-		x11-libs/libXinerama
-		x11-libs/libXau
-"
-#	)"
-
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-
-	!<gui-libs/gtk-4.6.4:4
-	!<x11-libs/gtk+-3.24.34:3
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			>=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
-		')
-		app-text/docbook-xml-dtd:4.5
-		x11-misc/xvfb-run
-	)
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "s:#!/usr/bin/bash:#!$(command -v bash):" src/tests/x11-test.sh || die
-}
-
-src_configure() {
-	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
-	local emesonargs=(
-		-Dopengl=true
-		#opengl_libname
-		#gles2_libname
-		$(meson_use wayland gles2)
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use systemd)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		-Dlibgnome_desktop=true
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dsound_player=true
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use doc docs)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		-Dnative_tests=false
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		-Dkvm_tests=false
-		-Dtty_tests=false
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-
-	if use wayland && use video_cards_nvidia; then
-		emesonargs+=(
-			-Degl_device=true
-			-Dwayland_eglstream=true
-		)
-	else
-		emesonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}