gentoo resync : 23.09.2020

24 files changed, 74 insertions, 179 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 4311f40cff1c..8c688de2187b 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 93d37064d04d..aa043fbe0d30 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -14,7 +14,7 @@ DIST gtk+-3.24.22.tar.xz 21349784 BLAKE2B 03dac82b3928a77beab1b4fcfcb9fdeb5e458f
 EBUILD gtk+-2.24.32-r1.ebuild 9957 BLAKE2B 9f5b89755fa452b5b2ca075093f703b1ca0e904de6848a24644a5662bbfe0edd1dad0d1a4732e268d7878a2702b4432a39ed22f33b6c45f44e4fffd0e7dc648f SHA512 e8f2dc31fa4ba63128bad6f2b7130a872344d86562d38675011661baff8cf16c56efe375933b5ef67d33555dca2ea963b54d66827a179132cd56532b77974a89
 EBUILD gtk+-3.24.16.ebuild 7267 BLAKE2B 14118fd199adbe0538854f9052864eadd94c10d42a5ec467c5820ea267d22994b95e0d15317a4549b84d597a9931866fba0777e5fb8f0664aeff15f85975a684 SHA512 032b54fd90d4dfa92fcb970b6a1c11e1767c9723d142b0476aa22362885c1fc32d1cc8cf89d1562dc48cd34539d885656e5b7bda13fe1a89aabf8b93ec77c046
 EBUILD gtk+-3.24.18.ebuild 7275 BLAKE2B 56a9c7d5ce48c0e3141375fd11646d4e5c39bd1536f2464b67d63fafb0d4befd3f5d918596b624618ed1279f19da26a1d359bef6edf8cd19ee6f865eb2029e82 SHA512 c5694653f9abb7b565c9f7657d21e92c58d94af8f521a3325b8373ebe6b949231238955b0bfe0baf97c8459c9742ad636bfb0541822894cc4c436abed7201d3b
-EBUILD gtk+-3.24.20.ebuild 7269 BLAKE2B aeed59528e0e4888b17c6bb6319ec4e5b123d512b2eb995919457ae85ba161824c34a01ac68974bf688c948fd54ce77671d6067438fcf7ac5bad0364b7eeec8b SHA512 55510a28cedf956a8068eedf46c7703e560f8b6c2a3185e95acbd03257b048a69acc26215b13747ed92fe8ba1ae1d9efc1fd3a35bba3d5b70bf175d6934dd56b
+EBUILD gtk+-3.24.20.ebuild 7267 BLAKE2B 14118fd199adbe0538854f9052864eadd94c10d42a5ec467c5820ea267d22994b95e0d15317a4549b84d597a9931866fba0777e5fb8f0664aeff15f85975a684 SHA512 032b54fd90d4dfa92fcb970b6a1c11e1767c9723d142b0476aa22362885c1fc32d1cc8cf89d1562dc48cd34539d885656e5b7bda13fe1a89aabf8b93ec77c046
 EBUILD gtk+-3.24.21.ebuild 7275 BLAKE2B 56a9c7d5ce48c0e3141375fd11646d4e5c39bd1536f2464b67d63fafb0d4befd3f5d918596b624618ed1279f19da26a1d359bef6edf8cd19ee6f865eb2029e82 SHA512 c5694653f9abb7b565c9f7657d21e92c58d94af8f521a3325b8373ebe6b949231238955b0bfe0baf97c8459c9742ad636bfb0541822894cc4c436abed7201d3b
 EBUILD gtk+-3.24.22.ebuild 7270 BLAKE2B 3d58b21f2f3abd54306721d29363b8f313a699886f1a1cde96fd519769960c4407c3b23c61dd87b4c6f5d64309fbce00d2f82c0d67d0d87a7fdea723d55f4152 SHA512 7dd3b007b00bbb424438022cfbae8e16a37791e016207788de972a18dc3b168aa6db07a21c031232213792d3535860783edecc71f2f80fc68fbfa68c16cf58b2
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.24.20.ebuild b/x11-libs/gtk+/gtk+-3.24.20.ebuild
index 9a806a2d123f..ed300aa27ff8 100644
--- a/x11-libs/gtk+/gtk+-3.24.20.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.20.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index ca451dfe0755..50cbf7211649 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,9 +1,3 @@
-DIST libX11-1.6.10.tar.bz2 2294095 BLAKE2B de615b3fb95e709f3e7b4f91c21b7f29adedb591afd76d8e631ea1d88a54530d799c840de6f5ee1af2a5aa48dfb87bc20dcbed2a2902d707ea3c198ec24d8d86 SHA512 ad384d8896fbe587f7fd99b0d3cc56fac6e2facbab52fa99174200d06b19dd163a483c998acf3834b3a4a3aa4de0dbbe13919a1c80e6797afe467c7075b403ff
-DIST libX11-1.6.11.tar.bz2 2389687 BLAKE2B 996cd32d4d408b15c400fa9472cba884513d78d278282434a85983171f7b3205ed1eb720fa39e49668e036cbbe06523c29c6cb49895f4465fc5f8cecb9a6237f SHA512 2cb4e215c1e3ccb327e02586844f8c426068536a0f472a39f12191feace607f61a6a08586f03758248199678c2f6897a984b0f1222bc0d68fd2e02702f4ce0bf
 DIST libX11-1.6.12.tar.bz2 2376498 BLAKE2B a2c6c76d5d4a15073f7837e6a72ecd8b7711dfcec48c54da538a6100a4afa01334a9456376633f1a2365717e03231c6b777c5683e462d10564065dc2437da39a SHA512 79df7d61d9009b0dd3b65f67a62189aa0a43799c01026b3d2d534092596a0b67f246af5e398a89eb1ccc61a27335f81be8262b8a39768a76f62d862cd7415a47
-DIST libX11-1.6.9.tar.bz2 2283814 BLAKE2B 00fb965b9cd19bde79c4e598c677d21058c85a8ac37d9addab7fb0b2faf67e3d65b91e1864bcd7180e5fd8b0ab7ec3cf68ae7f95ac8e82a049529b5a139b43bd SHA512 fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31
-EBUILD libX11-1.6.10.ebuild 748 BLAKE2B cbac32722674f88cd9c61ad37160a9244d7465ca3dd36fa4b7bb100abbefaf445a0eb81cac7893cf9babe419a22f8b769cbd0d967c1e3b10d1fbb54091214786 SHA512 34245a9233cfa4a2ca504fcb9f0ae89410104162e3e20a7353c78f27a4e971f5bff6b9e1b3f7d82a09b330b4e0363da22aee3c1a3a3e2d59b87dabc05a51a1e6
-EBUILD libX11-1.6.11.ebuild 741 BLAKE2B d7d5899eb21d4f54475a0d69d5de7f9d35f916ab79955027cbe97c42615b7da9301a03fc3ec27899f293add7bb238d39649adb79a59a531f0a519e03ea19dc2d SHA512 58e6041fd4b570578c5df2014ed8783492c4788d3ebc4bc45ce383423f5ab7a791ec116144c114cf2cd729e998ef52a5a88c83207648596f468b728bea6e14b1
-EBUILD libX11-1.6.12.ebuild 740 BLAKE2B 2d09f7673add651ed8f1318885c4779b897d575dae3258afa76a8d69304045c5c0181445c626d7fd700c98fd720fb696952df7c63aa867c0dc488db2e47a3c61 SHA512 b4174d85200a151731a64117890b73e8dc393366b271a206c7682006c1f116886d1ac47ef5a62d4b076e2e590ff8f002744c6dfc335686d9d086342e7ebfb87a
-EBUILD libX11-1.6.9.ebuild 739 BLAKE2B e6cd8b1efb69830827eb1da03aa9d787b476cbedc9365aed49e73fea393f8cc976f66a48a8dafdc919f2df3b8d17cd3e975ffd4302a4b932939ba435643fa20c SHA512 ad71978aaae6e2827d79815147fb22ee2e3d4224ada3ba4a0c48d3cf8f204c936136bf601b4d57b03a7eecb5cac44f7eccaff4c7fc2e0354d1e1debd62bf7944
+EBUILD libX11-1.6.12.ebuild 739 BLAKE2B e6cd8b1efb69830827eb1da03aa9d787b476cbedc9365aed49e73fea393f8cc976f66a48a8dafdc919f2df3b8d17cd3e975ffd4302a4b932939ba435643fa20c SHA512 ad71978aaae6e2827d79815147fb22ee2e3d4224ada3ba4a0c48d3cf8f204c936136bf601b4d57b03a7eecb5cac44f7eccaff4c7fc2e0354d1e1debd62bf7944
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.10.ebuild b/x11-libs/libX11/libX11-1.6.10.ebuild
deleted file mode 100644
index 332f2c8108d0..000000000000
--- a/x11-libs/libX11/libX11-1.6.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit toolchain-funcs xorg-3
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	!<x11-base/xorg-proto-2019.2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-BDEPEND="test? ( dev-lang/perl )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-		CPP="$(tc-getPROG CPP cpp)"
-	)
-}
diff --git a/x11-libs/libX11/libX11-1.6.11.ebuild b/x11-libs/libX11/libX11-1.6.11.ebuild
deleted file mode 100644
index 08b737574216..000000000000
--- a/x11-libs/libX11/libX11-1.6.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit toolchain-funcs xorg-3
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	!<x11-base/xorg-proto-2019.2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-BDEPEND="test? ( dev-lang/perl )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-		CPP="$(tc-getPROG CPP cpp)"
-	)
-}
diff --git a/x11-libs/libX11/libX11-1.6.12.ebuild b/x11-libs/libX11/libX11-1.6.12.ebuild
index 01428de5fa56..54f5a229c4a2 100644
--- a/x11-libs/libX11/libX11-1.6.12.ebuild
+++ b/x11-libs/libX11/libX11-1.6.12.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libX11/libX11-1.6.9.ebuild b/x11-libs/libX11/libX11-1.6.9.ebuild
deleted file mode 100644
index 54f5a229c4a2..000000000000
--- a/x11-libs/libX11/libX11-1.6.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit toolchain-funcs xorg-3
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	!<x11-base/xorg-proto-2019.2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-BDEPEND="test? ( dev-lang/perl )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-		CPP="$(tc-getPROG CPP cpp)"
-	)
-}
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 2861d2771984..dc1b7f0baa93 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,3 +1,5 @@
 DIST libxkbcommon-0.10.0.tar.xz 383788 BLAKE2B 0e2cc110c35a4d07cfd55a46a4cc30038bc296f74522beb97b72d0318799adb76fa514427640f286254de7aa59fb8b8c26de5d8fd52f7e09c5ba3521febb97bd SHA512 58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79
+DIST libxkbcommon-1.0.1.tar.xz 432692 BLAKE2B 151e9c2260b517e7e646defea8dfa1891af87aaeeebbf52d41d8e6b52c2c1d5079ca55da9e998300145c83718ce981be13c3fa35d8825bcde7846dcd330e9dfd SHA512 929be7b52fae360a696f01e0a8f3aa9b585ad99db975a88680ababf623e46f4d98e6f7590a2859c24060856f45b27e7249072702fbbf5a7bd0d4a10791e6d489
 EBUILD libxkbcommon-0.10.0-r1.ebuild 1284 BLAKE2B d43d05a9366fe8a92d62f714a532d5f2b372443971c0a5f496387faecbfd91ab83841372977f4de853e0ac569545c2deab9828f4dccca580ca0539c406bc884c SHA512 fd009357bf396f4f9bdbcc86febef8536a84095a880bdd5d5dc135e59981113db959d909edd6340e5c6908163e939ae032307228f76219d7972b577f209e6224
+EBUILD libxkbcommon-1.0.1.ebuild 1292 BLAKE2B 58b41eb81edce585c966a1ef1041ac7236da6565b90a2a514e12a729937400e542fe113230cf2a2dde1e348b3f38796809f661dd6c2b3ece4af2d362a5d0ec4e SHA512 dece8d99a0018f03604153358549cddf09a4a4a6853b32229080d17fe3ef7616f13e989c76c03c3af35d2548e55f1c790954f1b4dd5244d28f738ede9d42dc81
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.0.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.0.1.ebuild
new file mode 100644
index 000000000000..15fdecd2c429
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.0.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="keymap handling library for toolkits and window systems"
+HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
+LICENSE="MIT"
+IUSE="X doc static-libs test"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+BDEPEND="
+	sys-devel/bison
+	doc? ( app-doc/doxygen )"
+RDEPEND="X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library="$(usex static-libs both shared)"
+		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+		-Denable-wayland=false # Demo applications
+		$(meson_use X enable-x11)
+		$(meson_use doc enable-docs)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 0add21e1d094..3e34d004d687 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,7 +1,5 @@
-DIST xapps-1.4.2.tar.gz 69709 BLAKE2B 514e4cb2e614ccd9fa303625eb5ffb818847447b29d6d989c2abdc90b6b9840dac6124d8484b71ffc2e489a925f83dae597c0904aa79cd5d5a0c27d44420da96 SHA512 2d16bd893a16876270c41d755c62ca454f561931750acc719c480e63036b70dca8dae25e6a313f13ed0daae09fd650e0efcef9d272c405ccd9c04147aaf59fe2
 DIST xapps-1.8.4.tar.gz 179340 BLAKE2B f6558b87320cbd73e73c5294f48a3c0c94c7239abc9ede9cd88e66ccd53fd0c9cba9c638837efbd5eecd8a4f372262fde759e05ba9e97ad9955ab74464c34c21 SHA512 483e8e334d4883e2172e06835d690d20af2752fcc195f63776053b83abc0ffcb25c757633450a02b153e70e67e98c477754de12169c167a2f9f3fea103e12bad
 DIST xapps-1.8.9.tar.gz 187789 BLAKE2B 37b2d2677cb6483533d79853a83d77b30033313c06db89e93491076bb017122f77cd97b30d5ba64ce53fb41a37736791e97da785f516953b76b1d979d341e2fc SHA512 95dd1cbf84b59adf6682d9025e0cfa7a414c24d4f584cde87d0cc6ea82c06338de2c320dad8d997e105980782ec5cb23f0def6f6d60ea84be7d74c90d7cd692c
-EBUILD xapps-1.4.2.ebuild 1181 BLAKE2B ede71dd76c683ac4e05a4dba2679b16db5b653aaaaca9134f20b35fda0f374ac7a3ca11a9eac6c976b5babdebc451ef242d09ea0cb0be614ee67883512013bb7 SHA512 65eab865b8b232c4ab9aaa2d3a664a8961132d3a7d3a79482a4353390eee954de39bf0aa752f728f393bf73ab9e3ebfb6a3cf77a96e18aa6d7247b80c67cae54
 EBUILD xapps-1.8.4.ebuild 2044 BLAKE2B 604dd1658fc1a5cb2033defcec921bfb3217feae2d443a656e5f2eafcd03d6eab09b93f850c59c80eb4c48c4823e8c057affdced3cc51cfc34ea1c3f954b0070 SHA512 dbd39ff32234abc3bf8ed777ccea0e6fb586b5ec8d882beb63e6e1b4176731fc555fef2a7c67505988283ab80279b05bd9afbbcf2b4be83032ba85fb4c8ebfcc
 EBUILD xapps-1.8.9.ebuild 2101 BLAKE2B 77736fc9943ef13943773fa18feb1876aa5dba32084abae260ade71ee456213376a4664026984b38d0033acf0d3b597e0875c7a21b3e3c6a563d1998fd543c6c SHA512 5606c183f79557682cee07caf074d1d70ef229bbb76d7624e610fcb1bd2dab08b57c67f51b1064f1b94c527de2f16bf0025dc04ae9738bf4bd5b320f63200a40
 MISC metadata.xml 577 BLAKE2B ed5786f6e30619e209d841a04547b52f7a9a09eeb5a64f0fcbe9f33031e936610aaef4b80cd29f45d662ac23295448ba336786c31a2b5f302332750497d0f545 SHA512 3af23ee720d2691213fccfbcdde69b5af42259fb0acee32e499c51e13dc8a5414fed038372b2a485db65548b38163886911d4b44ebaaca8ff0e0274c4c40d48b
diff --git a/x11-libs/xapps/xapps-1.4.2.ebuild b/x11-libs/xapps/xapps-1.4.2.ebuild
deleted file mode 100644
index 762e94721fd8..000000000000
--- a/x11-libs/xapps/xapps-1.4.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_USE_DEPEND="vapigen"
-inherit vala meson gnome2-utils xdg-utils
-
-DESCRIPTION="Cross-desktop libraries and common resources"
-HOMEPAGE="https://github.com/linuxmint/xapps/"
-LICENSE="GPL-3"
-
-SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86"
-
-SLOT="0"
-IUSE="introspection static-libs"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2
-	dev-libs/gobject-introspection:0=
-	gnome-base/libgnomekbd
-	gnome-base/gnome-common
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
-	>=x11-libs/gtk+-3.3.16:3[introspection?]
-	x11-libs/libxkbfile
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	sys-devel/gettext
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	$(vala_depend)
-"
-
-src_prepare() {
-	xdg_environment_reset
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	meson_src_configure \
-		-Dwith-docs=true
-}
-
-src_install() {
-	meson_src_install
-	rm -rf "${ED%/}"/usr/bin || die
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index b2f71e9e2806..15f240a596e7 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,4 +1,4 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
 EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1373 BLAKE2B a562ea63ae7d0ab61737a1da2b4aa2e178630ff385fa92c50f8ba8bc75215749b4d217e0a8f3c5ebe6b1f311607601d7869a3ef5a42c5dd62bacd7a523429c14 SHA512 d790475278909a5163af2e1c9dbda90adc1d68e6998ac14c2ce5be456dee42bf221af55d0565ab2abf7de3531fce32af303a801f2d43f3535c39bd85a11bd7d8
-EBUILD xcb-util-cursor-0.1.3-r3.ebuild 1038 BLAKE2B e8a7d3247f25af11cab38326c631e85fc94764e2642fc4e432f1df88a3a64c477c226b08932f64ce6255664a1c0459c14fb909bf6bd7cd7291f0435b7c3cd895 SHA512 a3c80c9342e37843157002616e1dcbfece5733b4d0283051de0a7dc6f0680cf949cea81ec4ea2cadc6c8dd53832158af90ef770b4dbff4cd0eb19ac0bd86de5c
+EBUILD xcb-util-cursor-0.1.3-r3.ebuild 1034 BLAKE2B a1d3e3f4152dff7ac4edec2aa7485c7d8bfa2b1c3d5de4175e0aafd7fba8dd9c5c340731a78977824297eae2db97232b99226530802a9de8a63418ae4e5ab2bd SHA512 51f7a14f8ca7162fdfed636452601508c0afc0a4a770cfc16439a961a1bb1670968fcd33a6ed18f4e84e2e24997264ae3521aaaca97565fa92ecd5114ffc7a14
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
index 3e254c01c0e2..d2cb188bbf0d 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
 
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index b0eab3f0f3b3..0cf0053e59bf 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,4 +1,4 @@
 DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f
 EBUILD xcb-util-image-0.4.0-r1.ebuild 972 BLAKE2B e7763db6a983e1f1a77061f1892083f76ace5af13b5140844a5ab7e914fbd1ef6cd6b8d9b542a4bf5bf725cb54f68ffcf3e65a0aa3cf054b042c038faeecc002 SHA512 578ef56dece7935557e778d79f6373a59fe7ce0caf55a28e4eeb1c7033ca14362b587c3752a1dd007b80b94004da8e054b0a949d346b273de1724e005e2a076c
-EBUILD xcb-util-image-0.4.0-r2.ebuild 601 BLAKE2B 28fe3a8fac1094c40a7b113cf4ca14838bd1b262ea157cfef5c805db9d67a169913cc6d9fc74d4aba4b26b6d249f332585157b529cf804fd3abfe26a0c251a60 SHA512 af19fb249fb84584c444dd85f71122aaf4b224d03b49e2bd5e8a253f5d673e04dd9d1ae963cd2b4f5e2887e4bd982d2c9da0cf1fbafe404ca2fcba8a640cb6c4
+EBUILD xcb-util-image-0.4.0-r2.ebuild 597 BLAKE2B 2839fce6b163e4e4ec6152d4b79382845420538301dcd06e2d287020cee4c78fe3baf221fe5e520ef8514e8f40edf73de253b9bbc82a75807a68429f07a5c246 SHA512 6d7aa3ca3c1a2c7d3157844a670d124a05cbc1fc521a12b9d2a336ffd4045e07dc9e3f173451a238729cbbd74108d7b720bfdcefdbe95dad5732cc0f75927a9f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
index 6c6c29ba5af8..31f7d184ec83 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image"
 
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index 9ad69bb6cd70..d0e90bd5d348 100644
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -1,4 +1,4 @@
 DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 BLAKE2B 5f55706fc74ed5c096ca0e8a8411ba392a023ab7f3c8185088c31570e5873345e16d72b693596b0983011350ecdb7cb30ae5fca118f4758710ee2fc2441883ca SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4
 EBUILD xcb-util-keysyms-0.4.0-r1.ebuild 919 BLAKE2B 2397ac2d3cd413f73a4c03064a3cea2a135cd096a9756c1d25c0a5f4e1bc363ac1dd1992b097cffeb620078477f9b7c3577f404579b601cbb0b80b26d8b00059 SHA512 11adeedddac342108bd08c6bbcc3589e0729cc47daa9e1865eac69b42e6fc926766c786fcd861665cc58dfe80741dca19d96b270dcd14bfc669dd68d12ddd8a4
-EBUILD xcb-util-keysyms-0.4.0-r2.ebuild 546 BLAKE2B 002b8e1d88732530f983ccafebb14ca4c17837a53bbe607075092620cd84977c73b79551c5820d05695f41bed57103508d43842394722bd1a70a73b49e1ead82 SHA512 2247469aed272793c7d8d6196432f5d172a6515ff64d11d346d7071db9fb305f68e5568fc18757136593b418c5705e8548821ceed396abdb058438a939030e9a
+EBUILD xcb-util-keysyms-0.4.0-r2.ebuild 542 BLAKE2B a0037f872e4a4e2f50ef157356cf7aef7f8f841de41749e29eb5f94d02fc9febf9d63625dcf60ea298c3875b80f90c0f64e100e425a15c3b3ff84e2ced54b5d3 SHA512 e3f55864514c3be822c51611de423a6cf0a2471564136511f6bc3b5290717b53f7fb9fd5868b75eea1c20797f307fc193c9a9edea5dff99cdd33a247821c6cd7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
index 3e5dd4376c0f..af23f8906d61 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"
 
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index 4ade8dfc57c2..6148bcfe45a7 100644
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -1,4 +1,4 @@
 DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 BLAKE2B 8de259f918f1ffcd82d054bd751baf3f0fe3514da86bc736b68c74ca1f285fb41dca364ca49153e1464691c10fb65f16a53eec0ec8102c1abade9ad7c80629e4 SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc
 EBUILD xcb-util-renderutil-0.3.9-r2.ebuild 939 BLAKE2B ba23a8e39462d745bb748f3f1b9bc131e433d016d47ae3cc0491edf54d8063b80dfbc5fb4f56ef4e412387da30237a003dfb9b834b904766e7470421ec7bcc6b SHA512 d7be2a7f1ca40ec0a9de97ded92158912ac2dbf6af07a7f463c15383b2ccc4d2d8390e06eaa14e6445d6aedfacac0fcafa691b9d750036bc7ee2230095261cf5
-EBUILD xcb-util-renderutil-0.3.9-r3.ebuild 558 BLAKE2B 56524ebf790224bd35ac41ce68357601c4ceceac06899da86e0c1c802af1dc372090c5162bf452b166dd64b5152762a29976461c5a78c67239eb66bc4aa4faf6 SHA512 574da572da243341cc44a2ec04c1e58407e614609dcb0e4fbfa4532d01ae6d7459536a71d925dc2640ac8a1f66ed6f839233b38f3a28027d51797c61e5c9da30
+EBUILD xcb-util-renderutil-0.3.9-r3.ebuild 554 BLAKE2B 249f0697324e0aed1052ccbc1c06e5fa4b96fc640f01f6fd34976220a34e0a308d03a5a64b43f5058280ea86dec99a7d1ffe36df219dd6646db0b22284a63ce7 SHA512 52ca7675c762b09474052c8889cb00267b44ad2756fbd161d59aae07a21855a3de3ebd2fa1a2424bb721646b8a0af861051b057514a1ede40b10721d1a019643
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
index f9ec22de3d2c..48d3b3b773cf 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"
 
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index dfd58371a48d..6ad627dc87df 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -1,4 +1,4 @@
 DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326
 EBUILD xcb-util-wm-0.4.1-r2.ebuild 920 BLAKE2B 5762a21acb7c3278af572aa5922ce15956ec81a2822c64de241a22b27692557222f3f496b28330c6ef6fed5250478f505d9fc4dc1355e710360d035dd1ca5227 SHA512 1fbadcfb495abb85f78e38acd1d5f890af7002d1847381af1ea3b0cfe124c717b22610e8a33b9f925d4b6b9264864f9e8a29220f83fd6abde7ee211c18661e09
-EBUILD xcb-util-wm-0.4.1-r3.ebuild 549 BLAKE2B 3bae4a90c3f426fd3bc18b8a7536a9ea9504cf3e0b733773c34e754b9a66a5f918bb474ab50ef19da8339373f82232834fcd9f3e5c9af6886bb03c9815c63f25 SHA512 9adb79a360f6e8f94c0881b56a4f5759c92062184124fdd6ea4808635b8b3d612ee129940eb0ad1a0cca03c461fb080a4e1816fbe779adfbdce5f1451e9c4aa7
+EBUILD xcb-util-wm-0.4.1-r3.ebuild 545 BLAKE2B 4eb6f8d0f220da428a420a5d8fda8ccfd4084c512838c37db3a24129686de6ace726cf7ed9c567afeea5da4a2a3c8ccd92de1375b5e5a7edb65bdf13ee1e7dc8 SHA512 a54094a509afb0a13abf73b72b29ef3d245996f49dffd4f882748c090be2de0a24419a8bd37b51c2eabcf88a5a1373a2629ac37652a29d7323a72d064225e870
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
index 3bbf813088f6..f807e0e8bec9 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"
 
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index 40162a8f9dcc..c79ca8563242 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -1,4 +1,4 @@
 DIST xcb-util-0.4.0.tar.bz2 297412 BLAKE2B 55970cddd8d4bfb313f5d6e4ea82a169a90311c1c0bb5ebf796ac1ceb1d1e1baea4268dc37bd8adf557514a752eec9f957ad3e3e0747384f2cf6e1985f26247f SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e
 EBUILD xcb-util-0.4.0-r1.ebuild 1193 BLAKE2B 963f6060498a3f40ab19fcfd27247528ca60317c822daff96c854a879d21cd64e6db9f71d6e8a8a0c6f86ef3913b804b156a18b707b53fb1f84f22bef39ebf7d SHA512 1ef915863bd04a4ddde1b5f1c28e59256612b8db727c972a9c25f4733ee7587e50c3740043a8caf1bb89babc66a41d194949ff2f63c68738636e46ac000041d4
-EBUILD xcb-util-0.4.0-r2.ebuild 844 BLAKE2B 098e2948eedb5367747a5ef733c3d34366740c9c6d24467cc141ac2029484811b2626f22ae9417c3377321efd6b943bdcb50afb968958382e324014a428d9cf9 SHA512 c8b816eaf567bf1ba66af454ee0f1225b55f0d318d6308c18392815d797917e09a7931149b7f332b9227f6986799ef723158a849a0ef3d9b0f88aee9a881fe47
+EBUILD xcb-util-0.4.0-r2.ebuild 840 BLAKE2B eb8b189532ecdcd051daf84a133a3226c1fd5a761a670fbbbb993926abec12a8fb383f8f81760ff476889330f0baf986feda0e4e580d764e8c6c83655bb6699b SHA512 d0f66835cb5ba3d3d38dc21bde8a4f61a3b9c4c257a59e2763813b3ea78668272489725f1edbf27d2ad863257e6e5e308dea0b02baf2dedf4a27e979459ead4a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
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
index 7baf37bbe89c..c44efb8cbc9d 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
@@ -9,7 +9,7 @@ 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 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}