gentoo auto-resync : 14:04:2025 - 08:45:05

14 files changed, 8 insertions, 274 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 74d531310e5e..55b1ec2e9994 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 9b2e63c277d5..944b3f519eb5 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,8 +1,5 @@
-AUX cairo-1.18.2-cups.patch 1181 BLAKE2B 8790ce088616c33312bf54aa3f86a19f80c2f9bfae04e4862cc432d7e5891d167e824ef54716735bf521cecc02a2711a865ae41b5fabc414886dcefbf7bed073 SHA512 9f889cb37e60dfcd483edbc624702bb8b65dbfdbc06bc7077b09672e1c2ec89a2df9a53b84afa8541da67d6be80164bbd39871bd03e01dd510df9793572a398f
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
-DIST cairo-1.18.2.tar.bz2 42905863 BLAKE2B 2788b9b90aeee1ad906e36ec13c0e0dba5b87b88433bc2cd408ed427ebcab49ee3d63ded3bc4eb7dc51c63aba91a6c30de77c052235bc5b669eef268f706de36 SHA512 8db31b675791b892379bc5fca7f421d3e8ebca9c3cbcdc27fa80efb1274f12d89276a54fa1ec18008f81de9b1dc2fafb9fbee9ee368e893e8b035a332d07e141
 DIST cairo-1.18.4.tar.bz2 42897394 BLAKE2B 711142573cde2f0b2c4c7731d4de142fe5c199fbf3512a6c5cb83aa0cdeb1877f83c36c6f1d0b28db71dd263f957912149edbb3c537290205a3aed2985dd033f SHA512 27b98a17510b4d6f0187fcb280fea1b47ae31243f6999081a7ac94f8cf3c789c05fa6eb0fe65844808ef9ac11bcd29a4c3688c871a6950d888667840385acf9b
-EBUILD cairo-1.18.2-r1.ebuild 2720 BLAKE2B e474b9d9cc9d052146d7e487784af33c5ce3eb6f80266e2f848c21e8d80f8de0d64a85f6e3b75285d0bb044cb178e4edc2a9a5418b14d0688999b8a87caa1f69 SHA512 c6e11ea1ef4c564ec0c8199d72f40e42673a50d8463a809ec6711b64396ac299be75a7fdb9b4c0524747b95c27176b85c599679902edbc7b0b34f5a1fddc7e3b
-EBUILD cairo-1.18.4.ebuild 2690 BLAKE2B 2890a0b53ed64aeca357a54ee2dc4bcfe6572ad860077651bc54a69addfb1a0cfb6679fe2300990df26fc33b816bb38ffcab85dc998b6bac825bd46c7c296f2f SHA512 a815253843221d0e577b324cd95ebba7951212a35a1103a221d526f3da1d92815d6dc07ad020ead988fc9ada943cdbf54b4160bd1d8db840345c1ae82f9057db
+EBUILD cairo-1.18.4.ebuild 2689 BLAKE2B 7f7694e2115a7aca90127b7cba13e50c4935bb77debdf455a272c0c1daf49c779f1605dd1123550e2aa7ac87bf8012533cba2bcf1ec761165980d81398d69289 SHA512 814ab50ff808b77d2d434f7db655a1c7252ec9044fcf24255238f78a337f14354a6e99b449585ffdb5418a026dbdf4b686039afde8e8afd2987b9003bca75943
 EBUILD cairo-9999.ebuild 2697 BLAKE2B 66fa4f151a2bdd05110a54982273aeeb080e148715f7e6d2ead0d7574256f3e345521eea7c3340125db606f234d4e8f18b803626beb235869018d4f3bc431257 SHA512 0295111a82323029bebde475485a94252753056017ba551b0b03bcda65d6bd0390932239e6f6f9525ac6d9b9228ab934512aa51745750d782340e087865e671c
 MISC metadata.xml 484 BLAKE2B 44ea5fe06e0b252b5d0cf71ccf53f76ca6f1f29432886ac0a66af9df19ed72358b91c6ff399ba418d051b5fa5380ff281647ffd050f1471578699ddfa87085ab SHA512 a575a5e6f807ac4527dbcf62e6e4a70c0e6012a6b52d7772ab167ffc29a55718bd35e52b1d0bf61be89ed82f38959e63e7ef198e7b2c1f48889df9dd2c4c8988
diff --git a/x11-libs/cairo/cairo-1.18.2-r1.ebuild b/x11-libs/cairo/cairo-1.18.2-r1.ebuild
deleted file mode 100644
index c9c8cfee70a4..000000000000
--- a/x11-libs/cairo/cairo-1.18.2-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
-else
-	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 +glib gtk-doc test"
-# Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml
-# any2ppm tests seem to hang for now.
-RESTRICT="test !test? ( test )"
-
-RDEPEND="
-	>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.13.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.13:2[png,${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.42.3[${MULTILIB_USEDEP}]
-	debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.34.3:2[${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}
-	test? (
-		app-text/ghostscript-gpl
-		app-text/poppler[cairo]
-		gnome-base/librsvg
-	)
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-fontconfig.patch
-	"${FILESDIR}"/${P}-cups.patch
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddwrite=disabled
-		-Dfontconfig=enabled
-		-Dfreetype=enabled
-		-Dpng=enabled
-		$(meson_feature aqua quartz)
-		$(meson_feature X tee)
-		$(meson_feature X xcb)
-		$(meson_feature X xlib)
-		-Dxlib-xcb=disabled
-		-Dzlib=enabled
-
-		# Requires poppler-glib (poppler[cairo]) which isn't available in multilib
-		$(meson_native_use_feature test tests)
-
-		-Dgtk2-utils=disabled
-
-		$(meson_feature glib)
-		-Dspectre=disabled # only used for tests
-		$(meson_feature debug symbol-lookup)
-
-		$(meson_use gtk-doc gtk_doc)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && meson_src_test
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
-		mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
-		rmdir "${ED}"/usr/share/gtk-doc/html || die
-	fi
-}
diff --git a/x11-libs/cairo/cairo-1.18.4.ebuild b/x11-libs/cairo/cairo-1.18.4.ebuild
index 50446596c107..940404c3e0b8 100644
--- a/x11-libs/cairo/cairo-1.18.4.ebuild
+++ b/x11-libs/cairo/cairo-1.18.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
 else
 	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/cairo/files/cairo-1.18.2-cups.patch b/x11-libs/cairo/files/cairo-1.18.2-cups.patch
deleted file mode 100644
index 6a34c28a6250..000000000000
--- a/x11-libs/cairo/files/cairo-1.18.2-cups.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/939607
-https://gitlab.freedesktop.org/cairo/cairo/-/issues/870
-https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/595
-https://gitlab.freedesktop.org/cairo/cairo/-/commit/f19e2fe080ddcfce93c8234a919fd882f3d63362
-
-From f19e2fe080ddcfce93c8234a919fd882f3d63362 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri, 13 Sep 2024 06:28:39 +0930
-Subject: [PATCH] cff: Don't fail if no local subs
-
-Fixes: #870
---- a/src/cairo-cff-subset.c
-+++ b/src/cairo-cff-subset.c
-@@ -952,9 +952,13 @@ cairo_cff_font_read_private_dict (cairo_cff_font_t   *font,
- 	 decode_number (operand, nominal_width);
- 
-     num_subs = _cairo_array_num_elements (local_sub_index);
--    *local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t));
--    if (unlikely (*local_subs_used == NULL))
--	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-+    if (num_subs > 0) {
-+	*local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t));
-+	if (unlikely (*local_subs_used == NULL))
-+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-+    } else {
-+	*local_subs_used = NULL;
-+    }
- 
-     if (num_subs < 1240)
- 	*local_sub_bias = 107;
--- 
-GitLab
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 2f22e77bda64..0e61e273914f 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,5 +1,3 @@
-DIST libSM-1.2.5.tar.xz 312708 BLAKE2B 9babbc5409037d1292c85c0b23ff21975f614e9cfe53c6878761e67489815862a98ef84a2249161279fd5d7af7ff886cfbafb63b82832ee142e513e3d359e6cd SHA512 f2e58503a7cd144a610621104b4727878dd5ba0cdf8220e72f27a3474c9b49c01dc514c60cbdfb35a9318f307b27a601580725cef0f6b5091d4c4ea57cef8c91
 DIST libSM-1.2.6.tar.xz 314040 BLAKE2B 9511d1bb8ec49e9cb55e473d777c75a535ec4e82924653c2ef47bb17dbec75df5a2a20453f72dc158a52666b7edbc67af289eab3cfabe49b6aaf803e13225e42 SHA512 e544a1dc49a03390f76af35837bfd01f749b806d88d3ee806f20311c47ff53d0aeea4744feb875958031b17d50b57a89dcc41d81241c09333c88b268c44653a7
-EBUILD libSM-1.2.5.ebuild 1648 BLAKE2B 8f75353b95b7435256e265c42d49f9588896f3ed1fffa20e4616e03ac00b2b15bd476899a3691af05ac1d777755c381badf0544566100cfb6bd03e051611f448 SHA512 050bc181aa685d2cb56e07dd4047b88915e3cdd6f3767a1a36e263c594a8ad9425f9f49b3fa0e901dc32c0b86153f3fc0c8f5f2c29ccd462666cc28cbb03c73e
-EBUILD libSM-1.2.6.ebuild 1649 BLAKE2B 7fd828304fe846d2688f8184c3c2a0d32d47693c4a9a48c8b7af3e8d5078a2a038001e22a47ec4040b4e1c9d3231eec65bb5ce38009f9a5e8e01353edcb4b780 SHA512 ecdd0d105b368bbf70947869d5f977b41f8059d57dac5681f007aa3b2f3bbb8c730819ea9835089d49d4b84891352a3e6eb5e7b07a2959a20775553f1bd15b73
+EBUILD libSM-1.2.6.ebuild 1648 BLAKE2B 8f75353b95b7435256e265c42d49f9588896f3ed1fffa20e4616e03ac00b2b15bd476899a3691af05ac1d777755c381badf0544566100cfb6bd03e051611f448 SHA512 050bc181aa685d2cb56e07dd4047b88915e3cdd6f3767a1a36e263c594a8ad9425f9f49b3fa0e901dc32c0b86153f3fc0c8f5f2c29ccd462666cc28cbb03c73e
 MISC metadata.xml 457 BLAKE2B 895411214399309db731cd3f1c5c49ec5a505aa4a7a03e9fc39e7027b1956aeae7b0ffebe1d6f4500eaba907c0aa2ce7332f56de0b53ebc26dd000835a29c9ce SHA512 9e810808a715e91e939d710c5633675d4a7d74b2a18d8054d1932f6022bf186ae981b1ffffd81893bb1959923ddf541908a24656e7c308589994178dbab9ff60
diff --git a/x11-libs/libSM/libSM-1.2.5.ebuild b/x11-libs/libSM/libSM-1.2.5.ebuild
deleted file mode 100644
index b1cfa980604d..000000000000
--- a/x11-libs/libSM/libSM-1.2.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Session Management library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+uuid"
-
-RDEPEND="
-	>=x11-libs/libICE-1.1.0[${MULTILIB_USEDEP}]
-	uuid? (
-		elibc_Darwin? ( sys-libs/native-uuid )
-		!elibc_SunOS? ( !elibc_Darwin? (
-			>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-		) )
-	)"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-
-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=(
-		--enable-ipv6
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		${withuuid}
-		--without-fop
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libSM/libSM-1.2.6.ebuild b/x11-libs/libSM/libSM-1.2.6.ebuild
index 177a1d623a5f..b1cfa980604d 100644
--- a/x11-libs/libSM/libSM-1.2.6.ebuild
+++ b/x11-libs/libSM/libSM-1.2.6.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Session Management library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+uuid"
 
 RDEPEND="
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index d19f7a2c1bf5..e8e2d1625b64 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,5 +1,3 @@
-DIST libX11-1.8.11.tar.xz 1817652 BLAKE2B e557548d6acaa417a87600c10f1e295ae0fbb13460f7641260f59fc175e9b7de76b4c398981d76b11a52a055f26b233a2ceb44ebb8076d793eb047c2d178573a SHA512 4e2191258039ad0ea7fe5d22b8b0ab5e1d101b20fa4cd0fb44c5e1ac8b2ffbb3a0ad80ac3a67a3803ca30b972476b739a0c244b2ac8b7de6a32b06dc4e2c674b
 DIST libX11-1.8.12.tar.xz 1895256 BLAKE2B f4bdb69abb2add723ca84832ef35f239659228c1f5a3f53631f0d4d4afa7030512b9ba65479464f3efecca0e09d1f758e3b92b139dd5e716fac1b8caaf5bb98d SHA512 cb7a284d9081a8b67f7d8568d56dc403a4b787e46ac497b07768d236084c01f80f4ea2ebd814f950ac9738adc3baea3912932fc333858195c4f8217744b6f730
-EBUILD libX11-1.8.11.ebuild 1286 BLAKE2B f44c2c48a4d44f711b5d6f58f0e24560911cf11e5fc960895c352df64b689bcea6be81e2c22a547addf997906529b01db56844c7e02cf6e06edeeb70ecb1dab4 SHA512 29e2b4d78ff884e37acfdba2a9599ca7f6f2038b4cb1c66c7512a930094cc02011777718b3b71c24a5025450028628d192f482e1ffbcbbd99523d8481afd07d9
-EBUILD libX11-1.8.12.ebuild 1287 BLAKE2B f6034b358e674b6bb82acb04b8aaf39a66618bef1a7503dbc5485d8c7bc13540fd07e4fb3e4b1c7ee5e708bd6bb6466bf66c67a3646da4c6b842ddd117867407 SHA512 fb45a7ee3dc7144a0a8d5c0dfd1346cea5b6f408a4e7d619bea4d4cc280cb39baa71bfce3537d02085bb8bec0aa13489e2fa0af899fad31350b627a73369f431
+EBUILD libX11-1.8.12.ebuild 1286 BLAKE2B f44c2c48a4d44f711b5d6f58f0e24560911cf11e5fc960895c352df64b689bcea6be81e2c22a547addf997906529b01db56844c7e02cf6e06edeeb70ecb1dab4 SHA512 29e2b4d78ff884e37acfdba2a9599ca7f6f2038b4cb1c66c7512a930094cc02011777718b3b71c24a5025450028628d192f482e1ffbcbbd99523d8481afd07d9
 MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-libs/libX11/libX11-1.8.11.ebuild b/x11-libs/libX11/libX11-1.8.11.ebuild
deleted file mode 100644
index ccd2a3bec8b1..000000000000
--- a/x11-libs/libX11/libX11-1.8.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit toolchain-funcs xorg-3
-
-# Note: please bump this with x11-misc/compose-tables
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# HACK: libX11 produces .pc files that depend on xproto.pc. When libX11
-#       is installed as a binpkg, DEPEND packages are not pulled in,
-#       but to build source packages against libX11, xorg-proto is
-#       needed. Until a "build-against-depend" option is available in
-#       ebuilds, we RDEPEND on xproto. See bug #903707 and others.
-RDEPEND="
-	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	x11-misc/compose-tables
-	x11-base/xorg-proto
-"
-DEPEND="${RDEPEND}
-	x11-libs/xtrans
-"
-BDEPEND="test? ( dev-lang/perl )"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		--enable-ipv6
-		--without-fop
-		--with-keysymdefdir="${ESYSROOT}/usr/include/X11"
-		CPP="$(tc-getPROG CPP cpp)"
-	)
-	xorg-3_src_configure
-}
-
-src_install() {
-	xorg-3_src_install
-	rm -rf "${ED}"/usr/share/X11/locale || die
-}
diff --git a/x11-libs/libX11/libX11-1.8.12.ebuild b/x11-libs/libX11/libX11-1.8.12.ebuild
index fe80a327ef3b..ccd2a3bec8b1 100644
--- a/x11-libs/libX11/libX11-1.8.12.ebuild
+++ b/x11-libs/libX11/libX11-1.8.12.ebuild
@@ -10,7 +10,7 @@ inherit toolchain-funcs xorg-3
 # Note: please bump this with x11-misc/compose-tables
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index cba1a9b5206f..7c7a5642c8f8 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,5 +1,3 @@
-DIST xtrans-1.5.2.tar.xz 176680 BLAKE2B 6381257bfc489767438e76afe9bab5e9f143e7524417de0396c0d04e42f1ee7ef28cec6fee83a68f60d3d82326c824f1baa9e58c47f7108e4a4d5dc9a2daa65a SHA512 4c4909402cb7df0d69bf2801722de822f7e376d585ff5aa8db8f88be77ed7fb7dfbdc410827069fc5041327e81afeb9d403c6c92e5c1e02d593c829ef6c37536
 DIST xtrans-1.6.0.tar.xz 177156 BLAKE2B c46d0eb3029ad6501f4a81eac3b47970092429a978dde31202f58d52ea675585c320efb91d6aad999097a222882036e05e05f90842980e9eb7d6cf72fda44e89 SHA512 e0ac4a2df0eeacdf23cedd74fee063a8eea81d05c4c4c9a9a113b9b4238db7cacb3c831973ac647fe1a5b06426dcdf0b2f8be5ac27862700333269880e25725b
-EBUILD xtrans-1.5.2.ebuild 563 BLAKE2B 130fe3f4860ea7aa187ac94535938e8802fa82a70c59dd75fd3b7d749a4c8add81bd58a42c74f3afc7277f4e0f12357271de3b8db42a57f84ce19cdfd47affa6 SHA512 66b84fa182daefeb9e47b49a59c7baff23aa68dd193288348e55eabfb37df5fc98604789714278b54b50ddfb0e4e32605ec6cb460bb1bb059fd332a37e75ad2f
-EBUILD xtrans-1.6.0.ebuild 564 BLAKE2B 658f2f0787a49dd354270e7a651af63f0c4f78e1567770b1123c3ee4ee722b0955f5aec70e44fe04915a16b1991f7e23c9e24f870eb907cb553cd7fa74e89339 SHA512 e14b4f923205cfac70894820df3d950c34d4371f66cb4f80ad020fb99e195e80cdd0152ce4d1d70dc3aad9c3cf34b142b0b5646b79254a95c365894413dc4b87
+EBUILD xtrans-1.6.0.ebuild 563 BLAKE2B e4d96e554619109bcd55fd9ccaf6b140d810212c13243fe17c749e9afef9cc8bfd038af74c2f322e99eb4f849613f945d36a52723333780a352d3e94bca3b426 SHA512 e8b50bdef5e4e0e38fbfe8f049343bbc733c07ad26f6dd3815750a98fff0010676be14502f47f01a0fddd3f589b6408af6a470bf9db29d974cc79ed26ad33553
 MISC metadata.xml 340 BLAKE2B a338aaec9199c9b8d4d7104867c9beab0c1363cf8ae64b4c13366ba1d506a8849c9ace547c8ba8f737e5f0cb6f69a9acc11e4a7ed719bad81da5fb44214d33c4 SHA512 1a1504c0e5788a839e01bb8fa84ac557664af8057690b7dca4528253abbc6355bad2899c492a847ff1c4c938ffb2652c6d34a0b6f6efc2a783080a606ad8323e
diff --git a/x11-libs/xtrans/xtrans-1.5.2.ebuild b/x11-libs/xtrans/xtrans-1.5.2.ebuild
deleted file mode 100644
index 039777a29859..000000000000
--- a/x11-libs/xtrans/xtrans-1.5.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_PACKAGE_NAME="lib${PN}"
-# this package just installs some .c and .h files, no libraries
-XORG_DOC=doc
-inherit xorg-3
-
-DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-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/xtrans/xtrans-1.6.0.ebuild b/x11-libs/xtrans/xtrans-1.6.0.ebuild
index f676bb3d1724..3cc87c2c19df 100644
--- a/x11-libs/xtrans/xtrans-1.6.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.6.0.ebuild
@@ -9,7 +9,7 @@ XORG_DOC=doc
 inherit xorg-3
 
 DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 src_configure() {
 	local XORG_CONFIGURE_OPTIONS=(