gentoo auto-resync : 14:03:2023 - 00:16:42

3 files changed, 2 insertions, 46 deletions

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="