gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /x11-apps
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
179 files changed, 235 insertions, 266 deletions
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 37ef15311043..9238cee629ef 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index 2e718a1d437e..f091d5c10d97 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,5 +1,5 @@
 DIST appres-1.0.4.tar.bz2 117949 BLAKE2B a1938ffd3a3ecf279e35fd85c39f79550b9da0d2155d4ba08708fddff0b6cb9cb97a8174fcfb701ff13e929bd551405c3eaeae516d15e4d7ea31ef50aa6a5d29 SHA512 f07e672bd335308e58495685e5e7748684283aac28a96ea716edefe99ff281ec1f9b264e853ec0ce0f64cf54d9208d70dd3112a5a4219e0a38bfdc0fab8c9d98
 DIST appres-1.0.5.tar.bz2 124531 BLAKE2B 0d3e497afb3ab7d3565451c0da6594b4e608fa20e1a225162c4347d672db6a94823b5961c112b414e55c86a6b53a684709ddd109991f0545b6897bf276824da8 SHA512 70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137
-EBUILD appres-1.0.4.ebuild 393 BLAKE2B 7ee98ed0eb63e8d877c7b8b8de47876aa28e22077cdfd72de7f754c0cac6202df89ce44d7ba2a78baf9d1aee30d33de298593df897dd3651103a3f1ccca505a3 SHA512 c25305f6946b8c4a67e49b5df8e38724a883131a0518dd57677c1ad4a6f5212b67526d5ec276eb785207bdcb9fe6bb10624e1137f9e0d2d5ab76bf779a4e519b
-EBUILD appres-1.0.5.ebuild 393 BLAKE2B 7ee98ed0eb63e8d877c7b8b8de47876aa28e22077cdfd72de7f754c0cac6202df89ce44d7ba2a78baf9d1aee30d33de298593df897dd3651103a3f1ccca505a3 SHA512 c25305f6946b8c4a67e49b5df8e38724a883131a0518dd57677c1ad4a6f5212b67526d5ec276eb785207bdcb9fe6bb10624e1137f9e0d2d5ab76bf779a4e519b
+EBUILD appres-1.0.4.ebuild 390 BLAKE2B 576a1f60fa4c9c68ad233423870eff850956e798cb9e2dbb5c68c563f580aac784f5b029d510ca9419eea11eb8859abdfefe225ab4b0272a0dad1a3e8de1d8c7 SHA512 889e2353bba272973ffee2af9f08dcbced890e745c7a51001bdf343ca48c7d39f11f21125917abf463aadf32f88a02df79c4e00cf59298d82624d29470a0ca90
+EBUILD appres-1.0.5.ebuild 390 BLAKE2B 576a1f60fa4c9c68ad233423870eff850956e798cb9e2dbb5c68c563f580aac784f5b029d510ca9419eea11eb8859abdfefe225ab4b0272a0dad1a3e8de1d8c7 SHA512 889e2353bba272973ffee2af9f08dcbced890e745c7a51001bdf343ca48c7d39f11f21125917abf463aadf32f88a02df79c4e00cf59298d82624d29470a0ca90
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/appres/appres-1.0.4.ebuild b/x11-apps/appres/appres-1.0.4.ebuild
index ce6bdb87e906..e852a4932817 100644
--- a/x11-apps/appres/appres-1.0.4.ebuild
+++ b/x11-apps/appres/appres-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="list X application resource database"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt"
diff --git a/x11-apps/appres/appres-1.0.5.ebuild b/x11-apps/appres/appres-1.0.5.ebuild
index ce6bdb87e906..e852a4932817 100644
--- a/x11-apps/appres/appres-1.0.5.ebuild
+++ b/x11-apps/appres/appres-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="list X application resource database"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt"
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index efbf662c8c9e..d40dc182e904 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 398 BLAKE2B 175e9340f9a6cd7003ca418f98d7f1c200d2185ec977c426433c71501e54ee10a0f5d277f6a58ba4c69df20ab50a4a72db9c8cb0fbf7f9886746beed99e4ad78 SHA512 8de221d1ce0bf11233d96625501c94c82761d7986ba35a19a0804470e78c9d3d1982a1757d776ff6fda7c0fad6cb1be5dc7114d3ac523f80598a2e355f54da3a
+EBUILD bdftopcf-1.1.ebuild 395 BLAKE2B 67885dfaa117da375f2d3a447571438d6213619a1b9493fdedb86b7c6760f7b14584564e7c0b49643495f7cc30481108d356f4f9a66c3cf4c2938b0d9fbf3cad SHA512 79d9bf9ccba6c10e51d784df7d2c18e27d50e338ac235bbe8dddc5bbd84cbace43954ed2afaf6ac8b86064f6851d9a3715d08faaf340ae2acf84c6bcc0b9a655
 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 83a7b8ba50e6..ce319fae08c7 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org bdftopcf application"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="
 	x11-base/xorg-proto"
diff --git a/x11-apps/beforelight/Manifest b/x11-apps/beforelight/Manifest
index 5291a96ea49b..3ecabc82ae54 100644
--- a/x11-apps/beforelight/Manifest
+++ b/x11-apps/beforelight/Manifest
@@ -1,3 +1,3 @@
 DIST beforelight-1.0.5.tar.bz2 119358 BLAKE2B ff4a0e0a28d3cc668611eaea8b181696986f92eb7236b336218d0392484738788db9c16e0eb6d16a106ba3b30d094be082c12da22c058a5a0afeeb76fcddb76e SHA512 f6cc794159cda89ac060a43d190fa72419dbcf503a97093b4c0f05315389085ff804c2891e00da2843709e97633973010165f9d68ceb0dcc76eed150f9c75968
-EBUILD beforelight-1.0.5.ebuild 355 BLAKE2B bbb7465e2eb38a14b923abf56504113fb7fd26bf15e9b1c44d5e9c06a98eebd2d9ccc75cd31757a4d60efcec0458a362adabfa0804570bb56432a52efcc501e5 SHA512 039d498d9fa7f9ee39eb15131eae32f03a779d426ab02ca1e755ac16553458c72116b3602e363094d5e1139311f2759e2626f73b2a0a6730f60195e2252a62da
+EBUILD beforelight-1.0.5.ebuild 348 BLAKE2B 16b21b76e7107a2abec7b4126a108951dc092c283a15229fa53d2fa3c348f715f4eda5142e1f86f62dbc9ee08909c3854aca4a78fca5c78b90cba64063411f71 SHA512 15cbd40ddbd077b917cb0e7a671e5dbf0f3b4b012a733614eab53f73dc2845ae51e95985ecb25393a073e4a6606d9582bd742390d67ebb9cd75f0d6a932ebd17
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/beforelight/beforelight-1.0.5.ebuild b/x11-apps/beforelight/beforelight-1.0.5.ebuild
index e4ce3505fc3a..f131ec93b6dc 100644
--- a/x11-apps/beforelight/beforelight-1.0.5.ebuild
+++ b/x11-apps/beforelight/beforelight-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 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="Sample implementation of screen saver"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXScrnSaver
diff --git a/x11-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest
index 61fce96e2a3a..be4f4d06967c 100644
--- a/x11-apps/bitmap/Manifest
+++ b/x11-apps/bitmap/Manifest
@@ -1,3 +1,3 @@
 DIST bitmap-1.0.9.tar.bz2 181401 BLAKE2B efdf2d2905f6513ba8942d55a1aadca8f47f22736a55894deb9a4afeff132d8e410b8d84d27314253f16cb84ebb530b79c75991427365c45058e58280ede4449 SHA512 873c626c72a0f4025fe8c8aeedbf3fe4ee5657fb487ad7410406a20da518c0358041dc45c2549926cc10e1d031977073b9d1ddb32830fdce95b716a52fe44456
-EBUILD bitmap-1.0.9.ebuild 372 BLAKE2B 59c6a0d2106c65e0d65fad0de9d48fd3a4c50c2a0cb3f26997d8c13483f6967dd63b1b4a920c0d10c22cf37271f715f430c8b4df5bf79d2cfa9f755bf8fdfa5d SHA512 33f12428ce374c3f2c824f90189fc845cd7fb7e33cee5bb3935410fd8880025918cc476dc13509c73f11094f9b469e3e3daac1a49b6b23562d081ad27a0fa0a0
+EBUILD bitmap-1.0.9.ebuild 369 BLAKE2B fd23fa43b2b345385a60bd01715c243451bc3ffb311722b6538ef4de11de87ef0309d1bb1f100c35feeaea325f8f5e827cc748dea9424599b98f11d03b1b0d0b SHA512 90250bb5b88fdde13fd055399f7e81397762d2479ba9a60aeb00a1724778f41c7638ec877476e4f2df7f6a3cddcf9ba99a9aef7ea3d3f6d20f947431dcd41104
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bitmap/bitmap-1.0.9.ebuild b/x11-apps/bitmap/bitmap-1.0.9.ebuild
index f4dbb2099950..ce10f172b60e 100644
--- a/x11-apps/bitmap/bitmap-1.0.9.ebuild
+++ b/x11-apps/bitmap/bitmap-1.0.9.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org bitmap application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
index 8b794284a262..4bbf6fba63ed 100644
--- a/x11-apps/editres/Manifest
+++ b/x11-apps/editres/Manifest
@@ -1,5 +1,5 @@
 DIST editres-1.0.6.tar.bz2 156155 BLAKE2B b36ba85cd7c58a580e682e058d81af1d0f7bef044334fb0bb799fef7778af53055b592e0c67ee1b8c116573585d7699aaf2050310994b76c9b4aef1e43d9cd47 SHA512 c070709ce926802696d43d27256cea125c04021ad7555e1ea6c90650bf9e9fdd8da7786ebc99d6cf6a2dac73db041d489d34e6b2f6ceb6b396b6e96711b1c510
 DIST editres-1.0.7.tar.bz2 166429 BLAKE2B abaa0764bfc3419e17d5cd222bbe20f5591f7bc8431444aa6739cdc067cfb81f606370df19562410aa54820a0249828ccc9d506a9607031b453a7993af634f60 SHA512 b9c928b556116bf50cf4b6ea779bdc9fedf29f5db3e6a8cc75c122578c92e1cc530a81b226ec24aad183b8ebc2de570f200314b0d9ce7883b6e3306007365b32
-EBUILD editres-1.0.6.ebuild 367 BLAKE2B e6b6c0d18dfaf68abc91ecc00837084727398c90d8a19e63ae53a82798992a72054aea7ca2d02e81649f4635d94d551f28c4799d0c89d877f0f9bbf820bed47f SHA512 5722330943d002690a150b5a93c94f44f28e2bf8b2c06a4ea659c7632a9fa09f6e8eaf6177f62e866773b9ad145ad16239ef1d29b98756412f5ea02d2f5e66f0
-EBUILD editres-1.0.7.ebuild 367 BLAKE2B 0d70cd30bafeb031bfe3626424c215f3613a0767bbc7eff9005bb6ce749a415a1b55aefc486d51dc0cc92ed1968466cdf2fb51065f22822a0873b45aba0bda76 SHA512 8db8262993ea215fa4524ec7c667a2e6c37bc4c3a03508ae50caa9b9d6f40734c2a6932a927d690c5eabb1e41f221afa68308841837a755ab2ea7db57282ff1b
+EBUILD editres-1.0.6.ebuild 360 BLAKE2B 881aacc17fd0f690673511ba8a3a8ac9b9a2c0f0390600617850be576cf2244172dc745e3793f78989de6f361d94b678442b43807b2d1c92576051f78e86755b SHA512 aaa396b5816bea5057cfaeb7e502cd64527118aead063c0a976689c2903340baf1ce75728ec2432c800a60c172c4aae0796c5a8380d02d9e4b643c9b7c71592b
+EBUILD editres-1.0.7.ebuild 360 BLAKE2B 881aacc17fd0f690673511ba8a3a8ac9b9a2c0f0390600617850be576cf2244172dc745e3793f78989de6f361d94b678442b43807b2d1c92576051f78e86755b SHA512 aaa396b5816bea5057cfaeb7e502cd64527118aead063c0a976689c2903340baf1ce75728ec2432c800a60c172c4aae0796c5a8380d02d9e4b643c9b7c71592b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/editres/editres-1.0.6.ebuild b/x11-apps/editres/editres-1.0.6.ebuild
index d81fb1814cff..57d3582265a7 100644
--- a/x11-apps/editres/editres-1.0.6.ebuild
+++ b/x11-apps/editres/editres-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="a dynamic resource editor for X Toolkit applications"
 
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/editres/editres-1.0.7.ebuild b/x11-apps/editres/editres-1.0.7.ebuild
index 464eec9afe16..57d3582265a7 100644
--- a/x11-apps/editres/editres-1.0.7.ebuild
+++ b/x11-apps/editres/editres-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="a dynamic resource editor for X Toolkit applications"
 
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index 483579259f5b..e082cf612ce4 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -1,5 +1,3 @@
-DIST fonttosfnt-1.0.5.tar.bz2 141446 BLAKE2B 277f7f182d0c45ed06fd67ad0c839c2b116d64d801fbd623b81b8a9cbe5ee77a89b6b5cd277d3090a9b6be6e006bea36e1cf98e2dbdb2917e54ddfa30d0b659b SHA512 dba990098c95b07bc7240699a5c9ea11f056fbfddd70f669ae283548cbf20d756b28d817a99548c23ba81de9792877296ab6f35ee3c630e5c3cd8f14650ce297
 DIST fonttosfnt-1.1.0.tar.bz2 143545 BLAKE2B fd05a19ffc50306b747bbbc6ea692b6667c7ddd185feb31a21173cbf571e5c74ded0da8af305e3744d8db57eca909d271b153bfded2182e060d922e42395942d SHA512 f4fb9814c23bfd6f83771959444d2c37eb4ba32edee43c37cf21f0181be80c6e278307641b0f4dae4ee5d10db3289e95194f99757ea4bbca343fff15498e7173
-EBUILD fonttosfnt-1.0.5.ebuild 328 BLAKE2B e79415219a00bbce13b41b43fe9b1136dbd3125cbcfbe1918b7528401657b4eb53a0f100df172a4c46868ee7cb55a352a2e5390cd0a154bd3482379941fe8946 SHA512 9902c7c8f38da3f4bd88e5838efa3cb8d9461f8366d0a8b3dde8a8eceebb505e771a69e8f732ebfac5df38d5d96d443dcd07b148cc3db36385b634532ced1a64
-EBUILD fonttosfnt-1.1.0.ebuild 353 BLAKE2B 9cfd08153bc884961b6c9bfd02a0b51032af2e6a7a022a7b2f49436c2a1ede734b75a820cd49fde4331ef91853838ad31ebc217c3cdaf05f13f7cbf73e334ee6 SHA512 7ab5ec82d7cb748db0a68362bd6699ec1d7caa7b12af95db60121ef1cdb06c82f97cb85ccf035c04868297bb94532244873e16edd9eb24bd85285f6cff907d55
+EBUILD fonttosfnt-1.1.0.ebuild 350 BLAKE2B 0c111697081a982c6dc875c91d4d9164697024bd953a7fc32df75f965b017ca453ad91da86418270a36e05a020a62024291be2ca2494b6b0e72f2e81d31a02a0 SHA512 e9a0dd3b2b95e7d00968f99388f4dbf5b49326b19bdb2c39590a3ed3971bea981993c39e4a4af063334bc0a5f2616c721effedea39f70e8a84ef3acdbc27a1a5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.0.5.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.0.5.ebuild
deleted file mode 100644
index 3240d318140e..000000000000
--- a/x11-apps/fonttosfnt/fonttosfnt-1.0.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	=media-libs/freetype-2*
-	x11-libs/libfontenc"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild
index de1980014934..9b0d5a1a1313 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND="media-libs/freetype:2
 	x11-libs/libX11
diff --git a/x11-apps/fslsfonts/Manifest b/x11-apps/fslsfonts/Manifest
index c3810b7d1295..dcf4385c6c30 100644
--- a/x11-apps/fslsfonts/Manifest
+++ b/x11-apps/fslsfonts/Manifest
@@ -1,3 +1,3 @@
 DIST fslsfonts-1.0.5.tar.bz2 125650 BLAKE2B df08689dc452d07e895a93d5e755b3820b21c1df997b5269835ac04ac81beb09d98ebdcf7030d3e6c7ae288b3e7388b136a8b7b58f95ce3958e12923bab50620 SHA512 3a30598ace981c7396bfe44f0d8f76d40fca3f77158dceb3914a524594a12187dcad0b0f225fa81f251f0b7896bf046cec4ba610b4676da9be311eec5d8c6cc2
-EBUILD fslsfonts-1.0.5-r1.ebuild 313 BLAKE2B 0a80b0daa32a3e96cd66c5b8f0821f10eb160453bbd70b181165b3017c43392302e219b3baca4832b5ebeb3c3617a4df27135e42e0b471dd0471be560c9396f2 SHA512 16878edf4be9fb827b7383f79c28cebba6c3f2b18b7c75efb5cd53c7af569de1a8435be4953af0964df531abba92622423ec09b410dc5598181b6b69415cbaf0
+EBUILD fslsfonts-1.0.5-r1.ebuild 306 BLAKE2B dc53b776adaf1d754dd6dd35bff01e7b88767181c5224c19d3ffb1c2878611d64e97c31c63d09ffbd569c2b8e92fe255ed829eff509532f80f5255a73062105c SHA512 fd79d21802ce5c86913e12a7478f32e3c02f4c0a93b4927bf0b2c2bbe879f5e4a05d96a4b52116fae1a4867d80d8c5f25df4b7bd153c653e91a32183241fe134
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
index e6deac2c8d2e..32f8fbb3f0bc 100644
--- a/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 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="list fonts served by X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libFS"
diff --git a/x11-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
index 748dafaaa35e..db82619a062d 100644
--- a/x11-apps/fstobdf/Manifest
+++ b/x11-apps/fstobdf/Manifest
@@ -1,3 +1,3 @@
 DIST fstobdf-1.0.6.tar.bz2 127170 BLAKE2B 89ed63541386d9f46ef839fb78be1cbfae4b51d824781325e33566a027a5a44671cdae84ec6ed81eb23b6a89f6868726b35781f2626a407753129ffd4c0af86f SHA512 ec5b8f62019ba51725bb47241d4fc244412f354e7c12094ed884109a88e3db9d25d41a6142fd002e6c49877b4c7f2c5dde549682dcc05f7ce102621d2c71671f
-EBUILD fstobdf-1.0.6.ebuild 311 BLAKE2B a29874d96687d9a56ee5b2af24a1b33f01210bec37a925529cf7ea887d0ab816fed58d3e01f2780a10f6864a72525ef05ba42a873880e66a0e15956acb677b41 SHA512 ba0821487f49cf363a6fcb15ce566cf7df5efc6175cd75719328708ab45dcb6096edda18f6e2b102a792f3d65892fad27cbbf7773c712fc2a8ebe2bc67a40104
+EBUILD fstobdf-1.0.6.ebuild 304 BLAKE2B 7758d228a19624edcdc9e813e8f9aa1fcbf7e5c62bdedebc42a28140875ce71ebf842d040a52f4d9eb332785908665d94606eec58396fa882de0444a9bd3f330 SHA512 a072748bfdcf8a2cc89a5010160ed9eb7c7fe3f619e8f7fa6d2ea5c98a6c7bd8daba67aab5b58d28fc0b9a8f35522b19d31ebcaeca17e8af166156a35703b759
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
index db4fffaa7a9d..fc375467eb96 100644
--- a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
+++ b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 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="generate BDF font from X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index b60d2c1b3ed2..51d0ad8c0beb 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.ebuild 411 BLAKE2B e6c6f2d7554998c812860765f21a429514f7ca941fa4512d4086fcea73210856ef5a68f8db80865dad43a1a3954732415fbb0bb9346110a9f94cb6e3b7bdea3b SHA512 7e2ba635c50342576801cd344f916b470e98567ec65ab1aa56e446dc6abfab3892231f3550f4de85411225ad37f0889d70f7f7edd178aec9f708361af3e7d7ca
+EBUILD iceauth-1.0.8.ebuild 408 BLAKE2B 5e339e291fbb07a0b21c0ca60929bb7f842cc77b8ce2d8f0df68bf4978b561729fb15b670858d6f394259b9d26274b2c78114a380d22879b03aa60196db49ac1 SHA512 eab9ac01a7e3c6e6e4b98b56365b7d87769640b9a45cfa1e679b9e0b366c4b1a8dfec2efd22048a0922595a4d946ecade6a7b8111e55eb77de351bfe60c09d1d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/iceauth/iceauth-1.0.8.ebuild b/x11-apps/iceauth/iceauth-1.0.8.ebuild
index c81bf8c1aeca..f9e6715e7fac 100644
--- a/x11-apps/iceauth/iceauth-1.0.8.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="ICE authority file utility"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libICE"
diff --git a/x11-apps/ico/Manifest b/x11-apps/ico/Manifest
index f123ecfa3f4e..1ee23f579512 100644
--- a/x11-apps/ico/Manifest
+++ b/x11-apps/ico/Manifest
@@ -1,5 +1,5 @@
 DIST ico-1.0.4.tar.bz2 127619 BLAKE2B 8e9e161b2f0ae23acc989e7bd8ce70e953ffdb43e9d998d63993504073bc339b5dee85c0e5611e38a6c1b3b98a9a1067b0468c6dc3a1aaef26e38fac76efffa8 SHA512 f7200fc04e7d0442215a3fe1f53456fe6bcd14eb2e2fd048cbe7f5700ad28e10ea8ef72ab98d3cd232c801b037fdac5ac4367ba98484f2912de0715a23f82e5d
 DIST ico-1.0.5.tar.bz2 136727 BLAKE2B 6c6d0a3e9521d9dad9f17f20ca7e1ccb52da31b6a5c5879bbe3d63e58231956cb2ff665b109191185a9af8ee9d2b87f034d349d4d3b33d18dc7b52e0d0640972 SHA512 93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6
-EBUILD ico-1.0.4.ebuild 315 BLAKE2B a139b435593aed571ca565649f5c92111631e5dd303a89152fc87907401ebde2ac66d0e104a6cd34ab1929fadba69bcf49ae7782192c80d427c332b5b171506b SHA512 3e0b292da26e8d75db91b6addf351389797c34db07fa93ac4688b0b47c1d6c671a0fe27214b33c54d1e2b325a4d53c8cbce787dde19ddf7b605e5d90fa003f34
-EBUILD ico-1.0.5.ebuild 315 BLAKE2B a1a386e35028b812a06e5d617522046b6cfe8c2c961fdf9fd36a60894567a1401f0a79ecf5934df3acf131c0bee1b1566c891c60119436ab58a58909859bb6cb SHA512 0895387f0c21136d1b171edc42ef5235b8ead9240302b91cd1cbc5655bb78e77d9d7c7c9535e1eec16c25868c55833d8b1f41000ca53b8ff2c988bcfa7b16849
+EBUILD ico-1.0.4.ebuild 308 BLAKE2B 468613dc6e01745bff4fb99db8cac492ab296aa9d45044f58a0d228f691534adccd415554c47e1ff1f1822e491a640f6016c21fc1be003ddb1972cc501a237a3 SHA512 b55e76d19556566e052c1907d917c8a12fc2e7546172393fded38161046f8f199d01e81f9a58fd54f111f306db5aa22b547a843dd6b79f9e12a30f6b58bc44a9
+EBUILD ico-1.0.5.ebuild 308 BLAKE2B 468613dc6e01745bff4fb99db8cac492ab296aa9d45044f58a0d228f691534adccd415554c47e1ff1f1822e491a640f6016c21fc1be003ddb1972cc501a237a3 SHA512 b55e76d19556566e052c1907d917c8a12fc2e7546172393fded38161046f8f199d01e81f9a58fd54f111f306db5aa22b547a843dd6b79f9e12a30f6b58bc44a9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/ico/ico-1.0.4.ebuild b/x11-apps/ico/ico-1.0.4.ebuild
index beaa0842648d..0c60e859472d 100644
--- a/x11-apps/ico/ico-1.0.4.ebuild
+++ b/x11-apps/ico/ico-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 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="animate an icosahedron or other polyhedron"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/ico/ico-1.0.5.ebuild b/x11-apps/ico/ico-1.0.5.ebuild
index 65ce2d36b025..0c60e859472d 100644
--- a/x11-apps/ico/ico-1.0.5.ebuild
+++ b/x11-apps/ico/ico-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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="animate an icosahedron or other polyhedron"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/listres/Manifest b/x11-apps/listres/Manifest
index 6348b96ea478..3f9d54a84f46 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 333 BLAKE2B f99df135f4785c20dbb5f7ba91dd3344119b36fd87c3237adfda8f33739a8a02a98ef8f60d88687e051ad9196809c9ad69fb3ef60f76256601d8e733f6e14e58 SHA512 e6981565d085abfb9e54216bbfefbd4aa28e91036b7744077454e459b977a64de16479f50f794350d55a4080276de16507abe72849e47d8ed4566af73b0d7246
+EBUILD listres-1.0.4.ebuild 330 BLAKE2B e981874038e037abb9b7e598f0de6f5bbbb8dad78e1274b8f07af0f167ecb50356aae6a100905e38620a1a743e8eebc3f8d6748731dc50023d612e03602cc492 SHA512 f365c70a7c594d87f6b8f67340f186a2230ed84089a1ae564212187faec9cf4efcf6f8ada41a3f52f2a3a01524c9601bcc07583ea100fe28e8bcb84fef137efc
 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 d06a8dcf2808..9a5c4f391053 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 sh 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/luit/Manifest b/x11-apps/luit/Manifest
index e402441595ab..63f9087b3ec9 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 644 BLAKE2B 9d7b3392a2494eb75ca77ff081d7f4758a7d71119346821fc7b013f8aa4dd79360c12378a849bae204d127ddf9f08d39c03cab6856b224a7cc4285186840cdaf SHA512 3f81c3fa68810cae9af025fe53dc0a2adb4b1b5371964522afcfa09955482d033b364ded12709ae2226d3ca188189955c2f57620a4404713130b37250d3a15a5
+EBUILD luit-20190106.ebuild 641 BLAKE2B 3bbed118eaa5a9193d093b2215ec55b3f5ec2d71e41631752199bbc389bf9fe28e852c3c0d8e3521395c472d4113eb39ad8797e2fb5145642983f7a9679f4f83 SHA512 ba55af0641f835ad7649391f2c08f163a012c703e0bb066dbc447c1c4aefbfed4674ff2e19f26672dee563327a501b22c37b78c24cf4c9e247c78b4aa266d3ba
 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 257682f3cad3..53783206a826 100644
--- a/x11-apps/luit/luit-20190106.ebuild
+++ b/x11-apps/luit/luit-20190106.ebuild
@@ -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 ~s390 ~sh 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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 62965c2c58d9..0e7015585a41 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 1712 BLAKE2B dd3f4f6bdba657623dd64568f825ba94c7a4da856dc960e68da4e69c1b798322ac735f2cd5741b176b8cb2a281e5792313693f1884ae0af8b27bfd7519db335d SHA512 dc3366d93776d2131edab26e1f01ddf13abc300c5f3d5fa162c43d227e65e694e25e4e326609efed1c638e41020dc49fbb3417711267a39ee56886014fac646f
-EBUILD mesa-progs-9999.ebuild 1663 BLAKE2B ac8c8518946edf1900a2855eec8c72d23de44350c4f91366bf65338cf79d38161948bdd7068c977bfb70ca93de0c05bde2fa95eba313c53d6fe4400dc49c6731 SHA512 1fe5cb3514e1919e291cacc24e07e0c424a5bee0d3fe452e94f5f3f6f76751130c0261f682696f0070aee90ccb1c8d4d765a8fee461acbf4eac418f257ba6f3a
+EBUILD mesa-progs-8.4.0.ebuild 1709 BLAKE2B 6febe405e91813eb64ae1922151f4ed391cbc0bc612d5a0c958d7cdec80a41f23cf9b992f66ebf5e217eae802885b414d987223b0b87c0175ae3a7814faff08e SHA512 78acba58e03f4d2747a55157f769451a12f9d5ae56ae14762c4f3e5569875fd83b2ca2fa1482da39768aaf169fbd11a1445cad41d31115c5f19fc1ce14dc1fd7
+EBUILD mesa-progs-9999.ebuild 1659 BLAKE2B d5e7fa3a2676a990ccf40060f55034e57ebf47290817be0db9eeae8625ea0269eafb274fc21f5d68444d304e9b1042c71b5a24d78ba292ae4f31211a99d7e1dc SHA512 f7aa8192a09ce0d9b94afd522c8e76b93866440f1179b07c66cd763d57419e5357e725115c6c79c896b0a5bd78aee8cf5a657ba686b7604f4a7be7b373027c45
 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 47c7d51901b1..189d0804e56f 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
 		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2"
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 1f4f84983846..4220c4004cb5 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
 		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2"
diff --git a/x11-apps/mkfontdir/Manifest b/x11-apps/mkfontdir/Manifest
index a3256083945a..c00b406b4470 100644
--- a/x11-apps/mkfontdir/Manifest
+++ b/x11-apps/mkfontdir/Manifest
@@ -1,2 +1,2 @@
-EBUILD mkfontdir-1.2.0.ebuild 528 BLAKE2B 9b1a2036db6ab3802a4e854c47569995e3e1bcf3b503fc73140c43ea4801836285c2936435c780f44c289e81b64d57cbe126c1e0b2f57c4cfbf18a6045a95dbd SHA512 a145fb8b19e4a9cf13458dd34fc8a0fe6c9fb832cbf8f4614c65f653b1b7a84d2804710f722ece5ce07d9e1e766966bce6d46b918ca29ee56900c4e647a2822f
+EBUILD mkfontdir-1.2.0.ebuild 525 BLAKE2B da1ff91cc6944859663318464af73ec29db0c4fe814f43caef670d73d39296969154c1c7560f234df086de210bb12019344d3f72a11b15516c02e1ced30e1eb4 SHA512 891f5bb198e380d519f1d9694a3cc704634c3e50b6f2d59932009200d32c9b99eb8db75f6738ee9ed386ccf9e209b3bd6869dfa168f937fb7e8c851ea789f06a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild b/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
index 8e522ee26da6..f7e9dcb6a203 100644
--- a/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-1.2.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/mkfont
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-apps/mkfontscale-1.2.0"
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index cb1ccc61f07a..b2db542ec53f 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 611 BLAKE2B f5b310d1d0b983f93fb7c95d49550de2bf99a66050aec14705eeff0449b29d27b3d1bfbd159cb4bec44a2341fcfd0da4e4c2b193e150a82d6c75304959575ef5 SHA512 6518a4aa122dab6ef64fdfb62d86ad7c1bcca115303d85af205e9f943bdda01bd2675c8780dd78253b82fbcc6e831b76b4d611dd362ad1091a5dc477368289d0
+EBUILD mkfontscale-1.2.1.ebuild 608 BLAKE2B 4e448f2e06fd8529eef05f45eb68534f3111d29d33ba58c6b2dfb92f4a826359893b6c23d08cbf6756bc3e676165384573b72d9c681bc0bf94d4fb929ea17d8c SHA512 9dce7edeb2fdf77ca46d6fd1ec6d24a25505bbcb4f2aa8d884bfa0a4554a5df2ba9288e7cf2caed763ba5add2dbce6facca0f496bfbd0ae6d9ee4fd9fca54044
 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 6ab0eeb88992..bc724d1772ae 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 s390 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/x11-apps/oclock/Manifest b/x11-apps/oclock/Manifest
index 91d2b3df8f20..47debb9d9560 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 376 BLAKE2B ea28addaa552de604b3fc4e76519d6e18e9591878166015dd4f1f949bb89bd4e3551ddbe7c894d81d539a48c00e49deab97241517052ea390dae4f5b12cb6eac SHA512 2d10922f504ba7c16c3465f749b5a847673ada02d66447f47bc10638e102d68bd0f96d73ed4a878dbfa0a837336613f78510890b88f460df68f67e9dac2f528a
+EBUILD oclock-1.0.4.ebuild 373 BLAKE2B 4cd9468a09b40b337350c48dec5312720857ecb20b6429ce384a07391137c4fe88e050af83af617e77e458316c69b5ed0689dc5385b20e17f97e398e7334917e SHA512 a7208314058f577731a06d89d04accc71f18a2749bf590427476a5647f4a0b393f83fc265197f5cad54b5c3148f53b9574c78b4091e205124ba55e1dfab7283d
 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 ec6622196669..a9d5cb572755 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-2
 
 DESCRIPTION="round X clock"
 
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index 5cfa7a350d55..dda4404ac4d5 100644
--- a/x11-apps/rgb/Manifest
+++ b/x11-apps/rgb/Manifest
@@ -1,5 +1,5 @@
 DIST rgb-1.0.5.tar.bz2 130900 BLAKE2B 40675dfd862757d62cc636fe2cc3cfac25a87d863ada67e76dd9516a1607e356530b2578082b9e5cdf84d97b766c558b80f8fa919c515a5eb3da2731ac07391f SHA512 2e4ad2b0f5539375986d455b47cb5f10e50841198ee242ee430e021e9ddbffec1304259c259c7a6b7e0cd4b244ecedcb5818baac35deb4447da53c2ddba3ad43
 DIST rgb-1.0.6.tar.bz2 139225 BLAKE2B 25e20d0be23a46d869869e47169d86dd50a99bc65551bf83800119c7f9cd242f41d5ecdb611467eaf9aeba909cebbfab8f578e0a5dc63380482f324124064bb4 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e
-EBUILD rgb-1.0.5.ebuild 424 BLAKE2B cfd4ec0deea01a3f6f41c75bdaf787ac20947c69e24bff5a2aba55e66344700e354f4dcbc95884ba84cf7b693b1d41aea8b913e1589f7c6e96fbf8a733ed7811 SHA512 ec67443d68880c7255a2c00104a4fabff834ce1ed98e804a20d3238a2afc01828cf959437bdd359da801597146bdb3001ab7ff57d1b565c8517f14c3300c39d6
-EBUILD rgb-1.0.6.ebuild 451 BLAKE2B 3093c830451371aeb43b8640e670ab0e29429e11cf8d67a4e785b07c64ad31ff93f7edb8b33d558484385b3e5180a5053364b150d543248a612511aa0da174ab SHA512 cc460b68859c5c5a5c8ec0570d3c28d6f14276b54af273a817e66885cc4771f888dbd7519d1dd856eccfa5f605c87e35c50bb75bdf94f36b8d5a0123dd788796
+EBUILD rgb-1.0.5.ebuild 421 BLAKE2B 3e16368b4795afacc3aad5601b562419c6eee6cd61108b872763733ee8d73549ea1a5f9386de94dbc02d5972ab360f1bce2b36042b117838a513ec2f1efd6f81 SHA512 c791de01b06a977b2dd5028f1805e22de6bde5e0d6a3031290669189503216173d7e94538ce7e5c7bdc3ad4154d2a3b21a89de713360b4d088a1bd34912a3bbb
+EBUILD rgb-1.0.6.ebuild 448 BLAKE2B 420cab1dc350afb4101f5a10a0ef0b017ea43a399bbf7f8882120ffb66073166755b9e14830b3353ad99d37900d62b3445af05d80df18d27fe361b73d583e91e SHA512 4ef1435859cd5769930ae9f01213a388054020ab1e0fb2f25c00313a3ca2c56c5f63a401f2161553534d6e195b8030366dd9cb76174f88cd087e5eeafa4499c1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/rgb/rgb-1.0.5.ebuild b/x11-apps/rgb/rgb-1.0.5.ebuild
index 81fb483e8bb9..88f8ee04ddb2 100644
--- a/x11-apps/rgb/rgb-1.0.5.ebuild
+++ b/x11-apps/rgb/rgb-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="uncompile an rgb color-name database"
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild
index 6e7121089ba0..eacedba4da71 100644
--- a/x11-apps/rgb/rgb-1.0.6.ebuild
+++ b/x11-apps/rgb/rgb-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="uncompile an rgb color-name database"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-apps/rstart/Manifest b/x11-apps/rstart/Manifest
index ff0d2177a5d6..35276ee3c62a 100644
--- a/x11-apps/rstart/Manifest
+++ b/x11-apps/rstart/Manifest
@@ -1,3 +1,3 @@
 DIST rstart-1.0.5.tar.bz2 144607 BLAKE2B 2048877683a5a1c1d07bb68d8814cea2a0e1755d7cea3f40b62c086a7f2e8ea2582eea81db46117f906f998bc830f50c437188131584d07fbb68730bfe2491ae SHA512 bda43dd29f95ba5ea4ab42e78069c4011afc6987d00dc580250aec8bec217fabb67577a3038607468de1739d54da596a43cea4c1f5be72e3e572ae6d5abbc09a
-EBUILD rstart-1.0.5-r1.ebuild 287 BLAKE2B d5bdf212f2302d07120132a927ee0e9117550ad422fbea366a81f55d9a162605874a9abcbf47af49810575083abde0d22a226f0dd66391b93c0d25ae1becae6f SHA512 727d5b2ee44db51acd11359df546df21e54ca35f601989fdb0a0b35c8765f5ad2c050f10b50936e5e8e15fd30c48e74ad4f050f5ce9c473fdf41129590a9d842
+EBUILD rstart-1.0.5-r1.ebuild 280 BLAKE2B d5056eb1cfb5a4f8ae0a038af8c7504d57a069a565500022abaacb9bae713b129066bb66ae679940298ded4443884a9a290db48500d3d55f12b4b9d132127c36 SHA512 d4bd3618d942b338215a298a6044e78364e31271546ebc0248f61554883be23012d4bd129e9df202e2dcd0d3320b9588225ac8e0ea416c4766b41e00e66aee6b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/rstart/rstart-1.0.5-r1.ebuild b/x11-apps/rstart/rstart-1.0.5-r1.ebuild
index 86908b7e7f16..327b30687d9b 100644
--- a/x11-apps/rstart/rstart-1.0.5-r1.ebuild
+++ b/x11-apps/rstart/rstart-1.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 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.Org rstart application"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-apps/scripts/Manifest b/x11-apps/scripts/Manifest
index ddd612d06b59..9b2f18ceae7f 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 491 BLAKE2B d1570d6bbb745bba81ce2c8ff33b04fa3b36e218640c127d81bc575a156ecc42c849ba095ab9df202d0c6d1486175dc7cd217c2c187b534ad5d5025259ea275f SHA512 3fb275411ddaa3ad7549a2baa1bbbe0524dd3ddaa4460dbe8cdcc6458c521382bc5c1151321df38c9446338a886d702badea406888d34df1d2d17ce95fbb9edd
+EBUILD scripts-1.0.1-r1.ebuild 485 BLAKE2B c62cb4e2037c72184ee99ae01567de1cf893d1f2c1b671ee59d2870684127f1254bcef9f5453454a0c06917eab7328d363e20b202eef0d19f3be7ebe4f9dd74b SHA512 cdc8b0b38325ee45db8c497917b16ef14a93fecb9d7c8dba8d18c66cc29757416de8d0503abd76c44c5c457073dad3804adfe3a095fa8d90c279e3e95bcaedff
 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 064806f4a2fe..b17baaf949dd 100644
--- a/x11-apps/scripts/scripts-1.0.1-r1.ebuild
+++ b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ XORG_STATIC="no"
 inherit xorg-2
 
 DESCRIPTION="start an X program on a remote machine"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/sessreg/Manifest b/x11-apps/sessreg/Manifest
index 6d3c0e24642a..33a430dbe4ac 100644
--- a/x11-apps/sessreg/Manifest
+++ b/x11-apps/sessreg/Manifest
@@ -1,3 +1,3 @@
 DIST sessreg-1.1.2.tar.bz2 137612 BLAKE2B 0fe6484b83255bc2b917645ea841ad43b927131a8ef3fa9a47e7864984259140579c462c8d03645928ffd4667e7c46f36c5eb1aa35ce916ab65126c55f6bdde1 SHA512 7e3c2bdcadb7133aace463b58d8c6108d315ec95d2a42509073eeddc7f02644092a4b3168bd3b426c041736a016291092e0bf8368acd620dbeff96d53d12f98c
-EBUILD sessreg-1.1.2.ebuild 332 BLAKE2B 0df2664d4dcca86087562dcac1702370c2b8ff308d4df0bafea981d8265fb4a0fa8d955c7b71dfea3378edfb4443fc551dd8d257ca028bc7295d8b94cf29f0ea SHA512 31ddfd271b5988ca5592c404a530396dd82e8310ac84705d3d0f9c0cff3ff98712c8381ebda976a2ac137ae77417f81d0bc343cd6280ec4101b67cba21a4fe43
+EBUILD sessreg-1.1.2.ebuild 329 BLAKE2B 2d28fc78b34b54ef4b59a09efeda69ac61ddfb8e020c2f35ebbce5b72b745981d1c2a61dfcf5f11b50304fa226d2b2298afc578363d85d1d4a8ce9739b0f11cc SHA512 f216c6b13d4a6293e5ae55e753d210025328a72d61f5d68a02613affd1c1d4067bc8ddd7f46f6b0e8673e08885bd07f10c0749a62f767d715d0e1834d2c2da0a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/sessreg/sessreg-1.1.2.ebuild b/x11-apps/sessreg/sessreg-1.1.2.ebuild
index b6c45b91d440..a6a78f081e0b 100644
--- a/x11-apps/sessreg/sessreg-1.1.2.ebuild
+++ b/x11-apps/sessreg/sessreg-1.1.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="manage utmp/wtmp entries for non-init clients"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index 7fab1e66fd82..e2831c12ec8b 100644
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1,3 +1,3 @@
 DIST setxkbmap-1.3.2.tar.bz2 136253 BLAKE2B 0c7ee234ec39546812ed2cf4f57f20f8c5078a3193ad39ce948660ca870ef0b625a8bb7e90e9a9e8b567d6d023f45f62856a6e1b44d8bfd04a1c0fe1a6d9830f SHA512 bfa8015dee0d8d3fdbbd89afbd71c8606ce168d6edca8521d5ed05a00fecbea39bc4bfcce84b71458bdeb34c60bd80a5df27e0691ccee3966443ecdc937faf38
-EBUILD setxkbmap-1.3.2.ebuild 463 BLAKE2B 7a12aff9f1d6ad70d6624f67ab1c8e5b4bad260c80ce6160180103bc6aca344eff29223f91c5cd7bbf70ee68fde7034a264290d59055677f095add3e5b4f6537 SHA512 ea0397221af93b7b00569be080161110201fe28634c115d6aff09e44bc6db0701acc9e132e2d9291397945e91636579233eb625b301051b9f87efb6f5c602f63
+EBUILD setxkbmap-1.3.2.ebuild 460 BLAKE2B 12948765364662b0ef6e2431455f549cbe546498772fbaf4bf6b5bbecc438d163b08a818ec26bb320390d90ac561cde5c9bc01979c559b252f5138adbb7b012c SHA512 f5bd8e51ba116135d42ff77c44c3b6890e34ec4fff9887dcecd2b4ad234949c056273fb94c48d144bcc559c176d8a6e7c1382f7c019d9cd667d7d54b8d4789bc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
index 695168e72fd3..642bb5c3cdad 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Controls the keyboard layout of a running X server"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 COMMON_DEPEND="
 	x11-libs/libxkbfile
diff --git a/x11-apps/showfont/Manifest b/x11-apps/showfont/Manifest
index 2904ec970b4a..e15c83a3eeea 100644
--- a/x11-apps/showfont/Manifest
+++ b/x11-apps/showfont/Manifest
@@ -1,5 +1,5 @@
 DIST showfont-1.0.4.tar.bz2 118199 BLAKE2B 0784e5c6a4cb2fbff460058aac958a68d788dd65fd83dd00d3dd2b59220f1279c1cfec0f86fab79ede2888c49b18f3f3eb5e73f711dd0bebb5e868c623ece01b SHA512 5514aec3eca18f714b14b60a085e7f6edafa6f661567876cbcf965d67e90f031dd02d60cc71f8f1889b8e94c99a7f4f8adc8cb3acc1054a83dc8bc36656be0cb
 DIST showfont-1.0.5.tar.bz2 125618 BLAKE2B dd3f97e3f2dff934f1cff4bfda0f8a06be3b8549b8572f3a163dbc638fa753eb14b65e8b11e19a56e687a306f3602f99b91fc458c22543d5622f870e518b77cd SHA512 d90d6d99ca573f2632435ccfd46de606994e3792deb58bab6261ff950481ec71eef032b828da0ee5333d6946c5f54594dfb2dadf930825971d3f4baa5c0ff6fd
-EBUILD showfont-1.0.4.ebuild 287 BLAKE2B f6a60d746b3afa31f7ab112c37eaaf7805e5fac598ef0e6b6565728961e0104e8e54ab9b41078e6c4432df31bb9b872c8dcc3a38909e4cce827358e4e8c72207 SHA512 81eb2db670742a148c17c1c93ebc0701dfc70e89fd82a5d22b8f52dbdfd22e343b38bbbbbf9f54ba63d0b177236eced7b9ef5f6278b3d5695b505e64bacb1d95
-EBUILD showfont-1.0.5.ebuild 287 BLAKE2B f62d344c2003aaff25117377d4c2adf949ef75c9ff39df2b20bb3f7764b2c689bbe0df85255e3a9a7a359864d606ce9f70e6e264a9fcb5094391cf8112a8ad77 SHA512 d986bfc2c25772d1a51907d9e28d06b6a47e17f528f2263a0a8d22e7b0d9fa8d161f7eaacfb3d03f56c7ae1943372060e57c048819ea76ea0f57f9e5c2f3ed42
+EBUILD showfont-1.0.4.ebuild 280 BLAKE2B 5f3e0343da41c73d391f75e228bb094650cf91cdf537e1cbd8c7cddd92ed92f4d67994dfd2b25a58dc03aa8b88bbad4a0bc6e80ee6ff01399b66f792f08e8a3a SHA512 e78c4100e6bdb4e2c4950bea79e4e10b694208a9eabae9ae7bf22beb9f927a5b23deb2935fd2f270063d730663c488ca2361b97526e440a9cc6dbc2e8fb4727e
+EBUILD showfont-1.0.5.ebuild 280 BLAKE2B 5f3e0343da41c73d391f75e228bb094650cf91cdf537e1cbd8c7cddd92ed92f4d67994dfd2b25a58dc03aa8b88bbad4a0bc6e80ee6ff01399b66f792f08e8a3a SHA512 e78c4100e6bdb4e2c4950bea79e4e10b694208a9eabae9ae7bf22beb9f927a5b23deb2935fd2f270063d730663c488ca2361b97526e440a9cc6dbc2e8fb4727e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/showfont/showfont-1.0.4.ebuild b/x11-apps/showfont/showfont-1.0.4.ebuild
index f56371f798c3..08e95071467c 100644
--- a/x11-apps/showfont/showfont-1.0.4.ebuild
+++ b/x11-apps/showfont/showfont-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 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="font dumper for X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libFS"
diff --git a/x11-apps/showfont/showfont-1.0.5.ebuild b/x11-apps/showfont/showfont-1.0.5.ebuild
index 243b228fcca3..08e95071467c 100644
--- a/x11-apps/showfont/showfont-1.0.5.ebuild
+++ b/x11-apps/showfont/showfont-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 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="font dumper for X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libFS"
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
index 17ff781788dc..a1b950d1f2a2 100644
--- a/x11-apps/smproxy/Manifest
+++ b/x11-apps/smproxy/Manifest
@@ -1,3 +1,3 @@
 DIST smproxy-1.0.6.tar.bz2 132046 BLAKE2B b1eeba52730da79ed9f374636631c0400df997b2c5ab5ce18f1644ea6de7c55ba2914978d0b8b88f0cc455a0b5a65513fd7e29d2a374e7464fed14e007f8cf96 SHA512 4945c92c0f07c5dba5698889f415e78ce406939f4a36eb977309488c27385ce4ce04235c4e850a90a451fea8d7885ded7c6b18db71335c7731b38aaeefa9fcb7
-EBUILD smproxy-1.0.6.ebuild 317 BLAKE2B 05e22224707515a4997804c0d7551261e720eee1dcc91785ef2209d6e2dc9979b5bc2aaa39a022a39c12e73f842cdeca2faebc88a46d76a20d91b6f0533e474d SHA512 1f770e10755ee21b37f909c16e58389f87566364fe078a5b543fd8ba1dd6a339fe8080a4767b103eaab3367c1377669ae8f8cdc0dc3f165a92e7af1e84fdf986
+EBUILD smproxy-1.0.6.ebuild 314 BLAKE2B e3925572a76ea7033b377eedc4b86d44e1363dcb5daa842e495ae2f3efab10184c886277a7dd0299bea1f520f8c36e5371d20cd433bdebefbbbec78ee2bc50b1 SHA512 ac6855c5bbd57c615474dadd6c0dbcffb1c04ae921ff4f4ae1c62b0ce23d69065d7d9ba1384415f35cbd25ec3b3a1ea164403247d83c03a350f9ca3fc690573a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/smproxy/smproxy-1.0.6.ebuild b/x11-apps/smproxy/smproxy-1.0.6.ebuild
index 48aaab490ad4..7fed84bec717 100644
--- a/x11-apps/smproxy/smproxy-1.0.6.ebuild
+++ b/x11-apps/smproxy/smproxy-1.0.6.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="Session Manager Proxy"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXt
diff --git a/x11-apps/viewres/Manifest b/x11-apps/viewres/Manifest
index a9f63b768d4e..b37702888009 100644
--- a/x11-apps/viewres/Manifest
+++ b/x11-apps/viewres/Manifest
@@ -1,3 +1,3 @@
 DIST viewres-1.0.6.tar.bz2 135200 BLAKE2B 96677c7c02e56be5da7f8f9d492f22cca5c6ea83a783725fd9fd86381b00062f3b83cbdb88c4030d9f0a52ccb8f06978232adb8e5f0002db06abcb7ff6d35ac9 SHA512 3f4cfc61608bc6c9b35ef66ceb473661ca01946d3306d54040d32803e8e0eec506a0ce37ea22bfe514544a6ba9645fd30f39b20c063aff696b3c0fda3fe95dff
-EBUILD viewres-1.0.6.ebuild 364 BLAKE2B 811edb736029418d9d11fe2f93213cdb001f403a22e0ea7e177c54dbdb60150f9e4d25bdfee3a967f60d56320470f3a9238d646fcfe82da4fad6f93810f73c67 SHA512 c7fd23af5daa86df234f5eb177a0329c7eeb9b62db671d78295a0c0c9b8e4c5ea5ee6ab12ccf516d0ade0dad7386c40a68fd14f34a8e5f5b2cf89033c07eeb25
+EBUILD viewres-1.0.6.ebuild 360 BLAKE2B 4a38095c419a2a0a8637209118378ae8b4dcc2dd1446f1123562badd206db759adfd68a6673261d8600e0dfb5ad2e86c50b3e4a95b1a91d7c5e84a8f08bf17a7 SHA512 883f3c9ae076505f023c461a55089dfa92c82cbb1d75cdf10ad655e26cfaad8584d87cb096660f3dbb6d21b49e5e80c8d406846ee4bca16a12d92d37a5f3d3d3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/viewres/viewres-1.0.6.ebuild b/x11-apps/viewres/viewres-1.0.6.ebuild
index 24c0ae2fd18c..7d2094dfe9bb 100644
--- a/x11-apps/viewres/viewres-1.0.6.ebuild
+++ b/x11-apps/viewres/viewres-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ inherit xorg-3
 
 DESCRIPTION="graphical class browser for Xt"
 
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
index cff337170434..612e65feb3c3 100644
--- a/x11-apps/x11perf/Manifest
+++ b/x11-apps/x11perf/Manifest
@@ -1,3 +1,3 @@
 DIST x11perf-1.6.1.tar.bz2 189446 BLAKE2B 2a36bea5e1c9a414d9a1ce798e4f0481aeab86522c5924fb7520c0bc917b832f3e4c63c70a5430cd3fd92cac4374691a64db4542180e0917a0617bae7f783a6f SHA512 b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b
-EBUILD x11perf-1.6.1.ebuild 416 BLAKE2B ab962dc158aacc27bcbb12109c669bfe5d32803f3243a574ba7afc6644a38a7e84679c6d2e4aa36f9c9949e3cdf2d8a3535883d20b8e589aec9d1651e7b1d720 SHA512 bbe97b1982528b1c4fc0ddbee8e3c5b69cb7e7b2e0283349eb5e8140c4ea4e1554aa31b43eae5a739c324741ef08b8f4cb94d2a193cf8422cf632feb9c9b07e6
+EBUILD x11perf-1.6.1.ebuild 413 BLAKE2B 100f4a4c022bdb57c84e39f6c618a61274da1756445abedcf9176081d9ffa8637a79d9fb3ac6b4ad7bc43ae096e264bd922b47d5f770f10c43aff388d84b89b1 SHA512 4d2ba8509cdbe4261e7995eff09b38a80c6a3fee79abad2d39532e7a25c3ebfe42453594713b073e975e4a528c2f5908fcb7e2200359f305efaf3783e5e87b0a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/x11perf/x11perf-1.6.1.ebuild b/x11-apps/x11perf/x11perf-1.6.1.ebuild
index 9e8eb497233b..0f6da317c910 100644
--- a/x11-apps/x11perf/x11perf-1.6.1.ebuild
+++ b/x11-apps/x11perf/x11perf-1.6.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X rendering operation stress test utility"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index fa5c35f166ae..05aec33d1d4d 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 664 BLAKE2B 3e6c12ae07e6519d0e21cb8c67fb27ba402fc70f066fa3b720324ecbc41b06f1fdc87161da411525ec445c308d0363a62a916e80833ba605946b9c60619a7117 SHA512 63eeb514d3d7abac63492a2d8b3bd00483002c85e19be7d7cf89e6bacaff17d0e7d7fb1f8a82a39150c5b29a7dca810e2e2166ef0f4f94c848b46d8f54793bfc
-EBUILD xauth-9999.ebuild 674 BLAKE2B 16a837362e678abfbb1bbe372183a3700bbf7c2a6b4ab6e4c5f1b000cacff25a18a4624e427e2a5c702cd39725dfa8e6e87cc5f1d71380f323abbb513d2f6302 SHA512 2fad96c04fd966377ed3a738c7813c3eb5cf9f23b190bf7d5d23bfa717aaa29e173de7256c3c1e825f0be4712f5e32bf714b7f33ff77fbd92e1c231f64ae8f93
+EBUILD xauth-1.1.ebuild 661 BLAKE2B 2b5ff1093ae0554947872c5b52d374d9e75cc7bbff0c55e6f156a74c5bab6c2c02d23918778d3ca45835b56658cee531982583a7f407679e663f7dacf5aec007 SHA512 432af5fd00341e8c81a8b82c366e604e491dc037ccd704cb5a05f8ad485f3d2ec159e8db7bb654d2172c723564cd0bc1a7520d37d09f3508e688745a7e9bb9d5
+EBUILD xauth-9999.ebuild 670 BLAKE2B 2596b147bd26f4a4e63585455990c5070df6ab99d47dec64cc3c803458f681b8e43c70048aa3200f5948118ec699ec98ac6b7bcf6c001c3a4085e1e0abe4ed9d SHA512 c7a074fa9f8215a314437a21c064c364a1c1a518272d2449975013f92d71782ea7369eba9a964b55896c854cce1421c4db66c7b7ce2e7e65bfd5701f81bf0d27
 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 3aed6ad960ad..838c880146d3 100644
--- a/x11-apps/xauth/xauth-1.1.ebuild
+++ b/x11-apps/xauth/xauth-1.1.ebuild
@@ -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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="X authority file utility"
diff --git a/x11-apps/xauth/xauth-9999.ebuild b/x11-apps/xauth/xauth-9999.ebuild
index 17995a9945a6..303aa1063e26 100644
--- a/x11-apps/xauth/xauth-9999.ebuild
+++ b/x11-apps/xauth/xauth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="X authority file utility"
diff --git a/x11-apps/xbacklight/Manifest b/x11-apps/xbacklight/Manifest
index 4dd90c4950c4..a5fd884cbd67 100644
--- a/x11-apps/xbacklight/Manifest
+++ b/x11-apps/xbacklight/Manifest
@@ -1,3 +1,3 @@
 DIST xbacklight-1.2.3.tar.bz2 124611 BLAKE2B 19355773b2b2bc491cb3682d9d02fed462d30ed21742dfb9f7398ec39e85bde4fdd1b60bc8b4ac2a2d32410016186c1f1e5d45904fb19358bcc16eee69242dbf SHA512 717c87ce24634892fc4ac54fc59dcc0a5bc8f206aaf1d13410f95f7e4fe6e3dbc7ff8d951bcd8ea8c5e955357a00fea6ceadd4559e60b1a632e40f71290e12c7
-EBUILD xbacklight-1.2.3.ebuild 367 BLAKE2B dc94742b4e8e03013dac4345f271e9521c7eadae9527e1df12cb4db63631a15951dfc852dd161c6cdfac44ffe9b38e495f2dd69cc7461db3c57d1ab3fccd8272 SHA512 737b39f84265663fd4c94111f975901c395c35f77223074a093b6aa01c9140489d23d93ceff44e96c33924f650269a8607d5db6c94a87869fc695a4e1bd5ad57
+EBUILD xbacklight-1.2.3.ebuild 364 BLAKE2B 019454cca6379cc64f4ffca4fd27447632c998df288a5d05c763b5b27d70c97e9caa93e91555c87132888c3b5533ba925d7cec9f158a1c4efbc1a4a1cbe4a42d SHA512 c5296f5ec9e769b4d9353711ee42bead4cab954e4bb3a05696a7f82cdae199a2cea27670abbcebea6be3eb2c96b6c7e990d3273468f3ebc22ab08472533bc42c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xbacklight/xbacklight-1.2.3.ebuild b/x11-apps/xbacklight/xbacklight-1.2.3.ebuild
index a2e17e103c28..668ddacd2404 100644
--- a/x11-apps/xbacklight/xbacklight-1.2.3.ebuild
+++ b/x11-apps/xbacklight/xbacklight-1.2.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libxcb
diff --git a/x11-apps/xbiff/Manifest b/x11-apps/xbiff/Manifest
index 198b11e8409b..808a282673a4 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 371 BLAKE2B 2606386f5514d2b3420d8aef51ec0f123c53572d87510db62eeceb4192f6ca7d4c9549f83ce24106a3129d5debcad42ed48c68e4ae1d281eb1d1a62d34a7a217 SHA512 51f6f0b8cef8b354c2d73bca94e067eef81aa3ce97f90f8cbcabdc2a0433f0c86cffe264ef241a523daefe0f306ff1333ef4c6f8120104780e358f500ff72873
+EBUILD xbiff-1.0.4.ebuild 367 BLAKE2B 785577455728f957c688ed502c90d26351102004a42754cc077d88498808fdd5782e442db3d09251feab7962ee7b1a10b9684f7753a2ec51deec91be3a914ee6 SHA512 8e3e18477822b9ab754f07921153e9684fbcc81cfbf1cc1615b4006f08441bd5f6e38da024175daffcdcf1a8215eda96f7970890fb2c9a0d21a3e75e5b41fb8b
 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 1af59d9a8791..0b6a68e3cc45 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xcalc/Manifest b/x11-apps/xcalc/Manifest
index 5481fcecebeb..144ffacf25f3 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 406 BLAKE2B 8bc4fc840eb4de44613ac5029680c74cc7bed195845bf289a1f7abc72e98d3f67bff94ad109e2fd30416023a710c872cdcf8a6d1e81c9776d4f9ef8e89fb2c95 SHA512 c6add08190d922d7c08445fa365ee1a8d73fe9279a7ecf7528c6eae06656b82285a8270ac84e20c82baa6f7c76c77614843a5c1b772d032f335558ed418603ef
+EBUILD xcalc-1.1.0.ebuild 402 BLAKE2B 1148fae9eb28c533c5d9a10b6cdd654ac01d8078a44ca306d171d9616e278286142c2a966153aff448fc02fbf534e1d0f16252f44ef6123b3cadafde60049907 SHA512 5e0df98c86755490f208d7d553fc200033822ab6e063611be42520d6c84d72d15d97a7262c9061fcb60b37e478912b84495d63b1f84ef69102f4ee813fdbd8bf
 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 9a39ab1d1a54..dc5407baad17 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 hppa ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
index 0bd17a3b384e..4a8515511cd7 100644
--- a/x11-apps/xclipboard/Manifest
+++ b/x11-apps/xclipboard/Manifest
@@ -1,3 +1,3 @@
 DIST xclipboard-1.1.3.tar.bz2 132406 BLAKE2B 5e2e77a297c32884cadc4bf6e4503a958218b11083c747a575bb05dd8218fd0759edcab5c8d12055f5b0a1875e8a2cfb6b2062795580358521b619ecca8d70d8 SHA512 84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e
-EBUILD xclipboard-1.1.3.ebuild 384 BLAKE2B 9457fae748bf2e9bc66ab3f0af8522b84927b8e111bfd0daefffcf2b958b5df6b32f1d443f2085458dff85ba7b491e2489fce485fdbeeeb45b1d7fff8e4c0812 SHA512 d21cd259cf4d9cfab13ad5f0427524fceab1dad3bc2e053d86d63db8beeea5b25daca0c4d20d388b7fb15442229e34852d2508e1e04d3458fb9b86339a0679b4
+EBUILD xclipboard-1.1.3.ebuild 377 BLAKE2B 5ce80a21c34a6f53a6fd0e1ba6400f4d2599434ff9ccf9e4291ca263462bf70d2be54334f25ef5d65a8b2ee1e580cea99568b8b63528278fca5e3b6b742944c2 SHA512 3afbdf0ae7dc4be9577eeef211a7712903efc74b3350e4b2436ca83920cd869b8e503345f2a388511fb1516766882761eeefe0c52867cccb6bd4be9ddef90a48
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xclipboard/xclipboard-1.1.3.ebuild b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
index ea1227fbb323..cc1fab54564d 100644
--- a/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
+++ b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 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="interchange between cut buffer and selection"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libXaw
 	x11-libs/libxkbfile
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index 01be027c6ab2..8fc67a0d571c 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 482 BLAKE2B 43fafeca91a831e2fb4d3dc82185b2268a0c8cec0b44fdd4b053821b8738d7559c36096affbf2874ae15671a2c5045eab7108b635699e34af5a424e43d743dff SHA512 e69ef331896f35dfbeaf5e7b6abf377b7eaed61a2a6faac50cae5e0c54eaa6d158db4ef3d215c8accbc604f882f963f347cb7d3b9965f753a30ac623c4ef30da
+EBUILD xclock-1.0.9.ebuild 479 BLAKE2B 49ae40de1043393816035f2fdb19800af68664321e06582849ae4476195816fbbd5f80f5640940358bd9fb6420c2a279f992326ce9413074e2486bd1b8ccd707 SHA512 ef40ac36edece82f612cbb39a2014cf97702e0a89215ed785513dfc42339f870e80ad05db8f167f8e2c0cf8f18c542366c1f6a884405c108f1372e90517796be
 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 cbb54bc42553..89ef3b08f8d5 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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
index 8f512310ecb4..b33ea5fae482 100644
--- a/x11-apps/xcmsdb/Manifest
+++ b/x11-apps/xcmsdb/Manifest
@@ -1,3 +1,3 @@
 DIST xcmsdb-1.0.5.tar.bz2 145419 BLAKE2B 41269ca270e4b11838f54669900a074dfbbc7339af84db8638498e220eb7abac2fe055ca003dba326babf368d26137eabc0f0bae9f69233d9c91f7e727c3ba30 SHA512 e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4
-EBUILD xcmsdb-1.0.5.ebuild 347 BLAKE2B a3c48a0e53791f912f32f45bb3d8d0a343f62222bda2bc248cbb5a8249ac3917d53e65e100ca40c922f13b8bd127716c09c03f65152ee701ddf86db2b58a61ca SHA512 07c610904098dec046105572600964dfb7a7c39d42f514cc6f9ac1f4d79d1b9379eddf4e2fbc6c3a744067b96213e17e99d7e94413587722b80f9e203b3f918d
+EBUILD xcmsdb-1.0.5.ebuild 344 BLAKE2B 1a767947c9312339edaf7709091a7ed7781816e62b3499bd87336bb7e9cfe772380cd6d66e6843c7349c98a8d925642e0acdc7f6724b7bf3c7f1a86ec1f3a542 SHA512 70cb55f4d0ccec85516b215d3f798ab21b12583031df9f4027009e8bf7201a4f5f84c887dfa38d58ab1b1f67d48b7d9e3377101c37e95729e2093bc243d6e27e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
index db5e636725e7..83111e838c52 100644
--- a/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
@@ -6,7 +6,7 @@ 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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xconsole/Manifest b/x11-apps/xconsole/Manifest
index 3b71b6873340..94807e7f3ce1 100644
--- a/x11-apps/xconsole/Manifest
+++ b/x11-apps/xconsole/Manifest
@@ -1,3 +1,3 @@
 DIST xconsole-1.0.7.tar.bz2 134832 BLAKE2B 20f9729d0aad2aceb1c7197b2ae45f65088dc39fb5980eb41a39935fb180ee7181c560ef180b0413b28adf36882a13fbdbd454d8b6dbb0cc06f69632f903b546 SHA512 89f391058ea99904587bd1dac9e31fa3ff06cf63b899abe6c06e4897bbc9919500dd4773873b1a452de4f54cc6999bd496022b6d8df9d4147804448abbdca2f9
-EBUILD xconsole-1.0.7.ebuild 367 BLAKE2B 253aee6bbb92dcfd6c49e08b44c92d0c45b336407715238d04c0c20323489e3077ddd436b864e24cc01336d06ed6fa8e59cf7d727a2e4667c517a4fad6910a9a SHA512 ca163e4be977180c4a6757a705fbe20593222916b3e243e721b45c72667cd8d59e68d39c589e903bc14854eee62b45db5d704401f0527c0e66f4fef91729b007
+EBUILD xconsole-1.0.7.ebuild 364 BLAKE2B 5f23220cdc7e9fa5028f3730bf545384d1e81416ec32f235213255ef9b83e4ed96c6c04a7281a234a3c2b7d9d600a7debe4ba1c60ea535f8827a632ff6573863 SHA512 7578b57020a064356f71c76a0adf71176785fe4c0fce8bc163189f3d42574884ad4c84d3a86d9b3505addd1f3cae5c1ca73b6d7a87d20763f96303492864d210
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xconsole/xconsole-1.0.7.ebuild b/x11-apps/xconsole/xconsole-1.0.7.ebuild
index 405e37d4a9b7..39113597af60 100644
--- a/x11-apps/xconsole/xconsole-1.0.7.ebuild
+++ b/x11-apps/xconsole/xconsole-1.0.7.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="monitor system console messages with X"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXmu
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
index 8e50a47aad41..ac9f1f398caa 100644
--- a/x11-apps/xcursorgen/Manifest
+++ b/x11-apps/xcursorgen/Manifest
@@ -1,3 +1,3 @@
 DIST xcursorgen-1.0.7.tar.bz2 128102 BLAKE2B d4e583e0183e23d1a127d367e520027bb36dad44306dc2848717f2d25ea3cb656a7cd95fd02a18522911a720319126eed07637e1809b868f1f85c74773a10c35 SHA512 bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2
-EBUILD xcursorgen-1.0.7.ebuild 377 BLAKE2B 92bf75df562b92d745545b9f839d639fc375f5c9afab09a24eb82c0b0b692928539ea0e4742f8d9928b855e82ad8e9bcd5cd4807014f7608d9e5784948b381ec SHA512 7eae49310cdb5112d28eb259fb71380eef4b69ca81b29331281323719cea2aa31b714f6fae13bc24c10b174308dedd8d27cc9f9c4b0855952059139da09ac439
+EBUILD xcursorgen-1.0.7.ebuild 374 BLAKE2B 05b410a67e3178d8783ffe0de16ae5ab1791a49428551f67a0ae26fd714780647c127f0729330677d474537f1e83f77eecf67d1dbd1216428c92ab37616818fc SHA512 085ac4a7d4a60d133a2d3be786d21a911b9c368d01c75bd045323b231a4fe0786cf14c1ce3076d1c2384bb0bfc1a75aefa14e1aac5772163a1ab3e2695f938ff
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
index bbceb1211592..ef020abd8219 100644
--- a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
@@ -6,7 +6,7 @@ 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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xdbedizzy/Manifest b/x11-apps/xdbedizzy/Manifest
index 96eed3826bab..3f9adb7ff850 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 328 BLAKE2B bd5088b4b6129f6c455ff042f9d8377ba794e68e78eed5238e588ac01425912b8aad9162161f5965d4abbfa6c0c1d254fe5211aed4b02def8c6b67de12f5c9a8 SHA512 2872aeca7b00117c79c3ef86a1b9039164e60620c489a64a4850607df5c8ef63bb6bc06abc57b0f03df4aa14adf97351eca108e582f9384c0ec42902f09a7ca1
+EBUILD xdbedizzy-1.1.0.ebuild 322 BLAKE2B d60f6c38e58455bd95a73c67b8d7b46eb5b159af59742a0431745b5c10f9bd653cdf238cdbc12123b1f29a6ae09423711096446eeaef69297d15724ac93ba583 SHA512 4a94814a7c1489b3dc4adb6f26888056208cf5cb5f163d8b4f214c19a3de962a216029960d670ad97712821236a622c13439115c5058072f9316043c1235c844
 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 8df4f1fe96fc..8c5f6233c354 100644
--- a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
+++ b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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.Org xdbedizzy application"
-KEYWORDS="amd64 arm ~mips ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 s390 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xditview/Manifest b/x11-apps/xditview/Manifest
index 69919ca1a9ca..d8ab59f51321 100644
--- a/x11-apps/xditview/Manifest
+++ b/x11-apps/xditview/Manifest
@@ -1,3 +1,3 @@
 DIST xditview-1.0.5.tar.bz2 151313 BLAKE2B 53d96b874230dde6f4f13a7a61420e1b9da86fea18e49e7084212353d9de64aab30bda6bc790282127af961db66873d6fafec1f6c7a986776c30eaad260ad98f SHA512 e20c903f38394b496111267e142d84d11e69a3b89f91869652d1f2ee5c997a13f90bfa2966651b42cd3979a330b348a6e397cc6a74c45b1f3f91643e7c06765d
-EBUILD xditview-1.0.5.ebuild 333 BLAKE2B e436f227e6014c2098826172621797239adfa1db091ec54722f6a724fd2962e948c74a53befc2135d55a5d2cc2226a0a1ed39aece0e167c68f0f8752fcb9b9f7 SHA512 877876a1e4b69b84be0b9068100dcb4456b9b0dcda1a950e47d8b0a94837c653748f3a2308f9ebf78509e51b6481c1fedd77e25a9d67120782c0662c78c86a14
+EBUILD xditview-1.0.5.ebuild 329 BLAKE2B f87d493dcec9d4fcd8141184842ad72b41c9f8cfa0d7bd0ff9e4f6bf800f7a6352769e76118367970c87b2f446724bd07a11386510fb9d12058bf8f0415cdf0c SHA512 714e3939ef8c59b98e4b757cd2c50cdf91b698f5b41ba147424ae811bc1773aedab9bf08d69e77348011b50cf9ef658dbb8aa693218cea7b96547409f0bf063f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xditview/xditview-1.0.5.ebuild b/x11-apps/xditview/xditview-1.0.5.ebuild
index 8e1bf38f2a17..903af98add2f 100644
--- a/x11-apps/xditview/xditview-1.0.5.ebuild
+++ b/x11-apps/xditview/xditview-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="display ditroff output"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index f9590735c14b..d0258899f8f8 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 1936 BLAKE2B 13bd3c3e0e2c2b9047facd85a29af95344d1811f93d2f7159a9d51860ce69f3dadf093d076f62a9d0fab6c1f148f1016df08ab7b1a02042da89f6d834c3741f9 SHA512 c12792c3d4f425a2ae4b378daa9bfb429cd01a01c928b45042f8eaa0eb7ceaa03c949727bb1d46d72b525edba56a6671a57c302c8a8dda5431c07dbc7dba4e7c
+EBUILD xdm-1.1.12.ebuild 1885 BLAKE2B e215d8aee0f28ab93ec6217000bb6e20e8dad32851ec57ece5836e7febe7f4b6ffce071094be0c09dcba895df3f787efe4f3ffffddf9fc42e51768a9307a66ee SHA512 f3f50ad1d6c6c66ec4678258fcd8fd2726121bd632214686c4d1748a39f20d68adbb426f547767d1fc6fa9e7b895e02ba568b95fffad1691dc2249c0f473b58e
 MISC metadata.xml 345 BLAKE2B 18769beab9cc2a2a845351093c2e356c62bff79141960846a980da0132fae2e761ef45822fcf7a5a563a794ac3449870ddba2600f3d60171e83319c1687a6dfb SHA512 114ab21e12a92854e6d676e84f439518480445aa06b7c9fa94dfba827b51732895f0b4a50c16994c87441ddefab01f2f50955767ca30305e8650df9789132c5a
diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild
index 0013a5a081de..aded17291516 100644
--- a/x11-apps/xdm/xdm-1.1.12.ebuild
+++ b/x11-apps/xdm/xdm-1.1.12.ebuild
@@ -11,7 +11,7 @@ DEFAULTVT=vt7
 
 DESCRIPTION="X.Org xdm application"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="consolekit ipv6 pam systemd truetype xinerama xpm"
 
 RDEPEND="
@@ -36,8 +36,7 @@ RDEPEND="
 	xpm? ( x11-libs/libXpm )
 	elibc_glibc? ( dev-libs/libbsd )"
 DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	consolekit? ( !=sys-auth/pambase-20101024-r1 )"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	PATCHES=(
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index 67b46e91fcd0..a6c66ad7a806 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,5 +1,5 @@
 DIST xdpyinfo-1.3.1.tar.bz2 136412 BLAKE2B 6c9750a0c9690f6c5cebf3551f6ed77b4504e1ec31685c698abb5963b571d214d4647f3b1b11837e3df645becc468bd9f0275616527519693011d7e3168051a3 SHA512 1d9f5948f04bf555181f7989bd25dd4559226f757a8452493cfa7ba0ed33112502df28ea702e48c384e801360ea1b6374a1e3f626bd56b7a855016c12b7ad927
 DIST xdpyinfo-1.3.2.tar.bz2 141351 BLAKE2B b2dee4f424dee902c31430b8843c14d6836508ee0125db7de41f5e9faef1732dea571e90b37638cc90dabd3995a0ceb5e4094707138b7e066ee1ae856258503c SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d
-EBUILD xdpyinfo-1.3.1.ebuild 773 BLAKE2B 07620fcecfed691e09906b0d5f022b1fd4b1f8e569ed08e96ed9645ca8104235aecc0f0d95b93caae2ce3471243bc7f88ead6f67932d6f548ceecee78f959749 SHA512 4e41d92b803200334fc1a1d95f11376753e1b8dd153635583a39e47822657bb55bf705e80c38f297bee3ecef10a77fe900393ac666816f33b5d4d2c281a4d315
-EBUILD xdpyinfo-1.3.2.ebuild 773 BLAKE2B 07620fcecfed691e09906b0d5f022b1fd4b1f8e569ed08e96ed9645ca8104235aecc0f0d95b93caae2ce3471243bc7f88ead6f67932d6f548ceecee78f959749 SHA512 4e41d92b803200334fc1a1d95f11376753e1b8dd153635583a39e47822657bb55bf705e80c38f297bee3ecef10a77fe900393ac666816f33b5d4d2c281a4d315
+EBUILD xdpyinfo-1.3.1.ebuild 770 BLAKE2B c0d25e2b7713d6b2dabe70ca563c9f766ca7d3e01c3594d0b6e24f5b3b685122a1c0f9632883a78b67f22e4be36d47d169a93ebec2ee4101923aa29b6e92fc8d SHA512 3a22f19002266c5de95025ecdc1684315d7df4e7b3868c7d33e23674b7bc52f614767dd94e4dd40f5559c616a528867f84b7c8744e3c891cca178b50d684844e
+EBUILD xdpyinfo-1.3.2.ebuild 770 BLAKE2B c0d25e2b7713d6b2dabe70ca563c9f766ca7d3e01c3594d0b6e24f5b3b685122a1c0f9632883a78b67f22e4be36d47d169a93ebec2ee4101923aa29b6e92fc8d SHA512 3a22f19002266c5de95025ecdc1684315d7df4e7b3868c7d33e23674b7bc52f614767dd94e4dd40f5559c616a528867f84b7c8744e3c891cca178b50d684844e
 MISC metadata.xml 347 BLAKE2B 0496b148ad07710139de96e153b80e6035e6731a18d6e8a4dce75dd17bdfc54ad77276f1f82791393d198e96c9306f464dbce832b4d643b6285fb9a6d92e6261 SHA512 98174497a1f55be4b14d769ec110dafd63a8942eb8f51e2953237b76705128e47bd36a39b9c25985cdd99a3b431f3d5aa856fd634b2a2fbfc1a5cc13a3826fab
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
index 9a61241b61e5..d69f224bd74b 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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
index 9a61241b61e5..d69f224bd74b 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index 567dd084c537..40aa560def16 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,5 +1,5 @@
 DIST xdriinfo-1.0.5.tar.bz2 121276 BLAKE2B c6db6dfd5ff0f5f6106f92ad42b37e18cc148d156a5e294c497f4ac84226114bcb7d7666196b4b1e1b4471108f839c03d4a2e1dc19080af0d60c5cfb10b55463 SHA512 6b7a3641f488d305f950c494464fd4b674ab3aaed5c7159d6d8ddad4587c18d680e5854bd80666444f1dee52eb4f46b45709a6d9c333593fe045c73e738524de
 DIST xdriinfo-1.0.6.tar.bz2 123636 BLAKE2B 43e15c6833ad84760c89abff272864e13b777c01796ba119fbc7fa7165ab05cf5a090cf736f618a25385b5d5a8cf2d679fbe2cd55119842fcf9e16fdb46dd549 SHA512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f
-EBUILD xdriinfo-1.0.5.ebuild 491 BLAKE2B 7c7ec017fbe3f35c5a05a2ae80a24065cfe99433d47c612faf1657963eb10b7a10938b6660c4552b0617203826a0e4b6008a783a41de3943dfe62a9e9e798c49 SHA512 dac329c94a212d8baf0301c8d7800291e182e99f5e5ae1282cc73a086b987e6ecbf4b6a722929e237024f64dbbf79dd2d8875988bf68e2ab04355b1f955d2ad9
-EBUILD xdriinfo-1.0.6.ebuild 490 BLAKE2B efd7c99057fc35186e7062e48458038b4ec61308b5021b19fc9f8730377e67ef5aa3b02342a09fece50b1d060e74bbc907d56f0ed34380e60229fc4d33e09360 SHA512 1a475f05fdc852e3f9e03541a2207703d59a3820885515441c69e827bc513a8053fe57dbe82704fb5e7345e434cf59fe3ab11de823bb437106a91a6a6618e3d9
+EBUILD xdriinfo-1.0.5.ebuild 488 BLAKE2B 8ae51a2973054db0c3b86d6d2a3686a505b391759d34fbb342f2290d5375b303119b3bd981879994a8072d71c5bfff9a22b4a4c13c76418e6ae03f9371969be6 SHA512 228b45aef3a668d593068efea63583a1d3c9462eb46785b97bdd4de39a8e7f891fad5fc545dd8ba1b9c0b21b3257fb7d188a4ba1b29f725ead4c2b6a647616f1
+EBUILD xdriinfo-1.0.6.ebuild 487 BLAKE2B 16bcb26d0f5b423b5ecf408f0a404f3d74b80e61aa31ef9c69158cd91ede416a4b3da19c2f9e9ea3f3bebf616097eb397658b01979922f5be638c2b2f4cef66a SHA512 5ad5730a20da542453e6006fc6730465d0f69ef6d12beb6d6d7de9fa1fd469636c0d273dae84f5b18ecfe15b561984127fb2a0e02cdbc1f726091d0334b40eca
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
index 6592817ee951..9fc1ba2196ef 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2 flag-o-matic multilib
 
 DESCRIPTION="query configuration information of DRI drivers"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
index 6acef9e8a7ec..7a68b4e900a3 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.6.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2 flag-o-matic multilib
 
 DESCRIPTION="query configuration information of DRI drivers"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index db46cb7662c6..4a286e065b5b 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,3 +1,3 @@
 DIST xev-1.2.3.tar.bz2 134866 BLAKE2B 9ff8bdb1e75754a5390115d10dd5851f71b2319ad7ff02299ff28284aa23c14cd1ad3ee9eea81718ed355fc31983e4f7ec0312b31e3f86d3691bb52ebbe0cc4e SHA512 47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e
-EBUILD xev-1.2.3.ebuild 383 BLAKE2B 94118e9cc65e7859d91fc4c2b18ecf2f8da3f137db614eb98b5a18d420b8a6c3a75e1237564d00b11473e6cc9b62a84635ae05ceab61f4a59b54633aea856228 SHA512 6eb71aabc9ea367e0c34202b232a7d3640aff66c52052afbd1a90f40e96914eb4b6518876a734e3d0439c811f9b00c0200d14b6cd6b33c4cd7eae6db38d5ee0c
+EBUILD xev-1.2.3.ebuild 380 BLAKE2B 74260776f579a9b4fef66c5a5e3e4fd8ee86c2bd690846808b20db7f772533fc602b215632ca0a1161bdebc17589fd8231aeee1934a1369f38d7a85f29e3a32d SHA512 8ec4b6ea8c7a665338da71a07dd51cc9d1bde482ce26e2b5ba2f9c3179bab99cd07885e1b57bfcb0cc3c248c522a7f6c03e28d453e56fe5ea967c5a3acf63eae
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xev/xev-1.2.3.ebuild b/x11-apps/xev/xev-1.2.3.ebuild
index 3fdc73bc7373..84bc210d12b4 100644
--- a/x11-apps/xev/xev-1.2.3.ebuild
+++ b/x11-apps/xev/xev-1.2.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Print contents of X events"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
index 79a18be5fe04..2e99665899c3 100644
--- a/x11-apps/xeyes/Manifest
+++ b/x11-apps/xeyes/Manifest
@@ -1,5 +1,5 @@
 DIST xeyes-1.1.1.tar.bz2 113757 BLAKE2B eed50677718223be829fed869360dc2ed98252a2e0a335403b8e680bd5a47cb96d92a762899e46a8823a260dda4be7ae98b45208c87c80a833ab8929056df427 SHA512 3cb734239fa3180a9cc0eb2564c5a04f5e5c64ea314079c0604cebdbb821132f95a2c113dab476af8820308f0e6dbd4eac02b5da45dc2ed78a5d3ca010453618
 DIST xeyes-1.1.2.tar.bz2 133160 BLAKE2B c3f31a2df7988517e4f8903fce6b0cbfbaad01e84d89c7b9f7755eccebba95fbb8b75377644ae97f090e9f4a3a245698966e78f738275f7513f5927193b5dd19 SHA512 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0
-EBUILD xeyes-1.1.1.ebuild 454 BLAKE2B 50950e9c93e1080c8b191d2cf330b1af6aeaacba959bf66b6f21cb76eca2e367996a739b21d4a1b66d3327d32e0e7459bfb312b8e289b3bd6e54c5823d20f186 SHA512 ed1195021e693b3f52a7711a51296fe6fb7f13ab3c9f0aee9e8a6cf8aebb034606b204df156125560f0dbdda73354039d4504d32ceb4b6325ad4695c9c77b311
-EBUILD xeyes-1.1.2.ebuild 453 BLAKE2B fd8ef856d582a48d1d53741512c1aae68b74a68b39c08119434610ed6ce7cb6b35397250b5e1d1c1435402ecfe3d65666dec5e76273e0ee1b87f3659912f3559 SHA512 e78055cf7709d1f8259957e44acdb620f9458dba69003eb2dcb837901391bac8d232595e1ec16795dfb4047284377c58682aae2e62ff5b3cb175a875303406b6
+EBUILD xeyes-1.1.1.ebuild 452 BLAKE2B e99e2740d8dfd5f30393a263c09e5a59701d7aec3a5400edb3dd225413bc6ab591058bee228bff9757ad1f376468cf9a20b4fc61f94af0bcce1cb412e6ef5650 SHA512 bc8e8fa591327740bd354cbd8230aaaaab198b3cb58cba65a1c33e4e7027876d19d62b62875b38605ad2b630e0ff34ae2b72c45e4220813cf3c823066f815ef8
+EBUILD xeyes-1.1.2.ebuild 451 BLAKE2B fb2fa73ff85c4e02bddd8133922afe8c9dbf917946ef275fd61ec2af820d42b2e13fde5c52a48ebc87b01178e91e7f637e084d28b4b154ef757d815e762e8394 SHA512 4b76f8871c1384647fd7b758f310c7e8aab5b8f3d32a1a2fae87ae99d9ea42bca8cdedf7acfce497e6927fa4759af845eec670edc4e639c5ddbdefdc2538bc2b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xeyes/xeyes-1.1.1.ebuild b/x11-apps/xeyes/xeyes-1.1.1.ebuild
index 0cc9337704fb..acf3b255cb6e 100644
--- a/x11-apps/xeyes/xeyes-1.1.1.ebuild
+++ b/x11-apps/xeyes/xeyes-1.1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org xeyes application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
diff --git a/x11-apps/xeyes/xeyes-1.1.2.ebuild b/x11-apps/xeyes/xeyes-1.1.2.ebuild
index ca365c20ef15..004144f7ea0e 100644
--- a/x11-apps/xeyes/xeyes-1.1.2.ebuild
+++ b/x11-apps/xeyes/xeyes-1.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org xeyes application"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
diff --git a/x11-apps/xf86dga/Manifest b/x11-apps/xf86dga/Manifest
index 7a809de26401..0e07c2056d49 100644
--- a/x11-apps/xf86dga/Manifest
+++ b/x11-apps/xf86dga/Manifest
@@ -1,3 +1,3 @@
 DIST xf86dga-1.0.3.tar.bz2 104935 BLAKE2B ec294d1d1d49b57479d52e9bee834ad15eb15758d50da3d894c5236e9d94a37e2383258e2c2456ef6a6cf9f73d1332b594fc663a48dd0241cfc02be1b9157480 SHA512 18dbf9b5bbe1bb9c993c742e04e132ee22e376148a499ee159418435477221b00904f36c1a6b1063df788079a4ff5520b4d604abcafaad3b5fd391a3b2c1ec07
-EBUILD xf86dga-1.0.3.ebuild 370 BLAKE2B 0de4b20bf5fa98c2b712c2c89e68a193b99422b7b8effcefcbda35423ac3864885af02e10a228988e7dd04e934a7379268dd79723a5626711d59ee3326d7746c SHA512 7ff619560e9430b7c858100f7170207b59683a2c051a2c5c88b095b57e44d56b4fe8433e0a40542e8e4c8f5d7d341ebdec2d6cad899eda1582a7157f1f1c789f
+EBUILD xf86dga-1.0.3.ebuild 368 BLAKE2B 4512b920e220a3544c3a17c6e5899e9b002132e7b26b9956b5eab2c6491a220e54a4faf13a719510d7593f582ff75b48bb0ecd327fdb7acefa0739a96bc5a816 SHA512 e0af01ab28d9e4bc640e822d8fda9f565b0c721bdcd67adcc5e7f6724614bd566efc4b977d3bcf4db0e6e0e6609a567102c33f6e281b795a097ba99c0f6088cb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
index 6b27b8eaf4cd..d4d2b003ccaa 100644
--- a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
+++ b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Test program for the XFree86-DGA extension"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xfd/Manifest b/x11-apps/xfd/Manifest
index ea876d9791d1..bd34d387e9b6 100644
--- a/x11-apps/xfd/Manifest
+++ b/x11-apps/xfd/Manifest
@@ -1,3 +1,3 @@
 DIST xfd-1.1.3.tar.bz2 141312 BLAKE2B 742b6a1fff10593252dc27aa352ac500d9a17952e0415de80ea265322cfff7ef2c4c2435005a82c12f1b50003920322cfa27dab3af30b60575d4ae7a1b20f787 SHA512 68e2d4ce5e24215353b6f3231191d69639c4dd90a703e03ccf152bbfe4012da071c387ba289f918fb0336a3be9ee49dc05cbec7273fa85f5e476ead7e10795f0
-EBUILD xfd-1.1.3.ebuild 447 BLAKE2B 573777f1ad73718bdcc73afbd5659340a4483bf0bbf4e58b5a5c2574f9b2df982094e32658c628e708f673869ac98da03ae19a3e1f803b812644ddd8cead5875 SHA512 3f09ac1316932da48928618e4e6391ebe423b0ad649f912252782873caa2f177df335e4961190152fcb6fdbf223b77f3b075e1428f6a64d94e2edeccd9e88f04
+EBUILD xfd-1.1.3.ebuild 443 BLAKE2B 0ae056dccc06fa90cbf99dfd3a81dc9fa141af1748f9aff647727cade4f91ff455556ef230670eab8e56f100ca657961aeb6858f0d0c6187bd9add27e722f21b SHA512 ef6c4a2eecfcc95c184d5e408ee05f774dfb7e5e3930dc9e30605debf09a6461be4aeee95990ae4799826da3ef6c9e0da2d7e958e8e079ad252003dcaca7582b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xfd/xfd-1.1.3.ebuild b/x11-apps/xfd/xfd-1.1.3.ebuild
index b46c4eb4ced0..4939c1bde9d4 100644
--- a/x11-apps/xfd/xfd-1.1.3.ebuild
+++ b/x11-apps/xfd/xfd-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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.Org xfd application"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND="media-libs/freetype:2
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index fe2a61ea53c5..f5dba55711fe 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,5 +1,5 @@
 DIST xfontsel-1.0.5.tar.bz2 139801 BLAKE2B dc3c9f8b893434923f414a9bb2a8608cba1eafc7ad915cbd6231763892608cebcba8147a02250719ed4fb5881389467ab375a7777f904248047d369533949713 SHA512 df7a49286b94f64c610ab990d66376dedc12e3e8fa1d803641f466c3f6ebfdd06e81e4c7be39f8e6234928305f397d877579c39cf24c319dd5deead56f2578a4
 DIST xfontsel-1.0.6.tar.bz2 146469 BLAKE2B 9773430e51e63d23086403f91fd78f6ed2e7f3abf144fda5bba171d05145026d233474e9d055b31bd498a861994c4f59af52a8101fc1e10b891ea879cb2f0bb9 SHA512 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099
-EBUILD xfontsel-1.0.5.ebuild 411 BLAKE2B 98e098736f4b733d3182c06d3a9e7b1a8255cd10a844fe35273d8a15efbf75916677d7f5e132e21798878cf12f2f2f8a3c50e9d2ad1765ee9334bdc4e6f08e77 SHA512 8dab9df80787a6fcdbf5c2dc7249b1ad20bce593336b960333ae64aa6be3d24892555af9fc442772f7bf71cab97dd696caf793b2429dedce3d592c48c20e9df2
-EBUILD xfontsel-1.0.6.ebuild 411 BLAKE2B 98e098736f4b733d3182c06d3a9e7b1a8255cd10a844fe35273d8a15efbf75916677d7f5e132e21798878cf12f2f2f8a3c50e9d2ad1765ee9334bdc4e6f08e77 SHA512 8dab9df80787a6fcdbf5c2dc7249b1ad20bce593336b960333ae64aa6be3d24892555af9fc442772f7bf71cab97dd696caf793b2429dedce3d592c48c20e9df2
+EBUILD xfontsel-1.0.5.ebuild 408 BLAKE2B edb05263c134839517f8e8225152f11cacbd43f31b6d44139416f102355d574afba703d31b7fb96f8af39910ee80d8f0786f8143d1fcbfd82276710566cbb4ed SHA512 738c3a9496e1b461ffef774c8ce2117abd2f685cc6246108af56aa9ee05bbf1aa543b21e77589a2417435a605c6879642d7c64ea37179beb8bc77dfe7b214dc2
+EBUILD xfontsel-1.0.6.ebuild 408 BLAKE2B edb05263c134839517f8e8225152f11cacbd43f31b6d44139416f102355d574afba703d31b7fb96f8af39910ee80d8f0786f8143d1fcbfd82276710566cbb4ed SHA512 738c3a9496e1b461ffef774c8ce2117abd2f685cc6246108af56aa9ee05bbf1aa543b21e77589a2417435a605c6879642d7c64ea37179beb8bc77dfe7b214dc2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xfontsel/xfontsel-1.0.5.ebuild b/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
index 5a56d5cdbe8d..0b56c5402146 100644
--- a/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
+++ b/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="point and click selection of X11 font names"
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
index 5a56d5cdbe8d..0b56c5402146 100644
--- a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
+++ b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="point and click selection of X11 font names"
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xgamma/Manifest b/x11-apps/xgamma/Manifest
index 1c0d188bf462..d907c32c77bd 100644
--- a/x11-apps/xgamma/Manifest
+++ b/x11-apps/xgamma/Manifest
@@ -1,3 +1,3 @@
 DIST xgamma-1.0.6.tar.bz2 123105 BLAKE2B fbf5496e7c91f1e96d591721bfe7a1771659e7ef408be689e205e898191e0fd6beeff9466f4eff628054aefa640e83d7a8d69de028a6a6e5716a1eee50ef0abd SHA512 2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a
-EBUILD xgamma-1.0.6.ebuild 377 BLAKE2B 4428c934c272d659f53d529d3aeacc4dcce179a2989a2d6f63470c550d1a0cc6f254e51f7e2b129bf88afe3819f7a5541fb4664ddce4d5ecaf2f8b339c779b7e SHA512 f76ccb92dc60a858198fe76598b8e9552e7421b83eafd057696b38abc5f96d44ca71f42d814edf5f51bc45490a6cfc8770cf754e30b002a07a8a39a55fbf7bdf
+EBUILD xgamma-1.0.6.ebuild 374 BLAKE2B f9b2b76277e58c0a23489ea81ec25aa3d11e542acab4b335d0303dd4da7ba91d11bf10db26fdbe9b584e1503328c7200a4ee80952186305a081c72951111f149 SHA512 48546adf433197c201c082c543713dbad7341dbb04a175da69b8c120d43d033ddf61344bfed5b7e1bfefe993418b592b1f8999092c98038e1febfb9d32eaa04c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xgamma/xgamma-1.0.6.ebuild b/x11-apps/xgamma/xgamma-1.0.6.ebuild
index 2f0c9ce0590e..e90ac74587a3 100644
--- a/x11-apps/xgamma/xgamma-1.0.6.ebuild
+++ b/x11-apps/xgamma/xgamma-1.0.6.ebuild
@@ -6,7 +6,7 @@ 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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXxf86vm
diff --git a/x11-apps/xgc/Manifest b/x11-apps/xgc/Manifest
index 84b4909b7c33..d504ce11fca3 100644
--- a/x11-apps/xgc/Manifest
+++ b/x11-apps/xgc/Manifest
@@ -1,5 +1,5 @@
 DIST xgc-1.0.4.tar.bz2 180138 BLAKE2B 97082987e557963e714b5ec96c3d1106e9ecdc7d832f948c8205965363968b6db9de81229b126cb6f9098dd9ee0c00b353022410b88fb73cce8d382ddafc15d8 SHA512 c2156eb1c6dcc838d9b21ac9e45b188a92dadc991875c3c9497a18bae36212c01cf4c2c6df04830664da4e010880d2d84663e00aaa5e17082211ba969d480390
 DIST xgc-1.0.5.tar.bz2 188307 BLAKE2B 8e3906ee07898c1382c692d3ccb7541de40be55dbc88c0ed40ab3e78a638c6e475bf38f3a34d626507d34270208cc59cb7bdf727869c9907a00fca6280b5b39e SHA512 5943d13b9e0ed5e1b66d26eaa4b39d16d71f0df23e3ea93bfc397b6303516b161c2b60b24679ed75b640bf2493e66682d35efc7cedd41c5b57caa65f309a8314
-EBUILD xgc-1.0.4.ebuild 295 BLAKE2B 22b75507cb7b86671de72cf52f7a361bdfd1cbecaf7dd18b48d338b0bc78394f0b29bbe4ef1ce93889f97e940e1e19f7bc3fe00567d157053fc660188416bfd2 SHA512 a5fe8f1469d87a4769115ee00d8f02cc411c10162948d723d09ff955484ed5947abc17a56c709c226483b3758c0c6ab99d1f7caf1299a4302fc56fc6676a2dd5
-EBUILD xgc-1.0.5.ebuild 295 BLAKE2B 431940ad82b2217910cc5ccffa388c48689eb6cab6a7b5d9bd7a97fe1a60d431bea4403eca05ee62eb9339f50fbb25063b730a083df4cd9dadaee6b7344c5cdd SHA512 06a08a39dabc55efb191f7a60e83fe0fcb3d8e876e11297d321f23d31ad374f1d2a1c7c587cf33a478b5f8ab7a1304077479141bbda23475112c062d97e330ee
+EBUILD xgc-1.0.4.ebuild 288 BLAKE2B 9e538dbafd2e5305fc7fe7b2fb036f34c8f29e0a5440a8d49e66250acf8d69b5648fc38602961da63b5ee16cac93aea3f5b68d9b62f083f3e93161f1566aa05e SHA512 f5790d680dbbad3c26604959c70eda871b90ebd1db17ed3ba28a1a96f635a28546b99beb09f84128c870e81418504b30d526fd36773ef2b8a7b21b570c1a8255
+EBUILD xgc-1.0.5.ebuild 288 BLAKE2B 9e538dbafd2e5305fc7fe7b2fb036f34c8f29e0a5440a8d49e66250acf8d69b5648fc38602961da63b5ee16cac93aea3f5b68d9b62f083f3e93161f1566aa05e SHA512 f5790d680dbbad3c26604959c70eda871b90ebd1db17ed3ba28a1a96f635a28546b99beb09f84128c870e81418504b30d526fd36773ef2b8a7b21b570c1a8255
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xgc/xgc-1.0.4.ebuild b/x11-apps/xgc/xgc-1.0.4.ebuild
index 7f9c2024f616..b9a84142818a 100644
--- a/x11-apps/xgc/xgc-1.0.4.ebuild
+++ b/x11-apps/xgc/xgc-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 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 graphics demo"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xgc/xgc-1.0.5.ebuild b/x11-apps/xgc/xgc-1.0.5.ebuild
index 917bf3f76a9c..b9a84142818a 100644
--- a/x11-apps/xgc/xgc-1.0.5.ebuild
+++ b/x11-apps/xgc/xgc-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 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 graphics demo"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xhost/Manifest b/x11-apps/xhost/Manifest
index 87266746dfad..083c71aee864 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 520 BLAKE2B 2611d3d0baa7738c9d3d311bdb23d3b084144426f715d68e7e814e5c4c697dc8f23cc1e2f7914c145d25baa900c5134fef56d774f075d9e8f670d706fafc371a SHA512 0a3d9e8d3ec7803bca7b049e9d5a1b7290fd55a2e016af848a847be1afb1c6a0059ba3f0ca086d4eea9f8dc282115c5ebdd26802b736ed5ae61e42cb73eddce4
+EBUILD xhost-1.0.8.ebuild 517 BLAKE2B 7b01c9fe9edb07551d14bb3767fb68b5a99b725952a32134752faf06ad767966a3a1618f555df18e9266ef0fc7c5b51fecac6c00e3a8dd97a10c922e2ec9e19f SHA512 16763a1463df8bb51e50b18b8466403cf7a5ea669b9546b454002249ec221713e65b66bf49051412750478f8d8737cfed4a3fd3a20ce02ea42be97bda48162e5
 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 d74832908db3..4c3acd335ccf 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 s390 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 22733d69edd4..902fbcc285a6 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -8,5 +8,5 @@ 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.ebuild 2232 BLAKE2B 622e9f5e36c269abb54801a9b17457b711a5f3ff6383a0ac5f52e33c5fc5d0de2f0454e3d21d4443ba4ef4bbd050e7ab5c5a3948063fe8f4ec5e7848038655aa SHA512 a835583d0846e90cd1f3eb34c4f61369079fac6ecd39833338aedcc6e99c5227498e6fd72dbc5ff9a410fe96eb02c21f617c45cc9b5b2fdc20059f1de549b553
+EBUILD xinit-1.4.1.ebuild 2239 BLAKE2B 8cd8ec8946f8e7f8e3bdad7b031e23776407e3ea0e36d07a6daecdaf748d15396d8e80b03295516e60cd825d329c66cf2902a51e69bbe44bf343c28ecb429e43 SHA512 1184baf128170a5c9256abc8efda02c683ab65542bd81f8ac07d3511b02ab7cc672cb4dd0f14022cbfb1dfe33852fb27d8fff393441874441abbedfc8b9d3e55
 MISC metadata.xml 477 BLAKE2B 96cb48063d5da3ee74d3c6080b849841fb1b276338db584d51bac71b5b2c3df0ecd876055a3c11e18f46c4d879a90ef91713166cae2aef65ea7725ab639b116f SHA512 c3e1095f0e3e017439777b3113d16ceccdc5ee7127da7f9e994126d6f51227a07c831e082d58c9c094aa6fed3e789458a212e27ec497fd3a14ba4cc5e4956205
diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild b/x11-apps/xinit/xinit-1.4.1.ebuild
index 70f4ab1c68ae..ae32ff253c54 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,11 +8,10 @@ inherit xorg-3
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~arm-linux ~x86-linux"
 IUSE="twm"
 
 RDEPEND="
-	!<x11-base/xorg-server-1.8.0
 	x11-apps/xauth
 	x11-libs/libX11
 "
@@ -53,7 +52,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! has_version 'x11-apps/xinit'; then
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
 		ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
 		ewarn "any executable. When you run startx, it will run this as the login session."
@@ -64,11 +63,13 @@ pkg_postinst() {
 		ewarn "    env-update && source /etc/profile"
 	fi
 
-	if has_version "<${CATEGORY}/${PN}-1.4.1"; then
-		ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files are no longer kept in the"
-		ewarn "home directory but rather are created in \$TMPDIR (typically /tmp).  The change"
-		ewarn "is transparent for most of users, however those that use runtime temporary"
-		ewarn "directories cleaning tools, like app-admin/tmpreaper, may need to adjust them"
-		ewarn "not to remove the 'serverauth.*' files."
-	fi
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "1.4.1"; then
+			ewarn "Starting with ${CATEGORY}/${PN}-1.4.1 serverauth files are no longer kept in the"
+			ewarn "home directory but rather are created in \$TMPDIR (typically /tmp).  The change"
+			ewarn "is transparent for most of users, however those that use runtime temporary"
+			ewarn "directories cleaning tools, like app-admin/tmpreaper, may need to adjust them"
+			ewarn "not to remove the 'serverauth.*' files."
+		fi
+	done
 }
diff --git a/x11-apps/xinput/Manifest b/x11-apps/xinput/Manifest
index 8acbe3945628..bf23f20620fc 100644
--- a/x11-apps/xinput/Manifest
+++ b/x11-apps/xinput/Manifest
@@ -1,3 +1,3 @@
 DIST xinput-1.6.3.tar.bz2 162556 BLAKE2B be5e16301c6a48999ccce5ec3062afb195eb1a6357f09aea41e88a4ea43c4497b8377a3da8d5c80b059afb9998370a7a53561a92c04ff8f56fa5749d577b0144 SHA512 cb2fef866ac5a71dbca3e23b4ecadaca38e65dc1b30f8bb024bad92486554fafc472706619a1af04c746a4f53ce6aea827d694b9f4f0c7d0d46bb1da81984076
-EBUILD xinput-1.6.3.ebuild 428 BLAKE2B 5a4b7d9433ec7971ce964fd9cf337fb4f0fef3f2ac6daff6f39aaa6bbaea75a30b8c23f3804279b956aa3d1d0b8674ec28ef9f300576d7569a2688ab85151fcb SHA512 52eabe1c7cf6370c63529deb6c1962b091fc9ba672ef91716e467276cd7853f5e18304070285e7d77af0478d72f342ff5835ec6a4c99510e9cbfbb30e74f28e0
+EBUILD xinput-1.6.3.ebuild 425 BLAKE2B 96b847dc23f28c4846f98f314f5c3cb7e826fecadd5b76d65a894fd13ff6482069b32867eddea9a0ad905f288e24d483adc84306b86dc6e7308679c3f9236f1e SHA512 3d2fdc665066b166ae8e9025c121acbfb895838eb8cdbad0cacec9fc313df588979680157866dfe70e1dc032ec68fed8801213204acdede89201aa4891f9afa9
 MISC metadata.xml 315 BLAKE2B 29713769214403192ffd5937d2585eb204044d95976ff4836b1cd94406420c6c15d1df6efe7da1dd1afd7f3e950e025994dfd13e4e8fc70cd521e24ca63cbdbd SHA512 d2d36e4e38b384daa8555a0824dc7fcd364b9a61350a31a7c25f7d24e42901e0386606a8410800e7ca6efac8b49c11b805b76bd27f1510f3dd89ba91a0856400
diff --git a/x11-apps/xinput/xinput-1.6.3.ebuild b/x11-apps/xinput/xinput-1.6.3.ebuild
index 776829a7f0ca..646c691a9af3 100644
--- a/x11-apps/xinput/xinput-1.6.3.ebuild
+++ b/x11-apps/xinput/xinput-1.6.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Utility to set XInput device parameters"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.3
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index 09de870eeccd..d9435375bcca 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,5 +1,3 @@
-DIST xkbcomp-1.4.2.tar.bz2 248399 BLAKE2B dcc09823fdf8a62451a1daf8dc56adbd1713b56ac7343b9edb8b3aef8b527ab8443a056ae6b4f8c21051ce5aa4764c9b198c9a5cd0e929f52e9a3e191b950334 SHA512 b00d1eb08c19be86044418c8ea3bfc3c3973406c481878270138a70ed9dab348acb8e4d0af8678879598ffbd7df1c640a63d0abad3d7481758be99af8dd7734e
 DIST xkbcomp-1.4.3.tar.bz2 245658 BLAKE2B 306e30789bdbf6b5863252aa1f73c96f88c4086989eb5529dbde1e3f1f9e11200f67ad6446dfe912129acc1071074d2addf776a97d9d42a840eb62320ae47cf2 SHA512 827713c0413aecdcad2b61edb7b8c7c7a002e18505b9041f570e2f680907193cb5ff8a5b424695e21110b2d06c145cbf0e397e52347421ee946f06e2a51f135d
-EBUILD xkbcomp-1.4.2.ebuild 421 BLAKE2B c237e715dbf1ddade26225d6a061335df28255226a5dc8ea52e78654e2a42c86883b57ee8578c81df51070b7be3a8c509c449634a1e3ea2a070e5784bfc547ee SHA512 d966455a2f7d1dff89667c23048095a8ca443056acaadfa26b6efbe5f2e86af1fd8b02852121f0d2a9c0e295f8811a0cf56a11548477e8b61dd709d3d3010154
-EBUILD xkbcomp-1.4.3.ebuild 442 BLAKE2B e6d99641aa9ce57a33bd17f480789e498123c5445d7f006dc0b483f3cb04d1be003ed1a0f3fffba8e09d4e3a82b0cd6747f6005e34ec620a29df99cc1280de07 SHA512 a8fced9b0d4739b07b878b48affd81442c2c923fde99cbbdfea9099ab6202b76a708d14ba0f2ea9fcab22f40019d334f7caf9dc798ce3a441fce79904428494d
+EBUILD xkbcomp-1.4.3.ebuild 437 BLAKE2B adbd8305a8a9fe9313df18434435448b9bfc13c2c5f476c72bd1f56a6449999da8d6b606393ec1e52efd7c1303bee726529ad220e5e76bf1ce66ec987b252acd SHA512 7f450334e8d2f02c55767ceb6b83fdfc4dc1c67e2efa3c76dad98ab04c4d0be689a3b95700c23d5ef6eb2b42c8b6faaab6208a3b2765a90fc871d8d66c75c93f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild
deleted file mode 100644
index 575a7a85b0e8..000000000000
--- a/x11-apps/xkbcomp/xkbcomp-1.4.2.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="compile XKB keyboard description"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.3.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.3.ebuild
index afd3bdd55689..5c061d1a5245 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.3.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.3.ebuild
@@ -6,10 +6,10 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="XKB keyboard description compiler"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 DEPEND="
-	x11-libs/libX11
+	>=x11-libs/libX11-1.6.9
 	x11-libs/libxkbfile"
 RDEPEND="${DEPEND}"
 BDEPEND="sys-devel/bison"
diff --git a/x11-apps/xkbevd/Manifest b/x11-apps/xkbevd/Manifest
index e0e67c2b0e32..0d6ce9ff31cb 100644
--- a/x11-apps/xkbevd/Manifest
+++ b/x11-apps/xkbevd/Manifest
@@ -1,3 +1,3 @@
 DIST xkbevd-1.1.4.tar.bz2 151991 BLAKE2B 5f48968f4a45aeb5a851ba5c6c9cc6dd525d4385bda3475e1261a8419a3ea931fefff8e315309b6fcfba766ec9d95b4d64b93861f84798f5d730e2c5584c2cec SHA512 7628eddd0e1dc0c4df8e61eb3f6a6bf0e9d92a87e96bb2f5248ba5bd3d99d868885c36860b78e8ea2eaba3bb9a420067ef95c4d58c1254fa3d12fb25dd4e60e7
-EBUILD xkbevd-1.1.4.ebuild 335 BLAKE2B 51dd14badc011b4b42c2b5cb908703d8e615fda6e4c3e63ab92e1b797f61454a061f2e4a875d5d5e8339e09817f3d1f75cb80aedd23d6f1c8b5d95813c64d268 SHA512 797ba51f61eca9d5ff3d996369f9372ba10c4b617d5a4a749f44423d3f9eeee5c1fd5bd8338688ea28a8e20ace94f54d6876d38c43dc460ac8568dc576aadb29
+EBUILD xkbevd-1.1.4.ebuild 332 BLAKE2B 4bbe3584f95719d78258e267c221cd5e3b2332295257a35fe20d01f2a463f9d5c7de5617ddcdb27b44ddc462ab4ba8d1b9685ab64cc75f35f1248634db933e52 SHA512 705017e4e2c52cc8cb1aba2a3b229201db79b733c75d015d271da3a2e6339a07604b7977e683d22a7092da0e99da282d81f4d4e3e72476bf96d5b23c9d46498e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbevd/xkbevd-1.1.4.ebuild b/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
index b3c157834157..e4024b4efa00 100644
--- a/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
+++ b/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="XKB event daemon"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xkbprint/Manifest b/x11-apps/xkbprint/Manifest
index 66acf3af0f4e..a8a3053e1a11 100644
--- a/x11-apps/xkbprint/Manifest
+++ b/x11-apps/xkbprint/Manifest
@@ -1,3 +1,3 @@
 DIST xkbprint-1.0.5.tar.bz2 166856 BLAKE2B 99d375e88a871ff440ebed587b01961a6e2fa196a28c267dbaa6cdd10bacdc99767f12032411eb8448e8a2f7c6792c2f7b6f428d208a9263f94b4c959d2a0431 SHA512 ac3870352f3a595b5b8a8cb64f39e9bea81b17572c73cfbf72482477a2f576d0ffcdcf735cb3c66b8a88a7fe0f7aece6738cbac87df5641e44fae1ab9b97111f
-EBUILD xkbprint-1.0.5.ebuild 344 BLAKE2B 3d333d847f8ef7e8a39eca61a9a1d91077c2f21775ad4d455fdc0d46ec340555b3169ae0ef186ecc821f06fc60213a5d11511cad5618063b9970254203b8fde9 SHA512 df69e4270df0f02e0f40f366dffde4525b6660b26dd0df883e82c4d03c66a45f34202784becbb600255993d07ed3f7b93db63e1e248a8165f314cbb2ec173b57
+EBUILD xkbprint-1.0.5.ebuild 340 BLAKE2B 30c84f2e750c162c9fd6888b112592c7871d8db49f29f28de40e9b6c85702ff6ef9fcd6e379a03bbeae8d86939b243e68abbdb7e4e6de0025b1a7010440e03af SHA512 26498f759a218b2fa310d9255562c9e3ed904ffdc5ad38ea214fe4b6fc571d0cc2244c3db39cc074e1f2b1a867767aa0bd3d3ade6944ea132da14133a133ead0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbprint/xkbprint-1.0.5.ebuild b/x11-apps/xkbprint/xkbprint-1.0.5.ebuild
index aaff770fb036..58b6df2baac9 100644
--- a/x11-apps/xkbprint/xkbprint-1.0.5.ebuild
+++ b/x11-apps/xkbprint/xkbprint-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="Print an XKB keyboard description"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libxkbfile
 	>=x11-libs/libX11-1.6.9"
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index 7f6b4c09fdda..7da33f25d326 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,3 +1,3 @@
 DIST xkbutils-1.0.4.tar.bz2 131269 BLAKE2B 20e51a33b280bf4eaf6dfb3b2986ffdb09d1bb4fe3dd3689de5256204cc0e90808367b0afc054e2b5a6746b3b125bc0d20337761e1714c069f3c300a65fddb06 SHA512 5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d
-EBUILD xkbutils-1.0.4.ebuild 361 BLAKE2B 2444da40df2137721761a4d0237e8d3b0eb1d0ba14eca50fb3505d6d0fe37d7bfbe37f14a9e964e163c9c2dcf6fdcb8605fd022fb9da6a65adb3785e672aba99 SHA512 a8b2737f67c7cf2feedcf3a7e748c9a69774c6aa940dd40a1088a2b238cacfeea46ae150f26fc906b8e42b37ae59037895edd747765a045415d6655bf066b2e2
+EBUILD xkbutils-1.0.4.ebuild 358 BLAKE2B 78600471dd73bfffdc252dd53d962906ce964b1ea7710a59ebb15006986dea3a973e68c0aad3a6bfc4067878fc765df639343b5c18210159233e12194ffb1407 SHA512 a59597925d0e1d02930e53d36af29202da1cbbb8990b0b097bfd245cadd31dc0efb7c85774318396ef18f4400385ebedef718bc8d31db2543bf9c04e6a2c0653
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
index 24c8a7a5e600..eee02599d6a2 100644
--- a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
+++ b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xkbutils application"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
index de8950ce8a42..4575ed871e5f 100644
--- a/x11-apps/xkill/Manifest
+++ b/x11-apps/xkill/Manifest
@@ -1,5 +1,5 @@
 DIST xkill-1.0.4.tar.bz2 124828 BLAKE2B 4d7484a6e044f2a93d7d54f25619c08f657cc34955cd399e927442d8e8d79f3ad983020f75a3edb57e91371f4693909fae28b1ebf8f1e78189868c79c3ac5e87 SHA512 14d1fc0eff96a62d66307f09efc599639ee70be4bf580e2857569326881bfdcae7a8a21640509875218dd2b88575b4801ab0c43c4295550dc71141a579483545
 DIST xkill-1.0.5.tar.bz2 128146 BLAKE2B a01b954872eaad2aefe11335df2c85972abb8d36ae0c00fbca02b5af2d7df57934e3ddc47455f88927a90b0bff5ed707ca6dddbbf5478c89b193c98a86cc0562 SHA512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249
-EBUILD xkill-1.0.4.ebuild 364 BLAKE2B 06a59af49658baf462dd7c88a62a47baf30a6c81fd00f93dfb67a3ec7a3193a8cf2ac469046e83c04f4f2c72577839bc5dbbde792fc1577f87673a5cee1091b4 SHA512 9a96c6dec418c7611b99517bb5b63b62619202e8735292cc058cbddb5deb1287ae1662c469fd65966393fba8c6dd078729d9594311ef59a822dc02e304c941ea
-EBUILD xkill-1.0.5.ebuild 364 BLAKE2B 06a59af49658baf462dd7c88a62a47baf30a6c81fd00f93dfb67a3ec7a3193a8cf2ac469046e83c04f4f2c72577839bc5dbbde792fc1577f87673a5cee1091b4 SHA512 9a96c6dec418c7611b99517bb5b63b62619202e8735292cc058cbddb5deb1287ae1662c469fd65966393fba8c6dd078729d9594311ef59a822dc02e304c941ea
+EBUILD xkill-1.0.4.ebuild 361 BLAKE2B c8514bf71107186edbb6fd362e2eacafe43c88df1cfb5cce48967857906031962eb6e921974e59a4190ac74ec2df6a6b86ae53b5fed8169bde2ea5dcdcc1314d SHA512 7e5fd914df7b5ccda284bd836a947a648f7fc30aea92c9a24df6803701b86b0d8f5bc8a8d7efd54629d2ed32fee0f9d6a64237143ea9bde3bca178e59e85b3bd
+EBUILD xkill-1.0.5.ebuild 361 BLAKE2B c8514bf71107186edbb6fd362e2eacafe43c88df1cfb5cce48967857906031962eb6e921974e59a4190ac74ec2df6a6b86ae53b5fed8169bde2ea5dcdcc1314d SHA512 7e5fd914df7b5ccda284bd836a947a648f7fc30aea92c9a24df6803701b86b0d8f5bc8a8d7efd54629d2ed32fee0f9d6a64237143ea9bde3bca178e59e85b3bd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkill/xkill-1.0.4.ebuild b/x11-apps/xkill/xkill-1.0.4.ebuild
index 829140652c7f..73e70b238b47 100644
--- a/x11-apps/xkill/xkill-1.0.4.ebuild
+++ b/x11-apps/xkill/xkill-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="kill a client by its X resource"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xkill/xkill-1.0.5.ebuild b/x11-apps/xkill/xkill-1.0.5.ebuild
index 829140652c7f..73e70b238b47 100644
--- a/x11-apps/xkill/xkill-1.0.5.ebuild
+++ b/x11-apps/xkill/xkill-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="kill a client by its X resource"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
index 3cbbed812940..21b14ad1366c 100644
--- a/x11-apps/xload/Manifest
+++ b/x11-apps/xload/Manifest
@@ -1,5 +1,5 @@
 DIST xload-1.1.2.tar.bz2 136745 BLAKE2B 080c3885ce5ccabd2162cdbb855113a7718978b3d935493851315e682cbc9f6ba7652412130d414698b363aa1b3c74b21144293ab2475e45816ca15387fee925 SHA512 9c83d26bbb135cc0f2b3ef7f25b081cda5d080dd02b1c89195b40825a7d71211965b34336c853eb455472d9748f3edf64108455584b34b81673e2548806f423d
 DIST xload-1.1.3.tar.bz2 140327 BLAKE2B e3e4e817b65a405b2e4733fbf736d2f2a9803436bd752d8fc14204f2c6e342dcf60c9fe69d749283ed53345020fbf7c250c91453d4b6634c41795e91e072cd46 SHA512 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5
-EBUILD xload-1.1.2.ebuild 376 BLAKE2B bbeeab477a43cbf7ba739a43503c5867a6351fcad11a3a713ceef2fe893e1a8d63d187582782ef960d3d230083f383dea9a559580d0314c326320225c29e07ec SHA512 6b973d4798f3ba5ef6c82c30d9bfd31bf76f4fe34921288b4e7895532bf01d11831a47d38d755e6fc462a8fbe2f873f98a4b76524c1b682be12fd6debbe3b41d
-EBUILD xload-1.1.3.ebuild 376 BLAKE2B bbeeab477a43cbf7ba739a43503c5867a6351fcad11a3a713ceef2fe893e1a8d63d187582782ef960d3d230083f383dea9a559580d0314c326320225c29e07ec SHA512 6b973d4798f3ba5ef6c82c30d9bfd31bf76f4fe34921288b4e7895532bf01d11831a47d38d755e6fc462a8fbe2f873f98a4b76524c1b682be12fd6debbe3b41d
+EBUILD xload-1.1.2.ebuild 373 BLAKE2B d0d8f802b87812212163fd4db7ccb224ddd4b0178cfa53435c682146389e74c75324f9925ecb0907197a398d85875bec2fb596cc43117a16aa6953759558c42c SHA512 3f7bd858295c56e95d2d1c107bee7091d34567a103cdcf0d561bdcc5cee4ac3c9eb8bf717895ae5c368b9e6ab601046d37c8f00cb4a44bbcd4b802f86957c8c9
+EBUILD xload-1.1.3.ebuild 373 BLAKE2B d0d8f802b87812212163fd4db7ccb224ddd4b0178cfa53435c682146389e74c75324f9925ecb0907197a398d85875bec2fb596cc43117a16aa6953759558c42c SHA512 3f7bd858295c56e95d2d1c107bee7091d34567a103cdcf0d561bdcc5cee4ac3c9eb8bf717895ae5c368b9e6ab601046d37c8f00cb4a44bbcd4b802f86957c8c9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xload/xload-1.1.2.ebuild b/x11-apps/xload/xload-1.1.2.ebuild
index 56ed12508659..d32e2eb2a0f2 100644
--- a/x11-apps/xload/xload-1.1.2.ebuild
+++ b/x11-apps/xload/xload-1.1.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="system load average display for X"
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xload/xload-1.1.3.ebuild b/x11-apps/xload/xload-1.1.3.ebuild
index 56ed12508659..d32e2eb2a0f2 100644
--- a/x11-apps/xload/xload-1.1.3.ebuild
+++ b/x11-apps/xload/xload-1.1.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="system load average display for X"
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xlogo/Manifest b/x11-apps/xlogo/Manifest
index 3f6f42da3fa8..33644c2e17d3 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 455 BLAKE2B 3a23f4c44504d5b2f45ce47e601fdfb04333a886c0f4d7357e33a1f5bb7e79d4d06d767cc1132c3162b6afd1125796df24a667840c424377d27a545e88e1ff93 SHA512 075aa8ae20bd0203a6ee1eb5ad013c69d2db76fd9bb1adf6236b9ced635aa5b6de55d2b559e3de67026b7c55015aaa9c26f5b29e24e86c96b7ef3d911ec13441
+EBUILD xlogo-1.0.5.ebuild 452 BLAKE2B 8ddd9dafc3142cb76f84ab6ecde54deac7c6d84b6c68453d7ec380750095834568d0329334eda01cad6e867e0e99ef563ec6c8b8fa8c4e31926f557893acc003 SHA512 850f422e9fcf1a0d3ee51ed9f1c18a2802e70780aef24aa4c306164947ab5678dad7cf06700bb145dadbb24f983d6264d288a5df14de956c0e6f93c460021fa0
 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 dad0af6a6653..00e4efd2b491 100644
--- a/x11-apps/xlogo/xlogo-1.0.5.ebuild
+++ b/x11-apps/xlogo/xlogo-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X Window System logo"
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXrender
diff --git a/x11-apps/xlsatoms/Manifest b/x11-apps/xlsatoms/Manifest
index ebba2a3946cd..65f4906ead3b 100644
--- a/x11-apps/xlsatoms/Manifest
+++ b/x11-apps/xlsatoms/Manifest
@@ -1,3 +1,3 @@
 DIST xlsatoms-1.1.3.tar.bz2 126327 BLAKE2B 7a4ca35e6968432fc99dcf665b3f63ac84e5bda8a7b061fca9df7bb12e447e83feaf4c82d80a4e469e680042d7b856708821febe44897acf5cba7777e90073c4 SHA512 c267ccfdc5a83e834bfb5c3b144e22642badcadef4eb146eeec2df6fe6f85e9379500ae4219912c70fa2e535036a1a96cf496381f5d814e79af075e03c975f30
-EBUILD xlsatoms-1.1.3.ebuild 319 BLAKE2B 7afe5b1efdb44d37a53d51d12e6c274bc6e07cd0d5456de099126dd8860a991550ad489e6041f9dcafb1bf141a7b8e83e4482f59af9e2d62b43dcf0033cd3dcc SHA512 e2272a7b6f818c3fab050aa253ef04be3b33d402f09b2e614e8cfabd4ec351580d835586ef4e3e16ad60226811044ab0d2b1ad2101f90bd9c2ad5daa775b5b63
+EBUILD xlsatoms-1.1.3.ebuild 316 BLAKE2B c0f10910d667f8854142b8aa74e0db1541cb96818c46b3843c003d673a6fd472f907c92b21ea406e9836b877c59a1949491442dc4448dc7e5d16933c4f93d47b SHA512 1d6951b46707ded09d89c4535d48b62067984800dba533bc255334f2dece28e97bd43617a659b767c340006bfaaef4a7b9b54621e5b2b1813121e603a7e909b0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
index df0207a3d8fa..76f7623e4425 100644
--- a/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
+++ b/x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit xorg-3
 
 DESCRIPTION="list interned atoms defined on server"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libxcb:="
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
index 84effc80cc01..46d39a3d25f0 100644
--- a/x11-apps/xlsclients/Manifest
+++ b/x11-apps/xlsclients/Manifest
@@ -1,3 +1,3 @@
 DIST xlsclients-1.1.4.tar.bz2 130586 BLAKE2B 8e13bd29f10035a101cabe2a271fd665618dce12f7047f441bf943e8c4d2743e2385874b8e1cf42b69f6a19b7a3d5c16ec9ecff7e6cb62401888802d6946dd5e SHA512 42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4
-EBUILD xlsclients-1.1.4.ebuild 344 BLAKE2B c94274c2a8618e82bb667e634d55da09190da25de71fdc0c9e50a40e2a109914d7888d75f12894143ae09028678c3199b65551e4df90dbad55bd0b0a05522e41 SHA512 9797b7f3a14185f81255d06749c76bb41062d604050fd3a9813007cc600e6bbd5f5a4c9fd006cb9f1938e1cb724e5bafee84b2640cae3b1d7acb1a08ae439816
+EBUILD xlsclients-1.1.4.ebuild 341 BLAKE2B b7f0d86039b20ce6cf2ab319af076dfb0ad90670074bb6da6eb38b5294bd78106dd214c6301dfd525f140c75c1d6a7c6c20078c6d1202dd42cee91444f208e10 SHA512 93e78d88a625e60e8661885ad9eb6d4f5f34edc4c8d4bc9d0e183939c9d28427d9398cc101f94df4df46fb32c4a5764a9c9e1575f0954348a4c8b706e99186e3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsclients/xlsclients-1.1.4.ebuild b/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
index 0e09ffd55851..5cbc39a43c09 100644
--- a/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
+++ b/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org xlsclients application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index f612621f1748..08bf15026186 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,3 +1,3 @@
 DIST xlsfonts-1.0.6.tar.bz2 133500 BLAKE2B e21b5776ca02c5fe07ba80c2e845fd04d75642ed7984080df3402a478748e4bea00f93134eaf359da9d5223be6bf98224067bd3413c072c2f38bd589fdc90328 SHA512 052a3b1dec23cb20fdfacd4500cb836feb3b888bf568a548ea71deb58a4ba10a1ad5392d658e95272c6d4a1832edf1f19c3de2498b78dca82c43ee52800a30c0
-EBUILD xlsfonts-1.0.6.ebuild 351 BLAKE2B e8d185090aeaacbabb7ffe74b7067cfd81309217a4f00f6f92e0c865c04be1fad0ef97417fb622b65b5d234bf8f8eac64fba540c5ccd7366a45c975465a69b01 SHA512 e8cbdd569fec52f499a38c9e02d3cbdc706f56afacc6e1fdbc5648f891b41af3a874956bd106744dab9f76696c07877298719c9cb772f8e0cda3d96417df8e3b
+EBUILD xlsfonts-1.0.6.ebuild 348 BLAKE2B 13fc19f476620aaed6673c359f7826b02c7f789a3f2095502c829d99d5a5ec5f1fb4bf20f582fa06025479f2d341a4351e65bb1e169b292b39dfd0ddbba880b7 SHA512 5d32a3a445e51a7a26802331c23ceb29d487106511d5ecbeea3d2bf25caf8ecc272c807a841d1ce9bd67928f2d7fbc6bb8061d864bda3ea289265f582cd6a1e1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
index a5e00bea091b..932e7afce43b 100644
--- a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xlsfonts application"
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmag/Manifest b/x11-apps/xmag/Manifest
index 8d9e4291b4f8..b2ce5a3e4388 100644
--- a/x11-apps/xmag/Manifest
+++ b/x11-apps/xmag/Manifest
@@ -1,3 +1,3 @@
 DIST xmag-1.0.6.tar.bz2 143112 BLAKE2B f53d7f564c71100e5903c19ee86aae3405cbc56258c89a5ad3d5e583649e1c2a862fef875c6de18c462e103da2afcd4fcfc9927188e7a4e8b980c7d80b2c4c64 SHA512 98f3c8e0c58f31cd4f1736ba9c5cd68dba3b2e2de6191988de8ae3e91b1d310803461840189ad56be45ee57c9ca05a2c63544a49b02ce6f79f2ebc14c59613de
-EBUILD xmag-1.0.6.ebuild 337 BLAKE2B 09e3d0963ef39b70f78fa021473c4060f575e91ddb11631f19f58734c6353bd87a0f3c95bad94b8197e87531d6aee9ed147d1f1b409b3ebf9148a30f0622d570 SHA512 606c0b1c780bf4193ba7ac764ea4218ba03347e8081dddab0a0ac10d6e9b943da7c31c94cd0ca95bb6b35e3547e9fb3551bd87fdff720a4373783c904fb7c9ac
+EBUILD xmag-1.0.6.ebuild 330 BLAKE2B 34a5c661c515b3fb4b56535e0caac82eb660d357493038146464a19d0bac6d15a6eb7ff4bc41582004e94d8ca16f904374a9d0e2aa11cd9fd7ec3a7f9ca8a50d SHA512 1a3ca0f8a109eb9ef31395b81c6c7a075bc414b6c0d8474623b2897f10a9a3c4f3501ed8f032f968dca4fd3aae78b14458ebc7fb9a4f8ed8e58a9fce906d4f1d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmag/xmag-1.0.6.ebuild b/x11-apps/xmag/xmag-1.0.6.ebuild
index b013f1b4ca79..7bb88d04f61a 100644
--- a/x11-apps/xmag/xmag-1.0.6.ebuild
+++ b/x11-apps/xmag/xmag-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 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 xmag application"
 
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest
index e6876f6bedf1..51b68e3c6ed9 100644
--- a/x11-apps/xman/Manifest
+++ b/x11-apps/xman/Manifest
@@ -1,3 +1,3 @@
 DIST xman-1.1.5.tar.bz2 193676 BLAKE2B b49e78b0127844e2ee8c0343392af940e592ee6958b4f1af217696da9ab1cd880331dec2af2f7eb5084cf44d40a041c730f571e5fb476e74924552e1316614ae SHA512 f6b2be424a79f298bf1a81edce4172572195c9efc9454e5b7b7046f344ed08154c77ccaa763ccdf3f1a30b64aa4802783bf813ee637437ccb1fba434fc5d4400
-EBUILD xman-1.1.5.ebuild 379 BLAKE2B 51839e0d5f1aa403efca93b01afe3dd42646065f46fd6da1a5ce2e4283a276d4aa53d10b341aac9fdfb175e0f90e4022b638a7663b9751671c382e73ce9f001d SHA512 70aa126036cdb95d06a937f22ee165cae24dd7bbc909b62acab9ab91a99b5a0f3591d9eb6ce329ac5ba1067f40fa6f97d2aaf4c16403b04a9c29a0407ade4dc1
+EBUILD xman-1.1.5.ebuild 376 BLAKE2B 5433b247fcbe901d3448fafa31f1493b0814fcf7b3f95808d09c71a40a59bf2d3a568951286648eeabbcaf86c384174c91a8aead08894d8472f19df9a8546f4f SHA512 6b5f714f10523ac2f76723cbd5b12d6bf04b96b4184f637de6a91d846bf77df8ecc3d2655fdae807ede6aa9f0b3641c70411da7030d4406578ac30ce5c876373
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xman/xman-1.1.5.ebuild b/x11-apps/xman/xman-1.1.5.ebuild
index d3a9b0c29efd..b8668ca3a545 100644
--- a/x11-apps/xman/xman-1.1.5.ebuild
+++ b/x11-apps/xman/xman-1.1.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Manual page display program for the X Window System"
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index 2602c13da91c..dfe8102ba6ac 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,5 +1,5 @@
 DIST xmessage-1.0.4.tar.bz2 125011 BLAKE2B 4b1134ac3dcb6a696ba75dddb3fcd348222763c375067279e4d6af41c3c2c855249cd76b888693a5c0136144071acb628c0e3a653ce0afed70d0e6910d055a4f SHA512 a087fb09595bf0b188a4525b45e9b607acd063cceae36c69c78a48674fb7eca1c82d5c2d2770c7f4425b499e4c002bfc0e377935308c218a330a2b4994b94ebd
 DIST xmessage-1.0.5.tar.bz2 133393 BLAKE2B afa42e20ba995fa1086cd3cee5b90be8564c521f7bc12b544a787cc753782e1cfdbc5a94f5925f5bae1b630b7ac08fcaeee59e319f680d3be29c46d5421aa048 SHA512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
-EBUILD xmessage-1.0.4.ebuild 470 BLAKE2B 8015ea0bba110253be1c1a7e0fdd28e3b5af450a0a90ae9f109266798e216f76db8cbcdf3a28342d1095ce53897758f7bea54a3a46b17917bd171d7380c11adc SHA512 3c355eadb3b330d1d28a0029eca78dbe7e4934c7859ecd533394e281182b43b05e8254d7a43bf0cbe501b3caca8e88f840599c90f89d4e5f02358dbf7e951abc
-EBUILD xmessage-1.0.5.ebuild 468 BLAKE2B 39bdfe05bc8e167e26a6aa16680358bb99378743d52d601b1d6c7dc82766e215287f269efff439062b2c6cf3d12da1378d329b7c35c7b77367827d238798b11c SHA512 695d4ec1e733463d03f276aa7c8530a9c354ad7db22685cb9eb3c12a111008b6bb4829b44c7e8039cd058cccedab4b52a7ec8b7f3bfa8a2045073e93f33b5db2
+EBUILD xmessage-1.0.4.ebuild 467 BLAKE2B 7e2319114b6f99b51b2722f41ef1a3d974093b5cdb0e2fd535c554275f1ad49fece8bcede6bf6104b1baef84ee7ba45ce81e83d8492743333ff4f42dbc4015f5 SHA512 cb3a3a18e82937ffe15afb001b9d458cee3e45b1a7553d38d9140dc550265af85f3c3e70dd7ce8ec27da776c6b2d1f01349951b08484fd71a45e6184893288f0
+EBUILD xmessage-1.0.5.ebuild 465 BLAKE2B d1a59adab2833e5f41f30199f6248803c1afa2cd92e8450670be1793ff91615eab4fec15c513fb4b4c116b0c115c8334ebf59d562f5754525d493d9bbf2daf38 SHA512 3bfe38dfb10ec1a58565fe93bbaeecd67f56bf99479612e77b946b8021e0d106455e09c4d23d7779ee29b6347f894fe7e7d1628767be32a9d48c66f4ac9f4e4a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmessage/xmessage-1.0.4.ebuild b/x11-apps/xmessage/xmessage-1.0.4.ebuild
index 3dae2c836040..aeffb7fd02d3 100644
--- a/x11-apps/xmessage/xmessage-1.0.4.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xmessage/xmessage-1.0.5.ebuild b/x11-apps/xmessage/xmessage-1.0.5.ebuild
index f3552ab3e580..85c7a1a2fde4 100644
--- a/x11-apps/xmessage/xmessage-1.0.5.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index f20c5538cef3..beb3612373ae 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1,3 +1,3 @@
 DIST xmodmap-1.0.10.tar.bz2 145489 BLAKE2B 503e72882a1d6d5c916cb60b898156adbdccc3e90bda85b161ac7a57ee607605331be73bd779603cfab1013d065e28f3165cce2ef50d71579330ab0361078a22 SHA512 324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04
-EBUILD xmodmap-1.0.10.ebuild 408 BLAKE2B 3dcf382ef37e5bdc149b5a4e003eda9b5caa768e41575daa020fdb754e1c38087711f4fb759d004a14e3fc7ba2081c4e02384a5c7f95879c5f1da1ea2bd133a5 SHA512 fa8e4139f05cdd58c1418631f36c6afaed0e154d43e3d42d7009b4b28499ed53f71ca7fe6acc6583184ca2cbce8440cbac0825fff957574d08508ed04502f81b
+EBUILD xmodmap-1.0.10.ebuild 405 BLAKE2B b3801a1d94c69a0d5be00ca18356d6950007b76ae368934fbdccb496fd8efe87d88c1ff03c9a02a308548d9437ee3d0e257b825a8407a82cba84eeb63d1cec4a SHA512 640ec04bd889a3e49d8f3341001e4de098af8d3dd8d858e8916f1b6a538e6684701dd3be5871b33e16ba5401e5087f66c295165441eece0a5f5b5bc296ae0689
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmodmap/xmodmap-1.0.10.ebuild b/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
index db4af16c7d32..f2774983bdbb 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.10.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xmore/Manifest b/x11-apps/xmore/Manifest
index 74d1b7253b93..8235aa50888f 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 330 BLAKE2B 979f584908b7401080ba3f84b1186c87160dd22641be367284843dba66435d90dd1d6b1400365e81bf586fc028d76a44302148092d48665a54c586f702476cd8 SHA512 6ad25c4a8205a9384b4e8d37a23d52c9076fdc6f826961da16e5afada24cd863d18cf67504a38a4bd7a09e7f07839fa70bb5ffc42dc507a1757af0f94261a900
+EBUILD xmore-1.0.3.ebuild 326 BLAKE2B 461f84260b547435e5a4f996898b6127b64e06d19853bf90e50b00b9a7575b68944ba67b743cce4f8dad21210aff6ef2b2d1b5fcca0feb5a448ec0a0e0dcaba6 SHA512 717962b28e93c7fb1c918114078ce7876356b36ea3479ae32a1221928a540af83152d94767081c3f0a15f6a810bdfcc2c621f9ac8bbd317533fced996a23b3f6
 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 1e87cdf38bab..2bdc2c1ad61f 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-2019 Gentoo Authors
+# Copyright 1999-2020 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 ~sh ~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 ae03dc719fda..47dddaa59e35 100644
--- a/x11-apps/xpr/Manifest
+++ b/x11-apps/xpr/Manifest
@@ -1,3 +1,3 @@
 DIST xpr-1.0.5.tar.bz2 150714 BLAKE2B 89d20134a3a9a12e319d343ae20c3aac71d1d2d2cbbffe1ff71375211efb3a4b22c2d99099fb1621fba838778702cca8c088181218c5d2c5fcb6af706d23b359 SHA512 d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967
-EBUILD xpr-1.0.5.ebuild 314 BLAKE2B e0919f0569f7a48ab55930b8d193966966ea336496a4c04e46a8e82b0988b5f480265b36584a6dac2e81fd6c72515d9e0d4037926f273c27c5d5219444f231b5 SHA512 303bb7b2f6450f2ebb65be1b9927009c6998ba5192317e903148c90204d1004b591fce4653858f526b3541fac283ba804a8ce5263fdee72d0e33f0bf9adf1d41
+EBUILD xpr-1.0.5.ebuild 312 BLAKE2B 466a2da5f933500fe9be513d81cfbd76ffafcef34ec8255cb5a9fb19bf474eda7ed070f229340b93b77a5cc3bc12c8432168262e8d6dd9f7b3b5079c360258ce SHA512 9f266b6f29a7029717ef2dc2044f4ec26f4e706c5d115d406fae99b56938cff4f9bb70baa5ccb6f7f341fa8233f598eb07ac776f9f1ef9b543bb731d5fd93e69
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xpr/xpr-1.0.5.ebuild b/x11-apps/xpr/xpr-1.0.5.ebuild
index 6bec1943f683..2e9eee037367 100644
--- a/x11-apps/xpr/xpr-1.0.5.ebuild
+++ b/x11-apps/xpr/xpr-1.0.5.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org xpr application"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index 204cf7e6de9e..2d1357d2f996 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,3 +1,3 @@
 DIST xprop-1.2.4.tar.bz2 149930 BLAKE2B 93bd20c7c91d6abd9e2fdeca7864b9885ae7248c7ee3ef80a5efa1706bfef2220244b1443764fdbc042f66be8d589b111fd942c732922f05f4143e1c893da183 SHA512 6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7
-EBUILD xprop-1.2.4.ebuild 400 BLAKE2B 7084358236e280fbd3ed0416d59102a45fca3942bd86cfd080b72fc7eec71621195a4c44f1c03bbcc81d0df9dd7f226517c539eae761efecc1506bf0198dd150 SHA512 cade6aa492d411c0862c262824265ee3b547e0345651d918778a3b673fbfaec4cf4cee78efe6a32402e21fe7ce44af3fbb5ecf7db22ad263b41d6ee989b66c04
+EBUILD xprop-1.2.4.ebuild 397 BLAKE2B 073f70d7e383c02285af7e14d2c71d2d212d6a02f9f0e060822a40132ad93fc27c2119a9fb06d201f5d885fd4585658e21395fbb586280d5806cb23acf0c7039 SHA512 f7f3fa68a0c33093ac27e7e0ca2490ce5fde54c2bc6a2e17931555bdc482c87881795488f90d37efb4e78af06b5e9447786ee91a413bfc56463ba751cb50d104
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xprop/xprop-1.2.4.ebuild b/x11-apps/xprop/xprop-1.2.4.ebuild
index c9e9cf75df1e..fa206592feba 100644
--- a/x11-apps/xprop/xprop-1.2.4.ebuild
+++ b/x11-apps/xprop/xprop-1.2.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="property displayer for X"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index 6b079e5ae581..a1f4c1d6485b 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,3 +1,3 @@
 DIST xrandr-1.5.1.tar.xz 171200 BLAKE2B 69cc080da24b8d00fcf60e9fb2d4c03d7b80b46d18888fa726ad4ba5847fcfcea4abeefa298fb833febe0549aec0636ed9087c8ef065f5166df6bd7f270dac1a SHA512 3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922
-EBUILD xrandr-1.5.1.ebuild 528 BLAKE2B 1acb6e37d06d5fcb962f64da2925c2d4cfeccc52cd62fd8a881911faf1bf4c3b87ebf30929caed7a86a08974bbe5b8a0ffd56c94c1d7cdde1a5a02ccd6ffc668 SHA512 5778b4fb27c37184c2487448aedd30f32aa395d7e0d613cfb21001ed58fb477d8cbe619c09f5d06f156810797928af026363d59b51ce00a53585a80f9f23e67f
+EBUILD xrandr-1.5.1.ebuild 525 BLAKE2B 42d3959e7262d97f1aea4b57d5ddbb84b5a6e38d62ccfdef3b0fa208a752aa477b7d890d2c6c69569fad9fbdb208d2709af80fc9dc9ace6c5d3b3d26d5a65592 SHA512 ed1c8e05e08868e390d87e635054aa12d331ef376eaafccd74179d2a23d8068132b766108665f7c9d8bbcad5f2ff250886595cef59dd7387b03960ea38853c9c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xrandr/xrandr-1.5.1.ebuild b/x11-apps/xrandr/xrandr-1.5.1.ebuild
index 4511edd40447..05cb4edcc41b 100644
--- a/x11-apps/xrandr/xrandr-1.5.1.ebuild
+++ b/x11-apps/xrandr/xrandr-1.5.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="primitive command line interface to RandR extension"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrandr-1.5
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
index aaa16713c79a..befef139719e 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 416 BLAKE2B 3966e2578b208a809c52db3ef374c3904449413283c0763c2a6f5434eb183c396baef0b9dbcc99070d0cc8797c76c6699a25bf315cc72d96325dc2f79cda791d SHA512 4b9c4da5c9af5fa457ad3bde59bde06795a27cf00e0ad0e406a5b32fddf3dcd13637945331d53d22f7ce5bc179f15cbee57b0e4278faefd874637e617ea9594a
+EBUILD xrdb-1.2.0.ebuild 413 BLAKE2B d5236bff1ef70cca08298a4d39e890a231fd0403ba49d855092133106451cbecee7324ea6949f86a44067721780e8d106b8a1a5e497f036d2ca6eecef9ade819 SHA512 13ea9fbc71152aedfe13b6e95268a992242a2f42481ed77c2276990eb681b122990737876925cef21a79c1db336c4508866884de82d11e4c454e3fe19e562705
 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 d82c3f485940..0d62e05ff815 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 s390 ~sh 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 d52c5e395b17..839a595842a6 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,5 +1,5 @@
 DIST xrefresh-1.0.5.tar.bz2 120757 BLAKE2B 5c29df155649998cc18e607267f140e59fc50df063d1ba26440103c71c998050f4a0e940ef87a78ceeb3f350e9340fea3813c204548d5f506cb8c014be9362e0 SHA512 287d167cd167aa35cfc89364bf4e74313137ce47978419446c60cb915188c34051f95d4900d0d5dcf692173f31e00e2699d70e54b79f0b21a59b4694be744014
 DIST xrefresh-1.0.6.tar.bz2 127494 BLAKE2B 587f5756bbd3095e77494288d4b9cca99992b342bb718e5cadefdfbf018710ce0f216f43b68814d0d0a681c87d855be4ecf199a314361278c3bfdd81e6073f69 SHA512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674
-EBUILD xrefresh-1.0.5.ebuild 314 BLAKE2B 42376782a3312f3ca5ec81464f3bb90ed363cfcc022aa5ebf29a641fdee2857563c212ec6e4fdf197b5726b04206ac25a33a22b1a6533a076a485d88a83cd75b SHA512 ac2756b65a497752bcc74eab9c85fa4ee3b736db4e3db8ce504c32673409641b141147e7f20e51d06048a6e491088196fede0239327695397b0c703638c517a1
-EBUILD xrefresh-1.0.6.ebuild 314 BLAKE2B 42376782a3312f3ca5ec81464f3bb90ed363cfcc022aa5ebf29a641fdee2857563c212ec6e4fdf197b5726b04206ac25a33a22b1a6533a076a485d88a83cd75b SHA512 ac2756b65a497752bcc74eab9c85fa4ee3b736db4e3db8ce504c32673409641b141147e7f20e51d06048a6e491088196fede0239327695397b0c703638c517a1
+EBUILD xrefresh-1.0.5.ebuild 311 BLAKE2B 45cf2d160fecc68de4a809e919064626840e1d1d5b91e8ee3c7245421c17be4193c3e499a2ba9ca797cf36ae76589295d591cddb7422cd12c6b812df2b85f878 SHA512 86af2598d1b33cb66210bb0389aeedfae44c5f7e241bfb791c32ef47574ed7d875e95b915f36737ac5a9254c2545e355d0ab0a4acdf410da03e315fef6aaf635
+EBUILD xrefresh-1.0.6.ebuild 311 BLAKE2B 45cf2d160fecc68de4a809e919064626840e1d1d5b91e8ee3c7245421c17be4193c3e499a2ba9ca797cf36ae76589295d591cddb7422cd12c6b812df2b85f878 SHA512 86af2598d1b33cb66210bb0389aeedfae44c5f7e241bfb791c32ef47574ed7d875e95b915f36737ac5a9254c2545e355d0ab0a4acdf410da03e315fef6aaf635
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xrefresh/xrefresh-1.0.5.ebuild b/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
index 04c0d14df91d..50dafaff47e6 100644
--- a/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
+++ b/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
@@ -6,7 +6,7 @@ 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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xrefresh/xrefresh-1.0.6.ebuild b/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
index 04c0d14df91d..50dafaff47e6 100644
--- a/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
+++ b/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
@@ -6,7 +6,7 @@ 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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index 72bab9b379f0..17c57e307758 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,5 +1,5 @@
 DIST xset-1.2.3.tar.bz2 142286 BLAKE2B 83ba3d7ccc259ae7b244049e558af6db9428b897b340537b75b6c534c7e8a11f36709237982ffe1ab5b523cef5834467bdc85c94fbe07c64d6eab6eef2c930b2 SHA512 7b2cf4b06b93aec9f6f868be3f0932a5d6e62968485f7eb742a9b775059aa2a49c9170404e0597fd41a5730c0bf321e371ee6b23bbcde3be054f768ab8d3d92a
 DIST xset-1.2.4.tar.bz2 145546 BLAKE2B df4ae52046af7f632e2f60386bd3b8d90b27db3e53ceb68f1056c9c5df2ee9c6d83d109a444eb99ddc031e35b91db0249ee56eba3180bc9a8a002935db213605 SHA512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
-EBUILD xset-1.2.3.ebuild 484 BLAKE2B c65456501368f777baa1d1592dacd46261e50cb050fcfdbda0d7f5b928821b0051c178f4f3266e2be4e09c5fe96536d0353e43a7c59dffb87e42bb6a0ac50b16 SHA512 1af33069ccd9e19c274b0f68e3e2cee287b9e1edc82623b60d691ea5ac3cd7268276f3b49b330fa2794a62d84b92598fbd75f16088f30110979fa5b67c447686
-EBUILD xset-1.2.4.ebuild 483 BLAKE2B f25d468c9d42b55c377d046e8e5368f025bff33afcc650c6e5aeadd0e72dea18887f988ca061e26556069336fda45078819b11bb3504907ae7f6d3389c645880 SHA512 de4c0678ce43b272b662a10cb5227d5707522b6977271d08c8a2ea60619a2dcce7001da8623edb00fe6f204705de189e19f77f10cac29bde6c69f1d66a5a1027
+EBUILD xset-1.2.3.ebuild 481 BLAKE2B 77a6667b5a60dc600a0b8020a1a81054588a0ba0c9abb8a1f8794855d50c146adf9527912bf22ac23158bfcd17e0078a9827132c4b05bcb4ce4668d9ae464635 SHA512 4feed7e94b16ac0847dfd2560ce9b4f65f151b82bbfdb79f4f6a5d2788dab4cf4cb4bd2e5fdcdf7783d3bec12d9a9c4525862efe0a2c51f0a83a17525eefd698
+EBUILD xset-1.2.4.ebuild 480 BLAKE2B ad32f3f8d9dabb9ff8df650df24a515c0738dad789ffebb85803bf64850ba4774a0120eda3d89ebda7aad64ea20d9b937be25fa0a8f7ea3c76bf2355d01655a3 SHA512 f5047ae36a8ca04fc6d9c446ef8b004eaf032703f5aba18cd6c4d13f665d3e588e6a4dae2c5dadcf735e79b7f82f4e5044126dd6a6481d043599c06a20ff6f75
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xset/xset-1.2.3.ebuild b/x11-apps/xset/xset-1.2.3.ebuild
index 9b5236ee783f..eeed78e4c258 100644
--- a/x11-apps/xset/xset-1.2.3.ebuild
+++ b/x11-apps/xset/xset-1.2.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xset application"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xset/xset-1.2.4.ebuild b/x11-apps/xset/xset-1.2.4.ebuild
index 82a531f01cfc..5add728f94e0 100644
--- a/x11-apps/xset/xset-1.2.4.ebuild
+++ b/x11-apps/xset/xset-1.2.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xset application"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index bb9d8ed6413d..f20e75852f59 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,5 +1,5 @@
 DIST xsetroot-1.1.1.tar.bz2 119977 BLAKE2B 7589dc6014c2f905dce4bc72c4a98096eba38354975c307408e1aeb06e27cafcf64ecda7f8e3a470ac25e41108b3aac688fa9d365a3ab41908a52d8044142712 SHA512 04834a8ca658a4aabe03e62588353102e8019d424e25fab450d48e6fc4ac358df5bb98a850c82c61e2495faabfe54f3d92d9563e77c83ace7fd69c278edbbd64
 DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
-EBUILD xsetroot-1.1.1.ebuild 387 BLAKE2B d4c7367617db3e5a06669b5b208acab0db07d4c35efa4690f746d816c58bfd56829d2f2f07b9ac07d5792065399ff38f04e5e99fdfbd5195af08ba5e985bf02f SHA512 148e65b47eb012f71a34ef73c3c8c5f0d4c3d31f6905173cb51e7e2153636d16c5dadf88d4aa3572bde25905518849ea148e98ff49ba660e02e67ce5b04ca094
-EBUILD xsetroot-1.1.2.ebuild 386 BLAKE2B 50c20e03ee444b6fe877c32d984219ee9935a803d8a8bab38df9986fe573c6dfb502140ee788f95c1ad24295b8ecaae824d38a89781d6f44ce0bf730c6c77bdb SHA512 89e842e33b465fa49df83d0922182264d498a5b2d0e73b34597f26e039e6858621acd77508a9892c9ea2c147cecc58193d7b851ec1458119b7e2ace54f3eb1aa
+EBUILD xsetroot-1.1.1.ebuild 384 BLAKE2B 763932128c9c3842e531a9f45e7c89c894acb5afbc5a211c7daaff5f258a92cf52fb9276245574e955af7ed856ced35fb7fe69922da4e066a2baf066e0788f3f SHA512 2f4cbd0535c35b04592688d4e714cdd0b391efafe637258a068b79945b21f2c803964c1b051fc1034ffb7635b2a999ee04ac734cff04da4996becbe3042c6402
+EBUILD xsetroot-1.1.2.ebuild 383 BLAKE2B 95775973ad5582592f6b97f221035905501faa09b906b65e4601837616a3b47bab7b4a3ebc5971cacaee9e2a13b1015724963378b296b7f099ed4b6c0e4fd19c SHA512 bac08c9f5ca3e31211ed7465c028fe1af3819bc4e4fc21006204a83f2476b38e2680a8d1fe239c640aa1c3e163523ac21bfe0caffc8a5c790c018cb6ce3834fb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xsetroot/xsetroot-1.1.1.ebuild b/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
index 05c37c9499cf..485282c50133 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xsetroot application"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+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
diff --git a/x11-apps/xsetroot/xsetroot-1.1.2.ebuild b/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
index 4d7b818760f9..fafdafddbe8d 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xsetroot application"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+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
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index c545a6a4c19c..1deb543afa38 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,5 +1,5 @@
 DIST xsm-1.0.3.tar.bz2 161012 BLAKE2B 2628e4234b5fed58ebefb35f454c36e268c75cafa784ed709833d5979ee4484ada8f315d75b6204e64a0efd0f1fd7a14662afb430c0e84bc81a40eefda9380cf SHA512 930a12272011ddd7c60e62b32b485c383292163f8aed6086c756f71cece62d0c316d89a6056751818b3b0ee26f68cca6e0fc914cd58d9b20da0a3b7ccf2145f0
 DIST xsm-1.0.4.tar.bz2 170933 BLAKE2B 05cf4614440f36da6ed1e8e0949ef6955da03d1fe0cc2d0323150b34ea01c293301aa49006a93fe7c44c842db41fb6b66a2f4a4051ddf2258143e54a6e99b390 SHA512 d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176
-EBUILD xsm-1.0.3.ebuild 824 BLAKE2B afb3a4ad3c84272fca9dc8d93696422b725be06d260c9e7fb05c6ad352233481ec57d8da006ab51958e63f11098b51ea5b599698814e2f765c36be1e219d92da SHA512 75ed5060d28478e515b73cf416c72f50a6abe9ccb21abc7165d1de020045e728a041241bdd12a852ba81558d703332a7e1ad950370dd317cfa044d944de2da28
-EBUILD xsm-1.0.4.ebuild 822 BLAKE2B 49e9ce74e4f50272fd4ef91765077a8a3044bdc6087c3b683139acc077383769efadc8ad268b2dbdc96599d7b6148f61e774f547631a2dd3e9d58674596158bb SHA512 6718a5ad16e7220a682e8624a67518807963e07d0d1d9d80ab8542f09a9f85af02994abd4fd0585c2eca2a241d50791d3b1d8fbfedbf91772c9a98278678af56
+EBUILD xsm-1.0.3.ebuild 821 BLAKE2B 4160b60d92cf42db9b26bb82aac3c0c222e9706c0b0e9139d93f64797b6348ce5f8b88f29c65cf197583d215fa9a5b4e07148effffbd493e161501d987648c07 SHA512 28e16468be7bd7795edcfbea7c876982c3a0c5ffe1ecee8b71b50ba63dfd2d7dbdd3bf4ca24a65472863d8f3f55cd53a3e146b9c763d930835d3d42901bf3cae
+EBUILD xsm-1.0.4.ebuild 819 BLAKE2B 26991d3f723feb4c99e2be8b30f25ca766317d3861697fdcde15c55f1e65192ef922a88640477ec1d59b82c964e6f06768437fc32c97da5551fd1001c1232672 SHA512 e51bac35c0f0eac4e80f7ee7a83f9418b4713d459660722785cf9ccecb24c0c53d16fce3d76e576e7faf77c6fdd372ef2fb1acfcdb16d09745e5d33d5576047e
 MISC metadata.xml 333 BLAKE2B 0b142d7cf4b255c50a9e616434af7ff1db6a2aa0d3467f43d3e22ce6ce55a1bae7ab18eaf092bd5ca002464dc046bc2de62b3738425cdecf4ad15727b20f2d18 SHA512 5496dab87579d1d5c218ddd1ef1e8b63e73ed8d0e695d3be9577d862fc03a775b9cd3dc82abd356c1ef124522f4ed07a5f289e5e3355bb76c2d8746e6cf5a7c2
diff --git a/x11-apps/xsm/xsm-1.0.3.ebuild b/x11-apps/xsm/xsm-1.0.3.ebuild
index 7a615c51c74c..ac51d3e44362 100644
--- a/x11-apps/xsm/xsm-1.0.3.ebuild
+++ b/x11-apps/xsm/xsm-1.0.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X Session Manager"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="rsh"
 RDEPEND="x11-libs/libXaw
 	x11-libs/libX11
diff --git a/x11-apps/xsm/xsm-1.0.4.ebuild b/x11-apps/xsm/xsm-1.0.4.ebuild
index 65dfa19d4128..837b618fd164 100644
--- a/x11-apps/xsm/xsm-1.0.4.ebuild
+++ b/x11-apps/xsm/xsm-1.0.4.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X Session Manager"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="rsh"
 RDEPEND="x11-libs/libXaw
 	x11-libs/libX11
diff --git a/x11-apps/xstdcmap/Manifest b/x11-apps/xstdcmap/Manifest
index 58bea3153444..c40a848d56a0 100644
--- a/x11-apps/xstdcmap/Manifest
+++ b/x11-apps/xstdcmap/Manifest
@@ -1,3 +1,3 @@
 DIST xstdcmap-1.0.4.tar.bz2 126269 BLAKE2B 5c2fccbc374871738ae03d722a045cc3ffd6bc431774d76525653e70c5ddb9a4281b2372996ff492807f9d4aee414eac1016f2696ea4e1979407a5b7cf37e1b5 SHA512 2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f
-EBUILD xstdcmap-1.0.4.ebuild 305 BLAKE2B 16650fcf95a320783242b3472703425eec15bbfbb1a9b37234d1c5d0b7b3d71af0a39b7378dabfa9f12683f982c2cf003d2562919ee32e900da75775afd129fe SHA512 e9169bb8f273711ee4e2aebe4ead5032fe359cc03b63cabaf98df122b8413fc05f8e7813ed76e544ed8934ea7f97abc9121c791d8af9393aa35311f48338c38a
+EBUILD xstdcmap-1.0.4.ebuild 301 BLAKE2B 59ed972ce0f34058bdbb26086d526accf8b901a8ee63bc426baa5ddb25bd8f66d1f371ddaa2d15b4fbddb85ed950cf574306decd85f04095e70d6490e279d037 SHA512 9679aa3fa1078067dad6e946dfacd879be467b7859a1c570c5aa3d33395feb04f91db25e8935296c5cc28a75348c245eadb07c69a14c56a58c9b296a2d0f808f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild b/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild
index b57b833cadfc..f998ec1ba1b3 100644
--- a/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild
+++ b/x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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 standard colormap utility"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
diff --git a/x11-apps/xvidtune/Manifest b/x11-apps/xvidtune/Manifest
index 7914c56c50f1..7f0f0f764762 100644
--- a/x11-apps/xvidtune/Manifest
+++ b/x11-apps/xvidtune/Manifest
@@ -1,3 +1,3 @@
 DIST xvidtune-1.0.3.tar.bz2 128492 BLAKE2B 87271fa736f1c377f48f36fbb63a28ad0e6327ca612b681328aec44cafa839f5e1c04b239907e25f547b5a69e7dbd92bccd3500ed20760efcf18fb570078241b SHA512 0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352
-EBUILD xvidtune-1.0.3.ebuild 385 BLAKE2B 8fe8a50ad2f1141b180b4b96cc58fa8a51930b01c68d0412e03a619b087f8dafd7d475f88e17c7fd37af3263f1e09eb5d234ed86025fa1dc2e0128906f6d5293 SHA512 95a22bc2e63aff6f45c7e0a387d48a52c7da20055490b944bd21dc13f923ed7723e00b43bf1e46fc6adf689b04cf37883c4ade9701f7fcc9148063f4320da4a4
+EBUILD xvidtune-1.0.3.ebuild 381 BLAKE2B 6905030bdcef092cdf2e294ba12ba79839e13cb80199dbf6240345119e69437f06178ab0f22a923a86ef0a8ee6cadba27d743ac8c3970989143f6d2874f6690c SHA512 be41f344555bd8632a9a8e17409922a52bad12423334e4a95433f240101325971f782294dddc14800a9592926f0209b11b855b79f7a1d3f0d42b116545650f20
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
index 2f06f4dc1e39..77c7d67dd577 100644
--- a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
+++ b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="video mode tuner for Xorg"
 
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xvinfo/Manifest b/x11-apps/xvinfo/Manifest
index f480581235d1..9c9577e1907e 100644
--- a/x11-apps/xvinfo/Manifest
+++ b/x11-apps/xvinfo/Manifest
@@ -1,3 +1,3 @@
 DIST xvinfo-1.1.4.tar.bz2 126503 BLAKE2B 54a1e08913cd51cfeaced1c704834e0348d02cfb2e606f2cbb103acfdf649595a77680364bfb5bbe684a15c743d2d18b6031e77150d0e9fb0d3405d474accc3c SHA512 85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e
-EBUILD xvinfo-1.1.4.ebuild 344 BLAKE2B 0e4faeba5c149a5454f2addde5542412238d22b58b4a2a4f10e84a74ef51a841b7401517ffc4ca86d5ac766dc2e277cbace4685fe698a8a00683d64cce4ddfbc SHA512 f6f05e3bdbaba6f92cd10c1a16cda6b3f20209cd70aa2a0009dff859c6e373afa4f0eb570adae581bf2c4c82d3570a42498d7061783f6088c44f895f73889edc
+EBUILD xvinfo-1.1.4.ebuild 341 BLAKE2B 7629a5d12ba76ccaf48bd4b2e02e8597770a2194b08066317e50a10776632d3703c769151757e4a4a854f2e834dcad9d5018dfcb30ce53bce094307dfda186f1 SHA512 d4eed616dc38f031cad9e94eb1523505b648c3578371131cfcaffddfe9e7f272a9e561ba24144ab887131753c6918deced0b13116e26e702276b0c59b0b28df2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xvinfo/xvinfo-1.1.4.ebuild b/x11-apps/xvinfo/xvinfo-1.1.4.ebuild
index a2cd9458e36c..e3a23d900b39 100644
--- a/x11-apps/xvinfo/xvinfo-1.1.4.ebuild
+++ b/x11-apps/xvinfo/xvinfo-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="Print out X-Video extension adaptor information"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXv
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index 77a0a38e4ae9..a6a566f19c03 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,5 +1,5 @@
 DIST xwd-1.0.6.tar.bz2 144548 BLAKE2B 56560a36931d15f6f59d6c6548325e559534cee10cb13b07722bce5b47d7d2360244b29e88a66a58ffffd2209336f0ffb14cbabb0369c144ceeeabb4eb184b06 SHA512 8fb86cbe163631fdb3f49ad6bb648ea599d7c5f9b11aba7e88afb86daed34cab88dcba057e0c5ca3e4e5904598b279f5a68ad43a64dd1053d647aa78523a806f
 DIST xwd-1.0.7.tar.bz2 148026 BLAKE2B 9088105a07db38418352cccafaee4ecc084940e031416358291e6b5a6f47b2c8972928f0eb3479db4ff93b3a54a24ea4231f4d8196464f14ac4d7a1b5bb7ecce SHA512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e
-EBUILD xwd-1.0.6.ebuild 441 BLAKE2B 5252d8b780f41dda594df8c3d5fe507066072651b793e317ec80213d9e6321e9b947fc0a2f6382a037cfc49a3a352d7e9fe8ccc9e47ec2b0990e9bd0c4cd036a SHA512 e8f5a03566fbc014cd83b1d4aae54091158485caee73c33e30e726c3ace17c1168ce357f54c0e36226e09954a6e549b12ccf43651a2f66e8a00ae89c09941a6d
-EBUILD xwd-1.0.7.ebuild 441 BLAKE2B 5252d8b780f41dda594df8c3d5fe507066072651b793e317ec80213d9e6321e9b947fc0a2f6382a037cfc49a3a352d7e9fe8ccc9e47ec2b0990e9bd0c4cd036a SHA512 e8f5a03566fbc014cd83b1d4aae54091158485caee73c33e30e726c3ace17c1168ce357f54c0e36226e09954a6e549b12ccf43651a2f66e8a00ae89c09941a6d
+EBUILD xwd-1.0.6.ebuild 438 BLAKE2B ee537e795d13cc8b49464a555ea4f81169848fc1cc9b0777949ea0d8a630001e45eac206343b3ab2a19d8a169f80de765332d69549103b38704deaef8b1626bd SHA512 eb338d80b5aa7a5b1fc80b9398d096e260f67ad5a3ffda75318e0c45c65e4a80b4ad6eb4d204a9c3f5b9a422c325a6e3ac75ab31a729e43146647a3b6feac950
+EBUILD xwd-1.0.7.ebuild 438 BLAKE2B ee537e795d13cc8b49464a555ea4f81169848fc1cc9b0777949ea0d8a630001e45eac206343b3ab2a19d8a169f80de765332d69549103b38704deaef8b1626bd SHA512 eb338d80b5aa7a5b1fc80b9398d096e260f67ad5a3ffda75318e0c45c65e4a80b4ad6eb4d204a9c3f5b9a422c325a6e3ac75ab31a729e43146647a3b6feac950
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwd/xwd-1.0.6.ebuild b/x11-apps/xwd/xwd-1.0.6.ebuild
index bdc15d5400f2..8cadf6a8f429 100644
--- a/x11-apps/xwd/xwd-1.0.6.ebuild
+++ b/x11-apps/xwd/xwd-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="dump an image of an X window"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+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."
diff --git a/x11-apps/xwd/xwd-1.0.7.ebuild b/x11-apps/xwd/xwd-1.0.7.ebuild
index bdc15d5400f2..8cadf6a8f429 100644
--- a/x11-apps/xwd/xwd-1.0.7.ebuild
+++ b/x11-apps/xwd/xwd-1.0.7.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="dump an image of an X window"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+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."
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index 6d325c3294c1..27e63bb1cda9 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1,3 +1,3 @@
 DIST xwininfo-1.1.5.tar.bz2 172496 BLAKE2B ad657a96b74190981ecd2d946d1b81fcd0515a481f0d6d880d790b8e1eb4bf7e85bdd9a74b631acb88c2254839afde7f6ee79647af66c357c8ef4199aac51f02 SHA512 a3268bbeeeeafac94e589fdd47554a965910d40df7cc3d9c36c7c24fa4f5dd49615484d5916ccb41efca9cd4cf9d8981a4c60953b921220b3f4f57f9cce0e1a6
-EBUILD xwininfo-1.1.5.ebuild 418 BLAKE2B 0ad4234ced1197bc3dcc58aa9f9fe8efc9d2ae6f1635c379c64e7f81b92b83ef38e860a4c4b517e161ae40349b4b635f634e5f4980121487884ba175c391b1df SHA512 18104f9a4ed8bf242d265be8bf8b0db7606247f70ca5324fbd4178d96e80f11bc1cc754fd7720516065c4f4ace7e132061d4cbd7663944fcbe08eb65249e2ba0
+EBUILD xwininfo-1.1.5.ebuild 415 BLAKE2B 5cb38b8c7db1e04bd7c7af52ea1a27fea831b6b00ffb7ba1400a321ea18cf336b7856a1e81246b3fe89de54785fedbe7233e5482faaa3bff9e7f94f7d4318deb SHA512 648d1041b2c13df0df6a316497c771b6e510737e62073be089fc39721e0051649038203c45263abb8b6f268c1541d0420374a3cb141bfde62c598f69765f20f1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwininfo/xwininfo-1.1.5.ebuild b/x11-apps/xwininfo/xwininfo-1.1.5.ebuild
index 244764c0a93b..e9fd791b1bef 100644
--- a/x11-apps/xwininfo/xwininfo-1.1.5.ebuild
+++ b/x11-apps/xwininfo/xwininfo-1.1.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="window information utility for X"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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"
 IUSE=""
 
 RDEPEND=">=x11-libs/libxcb-1.6"
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index 2f5a9fdebcdc..7aa99ddd8b17 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1,3 +1,3 @@
 DIST xwud-1.0.5.tar.bz2 133376 BLAKE2B 27ce8251ae2a2a87393655e1824121dd54f75839a8066405299e9052bf2c55c6946cd686f285dca1d7339029d8ca8b94e4adb3efb485b42bd347db212b12858d SHA512 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184
-EBUILD xwud-1.0.5.ebuild 300 BLAKE2B 0b93e1a5c36aa56966e4d8c96aefbd0d2d340d9f9315168fa304251422da1af57b44df1c4ca9bd8fbd3463c7c8290b45e575007e00c7f5437f93f3ba2160c847 SHA512 3aff3a8b34ed83e7e328b2ac15cc600dddb3e453ee58f5bb21115185be71dea078f56b248bb1801a795aaa92acea5f501418b5b39ca1406e385d77cfd40da862
+EBUILD xwud-1.0.5.ebuild 298 BLAKE2B e124c4fd47991054ac648210a0235e87952d57da2822e4ec5a1dceeac6df87663d017f12d6b21c098daa0537748be93c2f78d01538a9ed75795c488f8c79c417 SHA512 6d4248ed7a876081eef46de78403a34f07ce678599413e1048bd971b7b19c60466fa2ff0c8337dc614cb72c212a6b266797389e54372609be80c65bd6d26af6a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwud/xwud-1.0.5.ebuild b/x11-apps/xwud/xwud-1.0.5.ebuild
index 4a1e3c60b9f9..095f82e038dd 100644
--- a/x11-apps/xwud/xwud-1.0.5.ebuild
+++ b/x11-apps/xwud/xwud-1.0.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="image displayer for X"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /x11-apps
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)