gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /x11-apps
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
107 files changed, 112 insertions, 466 deletions
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 086de8a653f6..abf1539b7a9e 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index b2bce7bd5236..ad6c9625eded 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,4 +1,3 @@
 DIST appres-1.0.5.tar.bz2 124531 BLAKE2B 0d3e497afb3ab7d3565451c0da6594b4e608fa20e1a225162c4347d672db6a94823b5961c112b414e55c86a6b53a684709ddd109991f0545b6897bf276824da8 SHA512 70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137
-EBUILD appres-1.0.5-r1.ebuild 413 BLAKE2B 354b9e46453ae39cff3e3e66ab7abc885078ee3e19ef3586ead633da7506aebee4d7a78220878d193e5d991d1f1aebabd3d958c2452ca863437b8f840c39809a SHA512 0b9d540cd558a7d44b01fac9fcde490dc22db2a28ea51de9c5aab55ec7faa6f6302d3e38d77bef2e7899b3cfe34b05bcfa13f9407e8315b317be3b54f9a955ba
-EBUILD appres-1.0.5.ebuild 390 BLAKE2B dd2777b0787ae95e36bf11b10924ad175f36573d84a8d326fcfd1de2030012ac56f66811664c8a3c60e2f631a2404ae25440ff5de069227ca5b51df946b80bc6 SHA512 defdbb32abc88776106c212722758e17d0941f7451def6d7907bc11b750b4a73b73efc6f5585b18cbd2ce24997cfdc748b059a772112734c73f9a29caf09a920
+EBUILD appres-1.0.5-r1.ebuild 406 BLAKE2B 7c31121b214c90395d9e1db1a06fadcb3207aa976ab08e56430555e42cf74a6b90098c03a5af33eead88f3ff470e286037ac9a5ffed7a6a50bc3616fde851ad8 SHA512 895d1873b57606d8810305d44325e90959f87877dafe5eedbeababb6417e71f653bac3b83e28e4686ece7c6ffe3fd38bc63d938857dd4cb4e938ec149ad48bbf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/appres/appres-1.0.5-r1.ebuild b/x11-apps/appres/appres-1.0.5-r1.ebuild
index cafaa058a220..197d71b1fc3e 100644
--- a/x11-apps/appres/appres-1.0.5-r1.ebuild
+++ b/x11-apps/appres/appres-1.0.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="list X application resource database"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/appres/appres-1.0.5.ebuild b/x11-apps/appres/appres-1.0.5.ebuild
deleted file mode 100644
index 53198ba6e8a4..000000000000
--- a/x11-apps/appres/appres-1.0.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="list X application resource database"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index 2b415f60a24c..9ee05c8c408f 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -1,4 +1,3 @@
 DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
-EBUILD bdftopcf-1.1-r1.ebuild 391 BLAKE2B 5977a9cb75123bba61efbfd0a979060ecdf57a673feceeafb65b8a172c3d2d01dc4094040647fb95e24b57198857bf17b52da3cd8a3ed197e02f887062d311c9 SHA512 457a3a887d7bd5e02d233f1d2d1fab59f63f457f5fa91d7d5ded36ea02da3f5cc992fd0a097f590f4d54cdf6de37df5db8078b92da14f9b54df999cb13a4e90c
-EBUILD bdftopcf-1.1.ebuild 392 BLAKE2B 2e42e1e81954bbc174ef03fdd550292b46d31f26e95abf6c40e840c58f7e62f90f3dffb0506256e45fbbaf9a614ac69a58e00ddbdb7b38f3c7262759d5c9fee1 SHA512 57bbaf70e61cecde5b1480a6033a2de6c9166649778470389170ee24f287d672a99a1fd2e8bd168d7d6217972c496353028edef8a248d1af88c531054eb6f415
+EBUILD bdftopcf-1.1-r1.ebuild 384 BLAKE2B 09921ee21e06b5de506e3489ceca3ebbf747389675088360de20a4dd1c4aec846ca9598a24ff3c25dd9f7a1a3e2c28f2a9b0654d4a68be9b2105d3bcbcd6851e SHA512 8143eb9e7b402333b6ae28844e88523fc2eaf7e53cfb561f1dbeca715d7842d0c996aca0abad5982bfdae2d24ba90b031a27a30653db7a22ab4360563e0ae577
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
index 17246b803cad..98813c66ccca 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org bdftopcf application"
 
-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"
 
 DEPEND="x11-base/xorg-proto"
 RDEPEND=""
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
deleted file mode 100644
index 9f0750e83c54..000000000000
--- a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org bdftopcf application"
-
-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"
-IUSE=""
-DEPEND="
-	x11-base/xorg-proto"
-RDEPEND=""
diff --git a/x11-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest
index ad3724839b67..f9282afc417d 100644
--- a/x11-apps/bitmap/Manifest
+++ b/x11-apps/bitmap/Manifest
@@ -1,4 +1,3 @@
 DIST bitmap-1.0.9.tar.bz2 181401 BLAKE2B efdf2d2905f6513ba8942d55a1aadca8f47f22736a55894deb9a4afeff132d8e410b8d84d27314253f16cb84ebb530b79c75991427365c45058e58280ede4449 SHA512 873c626c72a0f4025fe8c8aeedbf3fe4ee5657fb487ad7410406a20da518c0358041dc45c2549926cc10e1d031977073b9d1ddb32830fdce95b716a52fe44456
-EBUILD bitmap-1.0.9-r1.ebuild 392 BLAKE2B 8637f7a4f93ba5d2ade30fb92c4b87a9c6b41d5abda5a0f6f8be5e9811ae1dd601ab72952fdcb4390b371e65e811d495754fcfdce5b712d3c849fffb11ef2638 SHA512 2fcbaa00185276eb07cd1b9f13c26cccc2e6cf2d133060ebad3652f1acc724ea64f4311ff247dca3970d0279c372e7a125e86e34e2856352f1e2deca87683083
-EBUILD bitmap-1.0.9.ebuild 370 BLAKE2B 6c7cabf9c6ef53b576e65fe0c388700a5486298dab8d3ee6666583c2399bec7b557cd969a5eec9f1071aae4b46601dd8bc669083530c7f99e577bc85006829d3 SHA512 52352baec1b698b9d79640aa888113af2242145651a1d6df52f437110f17be934e9a262e2a1ca3e7a4e55724ef6b25d463af3c789cbbdc69319d6184c055cdaa
+EBUILD bitmap-1.0.9-r1.ebuild 386 BLAKE2B 227e3ea363fd1583fdef9cce7fa239371bbbed110172af908fd3da7b3637f9e72be1387bb1169ae787cbf0757ee967968f089beed0321a142f6de9757ad3eb7f SHA512 99e619c14aa3c71071de3e935e1c02e7c222f51ff0acaf819700ed93be7aa9815d995c9c43a8e3a784f2852ed5bf67fbb4df9ab7f0bf46b41d58cf271d622e63
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild b/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild
index 37031344c529..463ff52368e3 100644
--- a/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild
+++ b/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org bitmap application"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/bitmap/bitmap-1.0.9.ebuild b/x11-apps/bitmap/bitmap-1.0.9.ebuild
deleted file mode 100644
index 939040ae52db..000000000000
--- a/x11-apps/bitmap/bitmap-1.0.9.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org bitmap application"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXaw
-	x11-libs/libXt
-	x11-misc/xbitmaps"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index c6e6bfe81e95..fca7c92f4ba0 100644
--- a/x11-apps/iceauth/Manifest
+++ b/x11-apps/iceauth/Manifest
@@ -1,3 +1,3 @@
 DIST iceauth-1.0.8.tar.bz2 137905 BLAKE2B 8fb2e29e5f4fee57e5c1f86eb78ce518519f04301e8aa81778e0de6589f62f32478a7cae05db831177f4425eb388f7b666f697314d5ab967ea3e2b6ac7b47d56 SHA512 9d4520adf951b16a3e784349dbb70d5d8176b74b956f8adc63abf55d049745c113b03ccfa60a281fc39b487db3742302dc6287c9985ce83a0157bf4674df2af1
-EBUILD iceauth-1.0.8-r1.ebuild 397 BLAKE2B 471ae859e07baaf9540b862993ac051c29a4a87709c3be1296d5f1892cab1840b9ecc8ecbe236af071f921b4f6d7991bb883082f133e751ab2580d0e84c5e3b0 SHA512 a8800f1f6fc26318322be1e76fca15928737e3b83e4d1e446c2f31ce20ff914868d4da6e9c2234e2db6495798936f7aba7f98e7d6adbc33e982b7ca99965323f
+EBUILD iceauth-1.0.8-r1.ebuild 398 BLAKE2B d1ada5bae9c0ae9cefcb5b858e6e6e1a3f5d8be78411bb2d1b1e592a6079835a33f3508254f516a1a501a6abc2cad748d77894f2ec96c515a9f924779b1796d2 SHA512 fa89db2bccf705d90ac82b36f3e25ea18a59f57d94779befb43a2f1a40e668a14d4fd13a0421996d8a450bb1181a66f4d70d4c6cdef9c35f48ce15879ee9151d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild b/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
index 73eea2d9a317..725a27ddf3e4 100644
--- a/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="ICE authority file utility"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="x11-libs/libICE"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/listres/Manifest b/x11-apps/listres/Manifest
index babbbd9455e4..62fdc7d9b6e5 100644
--- a/x11-apps/listres/Manifest
+++ b/x11-apps/listres/Manifest
@@ -1,3 +1,3 @@
 DIST listres-1.0.4.tar.bz2 125472 BLAKE2B 99865e682eb2894b7af1a84a6fd29bf16f0345b8660bbb61060dbb7927bf376591c7403356b97cff13ff3392321d52f34388f49fd2aac6dab52592317818010c SHA512 925bceab6ff96fcf91f58ba2f858905d6e2eff7074ba29cfc02def7c19fb493545837884f1070dc004422451f749cd459000c01e8c9bb51a7cce7f7ab4067b8a
-EBUILD listres-1.0.4.ebuild 331 BLAKE2B 0c9c6121afcde7c40b6f4e9c84431da2af54e069dcb6049b687a84822c808c8cb9d7174e044d8ef17f3f53fd0334035bd8e1fe313ada868307cf8534a7c29581 SHA512 4acfec87db1aa3db9767232eee16dcb54611d961fd6793471dbdfba4a5181f059fe657e6592fb804c1d8c83f24f6b4120911c8813e3304b63f4ba9ea92c579d3
+EBUILD listres-1.0.4.ebuild 332 BLAKE2B a2746bb241e17a6fd1ab82157b97db3f849944f86f8773d05e3953d193b8edb6d6c8ceae7b51cdfc7c5cbf05be8ae8426a38980fec90ed6f2c3b6f08e8fe52c6 SHA512 c5ef9cc66fa2628c9c07556e6b3ca52e777e2deb0797669809e455796964c9192d26ae135aeb25df21ea962578578755add27b6d5a8687f516efeba26f833354
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/listres/listres-1.0.4.ebuild b/x11-apps/listres/listres-1.0.4.ebuild
index aa1a298af7a4..892b157132fc 100644
--- a/x11-apps/listres/listres-1.0.4.ebuild
+++ b/x11-apps/listres/listres-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="list resources in widgets"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index f0c9fcd1c289..3920b9e45369 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,5 +1,5 @@
 AUX mesa-progs-8.4.0-improve-printing.patch 11963 BLAKE2B ad2dd57bf0959da6253d0e5c19523e701d03b9d4465564ff3f7e1462e2f36db0ef6eca46ad847f8f92f44fb91c46e87425d430c47c13f7efc130540071fa3ac8 SHA512 31048947ba19b03277d5dabff8bf3209274e9c95da3b33d9e27c3c1cdf71c3027cc0591ee27bdc0e8dff506da2f0601911cdf5899594674d2dd178204db3085f
 DIST mesa-demos-8.4.0.tar.bz2 10073259 BLAKE2B d251e705c6e3d2fe959161d736401fd06ba267a9c389341098373670b6f44ca7cdb451d96e94e3b22f006b696a9b19e38096423f6438544539f46beda91c03f4 SHA512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957
-EBUILD mesa-progs-8.4.0.ebuild 1709 BLAKE2B 6febe405e91813eb64ae1922151f4ed391cbc0bc612d5a0c958d7cdec80a41f23cf9b992f66ebf5e217eae802885b414d987223b0b87c0175ae3a7814faff08e SHA512 78acba58e03f4d2747a55157f769451a12f9d5ae56ae14762c4f3e5569875fd83b2ca2fa1482da39768aaf169fbd11a1445cad41d31115c5f19fc1ce14dc1fd7
-EBUILD mesa-progs-9999.ebuild 1672 BLAKE2B f561d871fdd6689c48d9a11abafc0268c72e7e1340d301f00655512c7cf692ad36f38043510ddd061660af7d0c5c7f9bcbbbe6d4bc88b8d1994222a26cec5de6 SHA512 18e9b603aa29e034e4abe281589540bbeae9ee16f953ed36628ec23d566095db77cae38dc0761aab6d4724fcf2509da1d6ba624de773595d0f25ba627a1fbe7e
+EBUILD mesa-progs-8.4.0.ebuild 1711 BLAKE2B b42dd6ed54caccd9659e597b7fe4afb4033ec62ce76055f481b879c080734900bd5cae5093a74beeeb5e52e7b1a978413f599b737fb0446359543c7ce6aa9b9d SHA512 54170ade4604f5497fa70c6a708a2254eceae17039a19b57aba27181a7a0472f0cbc9bd62f49c3d9e228ca7b4decba4b222fed156cceaa5770e74f07715e5319
+EBUILD mesa-progs-9999.ebuild 1674 BLAKE2B 821cd384ac2507d9ebdac2be47e487b9b615ea81e4362e887db9f0037aa468dd3570f41ebbdcbd472f6f2c7521d6d2b1faf40cb2cc5dac105c71c705068e0243 SHA512 98821285c8702381f67b0e0c8f2cca9b0818e37884f863b690c5efa42fc27679834e7182bcefa4899cd23246092e74fc9953c6d1b51187ee43a295abef316cc4
 MISC metadata.xml 475 BLAKE2B 4275e3d7871f0b092559ddf5c898bad781441267b093d55bdb14d7e9795ac070aa7d9a87cf7248d58b75798eb28a4413d588492bb6ab092ef79373434fb1652e SHA512 624480e9601ad6ad1cb996b25074c3e47a539113af39633de80c9eb0330322453f545ecfede9d602de7259d66047f507bf3a1cb115becb5f5e7d0613cb5bc675
diff --git a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
index 189d0804e56f..d3615324448a 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,7 @@ PATCHES=(
 
 src_prepare() {
 	default
-	[[ $PV = 9999* ]] && eautoreconf
+	[[ ${PV} = 9999* ]] && eautoreconf
 }
 
 src_compile() {
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index b57bf836064e..d6b0a7e4359a 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-	[[ $PV = 9999* ]] && eautoreconf
+	[[ ${PV} = 9999* ]] && eautoreconf
 }
 
 src_compile() {
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 12c255ec0c20..09e012f91816 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,3 +1,3 @@
 DIST mkfontscale-1.2.1.tar.bz2 150808 BLAKE2B 0c2cce3a5b400f8c757a9e1f7a0c8ea85f41c7d229cc1197c68340ec9f2b0b36872a914bf04dabb584727405092b4bf9abbc465190ac1b91419d9ecb3d359b83 SHA512 4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c
-EBUILD mkfontscale-1.2.1.ebuild 604 BLAKE2B 71e49a036ebb55b6dde7ecd46aad7a26de23d6f64a7921076c18c75f08bb6822617640ea42ac268fe488d23b88e158fdfa79d9009cf2c74cf23968fc56e13975 SHA512 b0d5c7e81ceb821401568d962c2be58edd95b1123b7e85086828ea5aa1a578a366e181ba6b63fcb9258f18e184fef4c6889721948bc3421ed229a7595375624a
+EBUILD mkfontscale-1.2.1.ebuild 605 BLAKE2B 8301b7d578b2078c2324f082d087c88d8569fb9e8e3411564db1734b66078bb5ba3022fd78383f85173c87ecb1e132713faaeb1bf941ddb46dc9a2a01ee00d84 SHA512 52c0afafa3af9af432534ae702a6bff3f3a4c774a94694a45ef8f7c2678216013a3b138639e09c7705893bc7c9a904ddae432f1529b0c431c7852e10c9728047
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
index 0c62a985f5d6..2080a1afbec0 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="create an index of scalable font files for X"
 
-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"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/x11-apps/oclock/Manifest b/x11-apps/oclock/Manifest
index 927b5e4ccfe1..361cc7d1a309 100644
--- a/x11-apps/oclock/Manifest
+++ b/x11-apps/oclock/Manifest
@@ -1,3 +1,3 @@
 DIST oclock-1.0.4.tar.bz2 132835 BLAKE2B 8547aeb06ac33917d44f318ffaa38bd899b78176e4ecd0e4446706cdcb3fe30933b4a63cc465601268d8d868e90d498c0fc6a27f8c0feb304fb7ca1f44492d4d SHA512 6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7
-EBUILD oclock-1.0.4.ebuild 368 BLAKE2B dc4327fac69c28638cff0fe94d3286ce5bc4a1218208756fbc467763cec2df3f06428fbb346cc5e838dbb5234f69f06c69c476ace1802d588ca60acc5ea8f41d SHA512 79187ea593324e3b9f7adcf46ec5b882c58f1f7785177ed554f8298efcf4b95bd8b1286ca53cf9c4e694ecf71126019bf17d6054d9c18aea9e8d2ee5a3a384af
+EBUILD oclock-1.0.4.ebuild 369 BLAKE2B 5eb189f12b5c763910228b34a3d3b8889285575fbef9708d9257775bda35f289499c59d4ffd742505175c84a8e87fa9a8d1e4f698a92a7bcb41390c54e74ef49 SHA512 c0895a5212451aac1d3f408323033077edb3b02fd984a08ff54b7fa69ce4dce50ed37dbbe031bfd84a9ca56859661e14db8cbcaa1fb90c2b23c9594f1d48235b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/oclock/oclock-1.0.4.ebuild b/x11-apps/oclock/oclock-1.0.4.ebuild
index 5a42ee056ade..00d5c6932221 100644
--- a/x11-apps/oclock/oclock-1.0.4.ebuild
+++ b/x11-apps/oclock/oclock-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="round X clock"
 
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index 0ae1a93301e1..0cff059b5f12 100644
--- a/x11-apps/rgb/Manifest
+++ b/x11-apps/rgb/Manifest
@@ -1,3 +1,3 @@
 DIST rgb-1.0.6.tar.bz2 139225 BLAKE2B 25e20d0be23a46d869869e47169d86dd50a99bc65551bf83800119c7f9cd242f41d5ecdb611467eaf9aeba909cebbfab8f578e0a5dc63380482f324124064bb4 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e
-EBUILD rgb-1.0.6-r1.ebuild 435 BLAKE2B f0493ceede3d9c2e5e6e3093ad12d4cc6447c3d9151444c2362b6ba064dcfb67415ef24b39d5f4c7542708eec957b5fc4ef2c15f64b544ad25410e964f4e9d6b SHA512 490ad3380db6c43cd8dac0dd5cc13922ed6d0477e608cac4d07d3ef191c53ccfb10a09345b0c55be2189979a80c113fc898440cc99702115e4df26572d4b6ab6
+EBUILD rgb-1.0.6-r1.ebuild 436 BLAKE2B 953505d710fe0de7f3adc95349b43bbf53f0a0abcc16c95180721ff1c877d3ddefa3ebbd33022d68511ca7e1659a9e65bb1b6b24bfc876d12caf271b6e83aead SHA512 c219888f44905e120040d3d8aa9151969d9b1ffd1fe9476012a6049de1d9180000a6c13f1b622c78d918e7155a3865cf04f1558fbd02434c2457583a7eb0afee
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/rgb/rgb-1.0.6-r1.ebuild b/x11-apps/rgb/rgb-1.0.6-r1.ebuild
index de007ca57a85..d868e0412fa4 100644
--- a/x11-apps/rgb/rgb-1.0.6-r1.ebuild
+++ b/x11-apps/rgb/rgb-1.0.6-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="uncompile an rgb color-name database"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="x11-misc/util-macros"
diff --git a/x11-apps/scripts/Manifest b/x11-apps/scripts/Manifest
index 297f91f6182e..e8a3a24a15b0 100644
--- a/x11-apps/scripts/Manifest
+++ b/x11-apps/scripts/Manifest
@@ -1,3 +1,3 @@
 DIST scripts-1.0.1.tar.bz2 72301 BLAKE2B 2765ea1be05fabbbbf874399bf2a32fd778e5c57a98ef6c5135206d125ce29b7a02f7622205638e5c3a35fadd12211d46ef60e6c60b970ec924ec0bf97769282 SHA512 dd058c5d5b34dfb7b996e28c78ce8169809d9e0b0233b1e0f4f5ec223c62affe1e6e561869d7cc47948efbb56bd4b67f69e01f27e2133a15206fd3013c284226
-EBUILD scripts-1.0.1-r1.ebuild 459 BLAKE2B 5e3ea9e992ad209e1b2b6d120e8f0e3ccc67bc74225f070defb9ebd27f908b49dd9e5fbf655238ff952cc712b90d090d1049852522147b8f2a81b465371a91ca SHA512 de89605d59cb8e535a12d7c77dfd7015784945026cea5ddefd1fae49ffc5aa5394fc014d7d72c24403ff7d9fbca27403671d2c88f4a3999b00cae967dd5cbf9b
+EBUILD scripts-1.0.1-r1.ebuild 460 BLAKE2B 2e56fa9faf8b83c30fe62317d8a34ba5aa08653e8c2a92ca5bfac61df14e5fe6fb74255c543c2e1d5e59a649d0f57e7531b7bf94246acb4c06227680468e1591 SHA512 8757d87d747c0ae91ae95582a949e8fcb60f7b25266db1d18cf548cb5db7c0cafde07057c7a0c7f93fb632cd299ae7de67244e53d62a217aef4e08583abed67e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/scripts/scripts-1.0.1-r1.ebuild b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
index fabcb457abf6..9b0911defb8e 100644
--- a/x11-apps/scripts/scripts-1.0.1-r1.ebuild
+++ b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="start an X program on a remote machine"
 
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
index 7006ca05e468..0b714d3e85bb 100644
--- a/x11-apps/smproxy/Manifest
+++ b/x11-apps/smproxy/Manifest
@@ -1,4 +1,3 @@
 DIST smproxy-1.0.6.tar.bz2 132046 BLAKE2B b1eeba52730da79ed9f374636631c0400df997b2c5ab5ce18f1644ea6de7c55ba2914978d0b8b88f0cc455a0b5a65513fd7e29d2a374e7464fed14e007f8cf96 SHA512 4945c92c0f07c5dba5698889f415e78ce406939f4a36eb977309488c27385ce4ce04235c4e850a90a451fea8d7885ded7c6b18db71335c7731b38aaeefa9fcb7
-EBUILD smproxy-1.0.6-r1.ebuild 337 BLAKE2B 1bda74df12cf2f1640f55fa22302c66770d698ea0de0cb0c2ab5efab888482740d3bcd6fce0c34516de0c3c985c52d27431e5cb538f27903b129ab2d28dfb24f SHA512 4602212b08aae54af4648a63a27d9d58a5c20fd0d2a49058d01a17988d8d670c9362a5a5dcc3457d42093f0cfe156f1d4467662d289c9cf0792b8a88cbe0b9cc
-EBUILD smproxy-1.0.6.ebuild 315 BLAKE2B 0de031517e4a864abcbc1d78ffdf1030a6b1c715a52e4b10d47e046244463dfca3e1ea2ac671c5fb0e36cffaffed7a73f2a4f1ebb0f6ea68c86285725714bfbb SHA512 514338b38212aaf888c1ec0eb721fd65f80272cc249b7481140a3f2698f0b8feab787ccd7dc896929cdf2117e93b6e9189ab88ae182433fa35e3f1f9ef80eed9
+EBUILD smproxy-1.0.6-r1.ebuild 330 BLAKE2B 2e17812507c384213c6364ced641351803c2a507645cade15e90e3095b86a58a7dd9d9ee18ddb7a86c007379e118a976e69057611b43c7a4d9a2b7cc3d05e6eb SHA512 c30fa86cbb3d8f1f9815df7c8152e2fda3a05f2c2eff62b5fdaede8853fd5f43ec00354405b3b2811d1344a2b421a4f67a403ca85160a1b324e207cbae274a86
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild b/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild
index 04ff1c27740e..9d256e3ae999 100644
--- a/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild
+++ b/x11-apps/smproxy/smproxy-1.0.6-r1.ebuild
@@ -6,8 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="Session Manager Proxy"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libXt
diff --git a/x11-apps/smproxy/smproxy-1.0.6.ebuild b/x11-apps/smproxy/smproxy-1.0.6.ebuild
deleted file mode 100644
index e9da36aef5d3..000000000000
--- a/x11-apps/smproxy/smproxy-1.0.6.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Session Manager Proxy"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXt
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 6f13a34baa16..0da01194fa5c 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,4 +1,4 @@
 DIST xauth-1.1.tar.bz2 163510 BLAKE2B 0b55ee9ec35ca436c36effe2ba4eee55f76a311a5482d1d72e80e5afea30c682de3f686b2956d17278721e190dd9bec4d93db6507853841a633c931312df745d SHA512 b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c
-EBUILD xauth-1.1.ebuild 595 BLAKE2B 007dc4dad7ae97609e4e57624822c588c690a50b9bcbf2393e8d09ee47f981f3584408f7e0cae5b9de36061e9d25c27ee0484ff15cd97f86b088b8228c865c25 SHA512 623f8c01eb067a382b321d71ca4b4359a2703a016da0f74cd32e71fab423d7f6e1cc54f8ee3da5e19499906ea40e9923b640a5d2f86512878e856eb4cbfed2b6
+EBUILD xauth-1.1.ebuild 596 BLAKE2B 5d88fb6e91c756c1025a716d6a150a638d6752a2c4375d84326cc08530857f70cfe70138a0516a4321a0a5f16af37cf8bdf21cb4385ed781f19c647fee84d62d SHA512 3e364fd1f509b732bb98ab70d85ad1e5ce9af453ed011ac3a7cff2686244063e6af03c1e94cb5d142b25a6db3d7ef21c5ff3c6958e637314351995b064a6cc72
 EBUILD xauth-9999.ebuild 596 BLAKE2B e9747b6e1e2b3a3cc828c3ec739323322a747ffb00a6967a09bba5e2e42d27ef5826f70b114f17f16bb0a609cf3ca15df25ce7e63fb728b3ee7f18f54baaf601 SHA512 9e4f6c135735eafbb0b09c03ba39b372360f559529c02c1402d090a3f4c7a406b17cd300a756d8c1d142d0f01afb1d4216be654f6f19e4c5adac1c4179f81b49
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-apps/xauth/xauth-1.1.ebuild b/x11-apps/xauth/xauth-1.1.ebuild
index c4f8be1aced2..d81c5122af45 100644
--- a/x11-apps/xauth/xauth-1.1.ebuild
+++ b/x11-apps/xauth/xauth-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="X authority file utility"
diff --git a/x11-apps/xbiff/Manifest b/x11-apps/xbiff/Manifest
index 24287b58001e..d9d6c16f3a4a 100644
--- a/x11-apps/xbiff/Manifest
+++ b/x11-apps/xbiff/Manifest
@@ -1,3 +1,3 @@
 DIST xbiff-1.0.4.tar.bz2 133455 BLAKE2B ce79afefbd394b32fd543b64e966276cddc551bfacdf25e80a3463e65eb538469e252d105aeddb60a16227c30a5abfa996af89718d77e075f85b70d71e45710f SHA512 0fb920a08640ec59f23d8a8a47bd244565dfbaff7a21c38a8a2abe1edb5eacabc970b5dbdc409163fc444fde5b75a2dc4e0114312938efec5b77228f3bf785ac
-EBUILD xbiff-1.0.4.ebuild 368 BLAKE2B 156c9125ff7f961e7da71ca22d361d601bed8d22bcbd81a51b112ace6a09aaa2065dbd8b6b6232dd07d50882e538e4f96038eaa683eb9ce43263e20af73e966f SHA512 5c849c0fd432ad295fbabedaa520af2efb21f785b449545ae7c8b69de5d0701e8bf945f636db70a431340e228dd21c86813bb827e7e504a97ddecf0a028d1939
+EBUILD xbiff-1.0.4.ebuild 369 BLAKE2B 6b4fe203f2ce4be76ec17737947e25462105a4a4b39450c44f25f4221748cdfe116d69991b95a61a3bdbae13ae109182ecbb6234ee19910a74daa6992bb9e90f SHA512 cfc0ea966caa68f5aa13cb44ba96bace03882365160cea4e798f2ac670f0ca44d9b4248fc3027ad3206cd446b6a8dcfb35ae3e98d63eb34944bc83683ac6c056
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xbiff/xbiff-1.0.4.ebuild b/x11-apps/xbiff/xbiff-1.0.4.ebuild
index 33f769d9cbe6..301758d0f6b0 100644
--- a/x11-apps/xbiff/xbiff-1.0.4.ebuild
+++ b/x11-apps/xbiff/xbiff-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="mailbox flag for X"
 
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index c49a6ebf6622..0c460aa085f5 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,3 +1,3 @@
 DIST xclock-1.0.9.tar.bz2 175372 BLAKE2B 6e19535a357f1ed162de1ae5c403cfde6be03a3be6bebd8b338472473c8da71e00a3e6c52e7b43315735bc41345490a6dacf1b934458d4c11fec09072e2f9b00 SHA512 fcbac0b4ab1cea4ae0751ce1c0c6302048e5d98d459873c7580e4ca786ec49fa27f73e5831bdfe135abb5cfeabe886456276e9d01351ea7905c606f40f84522d
-EBUILD xclock-1.0.9.ebuild 476 BLAKE2B 74b9ff067a92f34cad9c17b16b1e4f00809868175de111db53f7924d51eecfe97e8e47e7a86297dd3863a7c49845a926f052fd1d40d4608f78047a1ec4c274bd SHA512 7324aeaa4f59f19958ff648c35926a1818c69b779e2e4c9571e8602db072a841b5e1ece9437f2d53b1d82720906f5e5efe1ff3a198f3071a97d437d65f151ba5
+EBUILD xclock-1.0.9.ebuild 477 BLAKE2B 2e104fc3c3f9c9d632da5adb6892aa884b23c37253c9c2fc755a02e56894d5e5e3f164852b6caf96da132717818341d71df50066b81358e6b886142e841f7022 SHA512 5501ba259783974d6a46b632e08c29c5f497b9d1ca6fc7889527ea522418734d7bda63a45887b1e8615d88afac38cb25173422d9d3b33dd1726e7b478c5b6027
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xclock/xclock-1.0.9.ebuild b/x11-apps/xclock/xclock-1.0.9.ebuild
index d4a8b4edc2a3..bf6c70530969 100644
--- a/x11-apps/xclock/xclock-1.0.9.ebuild
+++ b/x11-apps/xclock/xclock-1.0.9.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="analog / digital clock for X"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
index 1a17e922bcbd..975062ce54a6 100644
--- a/x11-apps/xcmsdb/Manifest
+++ b/x11-apps/xcmsdb/Manifest
@@ -1,4 +1,3 @@
 DIST xcmsdb-1.0.5.tar.bz2 145419 BLAKE2B 41269ca270e4b11838f54669900a074dfbbc7339af84db8638498e220eb7abac2fe055ca003dba326babf368d26137eabc0f0bae9f69233d9c91f7e727c3ba30 SHA512 e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4
-EBUILD xcmsdb-1.0.5-r1.ebuild 364 BLAKE2B 1e400b1ef00ec1f471ce9a3e796cce4489d6173aa930b6a5977e0c76cd29545a475280b296083815df91fcff2319fd99070b8c7c7e7bd6c5286cf28c725fd6f8 SHA512 f956eb5b469bff415437acf83310d0348143094be0bac19c7aebdd432c6cf26b5b0c6f783297da36e924c3b1f84af4ba01824b03f152a840b6fdc7e14dc0909b
-EBUILD xcmsdb-1.0.5.ebuild 345 BLAKE2B a6ed488cdde48630833abd44f6772d44d268e840f1cdf90361927dbb04c08eae2dade2d058a2ef3cec33a07d310e224d7737ba441249add63d2d81e7cffadf36 SHA512 2a52b63147293a89c9c271548252a2c046f784ae0b2e09571b4c44b91897ea7bba975422cbb640f9f5547007cb386f7ecf52fa626012a738e4347ba386d919b8
+EBUILD xcmsdb-1.0.5-r1.ebuild 358 BLAKE2B 25ce16986c56a407947b3c68e8073d2b30543c8badb00549518ef7d96e9f4e82d088c4c1a79f9ea33eb7b8e413345b4b7fa96874d06a827a0a7ac5ff60c5ac01 SHA512 c620c28c470d76aa91764496bda2967d28c90d3aa0d13713736d0f55cb506152703ce6879a43be6b24a8e64c7815db282004bb2ab96e3d756eec5778f50c3c96
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild
index 0641e30abecb..05099a27aff5 100644
--- a/x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="Device Color Characterization utility for X Color Management System"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
deleted file mode 100644
index ea41a62bfa60..000000000000
--- a/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Device Color Characterization utility for X Color Management System"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
index f45ab879ff0f..9e4c5bb3da5a 100644
--- a/x11-apps/xcursorgen/Manifest
+++ b/x11-apps/xcursorgen/Manifest
@@ -1,4 +1,3 @@
 DIST xcursorgen-1.0.7.tar.bz2 128102 BLAKE2B d4e583e0183e23d1a127d367e520027bb36dad44306dc2848717f2d25ea3cb656a7cd95fd02a18522911a720319126eed07637e1809b868f1f85c74773a10c35 SHA512 bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2
-EBUILD xcursorgen-1.0.7-r1.ebuild 398 BLAKE2B e2538a20a46a88f473f9dcac2d2f3d80db363152a1fde1e99c0f1203ab36bd1cc3acc66c66f86279df7d09542bc0290eaf73bea71956998e08cf4cb016e0d883 SHA512 4eac51d7f841180b9c3b9ae891859b4cbfc3a03adf81a9badb8f8be49d4abc749065a4bfada24d7d956c059d63b6c91c550b7ce8acdc000bd4d24ad9caf0bf9a
-EBUILD xcursorgen-1.0.7.ebuild 375 BLAKE2B fbedac7900c723f04c0fcbfb61fcc8e668ef888dbf7a9f36e535c9c45fe855748df3477fe1b66f0200ce1bc51dc45748d2e905466bb9ad9e60c498ed7a0c6fac SHA512 e9ad2ce7da1d46a04705e46e3f31db70c69474cd9b57cbe3fe0d6fffe3ecc2dbf4586562cbe32e521c9a0629b7f55e1cc9d5f7f4646c7d7f46552cead4c7a727
+EBUILD xcursorgen-1.0.7-r1.ebuild 390 BLAKE2B 5f99537419a679894505cb4228926a162e222be427f95577fd0339f424ce3345a3cb596c03bd5925b6c4e31eddc610826abcd81ebaeb241a10d4911dafdf1b20 SHA512 0f86cfb357f757e631c08bf651ef26061cca6c08a95466d78c056356461770c3cfc6213a59b8e4d35cd4ca7a8f86e23cf05e974b0acbd3ef1b1630b7b5436886
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.7-r1.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.7-r1.ebuild
index b7046b906d08..146a0a17f02b 100644
--- a/x11-apps/xcursorgen/xcursorgen-1.0.7-r1.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.7-r1.ebuild
@@ -6,8 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="create an X cursor file from a collection of PNG images"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
deleted file mode 100644
index de9d27f20360..000000000000
--- a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="create an X cursor file from a collection of PNG images"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXcursor
-	media-libs/libpng:0="
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xdbedizzy/Manifest b/x11-apps/xdbedizzy/Manifest
index 87f8e47f896e..f66715b167cc 100644
--- a/x11-apps/xdbedizzy/Manifest
+++ b/x11-apps/xdbedizzy/Manifest
@@ -1,3 +1,3 @@
 DIST xdbedizzy-1.1.0.tar.bz2 110340 BLAKE2B 2245ee691441e72e22a71ce482d97f7a24c230fae23779f6a496f8f82f962e7a0875b136b2a2308ac3e4940835b129e7641bebc895be02e2d32fff890d42489f SHA512 58b9c88b09772008fe18921c0b63972a65ee5833f96edbbd2e1dc335e5f20ca9a241728b9a225e3b0f3eb392a7941cc1ab6e3c871b9463ff21bb23e38557e9fa
-EBUILD xdbedizzy-1.1.0.ebuild 315 BLAKE2B 72e53a05ddd8001e93f69761c78b8434c79196e7ce3d43c12fbeafc1ab2f1d12fe135406f8dc52ca64bdfdfd3b6a99137fb8fc168b73cc789b4d3e2f51c0f213 SHA512 9394b5b7d17bf3a527caee090a5dddc9cbb4cf010f42f8fa5ebd3ddd2a5df301b7c4e8c79af1cb88926ac12642cc2a781691d7573109f011c396b76e06e8bf2c
+EBUILD xdbedizzy-1.1.0.ebuild 316 BLAKE2B 8b5ce83ab07dbe8ac6f3d030754664a237d62390fb6d83eb59c1f7a982681f678f9c7dcabd414d0e8d5058a84e75c724b876419f3392a7b58162394125af70f5 SHA512 818e82f2a85014e2e6136e07fbb2c6e49dd7b5c616b700b053d0b90e73acdfaf12085ae920ac84f9d577aeab886d5be94be7fc672cd9c3d8788923c344843edf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
index a274b1b04b3f..4d8a74d7c394 100644
--- a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
+++ b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xdbedizzy application"
 
-KEYWORDS="amd64 arm ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libXext
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 7f19c1720965..255d58d86b89 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -2,5 +2,5 @@ AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7
 AUX xdm-1.1.12-consolekit.patch 7815 BLAKE2B 1ef67b15385c3cc9a74797fadc34e5701889bf669f70e9c3720a82db595472dcf8fc36011ce35cad763dc68580a7680a272c7617d9cf58db8314f788974031cd SHA512 e318ebe0e606964712db40cb70177d4aa275679ef6e2c0ca97cd5156434d037e8774bc75dad3584e8d13ad4577798fac6624bdb6359f1a57de9eb2961bfdc5f7
 AUX xdm-1.1.12-make-xinerama-optional.patch 978 BLAKE2B feb81c4815c61c62ebd25acec572de03450c4ee5fd7a634cb0444e17d35566548c0bc8dab05562264533676012410839f61b2e5cb5bc98d83bf9a36daa1b59cc SHA512 efddf2cd662cc4e1ca5cea2a9efe49b4ef8e98276f37def047091088a9deaaadc61646deeefbd8668286d08edabd245a532db84ddf938a2853bdcc1865c221c9
 DIST xdm-1.1.12.tar.bz2 512074 BLAKE2B a82d124f4b7ce3185d703fca3aade92e86094602aec5343566ba8c91c54b70cdedbaea2fa6fee330d7ed48d9138b04a998aa2dae06db2683bfcce6c7693edc82 SHA512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb
-EBUILD xdm-1.1.12.ebuild 1826 BLAKE2B f154dd3610cd77c5370e8350e1664afe6a03df9c069880c2a0b14ca8d8c913e8e57e92e54540e53ddc29037fc8c493fe52101e013cd898e894788b07de0b971d SHA512 82d01fd71edbe9068b313bfbe71fe2bff37eef61dfefc161e57adab688e9e6841e317c85dab5895ba4505928ca894d2e655fb4823fec4d799701a6dd9107b35c
+EBUILD xdm-1.1.12.ebuild 1864 BLAKE2B 00b3edc97b4458220695884f4dd7aeac3c1bfae669be6ffeea16fb88590e8d75dfb94432e2a251eebcbe1a99389c212c2b2f126e9eac07b213156e091b7d1e4b SHA512 ccdee8ce70dee024b700584623f939f334a29887240f9b2d80bc4ef7b4c2dee35211e8f8f5c5b3a4b0f26dc9d4dfab19059226e73aa3b320b0e759d215fbf6c6
 MISC metadata.xml 240 BLAKE2B 7361e68ba9e9d62530d9e45896fa3473e5606d67f87f78f4be394145abb8ee5851fff417cbd973c913a05ce60530eca628c3864cfeef75bf7b5f69b3e8e87da8 SHA512 e23d56b08b47406b57f50a1028febb4c4e1809ce967715b2a46aed1124dfaf306a85a3b2398c4ce058df4305bfc8645b79e8ef3569e6cfe8ec467f63e967b5d1
diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild
index 5f1478118b56..1199ae27622a 100644
--- a/x11-apps/xdm/xdm-1.1.12.ebuild
+++ b/x11-apps/xdm/xdm-1.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,13 +37,25 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	PATCHES=(
+src_prepare() {
+	local PATCHES=(
 		"${FILESDIR}"/${P}-consolekit.patch # bug 747124
 		"${FILESDIR}"/${P}-make-xinerama-optional.patch
 	)
 
-	XORG_CONFIGURE_OPTIONS=(
+	sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
+		xdm.service.in || die
+
+	# Disable XDM-AUTHORIZATION-1 (bug #445662).
+	# it causes issue with libreoffice and SDL games (bug #306223).
+	sed -i -e '/authorize/a DisplayManager*authName:	MIT-MAGIC-COOKIE-1' \
+			config/xdm-config.in || die
+
+	xorg-3_src_prepare
+}
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 		$(use_with pam)
 		$(use_with systemd systemd-daemon)
@@ -54,18 +66,7 @@ pkg_setup() {
 		--with-default-vt=${DEFAULTVT}
 		--with-xdmconfigdir=/etc/X11/xdm
 	)
-}
-
-src_prepare() {
-	sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
-		xdm.service.in || die
-
-	# Disable XDM-AUTHORIZATION-1 (bug #445662).
-	# it causes issue with libreoffice and SDL games (bug #306223).
-	sed -i -e '/authorize/a DisplayManager*authName:	MIT-MAGIC-COOKIE-1' \
-			config/xdm-config.in || die
-
-	xorg-3_src_prepare
+	xorg-3_src_configure
 }
 
 src_install() {
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index f153c562e363..7e32b6fe248a 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,4 +1,3 @@
 DIST xdpyinfo-1.3.2.tar.bz2 141351 BLAKE2B b2dee4f424dee902c31430b8843c14d6836508ee0125db7de41f5e9faef1732dea571e90b37638cc90dabd3995a0ceb5e4094707138b7e066ee1ae856258503c SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d
-EBUILD xdpyinfo-1.3.2-r1.ebuild 778 BLAKE2B 8f9b9ea0b0e6027b114d4602376a38f79d41b26c187bb621f4a49fe03377b38c4850143160c2919168326a5f61dd3fc97247bc843a6128a757fadb6fa6ecae2f SHA512 b26dfa8a5edb6a9cb46c457098eb9348607683b69b4399a49ebd2bb49dc56c10befa34dc75ec59a4dae0c5882259097545dbfbb1b3b8a3d40288de3ad8fefa30
-EBUILD xdpyinfo-1.3.2.ebuild 771 BLAKE2B 73045fa25f9ea855e98174d9086594dbe737e476774ae9a18ee59de17698ebaf5e0e3dd7830207403530e809e1e21eacada3f4a3e3cb6ad39c91b1b724e66f1a SHA512 db2b6fb02243fd4aa98ac284e72780f1ff960ce5edb616fe67d327c8bdf7c8b2c94c6bdb3adc66acb76e02d1db132c75cf7520efec9fd63b7586515f3af06589
+EBUILD xdpyinfo-1.3.2-r1.ebuild 772 BLAKE2B c5f074af1dd2821b9cd42dc1319a1c234d79cbc20364e2715cd6c8ba53faf3257344c259afbea669f6952d2bc9f9e9bac2ba36300432873379b86743e6daaf2c SHA512 1f0ea649b90fb33352ea926febe812fc1424628a9c126959d005aa5dc22d1e99cf5e4b09e6b45d5f2e803f98687139c770d0a848e7293d645d9c403577f9e4c6
 MISC metadata.xml 347 BLAKE2B 0496b148ad07710139de96e153b80e6035e6731a18d6e8a4dce75dd17bdfc54ad77276f1f82791393d198e96c9306f464dbce832b4d643b6285fb9a6d92e6261 SHA512 98174497a1f55be4b14d769ec110dafd63a8942eb8f51e2953237b76705128e47bd36a39b9c25985cdd99a3b431f3d5aa856fd634b2a2fbfc1a5cc13a3826fab
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
index 63f16db55f3a..e3ef22a0543c 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
 IUSE="dga dmx xinerama"
 
 RDEPEND="
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
deleted file mode 100644
index a1457c867525..000000000000
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
-IUSE="dga dmx xinerama"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
-	dga? ( x11-libs/libXxf86dga )
-	dmx? ( x11-libs/libdmx )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		"--without-xf86misc"
-		$(use_with dga)
-		$(use_with dmx)
-		$(use_with xinerama)
-	)
-
-}
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index e72aa7b524b0..8d0f9c29ebca 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,4 +1,3 @@
 DIST xdriinfo-1.0.6.tar.bz2 123636 BLAKE2B 43e15c6833ad84760c89abff272864e13b777c01796ba119fbc7fa7165ab05cf5a090cf736f618a25385b5d5a8cf2d679fbe2cd55119842fcf9e16fdb46dd549 SHA512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f
-EBUILD xdriinfo-1.0.6-r1.ebuild 480 BLAKE2B 7b59e791bb350cbf4099a3946c3aa79bca1ab03897757919f1492f600da525be3f988534eb8b0c4df626689655982b0f79502c5eae3bab33f9b8399bf3d8db7e SHA512 c272261235b43fa053e403709a2c9844bc99f3d444c340cf881055b605f72f894f9224164159f00cf0522d55ce4cd09cc86547673415680c6fca39f5eec542c9
-EBUILD xdriinfo-1.0.6.ebuild 488 BLAKE2B 7118a5e7ff9a2dd7e9425536447299cb8e8b77823ca8e423d31bbeb5f0a41b1f256f90b123fc3711e39122e13b854285eec92760f96d2011c82a8e6e1e376dca SHA512 938a89980c771e34926ae5efad21fcf9de3e778d55df68b29fce4d4016e69039775826cbdb6de702f58db198bf1762c1ec666551e11d93b5764a7242bc6dbc79
+EBUILD xdriinfo-1.0.6-r1.ebuild 474 BLAKE2B 2a5f33eb89d85ef7305e77989b3e3279220b9a56db9161f25f789c52ca7823e86d4adfda62eb4b726b09f74afdc21a7572f4a802107d57ad8ce189d32e040ee3 SHA512 b075858a16ae5c6f6b69dac088822cdbe226602e686c71f42f73305fa42084f9b3fcf00ea420dace47e2b61b76134334dda690d3d157f78da13b18fef39ed7cc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild
index 12d615ee4f87..16dde9988301 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3 flag-o-matic
 
 DESCRIPTION="query configuration information of DRI drivers"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
deleted file mode 100644
index 222f878bae67..000000000000
--- a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2 flag-o-matic multilib
-
-DESCRIPTION="query configuration information of DRI drivers"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	append-cppflags "-I${EPREFIX}/usr/$(get_libdir)/opengl/xorg-x11/include/"
-}
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
index 86978223c3b4..58b2c5a2959e 100644
--- a/x11-apps/xeyes/Manifest
+++ b/x11-apps/xeyes/Manifest
@@ -1,3 +1,3 @@
 DIST xeyes-1.1.2.tar.bz2 133160 BLAKE2B c3f31a2df7988517e4f8903fce6b0cbfbaad01e84d89c7b9f7755eccebba95fbb8b75377644ae97f090e9f4a3a245698966e78f738275f7513f5927193b5dd19 SHA512 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0
-EBUILD xeyes-1.1.2.ebuild 450 BLAKE2B 656e720004791543c7753549e3c2517e2b8b3ff23d7dc1ee1d511a3e3be88d20241c8291a80326114bc67f8a44cb4674626691522aec328e4c38fcd34391115b SHA512 fa05b8dccfb7a0946c122ff49a57be3f67084a46b1cc7b5121cb259b73e06b0332a159770fd5d7076963502f62d975835ae84096d5da4b8749d388c569be4804
+EBUILD xeyes-1.1.2.ebuild 451 BLAKE2B 849312db8da2bd40307af1154979264db3bb180ee0e098ec6b7946648ef5949ba74cff897054ea5eb03d15b1aa877cd880631ff0927e707b2edf92b7b16a9bfb SHA512 9cd10484ea788bc0370b6e3abe265370c668add37dbab66bd212b53cc82b5cb93713fea3a6b094a8735399bb4d850f75db51171829714e20a6a42a92a554b7ad
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xeyes/xeyes-1.1.2.ebuild b/x11-apps/xeyes/xeyes-1.1.2.ebuild
index 770341c49443..538de503da5a 100644
--- a/x11-apps/xeyes/xeyes-1.1.2.ebuild
+++ b/x11-apps/xeyes/xeyes-1.1.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xeyes application"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xf86dga/Manifest b/x11-apps/xf86dga/Manifest
index df23a9bf5553..8fc6a0df4f10 100644
--- a/x11-apps/xf86dga/Manifest
+++ b/x11-apps/xf86dga/Manifest
@@ -1,4 +1,3 @@
 DIST xf86dga-1.0.3.tar.bz2 104935 BLAKE2B ec294d1d1d49b57479d52e9bee834ad15eb15758d50da3d894c5236e9d94a37e2383258e2c2456ef6a6cf9f73d1332b594fc663a48dd0241cfc02be1b9157480 SHA512 18dbf9b5bbe1bb9c993c742e04e132ee22e376148a499ee159418435477221b00904f36c1a6b1063df788079a4ff5520b4d604abcafaad3b5fd391a3b2c1ec07
-EBUILD xf86dga-1.0.3-r1.ebuild 370 BLAKE2B 2941132edb5cc114a25b67b17bb0ac3f57c6a08e51421b3dd25a0c5490a6630c4fc7d86ed85f98ac866a200b4e2f959f1faed71dd61115a76c2bd658d876e06f SHA512 beb29878c4798c1696299dc446ecb804c525c9b6f729cbefc1fffa2a0dc0d234dd211cb4b6aec3fce72efefa323b663217b911958c1986d3d2de94924cd51b8d
-EBUILD xf86dga-1.0.3.ebuild 369 BLAKE2B 93548c8513d4a09d28d7e3191397c0cbf98ea458db81bf40699811a4d4fcf636167dbdb026a3d9d932c81cb861f4dfaaee101219e841656100f7ce4d10c91730 SHA512 f6bd89b547d09776da6183b95a04b96042c9e75edfb816217021e94e30538506719b5d8ff402daee671d8feade1eb0014037131f76ddf50bee5161150552a00c
+EBUILD xf86dga-1.0.3-r1.ebuild 364 BLAKE2B 4c338bd452979c215d41f94afb27d704407cda962c1d2d596dcd1bde3e241faf03aff45ce616c6784d29f2ae4796b13bec184b6508e30034da76d2b18982333f SHA512 c28f008f4b27444660bc396584784e452e1a37a5aa18f9d44b09efeff895aff03fec851e1689271ed473d70a33a69fc84d1b03d17a478d7850387ac2858bb949
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild
index edb4b7e8ca4f..62228643dfca 100644
--- a/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild
+++ b/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Test program for the XFree86-DGA extension"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
deleted file mode 100644
index 870ea8dc7778..000000000000
--- a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Test program for the XFree86-DGA extension"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	>=x11-libs/libXxf86dga-1.1"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xgamma/Manifest b/x11-apps/xgamma/Manifest
index a9298edecc5f..c40119f5b996 100644
--- a/x11-apps/xgamma/Manifest
+++ b/x11-apps/xgamma/Manifest
@@ -1,4 +1,3 @@
 DIST xgamma-1.0.6.tar.bz2 123105 BLAKE2B fbf5496e7c91f1e96d591721bfe7a1771659e7ef408be689e205e898191e0fd6beeff9466f4eff628054aefa640e83d7a8d69de028a6a6e5716a1eee50ef0abd SHA512 2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a
-EBUILD xgamma-1.0.6-r1.ebuild 375 BLAKE2B bfe784ce754f36cad02e25167a06c37fe19d89920a0b3475cf0d17c9421bffd1b6980e392b43618dd300ee4af63e3e73ae10c18ac2432b99791a65976519c534 SHA512 22e14697fc9028901c758ee27eda50533f01fe7f8a9eee2f25c5dd6070a19abe968f43e76f684d6d74f259419e55dbf3c4f5d5f5b18f617846767868de94eb8f
-EBUILD xgamma-1.0.6.ebuild 375 BLAKE2B 0316bc444b1d541a3c0fefbda73c01a2ae6b5fc76ac0535b4887d43183640e33188683a34ba943c2d9823bf838b73b592605899e9558163dd87d3f1c63cf7c50 SHA512 0cf4db7a84d5c5f0622e1ae6bfc14611f32799e036f3c4dbe4f2221882363833d36ebcf284893fddb079fabb496e942bede4ce6f5131eb55a0cad02e3b7a4634
+EBUILD xgamma-1.0.6-r1.ebuild 369 BLAKE2B 73a1918f88538656dee248a505e13512394675bfceca8c1cc6e1bb793892d8011ed8b0c24e822c5cc7cd1238909955191ab926c3d7b5cf78894acbae72815457 SHA512 8d24a0b4072af3df06206fc6ab1c488e490554c6d2e7e1fdf8344efc78c79d183dbb3a239df4a037991cb13aeb1a918a74b2dc77bf6f8b7af78eb716228db6ed
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xgamma/xgamma-1.0.6-r1.ebuild b/x11-apps/xgamma/xgamma-1.0.6-r1.ebuild
index 2cbd04c886d3..0d01b1e9cd10 100644
--- a/x11-apps/xgamma/xgamma-1.0.6-r1.ebuild
+++ b/x11-apps/xgamma/xgamma-1.0.6-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="Alter a monitor's gamma correction through the X server"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libXxf86vm
diff --git a/x11-apps/xgamma/xgamma-1.0.6.ebuild b/x11-apps/xgamma/xgamma-1.0.6.ebuild
deleted file mode 100644
index ca3d23c9c564..000000000000
--- a/x11-apps/xgamma/xgamma-1.0.6.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Alter a monitor's gamma correction through the X server"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXxf86vm
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xhost/Manifest b/x11-apps/xhost/Manifest
index 835e61d2c0bb..d777da8454e7 100644
--- a/x11-apps/xhost/Manifest
+++ b/x11-apps/xhost/Manifest
@@ -1,3 +1,3 @@
 DIST xhost-1.0.8.tar.bz2 138539 BLAKE2B f05d58444537431d9dce5e6dccc27bc8116141d66b34b6edb356dbe823898dbb2927f8ad8dc133178efc7e5b399b7b6428883ea7c665577d4b1984300474eabe SHA512 55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b
-EBUILD xhost-1.0.8.ebuild 514 BLAKE2B c15cfff1e6ec732a93e6ea831362dc300ab2ef0e178adfcc76ae2b551d1c260edef964ae583020968eef7dd0a453dd78e10b035bacfc383e9a7f8ac9b5f58a10 SHA512 20f35864f182fdb92af00fb495895ad13b8c95b0e9fb284179c50ab0cfdd0c2cb56162af14c05a14f75c99190c82cfef0eecb928c8a9d53817d5010ed5ce73f3
+EBUILD xhost-1.0.8.ebuild 515 BLAKE2B 1e344a7d387e542074c0c8f004c4e62e4ee3b6a9fcde608d364ce64b22bb1743306853a04baeecb9d840e9d7384bbda96aef16393ad5beb275544623c9b1267c SHA512 4e26365fe7a12462240717742ff7e50943c7cd999887d44116e1252be0aad2624657591b99caab0a45a1d4e9911f447b03c21d863ad2934848a68d2ae2688e13
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xhost/xhost-1.0.8.ebuild b/x11-apps/xhost/xhost-1.0.8.ebuild
index bae4c85eb3ae..6b32368a13b7 100644
--- a/x11-apps/xhost/xhost-1.0.8.ebuild
+++ b/x11-apps/xhost/xhost-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Controls host and/or user access to a running X server"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 7c03ee19b839..6443309531c6 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -8,6 +8,6 @@ AUX xinit-1.4.0-startx-current-vt.patch 740 BLAKE2B f5ac87b96f76bd4c845cde4844f9
 AUX xinit-1.4.1-move-serverauthfile-into-tmp.patch 745 BLAKE2B 6a964926b4f5eda566be4ff5c0f015ca2d3a9f39f16ba5af0cf3816c56cf458e616645ace1b8be9873c604322ab56b118a7a9e531533f8617cb647a57cf0cf3e SHA512 0fb93f0cebfd4091d7e58139ef375fec931392159b3b060d699d118c89d4403fd5cee82cd35582aedf7dd752aee495724119f864b17988d0dd9a5dfe76c88ce0
 AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5
 DIST xinit-1.4.1.tar.bz2 176206 BLAKE2B 1c20f34db344eb967ac230a0cd61ad07d0089668aea32973e9b8b9749e5260ad5d93a7f6642a4f2c8d6b01870696e4e1e422790c2954320039aa85e6dba8870a SHA512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340
-EBUILD xinit-1.4.1-r1.ebuild 2229 BLAKE2B ff6cfc7e1d8a11e55cd7c09701a2864df75f07c1575d18db689272be47748c643f8e73cb44316d09b28a289db492b888701c7793dfbf2b287b715e509cd2613a SHA512 9f688323e0053b4712d2f8ba50ae3f9f1cd9c3e6f072bee0a3ab77e0a29f7c767769ac56ec4c0ca7f9dc82d99f00c1f63634edbdfe04a4966c0bec98247b6e12
-EBUILD xinit-1.4.1.ebuild 2247 BLAKE2B 255cdfec15b4a47ac2fae1651eaaa1fa41f3df5b21789e06ae4e99be9fb878affc279c37c80468566791432e268bcef75db72ecc67ef86eb33b43b929535da18 SHA512 e2730aa19d65b4c841fd2e0d57a55176bef218a9849ec6d11956b96166c527cbd0dcdba69ca50fffb856103ed60ed88ed57a8cf1e605cb8258b6b58b4b761c34
+EBUILD xinit-1.4.1-r1.ebuild 2223 BLAKE2B f03a4ae90db934f8e7158d47cdc4804df90523280bf3a94850b4d589d3c4f7a3382497ea624b11f9a4589ceb520e357b1757488b76a94c8651faa70063d61eed SHA512 53f89ece5104d1d3d8f1a0b60a8aaf995900efd9e781b704af0120d9b4bd17f09f768f851d382d1b5fd213256d3b45492631ef6d95ab543164728bb2f4caaff1
+EBUILD xinit-1.4.1.ebuild 2248 BLAKE2B a916c68369a08bbe98c1b613cadbf0c4fab34efe309dfe98c4af095a535b58cec2ea7750c689b0e7bd388464554fa6a3df92215101809369b064d2fa55311e35 SHA512 7b96b8a0e25ee71e19e7f9f5cc59867cdfd400b8766092f7d23b9849554263c15ed2652910d4374b4b6f972e0a2c3cc9ff55b6e93221ea7cf6628a5819e08915
 MISC metadata.xml 477 BLAKE2B 96cb48063d5da3ee74d3c6080b849841fb1b276338db584d51bac71b5b2c3df0ecd876055a3c11e18f46c4d879a90ef91713166cae2aef65ea7725ab639b116f SHA512 c3e1095f0e3e017439777b3113d16ceccdc5ee7127da7f9e994126d6f51227a07c831e082d58c9c094aa6fed3e789458a212e27ec497fd3a14ba4cc5e4956205
diff --git a/x11-apps/xinit/xinit-1.4.1-r1.ebuild b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
index 5cf39d121c81..350547d918c1 100644
--- a/x11-apps/xinit/xinit-1.4.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="
diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild b/x11-apps/xinit/xinit-1.4.1.ebuild
index cf9e8a891ece..f347aebee1ec 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index 060c19f07f9c..bcd68b6e0dbe 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,5 +1,5 @@
 DIST xkbcomp-1.4.4.tar.bz2 251224 BLAKE2B 965a6ad91029ff4934af443a5845386045a66796cfdb6181cd94bfc1e3ee746700b22e5db56d22cc95255d0dca4f5894cf9afd40cc6675308a4425d947c5ed61 SHA512 971eb06277a49083b42154472596f1452fa94cdee28bad345bbcd85b028441bfd975763c20ed92aa69d6605b3fb23d27fee89df91501963b77c863667bae41c4
 DIST xkbcomp-1.4.5.tar.bz2 251617 BLAKE2B 5005f35bcae6fc08e2386963c5f9aa0394e79178982ee742b7c13519fa35d118b6fe8318d76e2f4312e3fdb9bee23743a8faaf214078d207897bdf5cb8984946 SHA512 2e84f8d6b083e2e818cb95e5d2a184da00e50d71b280e92d1a71465a9a4348f922f4ddccb42cfeee6f76705bbfc8580ef67aedd0d958aaa1ae6bbcc66ccd8154
-EBUILD xkbcomp-1.4.4.ebuild 434 BLAKE2B 5d13f38055484417091726173e4b5c564eac07954bf03b86f0ee475da67cbe06a4070fd4b8ddc6daacacc38b8a6c274f175d30bd86f7cd5ab78069070f52760c SHA512 5d1f67268e64ce00cc36c8e746d840338be10129f29146d761e9e025a70aca16b3f96e63254c387159e20337b4f92d7537b01faf18b834665e8f3d6fcd448380
+EBUILD xkbcomp-1.4.4.ebuild 435 BLAKE2B 7597e00d1c764c8a9139e68a7f0c712dfd1850af3dca90a2d9fafcd3146ecbd0d91591912a7c00e1c8e337499be6924512dc506abd4d0f075ef53fa834c15176 SHA512 5f3a5fab3f7671a03b0152ca64980d6f0b7b07a30eee8ed934b2c165b3b0fd88d94172c038c7789c1b51e75da296d75ca2934243fcfe6bb2fa1f4da919dcb8f8
 EBUILD xkbcomp-1.4.5.ebuild 442 BLAKE2B 2be726c754705004d42ba18661321207a05a187dc0c3e7b33f1dff49371dd67dc4a3d807143e75dcabe0de3c6788c5f32120c162bc642b0e4ecb631a87c264db SHA512 464c3e74aade56e4bf7143e248e0677d1f4c656e96850d95577abf7b33c2c94da4c43808b25a576f4d28c7da462cfc6b84662433d755f21f7aa4b4c734e06f89
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
index c6266542a1c9..c8bac72168f4 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="XKB keyboard description compiler"
-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"
 IUSE=""
 DEPEND="
 	>=x11-libs/libX11-1.6.9
diff --git a/x11-apps/xkbevd/Manifest b/x11-apps/xkbevd/Manifest
index e7dd202f4247..d684e07d8741 100644
--- a/x11-apps/xkbevd/Manifest
+++ b/x11-apps/xkbevd/Manifest
@@ -1,4 +1,3 @@
 DIST xkbevd-1.1.4.tar.bz2 151991 BLAKE2B 5f48968f4a45aeb5a851ba5c6c9cc6dd525d4385bda3475e1261a8419a3ea931fefff8e315309b6fcfba766ec9d95b4d64b93861f84798f5d730e2c5584c2cec SHA512 7628eddd0e1dc0c4df8e61eb3f6a6bf0e9d92a87e96bb2f5248ba5bd3d99d868885c36860b78e8ea2eaba3bb9a420067ef95c4d58c1254fa3d12fb25dd4e60e7
-EBUILD xkbevd-1.1.4-r1.ebuild 363 BLAKE2B d8c9ae2c37f55381b42a138d5efe78bfbfc7e38e61bb56bb21d9a7b3ab172a964c903875673092b9fc93735554f122db2a45d7be0b459f8aa77a91552842b6ef SHA512 75e6847b7a55c1d594e5bc1a126c156f3db0cceb9d4d5e37879472b50aa0cf336e169d21c8efd09fc8fde28470725aa0d9c670978e11758da38e551a8244b72a
-EBUILD xkbevd-1.1.4.ebuild 333 BLAKE2B b94579d74dc02be3ce26033a9d8cc3e47acb1603604f16909340695354191f3a559aea7004316afb86232d5c907d0146abdff8ff68079c959b7c77bd52b9c4c3 SHA512 41ccca25360d9658303cbac2740381c52434b322c5ab08b7fe5503e4f504a92a8797df5063cb4f6a829891b353b3748b93fe8dbd11d8ad3f37a96a259af1830a
+EBUILD xkbevd-1.1.4-r1.ebuild 357 BLAKE2B da80aed1d6bbceb32fa30bfdfbfe8e905307aa3965232b83b3610eedd03cf9e1aea37bdc08268dc08e49672393a0b8f652d88a8a5de8be2c4838e561aa43da56 SHA512 1c2b20eb4d40265188a074545216bafb6877fa843a5bea063b0fcf262dd1b40e95fbd7c4509e1f6759963735c0e92591de0993a814c59c30ac40e3093dc6e04f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbevd/xkbevd-1.1.4-r1.ebuild b/x11-apps/xkbevd/xkbevd-1.1.4-r1.ebuild
index e897c00d87ac..901b76e8bc0b 100644
--- a/x11-apps/xkbevd/xkbevd-1.1.4-r1.ebuild
+++ b/x11-apps/xkbevd/xkbevd-1.1.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="XKB event daemon"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xkbevd/xkbevd-1.1.4.ebuild b/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
deleted file mode 100644
index 50f577327f33..000000000000
--- a/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="XKB event daemon"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index 05d597a82ab7..1a10c206e12f 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,4 +1,3 @@
 DIST xkbutils-1.0.4.tar.bz2 131269 BLAKE2B 20e51a33b280bf4eaf6dfb3b2986ffdb09d1bb4fe3dd3689de5256204cc0e90808367b0afc054e2b5a6746b3b125bc0d20337761e1714c069f3c300a65fddb06 SHA512 5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d
-EBUILD xkbutils-1.0.4-r1.ebuild 357 BLAKE2B 353a7729087263f2065ec40751fc63b716ae999cd0ba2e1e28bd614fe5dbe2dee18f216189d95e9eb69c88f04ad9a320000d4a2046847ee399b93a528e08c804 SHA512 78764cdcdb942f992624057b9f77719a3acb34ccd04155735fd8d01f66bde384b5adfe09e1605e0c32805a4066613ae80256474d234d458aa8e9f5b2df86509c
-EBUILD xkbutils-1.0.4.ebuild 359 BLAKE2B a8f3c870330fb536a45fd8bbd19ccef2b13bdd39a1f11f0ebce2d247d80aaa6b20e2a0806c47b39100a63198ed94e6feeca5b7fb8cbd5756554e60eac9f65938 SHA512 f6b17791a4b3df16e1bbf47fed78f2572a42351faf82fc8087412c53c6b250d3eb5e6a92fef1cfcc9124d5173ec9ba69695fc9b8a59ffeee9af3b42a9d22756e
+EBUILD xkbutils-1.0.4-r1.ebuild 351 BLAKE2B 5e91ddc2656f3640553fc9855f1f53423647c007d4abe5698ef8a2a891cb829d2fbf7656a78d18724550196513e32f8fab4ca1a16c6c1194d8575bddd0726653 SHA512 840013cf2f507057107efb57b291cc21897f4ef32fc7260319e3aa12b369b9b61f4faa31806727e74ea89a5d157e250bc1e691a0e9655bb2d0cf36def0a5a254
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
index f407430b8807..65a60558ad4a 100644
--- a/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
+++ b/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbutils application"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
deleted file mode 100644
index ead2202df2a2..000000000000
--- a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xkbutils application"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
index 6f1e7db18bfd..64f4e645183d 100644
--- a/x11-apps/xkill/Manifest
+++ b/x11-apps/xkill/Manifest
@@ -1,4 +1,3 @@
 DIST xkill-1.0.5.tar.bz2 128146 BLAKE2B a01b954872eaad2aefe11335df2c85972abb8d36ae0c00fbca02b5af2d7df57934e3ddc47455f88927a90b0bff5ed707ca6dddbbf5478c89b193c98a86cc0562 SHA512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249
-EBUILD xkill-1.0.5-r1.ebuild 381 BLAKE2B 2dd2cb156862617b010741fc702af3d543134a611a05a544b136ef445b2764b5e14cf0a5935d54dbfdeb1300ab831aa180ed39da57e3025ba9f6661fdcb5ebfe SHA512 8d6848005812bd7ff0745cf98395d8463f918c124491bff7bf1bb26192d1dffb59a8ffb08c4c24ffa122c0f01f14cf86085594819ebecc3d184a525f126ae8fd
-EBUILD xkill-1.0.5.ebuild 362 BLAKE2B 7aecfcf146503b9c185512b54a3ec1a571f2a825a1bfee8e24af71737fc1ded9237f7b93564a133e27323580eb6503fa5eba76fc885dd97db01ccc2eddc14ea8 SHA512 6c4b0c5f4a22bd8fc930d5ff8a564a6214e10e401e9faff4e7efcd0fbc64359cfbac21182aefcdd4fa2b6bb418fe1487fc4fe1ca342657124af67a3969186547
+EBUILD xkill-1.0.5-r1.ebuild 375 BLAKE2B 50e018f19f3a9aa4c585b6409d2f8cf53957d144ed4f80dc150a7655541d10e918e6c6d9a51daa64b61dc1abc802611c4a939b2e4b1936ca0dbf7758407bc5f1 SHA512 bd5c2c85b3faab2cca53e2c7af38aeac42ada7a0a57816724dad8aa6c5b2f0b64a9f6e629253f6968a78667e8392fb9bdfd04f4654d5ac83bfb40af0d4672bf4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkill/xkill-1.0.5-r1.ebuild b/x11-apps/xkill/xkill-1.0.5-r1.ebuild
index 0539ad5a3749..b0519770bbd0 100644
--- a/x11-apps/xkill/xkill-1.0.5-r1.ebuild
+++ b/x11-apps/xkill/xkill-1.0.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="kill a client by its X resource"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
diff --git a/x11-apps/xkill/xkill-1.0.5.ebuild b/x11-apps/xkill/xkill-1.0.5.ebuild
deleted file mode 100644
index 9174ac0ec731..000000000000
--- a/x11-apps/xkill/xkill-1.0.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="kill a client by its X resource"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlogo/Manifest b/x11-apps/xlogo/Manifest
index 73757f72f8d0..b716e6c4d369 100644
--- a/x11-apps/xlogo/Manifest
+++ b/x11-apps/xlogo/Manifest
@@ -1,3 +1,3 @@
 DIST xlogo-1.0.5.tar.bz2 135608 BLAKE2B eeaa9dfdca57bd5b60035dc31981f3b3e390862b5e8f695422505059f657cfe727d491c757e8ef4dba4a913179c92827741f04e3fc6765b0257d63f1382fc69f SHA512 0d78e269b0be3c5de71de7f362b896bfd9934ecd9d0361b3302399b1269e029c4a9f35418d792121a1edc34405d753f9d69c996cc3a69ac717f2b0d1f736406b
-EBUILD xlogo-1.0.5.ebuild 460 BLAKE2B 31e4cd93e9253b4e9934d5c5bc8d38c80b151ff0c77d2d4b89e06331008e836cd60a96957b14fafbb2568a1b2a135f6d9dbb05ef8a3d5a06ca07491accd4e957 SHA512 083ff415fac748212a6403bcacd5ab959e31231331f3012ec0c87a7418cd3a25e1d1f1465aaa9d4c2f659cd39427c7ecbb463b961c07408bff3f64ddd5cbfbd6
+EBUILD xlogo-1.0.5.ebuild 461 BLAKE2B e70ab714b2482a7aeb49a1cc35b3faa920354cdcf9563c0627716527753610aa79663eb25255d04699c6c7734124e118dcec7283b224a61b6d4b56ed0b03625f SHA512 2e5eeb5f533efe279cf701f4ec4220a4ba3bdfc4568bdce756403a664e122cb86c26aa2579265c3a50a1e4f01c76d34bc5289cd58c12f1dd2c4eef8999238b3a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlogo/xlogo-1.0.5.ebuild b/x11-apps/xlogo/xlogo-1.0.5.ebuild
index 3f0f962c5e56..e8c3fbcf83ae 100644
--- a/x11-apps/xlogo/xlogo-1.0.5.ebuild
+++ b/x11-apps/xlogo/xlogo-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X Window System logo"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXrender
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
index a9dcaf0c2d5c..47c989e66933 100644
--- a/x11-apps/xlsclients/Manifest
+++ b/x11-apps/xlsclients/Manifest
@@ -1,4 +1,3 @@
 DIST xlsclients-1.1.4.tar.bz2 130586 BLAKE2B 8e13bd29f10035a101cabe2a271fd665618dce12f7047f441bf943e8c4d2743e2385874b8e1cf42b69f6a19b7a3d5c16ec9ecff7e6cb62401888802d6946dd5e SHA512 42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4
-EBUILD xlsclients-1.1.4-r1.ebuild 361 BLAKE2B 00f29d98e21190a6410ee5ff28fac2314c60929b913d4919f9b794afcfa98fd0193682e6ab7b83f0fec67db62e8db71ec9f3ffa00e393622016d0c822387c4d0 SHA512 70ae99a61af0becd1a928086de640527b85f6c58d7a674a23057603ebf3138a117af2ee59f9562098a8c0a6ee417c7d39b291ec9b80ce821b90bbbd655a023ba
-EBUILD xlsclients-1.1.4.ebuild 342 BLAKE2B d7e1a9b54a45dd100e674ff05571748a5f3c025ee39434db0e9f0842474dcf0b56caa5cde6faaa52c8937d6627f7d35e4ad1981adc5ce9c8be13ad8fe8a205c2 SHA512 0e7d7d8734ec0685171ebcd0360e7cf6ec24fe3aa351f5326fb53687877510e6e472923907f7144449c7e1b95b196e54094a3dea3031b08337f15f42bbed6c3e
+EBUILD xlsclients-1.1.4-r1.ebuild 355 BLAKE2B e7d4eda0cd932414675041fe70ba717c89029464971e0de46f1fe7bca50a5b05538d84d3af2e6e25807a80b7f1a43cc7a048845227415d7ef38474efa79a792a SHA512 7ea6fef7d7d59ce1f5f345a3b3329b60de105699ae86c269957de20ceba5de574811cb8e9dd7b2a582caf68c1972fbfe22fb2fdcdfbe651255c6c5a13478c0e9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsclients/xlsclients-1.1.4-r1.ebuild b/x11-apps/xlsclients/xlsclients-1.1.4-r1.ebuild
index 0219303ab804..3e13f833c513 100644
--- a/x11-apps/xlsclients/xlsclients-1.1.4-r1.ebuild
+++ b/x11-apps/xlsclients/xlsclients-1.1.4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org xlsclients application"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=x11-libs/libxcb-1.7
diff --git a/x11-apps/xlsclients/xlsclients-1.1.4.ebuild b/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
deleted file mode 100644
index 2a19e5218852..000000000000
--- a/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xlsclients application"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/libxcb-1.7
-	>=x11-libs/xcb-util-0.3.8
-"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index 66942b034476..9daee323fb3d 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,3 +1,3 @@
 DIST xmessage-1.0.5.tar.bz2 133393 BLAKE2B afa42e20ba995fa1086cd3cee5b90be8564c521f7bc12b544a787cc753782e1cfdbc5a94f5925f5bae1b630b7ac08fcaeee59e319f680d3be29c46d5421aa048 SHA512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
-EBUILD xmessage-1.0.5-r1.ebuild 454 BLAKE2B b944e8ae2694ec621fd0198d336a9045b07189784ae5897ff74af058bd2e7b03b4216b714994534c5c21508da15238e401ecf4098aea13ecd8b95a788fea4c2b SHA512 40f5acd8ad2e5debf0962a5a8d9a2377e7a4e27b900ee51ee8f03ecb2ece2706cd0cf475572d46e8b1a6f9bac5c403f79994f997fa0b6dc96b5c2bc266845a76
+EBUILD xmessage-1.0.5-r1.ebuild 455 BLAKE2B ac22630caf2238183ed0d7f326c622049ca82d81a4b6600b7e9f3d8bb4d9a88fdd0d06570896429dacfd33b52f47cdca5da4f938a125b63242134ca69f583bb2 SHA512 6275a7c9243cf5036be87ec26169e586aeb4172702c28ca15c3238bac322f4ec97bbaee22a93dabca637d87b41d10ad148ab20c7cc5f71e3debc0041ec031206
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild b/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
index 4fd4eea96584..7286fc92f98e 100644
--- a/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXt"
diff --git a/x11-apps/xmore/Manifest b/x11-apps/xmore/Manifest
index 34a2cd52f0d5..4cb0dcd212b3 100644
--- a/x11-apps/xmore/Manifest
+++ b/x11-apps/xmore/Manifest
@@ -1,3 +1,3 @@
 DIST xmore-1.0.3.tar.bz2 127587 BLAKE2B f59c9b6b7a134694dc7df5540c75a4331785ef7da0c5b40618923a3d1d53a543f7a54b7b8383f2e816b4f478056f6c0b1c6a4ce212c50b4fca75a307057c3f54 SHA512 e3e44831cd87a54bb585f80ef0d87f69dc35f6c834a73241aad9f6e2b0999b53c51a0a3f915a94ae4d6dc9bdfb9f60b6576f0bdcec441443abd98efa6c51b1d3
-EBUILD xmore-1.0.3.ebuild 327 BLAKE2B 44eac98a037148e74ff6fc998432f954756f9dc0abd35e324007aa90075a7eb14a71e5264d6e550ff0c47a9d3fdb2d8f2cd8bb1aba9d5b4c12a8f8f4a094c421 SHA512 917160cd276f64d2154193a180a3551f0c1c15fc7c2f1dbf6bde48a13c4176358d5671e9354381b75370ef140911e0f429fa7bd42894f8317696eb4e3ba0e536
+EBUILD xmore-1.0.3.ebuild 328 BLAKE2B 4712ab03e02fd0bd7fa1433d1f257f8e4f59f99cea6c22401f1d2054a9de8594228ce5a4256057f59829e17a8ea873ca85743217506449ee8dcca9a5daea97b1 SHA512 3810f2289d6acca3243356fccfa1d29b7fc740196cdcb96c9bb8661b268b9e039354bd5fc6c12d12728edca403bfac0ba6ebfdcf81676a768087df930e846f1f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmore/xmore-1.0.3.ebuild b/x11-apps/xmore/xmore-1.0.3.ebuild
index 8702ffb7618b..45987247f95c 100644
--- a/x11-apps/xmore/xmore-1.0.3.ebuild
+++ b/x11-apps/xmore/xmore-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="plain text display program for the X Window System"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
index 2a04f9d270ac..53c24b092f61 100644
--- a/x11-apps/xpr/Manifest
+++ b/x11-apps/xpr/Manifest
@@ -1,4 +1,3 @@
 DIST xpr-1.0.5.tar.bz2 150714 BLAKE2B 89d20134a3a9a12e319d343ae20c3aac71d1d2d2cbbffe1ff71375211efb3a4b22c2d99099fb1621fba838778702cca8c088181218c5d2c5fcb6af706d23b359 SHA512 d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967
-EBUILD xpr-1.0.5-r1.ebuild 337 BLAKE2B 94304ee921c547e3a9e1a60da1ef7881080b3310a381494fa99f99cc7525a9dc811e324c0fe576ee551d60adb6926ff49ff759181b1b39eab18c9034131e6099 SHA512 c598fe74e69386cf2ebf65c7f913ec97a4ea0fe590cf87004ac6da7c6bb9f80d0334f88762fd2252d396cb8872f578509c6f89bc5f39f0300a3c1c1a5a434abc
-EBUILD xpr-1.0.5.ebuild 313 BLAKE2B fccbb36a3616243c56ceb67577c0895027e17c453ba3ffcb3b06b9d8ca7c05616316a18efa33d77f89c7b806a4bb629efa59d562946862ce53d2b5ed7fd0aa0c SHA512 e3492591a5dc0e648dfb355968532627daa40c8aa2c1bb60072cedbf36a5dea2921a8248d70b3eb3f0b8a1c43232902c9851dcb222a081ac15e3278cf41afd28
+EBUILD xpr-1.0.5-r1.ebuild 331 BLAKE2B a1c03ce3c1ca5949c745996b0016b90002a3616b86d986c7c805de396f50db55f879b9d8b3a7ad07b60e67dce61f6e55c3f3a7f88f65fbedf77a425745a99e1a SHA512 80061bfdb10839d8098ac31c5fdfa049de5a4023cf550f8a62ecb564a09ff4381328e55bbc95a2551ce9c6c7f60fa2780cb576a2e7d634bc24a8f8105771986f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xpr/xpr-1.0.5-r1.ebuild b/x11-apps/xpr/xpr-1.0.5-r1.ebuild
index b2a41d163976..d94b953c894b 100644
--- a/x11-apps/xpr/xpr-1.0.5-r1.ebuild
+++ b/x11-apps/xpr/xpr-1.0.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org xpr application"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xpr/xpr-1.0.5.ebuild b/x11-apps/xpr/xpr-1.0.5.ebuild
deleted file mode 100644
index 9b0185b401a4..000000000000
--- a/x11-apps/xpr/xpr-1.0.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org xpr application"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index 9cbe3b303b4f..1e6f1859650d 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,3 +1,3 @@
 DIST xprop-1.2.5.tar.bz2 151216 BLAKE2B c676a1a733f4f897bc207cd1d7ec1a6022d48d2bb9615072e2ce19c1fec7737a8c9bc0444c97f4972d85a8ec8bc1e990f559a0815eb3656f2378915095c1f85c SHA512 93cfa621fa76ca6e8e780a252c508380b6dc9db39b67bfca16bb9800f0d39110f5d18189409a8577ef79e98bf5eece17f5e23f2218ca72ae8bb04ee7b429d559
-EBUILD xprop-1.2.5.ebuild 379 BLAKE2B b15ce952d78b49526c1cb330ef2f9c3c73e94dc59f74ea513ca9978c9360ec55adc52386a9f90db72d380a72b0c19b3b75b49179dd9a36124117a269335d65d3 SHA512 41209ccea55da28557c718ae3958afaad042706b8d64f98d3b1eb71b08adece88f14d580530eaa31a1fbe2d7a6c874eb9b9dd63928e0e49c130c3972e9715cbf
+EBUILD xprop-1.2.5.ebuild 380 BLAKE2B 66132baffddc704f0263cbaddd4fcf25f946af46ec5688b3cdf704799c755d8f08dc440b68ca50bb2857e94171e0269fe29832799c73e64187a22fac4f7f69c5 SHA512 12ed30ba9651b8ccd13ff82eb47db6e86dc4682afbaaa6adc5d0beb5ae11184dc898feda0c511d9be56270522d827395c78b7e11459c691db02fbc32420f19c1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xprop/xprop-1.2.5.ebuild b/x11-apps/xprop/xprop-1.2.5.ebuild
index 882c7eeae5be..c942b74ed6cd 100644
--- a/x11-apps/xprop/xprop-1.2.5.ebuild
+++ b/x11-apps/xprop/xprop-1.2.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="property displayer for X"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
index 8549042165e2..55bd3f936695 100644
--- a/x11-apps/xrdb/Manifest
+++ b/x11-apps/xrdb/Manifest
@@ -1,3 +1,3 @@
 DIST xrdb-1.2.0.tar.bz2 142194 BLAKE2B 2fee77b287f43125413bbbc288b1d89986a93775797c02dde564e678bec3c429bca487d752d82f8da924a95e177a46e3b4de507b7fdca56b95789e1d7ea3dae3 SHA512 14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef
-EBUILD xrdb-1.2.0.ebuild 410 BLAKE2B 1a7020c0998f7430f8063941564b4218327790c1574dba52d26832b2bf8acc6e56c24d8f939138b2cdd817294eef7f141dfc75d2deb62fbc6c04eae258ed2305 SHA512 18074a199767c3e417ecdae067807e165d212d6d079c9b4ca08ca5c3ada8224e1bdebfe7c31f5170de2d647421e2f398c26c4c679a7b145a966cec821aaca912
+EBUILD xrdb-1.2.0.ebuild 411 BLAKE2B bc08376c598ef211ef22652aee6c7803255922a01277d2838f0fb3fda84d9b2ba16fb5eee86f2b1a166c0668998705be7b0132d49d2a510ec19c7fd56876cac0 SHA512 4d2f7a391e547e69f97bcc48f61eec846d4eff5807a6147f33b669993975c232e25ee10a01eb7934f060d40c85b1d89bda696c7e52cb8733be76feca57829999
 MISC metadata.xml 317 BLAKE2B 02ff19551010134a361010ad2647deb4949c46241c2f3ff388fc8fb7aad6194a822c795f8505cb72896229f9702857b29235197675a227a1da9755d051e5930e SHA512 460dc7431825b65cf43260ca92bad810e99a9cdcc0602da758d5f23ec6faf69a3c056d2db6df266055aed47fe3a1c7063cdd2cb942e09a9b08f60ea81597bc96
diff --git a/x11-apps/xrdb/xrdb-1.2.0.ebuild b/x11-apps/xrdb/xrdb-1.2.0.ebuild
index da18db9c6098..f6214f3a7709 100644
--- a/x11-apps/xrdb/xrdb-1.2.0.ebuild
+++ b/x11-apps/xrdb/xrdb-1.2.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X server resource database utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXmu
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index ef737c6e17d4..e4e852e482d1 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,4 +1,3 @@
 DIST xrefresh-1.0.6.tar.bz2 127494 BLAKE2B 587f5756bbd3095e77494288d4b9cca99992b342bb718e5cadefdfbf018710ce0f216f43b68814d0d0a681c87d855be4ecf199a314361278c3bfdd81e6073f69 SHA512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674
-EBUILD xrefresh-1.0.6-r1.ebuild 331 BLAKE2B bf49ad0da8682c448ea852035d761baef9eed07470446819aa935e70892896e2e16cde48981b3c697ca247e1e8b26b75f144378aadc1bcc5c7e944e463ad9ce6 SHA512 2fb2e3aa334110e97da594b7cd4e2477147aaefc0cfa52aae4395e9b64599b60a7a7e24707e366b24d0c8d7ed75b43e5ab3f8612851678375f5f0fb83ce23306
-EBUILD xrefresh-1.0.6.ebuild 312 BLAKE2B a1da9e51bef49939635b4b8f60be789085c03df52770b4e8bb24d7a6232ec4c6bd318b92bad6344acf3480984facd81fd6da1a91106487fdfccbef1a28f56181 SHA512 b03eb1ef54333f5ce43b3a2ae0bb4015eb6bd55a3bd60cd72b588d3037a1ad012d82cbb70f70dba00d2e35a4725cf7d687737dcfd1a973d7143d67ebf004fdb6
+EBUILD xrefresh-1.0.6-r1.ebuild 325 BLAKE2B 6036e169c74b341f1b4d87cdd1eb0b819557da826e72dae744d841267e3b3e0a4b7daf708c95f4020be6bd81be5bf38870e5eb7a8fe60abdae333a75335f9a58 SHA512 1107bd4a04bf7f802609d4191d0a078509a1fba792a339d8c0bc37a8640546de97b624bef6ce3fb846ddafd567d9ce03956f43ee031fbe9314d5edededfe6423
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xrefresh/xrefresh-1.0.6-r1.ebuild b/x11-apps/xrefresh/xrefresh-1.0.6-r1.ebuild
index 80fbc1b2cb1e..4634f6688a9c 100644
--- a/x11-apps/xrefresh/xrefresh-1.0.6-r1.ebuild
+++ b/x11-apps/xrefresh/xrefresh-1.0.6-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="refresh all or part of an X screen"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xrefresh/xrefresh-1.0.6.ebuild b/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
deleted file mode 100644
index 20d7aa1b34d5..000000000000
--- a/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="refresh all or part of an X screen"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index caf222adb570..47a8d8d9669a 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,4 +1,3 @@
 DIST xset-1.2.4.tar.bz2 145546 BLAKE2B df4ae52046af7f632e2f60386bd3b8d90b27db3e53ceb68f1056c9c5df2ee9c6d83d109a444eb99ddc031e35b91db0249ee56eba3180bc9a8a002935db213605 SHA512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
-EBUILD xset-1.2.4-r1.ebuild 491 BLAKE2B 7490ac510a33f670f894b800579fbc61bc09a8e2d3a415030a52d6d143f59b1f2cd4fa06e7367479429aa8bd4d69f177cc77c6cb5d16c0ab4c6749a123728520 SHA512 5b890242d4088ffd3ee8be256e774bb1e0289615c09933881c2f9b404b929e8712d69d86a8e503d6f8cd3f8b1e8e4b74f7923d61a4d37bac250d74fe11b7aa12
-EBUILD xset-1.2.4.ebuild 470 BLAKE2B 201e4d8bf88ebcf477164b789bedb3bb974eb972099d6cb7b3a70a60668f5db15923c4da0dba93885302158dec629bdea731b9fec042bf1b227f819df48acdda SHA512 7e8d940c96570aa96c43e1c8bf04434347fdb1dd280496781e8cbcf3ba1380ab5e6f6d0699168a14b21316b93a796c582ccd104465196360657136be24ef7e2a
+EBUILD xset-1.2.4-r1.ebuild 484 BLAKE2B c5529d6a6392f04ac8e2eb9f5f3083bc70262f7497d82fc90885a5d7347d6e27d7e90012f2a6e8b90bc356f6b11714a05d679a166f3b244c3c37123db06f72f5 SHA512 b10584c6ed0fd94da17b6c365fe3df37a00af0d9246b169ecce1bca71f80a2708f91abfbe48c50de31260bf0a2f9165b7458bf0a0a987bc83bc1cf45974a1b60
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xset/xset-1.2.4-r1.ebuild b/x11-apps/xset/xset-1.2.4-r1.ebuild
index 3e4bc382f415..9d83f67dcbca 100644
--- a/x11-apps/xset/xset-1.2.4-r1.ebuild
+++ b/x11-apps/xset/xset-1.2.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xset application"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xset/xset-1.2.4.ebuild b/x11-apps/xset/xset-1.2.4.ebuild
deleted file mode 100644
index 7d4dd3050fbf..000000000000
--- a/x11-apps/xset/xset-1.2.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xset application"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS=(
-	--without-xf86misc
-	--without-fontcache
-)
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index 659bd091abcb..387d494620bc 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,4 +1,3 @@
 DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
-EBUILD xsetroot-1.1.2-r1.ebuild 407 BLAKE2B e911774209086f3c35ca2c69c8f1d748a3088c9184955c5aba20254f2a2f05eb3952c0153c1977a6b195c686ce489bb85f864eb07c57d0b52b908bcef3c606a7 SHA512 7359eebc0545487e43c13987a9976b4b5044a3acd2c73f459e7bf2bc9e32a707a07add3a4bbb51097db54cced94b89299b442d30f423e9eebcb92c3eb64e646e
-EBUILD xsetroot-1.1.2.ebuild 384 BLAKE2B 3a22511b1f237133a80e616ebb529a5612622e2c12da4f0d33c5a38c2a23de9329a792ee9915a2b3a20174cc574badeb3e27d397c33259b5c019d8e4516a32ba SHA512 55b586e59c7e5d0bfbe582776460cf896c671d7a8e68dd0ae07e1ce612013bb9f051a7b2cfaac9a2270da33b7d533c0fd9fe688150a242c6cc1b2afb4f4df7bd
+EBUILD xsetroot-1.1.2-r1.ebuild 400 BLAKE2B 2bb32cc2a38baf71ad72fbdefc8b5531386483629054e65a7a1c9c62fc9cbd9094a85271d40941ce004fb62a204e3ee4ed8063aa3b04db42100bda593540a2c8 SHA512 f23c9986d192463dfc9ac374c9c30e023f098f9a5768ea585bd69575a79d065f073e3a75ee72fcc3f1d95af4281b13a1bc8a2f7cdc34c79d7faed71fe3c70390
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild b/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
index bb312bbff677..89ade361ca81 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xsetroot application"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xsetroot/xsetroot-1.1.2.ebuild b/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
deleted file mode 100644
index 448bc5f93d2a..000000000000
--- a/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xsetroot application"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11
-	x11-misc/xbitmaps
-	x11-libs/libXcursor"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index dce3a0a5efa3..18b8dee68301 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,3 +1,3 @@
 DIST xsm-1.0.4.tar.bz2 170933 BLAKE2B 05cf4614440f36da6ed1e8e0949ef6955da03d1fe0cc2d0323150b34ea01c293301aa49006a93fe7c44c842db41fb6b66a2f4a4051ddf2258143e54a6e99b390 SHA512 d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176
-EBUILD xsm-1.0.4.ebuild 676 BLAKE2B 7e67f478cd09516db3de2df74e62b21ef9328b50545a16dc282ef7d99ffce78d031a93646941974dcc6c8156ebc4693c07baee6cb67d1ac3102d4aaf7cbf2ff1 SHA512 9450f639e454bea92700eb9325c0fbd049ac7d50b1d17167c3ed9e7d78f698a13f1ca399e003c36cdf37fb6258c0e45bfc6d178bef841f7697eca89a547218d4
+EBUILD xsm-1.0.4.ebuild 677 BLAKE2B 0ee49f1999eabbe87519361ad60a81f0bf20c917288393009026cdf82ffe7c71c882b5b57aae74ec93cd1f65e55fa79358e06c5c2743ff06b09f9d7c3c3cb9c0 SHA512 e6547d9bcdad8edd49b75eed1ce59fb4c412cccf22752b6c76db9dbd6a1c6b80dc20ab6ff6d654120528cc1227c9279a1d877396fd220a6078e1d27d4be36571
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xsm/xsm-1.0.4.ebuild b/x11-apps/xsm/xsm-1.0.4.ebuild
index a29b381dec80..fe9a8866b40d 100644
--- a/x11-apps/xsm/xsm-1.0.4.ebuild
+++ b/x11-apps/xsm/xsm-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X Session Manager"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libX11
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index b90b18ba4738..75a9821c3205 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,4 +1,3 @@
 DIST xwd-1.0.7.tar.bz2 148026 BLAKE2B 9088105a07db38418352cccafaee4ecc084940e031416358291e6b5a6f47b2c8972928f0eb3479db4ff93b3a54a24ea4231f4d8196464f14ac4d7a1b5bb7ecce SHA512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e
-EBUILD xwd-1.0.7-r1.ebuild 363 BLAKE2B 6004748bac88f0e0e7a7b3ba0c2cf562d090016721ef2337bfed728deb3b8f5d2eabc35dc41b30d10d68cdcbabe22e7809d835af3a386e5b0aa1a76d10322448 SHA512 f88cb986f7d81447918b405a4898980af05b7538bd66cad813d8150a35f4e070f283512670fe6d7340b4f8d46ec69c67541fca3e01cabae7ab5edf0a5cdc32be
-EBUILD xwd-1.0.7.ebuild 439 BLAKE2B 9606f93395ad02373d8cee7d22a4e48e7a751f6f9399d4a067b04c5c0696d8062f94d809f95e66ad65aa6188fbb3a266597564a7ca4c6d14cb20f76869a4a419 SHA512 c1d749d3e6e6038e2dc7da6180992919d0bb1c16ba5514978a5febfd946dea483d33ae15bc1d1e80e66669bffd71dc0310abd65934c3a20f096b0ac7c920398f
+EBUILD xwd-1.0.7-r1.ebuild 357 BLAKE2B 934b005bf206c1e40319868e1d3240f75617c1b88404d8203ab4054d54035e07addd50551d2220bd37a40a42ae58380c1a411d378168cf6b1b37ff4463840757 SHA512 1193ba07553a9fdd202aa3bd603cbf2dba06729d61fd1b65bc584877c95a956f9a043b6a27c542f7e58ee732e710bddc599d240ecd1b51ebdff809d0ae005f6f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwd/xwd-1.0.7-r1.ebuild b/x11-apps/xwd/xwd-1.0.7-r1.ebuild
index 116dcac06fb2..ce9cc3b3fd2a 100644
--- a/x11-apps/xwd/xwd-1.0.7-r1.ebuild
+++ b/x11-apps/xwd/xwd-1.0.7-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="dump an image of an X window"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xwd/xwd-1.0.7.ebuild b/x11-apps/xwd/xwd-1.0.7.ebuild
deleted file mode 100644
index 77199c73b1c4..000000000000
--- a/x11-apps/xwd/xwd-1.0.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="dump an image of an X window"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-# libXt dependency is not in configure.ac, bug #408629, upstream #47462."
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libxkbfile"
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index 9d627734fdfe..8d41deaa7877 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1,4 +1,3 @@
 DIST xwud-1.0.5.tar.bz2 133376 BLAKE2B 27ce8251ae2a2a87393655e1824121dd54f75839a8066405299e9052bf2c55c6946cd686f285dca1d7339029d8ca8b94e4adb3efb485b42bd347db212b12858d SHA512 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184
-EBUILD xwud-1.0.5-r1.ebuild 319 BLAKE2B effbf9a8f40839a3b505ed3a43268567311df3fc50197c311561ee871a1511df728cccfbe1ee48ec1703ff6cd43f705c7ac5d0aa5b487b28aeb8cbc138707edf SHA512 6a6b79b9bd097bf2f9521da2f221a2a855434e98bc1ca9eed199a936b0f61686b4fd65b346edadb8b72b6abfe3d3612c1dc3d01c041ebf39b0b7ff565c7ef5b7
-EBUILD xwud-1.0.5.ebuild 299 BLAKE2B 3e33caf41813fb6eb41b9c2348d21e3018bc294d4b31178fcc0fe4989c0dae05962fbd7059361e583afdb823f667e6dce11208f097e43718f2aea57c789c123f SHA512 7cd7aceca3304b6fcbb0c7b88a5a0e57f81415384f74df8df9311be846a77f0191e51040f870fab19e0b963ecb11ff248c7571af43a09afc4f1e08503452f156
+EBUILD xwud-1.0.5-r1.ebuild 313 BLAKE2B bdcbafa4697fcbe18d9f6ae4a75f92b3be421932127cb5274dead73bdf7660690bc4269078d72aae96d3f64693f2b5861545eede4411c5aab9eac513a2d0032e SHA512 502fd2eaf967b8be13640197a88cffa70a107eef987f618cdbeb3cc69c04b210c335044b1595ff3dc4db5ad8f09eaaa7f1ead101c87893e06c81772967af9085
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwud/xwud-1.0.5-r1.ebuild b/x11-apps/xwud/xwud-1.0.5-r1.ebuild
index 15db6db7c0f1..067ad0c9ceee 100644
--- a/x11-apps/xwud/xwud-1.0.5-r1.ebuild
+++ b/x11-apps/xwud/xwud-1.0.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="image displayer for X"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xwud/xwud-1.0.5.ebuild b/x11-apps/xwud/xwud-1.0.5.ebuild
deleted file mode 100644
index 023f4dec039b..000000000000
--- a/x11-apps/xwud/xwud-1.0.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="image displayer for X"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /x11-apps
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)