7 files changed, 4 insertions, 66 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c42ed3936eb1..6335c2688c44 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index a83f4dc220d0..5620182603f6 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,5 +1,3 @@
-DIST libX11-1.8.3.tar.xz 1811712 BLAKE2B 0adc92c13ba4bdec5d927349ca8c02adbb851eb376f19aa5f39e13caddb36c089be227c1f2dc61b34f882aae794f2b46ae237345c12c8e897be8df01e9fb3ef2 SHA512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325
 DIST libX11-1.8.4.tar.xz 1835316 BLAKE2B f9f5d1b97e8ac6f8f0edc490a270f98ff4fd901c2054c309bce1f1b3eb690704193e18cd470f682c663090210b14a9498b9259b6acc0e902053e7ab0ca9df076 SHA512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e
-EBUILD compose-tables-1.8.3.ebuild 950 BLAKE2B 8f1e0b0e2a697c5afb72e8bee632227d8ea8d72275f42c38063a8e7b72571e62722bb7317deb7d488027cf85e792a34949933b9b47c3fdec1b63f8dd39ed2d40 SHA512 15b24815e8d5aa31e9282807ffa8233d6c4b7eab2bfde298c8c47c22c7adc6d64c46abfbdfc09f06501459eb53313fa911b52082e2fce5c964b356fda6903989
-EBUILD compose-tables-1.8.4.ebuild 928 BLAKE2B 6c1248fa2e8bd8a5c24e6f99498b333be6dc9802bea86dd340acf13767e1d30e56ad053c87b747726b0feac51452b84015c8487769382bdd99219f4f6971e21d SHA512 4e2520de6ffa7c7e9251581415f6830bb34dbe103047f666443524ffc3faa224db0e18b04059d718027dffb8a28d427f9f123f0131327db633a612c68a6f35df
+EBUILD compose-tables-1.8.4.ebuild 927 BLAKE2B 029154fb3e5e7b06a1e8d2580140e87199073904c5e7e50c97ff1892b0e5769e4c11600d7151be22678e40dbd3986d52a2813bb316fab4779364ad80f3337630 SHA512 26295cefc044ebfa24c2477dcf77aec61df311fdfd6fe44d3c2fc1c6e085de0198a499077dc3e20f1ef5f88473a1de60dee9ef34bd363078a47cf5f4d3f06262
 MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f
diff --git a/x11-misc/compose-tables/compose-tables-1.8.3.ebuild b/x11-misc/compose-tables/compose-tables-1.8.3.ebuild
deleted file mode 100644
index 23230b505b42..000000000000
--- a/x11-misc/compose-tables/compose-tables-1.8.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=no
-XORG_TARBALL_SUFFIX=xz
-inherit xorg-3
-
-# Note: please bump this with x11-libs/libX11
-DESCRIPTION="X.Org Compose Key tables from libX11"
-# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
-SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
-S="${WORKDIR}/libX11-${PV}/"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# Only needed by configure
-DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libxcb-1.11.1
-	x11-libs/xtrans"
-RDEPEND="!<x11-libs/libX11-1.7.0"
-
-XORG_CONFIGURE_OPTIONS=(
-	--without-xmlto
-	--without-fop
-	--disable-specs
-	--disable-xkb
-)
-
-src_compile() {
-	emake -C nls
-}
-
-src_test() {
-	:;
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C nls install
-}
diff --git a/x11-misc/compose-tables/compose-tables-1.8.4.ebuild b/x11-misc/compose-tables/compose-tables-1.8.4.ebuild
index 478b326cd7c4..f4cb0d243aff 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.4.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 8df2c5675986..e532a8db1e99 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,5 +1,3 @@
-DIST util-macros-1.19.3.tar.bz2 84690 BLAKE2B 95f6bd6cca47111f973eef60915ab0b0a1c6a6b15facb08da138df100c27caacce28866c5ac05aae79116fe3bafa15f454ea6cb9997069f0b5fab7968777d383 SHA512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2
 DIST util-macros-1.20.0.tar.xz 83324 BLAKE2B a19784078ff3043d9d54ef88738625a08285bb033e27713c05875135b39e9f5c1a38aa05c3d74c167d974a07611621f57c70e988e5fb024bb475575355c3f380 SHA512 76caefb118bf1675d7b2b96e1bbb04eb9a320b02e120839e55a22ef98538ecf00d0e686a67186fc8fdc8492d277ffe3125ae8b7ac61ce4739edc0de3f468d2eb
-EBUILD util-macros-1.19.3.ebuild 710 BLAKE2B 76fe57383e1f5eb715092ac442c54b38dd038037adcb8a2c2c67be1f53c07deb66341352e56c4b670e9e1ce974d0c883ad8b0e1088a4a99801587155fba43e48 SHA512 52484762335a47dae0561001f8745a6cee5205b348eab602af51acfeb57e4ed8458222eea1853a6ea6651191e8b1282759d8649f3f89f988c160f4c0a8a6739f
-EBUILD util-macros-1.20.0.ebuild 707 BLAKE2B 4315fba5d1e565247d4090cf8dff30317c962a496429720f78081c07667d41ac54d058d63e2130858d17df8725e62ffbf80580e855850f913c02538538a148a0 SHA512 6c90a71c661be2ab5a0d266f201227601b679ce50243f96c63e5e23559e08f75c57c1bf3817147f5c0c31970859e60b92ac20c36232aa97e34997bc69ec01384
+EBUILD util-macros-1.20.0.ebuild 706 BLAKE2B 37222871fbffffb53c4151cf1c12ada56f6156f9c5399495fa31229018d0347287d7e793153b1b0591fc6df4f674767da970d803556510ecb5a30eccd5f874fe SHA512 2f47dfceff08f9d5c0c6b5617b9edac1a86d8f77b0ccb465bffc4692c9610394db27afb55e9ce2d0ddef9c72f30cacc0482d835652e55165b1547680d51eb81f
 MISC metadata.xml 338 BLAKE2B dcc620ca4e58f9d0464530f7915fb50e995dcae1b334b7d0fb3044cbaee39592ba7d86ed925d9ff3e72f1236ef378887deb41e9102a4c3d543f43aebeaa2e105 SHA512 d3be3477539efb8765b1249e87ed842f7c1db9b10799a9569c68d6ec1bd0386ddd192556265a43eb401aeee30f52c8906c05871877814de9d9cf7c9ef5187c36
diff --git a/x11-misc/util-macros/util-macros-1.19.3.ebuild b/x11-misc/util-macros/util-macros-1.19.3.ebuild
deleted file mode 100644
index cd703a10a569..000000000000
--- a/x11-misc/util-macros/util-macros-1.19.3.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
-
-DESCRIPTION="X.Org autotools utility macros"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros"
-SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-
-# there is nothing to compile for this package, all its contents are produced by
-# configure. the only make job that matters is make install
-src_compile() { true; }
diff --git a/x11-misc/util-macros/util-macros-1.20.0.ebuild b/x11-misc/util-macros/util-macros-1.20.0.ebuild
index f27b305bc224..3e46a76b8050 100644
--- a/x11-misc/util-macros/util-macros-1.20.0.ebuild
+++ b/x11-misc/util-macros/util-macros-1.20.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-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"
+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"
 
 # there is nothing to compile for this package, all its contents are produced by
 # configure. the only make job that matters is make install