gentoo resync 08.09.2018

42 files changed, 201 insertions, 56 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 285e536df98d..109bfa020e58 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index 2b31de5d2cee..0e6114e87e5c 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,5 +1,5 @@
 DIST gccmakedep-1.0.3.tar.bz2 104766 BLAKE2B 4da8c3d4423f55fa110b1be748e9488b713a36b575f065f58d68c24eb4fdfc337aa9c715b82dfaac6eaaf8cb2037ab4d0355297a61c39f7e7672f136bb1395d8 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
-EBUILD gccmakedep-1.0.3-r1.ebuild 973 BLAKE2B 6a00b2c48f4355eed755dff7fcd43ee93fbd84d95e79decce1c26885de02c383863d7f5f9026901f8ac1c179c4be92b408e39fd1c33e2eaace4fee521b459bdd SHA512 8a2f1b683db50bed1d126444fa079f911a63e4054a3f252e255393744eb8dfb05a9c839a0437e90b8223f28d19c2285239859e1725c8936703c3819b5891a230
-EBUILD gccmakedep-1.0.3.ebuild 446 BLAKE2B 60c78ce3d332150270cb83248adb545db77fc07e6bcbd77e5b4a5ac3d0544498f5876c791f47da69dd1d4e8be3292c145aec05f123d93bbaf000966c837fa609 SHA512 0218532ade41810ea98f91b057818c8a3b9767f5230102bc80e1d056e662a921e29561e683950466a79e14244519e08892befd439e732ba47aaf8f0c53726e58
-EBUILD gccmakedep-9999.ebuild 973 BLAKE2B 6a00b2c48f4355eed755dff7fcd43ee93fbd84d95e79decce1c26885de02c383863d7f5f9026901f8ac1c179c4be92b408e39fd1c33e2eaace4fee521b459bdd SHA512 8a2f1b683db50bed1d126444fa079f911a63e4054a3f252e255393744eb8dfb05a9c839a0437e90b8223f28d19c2285239859e1725c8936703c3819b5891a230
+EBUILD gccmakedep-1.0.3-r1.ebuild 962 BLAKE2B 6519051caec72def71150721a012341f3154621eca3e8f3d2f9a2235ce7fc9c405554630a312c56109e01d2a71d56b128d0a4cbb8644f55cbc818a2fd6da9b76 SHA512 342b430f8514825e8c450c4ca0ad54ed941e3fd22acc13d99f2328f9d0e59acfe00a339a984c8282bf254702b219b05a4f815d3978f81f3f7b614a7d4d461928
+EBUILD gccmakedep-1.0.3.ebuild 435 BLAKE2B 7bbbd10c509c457fab33b5d8d47a81db748109cc56be6244ca579bfbf3d674b861e4dda663b7f01faac17ec408fb8f16280a9d83814bea81cff67801f80cafff SHA512 458023a1f3ff10d0ed06af110f2b83f63995d154f46e6eb8d47af3cdf1686ed146a43b9730c5127ba01d6710399edd5b4b337c2227207d7ad022bd3ab6ac142f
+EBUILD gccmakedep-9999.ebuild 962 BLAKE2B 6519051caec72def71150721a012341f3154621eca3e8f3d2f9a2235ce7fc9c405554630a312c56109e01d2a71d56b128d0a4cbb8644f55cbc818a2fd6da9b76 SHA512 342b430f8514825e8c450c4ca0ad54ed941e3fd22acc13d99f2328f9d0e59acfe00a339a984c8282bf254702b219b05a4f815d3978f81f3f7b614a7d4d461928
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
index dbd7fd229348..f324c514b6bd 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
index d834582a08e0..50a4017e5f14 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
@@ -6,7 +6,7 @@ XORG_STATIC=no
 inherit xorg-2
 
 DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-misc/gccmakedep/gccmakedep-9999.ebuild b/x11-misc/gccmakedep/gccmakedep-9999.ebuild
index dbd7fd229348..f324c514b6bd 100644
--- a/x11-misc/gccmakedep/gccmakedep-9999.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/icon-naming-utils/Manifest b/x11-misc/icon-naming-utils/Manifest
index 4acdfa7a2609..4c73cc82182e 100644
--- a/x11-misc/icon-naming-utils/Manifest
+++ b/x11-misc/icon-naming-utils/Manifest
@@ -1,3 +1,3 @@
 DIST icon-naming-utils-0.8.90.tar.gz 70321 BLAKE2B e4944c6a279ffe38c8966783c799b1a84ba626a0611c3c29a7bccc982dfd45c7ae9d38d8b99f2e796466812a98a9216a440e871058b73aad537a0f2f4339d5ec SHA512 6c23f6138e053f9fc6de9d56f94b80849f29f9fde46cdf54b705720cb48b0c660f315484fb36fb9936d4ceade7768aad2d17280545a4b392aa56185c9452999d
-EBUILD icon-naming-utils-0.8.90-r1.ebuild 597 BLAKE2B 1af9583c756ebd4fc0192b72f4becda27e2ba1ea38a1b67fff7ce0793448a86d08447bb1d3a9132881ca851600edfc673762e2a786e6a8f8b2e9a0688bf77082 SHA512 a6276f7d9d16a360041145d0017ddb95fcb3b8680c69c24dbfc2050c2a8c1f0e8f071a5b896ab7fef4d28d9695f818acd55b6700072e0c7d68aeabc91739c157
+EBUILD icon-naming-utils-0.8.90-r1.ebuild 586 BLAKE2B f4d05e98491114e78ff7ea34369207002366260a9dd25afbfa2302a98a9dc09684e9fa9b6a6f2632ec20f505f68bc06f5bd33cc7c0481cb788ea1c718b51918d SHA512 f3e70ba1adeca29ed84ee96a5f90ec76e82b05b7e6fb704915ae3f42cc686474db1879c0c9eed5080441fcb1bdf9b3769af663f0fdb31a9fcf9ea5113b741f0e
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
index cf35d41d28c2..568bb39727f9 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Simple-2
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index a7a7a7408e32..1b2b57671318 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,6 +1,6 @@
 AUX imake-1.0.7-sun-compiler.patch 462 BLAKE2B a1b0ce3d7776e855a9fc0d819f9338c4a4adab3f2491e52c7bfe674de1509120104ea7f042b2a6a61fa30ce1d5573289c01bfa63ff0826c9d76281ed927ada61 SHA512 c6eba0da6cc37702293273d762481b522467f3cd5ae7d216f397ff47657762db78deaa0780706c2e13d0010b739067e65d09b235ab9df379430a826c95e6fed8
 DIST imake-1.0.7.tar.bz2 156543 BLAKE2B 63e7f2fcd907ba5508e9e592602bd455d66ce134f82a3387ae9cee66a6b65190e38a0207980df62c2603d060acb5f380446dc6f117c75edc9c5c6f611d98dbe2 SHA512 b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
-EBUILD imake-1.0.7-r1.ebuild 1181 BLAKE2B 7d73f32499f52d213ca8506e8991e6fccdf74178af7948313cbbf34db04600b6bfcac3fa1d7f9a812fddb243ec2264c901007b19b4060addedd41eea706e9008 SHA512 cb8170cd71b37487b2c81608d9485e85bc09e80d12d838c55802353ad052816bfff7703ddf5b1b7ab01a362b24aef70a78f697ceba35d47d2f749ef01f2bd346
-EBUILD imake-1.0.7.ebuild 706 BLAKE2B 71e4d7544364dee5831c4c7b81f68d8ed696b19cee1f4b876fb047a27b4c329b0230c8cf10d6e2d70a503e378dc2c455d1a6177082d4c225d801d4e3aaaa1bc7 SHA512 7a66beb7081f938f47223aa7233295a7eae5d39bb6652307ffd3892ea8a2688684108fc7096ee18f3ba62d2e23f38ceff89ef99f1b07154cd59eea74aae764e0
-EBUILD imake-9999.ebuild 1181 BLAKE2B 7d73f32499f52d213ca8506e8991e6fccdf74178af7948313cbbf34db04600b6bfcac3fa1d7f9a812fddb243ec2264c901007b19b4060addedd41eea706e9008 SHA512 cb8170cd71b37487b2c81608d9485e85bc09e80d12d838c55802353ad052816bfff7703ddf5b1b7ab01a362b24aef70a78f697ceba35d47d2f749ef01f2bd346
+EBUILD imake-1.0.7-r1.ebuild 1170 BLAKE2B 4c9722b3260289f3244313ee6cb8cc352dfa8d419f40fc8d3332ea56916db9e66f8b40d7d911afd920ee05dc47b0493d95dc4bb0caed0e626fe39483b2b178f4 SHA512 89c11988a9d639352656d212d87e747c55d7e6fa8bdcbe34b84e45e4db08f8138d3d22fd9cf57b3fa2eccc112c4070fff0695fbbca3f28882a83139353cde921
+EBUILD imake-1.0.7.ebuild 695 BLAKE2B babeab6a39b6abcdb2cfea2ad33a7a3bb904c579456aec83cd3afae75f034bb106b51edc1c14203f85a125b5580f58c5313bca6132cb7393cd1f2def734ff96f SHA512 6d99c87eb9899cb9e16bc827732fdfa4acba9e4db0d56dfdbc797976e727b3b065557748a140aa863f15489f6c93a6ca117d2a7b830d2ffcec6641358e7c4bf0
+EBUILD imake-9999.ebuild 1170 BLAKE2B 4c9722b3260289f3244313ee6cb8cc352dfa8d419f40fc8d3332ea56916db9e66f8b40d7d911afd920ee05dc47b0493d95dc4bb0caed0e626fe39483b2b178f4 SHA512 89c11988a9d639352656d212d87e747c55d7e6fa8bdcbe34b84e45e4db08f8138d3d22fd9cf57b3fa2eccc112c4070fff0695fbbca3f28882a83139353cde921
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.7-r1.ebuild b/x11-misc/imake/imake-1.0.7-r1.ebuild
index a4ee1f9952ca..ea7c9d7795f2 100644
--- a/x11-misc/imake/imake-1.0.7-r1.ebuild
+++ b/x11-misc/imake/imake-1.0.7-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/imake/imake-1.0.7.ebuild b/x11-misc/imake/imake-1.0.7.ebuild
index deb33c715a44..58f52c2cf955 100644
--- a/x11-misc/imake/imake-1.0.7.ebuild
+++ b/x11-misc/imake/imake-1.0.7.ebuild
@@ -7,7 +7,7 @@ XORG_STATIC=no
 inherit xorg-2
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-misc/xorg-cf-files"
diff --git a/x11-misc/imake/imake-9999.ebuild b/x11-misc/imake/imake-9999.ebuild
index a4ee1f9952ca..ea7c9d7795f2 100644
--- a/x11-misc/imake/imake-9999.ebuild
+++ b/x11-misc/imake/imake-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 622c608925c6..86371f7989cd 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -7,8 +7,10 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c
 DIST lightdm-1.18.3.tar.xz 503968 BLAKE2B ec1fa0a62880708d223da972b3d9c2f2961e3e8f8baf6da9012de98818b27e0bc0e37cb6f460a25821779d83e9da1cd632484ad75ba95cb26cb9d23254600024 SHA512 dde34e4969d2f04e6729eb1b30d38bac9a89ff42c46f8a21e94b76beadbde450ffaa377201bd3a56e0d8d95d0640eb312ed11ecf94efb9a5a66777b944d4f234
 DIST lightdm-1.24.0.tar.xz 517552 BLAKE2B b4ab92b313bbb3a7bcc48a1d02b7bfb978bbc5041dbb81ceaa59c4296b2e4b069f90d9f09a4289376cb34e11331c39740f4e5370273d1315c75a9a35bd01cbb0 SHA512 30bad8887928f22bf2cc7ce8d7a323637dec669d47d69fb326cfcf1bb5ee9e52c1232cf680af94a25cf90a9de13d9b5ff73307c1dc8829422600d350401555b8
 DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7
+DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
 EBUILD lightdm-1.18.3-r1.ebuild 3804 BLAKE2B 0a9e0ac82b6b671ebef81433faa82e0b98cb1e38438c86c9a411d41ab2847956ac34396c5201a1c9ed33932a9fd4c19f700aa12411314ec064e7557df485d1c2 SHA512 f84aba34fe5d2fcd7bdafe1b8c787876b5d99a4276b274d698a91af05f4d149e6ba3f794c4d9bdcabb41da528274ac0c2606cb13a88c6c101bc33481d63d1f84
 EBUILD lightdm-1.24.0-r1.ebuild 3769 BLAKE2B cf78459133c836c6702d362a3977f3149d88d7c31aa950799a6cb3cac2480c592f6a953cc3a437939ab0aedfe06ddb0db60493f3b38a2d3ec3bdffc51325a796 SHA512 68d690c0e7a48b0d5e3db8977f2f48f8041cf298beec1d6d65d3f591676bf960cc54d140a65b9a7874f52d00d8954574258ea5d37d103fb724468d1809b2c650
 EBUILD lightdm-1.26.0-r1.ebuild 3870 BLAKE2B 869f000cf85d211b0c0e5125d196928c2e2fc1eaca43dd8a8be6a5e503f26aff779b4a58f3ef0108999225538ad0e3cbbd9213cb6cdfeb8fa75a7e9b98b6109f SHA512 13c2c39e9c7e5e8923bd24150f47047084a26912dcff8ce96df9bd1002b533ada62827a971fb4f4fa73c67e256cb67c4feb787ef8fbb3daa6b0f549138faeb67
 EBUILD lightdm-1.26.0.ebuild 3780 BLAKE2B bf14b85e4a808d3f0743135c325b5c91289ff80097ac22d968942e520551c8a6176e02a4444032ab4cd917d6c2a264901ba517918baa2d78d24e48c72bbba390 SHA512 6fdeac35cfab56c7df81cbd393b1eca4b39114087593731dcd340c9bb30781404c2365d448002c30f863a9441d3709d0984adaa638740bf1b2facce440cb789e
+EBUILD lightdm-1.28.0.ebuild 3899 BLAKE2B 8dae4273893bde7f0f6f0818e03f61e40bb5b7896d500e6ec804816e4aa190b2475bb1dfed979e336a010dc6d061505f82f1ba44698a417bd2ccd1ec9e88c340 SHA512 7258bede873fd974a3fe1e63678b518626b656922c0bed6a5a631b7ddf91c3fa996aa66f3139d97ff4bc868408d64305c0fdcef10662f016ef71c45257b9da6b
 MISC metadata.xml 392 BLAKE2B b3c495f83a30fe7dfee0e7f244c8d2d2df1a30fa8e50a071e0d63dbefa15189058d54ea3e881ab953c1cd9cd8dca74c37b0013da56f795422c0d0e9c2a0297bb SHA512 f44fb165a56a51fea1f3c1afddaab69971d9d56249b74eb7bf1263c120581d2e0b699f1f7fa94a9d3da57421b5d6070f03cb10643e3b3713c771f8c992457fa3
diff --git a/x11-misc/lightdm/lightdm-1.28.0.ebuild b/x11-misc/lightdm/lightdm-1.28.0.ebuild
new file mode 100644
index 000000000000..772bf25fca77
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.28.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audit +gnome +gtk +introspection qt5 vala"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.44.0:2
+	dev-libs/libxml2
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	audit? ( sys-process/audit )
+	gnome? ( sys-apps/accountsservice )
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	gnome? ( gnome-base/gnome-common )
+	vala? ( $(vala_depend) )
+"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+	xdg_environment_reset
+
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	# use correct version of qmake. bug #566950
+	sed \
+		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
+		-i configure.ac || die
+
+	default
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	use qt5 && append-cxxflags -std=c++11
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	local myeconfargs=(
+		--localstatedir=/var
+		--disable-static
+		--disable-tests
+		$(use_enable audit libaudit)
+		$(use_enable introspection)
+		--disable-liblightdm-qt
+		$(use_enable qt5 liblightdm-qt5)
+		$(use_enable vala)
+		--with-user-session=${_session}
+		--with-greeter-session=${_greeter}
+		--with-greeter-user=${_user}
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${ED%/}/etc/apparmor.d ]]; then
+		rm -r "${ED%/}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	dodir /var/lib/lightdm-data
+
+	find "${ED}" \( -name '*.a' -o -name "*.la" \) -delete || die
+	rm -rf "${ED%/}"/etc/init
+
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -rf "${ED%/}"/etc/pam.d/${PN}{,-greeter}
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/lib/${PN}-data
+}
+
+pkg_postinst() {
+	systemd_reenable "${PN}.service"
+}
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index d0178cddbcf4..217f79c57ce8 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,5 +1,5 @@
 DIST makedepend-1.0.5.tar.bz2 143498 BLAKE2B 78a7911e1a433bd2839c2d1372883928dc018a2576781cc8e01ffea3d06ecaab494c11a9eb36045b36091f51c6363d4a903562431256abbab26dfbe7b3fb8289 SHA512 e28d71c3ce4f74ca6479771fcdd123c19ab18e3f2aa690a7798237f21f13fca4c4d66d7b7b1d708c2c214b8e17f8fe37e6cf5b75a4d2b88514c50addea2600cb
-EBUILD makedepend-1.0.5-r1.ebuild 1017 BLAKE2B 96f9b8a1322c52fc97538359f1e13d2bb443124c106e826214d09953f4a6c8df2855c61bfb8a7c5e40f6bf2e7b8f62705d8651ee829dfa0b554b751e7bfc9306 SHA512 8295219d41af90f9453d7aa88a925c75702a4d60930e82259fb83e9b385466cd4c003d0fca5b770d05b4085619628d03ac9f8f4ea687f79a41e1eaaa9afd3b60
-EBUILD makedepend-1.0.5.ebuild 451 BLAKE2B 88672029cf2ca0e9c48744ebe371c2e88c7f97722c676a08f5cf3773095eaab501c2189e7db607a80a41f491d933b984ecb21c1c32c44198e246c5b8ee3314d3 SHA512 423364cde322cc2a09639d692ddd6c51b4035d3078cd0fcf6e4494aa831b24c76c6e098522e707ff45da07e4c20251d0a13b56c4c1f212584155598a79c5fae9
-EBUILD makedepend-9999.ebuild 1017 BLAKE2B 96f9b8a1322c52fc97538359f1e13d2bb443124c106e826214d09953f4a6c8df2855c61bfb8a7c5e40f6bf2e7b8f62705d8651ee829dfa0b554b751e7bfc9306 SHA512 8295219d41af90f9453d7aa88a925c75702a4d60930e82259fb83e9b385466cd4c003d0fca5b770d05b4085619628d03ac9f8f4ea687f79a41e1eaaa9afd3b60
+EBUILD makedepend-1.0.5-r1.ebuild 1006 BLAKE2B 12477fa6688cf2471b147712eb4de65f3f3e6a6a6be374dd33035b3274557804c5c44d36b22188c636f92d3808952986c7760fd7a6b1d349dbb23afe68af39a0 SHA512 046738edb142cbac1b7eea3cf06f616b2b259a3fa420f7c91206ce298ece99657d13b23a5d5e9957522f12f6588e91f8534fe41f6cbc2526d3b054e570cf7251
+EBUILD makedepend-1.0.5.ebuild 440 BLAKE2B dcf171d21b1b6dda5d178c4d18ccd0f986f5d54f4841a3272f6869450d949c9cb74a83ac851752d62c6d966fc0c8ad28764aa62f87139cf4bc5c9100caf193c4 SHA512 c92afb4731680a0545da6ec2c8d3999105a234502dc8513dbb4a2cfddacb7e36cb8033af8adb1f50a67c934831214cd177b5694fa10d4e068d1198556fae23e3
+EBUILD makedepend-9999.ebuild 1006 BLAKE2B 12477fa6688cf2471b147712eb4de65f3f3e6a6a6be374dd33035b3274557804c5c44d36b22188c636f92d3808952986c7760fd7a6b1d349dbb23afe68af39a0 SHA512 046738edb142cbac1b7eea3cf06f616b2b259a3fa420f7c91206ce298ece99657d13b23a5d5e9957522f12f6588e91f8534fe41f6cbc2526d3b054e570cf7251
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild b/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
index ee323d6f29a0..acc8c0eca350 100644
--- a/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/makedepend/makedepend-1.0.5.ebuild b/x11-misc/makedepend/makedepend-1.0.5.ebuild
index de8260303eaa..0b45317580d6 100644
--- a/x11-misc/makedepend/makedepend-1.0.5.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.5.ebuild
@@ -6,7 +6,7 @@ XORG_STATIC=no
 inherit xorg-2
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/makedepend/makedepend-9999.ebuild b/x11-misc/makedepend/makedepend-9999.ebuild
index ee323d6f29a0..acc8c0eca350 100644
--- a/x11-misc/makedepend/makedepend-9999.ebuild
+++ b/x11-misc/makedepend/makedepend-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 714dfef7ab02..36e38cb0fc48 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -5,7 +5,7 @@ DIST notification-daemon-3.14.1.tar.xz 280344 BLAKE2B 8e965cd52f97129f8f6116c9e2
 DIST notification-daemon-3.18.2.tar.xz 329196 BLAKE2B cc4b00474ea20435fa412c1c27a95614baea06bfc00bf09c25b539e44ec8c41621eb7903a9245407e23a2a098290160d970e66dfe9cabc3bdf1ce3663a418f06 SHA512 962d84eb1970451d12d07027d4ee6843a96dc42c7d954dcb79bac55cd9918dcc84a2903b4ee032a0fd8f25d269e5e965a1deaab3da34b4181ea304df2adbae3c
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
 EBUILD notification-daemon-0.5.0.ebuild 967 BLAKE2B 2664538362788b30886a38cc07d38282a18634fdf2fc92641339ff08858e7fa4f2899a8aa281ba9cf55b73fa53280a5a5bbbf341f4a1d739fa5c9a0da611f1a4 SHA512 2fe6c5f7bfeb22286489d1633c24728b9af3735677d56a290f7334741db22fc8ea26591affae3212342f71fef584dfb75eac97c673ffba8c3fc078a5fa591258
-EBUILD notification-daemon-3.14.1.ebuild 997 BLAKE2B f529ce3358441a331350fde9cbb3175f6a3c9f560c16ee8ad0f6b45b4fea5a855dd43d902057274b8e36a76226b548662810ec6e2b06da22a96b99425b0eec39 SHA512 931c2c5c4b23ab786c3daa8acd142d8f4072b95204061d0e58a8372c5f2c993b05182565e8064e7cb4df81040dbdb5c62cb88d43cc506aa56c15ac644970fc7f
-EBUILD notification-daemon-3.18.2.ebuild 971 BLAKE2B a5f4fe773e60125bdc0b02ef95fbdfa50358c26bf7df51193e4d7df23b1dbd3d23cf862c09514c40411d14043fe0443adc1b72bae375c6226cbe968c6d8bf39a SHA512 c548f88691239900e2e72a3b22e6bacc87ee0fb0b8c906e1bb4a9fb051eeb4ea34d4636be13136efb1433f29e98387574f9037ec97b546349653882d6dad9801
-EBUILD notification-daemon-3.20.0.ebuild 978 BLAKE2B 13f1eb7fe78fbcca645683d386ec94f085d9ed6df6c01e119f31a904d836daca002c8c516666ae0be9969ca50b0963e0f95a4177dccac2dd554b0cf84e89200a SHA512 9301962a0582f01944a7dddc8c3e6d3c986ac2896282a0d5c625064e5248370c4560ded93c11c41db89c9b0a6874f9a0f2cad8478ecdf01af103f497ad7ae379
+EBUILD notification-daemon-3.14.1.ebuild 986 BLAKE2B e1ac4ce69cde5d758d608b83d42306ddfa552d03de641dc10be7591787565941ab377b910fa904751647710c4637a02fa18b10bfc1e16b8d6b15d311d5445ff6 SHA512 3f07ef82001434d4fa2c9e73967d4461123fd21c66f2ffa5e55e249acdc6274a115399bb39122092650329914c0062fa9f3329bdf5648ddba24b8bf4e1628fb1
+EBUILD notification-daemon-3.18.2.ebuild 960 BLAKE2B a917f7b6b8f00c5024a7cf4152e3d1023b3da2907ad4004c5bb9e96ad2e19d468f01bd08d9866491edbf83c8ee30468aca79a09d7065814cb3428951bef617a1 SHA512 7dfe9b8665b7c7a0238221cca93a2efd4211249dc32687b47124399601fb14328fcbc1ee91db3775a4839c927df892d938d7fc3ccf4bcdcaa82813a7eb3c0d34
+EBUILD notification-daemon-3.20.0.ebuild 967 BLAKE2B 7b772f91f8f6d4f2487081ccb13e9cf6020469d36f36e04e2077d0ce239b30afd6dd313131c6e72a68f1b75b3a36ef5cb1a4c9f074e8e64c796b3b6b9956b2a8 SHA512 7c2e81f99eff3d93fc874a80ca729fc1b2911a788891920227bc8ff1bdd31951fccceaac6b86c30de14984c45931dab26821d7e07b11bdfd6588ba34395dcae7
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
index 4a213ca6f85c..cb3ad67ca632 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
index 016909f27988..8a0a9884722a 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
index 693a3578679b..a0923c395aa6 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index cfb111098a38..f3f86f08857c 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,4 +1,4 @@
 DIST obconf-2.0.4.tar.gz 456523 BLAKE2B ef3b3e4664ccd1095f5e1cd468fa3d021cd469a641930309a41c7b1cf418b9d87b2d8f4420342363dc4781d8e3aca3e8ffc0b9aac0151a2399579c5ff0997cc8 SHA512 b8cf6f363fa8c2f1d21142a3f79687a72f683f564285b05751c822ddf7a421b09c3440cbc5b08eb09d151601c6ada835ff5cc940bf5abeec2210cca26b552294
-EBUILD obconf-2.0.4.ebuild 823 BLAKE2B 42cf4f162fa30e763eee0caa69e706da8196d0901202a1352712bb7848b5a413c72032fcdd9c31c4b23b6f8c73618ab9485dcb006232e0ced73289310c8d3493 SHA512 98ae0d0fc16d2388a659445288da556088de4ea692ea38abeb3efea876aeb466be310eb2fdc61d42645095e434de774ae4afd84f72da4d5bbc0a366756bc3cec
+EBUILD obconf-2.0.4.ebuild 812 BLAKE2B 18db2cfc9da637b3d25f8d1efbfcd7fc890c4321a6713a346b9f783cb163d1be806dd7207c642f97c968bc8c6d6c86767aec2afc8839ec00b7f526b557a71900 SHA512 bf49d4fd6b9b28662b066cfef0c45d7bd72a509d56cf756384532c82171197358effd1bd52a4f86711070e005988faf8e25982bf0bb4c0db645f422ffd4d506f
 EBUILD obconf-9999.ebuild 767 BLAKE2B 83d6d4c188108b33926b8afa8f1115a00dff7fb0ac2d3f4ccd94f0930567305ca2bd626f5159ed5e0683a6b2619e9bf6b0c6f563268a7db6be2bb218a861a364 SHA512 cc71a7f24edc705f8155ddc52e368027beef8bce3f5abc063ff1a7a6f71e8baa0bdddbcd66d95a79be6a64b682d27b8aa607771bd6ce90abbefaf667072cf71c
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4.ebuild
index acba3e2cb972..783341609823 100644
--- a/x11-misc/obconf/obconf-2.0.4.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://openbox.org/dist/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-linux"
 IUSE="nls"
 
 RDEPEND="gnome-base/libglade:2.0
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 683a18aa1379..fc9dc94b82d6 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,5 +1,5 @@
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
 DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491
-EBUILD shared-mime-info-1.10.ebuild 1521 BLAKE2B 0d40cc8b6a531e080ef4966cd3b2a7054b8f9f338b8bd0c07e6932b9d5b3311ba6c72bc818a811681d6a529d69184794ad6019df8a902c0440ef180f4f2d1272 SHA512 a1e324af1ff4e85f746106652884d9a4fcf33c4d6108bb39182f9eadaaa6a87c5c556ad1d54fa11060ec1f40cc468b84dd6bd6aeee06669cbf17ea0b5c09a001
-EBUILD shared-mime-info-1.9.ebuild 1468 BLAKE2B 0209388692eb50642d52579e68b110424c8417886e2d7f89a1129c6aa45472e8ed9fb2ca722fceffddf9f449db9fa6a053bd543a8cdbab43afa1c0b9268ba952 SHA512 2b5b7ddc08167cc72df3f5c07ee1a9b76c316ad76c6fce1bea43ffb044c91e7792d850b21afefbbf7a580ea9597eeceb738cc4db9bbc8532c99d70fdcfe68a50
+EBUILD shared-mime-info-1.10.ebuild 1510 BLAKE2B f2cee0f59257368f5c2a3947eae5cbdd2db5be54a7914b102a831ce8d6c3c6682a983225d508042bb323aaa9968695e82ac44eb808fde1725bc9001e8e1660dc SHA512 452400f179973e2ca6e65458e30f179bf3d930b05b7b2a3d9f58b3121227adc7861944627b6f585c9700d32401930d8968897b265dc2ced4edabf19c81d4d431
+EBUILD shared-mime-info-1.9.ebuild 1457 BLAKE2B 582d75bcee9c267dc39f7120cd734085a963621e82fa4ba91288420f3390767c03672aca23f1b367aba252f8ae24396be44084f8a90cbb3da213f081de2aad3a SHA512 112646b17c088c2e0f34f8bce8255738ebc5881f404437d2eacb3dc101bf3362b2409a2923dd33ee9198da804d0a4f9b24c052b87499081621131e751f6c8070
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
index 7242b28967f5..14dbfd3e63ea 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
index 78fe4402a9dc..2349bbffbd2a 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 9ad9fdac5cc4..25cf59ec6e8f 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,5 +1,5 @@
 AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
 AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
 DIST x11vnc-0.9.14_p20161013.tar.gz 1702047 BLAKE2B 3c2487208a2318816af408a3396d4b6cd7cbcd5b3aa7879f0390a1a6e0200cbe0bb2cc0c50581b3e3e4de916dae3fdb4426547de7203ebe95ddc62722e4219eb SHA512 82207e4d721dde633aaa13dbd1e6a18799615f8e3c225c33d4f8b01775fb81fb6b92a817e7d014653ac7b2349b0b31e46be8db25c5fd5e3ecee8fb93ca665b97
-EBUILD x11vnc-0.9.14_p20161013.ebuild 1385 BLAKE2B 8ef4cace5db4e0712b9560c4cc82dc380ef72b8a82f06cc6c4a4409a800050bd6152f5290e9e89d7164d473ec39998b6f9d78e27253b7d477e12dcb8bad44538 SHA512 37067d7cf4e403cb298e473b2107728558b35a73e7974050403eee8fe9a1b5552c6a5b0b11718e5f0e88bd807f5b3d9dee54683d6e448ae60649c17edda02999
+EBUILD x11vnc-0.9.14_p20161013.ebuild 1374 BLAKE2B 8447ea4607d92d215214e6fb30038eb54f40b7b0c7e87af45996103208e1284e212e1c8c7ea7a72741b3a18a8ef04350bc770ea92201e7dd5eadc8f9a525f9a9 SHA512 520f30e07fab2eac5449ec931477a7e85b0376f4f19babe4d50afa843a13c8863866325fd2a2476a4b7c3d20faa91ba913270c119979287f14440e5610d476d6
 MISC metadata.xml 694 BLAKE2B c81a1713da2084ad68df6c91b75cba02df7c39950b331916362ffc8dd67b6b72dbf40248c3a906d1f582a8ed5034c4cbebcab7bc4b9db69508a753f44df07102 SHA512 842b0faca49ae6810c42d117ca3f79fc693acfb8a965d3fd2a8c890f475350c29175303f1b56b0c64468dae20e692d2430fc790e7b88165c0f30d65e1bdcb606
diff --git a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild b/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
index 34d249366e1a..ebf7c1d17f60 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/e191071c1f375d04ba8f955ea0a302
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt fbcon libressl ssl xinerama zeroconf"
 
 RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?]
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 50ddd55647d8..78bb76e536c7 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,7 +1,7 @@
 DIST xbitmaps-1.1.1.tar.bz2 113346 BLAKE2B 2ecedf3208ca8d5e4802bccae0316e0dcb5ad9b1efede1ace2348779797f29adf6aa6b173fae4874cf7ab73341f87af0bdac645a9e378c8946fbd941739fefd3 SHA512 172a74014e699e5f295ae726a77f1669baf4ac00d64a138b77e5502102b2a02c10127f35ccea5b6af5479d17f60a6bb63ac0f943fd071ab8b396d43ef314ae61
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
-EBUILD xbitmaps-1.1.1-r1.ebuild 469 BLAKE2B 14ff0927ada1adf936c496bc6c8168f8dd9476db1407da50742e814ffbdb0ce57e11c16e40a9d64c5b07e9014c472aa06a80dca58c470df6f6a1babba5aba497 SHA512 00b7997e9722f3fffca67a76590239658e8c3cb1d42f173e055608b0eaae0f81fd0978bfb95b2017df2a15d05efd2f08c2807a32269cc33c1443b3c6190f75c4
-EBUILD xbitmaps-1.1.1-r2.ebuild 695 BLAKE2B ba6250c3fda4dbd97bfa09508236e10f833f51f390762d2a0f41037289502c83fb4f377c4a0ea3035cb666042065950e33139044d0dcb94046e1b47fa6505476 SHA512 c0f9138fb2b647814655dc6da56cf8a05ba2a00da66ed91ecb64d36550c21e4484dc271127ba3a0369114d6bb8da7e0c8ea89ba8c4ccdf95474183ed2497313a
-EBUILD xbitmaps-1.1.2-r1.ebuild 695 BLAKE2B ba6250c3fda4dbd97bfa09508236e10f833f51f390762d2a0f41037289502c83fb4f377c4a0ea3035cb666042065950e33139044d0dcb94046e1b47fa6505476 SHA512 c0f9138fb2b647814655dc6da56cf8a05ba2a00da66ed91ecb64d36550c21e4484dc271127ba3a0369114d6bb8da7e0c8ea89ba8c4ccdf95474183ed2497313a
-EBUILD xbitmaps-1.1.2.ebuild 468 BLAKE2B 082f551bc0bb00732046acecbfee1c58d01a6051889fa185a49080bc967fc04db58fc55f642dcddb6ec26f4a5d1d60086a673709794b4c8709d86d74a0c5a218 SHA512 e42d3550476b545670a5b65f10d12a85779e5d2674cfa9dadb78f0520aababb8c2343e5b38e07b1d9742319ff7735045a2737452ef1e6955155ddc735e2db8c3
+EBUILD xbitmaps-1.1.1-r1.ebuild 458 BLAKE2B 35ae63b53763a27ed807f566ac651db0d3a73302d5da24efb2fca5db30a47ac08e1e18af9b6c08520e0d19b4633fe7cd76daf657432bbf2e56610935ef15094f SHA512 5e0b91620f1e7ae829137f55c703e4bec814ab3847fee3ce69e2b13cdf63a052cf120509bc707a3c9c98343dbb7ffd9808c15826cc4da7dc7ac0fb802cf1bdad
+EBUILD xbitmaps-1.1.1-r2.ebuild 684 BLAKE2B 6080c273544e2d7b47f93e744fc37d5cefcbdeacdc748fdd90e669b3bdbaddb8e396484ec0a77bfb796a08826c4e936c8970ab538ad8b69957f3f2896c2d7a22 SHA512 c7aac8c5778b25adc8e899ab31bcb11a51b7c061a91af375378f70e6e8507d1faed2d0fdcf6b735e5168f0098b77216652ff68dcc674603b02eace2d602df91d
+EBUILD xbitmaps-1.1.2-r1.ebuild 684 BLAKE2B 6080c273544e2d7b47f93e744fc37d5cefcbdeacdc748fdd90e669b3bdbaddb8e396484ec0a77bfb796a08826c4e936c8970ab538ad8b69957f3f2896c2d7a22 SHA512 c7aac8c5778b25adc8e899ab31bcb11a51b7c061a91af375378f70e6e8507d1faed2d0fdcf6b735e5168f0098b77216652ff68dcc674603b02eace2d602df91d
+EBUILD xbitmaps-1.1.2.ebuild 457 BLAKE2B 41d5b8c90fac64bbb6c1d574ed28a56c227e2fbee1a4f211de03f6a3a855ba78a8ac35dc6acf4bcd38a3afc7e3d5a4d519f0dc904d374b9df42cf040dd62a9b5 SHA512 8cc4d29352d38b506e6a6f32f4221b52702b369e0ac585779769b2457624e7a4b2284d2cfd7eb8477f28c20b9a312196656f1b373daecf72ac904564cc76f4ef
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild
index e3e272ec36ba..3b936b57bded 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild
@@ -8,7 +8,7 @@ XORG_STATIC=no
 inherit xorg-2
 
 DESCRIPTION="X.Org bitmaps data"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.1-r2.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.1-r2.ebuild
index a6d6551cdbef..e389753a928d 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.1-r2.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xorg/data/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
index a6d6551cdbef..e389753a928d 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xorg/data/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2.ebuild
index 070ad2a0725f..84fc20341b52 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2.ebuild
@@ -8,7 +8,7 @@ XORG_STATIC=no
 inherit xorg-2
 
 DESCRIPTION="X.Org bitmaps data"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index ec6a57d3903e..ddb34d10e73a 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,9 +1,9 @@
 AUX xkeyboard-config-2.23.1_fix_typo_in_polish.patch 609 BLAKE2B cf0dd9cabb3195fc7edf09996ec2de854c37893fbe0dca935ec0cedc8f80778c8c45088f7e6952073b34c854635212a79d068dd3c7c6c15a101ddf86aa856193 SHA512 7cd6193496ee9da7867d5121d995e360a3e2c31210794496b62338fae1eb0cf434712db11dfc2f25fd6eebffb92243589bddba98286c189757923bff39cd16bd
 DIST xkeyboard-config-2.23.1.tar.bz2 1053991 BLAKE2B c5551eb39f4cb240d36943d1e2fd3f9156bada61bb33013f6c43d036fb55aef5332fdb133ab6cfb03ebdbc68dcb3df7d974e3972904936b1e6dd89eafc4ec647 SHA512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba
 DIST xkeyboard-config-2.24.tar.bz2 1057889 BLAKE2B be9c6e0e0885c8a40406b3cf761f854268026084f2025a1a9f3e0326570543dd7fa11a2355947da1018d35af2ab4818092abbef5b7bdc3da923fcfe65059977d SHA512 96b65d18a85443a9bf93d65a4423da6e2b3d44882dae6a03bf46768a92017e9762cf3721361ba399c2873d53782944d0292eb673484f1cd8a8bdbf643e7a1dc0
-EBUILD xkeyboard-config-2.23.1-r1.ebuild 1142 BLAKE2B e07bd105590d32a952ce69908440bd94692ac17bf8dcad3383e1b11cd001501780294446b220f53e508426d6d135ea7aeb374ede9c2522cc422bba4b16cfc857 SHA512 101cf87a7d4b1807b510134d20aad7f99797cf6410bfcb28b39b52456c3db4cb3b804789dae667c6319eed77eaf1fc3c09241692fdf05f4d6e35eca835aa524e
-EBUILD xkeyboard-config-2.23.1-r2.ebuild 1261 BLAKE2B 088199af13b520caba6ab45c3350be918089e3f85c56c2b5fc8a8c45adc68ce7a3de3e895a3270f87ca99b2d516ba8f8094ff34ca3838210a36983b1c0f0893a SHA512 6cf19219b1ecda60fdca85d970999db6c6027535e70d0647136d42cbfc11837afbb037382f54a3a818557d5bfad4633406cf0183cc2a5f4ebde0e5635d7af0a2
-EBUILD xkeyboard-config-2.24-r1.ebuild 1203 BLAKE2B 61d85a869edc032a74113868c18be4d6e251346724b2d7093bef2e71c6f524fff450d99a12005ff64391886b4ddf08ced718877d24b83b5c20222abc9b63d8d7 SHA512 2795e9cfd326a63dd781a5c0e4e178e5ff65e3530a3146a84bc7ae4e76b5d7c927e833df5f11e41d929a49f5a57ea18fba18e2eb80dde469c9af9b9e1d766edb
-EBUILD xkeyboard-config-2.24.ebuild 1095 BLAKE2B 5ff0f206560806df10edf855cf7d81bb94bca1e13d779219f3564d315aa557772054de31ed1f661c89b8793ec44bce2d02304f9ff2f270b7ca1274688a16d5a5 SHA512 f7bdf5f231a033420eac29903ae03936fcc11568bbfd92fd01c803ca5bcf7d4c9cd947a371b6634e78c437108200d7bce8ef7b953a82d8b3ec20f7551683da70
-EBUILD xkeyboard-config-9999.ebuild 1203 BLAKE2B 61d85a869edc032a74113868c18be4d6e251346724b2d7093bef2e71c6f524fff450d99a12005ff64391886b4ddf08ced718877d24b83b5c20222abc9b63d8d7 SHA512 2795e9cfd326a63dd781a5c0e4e178e5ff65e3530a3146a84bc7ae4e76b5d7c927e833df5f11e41d929a49f5a57ea18fba18e2eb80dde469c9af9b9e1d766edb
+EBUILD xkeyboard-config-2.23.1-r1.ebuild 1131 BLAKE2B c959f3a2c32887490d4e5723b0b219c887f347d2c839a9038226065ba7d8d11d44c08857c352fd1f84973140adbff5f7c6d7e137f7fad5ed3c6a236a3b2d1193 SHA512 f212dc2bf40ca4297f4e0ec5f4faec599e4d836109282a511826186a9ebae190eae2e12a0f409e225756914c70715f09c2b896b86b1ad8567b0dfafc5ff5aab2
+EBUILD xkeyboard-config-2.23.1-r2.ebuild 1250 BLAKE2B 5a694d2394b39a7f998753cd77c8995aca9659845b56a4fd299d4c56d63f3f1abc0192a2888f7f3e36bd51e4cbce3e4b2fda502612d50271d64a2b928c267fbf SHA512 fe6e2b00bd09d9d4adcfc3683309e98350580f27ba965ca8ca8017ba666dc094a3746e6f4d38d0d96065b27af83d06cd1a4e180d7e2135c5e345b6af4bd08135
+EBUILD xkeyboard-config-2.24-r1.ebuild 1192 BLAKE2B fd3a5acdc4153a3c459cca540299a5ef52bf987df748bcc27fe0303d53ad9e450bf0f5ce81f4f95ec4ad1bed4ff81ee095ff1086cfae3920e0b74f362cf18a14 SHA512 2a06221496386dc2c3777a5209e54d931cc7bc91916e72804a63b5fa7fda1a6b4126bc4a2f96ab1a27d08eb16621c4d23ad6235dd1873badcc4332c18f63a135
+EBUILD xkeyboard-config-2.24.ebuild 1084 BLAKE2B 790e68a4f4b1ecb3c534d1ca086ee44746fd295bedcec05fa2edcad92a7c0ec60dc686bf7a9d39204b37c9e1b7498ebea69081b0c62cf1098f769f6a54cfd746 SHA512 1c2888737aea4b19df1dbc6d9d8859e54716986982ed961a160da1face286f6c4c702781987b4f6ec68a6b9f1a80d6e0d17eef714961b29a08ad3acf2a582222
+EBUILD xkeyboard-config-9999.ebuild 1192 BLAKE2B fd3a5acdc4153a3c459cca540299a5ef52bf987df748bcc27fe0303d53ad9e450bf0f5ce81f4f95ec4ad1bed4ff81ee095ff1086cfae3920e0b74f362cf18a14 SHA512 2a06221496386dc2c3777a5209e54d931cc7bc91916e72804a63b5fa7fda1a6b4126bc4a2f96ab1a27d08eb16621c4d23ad6235dd1873badcc4332c18f63a135
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild
index 311bf01f70d6..34dead4f82a4 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 [[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild
index 7ed826b1e0e9..8ee5f1f9f5f1 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild
index 5ec91ad9a5ea..e517c9fc8366 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild
index 40b72722a506..46745dbde703 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 [[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 5ec91ad9a5ea..e517c9fc8366 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 2ff69a183532..41ae867e3bde 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,5 +1,5 @@
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
-EBUILD xorg-cf-files-1.0.6-r1.ebuild 2124 BLAKE2B 77067b06822ad02c0630b91d356639f3264b33335cd730d3383c25e74ba97098fa5d8be42bdc3756ecaf441c0bb6e4674d703d06e79b2a059b4ef5576df81865 SHA512 51a4e8891cd6b4af1139d6ce1cf3ceb596a858100d75e2bd772189191596b0ebc62175ae2c2076122187bafa4692807e0b67cccd59b1d0b288100943ebff312c
-EBUILD xorg-cf-files-1.0.6.ebuild 1818 BLAKE2B a0eae43ec7b013ab501284e88729aa0132add4b6f544aa9e26b62719d69332c5a98573e1cfe1354b74821fef4489579c136687f0ce6663d0a7bc398567af8836 SHA512 f116901238eeea9e4add4db55174f321acaa63743b3c4b884d1f5469aed4a1761515448a0765b1eb7b6ae63b19f110f8de93dafb0fa330419b5db81a5d19391a
+EBUILD xorg-cf-files-1.0.6-r1.ebuild 2113 BLAKE2B 6df86cba5e6698f93c04be474d11d62d62b8a96cca53771cf57dea77e11e8fd0f8dde5aebe9898c51305859c000d6da1f978ca8d1b053de32fedc0317e720336 SHA512 f18e31812539ca4a75550f8dda2c8b504d547cf491c17568fd0406395ad97534fca5cc5a5c234bccfdcba5fc24d24c4e8553ccdff3c2fe6d29184910e092005e
+EBUILD xorg-cf-files-1.0.6.ebuild 1807 BLAKE2B f308e9bf32d0be178acf80a53e0ad94602dfe491fd7993d0957f115f84bc3b43c1678b6b71937b810604005baead00048085f5912a9e89ebe95dc2ba27045abc SHA512 22dd481f7266f56dd2628c7353686c58a4ee5fe0d9998bb1f3e4f6c90292aff1ad388cda7d6f9132a4eb07a1add8b14e2380fa54528790106d756b9d397c8f64
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 0ea092a0e0b4..a23c241bdd8d 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index 76edd0242ac4..6c6d7152945c 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
 SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""