gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /x11-libs
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
170 files changed, 339 insertions, 222 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 59a3f24a476d..1e2ccb991871 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
index 8de4ca958365..25e45e2f012b 100644
--- a/x11-libs/c++-gtk-utils/Manifest
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -1,13 +1,13 @@
 DIST c++-gtk-utils-2.0.27.tar.gz 2608722 BLAKE2B 06f5663435a75d7a5560b982574f06c124842f2cb77fa1e4e171428944916da7b4f493294e0373243a062794739336719f548c4cd3b3e6789fffa3eebf0115ba SHA512 8d6c12797d54d9b379302bfd572ded8b9e6e64ea5911ba4b13a0dd6d588711ec6d10bc3a83af8cab23165feeaae8873de5c3945cec94954590806f60490038bc
-DIST c++-gtk-utils-2.0.32.tar.gz 2753596 BLAKE2B 8b3cccca9a5229084df5c929b5ec88f300f57fb985961d56ec41e76f237247d8853e3cbb621590fcd5adb41dc57a3da0c48628310f89cec2160ee23ff19ca615 SHA512 583b6199c3c8cfd3d13157e871e4562000ac8df63bb10dd7cc44faf380cf10ee8e5f04a2d9bd0ed2ffb70b8c11cab70006bc525024790657e52e6d082ec34b38
 DIST c++-gtk-utils-2.0.33.tar.gz 2837861 BLAKE2B d76333ea2c285e35c9c59ac6705c6c4321dfc84d638c2e95070b262b5b46bb6a2d8457e95febf2d3673cd50e78e35d3cd58ebc3ceb14c9e912d0b8a3437191c5 SHA512 dda1cf024ee80e872fc93e7d69203ee0f927b93c269100f9e80df42d53899240bc391a3e8bfbd8abd6549ace35da9f8f60952c5a1e905185d28561f594748d06
+DIST c++-gtk-utils-2.0.34.tar.gz 2865687 BLAKE2B 4978bf9ce5ce364db5ad51bcb2d604ac2e7a22656e2affbc39785b7f27db6c75a77c1965e3524b6c617836aa5ae840c4ef45e0ea65eff01f12acb1ea770c04b2 SHA512 f155e50d152cd1444d282c47e995ea8cd93ead529d0cd86c11d548a266a567c83cf3367cdb82dd8d68af1bce28809c957d3e39595bcb0affe87db8f48718f6d4
 DIST c++-gtk-utils-2.2.10.tar.gz 2643918 BLAKE2B 3953b8acb7e8fcb47cfc55ade75baa6dd344e2e6e25187e67346137ef4cc241817c893597d75ae58462aaf0a0b58db5f018fd053e1da0b38716ae41c8ed40af3 SHA512 a0ea673988c95404846da6af6ff7ea51978653df3781be6a8323db5fe96826e94b0de9bbda5d3b821bbba2286dda6e66f4c099de4cd8da7bdefa4caa684d7a31
-DIST c++-gtk-utils-2.2.17.tar.gz 3029826 BLAKE2B 5bfc3917ccfe89b69ca5e3fd614051c42f1750c40de360f3963c9ed7e24c93f6879bccd0e44ddf658d0aeea40d15f564cee607a31f9de98ce035cfcff5db9f64 SHA512 45b4276891a465e949889b4dbdc7442fa637a77a1e0ce974f58337293591a10bc4e11776e772e6f7ec220e083720df273f6a1768702443abfaba4105e90f4350
 DIST c++-gtk-utils-2.2.18.tar.gz 3031253 BLAKE2B 46b06cc8af02336784da301386f1eac7e5f70a6c03f1507baf8771958f120e44aa55e82040608b83f1f6cedbf6081b33006a790b97c57114367b181e0939adbd SHA512 46fece74e3a3908573cfe161c870f63b9bd442eaf9eea6da03843dc03e010ba073696232206c37a10dd7eedf1aa748cedbbd5e3a58af1cabc98d804095aa3d54
+DIST c++-gtk-utils-2.2.19.tar.gz 3060284 BLAKE2B 5edd6a5042cb79cc95e8080cd76d284dfa47641c8a01a6d80ff6cfdbecf5797b6a99a5b7f209c35e0da9a2bc5331225dd2f13f30bbcc3bbb04aaabdadb3cb643 SHA512 c6527cc32b6a14a5fe24705a91a6918863f418ec8a274d24c79b65e905efefab53a5e53edfa57b31ed8b14ab8d9d26b4876861cab37e3702df456feb84e1cc5c
 EBUILD c++-gtk-utils-2.0.27.ebuild 814 BLAKE2B 9bec2efb2c1780aade415a7d1b5798ae06f5f7a974d1be5bf040e3fc36061b7e96d8df3e87cb94538995272c70b4b55f74d42ed0be041c148b41671f9a9d5bbe SHA512 7d59db175d274483e9bd6efc88ec69962a154a2c4c9efe259844a20eb0dfea0980b031fe1c609bf9a64abd846a57a0f933050eda73ac619d078058f76e337629
-EBUILD c++-gtk-utils-2.0.32.ebuild 816 BLAKE2B 519c5bc25fc8b8a75709c6f87613f4a1890d46e5cfc74cfeeaa36fb0f1f011ebccc047388e207d341e09089ecb9ad2b997f538bae423f0ddb5908e3c0e0e19e7 SHA512 5221794b86eff79d5ab6a590af081426fe9535faf00b590532cbf72ceb9e86b0b7c6da1a6a706dd8187d700c3ea42884ec76ca51ab7d6e7b99bda7c6af382476
 EBUILD c++-gtk-utils-2.0.33.ebuild 813 BLAKE2B 36d37c3c979d56a4f4926937d891c662f5cd48e8f8e830997d5e52377fcb9eacb53f17f54bae23b1990a5745d374b2ac0ece7092ae849896f0893e5a2560ff4d SHA512 b1a597e0bcfed74a749eb62fe2a8f479b5888710e975c8ba4affa5ee2c52b432a519014a97e1861f681187972e86cf0f32175e0b3e2532b8427c811ca789fabf
+EBUILD c++-gtk-utils-2.0.34.ebuild 819 BLAKE2B dd0217fcc2b85405a8dde22e2463f24a91d52837a896bf2889ecc6e1a4de3b802c96f520d9edda3bbbad3c0082a7980744020e941292e9237a9c65f2a4fe33bc SHA512 75d9c818b6a1d9c0e9bfc63893e767ffad7a0eb0e480b2fc46072c3e3d8600713e35c282e2d28179f8151a60e3bbd21810292132b48b8e0d907abc66502f0f18
 EBUILD c++-gtk-utils-2.2.10.ebuild 814 BLAKE2B e928b81d913cd8c4b7727b8387fcbf50d8670aa4656978eeb83cb6d237466a3f9fc28b22b19bd2ad42d1efe0ea045b5350947a6041ff9680f2e4796200983e0f SHA512 1d6525bff24df95ae55ca10e865e7b2a594a7f2ca6c193c1ca72e4b5f332eef2268762f547f626db7a97cf4fd8004c9fb2d236fcc7eea43d2af070d49af383ff
-EBUILD c++-gtk-utils-2.2.17.ebuild 813 BLAKE2B 3b7825bcdf88f715985f2ba281f2f09c0ddc220269bc5f1d8f9f1308e64d135b56fce98b6aa54847ddfa771417da8c0504c0d6d04e0c3d10d81b6f96a383f3bf SHA512 a43795e6bf4b61064e953a7a39c8603cc497e1eb7c2170b12ab084d0bd62b1cef17c2d4648b60aca65c55a408bb7db4457db1bb78dabcd32210e07f83096f3b7
 EBUILD c++-gtk-utils-2.2.18.ebuild 813 BLAKE2B 3904f3d6c1749f6fc579d21a61d017117ee6b4238328e98ac8b3f6383612027f89e6d52e8a183358df6922d205a5720750a878d71bca1e685676304fb37917ce SHA512 681972a323b18d9693ad450ffa2d29b7063a1014ae95f937272d2cd7c5c68ba92d8421a4676e6bf4480147215f4b40fd711f8371f18e77b7636ce13d461a24e9
+EBUILD c++-gtk-utils-2.2.19.ebuild 819 BLAKE2B 9c0bed68cdc5dde5b81703e0f4179a74595684ff59346ad718f552311fc221a6dccf1dce973b177775cc3a06f3f958f1ec3042097730bab2a4f1523af9860359 SHA512 fb8654660a445477999410042281582e65aceb3122e83bd346fdecf480bc08cdc8554080a39639b15d80db726c93274cffaacd84da891ad6b0c71757a7ff3c23
 MISC metadata.xml 359 BLAKE2B dbeed9c4bd60595eb059509d6ca0b7a0c5be034480fef5144b5221a58ac0284b1eb7dd4f1cae5ddc1487aed1f01d4ff79e3b3480bc3e46180e67cda078049e77 SHA512 531e6b6e9c7fc1668965508fa32687fda9bd697e1d46ee4de064a574e505365e4436bd50638e4eea79c42693f2f0feee3d4305cbc4e2ee09a9cb1777f23245de
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.32.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild
index 54010a2c72e2..8a1ca115682f 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.32.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
 HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
@@ -19,8 +18,8 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
 "
 
 DOCS=( ChangeLog )
@@ -37,5 +36,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.17.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild
index eaf554012b57..d025f98f1065 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.17.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
 HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
@@ -19,8 +18,8 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
 "
 
 DOCS=( ChangeLog )
@@ -37,5 +36,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 743296dad640..28f95a61ec79 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,8 +1,9 @@
 AUX cairo-1.12.18-disable-test-suite.patch 390 BLAKE2B 49db479ddcb636e80483357b291d66ae563d8dfeabde2f7b017fda4cb272cee856e9d29dfddcc22e3cfcb3e2ff62c9eba802ace0e5ef1e49aeeef26002482ec9 SHA512 097c1a32e007fb6852a0df1ad7f7eab6d00a422247055edf140d3f2b819122b16a9c09e21b9a601766a7facda1961262e68b078944877cab0b3b234eff149783
+AUX cairo-1.16.0-binutils-2.34.patch 587 BLAKE2B f2a5ffb4bdb4f2b63f07d0135e63704629093008d8479b19353d790012e8f1cc93707694ee79f71cc6e81c008505e1a069694231357748b54dc45c8bb2e94bba SHA512 ad01c6f651fc66d9a2853fc95f2402b9413d71e6353fdce609e0849a3477abbb2128e460a9c166adbd9c3da80786b2382b884a1249ccf22b8600ab4930d2b0c7
 AUX cairo-1.16.0-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch 751 BLAKE2B 9b693598ac8fec28c0479544cc02dfbd1daab171b88bf7b1eb6ee353fdd32ee4228f24723d3b4937b3f30838d68d2a9a6f87b40d08896b59d36345d7e9447a32 SHA512 33d8454b2173c5be1f53576c143781f2b802ee961cef496d6fec5ba58554f4302ea6c351dc64f133d93c5495dacb3d387b8a201bfc415d54f8c77e41e877d319
 AUX cairo-1.16.0-pdf-add-missing-flush.patch 914 BLAKE2B 6277dccf5e6fc70d885548b4814253084c5ba7946b29ee5c5209c2c207721d9699d9fbab83e40f6d10394e89fe7a23ea5dc194cfcb2495e3ac2b075e22fa83bb SHA512 569cc28538333cdd907e3c9f26dd6512e48188dcb761284f2414936d60d4239d7ac15a5836f1f390d4881cce71bfb62a0679e097386116ecf807ecd03bf0f03f
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
-EBUILD cairo-1.16.0-r3.ebuild 3814 BLAKE2B d12420a860c616ea33e141583a7dbddf08c9987c5b7603e9e8f2f349f1d9ccb18936aa91df2754454c13d0f79c496b4fa85968d93d6fd3f026035154c9d11d46 SHA512 fec0544504037a1ae69c97555854e6aab30649708e26b57bbaf30b716d89f1974d6aa6eebb559d2fa783e92b25ba837ef176cd4cc95a48b257de4b145ca43212
-EBUILD cairo-9999.ebuild 3698 BLAKE2B 85e189c7eef5e3845716c58d01c4fda9f1b6b4cb7b4834d2d4beb57020c615cb0375942577ebc52e1b28761c615438bab48c8e77b262b165a4e11646eb3f1325 SHA512 8406d49f3c2c3fe2303054862e9366f1686a5ae56c4dc7b2f8574c303408f4422ad3218b853ce6dbdd4d07bd9b2fea4b529459af3e097437294432cffa365a9f
+EBUILD cairo-1.16.0-r3.ebuild 3930 BLAKE2B b625db84805e84b599e499606a4af7f90dbfb3239c2bc5f3ecf8afe1c0f6c31b04e7d9bb3edfacff729f7b90e6d19aca56b5063506780a2df25140c29aee1672 SHA512 5af5f30d24bfcbb4464a8ab7254a2f14ed8ebf72c0104e69547d0b4272e67c3f721ab99b37444aedebbdbb662f8532edc484db976a6bcc3e106eb67bc0720b52
+EBUILD cairo-9999.ebuild 3813 BLAKE2B c3c43b4c79874688dc7a3ec37af105368cb7c6f3819bca98f4a754fa9ef24b456fa659ec2294082d55ed8029d36d81ba1c15e7f689fb188f4ab6287d1d62d019 SHA512 74812bb9a14a0f5238e0e2f4d67146eabddf8b5b056c463c8835ca1a2bf43e29e81789d7ff403f4f9fd007ab418c5701bca5afca9a97be4d2c7fb1cea08c8fd7
 MISC metadata.xml 709 BLAKE2B 7cdfba4d24004ca9d45af33b49ec0f27344306a42d2269010957d085f527a8ef6e95b521f00344e3280852b1b57d06f4f84ead4b5e149baac7a2c5a48de44d14 SHA512 5ff7d97521b43486f6a9d51fe36c7546e229a66deeb308d9f5f84b5473678f5db869d3f58634d044fddc00af499a8e03699b22bca0582290b3a322dd6ae66b1b
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 5c4c80e79af3..2d3601c7a396 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.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
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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 ~m68k ~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"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
@@ -67,6 +67,10 @@ PATCHES=(
 src_prepare() {
 	default
 
+	if has_version ">=sys-libs/binutils-libs-2.34"; then
+		eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
+	fi
+
 	# tests and perf tools require X, bug #483574
 	if ! use X; then
 		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index d5022d1759a3..29d74b12d970 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-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
@@ -65,6 +65,10 @@ PATCHES=(
 src_prepare() {
 	default
 
+	if has_version ">=sys-libs/binutils-libs-2.34"; then
+		eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
+	fi
+
 	# tests and perf tools require X, bug #483574
 	if ! use X; then
 		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
new file mode 100644
index 000000000000..03daac0eca4b
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
@@ -0,0 +1,20 @@
+--- a/util/cairo-trace/lookup-symbol.c
++++ b/util/cairo-trace/lookup-symbol.c
+@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd,
+     if (symbol->found)
+ 	return;
+ 
+-    if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0)
++    if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
+ 	return;
+ 
+-    vma = bfd_get_section_vma (symtab->bfd, section);
++    vma = bfd_section_vma (section);
+     if (symbol->pc < vma)
+ 	return;
+ 
+-    size = bfd_section_size (symtab->bfd, section);
++    size = bfd_section_size (section);
+     if (symbol->pc >= vma + size)
+ 	return;
+ 
diff --git a/x11-libs/dnd/Manifest b/x11-libs/dnd/Manifest
index ae6e9abbb684..55c96c15d755 100644
--- a/x11-libs/dnd/Manifest
+++ b/x11-libs/dnd/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile-fix.patch 1139 BLAKE2B b8e6a2e3d7c91eaccde9cb47228a7a810d313e5f0e38fe999451a50078ef86ae66e22dc6df8a2430c1d1e6d4c6b84897f2894158bfddb53325c12ebaba6add50 SHA512 57785cec0adfef150f9560be79cad9f6170c0476060b7653705fc8a2e17e81c93996a4ca1cfa11cece609950e8d4afcae113f2169a6b5d622494c3ae36cd6c26
 AUX dnd-1.1-gentoo.diff 1532 BLAKE2B 5bc035212d46f712b0f8ad016a0fc649f0b36f19674e8c90eec0b2a54a7a6a8e735bfdcf4d4afc0d5792236623a9c43b34775053704e8ad4916488fe55458edb SHA512 68e3fe2a8c36a1b9b8bfdf57ef4eef1e5abb11debd160633cc0d323cf90b1ba579ee87aad82fa8e29b086cbbcfe19326f2202f6191749059cfe638fa7940ec5f
 DIST dnd.1.1.tgz 227598 BLAKE2B 3d6bc4644d492cdfcb9160b87b1c8d2a0f0fa3ae30bfbc948e4327b390f80247c4e4fac562c14972ede2f807e11503d78edc845bac53ad5c5a42ce0439e60c6b SHA512 8644d669ea6553b4e99469f30144286e262fd64379a00b8595d1574d0f4f0e504799ed18979a9036cfc89d74074d325ffca94b4147e350969f3a1c5ff9cf0ff8
-EBUILD dnd-1.1-r3.ebuild 724 BLAKE2B 009d9442b6bc5bf5e5589861ca2a4f33d5cd5c1610887ef90c3ff182d4652b408604c6d56e5f7c5ad3609acf719eea65f66eae3c70b64b8beda67313c32ed287 SHA512 c23e686f805989715fadc617ae97fbf8a793ea4b43c7a6e626983261a718aab84789b9921a89f9cc6be617686f9c74b5f0af6bc6ba93d37dd49a5ad886178679
+EBUILD dnd-1.1-r3.ebuild 725 BLAKE2B 30c3f81018c8f89680b3efd9717371e797a2f6697e4bc30871aee5460863fe407b95002e86c5a0efe36b7b8a03b2cd67c23e46457c907c9f625dc8b554079032 SHA512 87fde76b0283ef7b292cfe35c484488d31f0f14a6c7bc55cc3a137d8ca101d00018c46385a971284d4206680278a23b8eb64de6554b1cf679a83a7c2dc28675d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/dnd/dnd-1.1-r3.ebuild b/x11-libs/dnd/dnd-1.1-r3.ebuild
index 3abbc01dae67..eaeb706acf9e 100644
--- a/x11-libs/dnd/dnd-1.1-r3.ebuild
+++ b/x11-libs/dnd/dnd-1.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="x11-libs/libICE
 	x11-libs/libSM
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 4b99df088c28..372674604d95 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -16,7 +16,7 @@ AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a
 DIST fltk-1.3.3-source.tar.gz 4986376 BLAKE2B 866d26cd8d7d1e985010f7601598ec87b44674f55d019239ebc0cbf8d70e04d9d1bce7a7c8463740bcd4c4a8ffcc8ef5e44b3f0cb591358d53d513844605c868 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
 DIST fltk-1.3.4-source.tar.gz 5284217 BLAKE2B 87da82cd04abe81cf095b92b997d4ca0fb7d77fbbb5602848f88ad79e5e41c9bff64b7c948b408b83833fcb658c07b3fe487f55c30357484fab444faca7e990f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
 DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
-EBUILD fltk-1.3.3-r3.ebuild 3759 BLAKE2B 94e3155d506b27679db23dcd61b3c74e3c8b8bd08ad8e06417b258ca7acad1b42c5ba44e73619e847ffeaeeb1d56fc7fa19a905061da754dbf746f14680731fd SHA512 a4c311154df42c8d5d60d02cdc969ad061879cbc929ebabf2f7d2e551594f1d1d81e43f84c62ed1827acec0aa305d447acfeff45996b36b4aec5e6e1be3e3fb1
+EBUILD fltk-1.3.3-r3.ebuild 3760 BLAKE2B 0a4f21a64ff83bdf1df9089e40b2746de33361bc6f201381f9f52f33466a0f2ec9a767440ae1f729f7badc0df87951aef59221bb374d380905660adc9589a63d SHA512 e804bfbf5ea2c2e58914804a7651603dda0e2723274246b6f90482aeaa973f2b4d345555b9bdfd29129dcc72ff31169b271b991a808b5bb11ba786414b469337
 EBUILD fltk-1.3.4.ebuild 4316 BLAKE2B b024fa783f7ddcb27856acb69a8a74c6137333f5bfe9be83f903155e387c0853397e1e0de08765d0a949e45dd6c6bc81badecf31f3db85a8a947856cd3931c3a SHA512 812e53a8c00059c4c384220596065fb3f9aaa9dc1d9cfad44c4c43126bf81a5357cd57738c616e9052e2183105271e672e269f5f3c74239e0bc66cfab61eef0e
 EBUILD fltk-1.3.5-r4.ebuild 4445 BLAKE2B a19ab85242cbc81e64f6111253a6e3319f6601e07787f34b4c2c29c5b13c459580e3cc866148a955c6b1585e3119d81d3a09d149c935ad93a0d8ff7c03d33572 SHA512 3e106bf157918b575fc43d565a6a8c0e0be84520d1f7cf9e01254d7da3e9d8c2a820ecff5320c44103f82937f77f91a87341d61ba9baacf604aadd885e30c7d2
 EBUILD fltk-1.3.9999.ebuild 4473 BLAKE2B 3ae316ba98fcd88c7344db7c78ca497620283eadc7419146af71e421862c6fdf30d02ef2e51e9a4d3e7bfb09dcaccb1496b1529e38aa20849bf29f3f959d2617 SHA512 ec27297bad9358c6ed4339c138fe38e69be71c386f0d0ac550999d1f31b4f713203d36cc2498b986c3e1aee82ffc8a1df4e8d61a93d1ff44d4109809f360bbf7
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 01db48d25b2c..923d77f56856 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
 
 RDEPEND="
diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
index d4bf0d979b7a..65d457729bab 100644
--- a/x11-libs/fox-wrapper/Manifest
+++ b/x11-libs/fox-wrapper/Manifest
@@ -1,5 +1,5 @@
 AUX fox-wrapper-2.sh 1905 BLAKE2B 1b437efc5d8fa8b4d12ccd84469b1c6b8c19cad06fafcdca19304f352edb97e645815411a49ff1aeea1347b3ad024b40bacb761727d32c1d2692e2d5a040f893 SHA512 9cf96c083ea0d787992f40c5acce69dec162535122d65788aa05fe4bf33473103c889a1de98dfd80526c4a53e684cf536105f88bd610e9e50a55eb68bc2ecf35
 AUX fox-wrapper-3.sh 1901 BLAKE2B 20b6ca94deee62464642e5a7e127c78135dc83a5c8c4d369fe35d7e6c2686b825b7fe966998f58dbd7bd5d77ae30a9f6e98d1bac46bb06050cf52a1d8c9f30fb SHA512 19d7115feb5566ae8e3c7af9a88aca7d0643dab92fb8bfbdd0bfa826f7357b2caff436741218eb9d51164fcdf863c3150526108e3282fa244102bd85f8abaee5
-EBUILD fox-wrapper-2.ebuild 521 BLAKE2B 3180b08d0c55585f0cbaedc43fab068ed68d02a47d51631f2bcbac6b88ffa76924c41c610f113c4ff8e60f505c9059db21de99ad5336e1dd32039b6fb19526f6 SHA512 8cbb277dbd1f60a13e7319aa5f8e9788ef96ca8bb6aec46ff765d8cd3e186b7dbbf0bc55671dc7bb90e5a6bc7f44fbaf101544dd3fbf0255e2c9a79326823839
+EBUILD fox-wrapper-2.ebuild 522 BLAKE2B ab3df1c77555741d66fcb0b60c2694adf7ca39f81a6e24b75ab9664ba22bde4afce1cb910b7f460c22b109fed73f917d9207fef9f8cfdbb44c33f5d5c2e25f4e SHA512 21614e34ceb81cb2997265f1dafc2ed4eda14b48ccee8eacaa222f09f811d5bacc67dd04f9f75f57597e3b2dca5aeb5585a5f25bbc78e8f1a5e4fbf3a0657a36
 EBUILD fox-wrapper-3.ebuild 536 BLAKE2B 8c62923bf0e9e50c5d00fe50a957f85d9fb754b559182f03dd36cb5b593e90d1f96f55dbc3d3dde4e3b7844c771ea292bb9a9a26f57796c0320ed499e2ba48d9 SHA512 1fde0c35aec32402e54ccc5fca5abf0f2901baa339ef4f3dbd51d1f4c50248b90650a1b4efe1f82e225140176d919c2dccc1830f174bc08284b956d5a885a564
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
index 4f9bb151e2c8..56983ae52617 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 2e433e28d350..931a2102287a 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,4 +1,4 @@
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
 DIST gdk-pixbuf-2.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa
-EBUILD gdk-pixbuf-2.40.0.ebuild 3852 BLAKE2B c10991c5f1fdd0fb9553d4c68e0abbb3263b01e3009e5af3460f30e17ad085b46f690e0023baff8bd7f7f278ea27d2b8a753b68c01bd95a170e1391cd66f1452 SHA512 154d9aabf933ce7dda3223ad3f4eec1a4d8a249a3639dd72a5ef6d26a9b555a188855ae709d76b9d0f2ec1db9250c0b7962a5d71e35a8c5276e147c938d4acc5
+EBUILD gdk-pixbuf-2.40.0.ebuild 3853 BLAKE2B 3e17902fa0abb0d16c8d7ceacbf5550220fa45f0dfe66cd3b02a044043b944ab10447d41c9b9275235d55d7682fbeab560e88b2b538b4afb1c9ae4739849581e SHA512 8c8dcd94309cb046abbd1680a3b2e2a46f6f938e1fbbc921658b94709b66058ec406b927ca8abd821e82ff3aa215e49984745834c5da225d55b2c33775cfa045
 MISC metadata.xml 424 BLAKE2B 07b31586e47af1803baf8ce93c9e61334fbe566e8fae5bcc9d442d09b3ddfc51b06be8f02ffebf663b0307130c57e94b63ff57a83856ebec755704b8d3b232bd SHA512 3ef93327d28195a186bcc16c8acbb931c2cedcc7893173ca76af0db90eb088a838f5cb1c2f43f4b72fcf9067f6c483c96a5549c57c3542cccbb70450cce485bd
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
index e28fc5ce9fd5..19b9055466f0 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.40.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X gtk-doc +introspection jpeg tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
diff --git a/x11-libs/gnome-pty-helper/Manifest b/x11-libs/gnome-pty-helper/Manifest
index 896cd37d36d8..2e8d10a1b3e2 100644
--- a/x11-libs/gnome-pty-helper/Manifest
+++ b/x11-libs/gnome-pty-helper/Manifest
@@ -1,3 +1,3 @@
 DIST vte-0.40.2.tar.xz 923852 BLAKE2B 666f1e8bd5ce1392c8c533c180e7e6700a6b0023e9b0ab467f2d99a38661fb600c53d83bda10bc97302dc54801f8e1d8780eb27a2c5cd184d786a55d513dfc24 SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2
-EBUILD gnome-pty-helper-0.40.2.ebuild 804 BLAKE2B c359e05704377d07b6f98fd3e16ffdad63b71182fee44e26ef328492b88fa189a12c6cd03bdc6ac66fefccf214d1abde0d2ec9881c8aedd14279e061a2d3e1e9 SHA512 3e59f0c72e451aedbd81f8163dff395b077878d504845f32f716b6b5be739218d3fee3deeb9be41e277f14ce26c43c1a9135d22c5d735b29e94dba7c7581b760
+EBUILD gnome-pty-helper-0.40.2.ebuild 805 BLAKE2B 8ecf0a05d1726083ebcd98a911f8ed5b8559071b798f4df022f2436a31a272c20e21be5a3c64894f8510a8a5ac88f64aedf997e47bdba4bc3cb2ffc39a78b8dc SHA512 af7de06f38103972e19742a08f531917428fc577399bf14a2f361f61b3f768df9913058db8ad44f728ced8f322d74691fa4233ac58fe8b8a2df08e738287c917
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
index 095161f77245..6bdecf3dcfd9 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2"
 SLOT="0"
-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 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+hardened"
 
 # gnome-pty-helper was spit out with 0.27.90
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index e62a3fce1554..ffd01faa9482 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -1,6 +1,6 @@
 AUX goocanvas-1.0.0-gold.patch 848 BLAKE2B 5d808bc92fa4acedd0be7610e8b75030a35934ade2b9a361b648aa119816d90fb0fa24b2ac148ebfa6b06df985ebd19ab0c4bfe7b091d559a7dc859652052f5c SHA512 8e61ca8a0e9d673bc77a90e9c8f8a5107717df32d094b34aed04ea2bb56383fd2a018e3fd3a4ece5b18a754adc83d29095a80fb0a34e24db0cd900a6fa8cefea
 DIST goocanvas-1.0.0.tar.bz2 570552 BLAKE2B 00b1a3d59448cc2f40dd20b0c97977cfc477a6656f32e2106b3f3bd5c42b8b625e270d9f96de44f30caf83b744b331699e7c6385b5269bf7b22e3bb25a879948 SHA512 fef4364b57dc777b6dcceb026f940121a24a8a3792e8d37d320eb47b7747ab0d54d8d7911b4ff77c21ca2b251937c9312da04221bbc246a07bbf4062689de644
 DIST goocanvas-2.0.4.tar.xz 584272 BLAKE2B 027ab47c1e9c241f74509001426367e86025ec8ea5901cf64c2014f8c32b83ce60870ca754dd15e8982a7023b77d3856b39dbbbdd636de6da47d361cb15a940e SHA512 e57dfd59d9b9cb64deadfeac193c11a89347c7f0e966377cfb98afcc2b46be13fe05d253a96e63dc7e6981c75e6e871040b83d8d0aee95cb62b79965d6be5688
-EBUILD goocanvas-1.0.0.ebuild 1264 BLAKE2B e1357fdfe2b6786b5592d5f3fb2fbf47039392021ab3201000cb456bf6dc55d59b9ca443ed65542b891cf430a4c7e3fa9ead157f102afc8f79bf0d7981996b04 SHA512 f10066f466342fa93a52076ea94fe7c7d19c55dbe87059502d200e862c9b2561bf916f6b255ae9fa918afe48bbb0b2a4f93d9451027c7c72ac1df539a38883fd
-EBUILD goocanvas-2.0.4.ebuild 1619 BLAKE2B 50f6df03b21bfab21c3fe46c6ddb55a5b498409e2c4d766e5bc8796924566ad5c79be147cf109df31e2112f085969d7c15708e91012aa3aa7dfde5b15b4d964e SHA512 2dd4ae53b3d790121b4c02d042fbcc9ba90f9ff96719e9e8a9276756274432ebaefecf5f67b6f034ddd42f515ef06533520a32579908362e9dafbdedbb83ef76
+EBUILD goocanvas-1.0.0.ebuild 1265 BLAKE2B 81f1f507889f2ce39ded8c435eef1a7f7a4d1b87026be11e1967f2f381654541549b344b6cfdef2b8faf01f265c37505ab9e055fc8b6b4faec0660d81d6c4379 SHA512 8ffde44ea7417887d59565ff2dd261ffa01452150efcb874d9578e97e8a0ef221d3981d5bf99779d29c78309f4ad4d9ee11b3d8b64419b45273b48c08298ced4
+EBUILD goocanvas-2.0.4.ebuild 1620 BLAKE2B b544807c8ca5f949562156ebb1db976419e81d8a8b4df5f2e239293d357785715f9892c73f849defe1fa5ed62afaa7ad4a6642d2371e1e14d2f595c28dc172d6 SHA512 37d98a110981934762da51933b4069cb011478ff7d02f182bf271e1bdb2e59da31aa18b935b431baa02d5ad801dad76787591582113308c5dda7bf54b1f0663d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
index fa288d656dd4..c77efc9fdd8a 100644
--- a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
+++ b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GooCanvas"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
index 411d9cb1b051..8d305a98fcf6 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/GooCanvas"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="examples +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 7f42c3360a19..13d805d2d271 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -10,8 +10,8 @@ DIST gtk+-3.24.10.tar.xz 20958300 BLAKE2B 60a70341f15b59b95316cbce55cd18b54a6dff
 DIST gtk+-3.24.11.tar.xz 20974300 BLAKE2B f338782d6141df64f83caae84649558296e11240ab082d4db129480a77e85cd26f86dee66e7f2650db48f13a30b0cb7191a8deb4bc545c9c7ee3b73796638a98 SHA512 15e33169030aa38e363730e5b19bbde614897b1a0de5db29c5292940a97e3613383b3eeb1c83ab8c09015a2a3f3ad425511bacd8fdbb79b30e0a47d4d4b57008
 DIST gtk+-3.24.13-patchset.tar.xz 57652 BLAKE2B deda8cb4e0026431b52c0299266d60c4d4be2a2c870bee06daf3d9f63918d47243b88c73c4441f9415c859116fd873f276496b7ea9c2243a9540351ca53c5897 SHA512 dc8abad0812c936f7316425ca456d5892f3438ca6f843ed49fd53258695958b2a52a1df878ff25547d176aa054ea48ae9fc1b971698afc4d4aedae9cb643feae
 DIST gtk+-3.24.13.tar.xz 23206464 BLAKE2B d58130d490d8886d0656a3106ddd4f24c0b83a512b6daa22cbb6cbfa6f0582a22a8f6e0063016c120e15b031a3c5585a557bd3dc94b1e55ac0ae553da871d64a SHA512 9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406
-EBUILD gtk+-2.24.32-r1.ebuild 9985 BLAKE2B 1e25f08b5f8bfc396c5b52bdda7c52e3fa8fc317f090226f86e7e518943447a2e47ae26cf4f49e1f845b0dec445aa4f666f064f1cac10b25eb29583009322202 SHA512 74dad47623d8851c20c84a89f7436b9dc52bef404ba61cce5cf4d1ae4ab7c53537397a8b29ad52b7a1ea5f00e28124ed7954848b84ca42edcf1ee86c09f8557a
-EBUILD gtk+-3.24.10.ebuild 7293 BLAKE2B de22448a92e0993ec1d1fa45e66ca4c5cd943348b52e0df3ac95f9659a3de20d03630d488b818d3d012f9caef033ad29b9723d4f7b82439b04c9c1efe62ad54f SHA512 819c2e3ca38a02cf4338121b17f03239375ef9464c8eefc6bedc9d352ec353143f451488bb4442d3b3a19b8bed146b3f1f23fff915eba05c7f62b08c8bfa1c5f
-EBUILD gtk+-3.24.11.ebuild 7324 BLAKE2B c89d9b242fc6088aac4343cd47bff8561b5706c6f3f3d3abccb675a13bb3f7174a90b66dbfaf402965d190f2b262c37c13d41fd82f86e99c1187c69f6a9e85db SHA512 41bb636c45d2dd51fe8de5ebc2e47a8d2b872f68a15274e871e9ade19afe6029c0a6234594ba3b54d7e600a97a2dfb1aa96d6ad1fd2abda880cf27c815b8b654
-EBUILD gtk+-3.24.13.ebuild 7453 BLAKE2B cdf71c8d622137eefcf44bd7b62487a385cbff5549ec64cbd7d3c79f448f69b8ce63a6aad57839cd9a09b10a81d413ee9d9e7d30dd1c0848c5ecda259adc0573 SHA512 00b82778653436219ce675f3842b68b333267961e892d9d280e6348a78935c62eaf5e4037f5b02a449f14f28c72603d9d3b3919d8f145879b308e80cb0db6827
+EBUILD gtk+-2.24.32-r1.ebuild 9986 BLAKE2B d669193ad3f4a93aa2fbd42ac53acccf65733e561848c39a98f2f4a6f9001b7ed339b72e5b6ac25bea2888218df1b21314fecaf80c4d6f227c8a705bc123ffcc SHA512 2e7ba97b79d16547462e4433b38a6e7668e34380e2f7d1012deeb42816f0f4e4c29134de8cfb0ae21728e899a21264be3593d24282f9f8cb2784cb5ddfa9ee05
+EBUILD gtk+-3.24.10.ebuild 7294 BLAKE2B b91fa9192749bd4d85a97ea47e4581c8401b2be82a7a620e0d0db456ce2797f9cf4b6e4efe6432f683e290df3661fb2fc73e3cae915fa29ed505ae081c682a77 SHA512 6b99400b400d156af7184ecd0ac2fae5a58468baa7b0bfc2e3aec38de4fbd308610df0ae9772fd8d779e382f1d0a1faeb16e59a5bbf92c5d90b690661a8d9fbd
+EBUILD gtk+-3.24.11.ebuild 7325 BLAKE2B 9c00c7990a575d14f7f4b0205acc384e4382628c41725f5469f0d525e2aa032721a53b4cb0dab81fb7ec1b5fe1d6ca2ab296190f9824986d06eb59a510e7d49a SHA512 9daeaf3bb855045589887e743d37be7f4e14ec16c555abc4d005207622a25396325d5d6967278c425fd9d617d9c1bced9196098b6f7db50a0ee93dfbc56eafb8
+EBUILD gtk+-3.24.13.ebuild 7447 BLAKE2B 31a619b26e2adea68955bd3cedfbe50d8523c21d4d8296363a7cdcec23973bd468b3ebeb87433afdc57c01e8338e95b1dd5364308fcb183d1fe8ad9e3d52bd19 SHA512 2c571c507fd3b37b2023c1f403d4680f20972a8d185c48b9b3c6584e36f43f53a09ab64c4fe28464510776ed761d2a89ec6ae01e7352460f51e1b4e499205f7c
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index 839e7a1a6139..67c8ddff4f4a 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.10.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
index 68d236b8db3a..e21e8dec69a4 100644
--- a/x11-libs/gtk+/gtk+-3.24.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.10.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.11.ebuild b/x11-libs/gtk+/gtk+-3.24.11.ebuild
index 8850b54760bd..6549eeb965b4 100644
--- a/x11-libs/gtk+/gtk+-3.24.11.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.11.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.13.ebuild b/x11-libs/gtk+/gtk+-3.24.13.ebuild
index fc1b2443d4e2..4255af1c9157 100644
--- a/x11-libs/gtk+/gtk+-3.24.13.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.13.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=6
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	xinerama? ( 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtkdatabox/Manifest b/x11-libs/gtkdatabox/Manifest
index 6cb651058ed1..ebacfbb647f7 100644
--- a/x11-libs/gtkdatabox/Manifest
+++ b/x11-libs/gtkdatabox/Manifest
@@ -1,5 +1,5 @@
 DIST gtkdatabox-0.9.2.0.tar.gz 2836730 BLAKE2B 8ac4c3a4335fd5850d21ad035ed68292da08f19ed83be4e50a30439782e6b3a0b3aea31d56a27e6cfd3af0a60ee71f8fd2b51f0dfe5307412ad6baa2159012b2 SHA512 cb36c4ec7b1b4db747520e00c80c037d02c26f60c04bd9d8e4eac06e4e0ec6a605d39e8f11d518751d3137a0ab38631916e98f15cb55cf024b3e5ed37a716f91
 DIST gtkdatabox-0.9.3.0.tar.gz 2883977 BLAKE2B d9d5de1c4d07bd01940ea6f75f2b2f455b46cf018dbae67bcb643f523353e675e1a97cfc10b696fe16aa0391cb006e5e866bef52cefcdd8ca4de057589164e6e SHA512 5c2464dafcf9cdd4ee11bec6f8e627533c0270fe28d736e1be45ad084c42d430a50c39cf08531138627cc59ab034a191ecd7b97ccfce633467ff99e6e9cd593a
 EBUILD gtkdatabox-0.9.2.0.ebuild 1385 BLAKE2B d3b683369f03e0876ae85c44a390c218bd07195396c73e9acbb4dfe111d87a146c20a62c099cd5950136020458149a3ebb6cfd28b07aebe8a9ea40acd4f5153d SHA512 3aab1a2fcfed72447f4a1c85613f4fc7cc148dce8ccdad57eb028b52c2f46a1bbb9f8e7ebdb2460f847d23b537727499c92ba51eb997467374dc094c1592000e
-EBUILD gtkdatabox-0.9.3.0.ebuild 1322 BLAKE2B f38111f1913c016eb32effaff1703b21b4d4472596ecdc706e322eea6cf38b370bc65805974eeb2e11dc65b59d07a222a30522e16cfe8eb7a92a756a570ae23e SHA512 438ce128a95daf45b1d3e15590ce4a51ef73b9b425022b8f3900192c383d231af7eb60adf5aacdadbf52442d400f332e44fbc906c91f6fce2b24678cd2c0f99d
+EBUILD gtkdatabox-0.9.3.0.ebuild 1320 BLAKE2B 1511e776e669f072064d036449861db9b642b8a5b8487c9a9e242fe692febe7febf240687e15323d76da8665b3c9f1d5f38653bc80bf307cde19a976ea6bca6f SHA512 af327c426845abb8e64b1938a922a058e198c7aee4914f1bb7f1e2d41ec55af30ce4641d9899b4061efe76828ac9e33e6fbf26dfa27560c46916a83cb2de0290
 MISC metadata.xml 581 BLAKE2B ff0d8d541a11821321883ac414d4de93a7e2a8daeee8e2e4540c72018775a8b37b83e52d97df8e7fc279e0c629fc9d46f9514dfba55e30e64eadf00ab100f8af SHA512 34e6d588df560865aec420e4d400c13e931bf97d402fd8ee5e2ee1df8ebe6df8673bacb59c14f8ef258165d0802e160c8f105648fcf42eac15ed888f267b87fa
diff --git a/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild b/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
index dface576ae48..3e8f296f33b7 100644
--- a/x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
+++ b/x11-libs/gtkdatabox/gtkdatabox-0.9.3.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=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples +glade static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/gtkglarea/Manifest b/x11-libs/gtkglarea/Manifest
index e91699e2591e..96beedfd39b9 100644
--- a/x11-libs/gtkglarea/Manifest
+++ b/x11-libs/gtkglarea/Manifest
@@ -1,5 +1,5 @@
 DIST gtkglarea-2.0.1.tar.bz2 298744 BLAKE2B a60ee019af111b6f1da92a6c81cc0d5dac003fa79ae95aaf79f1f5bc38c558e1a084d69b556570d1710966d1d25590467a612d9e0f17a994084960537bd744f1 SHA512 54d3c23637e4347c9cdc25fa0159f720bc6bf76e167b025efd14361f1026af18f41686860444083100f939bec66309b1ffbb84c776c88e513d6ad4a06f66c79e
 DIST gtkglarea-2.1.0.tar.xz 264100 BLAKE2B 453a867581a09bab4ad2c71a5d66f567afe8fa8315467beb39d48e242fd46119c4b77b75a662eb1d4c88398811c0ccb4328b8695f584f692bfd53f43c8bcf4a9 SHA512 c790c1b542d85d86cd57f333c87ab2c930c8065d6f75320d588688b9a0adb8c4270522b6b88734720db1b71170f4f12c95e650e9a599a5d7e4b7baadf1f9f06b
-EBUILD gtkglarea-2.0.1-r1.ebuild 1107 BLAKE2B b0813700c7463be4dd5ca2db7253e67f63cd2a81ed169027e50928565532c6883fab58b5e11fbcab09c15cae0a8532bf4602e29678b230d31569c1a98245a6e9 SHA512 d14a57e79901acd3a49cdef8a795d0d85c705f88b1f48047fc8587b545ad9f25cd18ef36822fe81680e8869b71518ec010d4e16294e647f0c5a6abda01faaffb
-EBUILD gtkglarea-2.1.0.ebuild 976 BLAKE2B 73b014af129fbcc0b5d1c869d084c0b3045ae1420752643914b18df8d8308cdd95bbc4bd9015de42f5dc28feecffdc3a0f8c9807d93af27ad49ef2cb0b21e7d3 SHA512 53a1f1710b46a03cec206dc644d1ce95e2cfc2bc1bd26483d1aa6721a1f7b64742234cfd2aa3994167a2ee0958442fc20ee2e10a10bd25d66aee48b925fdf465
+EBUILD gtkglarea-2.0.1-r1.ebuild 1108 BLAKE2B 5182fc07f3348acfc243f5b6ef51f6149a4a07df03371f8749fa54b132fc59b83cdd16919141664a51f8e7e4453e438139c31af1a18d6e4855273f08754d5cd9 SHA512 15c2a444fdfdc8d5b13136c22b06b21c52337d17cfaec1556a9f0e2535876a0d8ca2142332f64669be445fd722bbca1a554fa8b4e0f6720388d786cdb8d5749c
+EBUILD gtkglarea-2.1.0.ebuild 977 BLAKE2B ae7317b3aad31ed93582312c7065afa796ea6905de6ca318efd8ba1c0c6f28a1328e60c24d93af0fe93d01f1912a1dfdfd4b8e52221d23518b4f6684ed502ff4 SHA512 ba0290da9f469b73c6c771eb28cc89a6e0c706b41f93583334a249b85d037058a703733d7da9028178b9daa73afc1ebcbb7c648351325bb715e804cbbcbf9e24
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
index 8e2d39c4b40b..5766a907b263 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/"
 
 LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND=">=x11-libs/gtk+-2.0.3:2
diff --git a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
index b21107ae36e4..f3788d891dac 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/"
 
 LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="2"
-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 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index 15140fb2e9ad..effabfe8d6ff 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,5 +1,5 @@
 AUX gtkglext-1.2.0-gcc8-fixes.patch 791 BLAKE2B d0f17c83bccd6e92c640383fecdce384cd0ecb92868f3f70d87b16aed8a85357e9391134c3c233549f7471d64e02416bde03ff92028d8d2f19eacd3802542875 SHA512 b6240ce1f293e3bd37d71a09233417c4acfa2a7fce05ba65ba364181e6075f86fc72797586b93fb81e057ab8de2191ad345415bd6cc6e29e38945cfb4362f3cb
 AUX gtkglext-1.2.0-gl-configure.patch 11350 BLAKE2B ad0cadfa12bda13866da64433935520bcbb77a9fb430640d31c66b14ffb867a1ae1cb236e459b9d13c0493279185dbe8c8eddafce86abd14b2ab4b2d0a59a0f9 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb
 DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
-EBUILD gtkglext-1.2.0-r4.ebuild 1561 BLAKE2B 81f0539620d5df3a0fe39f7eb5f1aa57f53ab63ca6f11fbbab849d02e493b8d069f977c5012bd37f9af4ac1026a1025f4973a3e5ff98359a1d947995f5d13c75 SHA512 88c9f721d39f776f382f306fa40a1a32e96cf6493147f99e7a57547e84f410d2d725c1a6f1d65d9349dbc719649b54c1f9d492b06493d0c0e824f084171c607e
+EBUILD gtkglext-1.2.0-r4.ebuild 1562 BLAKE2B d28572943bdd3942fb9dc8ae59eed5687a1faa9438c5d504f6e6fd47eb810d27d1c610ce5af5d99de10dd25b6627ed09dd638d72e4ce2059462ffdb88a709ce9 SHA512 79691e24e330cdc3c8d500953151f83531bb3976e5b10e642f91082fd1ee4130cf740c349ad97bf3254f4b523348a2e2d875c675098d903086d89e4742498dcf
 MISC metadata.xml 331 BLAKE2B 214f9245eccb98bed5314d370a2e16d8605c46629c656c05a22c1a037e7aeeb9d3255f24203405b148fc73276241db48243303a86abea879c08a944025cc51b4 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index ada7eb76d176..3721b28edf38 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index 2d74ab579226..fce4972329ef 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -8,5 +8,5 @@ AUX gtkmathview-0.8.0-gcc6.patch 2043 BLAKE2B 5534acd718f3b4423a1325c109483de311
 AUX gtkmathview-0.8.0-gcc7.patch 1150 BLAKE2B 28c122d1ac04cdbe6b232325da3e5994e9680c670ad51387c0d0f7cd67618fca11d54163b563431c3ae3853ea05ada400627c6dc45b8e00f79f07c050d118073 SHA512 550646e134f43a47dd185b9ac2bb7c1713682685c78feca43fd6371d3e6455d06cb105fac9cc69f624cc8c3fef14d06aeabe91dae35ecdd096901cea9c802b17
 AUX gtkmathview-0.8.0-underlinking.patch 1926 BLAKE2B 6f50638ebb9c2a6af55e3b0f13b438b97a2e606fc7639a2aa6d7e3467bfcdeb4661c6b18db200b727a3de87c457ea99013f32e49b76ebaaf0a5d9793828f280b SHA512 9f0f4404ad60d8318f6feaae81db5ff4d331509145874926667eb9274a83ae278b08a078830cfd98ae85a602fd1ac7ea13b676f5dcd70a77e8b45e9e5fe5aa0d
 DIST gtkmathview-0.8.0.tar.gz 987328 BLAKE2B 1c8403fcfab828153911a40850bdfcfdd15c8c19da5dc1d7c015a8718c647b4adde2f7201ee0abc72d6c2b5acc79b8c852d6aa4f09021bbeaa827291d963b646 SHA512 aa7eb4aa031f9b9727be3fd8635fdac0e912585de9b91c5e71400edc5fa0b3257724244f796fea0122e32318d00701e63ee7fb12b97b7abbb7940a5439d31adb
-EBUILD gtkmathview-0.8.0-r3.ebuild 2067 BLAKE2B 9bcab3945fa6d38b2c57c7d9c3a75939acb05584e0579d1cea09cf05909f0932aa59dfe3752bb527b495bf881ebfcc9c6e8e74474f3c47fe5eb12bf16a212f26 SHA512 2d8ced171ec564d631e1c6e3aefa4ffe4737793beadf3f38f386ac9f89fc73d2bfd6c4543c6ec99c548dd91bde9520e5e38fc9ee7ac051459e38a809029c20d8
+EBUILD gtkmathview-0.8.0-r3.ebuild 2068 BLAKE2B c78ffe919a7c50b600f066c6109b209b5cbf52c693f35ae9b22701d8bee26aee10e8f0fc2d4d98a430eb721f0ba457f262b1b91df4989165671baa5be1d6f732 SHA512 f02008cafec9eb774b223a5f9311d10824a4c0af39b8624e5b2009ec69be848603c0de1a8898b784909ec26c1f3f3b8e4c264881985edff08c674b066a6260a0
 MISC metadata.xml 413 BLAKE2B 795e9acaab179d9cf4e0ab6f3232dbf079b418420a55ff58d06f5b81b2fa785121a6b4bb734f45f4df9b15435b3af8bf26abf773100b70c362a98805057f8a38 SHA512 734ee7fb5aa123fb2794a22b1a374e514a92a640e7bbd35ee53de045126d0b330f177db4018ddf76e9932f984a2f5c1646d3a3f642b29972df0af88f64fb1352
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
index 1e4f1c3bf83e..6a854f37f818 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
 LICENSE="LGPL-3"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gtk mathml svg t1lib"
 
 RDEPEND="
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 45c06833ffaf..71d244c642f1 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -3,7 +3,7 @@ AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
 DIST gtksourceview-4.2.0.tar.xz 1410764 BLAKE2B 8f20a762c16a0abc47ff191a2ea4d6b44a397cabee056e98263d0ba59cbc7207ac72341a630aa83fe7855804bd6add77e0d93e706ac9561c9577843f17e00246 SHA512 f2350b1e7042309c01be0feda6059d788a7ef55c4ccd48e16b4c92a71292ed6f92243455ca42aa0950db61de8d68f4a76f4fac46cd46316b690bcef1ea34c641
-EBUILD gtksourceview-2.10.5-r3.ebuild 1349 BLAKE2B 8b14830933232b109206737f8eba31e6f11da41bfa548f14e21be2c2601a6a389b8eed33d34295107b6c3c4130d9a8425dfdb17960eab448df6cf2074fe1d2c7 SHA512 be97db9977bc8d76c5a4bf4f54159e3655bbbac0292047f5326132ffdbb05eade8d0620460bfeba96ba0f270ee7311f7d07c7476dd66eb4b08ff5fe95a24bad5
-EBUILD gtksourceview-3.24.11.ebuild 1274 BLAKE2B 3bdcf062591c4dc9e4155fb61691112347eb9d6dda047429bdc6891c3c427ddadb7390c4737ea1043f72183b9784f88d550ccd11378c1f7b1ff0ece41affe773 SHA512 d555b4b38474549935cab8dcfdeafc5ff6bc4a1a5708d3434586754e48575059f550f906578f9fada3d1c2c4ad19f334f3ebd600c4632fc8a1a04f6a8c85360b
+EBUILD gtksourceview-2.10.5-r3.ebuild 1350 BLAKE2B 5e4616b58afbd5fb52a16333b8c83cb5eb1c1a3ef37dd930749de6fed8cb45f7ab3cf31277e14db0612171df22353ed422ba2ee79fd5b56e338d7618237f99fb SHA512 a31bd2e06f229fde20006aab1653609d50c531e15eb5d49faae4fc77034a209a8d7e269de843de55564e8197270f22ab29b2664988aaf384d99a10cc1db818bb
+EBUILD gtksourceview-3.24.11.ebuild 1275 BLAKE2B 7da648055fa2c455ba0ca89c70c57c74500fc1f1f4a58ef759d01ed52b5211108cb0cb3b3738761abed632903d7a61de62a42e41396c9840e979c7dfce7b6b40 SHA512 f733239b93948ee5274f079afb72945b6d199ed5d6cd43bf762beab042e4e6ac92e7bdd8effc666fedef98ac4221bce9cddb45b9ad264c398b67ee81ec8d76c6
 EBUILD gtksourceview-4.2.0.ebuild 1621 BLAKE2B 4e879c5489dcc9f8a5cde9b8a643dafabb323078fb8638834314aba639387caeb300287b0628a337351a0aea50a7aee2d0ec2beea30b160b009c0926df7ef73c SHA512 08749b912fc7850e370f61e17c25375c0f07fd57931759dcc3187f19eadb536614218ee5502ae83c856fa81465a42b075c50dadaf82591e80391ddb25ec2cec0
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
index da35f28e5a6c..4ed0f0a8167d 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
index 653d1abc6be7..e8b427f991a4 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index b8dc6b02da5d..5dc9cd60d3b3 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1,3 +1,3 @@
 DIST libFS-1.0.8.tar.bz2 347880 BLAKE2B 74f9079f4ac98ad8cc83e73a162f4e308c49b643dc11ab6d68d36afe5f70b9326023fafb7a17ab14a083bbda20f99d6e140bf85facc4a3177d356b7c5dd6e126 SHA512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f
-EBUILD libFS-1.0.8.ebuild 371 BLAKE2B 8401cbbde61fddcacdb0c4c62baff4f75ec25ef9f05492d93c8b9aafe37d00d17dfd49742588bfd6d6227c5cc2059f66f4b42c14f0936b4f32db27de8d2c4877 SHA512 30a0005a00daaf9350546dfee710ee378b4c60609dffb9fc44d44fde4a113cd236ca0b6765b4f6cfc0ba86ff50d5f57d383b0449688d6734e8e19a9998c8ce91
+EBUILD libFS-1.0.8.ebuild 372 BLAKE2B 670e8c02ffbeb03f1f916e9241ac84df5a718c198d29bb3e2c273135fbf2f705037bf9b37ac6ab7a119ac8f8c6efabe55b121afd2c3fcf2dfa15849929a3eb5a SHA512 1412b94ba0d2c8194d185ef3397b3a414c8c33c644ea77d24df5bac382d897b55b5a3a37bb72109e4b2671aa772e9b16d60f0a81c379fe1405ef4aaa654ca11a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libFS/libFS-1.0.8.ebuild b/x11-libs/libFS/libFS-1.0.8.ebuild
index 62c6bf145846..dd74cd7aa1e7 100644
--- a/x11-libs/libFS/libFS-1.0.8.ebuild
+++ b/x11-libs/libFS/libFS-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org FS library"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ipv6"
 
 DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index d98d78557f41..e34b6c3874ec 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,3 +1,3 @@
 DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
-EBUILD libICE-1.0.10.ebuild 654 BLAKE2B c03a31522f2a361a37c64d686f162cbfdf1836d23cd8cc237cc31a1a59a259ebcdc66ef6cd73858e031665dd60872c0ca30996c89571a69109e9025ef788dc2a SHA512 f40c8f6d0630c572f8952fa0ca691ddde6860f2878ed108e5375709e6e3db61941d86f7327a2e2029da74b13e3a3b0be99c10acdf87959e467ed60732217f935
+EBUILD libICE-1.0.10.ebuild 655 BLAKE2B b9a56bbc2a99438243dda9931cad120feb26340921cea472c0a79bcf1fe446f7cc070b31d7b9ef68a1a0e705dc05b1e9b54483548556d13d5d99a6270048b342 SHA512 012ff3e10ce6dcb5a1ca6fafb30334359e89b104a0b9fcb76369439a7316a40da1757210f508a92247dbd648753cf66e7a35cab421df116e16a513a99c0f9f0a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild
index 47e970987211..75118d406769 100644
--- a/x11-libs/libICE/libICE-1.0.10.ebuild
+++ b/x11-libs/libICE/libICE-1.0.10.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Inter-Client Exchange library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6"
 
 DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 92ea333be714..6982ad1a942e 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,3 +1,3 @@
 DIST libSM-1.2.3.tar.bz2 362595 BLAKE2B 20b7327cd16e066bd2a81eae60f52cab7499dd92d65786d0e5726faa64c2055376749562ff2158777f83711e1517b90b2dc94670892b787889b3950c0a975b68 SHA512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903
-EBUILD libSM-1.2.3.ebuild 1703 BLAKE2B 5a0a97fdeb971b6c6d18d6cc0e78f12aeaf55ee481b86373aa5f384f31f0d03a3d33c3afdbd1d73e10266167cd6743d4d42117a28371da0684304410bac6d4d4 SHA512 a6bfaad918d9d8175e357c3c2f1c6d7ee66f8e60f2b6159e6d45f9dacfe3ee38524cc8281bdda69511620f0efeeeeed81b100cac4e68fd33bd3b0694d828b936
+EBUILD libSM-1.2.3.ebuild 1704 BLAKE2B 407d7c09df3e78e905b0929c4020e35fa4cade686689c8b29c30819282f6424f704125e6099323cdebe913996878eb9ebb0413846d09bc81668ea633357aa918 SHA512 a88d1ba6c1453c51f0be6543ab02b14318f0f6da6bf0d2ddda9692973f3160586b8ed572992d19330e1ac259f86402f55decd52ad0cde670bf0896f6253d8dcc
 MISC metadata.xml 348 BLAKE2B 475822d6499e8c44bda145b3fb4d72b0f462c03ddddf44cdfb8359a2b0a0e44917a0004a53ace75218efa01c25491fd66e52c1bc0c7e392c88ba9cdbbe414e54 SHA512 4fa0439dc05b56a6fc0280c020ccbc52438ba0d22a4a9b8c0e4830844fa50bc6af8096498336b0d9752687b6e30dce581a24b4b67a812d2e7a62783e37af86d5
diff --git a/x11-libs/libSM/libSM-1.2.3.ebuild b/x11-libs/libSM/libSM-1.2.3.ebuild
index 1db39ba474e9..46a59b1a2ae1 100644
--- a/x11-libs/libSM/libSM-1.2.3.ebuild
+++ b/x11-libs/libSM/libSM-1.2.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Session Management library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc ipv6 +uuid"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index be0b510b02ed..c23c209c3c39 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.6.9.tar.bz2 2283814 BLAKE2B 00fb965b9cd19bde79c4e598c677d21058c85a8ac37d9addab7fb0b2faf67e3d65b91e1864bcd7180e5fd8b0ab7ec3cf68ae7f95ac8e82a049529b5a139b43bd SHA512 fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31
-EBUILD libX11-1.6.9.ebuild 696 BLAKE2B d3e3165e0f1d476b607e236e7b689877da741314e60e6b32fb67ae502afde7814622e9dcbab570e6e7e0d1df24d1df40b2768042948dd190a0d3bfd792594c87 SHA512 1ccf05374d1f40b77f1addae66b4a3040f7900761606b65e29e5b74fbad3f6ebd1a2d114dffc0e588fce8135488a773dc1ea05fd5b8b1b04ce70a055233c9ff5
+EBUILD libX11-1.6.9.ebuild 697 BLAKE2B 24bb87d6e3f54b607c54f774004b87ac1d8704e467a2adc62bcaf840346d01b2a8a7ebd2da6234a52876265a958e265b6f1f7fc34652d041818fefc895453aa6 SHA512 c69bff761ab10c9b8146ec9a59148b34f9c99995e742e44952ac60f3af0bf3f62a7a526a5d49875d7406f3afcffc3dcecc0cdd37632821ce7f5773386246270b
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.9.ebuild b/x11-libs/libX11/libX11-1.6.9.ebuild
index 432b7ef0c9ed..211e1e648d69 100644
--- a/x11-libs/libX11/libX11-1.6.9.ebuild
+++ b/x11-libs/libX11/libX11-1.6.9.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index 54fb3b78cbb5..6ee512cd8aed 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,3 @@
 DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
-EBUILD libXScrnSaver-1.2.3.ebuild 497 BLAKE2B 382b856888c59b8d4029ccb7de27e1ac46a85d914e328b43a744f1e7712f8108a29662f852faa824f3c88cf8695f34a791897e7d3c5240e7debeb39727ffbec9 SHA512 3dd180984cc19284976d7d028ddf8e8a4642d1b0a050409c543e7857c7c2182ecc9a47a3e548aba21180bb1db3824a88e9edeaf49b18cf4baf2a52ff3da5c6c3
+EBUILD libXScrnSaver-1.2.3.ebuild 498 BLAKE2B d13cdc4b5aa9a70a1bff7189f496fbc3d134060fb799e5bcc1c7cd3783da0bafa7fb9343623a6d42df4396b03187477056b333a1614f5ca0add9f66122089ba9 SHA512 096638fea4bd2906c637660ea4c46fc14705b6fe3b107faa92edae60463ce2a28314e38f4c876d4708de5ad7d2fae3dbfabc0ccbc45dc5796490ecc7e8102a26
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
index fbbabb0bee82..9555cb176ad3 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index f4fcb3ef0553..7cc6945f6905 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,3 +1,3 @@
 DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
-EBUILD libXau-1.0.9.ebuild 476 BLAKE2B f03018bd70547244bd8d9965e0aabf152d4279602859cb24142e74e218a91eba9e992dc7e5567543face539c50f46c3d2c4987a47386639c57d65af376e0cbfd SHA512 0aa2b394708403676bb3f0e8c3f37480c16b9d109835e3c3f89fee814e5ebd3ff7503090577c4fd6966d9b895db54704c9e505c8ba1d5be3034f4174593645f9
+EBUILD libXau-1.0.9.ebuild 477 BLAKE2B 0d0ff77617b63432377ea965758e935bfc5c34c4c0994b1558d8e34070a91ef062db679ffe4d74d7996aa81e8e7a5027b1bf81552b7d71744efeb847c35eb78f SHA512 ff99e3faf61c01d747804ca3298497581d035ce1f079aef3f737fa977c1e82883e4608bada6019e5b36b1351d39d5faf38683df8d0527681399f58d5fd60c8ba
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXau/libXau-1.0.9.ebuild b/x11-libs/libXau/libXau-1.0.9.ebuild
index 38d1b195d2d9..69d21421965f 100644
--- a/x11-libs/libXau/libXau-1.0.9.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org X authorization library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 6af78966f976..7e815b74d45e 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw-1.0.13.tar.bz2 674140 BLAKE2B e141a135d1a45edfb71687951542a31d838bf560997a631b3590db0581f94768a8cc77ebd86c7cff60668e9843b1258a9eb60383a4d25b704ce9dc91fc6d0bdf SHA512 d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f
-EBUILD libXaw-1.0.13-r1.ebuild 878 BLAKE2B 157eb7e67abf02b6f1ea32b65159f562922bff864a4ff2228e0fbacd8264d8ccd9e348ce72da7ddc7cc67dd89908d958e20ef170b94e8971d2bf35c03101f1b5 SHA512 c58a45627577712cb696fbcdfd920780737d90b446c47c862d4d551dba721487d5c719ac45063b1837f034a73dab844b7e104f65a6b35f49a3c1d4107f9b5b21
+EBUILD libXaw-1.0.13-r1.ebuild 879 BLAKE2B 04ebb2f421d92d854e3507e21aad3d4b7d846f3f33088981d2058e944160016e0f85796fe3c9279d3cc924b321d07b30005a6ad1d0e151965ca8eed6c04387cf SHA512 8a75e80feb2f0c77d322ad2f3fedcd9f0528f639213dbae660a550ede325358845208a012ec191e40dee60f4eee86120e0a721e85f41324ecf1f67e032ac72d2
 MISC metadata.xml 308 BLAKE2B c8b1bdf11408b82ade3364323648bf367d76ddec0711a46f3662f4fe34aec46918c7acc617a782312725ab0169e82c25d480194a2ff22bc3429f5f3c1d4e434d SHA512 331203494a47823877466669591ec0de413400dc18f51e96c18a06b7bece2fe56a73055cd7f1e4ffcf6cc9cc9bdd488a7a5ce2830def9ce5a6ae187c52dad364
diff --git a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
index 4fd09c43a820..3888376a238a 100644
--- a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="deprecated"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 87d98d30b50c..62448eebfbe3 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -1,3 +1,3 @@
 DIST libXaw3d-1.6.3.tar.bz2 561594 BLAKE2B 85f3fb6d39a9a0ccb7d2c529eff84a4a9e85bf81be16487f2119da0a670e40c2d328e17b06ca237f69029e8d43daf6eeba8488029e6e4d2f56bc1093a2f305ad SHA512 f79f997ff8442563c74f38c7d76fab2c9253691743ca3143047ce698adb4c126d02dc968be7bdc79ab3052b785fd705375d2f01171e3a3266736beb531c91424
-EBUILD libXaw3d-1.6.3.ebuild 715 BLAKE2B d12f7463a5cc2959cc1c54b851f55ada643e19b4ec64727f7c38ec1f170b5ac7d4b165b7129535419f26b1074436a74daf09110932fb6b33c7a04b75d92e58d6 SHA512 640876c75508682a030e7a256cc2044ad4eb2632c9219c0713fb33152be7fe22c7f297d7ff9dda74c82ae0c393f3c4f51f2fe9b6bfa779d8049eee5617f998b9
+EBUILD libXaw3d-1.6.3.ebuild 716 BLAKE2B 1be4376e9dd9b3031f567c122c9753216f2a0f881c99f3adede8a4164794cca14082d77ead7ecf06e95fca038b1d6461e48c75b32161da701d78115f9fbcf618 SHA512 fa1f32a323107bc8df810a0d8ae533979005f9dc191d3b3807d19fda95204d475ecae2b7f9d06421ee6b1f5cf1411d2645c2218dfee485192462db81dec22d0c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
index aabaaa038943..a5fdacac2c29 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw3d library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode xpm"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index 18ab7458573e..f822fc04fe49 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1,3 +1,3 @@
 DIST libXcomposite-0.4.5.tar.bz2 316993 BLAKE2B 4dc01b4c3fd85bdaad1ab9d9da0668caa162957056284fe864dacfcad302ddacf32a3ca233efe191592121a42783e04d5844277ef8ede21951e890114120ba22 SHA512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5
-EBUILD libXcomposite-0.4.5.ebuild 606 BLAKE2B c398a3eceeddde9bd17d37cf3ca351e1b8192d8d94fe3ebef42e1fcadd5c4788ccad2b1c4f58219c1a18b4dfef83456fe3f0df045c845c54814196d88f23b403 SHA512 b27a35074ca94cec065b7bb3242f3e83964125cbe0da90d89a47292f4f9b2da0905b2970892e0cc2eab94c2eb167f524d81ec2a6c522746c29ede50149d56371
+EBUILD libXcomposite-0.4.5.ebuild 607 BLAKE2B 223a394fc292f2fbd6c0e576d3fbdd222cca11c2070a87ab6436e78427eb1808d1eeab0b6a2371f28ad8778c98937c712be024339c25a77ca90e0f1230e9daa8 SHA512 6145efc5a70cdd8b8983d46be332eb80de7b4ba7391124217eda59cba1914c16bd97110704eed9425c175d75d88f903af604bee89123a931dbc69f32b660ac59
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
index 9f7608cbf871..d6ebdc7f50c3 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcomposite library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index bba7d4bbd5d7..4e04b352dd1f 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,3 +1,3 @@
 DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
-EBUILD libXcursor-1.2.0.ebuild 874 BLAKE2B b3c9e7cb8662e1930f7495334e9ab219b9692f40433bd0c89c2e659e5247cc2327c9b741aa4f2e37051a1efb426e30c3c6eb6f55eaef7c13c7ec593537498d2f SHA512 1db6e888b5f1f31b3b11822e8d3ef6a50ae5e10d980ed6632877054393fddc76e3180aa8675ffca897f6b1eed606a06e87628f54046c9b13c5352feff1014766
+EBUILD libXcursor-1.2.0.ebuild 875 BLAKE2B e5a37c42eeca564c051723ff7aef02bdc7604215bd307f0c3c6225827c3875fa41daf6ab0ebae280a33fa43c224f054f9a397742044a730eae93a1900f83e7a7 SHA512 1c57e1961da621e97c11bb7e367a5a1cc3904f02547c8635e83b2a3bc1dc340f9453813059dd507a14b41d0285dc31b8a3d772663a7a619137f56958642f8838
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
index eca02e82efb7..89d057a0b333 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcursor library"
 
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index dbff90064304..3fe3f9e1a990 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,3 +1,3 @@
 DIST libXdamage-1.1.5.tar.bz2 303750 BLAKE2B 78cb593365cc842cbc6fcb4dec94aa28293c385ad7ecfef032117d19e98c7b3f252c53b79559096b1c0b259d24a59220e9af7fb60d55c55f4474a33d117958de SHA512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124
-EBUILD libXdamage-1.1.5.ebuild 514 BLAKE2B 809e17790903bc8d852198ffe50af32729d1a2b8e8b83d653d52668259b973ab94c81b9ed5e443b0a5f6c6253c5af1b29694dfb6e34fd91e9c5dfb9f859875fb SHA512 e5183027bdb62dd79cab3e13ce70b301c7d2e470e9fd5168c8b5dea3127cecf3a5ab9b6ffd4ac9350747a909be37760a2fe39e3b34cfb28514675e4c957744e2
+EBUILD libXdamage-1.1.5.ebuild 515 BLAKE2B 41ada231c6f7677c3cdcb02d661c53eeeffdb92be05b2ab96fe7ea94ffe2cf448e7370e55196a626c2bc6ce8625aabe34714aac7cbd638c5b7a1544afb60af93 SHA512 2812f2d1bf3af283db148fd584c46cb9e90b8e9cdccd269b16f48983a50e4686b813b19a3893e8456fd81448800ac6b81130791600449a49fef4285ed8e1a1b1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
index a673bbaaf66f..9b2b0b94a6f7 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xdamage library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index b992fd3c372a..eaf2bb1f81d2 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,3 +1,3 @@
 DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
-EBUILD libXdmcp-1.1.3.ebuild 653 BLAKE2B feb686981ae005f002150ed607a799d02f7427ed49f5ccf71d3d048f0204580a64ba5c2f1c7378cdd5ccc7b390145821f52faffbef7bd345e036737d89394e80 SHA512 56382770511b1554f469fcefeb76044fa4261c2214377d8b6086f964325c871c318de8d466041ea342a0640a7360408ae389630f5309fb74a79f9b37884a568c
+EBUILD libXdmcp-1.1.3.ebuild 654 BLAKE2B 264b2bf98faca4538c4b2bcd2d3cf2e7893f5ef19c896e0870d630309d684f7d6030f3bd195d7cecb2ef3a7d70eb032737dd2a6aca5f4fde6c92d39d30b22537 SHA512 23a5aee1528338d3f4515f0a0c31db42587ddb9ed35e9153051d86ac3a3452d1fd2afa4db2600c32d7cc679860f2bdfad0774bec029ae5c96220a5cc5955e176
 MISC metadata.xml 310 BLAKE2B d30b368c138282f71b307e21c101bceac3df72c78519e9a20b124602e84d46d19f18c781e29ed797329122c63459602d56c2be4c5ad62e255e3586865a9a0c99 SHA512 fcfd052b3bd6c53658fea8bf241ca82753c12be1d0850536b02f700d9f9d830304296fee70a3b551ffd0c5d9378e13119c3bb12fd986764c940a644f3ac96656
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
index feea6fc3056f..93eed0e176a1 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Display Manager Control Protocol library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index b4e4768a8679..a9773bb8f284 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,3 +1,3 @@
 DIST libXext-1.3.4.tar.bz2 389114 BLAKE2B 941ebf63583a05f40063ec0d2350a40ccc656c6463e58a347489f7dcd8dc5ae5c3b24b561d74a0af2661c2e3c941bd4ffd90295273c248f22e52f23e8d7c0ec9 SHA512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a
-EBUILD libXext-1.3.4.ebuild 637 BLAKE2B 238f5f998fe88f1615af50389659d699ba13d878d314ad92a79c381f7458729050f71ab0bb86d6df3d7d12e80bb36d36a8ddae936e4cc120b027b8544c70f337 SHA512 b4c5abcea77d442b9f1c748135924f7a60cccb6fc2e56dab01fd51c0c792134b5d8f37121ea7c640161222aa548323574dbd567558c51935f2002408a3cd1425
+EBUILD libXext-1.3.4.ebuild 638 BLAKE2B 793c9a74f921d8fbbc5144da4242ab89d1a34a4c8b58274a93e3e4207a840cb2de0f99f3c52210c6049e74333b716114f77b4fd4acb5ca87bf910868d9ba5441 SHA512 8de38c7fa3fa65e03246aeab681834e0f620a183b6b20a9ba2c95de8348881961fc42ebc37d18c653f0a13cff865871dd37bfada6c97a7a1c33220c59f957190
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
index d2ac43ade890..af98e6314fc7 100644
--- a/x11-libs/libXext/libXext-1.3.4.ebuild
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xext library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index b148cfcf9aaa..9efdcf97bb0c 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1,3 +1,3 @@
 DIST libXfixes-5.0.3.tar.bz2 294400 BLAKE2B b9a6ce65bef20c24cd75985d7518ab19d7874419d508f4ca6767fe804adfd0e3baebaab69aa9c201901192b8ff5067f5de8d10362ef5c9b6ec12363553389639 SHA512 72d5ee496e5c0520c95ef6bbb52deff1ee4c29792f11aa17aeb25c8ec5eb992ca502de040c77ad95835d1b1432f315b6cb7a3308b434847c28b9c2c6f9d1ac10
-EBUILD libXfixes-5.0.3-r1.ebuild 494 BLAKE2B fb602d080370e12c5cc5392b418b3a685026e9e93937bb73bdce8a5dcf855c519ff984a8b55b8bdce09db3e2b4a5f5faff0d5056e547015a821766c30784906e SHA512 06cb87fe042c9eeb7ee4947be584bfb55ef16670438ede4d7bc886b097f37d5986474add14d60ee5217f565f56fac86e1e219690b62b86e7e5078f32e40057c0
+EBUILD libXfixes-5.0.3-r1.ebuild 495 BLAKE2B c5d8b24f58f6f6cf8eb08d9964ed42bdd01010080a12d2fc27325515ed07e6ef7b17ba8bb1a1edaab78bccafd75e3b16e79d9b828c77053214973dc620a68648 SHA512 044c8170f6243433c86a04b2edbc46a201a138d9d54875de92a8f5bec4510fd00b4f578c908463d2939538c0595a3963e1879820321f865a9dbd870a01c5df97
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
index 32fcc3a3fb09..88dd2e99162a 100644
--- a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
+++ b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfixes library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 05d1352554c1..99748bebd785 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,4 +1,4 @@
 DIST libXfont2-2.0.4.tar.bz2 513167 BLAKE2B 924cf8462a8fc593755080866b63d6cca6e58b5d875f1d25b95271a56d883e983445f72f8950adf1964e0bf10ca5b8bb2ddfe0c56d4395086e460952a5933bd7 SHA512 7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106
-EBUILD libXfont2-2.0.4.ebuild 790 BLAKE2B e56788317bf0f2bc194fcdaec45802dffe634870bd3e89036681cdb42ffc5b857191b161642906dd13b11f95ef1e31ec501edbe3cf99af66de2c229d424a9d4b SHA512 ddc53ce64b915a5ddb931a96dfb3118f39c63e324626e9b65d4cc4e4a4406358a7bf97cc4def266613a6f07326d334005895e5f22c9501b5d24ff4457517d964
+EBUILD libXfont2-2.0.4.ebuild 791 BLAKE2B 9870ecc993aab8a8d3f40c135126db27308f37d50a8df742f53f16e87bd8e284537c0ad8144e0c1cc8066cc70b7713f92b0169fd11073336302ce2718d93e003 SHA512 ad606cb8728be5cb9dfa6e74c5e45c60355e26154dfd29e99e2ff4c64426189e58a31b1fa7137ba1b24f37f591f456c3e45e257b78b34bbe8d60e1ff98095a9b
 EBUILD libXfont2-9999.ebuild 626 BLAKE2B 2ff0a44a208e81f4ef7d6dd1b60e0c906e7d2e002cc58f9238c76feedbfb5a0eb7398063d6932c02bcde407f3dd2b0dbdf4a1305c8e3ab59715e420cd7884a92 SHA512 74f8f3bb14f814d9ce9f8630eb398bafeda87c28a15f95e6f7c3c1a306dc5ac6352bcaec48743510d102e31a31e983b3f969d94b16be69224cd7bc69a1d123b7
 MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
index 84f1af84a080..b4d2c8723b89 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xfont library"
 
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 1fc8d715982c..30cd8a3f8e08 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,3 +1,3 @@
 DIST libXft-2.3.3.tar.bz2 353465 BLAKE2B 05a91225d09b5e1800a8272c72f7220d9987e3828591bf73d8307a9c4fca1ce7c4c62b36805f44e385c3a4269ebaafdaed70d3b2006208e860f8e982b53c975f SHA512 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8
-EBUILD libXft-2.3.3.ebuild 709 BLAKE2B 161cb32f9e2216f55e836404bfce01cbe8d58fbc8d4dacaf911c7ffaa1efb658f0c26ea95fde4439f7035790d04ed63549bdd7cfecc2787c9f5bc4abab4fa9ea SHA512 74dd85d1c9bf2f3549e7fc4f3a4d61d7e6f8a3d05bf88106618c401f1fcc582500b0ad9659c742b2927084eb7711e236fd5cce1cc6773027cc5028f22f592f0f
+EBUILD libXft-2.3.3.ebuild 710 BLAKE2B 34e2a541580157aeed2543132b692f68e8fd567baba8de2ecdd5d4d3bc1ccd5d6c3e817dde58da4cd7e27ae7bacce74beb92f56e41d169229f0b693925c7f5e6 SHA512 dfdb05885990cc82acced6a7e510319df23c326d580fa97e489a6173ad30cb9997a8ff2dfd0af3f42aed25a04d74ea339b9d223fa633527466ebafa6346cd0a3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXft/libXft-2.3.3.ebuild b/x11-libs/libXft/libXft-2.3.3.ebuild
index c09a279c8c86..e8ed219f79a4 100644
--- a/x11-libs/libXft/libXft-2.3.3.ebuild
+++ b/x11-libs/libXft/libXft-2.3.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xft library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="doc"
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 2ea2fcaa579d..3886055a1c1f 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,3 +1,3 @@
 DIST libXi-1.7.10.tar.bz2 484519 BLAKE2B b4a3a090045d65c351d21a65fdf2f3d252e11546a5eaba9bf5f22c837b84ee758fe325eff39b32df55f65ab3d6cdc0d2c7ac7e134fec0983baeb0103d109c810 SHA512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218
-EBUILD libXi-1.7.10.ebuild 734 BLAKE2B b9a3d005387c6c9982c4615fcdf699f91217025b14f1b700db9db6d2d8a6e0fb6ba089014da5a9063d3eae8153dab1285e116525501618299d68a345128b88f7 SHA512 d3ea43bcf6bbc0ccd273831298989978ed31564d9fced1015ff25cdde476f39918895658858f1d45cad214188d43870a1cd8995ab1782c57de3da442c7ecb588
+EBUILD libXi-1.7.10.ebuild 735 BLAKE2B edc418e46d639063906d2e54c5fa527c518c2d59602156879050dab7d018cad317fe1d80d35f06c7de1c87f1b1bc1fd33e79694db5371e25ab1061e86d721ed8 SHA512 b84d74090c8d8abedc11ee9dad826b131efb08634168e4b57c4d99bc48e0a36f5b000ca9bf9682071f8afac02a9c909bf938f6be5dceebd420fabc788b20417a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild b/x11-libs/libXi/libXi-1.7.10.ebuild
index cf71dd8e561c..ba1b676f98d7 100644
--- a/x11-libs/libXi/libXi-1.7.10.ebuild
+++ b/x11-libs/libXi/libXi-1.7.10.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xi library"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index 5449602413e0..6a65eba9d1dd 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,3 +1,3 @@
 DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14
-EBUILD libXinerama-1.1.4.ebuild 500 BLAKE2B f30eb62a57e56c0f45d36e3ad1184b5532f26e5b72fa18aa0626adb2b175f625a17d788badafc3698a115ec2650337f810dfc9bad8045e9501470a5e81aa0d43 SHA512 5908aef4e02a7ff3fd87d91918320106f10489ff09250bc820e5bea938180ee24433ea5da6a4b043403b7b0c91ed17678c06b563f7fa104c08d4f98261926730
+EBUILD libXinerama-1.1.4.ebuild 501 BLAKE2B 082589f6f5c4a51f214871c98654403a3c71d0fe2be5db2d4a30236c04177b1b0b503a37ec1bbc015966556b3e27cc4eee73dbee7dddb5a99d9d095018aa9e57 SHA512 8f6ed19a26caf8b44c5f6fddd52863de77f0662b7cbda9c839cfff152cd9edbc8fa7c6925e44a1797d3f02eeed84372af97333ce4d7f8acd3a2ea016d5cfdd03
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
index d368d6b710c2..a978613d5311 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama library"
 
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 067feaf4f132..44440a256e0a 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,3 +1,3 @@
 DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2d22a12cc30bc7f5528b004c1f73370d25b023b68772081f1c58b4813293971f8f08ca8f2b9508adb4c3925c94 SHA512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762
-EBUILD libXmu-1.1.3.ebuild 739 BLAKE2B edc3979bc95b54ba7d500b088e9e371bb02e08910cbc0a8687356281b4cbab52d328f4328361d712ccbb6ed8686b0a989c5a453ab1bbad5831878e7c444f2240 SHA512 516fa2f5b3e6582db9c812b4ede72ca5cccb6726bb8f27d5eab87e7b2e2a82b77052c50ef88dc93d658f60c8ac8c61cfb64a40c6ca4eb0372a8ea1cb5070afbd
+EBUILD libXmu-1.1.3.ebuild 740 BLAKE2B 2ea0e4f1e6581b2ecc37f143c0558f2ac24801229c517a03a6044ec3f25c91e9499724c456d562af2e8cc4d6fb5e35e766bd7439261bab56399eeb395e52dc2f SHA512 a035925160ab7e9dc653695797b9a90b76212689aba9e0f5b2fbdd530965e59f22286e684e7453fa11cfc9271b537191a1b3458e3786ae5f360a8500702a0ff2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
index 299a6267c679..bc75db5cec1f 100644
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xmu library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index 753297057834..e91ece132702 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1,5 +1,3 @@
-DIST libXpm-3.5.12.tar.bz2 430736 BLAKE2B 738838f37643e4e8ce489d34adf33d2459e7bcd7b1eafb21415cd44620c3d4eb18750381a80d1e2c9a2f44ccf00159a029df18164ea7a7834dfee8d104303783 SHA512 a5707d5f758d577414101b0723af334fc8ac223e5b9f869994765735e1cbd8dafed48ea2851ebc479fecaf84381bfd5fbef842ec971a487f7fa9e77d54d3a17e
 DIST libXpm-3.5.13.tar.bz2 463251 BLAKE2B eb8a390802f13ffdd8199e21f5f18d4d17141783d7259c6b558dbaddd2dce05f7cb27306dd5cb73e27d01cffa62f5e4808c143b72974dae443e958069e70cd17 SHA512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5
-EBUILD libXpm-3.5.12-r1.ebuild 909 BLAKE2B a0d4a798ade6ef57afda0b10910ef82429c4c0b33d4183901107830a64aa2c4e560931d719953a76ee608d7a7f060c846c2f1d034850b209f5c130120326bd78 SHA512 8c69439be41fe1dcf9ddaac7e7ab67e8d039e28d28dae97a65c3c3e33d07ae104a739fef50ccc603df51c1f7b4744c918e74e287e054356e4cd711a77e79b7f6
 EBUILD libXpm-3.5.13.ebuild 618 BLAKE2B 9ca38dde45d221aa0b7ea0ed1d40e7fce61055898a538aa038c32d9107eb59e03f4b356fbd895ac3cb7d09b64ac42353ca088302f19a4945d294de7a59b09baa SHA512 e612674dc80a061cd179539b8975d7399bd9707d79c239e94707398278b4d272005f8627f1465416e5155ac62e5cd8e346b477961db0b3dfcea5cfcd4d74bbbf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
deleted file mode 100644
index 84d3cc4c7584..000000000000
--- a/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xpm library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	x11-base/xorg-proto"
-
-src_configure() {
-	# the gettext configure check and code in sxpm are incorrect; they assume
-	# gettext being in libintl, whereas Solaris has gettext by default
-	# resulting in libintl not being added to LIBS
-	[[ ${CHOST} == *-solaris* ]] && export ac_cv_search_gettext=-lintl
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index 228b41812858..c7712144dd54 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -1,4 +1,4 @@
 AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cffbf33ccbf010d0517c9b697f576fbafd55c57aa2263ca93ad748c8d36c93834323ff9a78b1352b9003ba4b96c3a8b3f4acafae744b7e025bc9c SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4
 DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b
-EBUILD libXpresent-1.0.0-r1.ebuild 597 BLAKE2B 36a56111e70406eb7ff06b85c6de688dc79da9da5a93bac0b3e4f552057a06c30f18652ee475df12023784c662e298b041787abb8dd0cbe278b251288802c67a SHA512 8999a286b7d74464bbffaad3649753133c30ae14cae07bc6b5a6749fd839f51c3049ea5844f817f8e171ff74356ba079abb64dd78cc7cd8cc238d553d5812d96
+EBUILD libXpresent-1.0.0-r1.ebuild 598 BLAKE2B 23f435ef9a450cf82775101d0528c534f0eb476c022bca39c39f289f85657473b999629bb4a665bd3426c340010241a82f011a7bf41c4526a1652c97eab01cb4 SHA512 5a52422e043a86d7116280023f756d5ad649c232d18b47fcff722d3881b1a6254df52ded5b781b285019e7e6ef24392f6f6ae5b04a5c801e1158eaddc6a9b6e4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
index 45de16c64917..a1bb2503b95c 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X Present Extension C Library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index 28669cd13cce..64cde96dbbda 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1,3 +1,3 @@
 DIST libXrandr-1.5.2.tar.bz2 330726 BLAKE2B 2d91e4cd2d7af6b79ee952a0d51b0c61d64251c61f862677b47065f2eda811650a5e3bb3185d09a6401291b5a8bb30e8d29cf7aaf1699ac3f49b838ef7b1208d SHA512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87
-EBUILD libXrandr-1.5.2.ebuild 591 BLAKE2B 8aad67498e126699e0a212ef7277bae7ed2ec997cdd3242040c21dac021bdcffbf108eb39cfb2600bee4d1d708eccd1b9d9d4ab75ca27282f1a340c387d71930 SHA512 9073d8055bec4a5b2f2f536e75562f126c00359d293db311d07f19382d65dfe65a50252fed07d32eee173a062e56140339ae53d53a13082747cd5210a4b6a321
+EBUILD libXrandr-1.5.2.ebuild 592 BLAKE2B 91225813019c92c8f0dfa1f67c8789f6cb8b489eaab632efd1f5e12168f5543d648e2253f57b11ae4f344bcd6d59d24a9b42ddbaea02d50605c62134ddcb59fa SHA512 7d2c4852602ce5f1c5cbba6196f751f78b5ff02fb1f5c1dc66678968c88c11e1169ddb44139a42a375806318965e681dd5ac419016a743b880acdb11ca13a28c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
index 28dd1b0b99de..574c8ab9deae 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xrandr library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index b9d5a7e87e65..625c09032360 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1,3 +1,3 @@
 DIST libXrender-0.9.10.tar.bz2 308318 BLAKE2B c9e250e16118a4878e7439fdb37549596abfd6a17f50e4e88242579fc285d0ef5b0c8d5d0fb592c7dbcd6e77c5fb284e6644e4edf9b12118cbfc0f179e274313 SHA512 16ea0cf638b32d7df54b270457ef8c9d9a80da27fa845b105b560cb31027b4c7fe799cf23d6b6bac492be5961264e96d7845d316a9af4de9ff38bf40885ea6fe
-EBUILD libXrender-0.9.10-r1.ebuild 495 BLAKE2B 85e90be294148153614d4bd882240179306a0f23358c3b5237bff5789cc0fd465860e0a46b12caea91032595df1157b3746bd5d2cd0371dba60800a5d5bcf20e SHA512 ef8713fa0b6101a9c2e37be06660d795071defdcf9d564820de3555552c136e5194c5a61d3b82e305159250ba3fa73224e4585b12b58a705e2906e0e3cd545de
+EBUILD libXrender-0.9.10-r1.ebuild 496 BLAKE2B 8077f04513ea1bb4a19d7a6a34bfa2812d5fa3de392f8b3687ab8ecc95d47ac4d9dc49fe417196e9aa35b02a4cd035e4c980a676dd1c2dd48e2923ca46693b6a SHA512 bada35eeebb06944155ff563f69d5f78c597cfd1cc71afd11738e218ad3c065f5f8391d443d6bea8eca286a2b9856c6d5c37535d36599a61427bd50d7d773190
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
index 2bc7074a391f..b8255d2a0288 100644
--- a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xrender library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest
index 738fc33dbeef..137363e5d658 100644
--- a/x11-libs/libXres/Manifest
+++ b/x11-libs/libXres/Manifest
@@ -1,3 +1,3 @@
 DIST libXres-1.2.0.tar.bz2 286635 BLAKE2B 0c0813118c7ecd5851b075a4001e0e34fa3df92bd8367717eee42ec20352cab3443d232715c1d40c5df313f6508d2dddc779980d11744a1f897cc7511bfdfdf4 SHA512 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172
-EBUILD libXres-1.2.0-r1.ebuild 421 BLAKE2B 3acada4d4aa7ca6c4e21fbb847e5fdf66718eb9078c3523cccf4fe4b1fb113fc66ed4a1a43a677de88fe5831ea9a4275cba5423186ca65efc2e404241a44cd1f SHA512 e912090514854f7613c7d564d716f6e5694b7464512cde299066dce8185e57defd671c425639d00c4d922106510892eb18c91f9e8360b23d6aac21b268688532
+EBUILD libXres-1.2.0-r1.ebuild 422 BLAKE2B 3fe70e0dea1cee227fba5df6b3e3aa3a40a055aa7d5f9225c02269aab71030d7abcc12466ebca8229104b913c857c9c350d81d0ff37727b5ce6bf0fe14152251 SHA512 aa778b152475b3bf9f92e3ce5c013f32a7f96ea9278c3b2c1064b8178bef0e398cfef11483ae5e915ffa8ce6b43e526c30a1fc426158966eb0458f9d93165ffe
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXres/libXres-1.2.0-r1.ebuild b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
index b9db64bd2dd7..0e5d4d8cf2d9 100644
--- a/x11-libs/libXres/libXres-1.2.0-r1.ebuild
+++ b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org XRes library"
 
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index ccce4cf0819b..911bfc540d0e 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,3 +1,3 @@
 DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
-EBUILD libXt-1.2.0.ebuild 856 BLAKE2B 8484476bd7534f5a408b2210c351985053464ae0d2b5fa6e2ed9aef9dd1a84df8b673ee3d2e255284b088d5f78be97f79e6ee6a43f15a283678a4f1fb1dcbae4 SHA512 95125d9ae1f79ea5c5536c08ef0b6d676d0086047f9e445681171804066dfcbc40a8e240792815c7ac20366caa6e689ba620e37e6ad4f675f44b6a80b32386d9
+EBUILD libXt-1.2.0.ebuild 857 BLAKE2B 6c65574e4abdbe16102aab5744e7d86c1c907b598bad881c970f70dad90a3898c7818af08c3bcea4a142c43f41b46cc39a9007c12e1a6499c43a171ff0552a5d SHA512 3d8afae2f61d80965df3cf62456e76b453e5a4ba3b6e007f9882b16bd81e60516252fed7ea9c0a7dacc23762fc545054985e9f005b1c72b928b83b9de8eb8673
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.2.0.ebuild
index 9bb826b113c6..89f67ecb38be 100644
--- a/x11-libs/libXt/libXt-1.2.0.ebuild
+++ b/x11-libs/libXt/libXt-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Toolkit Intrinsics library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index e8968f972077..1a299d4583c1 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,3 +1,3 @@
 DIST libXtst-1.2.3.tar.bz2 321819 BLAKE2B 92a75d6ea9000fa7736093ce479d275c57a4a5bf849df2d6afae9478a53a07ba395013ba6676c2ea7dcb6a1f34475967ed6508b7c304b887f83ec44a611b8e6c SHA512 6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765
-EBUILD libXtst-1.2.3-r1.ebuild 637 BLAKE2B ebca34347a0f022d7908d499a310eefa1f33158da8b42d639cb15f9dd37d7762df8cfcc4d135fb00940fcb000d81b558c3605fa251f1bcb06ff2b6309227e1da SHA512 f4e014bab3d5c58a2f6e53ba049f825fc45d568d7341c18529d47b7a49bf1d62cd089e1febe6768bbd167183c775a8b38daece0ce7ee2368e58e1eada9bf35e2
+EBUILD libXtst-1.2.3-r1.ebuild 638 BLAKE2B 13e461b05f2fe43a1411e389d26967b2bdaa7e3a7ae0ce76247a36bbae3d9bc0eb421f60f355c99f656c48f89ee2edc15c921503be47de5da2f81804b978f8a8 SHA512 e3a1b679f825798b95cef021b88b1753e68b27c343777e5ea7a7350fe12bcbb6cf7b8b6c120b471d68dfbac3eca4131756e4799a962c0e89231b87a694fbc6e7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
index ddac2c28ef0a..556d23fd8296 100644
--- a/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index 57d53075160f..1ac47fc30136 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1,3 +1,3 @@
 DIST libXv-1.0.11.tar.bz2 317921 BLAKE2B 3c656e1f5cd02c936813b3e10a359d23e7a8643a45ade42ddd584084ba04d09cafbefcc68ab9356b78c1a716a050637062e956c7f50a03a522d28ff7aa31c3b0 SHA512 97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58
-EBUILD libXv-1.0.11-r1.ebuild 517 BLAKE2B c0ab599bfb1a5740c8b7f912694be6c406187694861459ea6c2cad71640a1612dd2b423e4f84f0b49bc883c3456b39531d8aa7ec08d72de1a4f6a2a365f602ea SHA512 d2035ca647bdba7a2a6c62c5969ff7a07d5dada48a4e07370b85ef996b3dde09e880dc2b0a53956f54f5c33e3c9cdc149c85de45669b9ce713ad30735ebbecfd
+EBUILD libXv-1.0.11-r1.ebuild 518 BLAKE2B 3de560ba50c06551591b6a3a4263619fd9b0872f9164f57aa573d229c0107c47a9bdf68f5eef1acd92a341e49ed94acb52643c44bc3a663b595917cf130e4fc0 SHA512 52061225ac3e0f57c84799f439b22e7582d6c9e3b0cd01c6cfbe2721e76979748ea5974d965f5281c80b821f588222d2e558634a65fd8be948b36a03033c94b7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXv/libXv-1.0.11-r1.ebuild b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
index 91a53ce718b1..0c7fc9df5a64 100644
--- a/x11-libs/libXv/libXv-1.0.11-r1.ebuild
+++ b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xv library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index 9a6dc6da2382..06819e0ebd3c 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,3 +1,3 @@
 DIST libXvMC-1.0.12.tar.bz2 306581 BLAKE2B 180867489863f45ee2cbeb259ae07cead3cef595652f6c02fcb5ffeadb8c286f4dc6fc8ef4b7df0c30b95ef51d8626798a76b50165689927c3449157fbe1a552 SHA512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955
-EBUILD libXvMC-1.0.12.ebuild 570 BLAKE2B 84f909f089ca534c9cb4a3e53801fb02e56a69a5eefdf673b77bed7850f43b596f1b94474e137a3f86cd1d9dd50961168e3a8cbc42fec562eb8641af07db5926 SHA512 c54be0b5b70941e78fae7ae544180d442c4e9bc5e4ae45ad3494005dacd569758e5c0254e6881e5e93c23b15e86a5291e1d7e148e48489111e206cbd6fdf8d10
+EBUILD libXvMC-1.0.12.ebuild 571 BLAKE2B 08d2122dc0527dc747334f757f3e537ab630104d8384abff785f0611f07f3985a8378867df9ade0c6bf8b222236553bb90c3e707ad14d1a6177329e6d3d29797 SHA512 b73459496c201322c835eafd49579841b09e79b1942f8f6229030ecaca3019b0fad41aebfb4a8879df5e2c9ef977c7b0314be37eba3a2866f2b4585fefc323c9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
index 97ac2c3193eb..dcaade19e2d6 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XvMC library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index d1ba9c3a43a6..3a8d9ed67af8 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86dga-1.1.5.tar.bz2 301685 BLAKE2B 8c70299e52cd2f34b4dbfa0d56707df20f7b368ab92321cf9e8c0fe15402a3b4e1b8eb62d0e53fd3321e95521bb4f35479493e412710a74779ac98ffaef966bd SHA512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89
-EBUILD libXxf86dga-1.1.5.ebuild 480 BLAKE2B 328de179c1a182aa5821129ff43cd1a0d1e977a83183eeec41504cef5054a6dabb33381f2012e01fffbceddae357459e34bf20a09fb0f4cd42c8c82f246e467f SHA512 56a7924e9c5a53d56d91d0bc7bab45b7b1c700cb80c5453261273294d0368a9dbeba0691752b1be642683fa043750a5c61057f7c2fbd8954f800f4eba7f6351d
+EBUILD libXxf86dga-1.1.5.ebuild 481 BLAKE2B 79110e429487678fcabea8957c92043d8e8c4f98a5490d53ae59d685ae44cd0bdffb4a01d9cfd033bf791a869b2271fcbf34daa82b8093017137bad87ab57d6d SHA512 d17dec9e12e24702a09ca35aa3098074bdf8b1a23718e70c1c2ca25e5ce785e106413a6855c5a5bce97daedb12980bbe13e9bff2f1c5d98d8d18af96caeb4192
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
index c1276b7d99e5..3e0eb1ebb5e1 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86dga library"
 
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-libs/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest
index efa2ffc55984..62986c60cf9a 100644
--- a/x11-libs/libXxf86misc/Manifest
+++ b/x11-libs/libXxf86misc/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86misc-1.0.4.tar.bz2 282048 BLAKE2B 5d60bc5d04f232444143aa1d89b5760a92aa5951efb41b83eed449916219346d049f0c2b7893858c7ba5148dcf273bb0d2b558e43843f897d057780362d0ccca SHA512 1dbd51a51188a060f676b88e5d98809ea355f69933972ceb7721c83289b5bb94c1f7b889baa83209a5ed864e67dd8a4ed62f1393634e97cc99ce36a2cef447fb
-EBUILD libXxf86misc-1.0.4.ebuild 442 BLAKE2B 6c96831f11d74ae4bf38eb7d32732050971e2bd56e82870d8afaaf7d78f833327b23484296ad18c0a92c9c196289f4c2f30722cdda62c6f1542d285a725862b3 SHA512 5d5883ebccab6cd899b6a3c54a7e5dfc77191ecfa6d03c6aee368ed9f137d1b8addb12c4cf85a96a20926891082e90d89ea854f41057f40d2b3aa0ba542b4278
+EBUILD libXxf86misc-1.0.4.ebuild 443 BLAKE2B 4c1ee00c99353d26b090b07b53733b814ad45c0200863bb811abbe3e3d769f3c86c577ad895c9c40131988ace4652ce90c9e32bf304cfac9617a1c56f3b0591d SHA512 be2e4ecf5fd47eba17441b0cc9581b2cc4d681f931ab55e7b26fc41bfe33d05aa11c84b0dfe69e9c839f993cec158a09feab21262b405303c50986992603a098
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
index fed84544102b..45deacfe0bed 100644
--- a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
+++ b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86misc library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 8289f1903163..ac06708b57d7 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
-EBUILD libXxf86vm-1.1.4-r1.ebuild 519 BLAKE2B 0ae9b3ce7bcb6f144cd120cbc0300c85382b96d1fa7964f3b8e4679560c8f2ac1dc1eed3117790518f78591bdb8f5ec7086dcaf43d19b1c30aa5cc38208575fc SHA512 f5bf0975e88f54a4acd749436ef02a64eaef0693c4e57a74bb48f840e159693935ed5afd708092b470a72a6ff6fe74694c9200c3134a166855be57afd3ba8590
+EBUILD libXxf86vm-1.1.4-r1.ebuild 520 BLAKE2B 1d8ba0695a93638a4821aaad273581980c1422cfa47694be55f4deeb155ee777e817948bb4ff9eeb025585594877dea18442972dd7a0e1cf49f364cd515dff1c SHA512 f1a99052bfc012c47062ef448bf24178c5629c4e8dd5dfe9c5f629ce8b029c6205c7a7d93b8a38792a0cbeb2b842cedaa7b70690d9036fc2bc68460bf844e251
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
index e45264fc8369..69f19b784815 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
index 0f76ea51f8d5..dea9d613b559 100644
--- a/x11-libs/libast/Manifest
+++ b/x11-libs/libast/Manifest
@@ -1,3 +1,3 @@
 DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d
-EBUILD libast-0.7-r2.ebuild 927 BLAKE2B b9a107334c439f888eb069bb8b9f406367735fd941a373b96cc7121fb1f17898c625c75503354222372aa6a94e755a8a0a09e7bb48eb7f983932a6370f40400f SHA512 a7dbdff69c55f225391ecdefa51b071b69e618dc60c5feeec14e4eb7b082acfcb4fb879e96ed4c3a1a1b34ab9bc8f335f80973f9bf2fc35a7310742d14449da0
+EBUILD libast-0.7-r2.ebuild 928 BLAKE2B 70d2da41772b3dab3e10a5b13df2deda5b9be1fb94040b776e51cdd9c7251b959def5cc2b50b814790257702b17cef03cc097fc42121b837d8653f24d6817d1c SHA512 e1a0ef31b059e396f69c1ac2c9b52ed4f501f0e5b587ba56903b3fc4d07db4ed92eb9732049a62ed5e5822853111d64b46a297a2a6f3904810a09ce1970e4ecf
 MISC metadata.xml 736 BLAKE2B 603c1752552864610f08d8b3144503837feb5c7bddb3ebfe108f4d090e25d38fee56ed63f392c98f5468c69b6bc47ecb65e53bed8c335e6996351522e4257df0 SHA512 a2fd1a0875f0a0c866845b4fcc63d0ab715ad73fdd1cde271e6174606180ee5e1f4924270171c08074a0ffc7af52fb9299dcd32a5f057c1548175bf638598acc
diff --git a/x11-libs/libast/libast-0.7-r2.ebuild b/x11-libs/libast/libast-0.7-r2.ebuild
index f8921d81d98a..e5cf229f1c45 100644
--- a/x11-libs/libast/libast-0.7-r2.ebuild
+++ b/x11-libs/libast/libast-0.7-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.eterm.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="imlib cpu_flags_x86_mmx pcre"
 
 RDEPEND="
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
index ce68440b0be1..4edb1b328c70 100644
--- a/x11-libs/libdmx/Manifest
+++ b/x11-libs/libdmx/Manifest
@@ -1,3 +1,3 @@
 DIST libdmx-1.1.4.tar.bz2 316517 BLAKE2B bede1dcf554fba15257277419c1a458125ab962365a4ae679b22a98d6a1e31584087fe09fc1a2e5a7e9b212c0fd332438cdf5c56c8a9d32b6ea755091026b6b0 SHA512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9
-EBUILD libdmx-1.1.4.ebuild 332 BLAKE2B c7b08e72e1cd24ef22b15936b1f7867dab9ccbae04af68e0258edbc26e7e76c3146525593e23d60dea33ca36199fea9a96d7719f5fdc107f325bc140d15ab9bb SHA512 d39a06f21ab0f4c6c40e714e1ea9773d723daaaa2631ca5882305415459996f453998d8b65159541de5fb0655d87cf61fddc346c09c3553c378eaaaba621b744
+EBUILD libdmx-1.1.4.ebuild 333 BLAKE2B 897ac8e12228bc7dea62a26d1319fc25d5ba873b371cdbe47e22fcb2b21386395f4904f91b8068db4e20950c01d696cf8351371f6ec34e12c6c00ca09c3400a5 SHA512 43a2e020ba4b8fb0525d4d1e715cb3cf02e9f652ea70ba7c9d5885ce8b76c2be4d4088856fb944acddabb278f5ca159bfc5a41146100a20db10f1a0244e6b493
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libdmx/libdmx-1.1.4.ebuild b/x11-libs/libdmx/libdmx-1.1.4.ebuild
index 8c13dd56a5a1..dcea6e56fb8e 100644
--- a/x11-libs/libdmx/libdmx-1.1.4.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org dmx library"
-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 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
index 646904284c08..f0f195833d72 100644
--- a/x11-libs/libdockapp/Manifest
+++ b/x11-libs/libdockapp/Manifest
@@ -1,3 +1,3 @@
 DIST libdockapp-0.7.2.tar.gz 40462 BLAKE2B 8d4d2e3d9b1856875a275661cba809852e7c91867ffae33052bc472208db911c19caf1b77b16e367f007e1606be6add6d9bc5a1e76ea8fa2b8616163e922f21e SHA512 a2f216ac1105abe0efbea191691bae986b6022510f96c78b08c1b809cff131794c81810197af7d1321f9b248202376cc7092e79a4d4afa3fb93e9ed8000c9d79
-EBUILD libdockapp-0.7.2.ebuild 832 BLAKE2B 4780766c1a6a51a76adad1b33dd9547a977d8d339a81abbdb867c5ffb9db72dcbeaade01908da55b51c8224510d9586db85210b987a95989f7a56a904bd4b8b6 SHA512 729bac0aec905580db6bff6a30ae16abaa32f77f0d479ab2ddc1b62c2f86f4c2702cab30e6b6ac377776ceccc60ba34f0281e559d21f42f486a5771cbea21304
+EBUILD libdockapp-0.7.2.ebuild 833 BLAKE2B 20a25a942cc18fdb2cf3713ffff0852c76841c3097da1f30daa977f54af910d5bb2d3743e5930d4bcbc08f69d1aa4733753363157c3a853bc572e1fc92a3ec76 SHA512 5eb47de90bdf4f8f74a65697451d6b389158ba141e8af58a0052dce23f64bd1f857502aa3c58c610df7e06a465ac046e94006f5c94cc2cc7d5f1bb98b4db3c5e
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-libs/libdockapp/libdockapp-0.7.2.ebuild b/x11-libs/libdockapp/libdockapp-0.7.2.ebuild
index c46855270162..d8cc59884319 100644
--- a/x11-libs/libdockapp/libdockapp-0.7.2.ebuild
+++ b/x11-libs/libdockapp/libdockapp-0.7.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="MIT public-domain"
 SLOT="0/3"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 # Required for font eclass
 IUSE="+X"
 REQUIRED_USE="X"
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index f0ae650f6dff..1a9f94965e06 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,4 +1,4 @@
 DIST libdrm-2.4.100.tar.bz2 855793 BLAKE2B ba2c631de860b8e2a8bb34d8ac0ba2ed11c05cc98a156bb81ffafa0395e22f79878b9936efd1ae33c31049c2a5cc281586a867a974eeb4018dd713a8481ed269 SHA512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247
-EBUILD libdrm-2.4.100.ebuild 2122 BLAKE2B 77ef1c64f81b719759ad3de3c43af0fb2c02166e137c429c3c56b9d7dca5ce70734bebbb54c098f6289ba60383dcb177b1bad1317e59137f05c35f700b1bd3cb SHA512 d459f2f3349d9a1ba1487f0844494439f245ca5b3988941c09ee41ad14d73cf85af8e5188f7e03a97c2cf49fabc480d01decc6c825f804ab91eec985472ef403
+EBUILD libdrm-2.4.100.ebuild 2123 BLAKE2B 6614feb21a3c47e28eb8483f1c457a86cb8a6de601062e05ed065ff907d9d0f1c08eb554c699b0329aff0625373564a20080ccab320341680de0336d843176f4 SHA512 ca7955bc227be76902290b71607ddd3f898c703af02375b2201f4c0255965c7f5a1f9a5268ea32978ca93c095057533ce26d7683d0322b37c7fe0a9ef4835664
 EBUILD libdrm-9999.ebuild 2132 BLAKE2B 355ab8265fbb85c26623fce83ab593b860248b4b8350d1daf8183b5492a73e8621abc4f99edcd017676b6333d63cbf84b2703ca8d2da7d737ded91ea7d99d4c6 SHA512 d4d44bd07c2815a299a8f32ded02c76a46529d8430684164227f5b47d6806d97a76f4e65c32de72262744190abb01b1c35702535f56f6fcc8eac3cc0746d8f1a
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.100.ebuild b/x11-libs/libdrm/libdrm-2.4.100.ebuild
index 7e8eed29e20f..1ef083f19c6d 100644
--- a/x11-libs/libdrm/libdrm-2.4.100.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.100.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	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 ~sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index e38eb049f605..3ff3cdcb10c5 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,3 +1,3 @@
 DIST libfontenc-1.1.4.tar.bz2 320492 BLAKE2B 34da17e220789f5078e870329390c0e3ee665598db3432ef5a33e78d1db4b12460c7467bcbcc1dad67e9f6ade0173f9fad915a2fbbee51f0be23feedc242e7bd SHA512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582
-EBUILD libfontenc-1.1.4.ebuild 515 BLAKE2B e55593108eb3bd6935407cc7e4ebd5a06a58e39b1681503a4cd895485dbf030cfd5fea3ce6c1195e346c49095c67d21f022268904b7189fe161e28a037e7bdd1 SHA512 d4c2c68212d73b86210b3412cdc9be5c66cee778f2cf0a90cc217219f368ac509d7eb698d1f4550100a049cd1ddac8f30d01967ef4e39e8230e9bf7d017d178f
+EBUILD libfontenc-1.1.4.ebuild 516 BLAKE2B 6155e22c4ba31ec3265890fb4c7e2bfe1a79e94e4dc6166b6b652f5f24acdbf2bc646dbc07ad05eba30e23543ab44038f9220e6d91f30ef717d2701cd429febb SHA512 dce2bb395f0fc63ea4286c3deeeef28975a53d80dec50939b740599f0b3557a551316da61277e29704148b74ca1525991df5256c25c10cb4c039103600fbba32
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
index 8780178c9b1e..d82afca7f8e4 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org fontenc library"
 
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index 84f3dc62d9e1..8ce290d129a8 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,3 +1,3 @@
 DIST libnotify-0.7.8.tar.xz 108436 BLAKE2B 0a73eabe58faca55e16774cda6f649ab3187bd73a1f87b538d5098f390571a6a34078883dbd2447731d6e4cae315d8286e9e8acc06e85590c8b05a693a83e7f7 SHA512 9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94
-EBUILD libnotify-0.7.8.ebuild 1489 BLAKE2B a2d21af4c10d440853f3de9bfc700caaa6f0d1319bf64286b36b3857e4360a81cd669d3aa01c910c8f4e4516df06d27a22f2d5d6a029d87fb22e613fcd3c4676 SHA512 6d436b4b245892380cd003f922575c4077b4c9d25ddafb0755fc2cd2a3da1d62f808d0527ec4f6452f03c9631ea385bcceaad09ceccb3402a901adb322681843
+EBUILD libnotify-0.7.8.ebuild 1490 BLAKE2B 096cee7bf112d05199daaa99fb93beff7838c23a05f85ec1958ceb5dd25058fd29e7dbabd8927f065f86a59d6b2fc9d8cf24594ccbf724b4442d3d3399d70cce SHA512 286ea7dc4b94e20049f264a9e558f77ac78a7f2ed321ad8850d140fab725283f381a478b9d78407507ba9dfcdfc73904893bbb3f93a4e79c1010ec169d5c330c
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/x11-libs/libnotify/libnotify-0.7.8.ebuild b/x11-libs/libnotify/libnotify-0.7.8.ebuild
index 7f8ce624abc2..8d3947ea93c0 100644
--- a/x11-libs/libnotify/libnotify-0.7.8.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libnotify"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 9fca3d9decd5..cab64b805df6 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,3 +1,3 @@
 DIST libpciaccess-0.16.tar.bz2 366603 BLAKE2B aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad SHA512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1
-EBUILD libpciaccess-0.16.ebuild 811 BLAKE2B bb6f9d623ee771d5a7a0fe22803cfef6efbb84bec6c5047be5fb8c4e2a229eecc95d6c846b9019a44e56469d810f8e3f8c6f499d2a8183f0d44b88d2dd625d70 SHA512 96f9403de46366bcc28ae5b957aa436e77f654724e240caa1dc9832e99304aceef28930ca842cd580e96a4cec53d7ea2bc28b5d3d849e45feeef3d1e3dc855a6
+EBUILD libpciaccess-0.16.ebuild 812 BLAKE2B ff3ac136e2b52b8d04f519451655b797391d0aa392410f672db58291991c16716b04ddd209261c04616b5dbc92efd409a155cee7adbfde87f8cd86d61cae885c SHA512 2cb58ea39be898f8ea7d8f0854fae8d7d0f3adaf085f6d2f9a3d6cf70b63309ca48d408d5a2cfcd613e30b63d3795c9cc5840550d0d41a809a4efd525831a7b0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
index 0b575e1c91dc..9637937761ac 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 7499cc1e1475..7453ab42fc30 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,5 +1,5 @@
 DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9
 DIST libwnck-3.30.0.tar.xz 800296 BLAKE2B 5917ac8a69f6f1e0d639f301a77349015226ca6d0fc12e8b23c00a81e18f6e9dbb7716b01e50aceb15bdbd64b5b1a8295be5b931d513e120508cdf14d2d15a23 SHA512 79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128
-EBUILD libwnck-2.31.0.ebuild 1255 BLAKE2B 26eb9690e2ba746e176c9f8dc69b7b971ff60e473fe59abc2bb021fb276ea4958e5d4a9076ff075dd175ad557b42b5fe8a7d9110b94cbda892138270e04d113b SHA512 9ef305ee7ffd8ac7e55ad300de9d95a616fe967d907f7bf0c9661776b58d60fdca24e1a30bb14616df9a7823de8d9054053a37467d6a725ef107fbf5ce35de43
-EBUILD libwnck-3.30.0.ebuild 1130 BLAKE2B 16a4dca2d08989cb9a3af65adc34e87fb4973a414dcd97741d1a268d4c212cc3258c564fbd15a7279150464d9ec465030232c01b0bf6ab9ad99ba3058ebed967 SHA512 b2f9f1a442d8f9358aae0cbcb8efa8f39623079e41ec90d99ef23da22702dce7af96d31ac274d3cd73d621060ca838b0cff6b98a82b95d91ca3f9c02b44d7010
+EBUILD libwnck-2.31.0.ebuild 1256 BLAKE2B e8b38702ad4ed813d84286b5a898aa129d9c408d70b42bfc0fe0de2c0de59ca69fe781aac1494f04ee1a91bcdb78c91dcbb3603a54701d28ba9d4b717b84b5c2 SHA512 8d45ad927c02761e1267c2a4e657bf427f3f8a7e2883c863c12a05d342c405aeec703015b46a686bbc8bff671df39d714532c1398ed09543b5c709f111a281d6
+EBUILD libwnck-3.30.0.ebuild 1131 BLAKE2B f7e70b65940fabbc2c154e598efb9f63da6253de3d5d0f6fc5fc0382fba3eed952c3bc967655b64fa430a30d8f9c898a3f75c6d8d2da8c943f8bd0aada2290c7 SHA512 895bce136f3c2d2410a7fc3d203f56e8c3841f21a1c57cc021115b6dd30b0b0fc37f049a57a89559b5419197a8d7580076824ccb80d6c2b077e529615aaaae87
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
index 525c7cdbc1db..422baec70749 100644
--- a/x11-libs/libwnck/libwnck-2.31.0.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2+"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification"
 
diff --git a/x11-libs/libwnck/libwnck-3.30.0.ebuild b/x11-libs/libwnck/libwnck-3.30.0.ebuild
index b7cde39c5565..de2de559bb3e 100644
--- a/x11-libs/libwnck/libwnck-3.30.0.ebuild
+++ b/x11-libs/libwnck/libwnck-3.30.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification tools"
 
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index d3f31d670583..d3cacfb9d658 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +1,3 @@
 DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
-EBUILD libxcb-1.13.1.ebuild 1458 BLAKE2B 1bf9a8c6ad461d86ee9f7a49b22ec238bef7ace3eb6a0798eb6b5ed1cbaf5c017b3b4d034f473f3ac87c20473ea07e8d58b80177bb0eba293980bcf46428b5ea SHA512 3119417a2b3664b6a6f70710a551bd7fc16b3446f7c644fbee477bee3d7c5a482fc2b5b47809616a34d64de9ccd4194ef7c26d745fe649603d890165758801a9
+EBUILD libxcb-1.13.1.ebuild 1459 BLAKE2B c8ea9d7be5ff74720b17b160132ed5fb4b942805f5f6a58c150fe2cec3ad8f8ac522604b4b698a94b2ad90731bc7fcfee335e2e7f846886b015f896a794e2d8a SHA512 240e560d0297079cb032242595f85bb74d5eb540c414b14eccd41e85e7b38b051ff6cc1f79b630a940828b0fa260dc905436882e20c7d2721c91df45d7fe0739
 MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild b/x11-libs/libxcb/libxcb-1.13.1.ebuild
index a00b275a4b05..6c971b7ee8f6 100644
--- a/x11-libs/libxcb/libxcb-1.13.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE=xml
 
 XORG_DOC=doc
@@ -15,7 +15,7 @@ HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/l
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc selinux test xkb"
 RESTRICT="!test? ( test )"
 SLOT="0/1.12"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index b8f3c727c9d9..e96f89f81b6e 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,5 @@
 DIST libxkbcommon-0.10.0.tar.xz 383788 BLAKE2B 0e2cc110c35a4d07cfd55a46a4cc30038bc296f74522beb97b72d0318799adb76fa514427640f286254de7aa59fb8b8c26de5d8fd52f7e09c5ba3521febb97bd SHA512 58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79
 DIST libxkbcommon-0.9.1.tar.xz 376164 BLAKE2B 16c95081136ea9ce742f494ae2192cce815f3fb4a3d33d3e525f8ad61f1f720fa6bfe74088a9ab88f3c6ef9cdf78c4d8d4dc87e7478fd84e4b09e03a337efbdf SHA512 8d4551a06e7dd4936633f544409401dc33f8f1900adb5daa6403615c71f321d17212db739f89a5b3e393d729b3f33167691404849a25d5526b403fd9ec3e8878
 EBUILD libxkbcommon-0.10.0.ebuild 1226 BLAKE2B 838ec970caa72c84b24c3c67389d91ba5dcbdc23191151e61abfe574b77809b6b98492a47f7e696a0aedf96d08d8867334938e09e7dcce168861092dc7293725 SHA512 de971c96b741b86aac3b9e9e9764f011ec1546d05f1eb0b0d164f3a66ac39b952169c59eef67c121c82b1be762c3ca13dd993eda7d819ec7e70553a5bd8382e8
-EBUILD libxkbcommon-0.9.1.ebuild 1216 BLAKE2B 82435dab35e380f00f48f0d1fb3a54e8c22e163913e72189859039f10fa83dc0498893cdb8ab0c7195164874cc51176735d78e16adc187e4665354d48a4e9a3c SHA512 2628f7a00dc614764708aad7a88830f6b68e4c2291866c9e29f4b5747ff55aa142091f647c4dc6dcfd62aaf4815d2eb050e65d95dda35fb4603bc2437bcbc900
+EBUILD libxkbcommon-0.9.1.ebuild 1217 BLAKE2B 1a022623600444f1f7dbeb68ce48cff615aec19a02643a2f8192f8875dba86e48e2db36c7a40ff88baedee05d9ac302f6f18553109d053bce14aa9320e6a5647 SHA512 fbf69f3c31f7c02314ab124ff106235e01bd29835aaf42600a273554309f9e4f78d52badd858734a5b155cf1c5f3ca80acf7b10585889d01efca8fa0cf4b603d
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild
index 3c8da7b78001..22e1518d14a2 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
 else
 	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 inherit meson multilib-minimal ${GIT_ECLASS}
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index cb777b96187f..44902ac61ecf 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,3 +1,3 @@
 DIST libxkbfile-1.1.0.tar.bz2 364678 BLAKE2B 577da1c43e6ce681630676f3f52f40b1f31d01862a891d4c1bd853056d90b03d9993299714c5e63a903b243165a1e299e1e014cd94614eacb50aeef363be8990 SHA512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826
-EBUILD libxkbfile-1.1.0.ebuild 483 BLAKE2B 53f78d54fe174ca60845c7d6dd264b88d6beaa7b7e0f36e440a2a630c97e6de11f485e4117d6e5c7d772df9ff9919599dab84ec8f9e3a16808dfbca35ea9ee39 SHA512 7007a9b01815f7d3dee1b5cd6bbb2963615dff347d132d989e9f2a3ae3d792b2fc7495b04ca924f0301b2662fbcb251b3eb39057fb817f81b41522e30796812c
+EBUILD libxkbfile-1.1.0.ebuild 484 BLAKE2B 58f36be59333720c13c85bc9ecf123e37e99cdb0ef9798a4839ac2b39852f65fff9fa2c799c06c28eeb0c1c3b5c0c9b710d019442be8d332fb2495489dcccc7f SHA512 a85dccf395c5b20146cc50f563f06a0460d5723c0b2bebcd43b354e78620de7a8dac73063de9bab16e5c11eabb091146acd825c4cf3d09cfc2afd4e750c9f258
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
index 1225f3449f0b..6b2bddaa3242 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbfile library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 07de1a83dc6f..81e8a54aac50 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,3 +1,3 @@
 DIST libxklavier-5.4.tar.bz2 390428 BLAKE2B 3cd109c6200ef977533d39b1362c33f871c2cd0b011779b726546aa7dc95bf7dc89931dff7ca2e9a012a51aeec602a53df499591ab30e1dd813fcc823318a2e2 SHA512 e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae
-EBUILD libxklavier-5.4.ebuild 1341 BLAKE2B 8e71cea7b90ad0cf59b61df1f11998edeabd6c6ae14f9cb23901e6efebac3020af7f0dc7bf673b8df0245fa8469ee54b13997084cfab741963fc90a807e87169 SHA512 04188383e4ed96d501a0f1d7c0a9c7d52ac99ea19768a5b5901e90029d0407c3f679f2a7f468d943da733ba2477542088007f23e250319ddeec0d943ef40d94f
+EBUILD libxklavier-5.4.ebuild 1342 BLAKE2B d13dfff36e19fe57d0f26f16ee47201466fa764c09a61bbe39817a3c8a94384af1c1d225aea76969389d6183ed0a49ad3d85a8e53010d009dc8d1fae8058aeb9 SHA512 f8f9184e0e0a61eaa1793ff9591928c490fd6985440b9c92514beec846c9518ce08905cc3865cc8de21856e3767e78367853f9b9455df4975190b5fa8976aac7
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-libs/libxklavier/libxklavier-5.4.ebuild b/x11-libs/libxklavier/libxklavier-5.4.ebuild
index ce4f9c400f0e..f1646ee33f90 100644
--- a/x11-libs/libxklavier/libxklavier-5.4.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~svu/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index 526e41222e0a..2bf530ac5ea0 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,3 +1,3 @@
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
-EBUILD libxshmfence-1.3-r1.ebuild 388 BLAKE2B 4f607cad56a349b25f1ef67e833117e9323578a3b6e3a7abe454f041870af85397ff1c4d1b28a1a534dc264e28445651e0a0fb10268eb4240e76e911ab25849f SHA512 f3b9260ef6af94c22e767ea7201568ce6da7b588168b8ae7d9e73a3a00e3460077da56ad43cdad1183afe21aba73b40bfa0c42edfcf369da7c9d0b394e9a3aee
+EBUILD libxshmfence-1.3-r1.ebuild 389 BLAKE2B de0b4e959b6d38ccac2540e862e4e755f38b3e228eeb5b729e5d551f8547e156afa2d54ebccaf7ff94301c7617624966ae2b3b40fbcb8e34d1c18bc9b7297196 SHA512 298c0d2162bd777a8e1da9c40971eaa82bbdac793125ef24cb5194527edc30e3b9aa88ca263445cbcf07dffd5a51957913ee154063ccd13d942deb86cd138b04
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
index b206ebcb15d7..2f056f93ebce 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Shared memory fences using futexes"
 
-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 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 5dd8478dc7d5..7d5918ea13aa 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,5 +1,5 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
 DIST motif-2.3.8-patches-1.tar.xz 1896 BLAKE2B 7234860dadac55362c7f1804133a660da1ab468fb6c0f0c71cad76b956a5f0b1e58874496a6721f49bd6413e916014807e946112b48b9a22272db5e4d97d43d9 SHA512 22e5d8c590d2c1c57fc639cb46d16984dc5fbafb3b68fd647d180d6299a06f884a8ed69e2180da8153bb0f68821eb0031f93e9b9a3128ba93535fd7fb92b402b
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
-EBUILD motif-2.3.8-r1.ebuild 3110 BLAKE2B c32256b98891f61dabad7115f9e45178f81c90808646f92f68a9d94b111dfc2ef52f92f3bc47a074a3590fd18fc9b68a1cad04e351a06153175d65876a48493e SHA512 51717584babdf448d3e9458307d6d2cdf3d40375689e012a45f3b18d858611913af7b804034a3caa9bace5429b179a867883434257d0ab607595a6ed68b97860
+EBUILD motif-2.3.8-r1.ebuild 3111 BLAKE2B f6d0ad320d7bb1584dfd00d9daa2e96dcaf7d6b4685938ca58282026f08642181f90ca1cf24faf63d0976d78548221e28b04cca34f3e8f3ca910731605586b84 SHA512 b09fb14ee0a44f7236e69df84444c56af6fa9869d70548ccf89b95f7d879e64531557429e7aa632dcef3c43285112769659889aa555ee1d2df87dbe89d4538e2
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
index 956da5293b19..6a64584bd370 100644
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index 7f8180e5ba73..c2bef78fb4f6 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,3 +1,3 @@
 DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1
-EBUILD neXtaw-0.15.1-r3.ebuild 716 BLAKE2B e3bdbe1eb4707b0ead97fc437a872132460af3cf241665672dd882e47f13e38e43eec4d8ea6d73795727c3fd39e099880b077b4c80d62a7594f41637e6eb12a1 SHA512 bdc1ba796254062cd41adb8c0d8090703cdc2713bc5dd0024df46c3088213448d806f2e9fdbeccce597c7903152cff363d080155a331f4208934e5a01385ea01
+EBUILD neXtaw-0.15.1-r3.ebuild 717 BLAKE2B d5917fcbea78c49e50223250d36843a157c999eacb9ac3151ad016b0c73959a3d1fee9a0b396545a1e106a438cffd3c454e364240d015475a0b5db5337e28721 SHA512 ed54295ed52450fba6c56f69f59f85ea3acdf3c0d1c32d98d0d52371069b58c6c0654f1eb05f13257281541bd508bdb5e867f7fdcedeef41d516bfc737799d98
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index d1d73b5a863b..c04d68edcfbb 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 2df4c38fed6e..f496df93b124 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,6 +1,9 @@
 AUX 1.42.4-CVE-2019-1010238.patch 1088 BLAKE2B 7517b2b4c3502546a554d3b592c8c48af444bf2797fcffd18bd63fb97023f3fff666c70359d4935cf179d7e98be12b885e5a2937d882b27f213e17658002e0a9 SHA512 24f46b5d14dd589b0d5ca992169fb46a696d0251c63cf3c0210bfded534f4f35d20bcd158c4397d6ebe828ae995a5321daca4ecc634f0d5f38bc7f5ccf8f2fee
 AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
+AUX pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch 1148 BLAKE2B 3d11b4da8d8d518e295af03f1fee1339e493cb0e6a8f3db3778986b53deab5a2a6193d5c0aeb38461a9f2fa5d32324eb23fc3cd16ccd927602bf76a805036538 SHA512 8c70c0e42b25946f1e4bf907e353c78721389ac726ef4574f1d2e34e4d6f93fcdd7d4d095c5fa0d6f1e085b148d7ed653713dd1876a255dd7703bf190f2d159f
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-EBUILD pango-1.42.4-r2.ebuild 2335 BLAKE2B 75ea8501c2d36ec6a4e523ec05f076ed2de4252c18424ce10cc41d76f4c43299115e35640daf52a2b79c10c32c9e87eea7a989ee3d99dc3cd2c7d417fbba9d51 SHA512 22ee1035c822380fc2f2d4fb89507ac945ae6752e90114f6b1a8695b9821d9bf551692ae56717f2bc6febd51926bc833455515d58b6e37f0b94f19ae76d3ddab
+DIST pango-1.44.7.tar.xz 521384 BLAKE2B 9917efc1bcc9115331149d77eb9b15373d4331ed6a8e5542a97fbbbb480eb0557736d4f1817c0fd56262f442e4b3c2c68607baacdd38b1684def1af58a583bfb SHA512 6e0a3d5cd32c209fd71a2ce5f705a60db318c2133bcca07360a047a73892f642a1661c1f0fb90353fc43e75336dfc22909bf4969f1bd03324c9689344af08350
+EBUILD pango-1.42.4-r2.ebuild 2336 BLAKE2B 8c35093e164a29d4a2a79f26340b99331c2124ab02fec894878f35be8758b71ee4120fc5c2ddc79282b25f4ed4a218bb5aa7f54260d128995bef9399a41e6e6a SHA512 28d7c495050851f8d957169ad8cf5a47fb4551aff31856827aba945cb42a47927c4670812395069736b4090d1c55ce68e31a1ab1038757f8f98f2f3064f3989e
+EBUILD pango-1.44.7.ebuild 2130 BLAKE2B 45c7b415b2d039c840b4f75c47d61fe13aa66af59ab045779956fda58cbfffd0714531529d3170bdc5d7ea0038a5a13f22ed4c8b86f665ea9a339318c3e37a56 SHA512 cb2c95cc8a3aaeb2f982c7634d4789c9ab8ab1f51f8fb31b0e23e37b768830f219e98986aed7eec4176f58f139ea50a416114df38d4714cf2b3080862bc86c23
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch b/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
new file mode 100644
index 000000000000..181d84587e13
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.44.7-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
@@ -0,0 +1,35 @@
+https://gitlab.gnome.org/GNOME/pango/merge_requests/161
+
+From b73284747ac937e31dc9191f84ed6e24284c88ee Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan <fanchunwei@src.gnome.org>
+Date: Mon, 25 Nov 2019 14:58:32 +0800
+Subject: [PATCH] tests/test-break.c: Only test Thai breaks with libthai
+ available
+
+The four.break test data file involves the Thai language, meaning that
+this test will fail unless we have libthai.  Skip this test unless
+libthai is found.
+---
+ tests/test-break.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tests/test-break.c b/tests/test-break.c
+index 8549b678..47fa3009 100644
+--- a/tests/test-break.c
++++ b/tests/test-break.c
+@@ -305,6 +305,12 @@ main (int argc, char *argv[])
+       if (!strstr (name, "break"))
+         continue;
+ 
++#ifndef HAVE_LIBTHAI
++      /* four.break involves Thai, so only test it when we have libthai */
++      if (strstr (name, "four.break"))
++        continue;
++#endif
++
+       path = g_strdup_printf ("/break/%s", name);
+       g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, "breaks", name, NULL),
+                                  test_break, g_free);
+-- 
+2.24.1
+
diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild
index 55f956cec0bb..97f10d1025d6 100644
--- a/x11-libs/pango/pango-1.42.4-r2.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="LGPL-2+ FTL"
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 
 IUSE="X +introspection test"
 RESTRICT="!test? ( test )"
diff --git a/x11-libs/pango/pango-1.44.7.ebuild b/x11-libs/pango/pango-1.44.7.ebuild
new file mode 100644
index 000000000000..cbaa8b80c48a
--- /dev/null
+++ b/x11-libs/pango/pango-1.44.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson multilib-minimal toolchain-funcs xdg
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="https://www.pango.org/"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="LGPL-2+ FTL"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# X USE flag is simply a stub until all revdeps have been adjusted to use X(+)
+IUSE="gtk-doc +introspection test +X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.59.2:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.10:=[X,${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	x11-base/xorg-proto
+"
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tests-test-break.c-Only-test-Thai-breaks-with-libtha.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	gnome2_environment_reset
+}
+
+multilib_src_configure() {
+	tc-export CXX
+
+	local emesonargs=(
+		-Dgtk_doc="$(multilib_native_usex gtk-doc true false)"
+		-Dintrospection="$(multilib_native_usex introspection true false)"
+		-Dinstall-tests=false
+	)
+	meson_src_configure
+}
+
+muiltilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/x11-libs/pangox-compat/Manifest b/x11-libs/pangox-compat/Manifest
index 5b665174755b..d5e0282e54a5 100644
--- a/x11-libs/pangox-compat/Manifest
+++ b/x11-libs/pangox-compat/Manifest
@@ -1,4 +1,4 @@
 DIST pangox-compat-0.0.2.tar.xz 267396 BLAKE2B 364761c9610e497e3bc2c8a1d311cffa0298256b3cf68754c5ea4e31ce096d136cd50e2deca473d2b34aedf24e50577e8e8c37ca2556ed53c9210e4d3ff663c9 SHA512 fd3e257157d78c3d86c948e7909226fdebe52408d02a52432de8a295443b64b80b37cb795fe646d581515e6072bd278f2dcab0e43cf27b63b03a82c01eb6b9b3
-EBUILD pangox-compat-0.0.2-r1.ebuild 783 BLAKE2B 71d3d4b6ab1eeb6f4627a3f93900839a553a6a3a71b49c5ea4fdd36ba8f001c1199b013a0c10a460a6f59b03bf098cc8000e4358c56b60080d99aaa815f25e86 SHA512 1036f3a53570faab857bebf147d61fd19fba78b4112838093b168e545ac7ab7533f1649feba4aba0ed62462b87835a70ba06d1fa2fc4fc17ac42cab1f2082654
-EBUILD pangox-compat-0.0.2.ebuild 635 BLAKE2B ff370f1903ab0928a3a872b9bc1b65e85dcfc2282d50465e1529aab71644d7db3b8aa868d802fc7f6cf3f6fae03e82cced9041448a6caae12d87a5e071ee495c SHA512 98a6b35663e39280573abb52a05bf6642698786b380726426ebeac5ab84da711de52bfecdb0af5997bdbd7d1394eaf4fd984510a37946e3607c88037882068ec
+EBUILD pangox-compat-0.0.2-r1.ebuild 784 BLAKE2B 8582bf59aed5696064cb0bb56dc66f7ea207eb0f50d77234d06eda4a6bc3d263ce61f2461a8913a47217a581c9b457412e764c696e5b394caad5f6d978b86977 SHA512 43439d3a620b9a7e5fe21385ea2aa1aa22d99621c190fe6d1041ac8166388b994f9601fcc8cd9b5ff57f1653cde6efd247c57a57d8f1e063a4335ea58ec1f5bc
+EBUILD pangox-compat-0.0.2.ebuild 636 BLAKE2B b9d68a957612a7d3c0d341b5826d71e155011a5be55a49cb13ff5b2cb252e791d4603ca9e25331eaca982a0cf920d8feb8c0c8f7ebb4be7141a30bba61c953f5 SHA512 683dbf73af9b7d411c6c9e683929c4a4172a83d390be634b13e022150f27e0ad395187911b232cbd1f062aad9a60ae7d92735ed07ab037ab2ca30643add631bd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
index c0fcef606f2b..7593631a76e2 100644
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
index 461ea69dc1cd..c0f2b50943d5 100644
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/glib-2.31:2
 	>=x11-libs/pango-1.32
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 930bfcbbc690..ded6a9648406 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
-EBUILD pixman-0.38.4.ebuild 1731 BLAKE2B 23595d62da78c3f77390ce44f2135e235035fa8557ba3c5f0da8ae41de5ffbbb589ce74c3ae438a83c5c715927546752b25a92a23999332353514d3e225e11b2 SHA512 a37b75dec6ae3c8ec3f18f710ffab49df25f5857a7af1583fa2972a65267c3acfa13394925d91176ff7fa147a7b0777e6568db4b92f12ad4850477611d329c08
+EBUILD pixman-0.38.4.ebuild 1732 BLAKE2B 36630ab320a853538420fb4ef585ed67239bfd397bddd68f4d6de4e1ce8f7bafd7723c27219202e7acc07bd66dbd1c2e8ae658b83b5cb3e0d4c2553141e3f46f SHA512 c742d31fc898c83e9d747c216d9695568abe4ea68db11442ce3e0c03a2f865860699769496fb06b7e1d8a7f41609018fda2a5e42fcedfb1c8353197e139e771a
 EBUILD pixman-9999.ebuild 1731 BLAKE2B 1d1938888a233829df28bb28caa95551b0687ddfcc6ff986096348a2a94bf0e96eb0cedb46b02b53977bc58c9a2a27cd178ae60c33f29f23b3eddf407d3050d9 SHA512 10398c86d789d7056907a006cd66d2c2ae32271ef44103487dcaa6880ec322565c8d990f73824a3baf9d4adc3f8a4ebf7ed737203d635bb4118270c61d153c98
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.38.4.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild
index e1d98ec9a93f..1bcb97cd34d1 100644
--- a/x11-libs/pixman/pixman-0.38.4.ebuild
+++ b/x11-libs/pixman/pixman-0.38.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	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 ~x86-winnt"
+	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 ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
 fi
 
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index cfa3a36a0fcc..dc99e1a3301a 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST rep-gtk_0.90.8.3.tar.xz 120616 BLAKE2B a0ada2bb13a8104d0dd532f35b64e6b049711284b60b4c4960b730909061ecce058a0ee79517cc508db95647d93f9af95c5ca73cf76e26b59467c8441064ac07 SHA512 d33de562c94731c0ce0fbca574952b9f36c2f2cb084783976486c8751daba5de0d20bc781a06ebd2005e541bbbec3f984453ef65ba6233bb7acfefa31b1acaac
-EBUILD rep-gtk-0.90.8.3.ebuild 982 BLAKE2B 839bc8f77dd0d45613f8173bf7981658932c6697611693c32c7db4589c9ea4b2a66882bcbe125535626d974694f01290da204e327bf3476a446f96648b6a0383 SHA512 9800ebc2dd842a6266afafa719831cbc602908221c4260713411cb918c6f6fadb452314418c257bc6cd499acdd1cba7a7804b494715aa21fbd84c051f056171a
+EBUILD rep-gtk-0.90.8.3.ebuild 983 BLAKE2B 94fb6bd24ed058421573398180c49a77091a575d9ea32798bc6d9e80e327ad91c121b1ae43aa6213ddb96d3b15c9e1de73f562f1fc4c2009d20ae28c8c9d7437 SHA512 e6d600178a344e52ab78da91786bf7a8033574a833a515743ceb93f229edf2e0d49627285d192035971c0b3304b0c7c022aab3c2eb000d2bfb95961553ca045b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
index e099e52a4bd3..8ef0493535ca 100644
--- a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
+++ b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.tuxfamily.org/librep/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="gtk-2.0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND=">=dev-libs/librep-0.90.5
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
index 06ed0479befc..b354f555dc19 100644
--- a/x11-libs/startup-notification/Manifest
+++ b/x11-libs/startup-notification/Manifest
@@ -1,5 +1,5 @@
 AUX startup-notification-0.12-sys-select_h.patch 928 BLAKE2B 048e3a834d6ec993d629bd72d13fc3008b7c52885cd34f5b057c77c5be3b8601e05d5280443eb567696ff5e590f49f3b6f184971c92e8bffc8b94cd1103e9b81 SHA512 5f89b2747a2e5d633229b2e858380919121bdfd8f5788898824115fe5c4f60ffb51d0303830b7896657a96f4c2468de0ada0a72782a48cb990d614a1805e91cd
 AUX startup-notification-0.12-time_t-crash-with-32bit.patch 3377 BLAKE2B 2ed2cd342d606e6d3a2065aa127b7c1e2f6352c9e8142795d2a3a654706d771ec5a8cd1c26d5f75538d8961d081577cc3738d1c169790ebe954d3ade07f1721d SHA512 b1bbef28012a08e265e19296f6f6b1adf4bf82efa2d585680f06a352258deee6f2d8b2f842a8f27febe78f23048afe5f39fe80bd555b826aec927d14a289928d
 DIST startup-notification-0.12.tar.gz 355285 BLAKE2B 9822de9745fdeef28d7c6422d2a967394ffc329e7f37e1676c79e900f8e776578698ef47ff199fa05aa795540382f5eab5cb63f6cb20512328897236df1ab152 SHA512 ea1246acdb50dafd9ced9914ec3c8f0d499c0ca3cfd447b43a444c768a6e9ea7135e5c42d9ca0089354698ac235bd86d42f12c70a3a17c9c79f998c07461f7ab
-EBUILD startup-notification-0.12-r1.ebuild 877 BLAKE2B bc8155f5d49145db4713b5586970fc0f1bc2e8811c6a42dfd248c63598d4cd8181375a1747a065c7db0ecae1a4c283c9bdb4ed19afb5e69aa76cb95e1b02d2cd SHA512 007163bbdea20a6fa44edf359ca43fd163a428ee5e9e14c65f8f4e5221900983b44f1159dda385a7f514ad724a9180a99ec707962d9da080faac743cbec5cde0
+EBUILD startup-notification-0.12-r1.ebuild 878 BLAKE2B 39e3452b34e14acd4986eb0978a7e2be665ea1f5992e80ae937aefd4e3108aa63bdf3c16e694ac33f0da434eaa896328a30898f83fbf3f1bbeefaef50bedf134 SHA512 8f1ddbe315a7730bcd149930897259a87ca802996b69973c2c325ddc9076df9f9dda6fab1a438d44810e7dfb5be7233f1cacd1cb36bcfd78e28d7bdf7f46c7c1
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
index 46df2448200c..76d83acfadff 100644
--- a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2 MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.4.3
diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
index 34c21bba9015..51fca2c8eeed 100644
--- a/x11-libs/tslib/Manifest
+++ b/x11-libs/tslib/Manifest
@@ -2,6 +2,6 @@ AUX tslib-1.21-optional-utils.patch 610 BLAKE2B 0f25c58205f5bbddc62f278827d9689e
 DIST tslib-1.0-patches-5.tar.bz2 6602 BLAKE2B 3cd67f4eeacd0651354af8ee4637e27084e9ad61246e6cab631ef52c7435e6d37acdaffd4ca72d8435335860f12d2b0fb4205b33092ea603aafc837e2dba6885 SHA512 dcde900942a3c9e9114e2c36d1d9554eeae8e5ca64463d69c52188a30734b19d6ba0439e8bb009b0d535dfae3f8f8e688a6861ec0a0371fdcb0e9986abb963de
 DIST tslib-1.0.tar.bz2 47522 BLAKE2B 99f43b5175fadef240a973d0e88c80a227b5ffe518c97c6d890fa4194148ff099055b98e7b5b3fee542249bb9c9bae88a22d1d050f2f7ca1563d03b453aac34c SHA512 a12e569b1d9cd809776a605775c3000f4e405789d95eeda21451d3911b5aa67003c921d9988f5ea8eba8b32108c8b0816e6609b5f013a2594d27b6e00e75de8c
 DIST tslib-1.21.tar.xz 349216 BLAKE2B e19623c9390688b0aa85e6547a57542d2e10498c8ebbb30f840157d240dc9975c3e6735814a5e6f02fb71c273a52f860695cf4772fef28522e74c5781cdcb02a SHA512 66c5e5dc4e2314277e19af29b5dce1181573579f13b0e79fa43e658838d4c19a77feb978b60d7c6458337e8d6100ee54a42fc4af3a99fd8d6840cccafa6323c4
-EBUILD tslib-1.0-r3.ebuild 1103 BLAKE2B 48107042388b9b05dfa1977a62cea786856e267b762dc64c80c2a48b0469cdcc6c072dd06b8bc2c66bae768431f4af1939ebafe9c54a468496180fe60768d4b7 SHA512 a41e3bee36018b625230f165585afb9493ce86aadeaf1d651773a5b26fd8e0bf35673b1387098321d9aa3a8e0afe90e3cef4d6d52665a29fb0e039b14291b29c
-EBUILD tslib-1.21.ebuild 1571 BLAKE2B 20d3ca2a8c62a85e7f5bafaeb30cf7be34a30fb8519ff9fdde7747cfee76bba19af66e465e74c72745498eef06165d763a5d2fd91a70d5cc91ce8159a3a14f1d SHA512 470ff9c800bea111deafeab004724bc7980360d5375dbe1ff835d70bde49ef3351dbadacaa0d92150f5bed91bab5ce3da2c58014f7c9fd7bc540be7fa7a57b8d
+EBUILD tslib-1.0-r3.ebuild 1104 BLAKE2B 086491384571e21860a64b36e7e891c104c457f77df8a465fb633cb071e5543d444d5c788fd7a540ea901ca3a4ee931e784dcce687f4dbda123ed8d62e61a96d SHA512 7c0d876d74c1aeeb7039a8588c452405c7c68d95a4c4659236ded7d62811b2b0dd23541c96dbe0514247eb7660bacac16de49a49c2711f290b55c0235d50ea6b
+EBUILD tslib-1.21.ebuild 1564 BLAKE2B cdfe1839919463c2fadf4d5dde834c31903a17745892b5f25dcff4dc2f84580901b2e34d4180e81d3f792a7f6cadc01258a6cec2c7ee8fbff0ee65a3e67082b1 SHA512 58177fafc930bc729ff097a2a599f0be62e77e06fbd21c167115fae571ce64f54c14d643b185f4d82002d51a88711201ce68674e9de204a073aa4722cd69af4f
 MISC metadata.xml 476 BLAKE2B 60986e648e86b87a797224b40bcb510af598d2aeafdc497850c714872d844b86c27d7f3c24cbbdad92ec91c8803fd1a8aeb9e06ffea5700ce3c42a2b3d3d8587 SHA512 f5b0def5c198a78dd8bebfb3e9b022ab37dc6466e1a3af7a7b0497f4133be7d155a205da190d63f98c4e10bc7fca6ee84e6aaa6e46e74e1ed0d8c2ac387a15e5
diff --git a/x11-libs/tslib/tslib-1.0-r3.ebuild b/x11-libs/tslib/tslib-1.0-r3.ebuild
index 77ef6bda4952..60286f30b2fa 100644
--- a/x11-libs/tslib/tslib-1.0-r3.ebuild
+++ b/x11-libs/tslib/tslib-1.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 #extras arctic2 collie corgi h3600 linear-h2200 mk712 ucb1x00"
 
diff --git a/x11-libs/tslib/tslib-1.21.ebuild b/x11-libs/tslib/tslib-1.21.ebuild
index ac72cb85bb3f..5ea56531ce69 100644
--- a/x11-libs/tslib/tslib-1.21.ebuild
+++ b/x11-libs/tslib/tslib-1.21.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2 uinput? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="evdev sdl uinput"
 
 BDEPEND="
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 1b370c83147e..69b2f76de82d 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -5,6 +5,6 @@ AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
 DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
 DIST vte-0.56.4.tar.xz 1100952 BLAKE2B 3c3ec69f4078bdb07a4501df4aeb31aaeb7f9fa5a4631152d486fbb2c950362612cd9dff4abe25b93da6c712a37a20ccbf050ad33d96ec7b997bb1409189f60b SHA512 5a6c79b30f07c1f5848ef59028864d893cc605b9ad8f49ae819958aaed962d2ff96baad379f126381b8bf00015003c5a6dc28c792e4e050ba35090338bd7dabb
-EBUILD vte-0.28.2-r208.ebuild 2952 BLAKE2B 40d1d998937dceb5b3f614a4c5ad959721463b4e11829f3618a54d60c3ae7f854dce7e218eeea7a8dbc79b760f39f04f3c94daa8dca4a307ec1e3a2a6023323a SHA512 06889f2d68a032d8b68bcc8815b0641bb7254945514988b32547cc9c3f4e032bdf23279681bb8c5fbb4eb6901b0f064b299c69ea53a188c008ebabf7e6ae8fb9
-EBUILD vte-0.56.4.ebuild 2278 BLAKE2B ccf8eedd6022721a0eed732293a3707c71b78b12ac350cbdf685b3f4f66b580f074d68f25d2aafcf6c0bb42d5aff93031e18792d2e9504f2254b57e4ad85ba4c SHA512 f1265a1133d5ea3710ce85dfb8284a95b4d34b60311cbf8b81e6051be899633409a9ea64720b74fbb83e1e31a0a89f85e6291f5173e30be1e911d3764cd3cc62
+EBUILD vte-0.28.2-r208.ebuild 2953 BLAKE2B 2c03f83d8daa49eaf5c603d0c51c415e26636ca0f1087fe833ce577d5b9e333307c8c2b03b56547df401176b8a7dad22ca6d038d1800712f62feef7d0da7dd8f SHA512 f57bc271c20e7994675aeadba91d00e36efd73d55efb4b7c6c558955877385539a0db28614ad6e1fe19906c60e79b20ce885cb41218bb8c2c4600b2ebd510b0e
+EBUILD vte-0.56.4.ebuild 2279 BLAKE2B ffef98a5788101e4f6ca7ed8c9e29fe7cd4b1c45a4a6d21b846f992384383d84de3cab0b59cfbe471003e19c04ded933b1c6571aac23542dd213097bf1022c12 SHA512 63ca8a7b27932bed7474b75f26d2b229c22bb67bbdbc10963b52a5df18d40f0e0d1b57d889995941b8bb16b2fa12617c3fdb8b43a53b5d4e62961e46a136eb15
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.28.2-r208.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild
index ad2f3425c457..3c3c8d2a5661 100644
--- a/x11-libs/vte/vte-0.28.2-r208.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r208.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/x11-libs/vte/vte-0.56.4.ebuild b/x11-libs/vte/vte-0.56.4.ebuild
index 718b10f7f507..afa7f7693a5a 100644
--- a/x11-libs/vte/vte-0.56.4.ebuild
+++ b/x11-libs/vte/vte-0.56.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 8f0312bf7098..3b8f617bd578 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -11,11 +11,11 @@ DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d04
 DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd
 DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
 EBUILD wxGTK-3.0.3-r300.ebuild 5046 BLAKE2B 686dd2de3291981d965c9a30c2a3fd6d883217bd0a91729e6c751462e74022295326ef3d1d23dab5a0ee1b4bcccb627e49a2e6d6980ef62b7cbd26a0a3576c65 SHA512 a41f3ff4af20034a8b4fa6faa7fa8b0e81769d641f4cb6ea214d9f100c1ec6ca99cf30b9218d65118af7bca31a740e44445c28b6801c35044ac9495e25a1ca26
-EBUILD wxGTK-3.0.3.ebuild 3972 BLAKE2B e4e180572b8a8edb94fb0f1339806a37d1b099333eff3dba6891629a3076b2efb36e852919eaac8cb3ad43941c7d1fc2d13fd93f67f67199f136c8ab75bdc038 SHA512 71495f3150fa391260a9d459dcc5164aecaca4dc802e9a05e8fb269ad37e6836b51c925e896fd52d63f60dc4f801570178c5ecbcd885f729b588ed9d0d4c4b50
+EBUILD wxGTK-3.0.3.ebuild 3973 BLAKE2B 8b0568a51194423dde783f6767239469d78aab276f36f857979dbdd97c2ba3c0248754fb75fff8567431ab8138ff4bfdeeda8979c111ceaead5586ceef229e2d SHA512 2c486358754ce998fd3357235eb4c628cd36ec8c0129626c0c571f9848a36f1136f1f11a5a9acc4cf1429350f307cbaf6dc1635a248413fe7d7cfeab56acee31
 EBUILD wxGTK-3.0.4-r1.ebuild 3979 BLAKE2B 982ab0b79b36078acea50118a213c1953fb8290476a2a54faf32edd955954d6f9fd22fe0abccc0906121c930993103cffd17e11491908f3e7e079409cdc1a5e6 SHA512 0df4930e67b6c3dc3d20161ef8ff8bac0e046d4dfd65f83e5db0e787788b55b4f1e733dc288c1a4534fb93fed6a00b0ccc8b83fa732c245398129027257cc703
-EBUILD wxGTK-3.0.4-r2.ebuild 4019 BLAKE2B cd50069649dc49d052f05deee87df25a1c27ec1b79610e9ada579580b74f30be7bee1b14f62dba2760b4b2fb74382d0d23c4ff7a2e89f374878eecc3e25472fe SHA512 27a512e2cc2f7029b4a5319125344d31cfe8cc912fe3ed1ec937121b699c90cc7c431ccb4a1badcad71fcbd54538ff836cc212b8313a23ea9e5e43877b40fc86
+EBUILD wxGTK-3.0.4-r2.ebuild 4020 BLAKE2B c01fb525d61ffb7de9318520b3902c102cbf1e5e69272773ae615ab6daef59907cbadb291880cd403a6204fd73997bc746897c1b9182713461c261a54aa99c2b SHA512 df124838818830fd94e59f762da4bd24c7bec2e1d558a5f0f26eef7be9f658516c544f4b7c1985e150cf452aa011b39fe0ff629494f033907d54dd67f2d145fe
 EBUILD wxGTK-3.0.4-r300.ebuild 5196 BLAKE2B eb76e91933d3e1c4d287c45e01057ec98ffa1b6319b932c4fa1da18f8a657a9e395135601e9b486434be55f7b26ba206e7f30d0947051016ce8051262cf52b6f SHA512 b37d2c799a516bfb4a31fce5c9471c025680795acad84f977935c6b85e216667af02076ca36490293867431e2227d633740d4579871288977d46e47230cf6007
 EBUILD wxGTK-3.0.4-r301.ebuild 5196 BLAKE2B 5acd5b07b33a893139dbe20d697bd0e4e155d5b936a527853ae35930fabe4581981d891a03814d821434dd20b61b25cf36d514bdd02d91e5f9dcae8b04c789f6 SHA512 e4b9e789f0a333d030e4bf4d7a2ad2142b8092b6790f7106e8b8a9898e694382eb120f432af8e5d09f25522fc9b227bed70b6018cbe55dcae00579dad904b49b
 EBUILD wxGTK-3.0.4-r302.ebuild 5246 BLAKE2B 9b49c08d97448521c72631cb842f03d3fe959cedd0e06245cd325913b54b4242e5b791bd2dd9fc81995ed992d7e883b31c59c154f4de22d5bb1fa306f6a884c8 SHA512 4f6a4e59078a6d6a4bdd7f2841d88f1d1a4cb11995b039618cef0cf21f784e9c8be51770e536fcde9849555cb5345e33da7fd7d9824368bf46e6cfd5020711af
-EBUILD wxGTK-3.0.4.ebuild 3968 BLAKE2B 9f52ba9de546e02a417c7c0bba94574510c7c5d0a3c6bf7ea6aa90b272b6ee3399d219809e366eccd7a34944cbff37b6e0f4b763c147735d58d96046360be829 SHA512 04ed82d44ca6a7e6de0521e5e12e964f46c21f0638e74c3466c31d038b09bde3d2c3dd13b7d498314aa5f1ca68bd9e885519183f60a77515041262f0814359fe
+EBUILD wxGTK-3.0.4.ebuild 3969 BLAKE2B 0a6e3dcdf929e1375cea84c2fe96d2dad9dd8aca5164ddef8398949d60bee8014fdf4864e22c6b68fa279d2a1621d16b07529c273a839b128bdd0757a4a09bb4 SHA512 1a972030ad233e1b8297d8d97e083d046de88db1e56bc161e2d6f8679ea3a58b5ffc1413997bc1c1e0a90e9396fd3cd970fbaa8517c79cf2f7c7e9e6736d6b7c
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
index eb34842c551b..12f859ec705b 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
index 62e063a1f837..610edd44935f 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
index a31c63e26a38..2de5b927dc81 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"
diff --git a/x11-libs/xbae/Manifest b/x11-libs/xbae/Manifest
index dc0d4e83fee6..91699d59becd 100644
--- a/x11-libs/xbae/Manifest
+++ b/x11-libs/xbae/Manifest
@@ -2,5 +2,5 @@ AUX xbae-4.60.4-Makefile.in.patch 751 BLAKE2B cc40a6d58a1e6ae6c68f2dd989807fedac
 AUX xbae-4.60.4-lxmp.patch 364 BLAKE2B c7defbca432abd679c5afbab2e95de3270097617d7a52cf4c781d3d44e36887c18901a045d9ca36d107aa71343e7f1ce974ec0634062318a56c14351335e8425 SHA512 90a348e0f67b3954ce2c1965e4252ef5b1be9b0c6c232981219a79af5a705dcc09bada6e87b7a2ae25e9d9220130c1321af90d079843317cc82d8e2a11dd78fa
 AUX xbae-4.60.4-tmpl.patch 182 BLAKE2B fb68a556359b2825879567ad53e4fcdcb3f5d41198cc8f3bb7626e45251881b8b7e7ebc4f244c4df0973d21e62a797d38b7a429dc94ca84a97700a4f2f9055d8 SHA512 dc360679441f2c8a4642a8b12b624acc739e4e7bd4ccb931d385212e418291eaf8d05501a420cb0407ab953826cd477634938c1b3fb89b3aa5ea1fefa57a8a60
 DIST xbae-4.60.4.tar.gz 1770938 BLAKE2B c9790dae438a4a35ca58274d96b3d4cdcf61191e3c8336e7df3df419a64a790bd010890f88082add21c304ec520ddec3545915c5babf267bd9ebb985b0acf0f4 SHA512 e9c2ea59ab598217a5d6a3df0b86ca9fa084c364116d9789334984a0ac83dec0d5b5e3fb643e067036fca10f13b175f6d5134325eb5041af614a4ed00745ba16
-EBUILD xbae-4.60.4.ebuild 1239 BLAKE2B 215b85d42917d33734dc6d5e47f9166e5b5eb26c5c07ae62cad25f4c0415d0fd54c89acbc6362760c466c3f49df8f474a9c6f2caf7cf93fe97bac6609a50f1d6 SHA512 a3e5a9eed9da22beb663b67801ed9f06bd6842faa946dcc4c760e8aea7496a261dccaa6b1532fd625b2ea9c30b823ec36dde085824ecb3f7d34be500f87806f1
+EBUILD xbae-4.60.4.ebuild 1240 BLAKE2B e81bb140d2bce5a3a0d3ad7d9bfee3f0112d98beb49b7e8db3b767b82c7fa2b67e2bbb8db3f85dc2744ff32eb0460f19abfbb12c362e18f28c1b6622a77bd10a SHA512 56258b847f933fc8a67d7d0ffc20777177aae9b2c75e7fca0ca96c4645d8198b7eab4072d1a15cb40f93323f51ddfbf2455efbb1e6e267b14c78ce53efc8fb8b
 MISC metadata.xml 965 BLAKE2B f76eac30d4f1d0ab6d41cdc26f8cb309936558efba912f56520f2f84ffad4463c8653de937dc2e6cb9757ebd7f60a5e147fea5d3c15dea1dd5f1ee0234a62604 SHA512 ecbdf447ab2b5b6c41888e8d2f7f02547de650fa1ca1bf708195753fc5e76dfc0e43a7a108c9dcc39e176b5456032b2e5d94c492075651267de4499eddc67451
diff --git a/x11-libs/xbae/xbae-4.60.4.ebuild b/x11-libs/xbae/xbae-4.60.4.ebuild
index b9fe5e37dde0..c0429cf98176 100644
--- a/x11-libs/xbae/xbae-4.60.4.ebuild
+++ b/x11-libs/xbae/xbae-4.60.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 # tests need X display
 # and are interactive so virtualx will not help
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index 6af2198905ab..391cec056fc4 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
-EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1375 BLAKE2B 29e7ac7e5ccb731168b6870472b3760f1aba9b92fb987ebbe720d94b122afea899eeb0d97dcfa6d65ecf72fc228169b97c22acc82f9c8dd615aa35da3d4a0a51 SHA512 fe000f7d555dfac5ed4ab5798c7aa5b908dce8619dc2789d43d424a4d1f1657798e3342a8999a793654d1a21e7c2cbe5619acbc192ed52fa5f239bdedaa6ce98
+EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1376 BLAKE2B 2e97a9ea10d2cb475f01f711570754ae64b51a9ff165f8ca1fb1867b3be89b76e5e47677b4d2499cb268d0c1336429f86c50320269aa63fba5687d2d9d9f49bd SHA512 4a5bd73502df6b18feee8e0a2ab2b61a1e45889b0d56fe0847cb0337c3c66d4307a3992d90609a033ab020928d02d80214b740e109670bbb7f3316f024d45dba
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
index a7559fd27eca..8b5da8d3fea8 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index bda8b3dc373f..18c3580db89c 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f
-EBUILD xcb-util-image-0.4.0-r1.ebuild 974 BLAKE2B 6b5fbe7fcc8994b744bdc87b46162439c0c3a76c24efc24c8629fc818521f1791955cdfed2db5cf095c9947c8521b228cff7588b711cf09c3e87dcb729e28922 SHA512 b2359063ae67a5bcabb13d2db97cddfa49a1b729712171e04090fc2b7fbc3aba36f378274ef1b914827e152075ac9f99f2bc9312a6813eb7a97b0747fbe17c88
+EBUILD xcb-util-image-0.4.0-r1.ebuild 975 BLAKE2B 5b7da0201f88cf894f820417bc3dfa2a49efb9de8623f4ebae1f7e235d073c8117e79c7012feb0d8898c3f0b089625a8d895b0edee93aff1c80b27138b0cd1c9 SHA512 13c483702c9753aa7229af992e66e3c46fda15951320f60bd927fb02d71770694b0e703ade21ae0a1f32213ccdb429944bc9be61793bde44ce7dd33b2655689f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
index c612777a22e5..92cc09e89ede 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git"
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index 200a34ee1f32..3daf2674ee9c 100644
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 BLAKE2B 5f55706fc74ed5c096ca0e8a8411ba392a023ab7f3c8185088c31570e5873345e16d72b693596b0983011350ecdb7cb30ae5fca118f4758710ee2fc2441883ca SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4
-EBUILD xcb-util-keysyms-0.4.0-r1.ebuild 921 BLAKE2B 2235583b94fd70c8485d4f898a1f71036fd8a9578683d9ad82e0db726f2e4db21c848a372e5bf131cd0fe8c23c4b52168d54792fbefa5bfb6d7a730bf38e6add SHA512 eb1cdaae9482266684499db51a9a5bc46a23c6dbd4929110a2b966271e435a64c1e628940e8ea092d60308d58c83f725b9914253eac35d33d55afe160f5e4b0f
+EBUILD xcb-util-keysyms-0.4.0-r1.ebuild 922 BLAKE2B 2b93c6afd57624c0f86ec1772457ddcccae215e375f82773c53e4882516f85369043636a446343150c0ddf9acb3ce19f195a7c369de265aaf134b8232712545a SHA512 05b203438d6cc78a9b5830e0d20a4bbba9f48a1da147e5572cc39f8a7e619c3b9c8c84c82d2b0356f2e1b8adc162cc43accabe994a2066acd5acc6e30ad399c7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
index b9a5a3e0af95..c203d5d2ed96 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms.git"
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index 6dfed7035b6b..c5e40696952c 100644
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 BLAKE2B 8de259f918f1ffcd82d054bd751baf3f0fe3514da86bc736b68c74ca1f285fb41dca364ca49153e1464691c10fb65f16a53eec0ec8102c1abade9ad7c80629e4 SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc
-EBUILD xcb-util-renderutil-0.3.9-r2.ebuild 941 BLAKE2B dbd588a8bf743db9fe31f85d9ea01af309bd93e72a4068fc14c05c3f2c0b52fe55bd71e67f58527424888ff313aed024b6bfd4d5920dda8fc80d7db874f6371f SHA512 571cb7f4cfedfa6d597d153313ba5f98061fa107e446739bca9c6e410e9f7d965e162abe56b89ad08769f2c967cd4edb2a4bff28678890bc7d235b1d245605bf
+EBUILD xcb-util-renderutil-0.3.9-r2.ebuild 942 BLAKE2B 052bb5d578b470205a5a8d7275bf3596c4fc16d41c19e726c40ce64a6ac67f0a7a9dabbfc329b99dee6610d9f7a09dff5de6f6cd362424437370ab8e52f871db SHA512 a74e90432e2d44ed071619a6f427d4356357e05c2bdbff0ec62f124097d11782d80bb04759375d66702001b83b6f8ce9bd0aeeb8fe4ec571d2b97369082a5bba
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
index 31ea19d331cc..dbb2b7a48f01 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index fd099546cf33..62b58c763491 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326
-EBUILD xcb-util-wm-0.4.1-r2.ebuild 922 BLAKE2B ac3e8eb7f01240f2397fc3b327dd280f2379ce53cfaca0b46b5e5aa34ad7d00b4335e9e78cb797459bdb55961a5ba05adfa8758dc3d6f03e581ebbff96dd902f SHA512 1cce7f6ad61b7fe624207acad4364ee1fdae09858d60cb9603dca968bc0888d68501672519c06258eb4ef68fdd1f3d5d33f53b1cecc74b828147f31d2ad3dc28
+EBUILD xcb-util-wm-0.4.1-r2.ebuild 923 BLAKE2B 1141b5172492a8caa9d0c5469ecf4f637f13dd4e97b97fbae96ee84da00d9adbdf2cdc66be319866e6a631f8ca5e924b523b7fe7451830564023b93814875e60 SHA512 48dc4f6c95269c55aaf9a33761d37621797258f57d0b01c1f0d27e304430975a13fc6778a010e517d39a0715c4de6cadc0c2d3c8d109737e12c4fe1ee2eb7e39
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
index e8c75262d6b0..4f5ff18838d6 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index 7a4a605df8a2..1a3e4b1f2bf0 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-0.4.0.tar.bz2 297412 BLAKE2B 55970cddd8d4bfb313f5d6e4ea82a169a90311c1c0bb5ebf796ac1ceb1d1e1baea4268dc37bd8adf557514a752eec9f957ad3e3e0747384f2cf6e1985f26247f SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e
-EBUILD xcb-util-0.4.0-r1.ebuild 1195 BLAKE2B c63700b9db3a4e075f6035095eae91ae66ee3411cc024fdb351f0a63df4485556025895373490cb0dc5112b338ee035ad85b92454669002f3e7c340d2f9243ed SHA512 ae1cf33ac90c85c2827961ef4c578c01b2b16198b65c35f11c864a97398d3e85a7cfefe4e4678eef4997797b3240ecb14fff8eef1ce6978c70c0ab0c07d7ff94
+EBUILD xcb-util-0.4.0-r1.ebuild 1196 BLAKE2B 04c49955c56a66178b785c05b9bcf8b16ed3bc5195dc11b98c8a0a08dd80d7856238934892cfdbd16b93ed40464b2cda51898ffbba28422f8b51728f7ac8dc1e SHA512 5d2d29005b270cbc3b26cdf971b28a562c083ff6111f53b3f239a466ac94c4e61fc3ee90baf0ded99af6d345a33853e688f89226632686b1ce01458aa3b16dfc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
index ae0639fcfe89..677180eec93c 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-util.git"
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-util"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index 4e5fd1c0c2e0..b0bbf21be3e9 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,3 +1,3 @@
 DIST xtrans-1.4.0.tar.bz2 185371 BLAKE2B 15e5ff810f8df94fa6a050dab00158646003ecc7b200e199eb713d8bd6e7ca8df1769490ebc3d8b8920915bb5f2ede698f01a1a120ca09acfc85f225c4d618f8 SHA512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214
-EBUILD xtrans-1.4.0.ebuild 646 BLAKE2B 530cafb2e5a1c3caaaac0ce17d6ef18989fc0b674e1c73b6664eb06daed6a4e245f3ee52c1a525aa1ca2f4545cf0a4be1280d28f7900882b674be8c749e84704 SHA512 09db3cccd4818c1c1a122af1ff7f717bfb542bcff56d67be8b8bc9bc7ab9c6135907f846932c4511f01195ef112b4c65f2864304a56cd493fc600f2169eaba29
+EBUILD xtrans-1.4.0.ebuild 647 BLAKE2B 5e88b9c5e382cec2fa2d4af242c9788882708febf30a264d25f89980db525138713209c68cd9b991ad1f8ed46fc927499d6600aba219a968dfdf3b6b358e8cbb SHA512 d291ba5b5a2d3e2744b1250f7fe388865472511b9d62f1a23c27ca55f167c58c14385829134facbd34c412c7e9a6c8d135282ec59424b3ca1a0d03600048405b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
index a9392aa423c2..452e5bb9b919 100644
--- a/x11-libs/xtrans/xtrans-1.4.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -10,7 +10,7 @@ XORG_DOC=doc
 inherit xorg-3
 
 DESCRIPTION="X.Org xtrans library"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /x11-libs
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)