17 files changed, 90 insertions, 112 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d6af7ebfa913..9cfa3cff0ee9 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
index 54f87dfda499..4d1bf463ca2b 100644
--- a/x11-misc/arandr/Manifest
+++ b/x11-misc/arandr/Manifest
@@ -1,4 +1,4 @@
 AUX arandr-0.1.10-manpages.patch 1193 BLAKE2B 59816489bc196d73f32e810db5f6b661e38edc5838d925f1866e3ad0786b3db6986623eb617864a39e038829991fee3f7e865dfbc07a868526973ba09d00232f SHA512 926ae7720aec2d4ca35c4ad085e6b8e1b03d3aa87102efd8a122241ed6790a192d30629a576a028d73ac344423019f36f309f42afffb88bdf96adbc2b233e48f
 DIST arandr-0.1.10.tar.gz 100203 BLAKE2B b5754dda4c4f9c5e957a9fc75b7236480417b899c2705bc5aee514899c664d39b5902921c69ac425aff99f3a6ea512bfc0c2c0259519c1a6e0fc553f6e367cc2 SHA512 12c2fe5b36f8d8e688d990e352c1cfa3e8512c0b647b78a8af93f9472704e4867fac4c56c207465fb7b420c9022dc545dea8ad8a29af3037758ab4587dcd38ba
-EBUILD arandr-0.1.10-r1.ebuild 602 BLAKE2B 2eee0b3e66832784eac7c26b1b5dd808045d9bbe8d47c20b58b210698cf3bb3705fe5910cf8bdbfe7c1928d02b7b9e6c542d25fdd8bead2fc8557e4eef092cb8 SHA512 8e23d874ce1388e7741ae452d6c8b86b982ae7fc04fbc7741b3f2befbd5fe350f323d54155758227915e1f737ffc47262d3a26e02f15d8e138367d32e7d605b6
+EBUILD arandr-0.1.10-r2.ebuild 634 BLAKE2B dc8656cca105d4e62d3a162ea1ef89aa50ad4b8b9b2f98f8b2df7a73b94386482b8f40f620d0273a8373002daa7aaf92b5d7e65ad5905eeb8c0f56face1c44bc SHA512 2969b257036215ee6a26999e121cbd2c65744172e089339d7d06d7f0afdefc5d30f02f8187341dfe9fed67c6799ddb77c5c7b196f6cd9eb857faa6001f42a214
 MISC metadata.xml 532 BLAKE2B 9476163e85e634aaecf529b042e3b25a6a5e0707226ba619166ffba92cfc8f2cdb1b0d710d20de1becfe7a62ddebd1ac509d8e62dbe668d863bc3551ec273089 SHA512 188c51ef95535347b2fe4b0096cabda328b31c0904763377cadbf3fd5905af52a2b7f3d53861c48cd7539fe3011b9cc2a903fa2de705ad688651823a1287c9f2
diff --git a/x11-misc/arandr/arandr-0.1.10-r1.ebuild b/x11-misc/arandr/arandr-0.1.10-r2.ebuild
index 0ad5b88dffcc..93d18823f081 100644
--- a/x11-misc/arandr/arandr-0.1.10-r1.ebuild
+++ b/x11-misc/arandr/arandr-0.1.10-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS="no"
 PYTHON_COMPAT=( python3_{8..10} )
@@ -18,6 +18,7 @@ KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/pygobject:3=[${PYTHON_USEDEP},cairo]
+	x11-libs/gtk+:3[introspection]
 	x11-apps/xrandr
 "
 
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
deleted file mode 100644
index 554e2ba9fadf..000000000000
--- a/x11-misc/compton/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST compton-0.1_beta2.tar.gz 144239 BLAKE2B 993c091aa0eab4171740a26c4ea8e9da66368fbcddbbdf9c466dd2cb2dbe0a685dc6c2027a5b56d08df4fd42d21784dd2cbb7cf56869feb1b74b4854db20a5f8 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535
-EBUILD compton-0.1_beta2-r1.ebuild 1618 BLAKE2B 6e591088f42a15057352e85c39f05f4c044c22338c4851d7949e8f369f993bca82e8b6f767a8dfdd3809f15fce39965105f8ea31edd4938b56bc130c743aab2e SHA512 4ffd1ada1439d583b36e87d55d130544785ad9f641639589b57ef0e3cc3256f48eb30bed209aa24ce0c45bd1e65c9cad12092dcbdd1c4560ce8259deaeb3d7b3
-MISC metadata.xml 492 BLAKE2B 74c0a1f1a7099a52f157ff92aca2c82e57e8ac547ce8119962db0c8f29465e55d2c3d03a85b8a72585cde7195f77952673a98f8ab86715816cef77fcb214bea4 SHA512 fbb4101254eea39b9208d07f24ec6576b3218b34d8b6e8ff88930e95a252a619fd15db6f675940da9f5198268258ca361ad1079d98572da73b00424359159b83
diff --git a/x11-misc/compton/compton-0.1_beta2-r1.ebuild b/x11-misc/compton/compton-0.1_beta2-r1.ebuild
deleted file mode 100644
index 40ff04b84690..000000000000
--- a/x11-misc/compton/compton-0.1_beta2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit toolchain-funcs python-r1
-
-DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
-HOMEPAGE="https://github.com/chjj/compton"
-SRC_URI="https://github.com/chjj/compton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dbus +drm opengl +pcre xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/libconfig:=
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	dbus? ( sys-apps/dbus )
-	opengl? ( virtual/opengl )
-	pcre? ( dev-libs/libpcre:3 )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xprop
-	x11-apps/xwininfo"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	drm? ( x11-libs/libdrm )"
-
-nobuildit() { use $1 || echo yes ; }
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		tc-export CC
-	fi
-}
-
-src_compile() {
-	emake docs
-
-	NO_DBUS=$(nobuildit dbus) \
-	NO_XINERAMA=$(nobuildit xinerama) \
-	NO_VSYNC_DRM=$(nobuildit drm) \
-	NO_VSYNC_OPENGL=$(nobuildit opengl) \
-	NO_REGEX_PCRE=$(nobuildit pcre) \
-		emake compton
-}
-
-src_install() {
-	NO_DBUS=$(nobuildit dbus) \
-	NO_VSYNC_DRM=$(nobuildit drm) \
-	NO_VSYNC_OPENGL=$(nobuildit opengl) \
-	NO_REGEX_PCRE=$(nobuildit pcre) \
-		default
-	docinto examples
-	dodoc compton.sample.conf dbus-examples/*
-	python_foreach_impl python_newscript bin/compton-convgen.py compton-convgen
-}
diff --git a/x11-misc/compton/metadata.xml b/x11-misc/compton/metadata.xml
deleted file mode 100644
index 2ebce28929db..000000000000
--- a/x11-misc/compton/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
-	<use>
-		<flag name="drm">Enable VSync with DRM_IOCTL_WAIT_VBLANK</flag>
-		<flag name="opengl">Enable VSync with SGI_swap_control OpenGL extension</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">chjj/compton</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/gbdfed/Manifest b/x11-misc/gbdfed/Manifest
index c9133818a158..a9cea23c4acb 100644
--- a/x11-misc/gbdfed/Manifest
+++ b/x11-misc/gbdfed/Manifest
@@ -1,3 +1,4 @@
+AUX gbdfed-1.6-makefile.patch 323 BLAKE2B 51fc81c1b752cb199d48dbc41dff219cac4ebab9409b5c3caee114f97e89cd1bad3a2844a54073b9a41276a87fa9464c7e50e7aa00b5246472d6992bf75b7f4e SHA512 da573f5fcbd51b954f2a2cfdf38aa22bd93d43d21abdc94c0aa49cc72649f47249b9a5cd9eff7a5bf4caa3cbdfed70093c33b2f12b7027fd59d5aedaa93cc550
 DIST gbdfed-1.6.tar.bz2 236166 BLAKE2B deca4c3a4c421b60848e5fca0abbe760582ed5b0ca78ae9a3568d87f19975601732575e911934272c74ad58205ac4b1e9a4fb67aa80c24b0580e631b365b0997 SHA512 45cdccd86d01d104c14db5c320066f167a25b7967a13f4bc962a2936c94f549efbae792b7828cf21c43e2989858c3482c5daba74cb267db24ca5daada0ad44ef
-EBUILD gbdfed-1.6.ebuild 620 BLAKE2B 9760ab43c9d0de85d150f50d38e90259cf4e51ea7520999f8623b015cde713ce6f4d98ec1042ada93be96e75530d75ae7666a3547fdc50de6b193b0162471a42 SHA512 3eaaeed222bc67ab2267274f7eafe2b60ca22bd34d45280961da6aa54be79584aa96fa6d02a0735209a9cb12fa1c999aaa212e2da4bc5a6ad062c3880881261d
+EBUILD gbdfed-1.6.ebuild 506 BLAKE2B 95c5636bfc903875c79048c3129f560741ca992e9eb20b0583a280c3bfc7e025768113374fbc3424acd02354b798f21126fc9b443c3fca3142339a2e6d7b9e1c SHA512 519849ad8dd5b964d1152f9a17fdf46782a54774f9478c2c9baa2e3571a17a13b830b2bf93ac78e153716103fcb324dcca16b9c2bbfbc997156472a655829021
 MISC metadata.xml 239 BLAKE2B 5aaac778361cc8f607c6587e338cb80fd9a032e722766c60e011327e58b327fd4ca5113b66b281273c718c7492edd2477a0d702acd900fd9e376faeaedf717b0 SHA512 333c4df4d2002923cb872edc1e4e4f121563d73b157a8b2a4605ee449c759417014e9bc1342acaf697325d3d3bd8babe5930bbe4e08df90650cd1a52a0ecd337
diff --git a/x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch b/x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch
new file mode 100644
index 000000000000..20c8f3856de8
--- /dev/null
+++ b/x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -27,9 +27,7 @@ MKINSTALLDIRS = ./mkinstalldirs
+ CC = @CC@
+ CFLAGS = @XX_CFLAGS@ @CFLAGS@
+ 
+-DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \
+-	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+-	-DGTK_DISABLE_DEPRECATED
++DEFINES = @DEFINES@
+ 
+ SRCS = bdf.c \
+        bdfcons.c \
diff --git a/x11-misc/gbdfed/gbdfed-1.6.ebuild b/x11-misc/gbdfed/gbdfed-1.6.ebuild
index 2166c768e873..3f72a17df64b 100644
--- a/x11-misc/gbdfed/gbdfed-1.6.ebuild
+++ b/x11-misc/gbdfed/gbdfed-1.6.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=8
 
 DESCRIPTION="gbdfed Bitmap Font Editor"
 HOMEPAGE="http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"
@@ -11,19 +10,15 @@ SRC_URI="http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.6:2
+RDEPEND="
 	>=media-libs/freetype-2
+	>=x11-libs/gtk+-2.6:2
 	x11-libs/libX11
 	x11-libs/pango"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed "s:-D.*_DISABLE_DEPRECATED::" -i Makefile.in || die #248562
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README NEWS
-}
+PATCHES=(
+	# bug 248562
+	"${FILESDIR}"/${P}-makefile.patch
+)
diff --git a/x11-misc/lsw/Manifest b/x11-misc/lsw/Manifest
index 90e417df4bf5..55ea0e74b9e5 100644
--- a/x11-misc/lsw/Manifest
+++ b/x11-misc/lsw/Manifest
@@ -1,3 +1,3 @@
 DIST lsw-0.3.tar.gz 2723 BLAKE2B f906efdbd8d2dd3781207b2112f0358d4d64a0134548364b7b65e06cf0e140337f70f3f06fdbf3a11545f34c6ce8094866635e52ccd088507f3a89c61494fb90 SHA512 54f5aeb6d17fe23a2e65fbbf4a7622c194e776261a6f0c04ece54fbf212588ec749d5bf5939a6084997f36468339f5373169234c671211a2b7712c408cf883d8
-EBUILD lsw-0.3.ebuild 673 BLAKE2B 2ea068db44a7eb1be6c2e94777260cfcf5bd19e58c9dd02a430807b2b72c0bea06f6e981df21373ae430308d8caf0ca9478c0b8cc509788d9cdf417198deea0e SHA512 18805f44432a2d02c76d40514504b36ca468fceeb095f338cabe5fd2bc25fcc7049369741e380b88e4b266108d52dbcf955416463cc5ac47c94fc8c1f5919e5c
+EBUILD lsw-0.3.ebuild 690 BLAKE2B ce70a3e2494534141e2752643340630f6d76b9f4d219ef2eb559f42c76d1f4a07ebdd353574f09e15674e8ee1aaf72356b2275a5fd83c10b0b689c5d00f355dd SHA512 ff97ca5864f8f9fd194fc800c4a0cb3025ae1ffe08e7a8057ecc76a324880e739134bf9e44a001e9f1020165663fd8a99ac1eb9c74edde6d53f9a8397cdf0d46
 MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28
diff --git a/x11-misc/lsw/lsw-0.3.ebuild b/x11-misc/lsw/lsw-0.3.ebuild
index 8d3f62603016..006e0b543d2e 100644
--- a/x11-misc/lsw/lsw-0.3.ebuild
+++ b/x11-misc/lsw/lsw-0.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="list window names"
@@ -10,13 +11,15 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
 src_prepare() {
+	default
+
 	sed -i config.mk \
 		-e '/^CC/d' \
 		-e '/^CFLAGS/{s| -Os||;s|=|+=|}' \
@@ -28,7 +31,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index b27971e9778d..5b180f7040c7 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,5 +1,7 @@
 AUX xdotool-3.20210804.2-no_hardcoded_pkg-config.patch 1073 BLAKE2B 570221beabbad51f324bded0398afd68e9d3d4f30216b7a643dc9f8c76163721bd32778137fd322faffc2edafbc63d10cc036ec5311496b24410c737735f6482 SHA512 cb206c2b708835d8f3c656778edb07f08faafe3f9c1b407526e45321dc44b59981617b0c7b96865d6c1b968c855d40c0302ce888e8a1f57719b87ee9e774449e
 AUX xdotool-3.20210804.2-no_ldconfig.patch 493 BLAKE2B 044f6896b2f1279795a4263107309886518698125a818522a771374f3a1f2242f00446e87eaaff3b5eead3840459fc249405d49d47e7cd6568f5c923e096fb34 SHA512 7b3d4fe4a532e81358d81ebe9fd6e212bcceb08700df37d7d4c7fc16d95177c8f39ec8ef5a986eb6a08e7c6d209efaa8426483732dcedec39617b203de2faac5
 DIST xdotool-3.20210903.1.tar.gz 115051 BLAKE2B d1be4fc2f5c86991804b63b85c95748dc04098f85a515b3427d980dac3d355133da0408d3e91a39e5363ae6242b02d268a8b5bc014fdd5faf51e43e24fb54176 SHA512 446ba8d354031df6a21957df92220c7dcaae5bacbb8878568a57f31097db72a88701717ec8bcd35cca3f5356bfaf47eb3ed65d2159f03b0c7a7ae5550a9b1dce
+DIST xdotool-3.20211022.1.tar.gz 115237 BLAKE2B 1269775848905253936b113ac45e2a5126f1414eeacb5dd91aea6dc0cb6993f9fa0da969f30c83e0e03d435894a31ba633dc02269b38f9056772b513f0c86889 SHA512 f11d7b079f19d1650adfb549ecc96e840805935bf4925beefc3238154ad0afbff36b134c78bfc73a9dc07fc869ab75676575d6de50cfd54484d2c35d6913ea27
 EBUILD xdotool-3.20210903.1.ebuild 1414 BLAKE2B 122aec097283e3d75980d9639d982719a0ce3af7501dd2877ffad27d7e17358a369913b4aaad97b04d5e7d46d4a0e88492b18bd17f49bebfab660b34e226faf1 SHA512 da30202930aef39942f58d6f1b9a24cfee833e4ec69f50f43c50d2fe0e1f49dc4f9d86d7b5722f3226ba7d8efcdccb35cd06af71e7f29ab4cb7c09254c05905c
+EBUILD xdotool-3.20211022.1.ebuild 1420 BLAKE2B b13faacc29a312ca24f1383d996bbb51b010fd85b1a5ba1111ca25aabf932feb133a219eccca1799f3dddaa089ffad206d6fb6ebbb7fcc58ba9e70e9b5416592 SHA512 fe201f408059102b92ad0d8ec894a7d4ac925bd16fd2df2889d6637323b448889656e6c575332b42caaf2343d7a8fc143615051efa74c803c9e5768a68fea931
 MISC metadata.xml 560 BLAKE2B 9977cd6c5efe52174f07e4ef10141b7742c904c86afb7305ee82f9f222b2cf62a5b052f171f13d69cf3a7b00bf53f759f4cd108e7b285fafec5f5995828c0888 SHA512 381d5c1933c426b1847d2f239de60c68ec4877b482e6c33b60dffa74c7ff729cd5c62f852adcdf92b830ae8081f0b4c1a498b58416022f49bbae2013ca82ee74
diff --git a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild
new file mode 100644
index 000000000000..849e4a9503b1
--- /dev/null
+++ b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows"
+HOMEPAGE="https://www.semicomplete.com/projects/xdotool/"
+SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+# Many the tests want to manually start Xvfb regardless of whether there
+# is an X server running or not (i.e. does not play nicely with virtualx),
+# some tests require x11-wm/openbox, some try to run a complete Gnome
+# session. All of them require a Ruby interpreter with dev-ruby/minitest
+# installed. In short, supporting tests here will need MUCH work.
+RESTRICT="test"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXtst
+	x11-libs/libxkbcommon"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.20210804.2-no_hardcoded_pkg-config.patch
+	"${FILESDIR}"/${PN}-3.20210804.2-no_ldconfig.patch
+)
+
+DOCS=( CHANGELIST README.md )
+
+src_compile() {
+	tc-export CC LD PKG_CONFIG
+	emake PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" INSTALLMAN="${ED}/usr/share/man" INSTALLLIB="${ED}/usr/$(get_libdir)" install
+
+	use examples && DOCS+=( examples )
+	einstalldocs
+}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 7aaad63666f7..3805e9b471e4 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -3,6 +3,6 @@ DIST xkeyboard-config-2.33.tar.bz2 1755990 BLAKE2B 63d5d789609711fb92acc69319efc
 DIST xkeyboard-config-2.34.tar.bz2 1763558 BLAKE2B 4417ab66f476de9914113296437b6a1b558c57561169353f533695bbe95831e73045c87bb3a072d1e3c103d2f69aedc3a73e5290c90ecaa8a131419d0d8ca3aa SHA512 cf3bdb658349b2db9db44ea1a0f7060b890b95520319101d83ba5aefeb0b1e2fd578b6f72a90758438f04bffbe7536cf112b76297fd47c95e02029fd203c51fb
 EBUILD xkeyboard-config-2.32.ebuild 1012 BLAKE2B badc44dbcf680de7aa91a2b639f117fde7f799be42804179f99b86bc016dc66135689caebb93f6e504abeb49fd2c2d77bf19ed2ef805fb5ffc1430d7654a2ac8 SHA512 f063fa916ee24bd293037ca460d33d2725f1afc636e626a0db7f5e5d26a2e26d5f6e5832938e9bcf071376525c14c999fe5fcb204bdf76206fef6f983ec7199b
 EBUILD xkeyboard-config-2.33.ebuild 1011 BLAKE2B df66a9172b6565a1a3d748f3c84d2cf4944521b528303099104f2b4fa5e76f99d164746369c36afddda29262cc94b0cda5d98ef6f9cf4fdd078503edcdf71a8f SHA512 19be925fc2d86c10f8e4523890a7e793e20f180955e419d6e10b54311f17d42c314e7d373df5d397db26a9de3dfb29ce762b77130044788cf6e10dea0a88bc1b
-EBUILD xkeyboard-config-2.34.ebuild 1019 BLAKE2B 15e28c63f89ae1238f0f8c5c6c56b5cdffb8d66ca0d70124867012f3b4e8fbc9ba73c9c93af74c7185909a6811f5a4dea2fe6ac77b6bb3c9e3b37c84c877d884 SHA512 57d5933cfa0f30d80dfeae2b9c12594929c1e60f72cd18beda86e0846ba46311d4ef4d8d199687942ecd4f35239e7e06967cf95c1b38358276e47cb99973615a
+EBUILD xkeyboard-config-2.34.ebuild 1016 BLAKE2B 86245275be2efbe06530576effd62888b7c3b49a665244561fa3ea8f0aa48b24c5105d318ac25067c06fb08e28c1f1072e2c9eb6a87f2be6996619dc72527531 SHA512 6b042e849e6b37925b5ff981701876ffa23dfa57977f881c7a13024115c1f9ea3a01dda90cbeb870f237b90f9b96cdae8f88a7fe3de3f9959aac2d7640714922
 EBUILD xkeyboard-config-9999.ebuild 1019 BLAKE2B 15e28c63f89ae1238f0f8c5c6c56b5cdffb8d66ca0d70124867012f3b4e8fbc9ba73c9c93af74c7185909a6811f5a4dea2fe6ac77b6bb3c9e3b37c84c877d884 SHA512 57d5933cfa0f30d80dfeae2b9c12594929c1e60f72cd18beda86e0846ba46311d4ef4d8d199687942ecd4f35239e7e06967cf95c1b38358276e47cb99973615a
 MISC metadata.xml 338 BLAKE2B 0abfc9e29fc629961ecbcc525a18185afd4b08cee4b68d35d1e2f863b898b1881b68e53f26079d1dfacbcd1f6961433dddf316435f421ec9f8b7a2e669c89eab SHA512 d1df4e20e9260892555393fddfeac0c9190c13cbf2a654ece211faab0c180ecdf592939992d5abf20a432a68a1ac0400e9e65241a9d3c7a04093c11b13123d75
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
index 9e1a13130f32..647145209db7 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 8f403c0b7815..121776402410 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -4,6 +4,6 @@ DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb690776
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
 DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531 SHA512 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
 EBUILD xorg-cf-files-1.0.6-r2.ebuild 2116 BLAKE2B 6f4a625d0ad8a2f3f06c9ad48da26c6801d1b571aa1325e89aee77527bc47bc5fc30d8b440b54c6d9353d2c9869e6a51c865e36d4ee9cdc2bd597144b7e151ff SHA512 65ec70b79bbee5f2f256e9356b9fff0350e0dc6fee458f5de401a667ebb2a2f72bfce80fb59c6b0b2e720d12c3efdf06b9266150c485936d2641df7f8721826d
-EBUILD xorg-cf-files-1.0.7-r1.ebuild 2004 BLAKE2B 0c33adcd29491cd41243dc25bb0b574f903a14efcfe7e89927ebc40b6ef8e8ed040d27fe6a7206435e7f33f103cb135b4fa785441157964bb800e4bf9d777c1e SHA512 6a224874cd5d4361624938c618f0691031623cc7948a0a4cc5544cf3fc44b56c4d52032f314a646c124d40c4784521601a05280a3cb0630ddec28d810fc3c20a
+EBUILD xorg-cf-files-1.0.7-r1.ebuild 2002 BLAKE2B eb530751955e94571d4d7082d4c3708cfe0b2aa400354b8ccfce59df8258ad874b066bf250a391003159a6d15679860892aa0bb81f240cdc90a429611afa4a17 SHA512 5feee912e64ba8a5463260333d001647314de9a689c819ea2ae6c7757b0ce19536edf9221cf54d9fb8f6c53067d4c131cc60ebc9c9f805db9572f9b9c8e0e1db
 EBUILD xorg-cf-files-1.0.7.ebuild 1952 BLAKE2B 42449687e7df6c45332fe5c4da007a6900f5ddcf5c5a265003583e44b26a5fc48c3e45592287de69834394f26c6ecfbafa756f5b2b4fccb7cdbf32c02985c0c9 SHA512 163a67ae8db397254eb2091353754579b069becaadf3938786d7dfc8a161bf457e8dbce199613f990cb2e089735ddccff3ce19a9a3ef0eaa7446845c56faacdc
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
index 0c86ae1b1599..e975dcc5e261 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	virtual/pkgconfig