gentoo resync : 08.01.2021

32 files changed, 79 insertions, 45 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 5d1441582f60..93587871dd64 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index b69b52b8eb26..d53c9bebd420 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
-EBUILD bdftopcf-1.1.ebuild 403 BLAKE2B 869b7a67d93ff0c5790dc8553ec9b077b4a507577ff70d1a24d5941c5a811e04eb8b6ee84409ecc6e188ec134e20b4244382b0c901391fcd1ad57cd17d5fbd54 SHA512 f8474974246740d65a9c262e45b70bf807b5cb71487521a23333ea00338a7b29607ba9654c3ac07e952f96425c2d56dcf978dbd38d9ba13074f4c5a2b9d27a29
+EBUILD bdftopcf-1.1.ebuild 392 BLAKE2B 2e42e1e81954bbc174ef03fdd550292b46d31f26e95abf6c40e840c58f7e62f90f3dffb0506256e45fbbaf9a614ac69a58e00ddbdb7b38f3c7262759d5c9fee1 SHA512 57bbaf70e61cecde5b1480a6033a2de6c9166649778470389170ee24f287d672a99a1fd2e8bd168d7d6217972c496353028edef8a248d1af88c531054eb6f415
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
index 067741668fcd..9f0750e83c54 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-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=5
@@ -7,7 +7,7 @@ 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 ~x86-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=""
 DEPEND="
 	x11-base/xorg-proto"
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index 02a9491b74ca..c6e6bfe81e95 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 408 BLAKE2B 2e8f535e84346b1e744d7e03a6006760a9da997f45f88ca6c55fb98a317cb62a20904d97231ba14eb8f2fd43b8bea0cea9c69edc5b9164e7cf678207fc7b3a11 SHA512 b16403e8abe45545348dd3d994ac720432a24d4ce4f0e2fe562de31ec4624d5a30eab5e8a891588ffc0a4691074514f0b4e30f9deb543fb7510a752f80b71cd1
+EBUILD iceauth-1.0.8-r1.ebuild 397 BLAKE2B 471ae859e07baaf9540b862993ac051c29a4a87709c3be1296d5f1892cab1840b9ecc8ecbe236af071f921b4f6d7991bb883082f133e751ab2580d0e84c5e3b0 SHA512 a8800f1f6fc26318322be1e76fca15928737e3b83e4d1e446c2f31ce20ff914868d4da6e9c2234e2db6495798936f7aba7f98e7d6adbc33e982b7ca99965323f
 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 f7180b863ea2..73eea2d9a317 100644
--- a/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.8-r1.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="ICE authority file utility"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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/luit/Manifest b/x11-apps/luit/Manifest
index 3d793c97a933..63fb83a0858a 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -1,3 +1,3 @@
 DIST luit-20190106.tgz 190866 BLAKE2B 44098a00cade37aacdd7e67e1dae68157b652458b8a059de3dc56be9cc79ffba2ba861d403ab65de640853e0aec38c7d8d67febb5b6ae852a25430d2988c3661 SHA512 4324ff2793635e12e7fc0df2d7c5cdeb6241591105d0cfaf40a0da06a08764f08c5ef5f6fc19bc0e5d1f4b34b90e14b7aa393a0e613f5e096c6f91c90988215b
-EBUILD luit-20190106.ebuild 649 BLAKE2B e66161f7423e42fd329e4bf05badbcf2f9c3954aa3911a351a1436a0408f5ff2d312cbc5e5b47ccad266a49ea5d52a57ec425965f4558c299e689d2654ac20f2 SHA512 df7542a5cbe4043f331074fc2a3a0897db9b7b2e5dee1ff3133404043cd359e6c8d3b700de6670a7e583a8696a825ab67d59fffff357a097923af1a1cc6e12db
+EBUILD luit-20190106.ebuild 638 BLAKE2B e20f5efaacb29eca2768254115e6d3d3a820e9f0fb24b3621df2a0f3bd721e6e4e1003eccb2d94adbb77a0a154c8f18fae01fe38fb877cf5e152f51f5c5080a8 SHA512 32e422c19cfd3c2040af081db37a03ef99a6d5fc4aeabb95e4e2cd3bd946dfc1aba8602359610b0249573bc385757767d7ca7930f7123affd63d383f24a35194
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-apps/luit/luit-20190106.ebuild b/x11-apps/luit/luit-20190106.ebuild
index 056ae536c8e9..c62756f20dae 100644
--- a/x11-apps/luit/luit-20190106.ebuild
+++ b/x11-apps/luit/luit-20190106.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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=""
 
 DEPEND="sys-libs/zlib
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index b7519f0a7f64..12c255ec0c20 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 615 BLAKE2B d3528b84f68c3c1b95e3f10e796111a0b735b6766fbe70ce6bcbfd225b49f4cd050c27b55285bed0167367ff3ef605168d35872e954526c9707e6621b636ba13 SHA512 0c7f16ec66f9ff29d39e26290f820b86431b0e08d45f2b8dce2cfebabd19426b81aa826bd406ebfb02ac79179b55e27d3f0ff338a52dc04cda74f7855b1cec57
+EBUILD mkfontscale-1.2.1.ebuild 604 BLAKE2B 71e49a036ebb55b6dde7ecd46aad7a26de23d6f64a7921076c18c75f08bb6822617640ea42ac268fe488d23b88e158fdfa79d9009cf2c74cf23968fc56e13975 SHA512 b0d5c7e81ceb821401568d962c2be58edd95b1123b7e85086828ea5aa1a578a366e181ba6b63fcb9258f18e184fef4c6889721948bc3421ed229a7595375624a
 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 385063336c5c..0c62a985f5d6 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.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
@@ -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 ~x86-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/radeon-profile/Manifest b/x11-apps/radeon-profile/Manifest
index ecd6676d29f9..8c4b83bc41bc 100644
--- a/x11-apps/radeon-profile/Manifest
+++ b/x11-apps/radeon-profile/Manifest
@@ -1,7 +1,7 @@
 AUX radeon-profile-20200504-run_subdir.patch 1094 BLAKE2B 46b28649ae72b6e158df117dbff356213c14eaccba4547f1740b9b3c3c3469b816868d3b85acc3e32bde081b586e459e8b96f9df02e0f66717f7d88ccf047a66 SHA512 f8040a93e065292cc696ec94fa1076e438bdca5fd5f032062f4f3e8abcbeec9d4f814fb535474608fcbb352f554f5ce82244995977b7f4322b24a125df8a4847
-DIST radeon-profile-20200504.tar.gz 395674 BLAKE2B 6435dfcf9d2ce25789f429f12071cdb1c3f85050654b7fdec45c51a59d562d60369b28cfcd2854dfd5841e4af8f9166afed266e0a48d9010619972b653e0d4a8 SHA512 73f7eb59369af57aba5f067202fb1f772e48260c42ad194876926c29d278022daa86235f8d591bc763b8c6d80682553fe9a55f848137a8ec1de1bf9531c162c6
+AUX radeon-profile-20200824-segfault.patch 1170 BLAKE2B 9dcc28b9ee211be791a4f7e4f3352f17f78de85e20cf46b480dbc066caec9927677dc3da7b71a2c36aa992b57206dfd29622c94fbf58e575428b2e2e7526226a SHA512 6d4942a227a6f5d5886002aaf52cac4735248b2c0ce78e805ef14fa2774f2a546a181add72dc3086bf9e284a409571d261981616c39a3724629361bdc2cbc90f
 DIST radeon-profile-20200824.tar.gz 395416 BLAKE2B 0f1b9ac59c1e5da97cc0446d32f1fab6435d9049a5dc362d5896849e580382ede745e1759aef3ba659dec0f8f2ae12bb68f0f65313d24f9e3f4cdfa6f7d4887e SHA512 e3e9cf9aa46f81772406f7dc18a3768777b9f2ccdcda18094862183b31857099bf22e2a8b548ade5dedd04a38c8eab7a31127db3b7726adc901c7123a47f81de
-EBUILD radeon-profile-20200504-r1.ebuild 1248 BLAKE2B ec70477c0942ac99cb44c40d0e081d60fe7e7d47af5113e2a7062cab86fdfc3edac66e4792b6abeaf17aef745d065bbe10cf8ffa398d7f75e5634c34a7952a2e SHA512 b2ca93c74ed62e3ff271040d725fd2801a3215c5e8898f6855dd3ae41d07fa69212afdc4a77bb5a236d0089d49a09d86635e16c9ab49dc347fd24f2f4832cfa0
+EBUILD radeon-profile-20200824-r1.ebuild 1293 BLAKE2B d454aad98103b7ed8f96e092faa6104340502dfe22ecd16b23c34a6b1aad53cc1cb1ddec03ea20d8fb5f1c486874c7bb6758e397bbccc75c4a264460779c96d5 SHA512 9ec24225772aa8f17466214b3f2424818a1d222590ffd23068dc4147f792d194eed5791cdfd9a952d7b581f9eb2f72a1d2aaeb429f2e96d80b34d6e0b7f19137
 EBUILD radeon-profile-20200824.ebuild 1248 BLAKE2B ec70477c0942ac99cb44c40d0e081d60fe7e7d47af5113e2a7062cab86fdfc3edac66e4792b6abeaf17aef745d065bbe10cf8ffa398d7f75e5634c34a7952a2e SHA512 b2ca93c74ed62e3ff271040d725fd2801a3215c5e8898f6855dd3ae41d07fa69212afdc4a77bb5a236d0089d49a09d86635e16c9ab49dc347fd24f2f4832cfa0
 EBUILD radeon-profile-99999999.ebuild 1248 BLAKE2B ec70477c0942ac99cb44c40d0e081d60fe7e7d47af5113e2a7062cab86fdfc3edac66e4792b6abeaf17aef745d065bbe10cf8ffa398d7f75e5634c34a7952a2e SHA512 b2ca93c74ed62e3ff271040d725fd2801a3215c5e8898f6855dd3ae41d07fa69212afdc4a77bb5a236d0089d49a09d86635e16c9ab49dc347fd24f2f4832cfa0
 MISC metadata.xml 351 BLAKE2B 9bd8e162fadd4298b4cad8421104f7a75fcbfd41afba232789443b55e7a0c5befa8da030dc2fdccddedcab6296f51963158bf822e272182d98bf47dde9e63936 SHA512 0dd848bf98523b34bfb961b5711314bfda5294b2e7292a2b9a38c45c3bbb8f3d71ee22640a00068aadf97ee6aec3bf393a288f9d0b0533b7d5c9fa83aeacc2b1
diff --git a/x11-apps/radeon-profile/files/radeon-profile-20200824-segfault.patch b/x11-apps/radeon-profile/files/radeon-profile-20200824-segfault.patch
new file mode 100644
index 000000000000..141dd46d8f79
--- /dev/null
+++ b/x11-apps/radeon-profile/files/radeon-profile-20200824-segfault.patch
@@ -0,0 +1,33 @@
+From a98da7fd620a9b102a74affe16c0c0daccb97fc4 Mon Sep 17 00:00:00 2001
+From: Haakon Drews <fawz@negentropy.io>
+Date: Mon, 4 Jan 2021 02:21:17 +0100
+Subject: [PATCH] Fix segfault when running as regular user
+
+Bug: https://github.com/marazmista/radeon-profile/issues/244
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ radeon-profile/gpu.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/radeon-profile/gpu.cpp b/radeon-profile/gpu.cpp
+index ccd99d3..f5e32a3 100644
+--- a/radeon-profile/gpu.cpp
++++ b/radeon-profile/gpu.cpp
+@@ -69,7 +69,13 @@ void gpu::detectCards() {
+ 
+         int pciIdx = ueventContents.indexOf(QRegExp("PCI_SLOT_NAME.+"));
+         if (pciIdx != -1)
+-            gsi.name = globalStuff::grabSystemInfo("lspci -s " + ueventContents[pciIdx].split('=')[1])[0].split(':')[2].trimmed();
++        {
++            auto input = globalStuff::grabSystemInfo("lspci -s " + ueventContents[pciIdx].split('=')[1]);
++            if(input.size() < 3)
++                gsi.name = "UNKNOWN";
++            else
++                gsi.name = input[0].split(':')[2].trimmed();
++        }
+ 
+         gpuList.append(gsi);
+ 
+-- 
+2.30.0
+
diff --git a/x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild b/x11-apps/radeon-profile/radeon-profile-20200824-r1.ebuild
index d836b3ad1f83..1024baeddcbe 100644
--- a/x11-apps/radeon-profile/radeon-profile-20200504-r1.ebuild
+++ b/x11-apps/radeon-profile/radeon-profile-20200824-r1.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
@@ -41,6 +41,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20200504-run_subdir.patch"
+	"${FILESDIR}/${PN}-20200824-segfault.patch"
 )
 
 src_prepare() {
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index 5cf85ad6a664..0ae1a93301e1 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 446 BLAKE2B b7a280bd06b2cfab08b4ee8f9807c4bc7089fe2d0b94e4e7006bae539b0de694a72de32b1eb7e4a0234536549138f22f199b096ed59adb50b9d35230946ed0f1 SHA512 36407c8a87650fbefb0a0ea09d7290e0f792139fca337fe4a0d1240278e10e6a6112675e3962ee11efd4b871245ccf7974c48bf3d5d8de8d0af0d2a05633f24e
+EBUILD rgb-1.0.6-r1.ebuild 435 BLAKE2B f0493ceede3d9c2e5e6e3093ad12d4cc6447c3d9151444c2362b6ba064dcfb67415ef24b39d5f4c7542708eec957b5fc4ef2c15f64b544ad25410e964f4e9d6b SHA512 490ad3380db6c43cd8dac0dd5cc13922ed6d0477e608cac4d07d3ef191c53ccfb10a09345b0c55be2189979a80c113fc898440cc99702115e4df26572d4b6ab6
 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 d5bfa9792151..de007ca57a85 100644
--- a/x11-apps/rgb/rgb-1.0.6-r1.ebuild
+++ b/x11-apps/rgb/rgb-1.0.6-r1.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="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 ~x86-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/xcalc/Manifest b/x11-apps/xcalc/Manifest
index 2de368b02a5e..fb1b2fc6198e 100644
--- a/x11-apps/xcalc/Manifest
+++ b/x11-apps/xcalc/Manifest
@@ -1,3 +1,3 @@
 DIST xcalc-1.1.0.tar.bz2 148193 BLAKE2B 8643544d7871eca1e242b643f1e80fc76b7b2f64612a75ca2ec2537194df84862d9b86be515acea5114a8f2dc6cfad7c95cf40e396a0aeb26a6951198827755d SHA512 877aab7bb08f409a21c26b841f4d91eb6993914ed0d26512e47d6b3d2b3e0b231158901415a106cfb45de43f03f253bf2a8733f986538d4ee810afe0e54f98d5
-EBUILD xcalc-1.1.0.ebuild 410 BLAKE2B 8f6ca0682599f470f24cac583843ad14af9a80c4459a6877129e31e652873fd8585b8cf50e78b3ea54535302754d4b8314e5d7bf0bbfff99b1bd31c3bf1ff5ba SHA512 d49dbfbf9c883ac9a35b7693320a7404eac67f47cee19aa77de88ee03954a962c72625d3e6054e8eda43a459aa447a06edef0ccf2bf61f6e3d31d01dd9573c4a
+EBUILD xcalc-1.1.0.ebuild 399 BLAKE2B f7206f46718ec56094e63eab37ccd8b6a581a6a7fe28f71fd6190b4552b5b6e26714f0450ccd1d5708c7d313da8d3a17e78e97437f5983510a8b87891bef9f30 SHA512 69128a79d0e6bbfba8ae8298ff4fc7abf01b5ecea0162f1da935b142554479a1b8019932e0cf7e099ccf1caeac52bc200093bd10d2a3eec64537e580108d30b4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcalc/xcalc-1.1.0.ebuild b/x11-apps/xcalc/xcalc-1.1.0.ebuild
index 0cc39324242e..ee00cee34728 100644
--- a/x11-apps/xcalc/xcalc-1.1.0.ebuild
+++ b/x11-apps/xcalc/xcalc-1.1.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
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="scientific calculator for X"
 
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index a57427595cdc..c49a6ebf6622 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 487 BLAKE2B f222eb80c226f0758a26bee4290b57115871b41a39ab32cb1d9b06ee096c053961ceecf9a24c27f0e21447cbb023061b578ca2fd210571e4bb4dbc177537ce4e SHA512 70c1ecfc3a0e7fd41ab85ae352c0cadc956080b96fbb10e0cf0bd268de2bbb69282e0ffce3ae51c798db15a14dc1ca23f151cc3ee433c048df77d30a479b72bf
+EBUILD xclock-1.0.9.ebuild 476 BLAKE2B 74b9ff067a92f34cad9c17b16b1e4f00809868175de111db53f7924d51eecfe97e8e47e7a86297dd3863a7c49845a926f052fd1d40d4608f78047a1ec4c274bd SHA512 7324aeaa4f59f19958ff648c35926a1818c69b779e2e4c9571e8602db072a841b5e1ece9437f2d53b1d82720906f5e5efe1ff3a198f3071a97d437d65f151ba5
 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 719d18495a46..d4a8b4edc2a3 100644
--- a/x11-apps/xclock/xclock-1.0.9.ebuild
+++ b/x11-apps/xclock/xclock-1.0.9.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="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 ~x86-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/xhost/Manifest b/x11-apps/xhost/Manifest
index 69270da3afcb..835e61d2c0bb 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 525 BLAKE2B 215eee71bb02b07dd9f1c63e8672f49f0de58718fbbe8bc9f393df168d10c7aef72c3bd9da21acc6761419b5cfc709a8df7bb487cd9ee5159d2517338d857073 SHA512 9f8e4149c9dc0bd8de4cd7ef9e3369c7c74a2f99d8add65436d2b02e07f371b6b87748c774680c2228444977218789862078ec120bcb4516f53edde83035fd46
+EBUILD xhost-1.0.8.ebuild 514 BLAKE2B c15cfff1e6ec732a93e6ea831362dc300ab2ef0e178adfcc76ae2b551d1c260edef964ae583020968eef7dd0a453dd78e10b035bacfc383e9a7f8ac9b5f58a10 SHA512 20f35864f182fdb92af00fb495895ad13b8c95b0e9fb284179c50ab0cfdd0c2cb56162af14c05a14f75c99190c82cfef0eecb928c8a9d53817d5010ed5ce73f3
 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 c6c8e40c6706..bae4c85eb3ae 100644
--- a/x11-apps/xhost/xhost-1.0.8.ebuild
+++ b/x11-apps/xhost/xhost-1.0.8.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="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 ~x86-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/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index 76bacfb19e65..d9d225980873 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,3 +1,3 @@
 DIST xkbcomp-1.4.4.tar.bz2 251224 BLAKE2B 965a6ad91029ff4934af443a5845386045a66796cfdb6181cd94bfc1e3ee746700b22e5db56d22cc95255d0dca4f5894cf9afd40cc6675308a4425d947c5ed61 SHA512 971eb06277a49083b42154472596f1452fa94cdee28bad345bbcd85b028441bfd975763c20ed92aa69d6605b3fb23d27fee89df91501963b77c863667bae41c4
-EBUILD xkbcomp-1.4.4.ebuild 445 BLAKE2B 15173c25a13b750e2c752dc5eab6c19c5f3e70a2aee6850c7edf062c6b674d01f8fdd5cfd4e273fdb349146df16250feebcfd2dd36ff1f44e96e1ded466b1cb1 SHA512 6b09efb1d6821dcfc04b833293f8f4159899399b4f4ac62e491fabb393b8aafcda77a96ca6e4233b1e8d0d4b51f5b23a1c661fbafd8b28938bda8bd1a4d2ebf1
+EBUILD xkbcomp-1.4.4.ebuild 434 BLAKE2B 5d13f38055484417091726173e4b5c564eac07954bf03b86f0ee475da67cbe06a4070fd4b8ddc6daacacc38b8a6c274f175d30bd86f7cd5ab78069070f52760c SHA512 5d1f67268e64ce00cc36c8e746d840338be10129f29146d761e9e025a70aca16b3f96e63254c387159e20337b4f92d7537b01faf18b834665e8f3d6fcd448380
 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 11b612ac19fa..c6266542a1c9 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.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="XKB keyboard description compiler"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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/xmessage/Manifest b/x11-apps/xmessage/Manifest
index 29ba8a47c8b8..66942b034476 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 465 BLAKE2B 02dc61997514d66624c9d6255c920c79a683e0736b25ab71958023dcd7130e560e8e5a7f21585ce7ff2a159f3e1279e84387107266c9b00d0bfeac5146164a7d SHA512 f24097783e6f7bc7a7d1fc6c9ce8a458f8c17369aadfe4627a22e2205886824309f86f1f9b25c32457d60a19e22f3af651c8324b949694a7b3f4a6b65f75b220
+EBUILD xmessage-1.0.5-r1.ebuild 454 BLAKE2B b944e8ae2694ec621fd0198d336a9045b07189784ae5897ff74af058bd2e7b03b4216b714994534c5c21508da15238e401ecf4098aea13ecd8b95a788fea4c2b SHA512 40f5acd8ad2e5debf0962a5a8d9a2377e7a4e27b900ee51ee8f03ecb2ece2706cd0cf475572d46e8b1a6f9bac5c403f79994f997fa0b6dc96b5c2bc266845a76
 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 b3c25b99f112..4fd4eea96584 100644
--- a/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.5-r1.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="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 ~x86-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/xprop/Manifest b/x11-apps/xprop/Manifest
index bc0d770d5504..9cbe3b303b4f 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 390 BLAKE2B 8b43f48fb08e5d2ea624bf8ac793dfad9bbc6e880d36d122bde1d6cadeffb2d96927251ef2daf92bf8557910b5bf8cd4dc6634051e4e1531c2830ad96c9d9127 SHA512 2b05848dd0a896417cb63f2e2fcd1bc501f468f3df9d4a3ecdaecf350deb9fcdd99fb8fa2fb76e47c140aae9c16853a6201614d2de4ad6d1846105e6c91ceb7f
+EBUILD xprop-1.2.5.ebuild 379 BLAKE2B b15ce952d78b49526c1cb330ef2f9c3c73e94dc59f74ea513ca9978c9360ec55adc52386a9f90db72d380a72b0c19b3b75b49179dd9a36124117a269335d65d3 SHA512 41209ccea55da28557c718ae3958afaad042706b8d64f98d3b1eb71b08adece88f14d580530eaa31a1fbe2d7a6c874eb9b9dd63928e0e49c130c3972e9715cbf
 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 7c49ddda9e22..882c7eeae5be 100644
--- a/x11-apps/xprop/xprop-1.2.5.ebuild
+++ b/x11-apps/xprop/xprop-1.2.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="property displayer for X"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~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 4c4f1835ae8c..8549042165e2 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 421 BLAKE2B 918fd2f22fce1598d309abc2deee3642f16a7ce8724356234d9513be987b9a16071cb6dc891b428c9269021630e77cda3bcfb683a1cd622698fa14520b1294e2 SHA512 f7abca48693356e9b2970b9ad0439db4edbd99c788ab993206b4928a6991830e125a8b2764325b68870bf9069bb157ff81c49aa30a9baad0037a4f8ab5bf3ec9
+EBUILD xrdb-1.2.0.ebuild 410 BLAKE2B 1a7020c0998f7430f8063941564b4218327790c1574dba52d26832b2bf8acc6e56c24d8f939138b2cdd817294eef7f141dfc75d2deb62fbc6c04eae258ed2305 SHA512 18074a199767c3e417ecdae067807e165d212d6d079c9b4ca08ca5c3ada8224e1bdebfe7c31f5170de2d647421e2f398c26c4c679a7b145a966cec821aaca912
 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 2d74e4d0fc3c..da18db9c6098 100644
--- a/x11-apps/xrdb/xrdb-1.2.0.ebuild
+++ b/x11-apps/xrdb/xrdb-1.2.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
@@ -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 ~x86-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/xset/Manifest b/x11-apps/xset/Manifest
index 4e5054ed7ada..0d1b2aa22e76 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,3 +1,3 @@
 DIST xset-1.2.4.tar.bz2 145546 BLAKE2B df4ae52046af7f632e2f60386bd3b8d90b27db3e53ceb68f1056c9c5df2ee9c6d83d109a444eb99ddc031e35b91db0249ee56eba3180bc9a8a002935db213605 SHA512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
-EBUILD xset-1.2.4.ebuild 481 BLAKE2B 3827a78dba877b049d40ba955c1a82b743f9e3fa6e1807cbe86b0ec932d1f2c64df0e02df06eee57121b9b1efee999a51e1519c4d056ac7e3581ea5ce7d61ce5 SHA512 c736ef75d98a49c736c7c6c97e6c7dc76ca27b5baa0ab7bc4ecab3e4f29f860939a1dd90a4234cc586eca40f82f6cd2c6cbade0bffb2ef195493f9f648296bd2
+EBUILD xset-1.2.4.ebuild 470 BLAKE2B 201e4d8bf88ebcf477164b789bedb3bb974eb972099d6cb7b3a70a60668f5db15923c4da0dba93885302158dec629bdea731b9fec042bf1b227f819df48acdda SHA512 7e8d940c96570aa96c43e1c8bf04434347fdb1dd280496781e8cbcf3ba1380ab5e6f6d0699168a14b21316b93a796c582ccd104465196360657136be24ef7e2a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xset/xset-1.2.4.ebuild b/x11-apps/xset/xset-1.2.4.ebuild
index 0943a1488e90..7d4dd3050fbf 100644
--- a/x11-apps/xset/xset-1.2.4.ebuild
+++ b/x11-apps/xset/xset-1.2.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=5
@@ -7,7 +7,7 @@ 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 ~x86-macos ~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"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index 3a3ceee336c8..800efff144dc 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 827 BLAKE2B e3b9799df6983caefac04eff2f13ed81c3428176a47d691b149bbefe3b84b7317a0fe15896bb02d4c2c74fffd55df8dad496a70f2d9e54d7f4af3c7ea44ab069 SHA512 d292068155363f6c786aaab2310cde7cc51bd6d28783e3b8fda2b7d686aeee3ea0623554762dd202063ded51717b63b8c0becfb76af8f5fa94bf85e96263178a
+EBUILD xsm-1.0.4.ebuild 816 BLAKE2B 9814ad1a9912b6eb07904bdce63ac5600139fa1b8114b0c471f0b9298d8dbaee2f37e7eba6872e413e84712145f471c47304579f609b8712547a60c4093bbf65 SHA512 20da97a0f930c3750249e82c7fc926b86c38e454cbdeb40b36ff3225c622e690442c2d37f8affd46f0b9a3d93aaba0f18571ea009d70566e377bc28fab9346e1
 MISC metadata.xml 333 BLAKE2B 0b142d7cf4b255c50a9e616434af7ff1db6a2aa0d3467f43d3e22ce6ce55a1bae7ab18eaf092bd5ca002464dc046bc2de62b3738425cdecf4ad15727b20f2d18 SHA512 5496dab87579d1d5c218ddd1ef1e8b63e73ed8d0e695d3be9577d862fc03a775b9cd3dc82abd356c1ef124522f4ed07a5f289e5e3355bb76c2d8746e6cf5a7c2
diff --git a/x11-apps/xsm/xsm-1.0.4.ebuild b/x11-apps/xsm/xsm-1.0.4.ebuild
index 0cd41dc49e9b..ddd4fcc32c10 100644
--- a/x11-apps/xsm/xsm-1.0.4.ebuild
+++ b/x11-apps/xsm/xsm-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=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X Session Manager"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="rsh"
 RDEPEND="x11-libs/libXaw
 	x11-libs/libX11