7 files changed, 2 insertions, 95 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 3df90bf9ffc4..b12c81e02eaa 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 1cf25cb8cfc0..89449f4f0284 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,6 +3,6 @@ AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0
 DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B 6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9 SHA512 86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
 DIST cairo-1.18.0.tar.bz2 43979246 BLAKE2B 1afb01a934a41c9f4c2cac0d6f1fd842bfd3297378b7692a0c38786d151ca568a63707ceee4b220da7ec9a605f65eb87b546a78392c5fe652345e749e6d3da6b SHA512 bd702f3b64061f8add954c243c9b59f5d44271adfa76d997941ddab629ff8018c2a1d3368edf2362573e0018c342c61483de58240c63e15e1e6035d2511d3e40
 EBUILD cairo-1.17.8.ebuild 2797 BLAKE2B d3c7e09dd25a812582c1c7844092755eb06e9ea6962ded49c17da1af16448265cc7750d95f6a7f6bc6d28d592cec59763a5cabec3160795b82ef03458a09a668 SHA512 80e6717c7f4355242dcd9f51952dc30a6d0294820426ad61445e3d6e1bd101f04760e5c9a0adfd6dd868942834798cb97c52b0da7c074945c8128a97fdf8f55b
-EBUILD cairo-1.18.0.ebuild 2711 BLAKE2B d5d7df79d83cbca322a33eff4417686e6a84e160dd445f7298dd99b9cfe1e1f1459d4d5272d72f8d857d6e8c8caf6f17a8868d43ac83603046f2643bad20a25a SHA512 ba87cc3cbf66819f3b293b0c270c6d49d21ea48eb53b6aca03ac312dea29da8f5ab6c0e0f972541f8389bcdf99d6e16e3c2c475d80e4a66bac5f20fb05c29316
+EBUILD cairo-1.18.0.ebuild 2710 BLAKE2B fa003a0d5126a828e8c1b4484c213a19605c5fb1423bb2f82c86a6def51d0808ced4fd1c591a2398703bf44d1819971a657fe15cb860dabf82094cfa4ef81243 SHA512 3b981d2d4074af860a4998d5afed04e2c3a66fd398964cdc411f3339c645fd2f5e7cd8d87efd146d12f500efcfdc2c6e9763a59e821c6c96882337bbc725d6b5
 EBUILD cairo-9999.ebuild 2683 BLAKE2B c07c19e2bdef21abe2351da6bbec98b6d81b923f6747a85ace463d85112f141e3781e254bb32f50f9fa89890b7888f18231c99f66c48c09def9e703c6dc31b40 SHA512 2f3f6e042744e1fad1288efc20a630a4df9a679d3b2d27ea1581285a58548271e9b316145c70843689702f71a90428c06e5dc332d2dbacc2db296468e2c3a317
 MISC metadata.xml 484 BLAKE2B 44ea5fe06e0b252b5d0cf71ccf53f76ca6f1f29432886ac0a66af9df19ed72358b91c6ff399ba418d051b5fa5380ff281647ffd050f1471578699ddfa87085ab SHA512 a575a5e6f807ac4527dbcf62e6e4a70c0e6012a6b52d7772ab167ffc29a55718bd35e52b1d0bf61be89ed82f38959e63e7ef198e7b2c1f48889df9dd2c4c8988
diff --git a/x11-libs/cairo/cairo-1.18.0.ebuild b/x11-libs/cairo/cairo-1.18.0.ebuild
index 0e79ce5a8cbc..34be05e3af73 100644
--- a/x11-libs/cairo/cairo-1.18.0.ebuild
+++ b/x11-libs/cairo/cairo-1.18.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~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 ~ia64 ~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/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index d05f50244227..2893e2c9b427 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1,5 +1,3 @@
-DIST libXrandr-1.5.3.tar.xz 282316 BLAKE2B ec3c9cd4dfaa68332c947a46cf47651c60f97d26522e9a63c5a857c0f48f06c305ed4b2633ab0b8190f9dd74b367227fa869b42031a2d1986bdfd79545d1d9ea SHA512 0c385fc304a872048ffca5cfb8789dfe3132e3126894d54b2fe642dff19d286e7ade1d2f6da894e03788df9c5cf31427c674e987143037b7d385b19285590edb
 DIST libXrandr-1.5.4.tar.xz 282928 BLAKE2B 683205e5d2727dca1319c096ce035469bc9c70844f57750df465d19fad31c3aadd3535860f5c02aebed324b41ffe4471c0389128fc3d15ef560956bc196ff489 SHA512 f7c0b083943e11b4cc3c97e10e2cbbc3920fe0c9c5031ef86fca2eb5df413d767caf53dca266abf65395eb10e55354c8fe59ed6b3265402ffccb919a813bc781
-EBUILD libXrandr-1.5.3.ebuild 568 BLAKE2B aa2ad231033707326f9a80fe10ab5e1d4e5973f035443e944fc5fcc380f5bebd63321be65af802b12a4966d61c3e08518d26bea03776ee28717431c7848e56bc SHA512 9578e6a20157729288594f9cc330dfc5662006737daa9537e7859d5bb75d0c1a69b7411e86c56f1d433cec090bc2b2f1d089aa4e633ab3494d509211768682d0
 EBUILD libXrandr-1.5.4.ebuild 568 BLAKE2B aa2ad231033707326f9a80fe10ab5e1d4e5973f035443e944fc5fcc380f5bebd63321be65af802b12a4966d61c3e08518d26bea03776ee28717431c7848e56bc SHA512 9578e6a20157729288594f9cc330dfc5662006737daa9537e7859d5bb75d0c1a69b7411e86c56f1d433cec090bc2b2f1d089aa4e633ab3494d509211768682d0
 MISC metadata.xml 340 BLAKE2B 8256af7fc43fb196ed97a295a7f5a4f40dcef2833d715e5d6c247123e072336b09957fb1a08b337d72283fe4bc6d5c2288d74c88473b1c12c914d2e84a442ee0 SHA512 963039a140a9888c0ab1f1cc334ba764024b32fbc7ca152c39f82e6d62484ae99ff8c98f5bfa6c0ada201d15898072d0e5fa188247986f0a0110d4b04789182c
diff --git a/x11-libs/libXrandr/libXrandr-1.5.3.ebuild b/x11-libs/libXrandr/libXrandr-1.5.3.ebuild
deleted file mode 100644
index 2937fa4dff89..000000000000
--- a/x11-libs/libXrandr/libXrandr-1.5.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 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 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 ~x64-solaris"
-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/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index eddb9f5855c6..acd8f5d451b9 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,3 @@
-DIST libxkbcommon-1.5.0.tar.xz 472700 BLAKE2B 5dcfb514c297f71629f20b444cb29c5d26ce9def1c1173a125fb0c0c259d76194fcef7a407d8efda2d2d87c9b90abac34e2fc1742cfd6053df511a3ef205c8ef SHA512 bbba6665f052c04c7450413cc5e2badd6bfd41326b0e4c60e3ec01d730cae695fd34ce2662b8a91ece7a76b974a0ea330f7462dd5d2db148b0d0da26264ced9c
 DIST libxkbcommon-1.6.0.tar.xz 510456 BLAKE2B ffd373161f12ea6448a9206f57710355ab65b81ebab5dce74e4dfcee1bdc9175406fc434560648f5933b83cac163099c8564c3add6f51d34856def39ab077850 SHA512 4f93225eada1c5d0806bbc01f72d82d72729f4580ade963ff6a386711c9b2232aae5213c8488abf01c3b81f0e1fdb7f4d8a4d3786113ccc134251ff164c4be5c
-EBUILD libxkbcommon-1.5.0.ebuild 1689 BLAKE2B be1dc727a392d7237ec09380ce2e799cb07abcae3a771460144ca94dd5f5ff753dd23e5550fa1c0a03eeb78c171d3534d5e5f24558e4583ec2a66d2e525f4fdc SHA512 34951734cd4ada20070c688b89fd9f78855fa8d0e104c6302399d6749a1194cd0fe0f3e63fbba4c1125771c3d94edd1184598184995b21e7cb2aae772a1764fa
 EBUILD libxkbcommon-1.6.0.ebuild 1788 BLAKE2B c568586b11db7035ab6284833870167d6461debbf8bd72fb6fe10a9bccc0d6541062846f6fe5b8c13655b775d479a511270b3df651c040edd57dc7b646b8cdb8 SHA512 26a9e58add17a0ac7e93d10b5ad7e266aedce62e9e147e94b5ce4b75d82bc16d98c4e03d808340081d056ab93beb63b7c7b77df907b0dca923c944c9aca11350
 MISC metadata.xml 470 BLAKE2B 4edc4923d3888c12474fb659cf1fb1177c600fba9e8fd34fd6be284c979313bb3282d0fa9084c0aee29d9413e68947dd0ee2d241af4e78b2eb06887d2d684f6b SHA512 e19a6e154a79578d5641dfdbef8e963794b14ef0b0f63450dba2d24044e83b517991a72d81598420567978dcecb9d4e4f0eb9e4cf63e0b562d3e41aa80b39a87
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild
deleted file mode 100644
index e0ed4692622e..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson-multilib ${GIT_ECLASS} python-any-r1 virtualx
-
-DESCRIPTION="keymap handling library for toolkits and window systems"
-HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
-LICENSE="MIT"
-IUSE="doc static-libs test tools wayland X"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-BDEPEND="
-	sys-devel/bison
-	doc? ( app-doc/doxygen )
-	test? ( ${PYTHON_DEPS} )
-	wayland? ( dev-util/wayland-scanner )
-"
-RDEPEND="
-	X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] )
-	dev-libs/libxml2[${MULTILIB_USEDEP}]
-	x11-misc/compose-tables
-	x11-misc/xkeyboard-config
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	wayland? ( >=dev-libs/wayland-protocols-1.12 )
-"
-
-pkg_setup() {
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library="$(usex static-libs both shared)"
-		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(meson_native_use_bool tools enable-tools)
-		$(meson_use X enable-x11)
-		$(meson_native_use_bool doc enable-docs)
-		$(meson_use wayland enable-wayland)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		mv "${ED}"/usr/share/doc/{${PN},${P}} || die
-	fi
-}