gentoo auto-resync : 26:01:2023 - 19:56:42

42 files changed, 1 insertions, 741 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 407c634c0415..3e5895b712c4 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 76e91a2a9b4b..bbd01d7cd08b 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,13 +1,5 @@
-AUX cairo-1.12.18-disable-test-suite.patch 390 BLAKE2B 49db479ddcb636e80483357b291d66ae563d8dfeabde2f7b017fda4cb272cee856e9d29dfddcc22e3cfcb3e2ff62c9eba802ace0e5ef1e49aeeef26002482ec9 SHA512 097c1a32e007fb6852a0df1ad7f7eab6d00a422247055edf140d3f2b819122b16a9c09e21b9a601766a7facda1961262e68b078944877cab0b3b234eff149783
-AUX cairo-1.16.0-binutils-2.34.patch 2332 BLAKE2B a0df3d0f99b26a867ac554ee515c7e435f02f49c97806bd7d2684a8d6fd737014560c2451761273641b88d9892fb4f5d00f9ca22a1b021e4edece442e7cd7425 SHA512 ca05ea37273c17d4e6b3076f23defb028d25ad96cf99e65937c3e59f5cf9e63a35cb8374a8e0d4037b03f889f338628c9303686cbc6dd2d695505fdde2119c95
-AUX cairo-1.16.0-binutils-2.39-ptr.patch 1174 BLAKE2B 7afe9aba01102dcf8ea52a26db9830c18e9bcb5d87833de760ff8b4fe5343c2ed178a74d043ef6fa5ec1d5bdead6b8f41f11ae2c6fa46317a07e76ce966c123e SHA512 8499bb67c0c17131ebab37c114838876a7afc051691adba83d848663e38d83006dedfaa0553e05b99216767a8d6d93c13ea370bc2d2b3e417cac9ebda4b08fb6
-AUX cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch 751 BLAKE2B 9b693598ac8fec28c0479544cc02dfbd1daab171b88bf7b1eb6ee353fdd32ee4228f24723d3b4937b3f30838d68d2a9a6f87b40d08896b59d36345d7e9447a32 SHA512 33d8454b2173c5be1f53576c143781f2b802ee961cef496d6fec5ba58554f4302ea6c351dc64f133d93c5495dacb3d387b8a201bfc415d54f8c77e41e877d319
-AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b4814253084c5ba7946b29ee5c5209c2c207721d9699d9fbab83e40f6d10394e89fe7a23ea5dc194cfcb2495e3ac2b075e22fa83bb SHA512 569cc28538333cdd907e3c9f26dd6512e48188dcb761284f2414936d60d4239d7ac15a5836f1f390d4881cce71bfb62a0679e097386116ecf807ecd03bf0f03f
-AUX cairo-1.16.0-strings.patch 1379 BLAKE2B 60b63e80ae35385a0c2cbbface46379e76ad8cbc472d76fd68803330e42c49f9c71d662b1824ebf16fbd1bde794ec12a34b8e311758d6e639411e35cd1f34f97 SHA512 d9d9e95b80a0aaee703ff4f58526455db5ac57bce35237826ef4730c54f58b6752756ab92f23e36343e056b0e84269c4b692dfc40cc7836afad3b44fc46c2e26
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
-DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
 DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724 SHA512 1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
-EBUILD cairo-1.16.0-r6.ebuild 3919 BLAKE2B 4d35c54d4e93fa37dbf726f524b01bc44a0eee6179b1772823f6a08bc75085688bf3d1dff318f71599e8ccc8a46e5fa51c48f13ec0dd7553ad205bed5fbcde4e SHA512 65a715633863be2a29f97786b7db63e2b160f0fe342438d4df6c4eb9ca83ace1cbc6315da229258286f7547490414339b270ad2aa047955c9be5658a694be4c3
 EBUILD cairo-1.17.6.ebuild 2835 BLAKE2B 6d3239007d7bfa930aef8921756a95f68fafc4e316d48c9e65333313779f8fdb9839505dac7067869511b2f81336dbba254f8c2b366ddcb2f3937c809a3666c8 SHA512 a8195ce1e421200eca17618fcd768697ae78910deae20e97e8644cb1476ca1dd82979d8835902bd5a870855d099e98123fa8318fbf2e0ec819ab539bce9b52ea
 EBUILD cairo-9999.ebuild 2843 BLAKE2B a123d14d1e6cfbe5828662026ce2da1fd2a63a9e545f6abb05038d4b078e934706cb645851595fdd793542615155f74190d32864b0acbd498e86e3023eb04ceb SHA512 455855ba076c41cc60b819c76e77faea4a35b00a91f36ce2b8531f0acdc821f0d0def76fd79edfe6b9ade345744c9786786081295be2fd1d307bd07376f693c7
-MISC metadata.xml 935 BLAKE2B d435dd01dd10a8b95567ef6c5ebbe41a48affea6c583895e2be8d1767658ff91b4c4cad409dbcf5391585f03ef283364abab450a183076fdfbfc926608fb58d8 SHA512 70e88efc9758f49ea62c79cba5c010c3acbfbd319eb6e760912036a345606dc574284943b19b4683444ceea65209727b1c21747567df4cfe00dcec6d770dc2da
+MISC metadata.xml 781 BLAKE2B 93cef84890039f9bbf75544a857cf611b3444fed5f82611d0f180de9c0df4ec5ea468b569cf99d158135354bec1d06c3aab97e139840db7e18d2b0b8ce350731 SHA512 c8008c604fa8956301078eced6c2c355f0205d9fcdfae68da39b1019fa54724239c713cbbd5f44f3d4d1b4d4d21a75248a00e7da4adffbb1974b6c2d36a30ee7
diff --git a/x11-libs/cairo/cairo-1.16.0-r6.ebuild b/x11-libs/cairo/cairo-1.16.0-r6.ebuild
deleted file mode 100644
index 299a8c20e695..000000000000
--- a/x11-libs/cairo/cairo-1.16.0-r6.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
-	SRC_URI=""
-else
-	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/libtool-2"
-RDEPEND="
-	>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
-	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
-	gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
-#	doc? (
-#		>=dev-util/gtk-doc-1.6
-#		~app-text/docbook-xml-dtd-4.2
-#	)"
-
-REQUIRED_USE="
-	gles2-only? ( !opengl )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
-	"${FILESDIR}"/${PN}-respect-fontconfig.patch
-	"${FILESDIR}"/${P}-pdf-add-missing-flush.patch
-	"${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
-	"${FILESDIR}"/${P}-strings.patch
-	"${FILESDIR}"/${P}-binutils-2.39-ptr.patch
-)
-
-src_prepare() {
-	default
-
-	if has_version ">=sys-libs/binutils-libs-2.34"; then
-		eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
-	fi
-
-	# tests and perf tools require X, bug #483574
-	if ! use X; then
-		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
-	fi
-
-	# Slightly messed build system YAY
-	if [[ ${PV} == *9999* ]]; then
-		touch boilerplate/Makefile.am.features
-		touch src/Makefile.am.features
-		touch ChangeLog
-	fi
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myopts
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
-	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_with X x) \
-		$(use_enable X tee) \
-		$(use_enable X xlib) \
-		$(use_enable X xlib-xrender) \
-		$(use_enable X xcb) \
-		$(use_enable X xcb-shm) \
-		$(use_enable aqua quartz) \
-		$(use_enable aqua quartz-image) \
-		$(use_enable debug test-surfaces) \
-		$(use_enable gles2-only glesv2) \
-		$(use_enable glib gobject) \
-		$(use_enable opengl gl) \
-		$(use_enable static-libs static) \
-		--enable-svg \
-		$(use_enable utils trace) \
-		$(use_enable valgrind) \
-		--enable-ft \
-		--enable-interpreter \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--enable-script \
-		--disable-drm \
-		--disable-directfb \
-		--disable-gallium \
-		--disable-qt \
-		--disable-vg \
-		--disable-xlib-xcb \
-		${myopts}
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	einstalldocs
-}
diff --git a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch
deleted file mode 100644
index 6822121ce495..000000000000
--- a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 03fa352..7e11d24 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,10 +18,6 @@ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
- 
- DIST_SUBDIRS = src doc util boilerplate test perf
- SUBDIRS = src doc util
--# libpng is required for our test programs
--if CAIRO_HAS_PNG_FUNCTIONS
--SUBDIRS += boilerplate test perf
--endif
- 
- configure: cairo-version.h
- 
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
deleted file mode 100644
index a10cad5ee553..000000000000
--- a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From e30259f6237571c61992433c110bc6e1ef900244 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
-Date: Tue, 23 Feb 2021 11:36:24 +0000
-Subject: [PATCH] cairo-trace: fix build with newer versions of bfd
-
-And update configure/meson checks to check for the new function.
-
-Drop libiberty.h check since it's only needed by backtrace-symbols.c
-which we're about to remove.
-
-Closes #391, #460
----
- Makefile.am                        |  1 +
- configure.ac                       |  8 +++++++-
- meson-cc-tests/bfd-section-flags.c |  9 +++++++++
- meson.build                        | 11 ++++++-----
- util/cairo-trace/lookup-symbol.c   |  7 +++----
- 5 files changed, 26 insertions(+), 10 deletions(-)
- create mode 100644 meson-cc-tests/bfd-section-flags.c
-
-diff --git a/configure.ac b/configure.ac
-index 18e4a305f..6444a3da3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -826,7 +826,13 @@ CAIRO_ENABLE(interpreter, cairo-script-interpreter, yes, [
- AC_CHECK_LIB(bfd, bfd_openr,
- 	 [AC_CHECK_HEADER(bfd.h, [have_bfd=yes],
- 	 [have_bfd=no])], [have_bfd=no])
--AC_CHECK_HEADER(libiberty.h,, [have_bfd=no])
-+dnl bfd_section_flags is an inline func so we don't bother with linking the lib in
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([
-+  #include <bfd.h>
-+  asection *s;
-+],[
-+  return bfd_section_flags(s) == 0;
-+])],[],[have_bfd=no])
- if test "x$have_bfd" = "xyes"; then
-     AC_DEFINE([HAVE_BFD], [1], [Define to 1 if you have the binutils development files installed])
-     BFD_LIBS=-lbfd
-diff --git a/util/cairo-trace/lookup-symbol.c b/util/cairo-trace/lookup-symbol.c
-index f9665b36f..9af0b5944 100644
---- a/util/cairo-trace/lookup-symbol.c
-+++ b/util/cairo-trace/lookup-symbol.c
-@@ -65,7 +65,6 @@
- 
- #if HAVE_BFD
- #include <bfd.h>
--#include <libiberty.h>
- 
- struct symtab {
-     bfd *bfd;
-@@ -145,14 +144,14 @@ find_address_in_section (bfd *abfd,
-     if (symbol->found)
- 	return;
- 
--    if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0)
-+    if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
- 	return;
- 
--    vma = bfd_get_section_vma (symtab->bfd, section);
-+    vma = bfd_section_vma (section);
-     if (symbol->pc < vma)
- 	return;
- 
--    size = bfd_section_size (symtab->bfd, section);
-+    size = bfd_section_size (section);
-     if (symbol->pc >= vma + size)
- 	return;
- 
--- 
-2.34.1
-
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch
deleted file mode 100644
index 6749786d23bd..000000000000
--- a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://gitlab.freedesktop.org/cairo/cairo/-/commit/74f2da7b70179a363b5a4649b9c5d6fd18d9cbc0
-https://bugs.gentoo.org/868405
-
-From 24996e6ee241ebcd303dd34a2b06b37a6dd0c217 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@debian.org>
-Date: Wed, 13 Jul 2022 21:26:57 +0100
-Subject: [PATCH] Fix build with newer binutils-dev installed
-
-It seems the PTR typedef (or macro?) has been removed from newer versions
-of libbfd.
-
-Resolves: https://gitlab.freedesktop.org/cairo/cairo/-/issues/581
-Signed-off-by: Simon McVittie <smcv@debian.org>
---- a/util/cairo-trace/lookup-symbol.c
-+++ b/util/cairo-trace/lookup-symbol.c
-@@ -106,10 +106,10 @@ _symtab_init (struct symtab *symtab, const char *filename)
-     if (! bfd_check_format_matches (symtab->bfd, bfd_object, &matching))
- 	goto BAIL;
- 
--    symcount = bfd_read_minisymbols (symtab->bfd, false, (PTR) &symtab->syms, &size);
-+    symcount = bfd_read_minisymbols (symtab->bfd, false, (void **) &symtab->syms, &size);
-     if (symcount == 0) {
- 	symcount = bfd_read_minisymbols (symtab->bfd, true /* dynamic */ ,
--		(PTR) &symtab->syms, &size);
-+		(void **) &symtab->syms, &size);
-     }
-     if (symcount < 0)
- 	goto BAIL;
-GitLab
diff --git a/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch b/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
deleted file mode 100644
index 3709c5a90f80..000000000000
--- a/x11-libs/cairo/files/cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Mon, 19 Nov 2018 12:33:07 +0100
-Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in
- cairo_ft_apply_variations
-
-Fixes a crash when using freetype >= 2.9
----
- src/cairo-ft-font.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
-index 325dd61b4..981973f78 100644
---- a/src/cairo-ft-font.c
-+++ b/src/cairo-ft-font.c
-@@ -2393,7 +2393,11 @@ skip:
- done:
-         free (coords);
-         free (current_coords);
-+#if HAVE_FT_DONE_MM_VAR
-+        FT_Done_MM_Var (face->glyph->library, ft_mm_var);
-+#else
-         free (ft_mm_var);
-+#endif
-     }
- }
- 
--- 
-2.19.2
-
diff --git a/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch b/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch
deleted file mode 100644
index 19345f141872..000000000000
--- a/x11-libs/cairo/files/cairo-1.16.0-pdf-add-missing-flush.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4c8813f0eaacc32c27126ad2296951a626300b89 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu, 25 Oct 2018 18:46:17 +1030
-Subject: [PATCH] pdf: add missing flush
-
-Issue #342
----
- src/cairo-pdf-surface.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
-index 7eb61aa1e..939b2d2d7 100644
---- a/src/cairo-pdf-surface.c
-+++ b/src/cairo-pdf-surface.c
-@@ -7711,6 +7711,11 @@ _cairo_pdf_surface_mask (void			*abstract_surface,
-      * and most common, case to handle. */
-     if (_cairo_pattern_is_constant_alpha (mask, &extents.bounded, &alpha) &&
- 	_can_paint_pattern (source)) {
-+
-+	status = _cairo_pdf_operators_flush (&surface->pdf_operators);
-+	if (unlikely (status))
-+	    goto cleanup;
-+
- 	_cairo_output_stream_printf (surface->output, "q\n");
- 	status = _cairo_pdf_surface_paint_pattern (surface,
- 						   op,
--- 
-2.19.2
-
diff --git a/x11-libs/cairo/files/cairo-1.16.0-strings.patch b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
deleted file mode 100644
index 2c4742887e36..000000000000
--- a/x11-libs/cairo/files/cairo-1.16.0-strings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 23b6e8bb5798c77550da613fadc3da8b3be14573 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 14 Jun 2020 09:58:52 +0100
-Subject: [PATCH] build/aclocal.float.m4: detect 'strings' with AC_CHECK_TOOL
-
-This way all binutils tools are detected with $CHOST prefix
-if exist. And strings is allowed to be substituted with
-STRINGS environment override, so 'llvm-strings' (or other)
-alternative can be used.
-
-Bug: https://bugs.gentoo.org/726200
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- build/aclocal.float.m4 | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/build/aclocal.float.m4 b/build/aclocal.float.m4
-index f92db03e6..d9728c123 100644
---- a/build/aclocal.float.m4
-+++ b/build/aclocal.float.m4
-@@ -31,10 +31,13 @@ int main() { return 0; }
- 
- ]])], [
- 
--if strings -a conftest$ac_exeext | grep noonsees >/dev/null ; then
-+# allow users to override default 'strings' with 'llvm-strings'
-+# or ${CHOST}-strings.
-+AC_CHECK_TOOL(STRINGS, strings)
-+if $STRINGS -a conftest$ac_exeext | grep noonsees >/dev/null ; then
-   ax_cv_c_float_words_bigendian=yes
- fi
--if strings -a conftest$ac_exeext | grep seesnoon >/dev/null ; then
-+if $STRINGS -a conftest$ac_exeext | grep seesnoon >/dev/null ; then
-   if test "$ax_cv_c_float_words_bigendian" = unknown; then
-     ax_cv_c_float_words_bigendian=no
-   else
--- 
-2.34.1
-
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 605713de435c..bdaadf1326b7 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -10,8 +10,6 @@
     <flag name="gles2-only">Build the OpenGL ES 2 backend</flag>
     <flag name="gles3" restrict="&gt;=x11-libs/cairo-1.17">Use OpenGL ES 3.0 features (instead of ES 2.0; requires USE=gles2-only)</flag>
     <flag name="glib">Compile with GLib Object System support</flag>
-    <flag name="utils">Build support for Cairo script and trace utilities</flag>
-    <flag name="valgrind">Built-in support to mark memory regions</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index e37ee4627918..b1eae4c7b6db 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,5 +1,3 @@
-DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
 DIST libICE-1.1.1.tar.xz 335960 BLAKE2B 2849418aa0a66a9137481194bb91208fae4a1eb9a4f9f509b52da7668b8281b6c36f4ba4bdc686eb008a2561b89801fb9270b22887b7c5044e6c14a1ae94dfae SHA512 2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3
-EBUILD libICE-1.0.10-r1.ebuild 705 BLAKE2B ec84151d3792e185d97aee46735e9702f5396623b1ecb184b6efd125f534e2420686570e7e7153f1f52cebd90f45ee7551b749107ca5f9980995d6f9fe3d5d37 SHA512 5400d1d21ac457b08b33c0b78104fe2e1d4563465803853c119b412c33b7dabd8010f68a2f30ea2e0b532e8a82f8472bbad9cd7d0164d9e89fe37b5c44da11d0
 EBUILD libICE-1.1.1-r1.ebuild 695 BLAKE2B f562e0a311b357d825932ce220409b730338fea12e38b314e013e546ae13fcf7019540a50bf36fc9b1248fa8f38462f3c6c1a7637222cbb9e1b34efc523f57d8 SHA512 f0bcf4cff375d277ac14b5f81e0ea38354f68137f865e77c8049ce09605864aab237a717558e8181494ba376a725bd102a99b95d67242c4c121cf4680138a926
 MISC metadata.xml 337 BLAKE2B c895594110c07848bd58cf4a28df82dbdc5f26671689386a667afd32f3925d4b401887d992282416213be51536ee4d24fd00c0f85d52c98eb71d66854209055b SHA512 2718c47a51ba70e9622bd3bf5e6d987fa2f57d122e25aa972f71585ddf3dbdb8bf34eaa0492846e6230d951f8d557948e1d7e3f54ee27765b63e8f9f2e6fe604
diff --git a/x11-libs/libICE/libICE-1.0.10-r1.ebuild b/x11-libs/libICE/libICE-1.0.10-r1.ebuild
deleted file mode 100644
index e9665879d24a..000000000000
--- a/x11-libs/libICE/libICE-1.0.10-r1.ebuild
+++ /dev/null
@@ -1,27 +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 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"
-IUSE="ipv6"
-
-DEPEND="x11-base/xorg-proto
-	x11-libs/xtrans"
-RDEPEND="${DEPEND}
-	elibc_glibc? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		--disable-docs
-		--disable-specs
-		--without-fop
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 90896bf1ee3c..28d3ff174f43 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,5 +1,3 @@
-DIST libSM-1.2.3.tar.bz2 362595 BLAKE2B 20b7327cd16e066bd2a81eae60f52cab7499dd92d65786d0e5726faa64c2055376749562ff2158777f83711e1517b90b2dc94670892b787889b3950c0a975b68 SHA512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903
 DIST libSM-1.2.4.tar.xz 306944 BLAKE2B c1944cd8e25389cffc18e9f6e46e3543381a2d74036cff2c24f063c1defca001c94055ef278dc468123b1f60f145df5daf34bcec39875ad918b664a3c279777a SHA512 7f1d41b7b6c5dd456c49ccad7740c3ba9791a2793fa50fd94814a4164ce2e20c4a0a0ad42a87708e494ed5c23f611be6d3ccd9ef1e9add6d46ac545e2b0f6f86
-EBUILD libSM-1.2.3-r1.ebuild 1734 BLAKE2B dda743ea00a43c47cc31f5ab8906f61c55253a7d80ce8063e62151e29994ca7fafeb8fc9d45ca2bed10def369422498e4a3a70f0d3d334fcf03a63b37d104e64 SHA512 fa213a1b1d6ca0e18c6396348c4828d877f5c821fa090025c7bd0fbde28d80b7d1cb0d7fd6b391afd230914021968ac74a303200d9a574a753dd204cbf71962b
 EBUILD libSM-1.2.4.ebuild 1747 BLAKE2B 8d86b5890bc9ca5088ca26a29bd89da87888cb3488f8193a458c811398a0b37653812be9fc33a5463c0170e58a4b2750b89e0ff63a0b267344c854de63ad9e44 SHA512 81a196b31c034071f3dea319bf580526a7fa8fcc03547919144b8af5f561e1c5552afad1245b6760106e01abd0b1ddf52ed9adbb78cc4967cc366f083a81be60
 MISC metadata.xml 457 BLAKE2B 895411214399309db731cd3f1c5c49ec5a505aa4a7a03e9fc39e7027b1956aeae7b0ffebe1d6f4500eaba907c0aa2ce7332f56de0b53ebc26dd000835a29c9ce SHA512 9e810808a715e91e939d710c5633675d4a7d74b2a18d8054d1932f6022bf186ae981b1ffffd81893bb1959923ddf541908a24656e7c308589994178dbab9ff60
diff --git a/x11-libs/libSM/libSM-1.2.3-r1.ebuild b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
deleted file mode 100644
index ba364af1a29c..000000000000
--- a/x11-libs/libSM/libSM-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,61 +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 Session Management 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"
-IUSE="ipv6 +uuid"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-	x11-libs/xtrans
-	uuid? (
-		elibc_Darwin? ( sys-libs/native-uuid )
-		!elibc_SunOS? ( !elibc_Darwin? (
-			>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-		) )
-	)"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local withuuid=$(use_with uuid libuuid)
-
-	# do not use uuid even if available in libc (like on FreeBSD)
-	use uuid || export ac_cv_func_uuid_create=no
-
-	if use uuid ; then
-		case ${CHOST} in
-			*-solaris*|*-darwin*)
-				if [[ ! -d ${EROOT}/usr/include/uuid ]] &&
-					[[ -d ${ROOT}/usr/include/uuid ]]
-				then
-					# Solaris and Darwin have uuid provided by the host
-					# system.  Since util-linux's version is based on this
-					# version, and on Darwin actually breaks host headers when
-					# installed, we can "pretend" for libSM we have libuuid
-					# installed, while in fact we don't
-					withuuid="--without-libuuid"
-					export HAVE_LIBUUID=yes
-					export LIBUUID_CFLAGS="-I${ROOT}/usr/include/uuid"
-					# Darwin has uuid in libSystem
-					[[ ${CHOST} == *-solaris* ]] &&	export LIBUUID_LIBS="-luuid"
-				fi
-				;;
-		esac
-	fi
-
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		${withuuid}
-		--without-fop
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index 50b411dfc521..269451b53218 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,5 +1,3 @@
-DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
 DIST libXScrnSaver-1.2.4.tar.xz 264384 BLAKE2B 03cd9431dd8efd4842d5775c7b8219941c1ee6e440fa38111e7f582b10c554cbedd03511494920d09f57fd278eeb05987043f730882e27d998dd9b71a0bca7a3 SHA512 e4395af85f8496618afb23ffdaca1a75f5e3d213478d8dc73249cbc9840d7b993ba7513dbf6015cb38b48fe3f2223496365158a148dd5e1ac7475c5ee569e28c
-EBUILD libXScrnSaver-1.2.3.ebuild 505 BLAKE2B 1cf5c8e85118fff5b523b2ededaf33c90b54d2570bf47734d7b65cb8eae0b23570714f6d731cd997cbfde6850fb984db536abeee9daf4da11440756a3cb52d8c SHA512 2f72ec0d033e2ac812fada24512eea8aa40646a22d03438684666545b8d0d607359c7d899da87497f151fbd24dd8209ac4c279bfe7a8e367c2f17dd3b3eb7617
 EBUILD libXScrnSaver-1.2.4.ebuild 529 BLAKE2B 9c8f7b2d6b20b0ed8fb247d9901e79c75243882d91807c6bc952dcb5c3f1b2fe4b7d0f8629745a257732055cb686be9741e5d4aceb2d227db02a3a16be89d648 SHA512 d7fd8d90cfe19121fe7ecee3b12f299864897abb37987d90dadc3181a157a2ceedc0d90228ac5f76691d6af49097eb1211858bae785a55779f3ccf9bfbc145eb
 MISC metadata.xml 344 BLAKE2B 38592243cc511ed03e89684471df8496b65fd4e0c1dfee85cfff8eed5254cc1cd0eeab3da541ee094064dafcf1c69f2d05c4cc458f27e84e77871eca47bce075 SHA512 8fe30e64a2916afb8fc6b37454d5bcd10aa515d80f8af32b2a92faba055650d96e7385b48d503259cea360a503a240bc1eda2694d4e3020e7c4e5f36ac0d4e74
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
deleted file mode 100644
index 90def7debeee..000000000000
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.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 XScrnSaver 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 ~x86-solaris"
-
-RDEPEND="
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 29156783d64c..c8e790e65378 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.11.tar.xz 274108 BLAKE2B ffd037d6a5bd8bbf10d15747469c5277b3061b87793d8acf095f60aa121bdc0831da9d3e6c369846fd40d2ba03ef209e1e8febff64736d4ececd135a8fabb0a3 SHA512 f56abba3bef3fdd4739dfa69367a4251b5fab7c89194c9aece9efa66b9ebbf0736690cc9bd654aab19d9db377e4b9a5268c9c020b3d293bb5351bff5fe75a4dd
-EBUILD libXau-1.0.10.ebuild 484 BLAKE2B 7db594594fcf1d8634aed71a0378c90ea89c1aa7b9e5a845075ee563239773c5efc0b858650fddf1dbb5a810dc94027d6d912eafe90cdd4f566bea8be9aea70b SHA512 3ff6b92b19efe828022d19c3dacac4ba77d38559dad70bfbc2cea1df857dd3655f065c75b89f0a465538a0b77f0e8897dd9ec2912c2ba4890f272809ef9a4c57
 EBUILD libXau-1.0.11.ebuild 484 BLAKE2B 0720204b8f81317ec20d98c7a5f206d9c83287ef0b45f32804ecb23e27ce8a8e6381e4ed6062e20c13c0f8edbc1472cf632b6d0d416b5d766233c54e7c4021a0 SHA512 3349d81169ad6189dcd180feeddad7fccf2e0dcbcfb7176f2f3c74b9c4b0e314bc4ef2eb691e9e5702ee0a4d75dffef91cd1922a46ddf62c34662e8f0eeac4fb
 MISC metadata.xml 337 BLAKE2B bccad5dd3ea84c6ca278438b94fbfc3e94b65b1808a5004c71c10023c774528084e5afd9e17bc852d2e0b8cc966539d02985ba4485e05e92c7b404277250e50c SHA512 8c81a02a3f99267055e0d044a99b3add40e6737236718e1d5cca35b21b417295a4eae9405c6becd7b42792bb1e387c44bf9c3c31f163f8414da265ff21f41904
diff --git a/x11-libs/libXau/libXau-1.0.10.ebuild b/x11-libs/libXau/libXau-1.0.10.ebuild
deleted file mode 100644
index 075339292021..000000000000
--- a/x11-libs/libXau/libXau-1.0.10.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-XORG_TARBALL_SUFFIX="xz"
-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/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index 7e557fe7be5c..71abbb11b639 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1,5 +1,3 @@
-DIST libXcomposite-0.4.5.tar.bz2 316993 BLAKE2B 4dc01b4c3fd85bdaad1ab9d9da0668caa162957056284fe864dacfcad302ddacf32a3ca233efe191592121a42783e04d5844277ef8ede21951e890114120ba22 SHA512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5
 DIST libXcomposite-0.4.6.tar.xz 265596 BLAKE2B 1e017ac65c7fb9973f8a1ad06116c67b9ebecf880bee8fb9b2afd83e85ec53853eb082c7edfb6a53f1a8451ac8c61c63c540facbf97953997695b18d65d00c45 SHA512 f35a0da8f9f22fd788eee01209557fe3a1b1abdc9744f76330ba42b21b6e3af5464ca4451c33415856417c30da5aa5624e3707980c644327249bfeda5a62a59b
-EBUILD libXcomposite-0.4.5.ebuild 632 BLAKE2B 314d563f9a89d1a14f527be94ad863ea5f5210ace187239fcf6a002ac7633cdc295259df95effe240ca34a20dc52a8b4160c808b1b430d0e81bc4e8d1900d56b SHA512 85d469c84a100b901f372df3e7cc442a238afb0917814189cd6c6f762d8963dbc642c1513d35736c45b6ad133e12ef2e4d482367d38263d2b16df6343ada1f20
 EBUILD libXcomposite-0.4.6.ebuild 654 BLAKE2B 393108ded120979b122abc8bff90c9eb5d6bfe2d826c36556a331a8336c3886ae4356cfd0ca48a935f89a45a6570d002fd387ac9072b8064a781de35c769eed6 SHA512 67805ab37f97a492d71627407fd8c53a56ac738d6d81e215eadaad9485e9ced9155476ee5cf79492b65d57acf9722ea649355429b89ad9381417a98ba7b3db6e
 MISC metadata.xml 344 BLAKE2B 4e9d885da27e4236caf1cc43695d87d4fb87181c60b1f4ee8d732f8d0cc090d9350ae9f48f0e9bca95fc64232327729c845bebbca0e2f54d31f78a1c075b1ae6 SHA512 8bb10302971adf52c2e2cb3cff8266e533b0913527f551dc1d73595d72a3e214a22eaa41ea85f35345b3e0a0020f3b0ff0eee6bf68542c275a39e48e6b706ff0
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
deleted file mode 100644
index 48338333409e..000000000000
--- a/x11-libs/libXcomposite/libXcomposite-0.4.5.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 Xcomposite 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"
-
-RDEPEND="
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index 007924809ba5..ec1419a1d478 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,5 +1,3 @@
-DIST libXdamage-1.1.5.tar.bz2 303750 BLAKE2B 78cb593365cc842cbc6fcb4dec94aa28293c385ad7ecfef032117d19e98c7b3f252c53b79559096b1c0b259d24a59220e9af7fb60d55c55f4474a33d117958de SHA512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124
 DIST libXdamage-1.1.6.tar.xz 257532 BLAKE2B 9b9e21c180fa2ddfeb15e97edc1e7665de722f7fdf9997273fead3348df78b8eec610181d7fd2ef41af7305286285ccf57b56fe7859ebd863b9d8bc1321247c8 SHA512 624dcefa1c79064569df952892f7f1351dc19ad338ce73d1a57041e406cb3e18abe531bab352b93d1f0f5c9b5c6b2652cc84a8f1fbfcbba648343812695a8acb
-EBUILD libXdamage-1.1.5.ebuild 516 BLAKE2B 52bd82b984cb5786c2632e8331d597a98e9b7195d2a2090775af7ca2a8ebaf01ab7bb378fb26aaa9f6b6862eed48fad700d4e08a8bf5fa8da1d9cc550d2a2245 SHA512 3163f4ddf0a08a53fd8a8d7fbe959c109f5f465ae5e1c319f44287737a082f6837be78e864cad43d25c4b223b5c4fa99c689cba46fcb65a4318f73e8a414d073
 EBUILD libXdamage-1.1.6.ebuild 530 BLAKE2B a8712ad6b8527a609635a65f46ee3ea928f5ee2b7cfe6450458d97bf711c82303b579cefc69ae2f4e458209209801654cc420a5c380bd33b15065d05f1e56fa9 SHA512 51004b75590e61846b0512f8f4b74932bc72a2b254b916427612196a7bf0b60b84a97bbb86cd5c6acc15acdc83011dd18a74f422218887973b750da5837f0b0e
 MISC metadata.xml 341 BLAKE2B b0dba30641b99c64904acd6ce23f90ac0618c3274fef812ac975f25a441ccbe75621f4f586666d6ed51a939f61165dd36381dc650b4ae39b7cc32c35940b20d8 SHA512 63d404d9b62a3b5f82511a4f472059e890f55a006b29a6f5de2b63d57e34c9619d31af94842f81effd35a664bbca4508e28d3db57dd05518a0e9db89511b2313
diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
deleted file mode 100644
index 2253d995178a..000000000000
--- a/x11-libs/libXdamage/libXdamage-1.1.5.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_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xdamage library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index cb18c9284984..518696af0819 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,5 +1,3 @@
-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-r2.ebuild 814 BLAKE2B 755abef5cc333637572f3a3c8d9a2457c6438e158d50a813c93c0cc793e09c7654897893c085a20bc8b1010d0e3454a800d1e621f33463c2b9cd9f4ab5d58033 SHA512 04b8a444c0161f04b45b72c3758a7319bbfaeb12bbb22a40b242b3d39275a457a76bad4a7343da4409a9e55537836ea35d5a95c3a2e09880c2b80a591cfdb1cd
 MISC metadata.xml 399 BLAKE2B cc623f4c1293d011af9a0afaac1d5cdd0635f4db48b55c3f59070ee8ab14e96967afa925160680e8253b36654ff04d171db430ad90e5f13c72497d83fcd9408e SHA512 c5b696febaefea9d236c5f0a13502547350c87a410e57474574d3d2e463c9f07bbdad9a9c0994801dc96f25d2711702a8710f3112e96eb302ac46bc2602f7e96
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3-r1.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3-r1.ebuild
deleted file mode 100644
index 3ccb36d5f8f2..000000000000
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3-r1.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 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}] )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index 60997218dcd9..ce0cb17f1d9c 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1,5 +1,3 @@
-DIST libXpm-3.5.13.tar.bz2 463251 BLAKE2B eb8a390802f13ffdd8199e21f5f18d4d17141783d7259c6b558dbaddd2dce05f7cb27306dd5cb73e27d01cffa62f5e4808c143b72974dae443e958069e70cd17 SHA512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5
 DIST libXpm-3.5.14.tar.xz 392624 BLAKE2B fe87d246222717b1120647c59fd4c466914fca2debff20f33bfe49b0c58643a6d122e17e0e092c1570b28c945887cbb94e27989b6dbeadeae503a1811b7bbf09 SHA512 c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b
-EBUILD libXpm-3.5.13.ebuild 616 BLAKE2B 38331190a6b74b60a66829fd810ae323c600f82b18a885eeb5c67e1606b77f3ccb87b527910f4fc98c67bfee75cd4a4562c55bb582d34383de63a9b5be5037b5 SHA512 9286860357481eee773f22115f574f9bce679731328b41c0d0b46e4e8c2754480dca848c0cb858800b1c812e8522fe14bec1472d873a53a7847cf8fea1799a8c
 EBUILD libXpm-3.5.14.ebuild 646 BLAKE2B f51ff1c6dbad6133cf4f6c864cede53b32648e9c96f76a87906788797e34abf328797cb0194a24c9599a409dd4d5b7c2b9ee01e2578dc9eabed62e83d992902b SHA512 9388b64af03cd0c6098cf4ac4944638f4a5244681ae56e9b83cf004ada215aa9a9280a14f819437816305b4b6800a924f9d7e19e44bfde7a8ab8dc4dee420cca
 MISC metadata.xml 337 BLAKE2B f05884685bbe654022c1126464b03338198dcb0dea05679ec4ba2ee478ffeeb410f5445457956bb9309340616d66bce3bb1656c636669743fc962571a1bae32e SHA512 1a53eb6b24624c18dd13492dc76dcca255e7bcc88646a257cdb3b72ba6a1b347cbc9f3e2e8098bca25ae78060a68196bbce8861919250302c75a76db541236d7
diff --git a/x11-libs/libXpm/libXpm-3.5.13.ebuild b/x11-libs/libXpm/libXpm-3.5.13.ebuild
deleted file mode 100644
index b196104c7e8f..000000000000
--- a/x11-libs/libXpm/libXpm-3.5.13.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
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xpm 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=""
-
-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"
-BDEPEND="sys-devel/gettext"
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index 2ed91b2f4ed8..52da022ae76c 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1,5 +1,3 @@
-DIST libXrandr-1.5.2.tar.bz2 330726 BLAKE2B 2d91e4cd2d7af6b79ee952a0d51b0c61d64251c61f862677b47065f2eda811650a5e3bb3185d09a6401291b5a8bb30e8d29cf7aaf1699ac3f49b838ef7b1208d SHA512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87
 DIST libXrandr-1.5.3.tar.xz 282316 BLAKE2B ec3c9cd4dfaa68332c947a46cf47651c60f97d26522e9a63c5a857c0f48f06c305ed4b2633ab0b8190f9dd74b367227fa869b42031a2d1986bdfd79545d1d9ea SHA512 0c385fc304a872048ffca5cfb8789dfe3132e3126894d54b2fe642dff19d286e7ade1d2f6da894e03788df9c5cf31427c674e987143037b7d385b19285590edb
-EBUILD libXrandr-1.5.2.ebuild 599 BLAKE2B 42c1ce2f0a05e7cf640c98fcab43dbeeb2f1aa77921530ed6fb237093b155c968890364651e3ed28aba8d0feb8bfbe2d4db7139e2a185507f568a84e4eb27cfc SHA512 118db2a354b1c6a9e57ffde795a0279c958406a1d83134508b1d0d4f58d85a170f821e239f98f0782a2c92e52065acb244d53c41d2c78e0ddd5d5d7b56bb56d7
 EBUILD libXrandr-1.5.3.ebuild 624 BLAKE2B 7ad0a822817cdcee8561462f27fde3524ff3a8acc676019c49d0790090e92d3221a0ef4637a7b986a4ca3a7485b7ca3459bf44776c493b9c9941d9f9d6188c4b SHA512 862dbeb2c7542d22f0a06e1d20122b82aa1e9a9733821b5e240347ea4fe52e44f09e48674243ad120c86ab06dff7e49ad1284f0f0e0862ecf97082344673e869
 MISC metadata.xml 340 BLAKE2B 8256af7fc43fb196ed97a295a7f5a4f40dcef2833d715e5d6c247123e072336b09957fb1a08b337d72283fe4bc6d5c2288d74c88473b1c12c914d2e84a442ee0 SHA512 963039a140a9888c0ab1f1cc334ba764024b32fbc7ca152c39f82e6d62484ae99ff8c98f5bfa6c0ada201d15898072d0e5fa188247986f0a0110d4b04789182c
diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
deleted file mode 100644
index 93efa7f743e5..000000000000
--- a/x11-libs/libXrandr/libXrandr-1.5.2.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
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xrandr 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="
-	>=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/libXres/Manifest b/x11-libs/libXres/Manifest
index 6383f663c692..d983d9af8e5d 100644
--- a/x11-libs/libXres/Manifest
+++ b/x11-libs/libXres/Manifest
@@ -1,5 +1,3 @@
-DIST libXres-1.2.1.tar.bz2 311025 BLAKE2B f1ecc2397547cd6bcd37dc94968bacc378ab67d004fc31f02890b26bf169057bda61f6a08559ec23eb70bee5910f200e9d1016add3ca816fc4dd49115e718256 SHA512 c17d28406e17e305dc4976f095e88059735f5bd8c600adf2e556523c9e0dd7fa01dcbf7a9d28a642e77e49a5b30f54bb9b2fc34bfbedce467ee2a020bba5cdf1
 DIST libXres-1.2.2.tar.xz 261400 BLAKE2B 569d4e4b8bf43254139a7c1428ba9dbce592930b05588ca90266e42721fe7cdfb997d05f983dce97afda460c39b9b232128f760f2c69aa87d800f948562a03fc SHA512 897f2d426ea6f41169a5a52c356d1a1cb2ffb9144ae41b9fedd06455c3d81042930fe55be269ce4b8545ee65fcfe168101192a599053d810e8810f627c94f810
-EBUILD libXres-1.2.1.ebuild 430 BLAKE2B 3e80451b5d0eb47d0c4b4432169c96063dd7e8a4d61169c1e6afea701220367f38d744fd9e1af2fb0902f8de597673d94403d4ab82fbd7e45c1895820df0c6ff SHA512 f320c5cf0b7bf3dd13a69b4d246ee176b3c9393a430f29969d0a3487edc63ad79f0f1857273582d2e6c4b1dc632f9bcd1b76f15ffafa28fd81a4b6b9f565fef1
 EBUILD libXres-1.2.2.ebuild 454 BLAKE2B 2b37cedc2653d34a226fc7a1d171135a4b51fa4b09f9f20bedefbae1913c2369b9d03ad9bd83691655a24e4f2aa46b89e82138cd6d6953b0e621dc260df7c2f1 SHA512 b4eeb98790fcb2227774fdbf3ead3eb751de1488081224ea6be78d7f79118ae705f7dc909eb7dd999a836ba50d9a37d582e802d7114522e313ab1b71c804a3ab
 MISC metadata.xml 338 BLAKE2B 8feab0e80e774feb4ee7a995224044633f0b686abe7a51f758d322d5107ee35847a8db2b568656ad50c8a720ce55d62d36f21165fa9d5067add7128e6eb07c0d SHA512 c6da27d02dd04dd7b98ec500496bf12c49a72865a34e8bfe236cb40f4243df5cc6b7c5052d780c213090e9fc413245419bd1fffb2c78865584ec1a2db2e7021a
diff --git a/x11-libs/libXres/libXres-1.2.1.ebuild b/x11-libs/libXres/libXres-1.2.1.ebuild
deleted file mode 100644
index eaf0a5457ba6..000000000000
--- a/x11-libs/libXres/libXres-1.2.1.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_DOC=doc
-inherit xorg-3
-
-DESCRIPTION="X.Org XRes library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index e30135cbc4a7..ca109394ca01 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1,5 +1,3 @@
-DIST libXv-1.0.11.tar.bz2 317921 BLAKE2B 3c656e1f5cd02c936813b3e10a359d23e7a8643a45ade42ddd584084ba04d09cafbefcc68ab9356b78c1a716a050637062e956c7f50a03a522d28ff7aa31c3b0 SHA512 97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58
 DIST libXv-1.0.12.tar.xz 276020 BLAKE2B 567e824b77dd05a9e48f0ff0a4591d7088ee5b681b8822cda6a89c85b14a7471603cc5c80138d0734d7adaf9746610d443013492d10aa2a9efe4749e15e0388c SHA512 bdd00de1ce6a8911056181ab4de32f9e319a68567389162d4bc2e3c9946d5f3c60f87eb6c53f74c9b6a342255e591d5fef4a445a4ac8ca3c1b6fe87d42c51c1e
-EBUILD libXv-1.0.11-r2.ebuild 518 BLAKE2B eda59103dbad717a8b6195f6db8eca948db87c46c216c146b8c4f45f59bcdf4bca39288ee69328f238d2e3931220ed13c44b6bfbdd13234a7f49e6be725725c5 SHA512 8327eb7ba4a86c8ec152f9cf1b06b2d88f6342aae7f3774b623b7272a0cd74f6e69ce017b6a087b1010c6d25c04b7ae41475878d8971df93558a010e31dcc1b5
 EBUILD libXv-1.0.12.ebuild 544 BLAKE2B b671accd51058db19494509057a0048c2d004f7070d7debe208b3684fa770e2a59a0a8d667b605b8699954cfe52a5f3d110e54a37606eb0e2f8877aa864fdb2c SHA512 655d5c8f47330642ceafa9655e29e02930a25c84baca8f30267530b28f20f0d0cf92001a989725d9a8408a5bbdd36230a2506b6596f2bb6e8790df51680ec500
 MISC metadata.xml 336 BLAKE2B df53f0c032a8ae8449fcb3a321b35be1981e1044461aa6356d1e47126ba671cf398614e88525d9fd9be633513556636f6813948e9bec593f2997bf48c47e2928 SHA512 9c32d9805677aa96736b66019dbd73055de44e2aa7581d123884b0a691b5cdcb3dbd1a8efd5d06e82ce7a987bca93f2127dfaa12cbde48d3e9162a7b7b9f599b
diff --git a/x11-libs/libXv/libXv-1.0.11-r2.ebuild b/x11-libs/libXv/libXv-1.0.11-r2.ebuild
deleted file mode 100644
index 327727dc55f7..000000000000
--- a/x11-libs/libXv/libXv-1.0.11-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 Xv 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"
-
-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/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index 2e9714f38232..f6f2fa040c7d 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1,5 +1,3 @@
-DIST libXxf86dga-1.1.5.tar.bz2 301685 BLAKE2B 8c70299e52cd2f34b4dbfa0d56707df20f7b368ab92321cf9e8c0fe15402a3b4e1b8eb62d0e53fd3321e95521bb4f35479493e412710a74779ac98ffaef966bd SHA512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89
 DIST libXxf86dga-1.1.6.tar.xz 267760 BLAKE2B cd571cd05f205ea770335e1d12f0051f85d786317d051cb22d0dfbaf105f2e6e2df36d50c2113b525fb7ab16a9f3c1262b5fdab864570f81f7318bc5019201ae SHA512 61f7954471df63840ffb5e82347018e285d30d64d4d0a97770ca031c8554a0f52d1b007ab8342a283cd2f0d534f564fb59f57ec92515714f20a7d145912c65d9
-EBUILD libXxf86dga-1.1.5.ebuild 482 BLAKE2B 350d2c74f4b0039859dd340e75705e395fbba2d7d3e05be80fa1496486aab83a59c5cd2c2e3197db7504024c46551fe4b3b3b28973039f72a9dfac6a10e525d5 SHA512 89fb3ca03cc5459ea50148b1b90831a00e5d1453b46b345c8dbdd6b0705b290b02fc1dec4471d613faf6597fee3100d61cf259a51da143229d2deac47fadd92f
 EBUILD libXxf86dga-1.1.6.ebuild 506 BLAKE2B 67c24824daecf165cba8a511b0952996f54440a13eefc309e12adb2ee955ef2d8e29f2228a4483c2c7a1baaef7f3309ff89a83cec3971953d7bff15d81e698ad SHA512 298e7585d0650364c8e5bf996a3d5fcded97015a6a702a393b9ff4c162dd56ae271cb0de3e958181c85c7c9c45e560da55e464ddbcbe6dc337030004ec13931b
 MISC metadata.xml 342 BLAKE2B 2ddc40ae69f107abe54da5f36aedbc968115393409f0c4bf99f970cd03f6e43931d00131a2939ac54fda86a09699f62d27652c398bee31d8c7a96a351bf7d57d SHA512 b0c044574aa4c72d60352dc275a542f9c3fcdb9107bdab0bf48ecf221abe256f299d827f94f6fd96ddb580f3637f56aab65bd36968538bac48686e53861d604b
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
deleted file mode 100644
index 8d1a42bd6ce3..000000000000
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.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_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xxf86dga library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="doc"
-
-RDEPEND="
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 219f567f496e..af9b20114799 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,5 +1,3 @@
-DIST libfontenc-1.1.6.tar.xz 272520 BLAKE2B ccfe4f9524655862e2e5ceed8edccd7da8ec1872b3a8166803540b69fe4f42f1b5b6f2128a00b702368f9009e1bb1edcec5d28c36815abd6d591dc9fc46cd291 SHA512 524247caf035e5d69280575c79ec5a3259c4cd0a4afa375b01985fedf800b42ecd75102e38f85cdce5591d020d361ffa9390adcb7906e939df289e5131088683
 DIST libfontenc-1.1.7.tar.xz 272752 BLAKE2B 19f675c001d12c36103e7fbdbe99c22fe972659c6db503b67271d875426da27557fd3bd57cb0ee4a3bd99ea4bc59d34d0ccc35204ceaaddf24d49cd5b394cf1a SHA512 fd8578a81090fa938dd75ad9081ab62c6c54fa2535d1c6291afd799ac8dc7c344a43f07cea5cd4433af16df0d926c22e7c169877bc8b13d92584e7dec173d701
-EBUILD libfontenc-1.1.6.ebuild 540 BLAKE2B d7a9a68c2e53f687d626f17aeb401f3568c389073c878fec0ea5962d19ca502fb5c4e3512053a1b5f584c3c60dc7a5f4687c336235db714bf4852c3191def02b SHA512 8d419e99814129452573aad90c58a4b7a91e61b302314ffb6512bc53dce4d16de3dea19647662784b82b461a52333c3b4a0a473aee2d2852eed9c74cdfb1344d
 EBUILD libfontenc-1.1.7.ebuild 540 BLAKE2B ffc8397e42a3177f87c5f57201facbbed20c89a1b5c71edfd16465bad2604630285037262dd42d29ad54d654e76acd5afec2093a85a57b7828f408643e3f523a SHA512 29b5625bfbcf1727355e2f3ebae5a814c0ba6202da5d62273206954e0e406a82149de1104547bd137a94a0a7aa8adea08ffd20e02f64743aa235be9fda56ef44
 MISC metadata.xml 341 BLAKE2B 8eef39a5f51bea7f961c5605b9bf18c25ecc2a3937f3610275212ef0d6e99903102e7f9cd16c632b7bc22f4968cb259f63470e1e4594eec09752d3985538a3ec SHA512 4c3d24add9b54f986acaa2aceb12df8e59571d0df7370a4fba731d89618d4bfe443fb766f3305f45d46164fe7d465ec65bfe7b617b22e5151f075f8b133a04dc
diff --git a/x11-libs/libfontenc/libfontenc-1.1.6.ebuild b/x11-libs/libfontenc/libfontenc-1.1.6.ebuild
deleted file mode 100644
index d58a84ca2df8..000000000000
--- a/x11-libs/libfontenc/libfontenc-1.1.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3
-
-DESCRIPTION="X.Org 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"
-
-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/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index eb6722615bb1..6cfd7a96a062 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,5 +1,3 @@
-DIST libxkbfile-1.1.1.tar.xz 308832 BLAKE2B cc3042a05dc4859edf96235b8ce95b7da33878e9c9b8b7f82f83280f84cbb215f5d3bc32c7f77d8667f0dad7a9500abc68695c8e784dcc7e83e4b30196bc0257 SHA512 2902d21860e27a27159123a19f7d4e0cf9cf8933685f1d2477e69ec647f0f8629b58bbfc391ed45e8b51a10033f18a9d0f16f7f519da9923cd7ed3bd497cf1a2
 DIST libxkbfile-1.1.2.tar.xz 311428 BLAKE2B a7087fe8a752c83fc7c05e4765469d87eb75eb33686c5bcdcbbdc46d60b23d453053aba35082fd2adf5f95a464909e7b7aac1f12ba364ee1fded1c0559dd3a4b SHA512 0639fad7b64b36a85f8d24cdd40085e0ec18d7a671793b8b5c26449e9cc5a84c37117e7757fb1238ac353044935dd00013e42166de5af9dec428e873a47e598d
-EBUILD libxkbfile-1.1.1.ebuild 508 BLAKE2B b010b2ab9a6f8dcfec3235a4b123818a90e1e1dda0a974889e044c91564df8097407df901abd29456f46e8834dc6bdb17c47fa5cca7aafc330996518099bf573 SHA512 20c86965706e6c6720a990ac60a7e91366165fa625aeda8fe2eb6541a3b6a9d975c86d6ab51aacc97b33b407d9b5bff2bbeffdfb811dc55eb4d1addaf5057920
 EBUILD libxkbfile-1.1.2.ebuild 508 BLAKE2B 8650c0a137306300ec9204c5c9cec57b3e8a43d9389eb1dcee421fd3fd00d56a8649b91258f21dbfbbe1688e417749b5a7167063db1d511ee6642e3ef560a989 SHA512 6a6e1a7779ef9c0a86abe449c5521af492722de105d8abba0e2396fdf6428766c52cc19b55fe2e147b6bfe83a250e0fa86982424a2272626e849d4e6d6767d0c
 MISC metadata.xml 341 BLAKE2B 6bdfd118881a6eae282b380680ff6484fe69747cb1b1d0cabb00607d1cf06535de084ed07bb8664bc5027db274f263ed34175881cefb7464124891a9eb38e117 SHA512 436ec0aaca5f4a4392dfca223787672744e65354de323e5a6222e6a3eda53cfdbee00dcdacd375e587eb8a9277a0fb8da1c0f84723e577d8764ff884f37ccba9
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild
deleted file mode 100644
index 90ec22f907fb..000000000000
--- a/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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 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"
-
-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 a2baa7d3f890..40db6c9ab770 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.2.tar.xz 259024 BLAKE2B 2f0ef0767fbb29349acf43b4cb4d7177956c06c389f0443db06e398c4e0f3b424432ce6fe8946d70fdd59b9446c53bf2f1ee126df4d41b3065f1e94438facecf SHA512 e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c
-EBUILD libxshmfence-1.3.1.ebuild 414 BLAKE2B 73f42e6ea33b0744426be88e7fa3e6bdb03a24cf4658a37ec6ce7aaf3f04e638a62a87b89fdfe83a22a350bc2a16dc3e4c058c9efc719217aec515b359eefa81 SHA512 7d0bb347be47d5a0c19aa75656d3bc941833ef080f9ab90c589958ebc4f0193a919cb8613b2c251d731f018bd8224d44bb55aea76a70ac1cae83e140e4d8f6af
 EBUILD libxshmfence-1.3.2.ebuild 414 BLAKE2B 6d0b0a76d1856c3fdf75dbfc83c22d28b89f424cd2cbba4c5275b4851a23bded2a5f0fd39494b5083a63645dcc2cbb3b526503cfc638f46a8f3e4ecbb9d3133f SHA512 efa7612461ca0fe15c62172a76c0f1fbc656dd1024f393b4bfb7f34c76a75f8227fcf951f8e888b3ecfcdeee3c3b95147d27fc9b135b6b7291f5a4cc7a942b84
 MISC metadata.xml 343 BLAKE2B 4b6c3bd00d5e71b96c4cb0c1eebd1606f5a7e219882a4310251f7b68b0230b4cb76ce1d5ea7f3911fe57a33c07c08ee5bd2ca6ac9d1fe690713a2ed39b0e199e SHA512 f58bff9c90477bd61d09f59b3e92b9d899d0329a1be77a76b3ac74c89e4a20a8b88daa37f4c64a06e5367fd25a40bc9709e98d141be271652185e4f2a3c350aa
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.1.ebuild
deleted file mode 100644
index 94640bdf7fb7..000000000000
--- a/x11-libs/libxshmfence/libxshmfence-1.3.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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="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/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index f6ca2deee426..dfafc2546a65 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -1,5 +1,3 @@
-DIST xcb-util-0.4.0.tar.bz2 297412 BLAKE2B 55970cddd8d4bfb313f5d6e4ea82a169a90311c1c0bb5ebf796ac1ceb1d1e1baea4268dc37bd8adf557514a752eec9f957ad3e3e0747384f2cf6e1985f26247f SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e
 DIST xcb-util-0.4.1.tar.xz 267396 BLAKE2B bcde73073590c56771af6233f1a04a692197a756ef9ce70b6e0bd3625ad6d61f99f4c671dcfae39c8dd66e3225f40f7e9b42dd115ffe83a561e48a9808bf00e3 SHA512 da67f2f017d2a1788dcf35f28d6956e171303a622a1dd085cd3d69fdb2ed77965d83c557cc926ebf9b32e905eb2cbb5921987250192d78a2f5edc4d437ed7d2b
-EBUILD xcb-util-0.4.0-r2.ebuild 851 BLAKE2B bb797aa63665ef5911e14116ee9315719dd56670dddb0b2866eaf0c069678e71fa9511888b739cddd908bbaa20297902bbaef0648cd6a3b688d19256e9786d7d SHA512 12be3d9b1b0b9a5ccee329d69c5a1d34964ccd39208992be8a7a7d4b8ed897b02a2cb9b29ab7507bbcab29aa18fdf87f87631b987b11f9939386a2e12e96bcab
 EBUILD xcb-util-0.4.1.ebuild 582 BLAKE2B cad067b329db8040c2394716172bfd7b75712d09b713053907f9cce05b0278cd2217d3189e424035d4b6809061d5163f479adf8512dc308430a945799e2d465e SHA512 dbaa45a9e372a6645346eb9087bcbdf6805a53796a5d474ea0371a2bc186c724f14012c42349510c6497155ae1a9ce120ee076af7a5b394e80f59257f1cdc93f
 MISC metadata.xml 342 BLAKE2B 8b63c0c5e0e032812e3fc213bf7d260736517921d7af89de1e73e8224a36f56e50e2cc8a3252731f44b843e6623c0ea8f503b20fa4066f80461830986f10623f SHA512 a178db0e3ebcf2ded489273330063bd5630c721a4909673eefe7c23e2efa6ccc392b92986f07ade3c9100e02551e17cb94d80574eaa8d777e0d2e9f9cb4eed33
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
deleted file mode 100644
index 67c40842fbb6..000000000000
--- a/x11-libs/xcb-util/xcb-util-0.4.0-r2.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-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"
-
-PDEPEND="
-	>=x11-libs/xcb-util-cursor-0.1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-image-${PV}:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-keysyms-${PV}:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-0.3.9:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-wm-${PV}:=[${MULTILIB_USEDEP}]
-"