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

66 files changed, 35 insertions, 1288 deletions

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"