gentoo resync : 08.05.2018

15 files changed, 13 insertions, 47 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index ade2b044f1f7..57195fee3f30 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index 3f2f77530942..ad5721b76166 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -3,5 +3,5 @@ DIST bdftopcf-1.0.5.tar.bz2 123291 BLAKE2B acd4838278b090026f002e6f5fae7146fff71
 DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
 EBUILD bdftopcf-1.0.4.ebuild 441 BLAKE2B 1ad53f7ac677a55d815219c21b8b03d4158168c5685898557092afe35b07151f10c8f05e5f29143a36f8dd673cd474c08ba61d59135c11a393391c973f574b54 SHA512 82825e87f9f4defb60cf7892328860cde0977df9aaf410f3dbd101723809342cc2a45b690b188d0c338a272d6aba9c4ce972bbe6f6c4de85712a068d44144350
 EBUILD bdftopcf-1.0.5.ebuild 441 BLAKE2B 1ad53f7ac677a55d815219c21b8b03d4158168c5685898557092afe35b07151f10c8f05e5f29143a36f8dd673cd474c08ba61d59135c11a393391c973f574b54 SHA512 82825e87f9f4defb60cf7892328860cde0977df9aaf410f3dbd101723809342cc2a45b690b188d0c338a272d6aba9c4ce972bbe6f6c4de85712a068d44144350
-EBUILD bdftopcf-1.1.ebuild 463 BLAKE2B cbf5e660c7a276311e05267e3bef0db902e3f59376c3f7aa4f4b98617538eb1851bcab8270b706cd3de8ab2e335ec4afebf32efc7c4497379cd3f076f81f16cb SHA512 9d2cc39701c505857c9373e9385a59ec8724ddcaaa5d7eb122200d21f2cf10cd5e201ff4ec335fdc77a0f681afec36a06778579d3b826c5680f7ab22df7ebb77
+EBUILD bdftopcf-1.1.ebuild 455 BLAKE2B 68e1ee427ba1f6d2081f5193eeefd2ca82e99251e8f4cbc156f051c236d3d389bf6bac16245d79595a8eaa6c4e147ca0ca36c57bd81a2d091c290e76b7a1a80c SHA512 5e381026160d63191a7e9a484939a6b62f949c71d2fdb082a39c309bdd7ef10bb7be020cd59cc109007136daaf8aaa6f14578e948051273a721fc3c08e512827
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
index 804f58b6d980..df9d6c081a20 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org bdftopcf application"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="
 	x11-proto/fontsproto
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index d93701d7eb67..2aa274207ae5 100644
--- a/x11-apps/iceauth/Manifest
+++ b/x11-apps/iceauth/Manifest
@@ -1,7 +1,3 @@
-DIST iceauth-1.0.6.tar.bz2 133531 BLAKE2B 23119747e42b1901c08bc1e10605ca49200bcfd497f7609ea0b4cbe4c18a9cfd4950fe425dfc9405272e3614f171560c2f158a9602f7724500ca7a8160fbd6e0 SHA512 45a89d9742570f837225313032a63d66e658c379e7f6b776836e5aeed17443b26faa48ff23645517bf32353fb346de13b62c61d43f1fb1b044686d9fd4c4578d
-DIST iceauth-1.0.7.tar.bz2 135656 BLAKE2B 4a17fb2b7a1f2ac1604131c9a91c9c78c7c6e480573dcb68c06c5a300ab8474dcbf6782672c3147bf848a81e6bf20fb602375497cc141ed465d3aa5e59d68b8a SHA512 4fe08b3137904c99219456716879cbdf5b49ca9bf390011ffb44b1e896f9a6e008b5f761346a533e682f5cfbf18d18a859c74ad4268ec8d40002ffb79c33bcd7
 DIST iceauth-1.0.8.tar.bz2 137905 BLAKE2B 8fb2e29e5f4fee57e5c1f86eb78ce518519f04301e8aa81778e0de6589f62f32478a7cae05db831177f4425eb388f7b666f697314d5ab967ea3e2b6ac7b47d56 SHA512 9d4520adf951b16a3e784349dbb70d5d8176b74b956f8adc63abf55d049745c113b03ccfa60a281fc39b487db3742302dc6287c9985ce83a0157bf4674df2af1
-EBUILD iceauth-1.0.6.ebuild 434 BLAKE2B a1b47af20ef7508f72827030c794128e122c1326073566a0c87bc536265005ff302c5198ec56451f1df6394059602079dc943024450dd0b320d565fc048fa614 SHA512 ee373963f28ab08c1c477ddb3947e6b7d184df9718648d8d2d51b7832830ce2644462a8cef6efefd91951750209c724cf457d092f1a12892a6eec35fbd473a1a
-EBUILD iceauth-1.0.7.ebuild 427 BLAKE2B f05e8a5675392ed6e73f49c5d92f14c9ea733947ab751ae5f7f41bfefe5ae07adf1bac6bcb30255bd4821bc159b38861d001473076dbd5babd3ac4f50eef0c4d SHA512 736552cd21600a814d3b880e9b145db70df5e955dd0e34c6e44e408d75f7f1f7528c742d53ebe72ee8703004a02d6c495aa1a86e599af28c3b82cbf6d3811642
-EBUILD iceauth-1.0.8.ebuild 427 BLAKE2B 0cb1c47032f4b6e0af4c276db95b5858a08ef7a40e0b34a878849cb79dbd8e517f35cbd90886ace0895e646d91e8e69f8674a18ebd6c038ea6bac840678608c2 SHA512 d54c748dbbc570ec61998f286677a35be4ed30f28afcb7be7118d8c3b547bf5d041b83ce7fc0c0aa5ac7a015f1c4b91420c3a943bee8f1fd3f1a2487df17ce5f
+EBUILD iceauth-1.0.8.ebuild 434 BLAKE2B 8b67efdda40ea2d42f821b159aac8561fddcfa2db6d97594fc604a8ca3eae6126b4c13ab25d0359182d562afb8bfc436720788d4e1add8b16e3bfc12efb84cfc SHA512 55f6c0cbf1361240c168603df9619525ea1f325df67d3e67265a8f2db6c9d58299d5f95172acd921329b0d1aac72b455b67148ca8c99900939a2a85918c65e5d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/iceauth/iceauth-1.0.6.ebuild b/x11-apps/iceauth/iceauth-1.0.6.ebuild
deleted file mode 100644
index a9c41f4f9f7f..000000000000
--- a/x11-apps/iceauth/iceauth-1.0.6.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="ICE authority file utility"
-
-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 ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libICE"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
diff --git a/x11-apps/iceauth/iceauth-1.0.7.ebuild b/x11-apps/iceauth/iceauth-1.0.7.ebuild
deleted file mode 100644
index 2d87cb33677e..000000000000
--- a/x11-apps/iceauth/iceauth-1.0.7.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="ICE authority file utility"
-
-KEYWORDS="alpha amd64 arm 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 ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libICE"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
diff --git a/x11-apps/iceauth/iceauth-1.0.8.ebuild b/x11-apps/iceauth/iceauth-1.0.8.ebuild
index 91065bd578f1..084c861bc6be 100644
--- a/x11-apps/iceauth/iceauth-1.0.8.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="ICE authority file utility"
 
-KEYWORDS="alpha amd64 arm 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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libICE"
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
index 4ef4819434d6..bbdeca0d2a97 100644
--- a/x11-apps/intel-gpu-tools/Manifest
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -3,5 +3,5 @@ AUX intel-gpu-tools-1.12-sysmacros.patch 981 BLAKE2B a6183a9d0d07c57ed34205c028c
 DIST intel-gpu-tools-1.15.tar.bz2 1827851 BLAKE2B dac481571603ff36957ad2d5ef89266e744ec39a5623bb2b8e3d2e389d39d7aa09130cd7591e876b02d8edd970fb287c53ea9b520801a4a9ceede294e2917a7f SHA512 407f7c4ce72babbbd3ed08fc77719f88321b56745601b588bb6dce1a659786215e6d1b121af748087746df6f7da1bfd3ae8f9a898173eede5d5bb4a5b24b4559
 DIST intel-gpu-tools-1.20.tar.bz2 2274390 BLAKE2B 55c8614f93f5ed6391d35570ed6e4e36a659bd8ba5d98e321cb1daaf89413a95d1f0911cd07ed00670f0dceacd8f4443894a59b85cce1debeae9f8e01a75f824 SHA512 7b930c6949c04a600792df359f7cd230ca7b843072936c0c674cb9212b2d8c0701c43ef3bebe66b34141ed7a9b39774bbb99466cd52d70b3f1abfe5e52608f25
 EBUILD intel-gpu-tools-1.15.ebuild 1310 BLAKE2B c164f8ec91977160c9ccf41a8a1061089106b837835da44201072e4083cc1a31b480f03645b8d5b0202c448c878025023d947798fa273d2f50e787e87ad2fd39 SHA512 aab618d20956444222de42e8bb27130e6a6f76e2d83555da0fc6e450ed8f8304778366d9533e519e3c01760ec5027d1e83faf55de4de77e373bdf3d90503abc4
-EBUILD intel-gpu-tools-1.20.ebuild 2340 BLAKE2B 562eec910f1220fb92d60d161a922864aa0e0fd56fda5540ecb9cdf7785c40d60cb6631c109d9df26ba0d3e8afd558ba1aac774e437c2051cd2234b7d21f3bdc SHA512 8a34d86cfa622addbef622db66d0994c26f7e0390f4bdd2e46a7c8bcfc519c3b949e43f4b2e348fbbae50c4409d6e515dc3659e6c5e6ce4d60ec7a574a57f7b4
+EBUILD intel-gpu-tools-1.20.ebuild 2339 BLAKE2B 4f90803e8e31858669fb75c11a2d0a9c77752e7a825c4895459e8edbbd07edb853e0181436be871dac9f0a844c5f89e99e6f4718ecd2bd6c2a6d0aee0671fb40 SHA512 6455bdf9bd7f0a661289df456b42bc238e68b71bc08dcf9a6611db887cf843dd0264392277035fd6f4425c6da2b35e41836acd9b34d484ba377c2eccd0e03299
 MISC metadata.xml 603 BLAKE2B 45dd9f436fa73acc04e08ad1e3bddde995b09fa16da4bcc66898203eb5b72f72ad57d3e3c07f4669e57bcdcc26e5a2711a0295964c49738041ad06d9d4b9c31c SHA512 1d211baff35dbc0ce425b433b9a1a9897184a53800f7a2e4dde8e88a8de87cc9913341a4ff5cd15115067ac4fcbf9151f6c26fd34fb2feaf9477e9636fa32b1f
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
index f14f3fa384ae..0b6ab028cb0b 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Intel GPU userland tools"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="alsa glib gsl sound test-programs udev unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv"
 REQUIRED_USE="test-programs? ( sound? ( alsa gsl ) )"
 RESTRICT="test"
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 21c727e1c225..dae5d1e1db7e 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -12,5 +12,5 @@ DIST xinit-1.3.4.tar.bz2 165881 BLAKE2B 78e0b9e8fdb146e969014d726ac05e7f4cf14947
 DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081 SHA512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
 EBUILD xinit-1.3.4-r3.ebuild 1913 BLAKE2B af34d5eb73f8e99ea509c577c7560d44f11f8151dafd2371d91172c395e564605bd326f8da5610a34e1b2edaad4f58f09f208a38d1d803610b641cbbc651592f SHA512 59712d0dd8ff2e7637bbd3b72a9bc067d860247eb9bb8be603211d265a3c209d59431759cffee408e4104a5d28f07fe18349e7aab1858b18944b5b6ca4467e05
 EBUILD xinit-1.3.4-r4.ebuild 1770 BLAKE2B aff5f95040e5b78e49670178dbf5ba32cf80b437aa91857acd0c6590eb60cf39f4dcc460b16519d86ea05c08e2e0fbd670e49ee4dcb5831ef79cf7cca12ada3d SHA512 bddc5e4776a5b27533fb179aa4102618f8f6a9e9afc1202f962734f5854bd4e60bddac6141fafa297060b544b633be269646a8cb3b4896f0003e2e707d2930b8
-EBUILD xinit-1.4.0.ebuild 1770 BLAKE2B dfc2a356b82f4de24f55d658a8ead26aefee4986b282ac3dd0770f97e7c7ce65799b997a2c3fafd448dac4d3e4920de6e2c71b2d7967084ae1faf96f89fb3f74 SHA512 4f2719c09fcfb06470e8ff12f2ffe13628de4ab7b75897e7592f86a700c3edbc1f32d173d790eecc21923244025fa3263ddf0c6fc552bbe5ba9f7c4f58bdc5ad
+EBUILD xinit-1.4.0.ebuild 1763 BLAKE2B 7d49d469b42eeaf75f13f311099e02b8e38d98c436ee4ad6d287f8da59c236a541d870cdf6f8c9f1f751fc2b4e81ac51e5b5f52d4d6e7f7092b9d8234fbf9e20 SHA512 8e25718b5ca76a6ecb8557cc73a7a03fa7b5e3a9ebba32e3a4ca3de7f1b8b3dedc96238028345ea95ca332b88d89604bbfa2bac05dd4a9ff8e5dab198c236b79
 MISC metadata.xml 480 BLAKE2B 190a0b3a84e4d0d85e0928b964cb820599510c6c09a1a7c385b2f9b402a44478e08b48fce2d88216fe2fd52a3f35ec02d99cb7d738caf8a2d8dd6418e36f6125 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55
diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild b/x11-apps/xinit/xinit-1.4.0.ebuild
index c2d2baabb333..b52564c0651a 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal"
 
 RDEPEND="
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index 913a3fdbf3b1..9f43af6bc509 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -3,5 +3,5 @@ DIST xkbcomp-1.4.0.tar.bz2 243774 BLAKE2B f6a226abfe555608a898a7db40fd83cac954bc
 DIST xkbcomp-1.4.1.tar.bz2 251069 BLAKE2B dd485d2a5c985bace74fb5cc8da64d6b33dc9450c2e98f42e7e82f989faaa724da068799c40d2703da7172d758e67ece633ca47d2fc97342ec7a9aaedd71d201 SHA512 443397e112f67e2ebc5150ec0dbf0f4a072ea39585d964d2c7cbd0569b7e0ce7d8bed0bc2c2d886343fdb060c941e65b42aac16adf189c66e90849029e278f23
 EBUILD xkbcomp-1.3.1.ebuild 458 BLAKE2B c06aff2b862cf68af1950647fe3d8f60342cb17225516c1d31a6932371e49199551b290311d58cb57312cf8854e8975e84d5b0fe1a2ebd81b407fd520bb98363 SHA512 fbccde9c157ba47ae47ae3cdd52c3fe254dbb2fc4f395f0b5ad5e18f52f35022912646b42ba141b08ef1e644293ab59ab07fee437e4b4a8c5534083406dc3443
 EBUILD xkbcomp-1.4.0.ebuild 458 BLAKE2B 494541c3f941fedd25b488a4094bc0f92598948b454eb1bf32c5abac18dbdae01af939d4e259928b450cc7976d9f93fb49cd207e239e99c6bb6999f37152586e SHA512 899bc4a357b2a9feca67fe97e9b3a2b7bdfef6d180331493cfe3b4dec67e1b669f5f956a7f244973acf8bb8c0d96d961d399644487279d07b55be63f4341de33
-EBUILD xkbcomp-1.4.1.ebuild 467 BLAKE2B fc6d49d4634e6df995e77f1977beb6ba041e42ed42cdf9a7d43052ae5e4fb49970489661a6034875acaa7d513809ae503f093479e8b20d399c6bf91cbcabf069 SHA512 e027043637b117df23b3d7d1551a10fbf5693cad3130ce010e280edde5a9724571ed5ef803283acfc31bcc229f1e1b3d35d1e082d904357ba93b45fab12e92cb
+EBUILD xkbcomp-1.4.1.ebuild 460 BLAKE2B f1538206eca7fe809b94de32f767c2db9284a2bc9d8845804faa42ba0119adb75555eb125648637752ba5480fd9cbe3802ca73499f9ba7e446f9932a10753563 SHA512 3236a92e61eb24c090857b63b7b41cf5a2c50773193a4f040602320ff132beb7db2c82984000cb67b877c0a229f55a9fa27667df3c2326a47423d3eb45d064a7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
index c3f0fc686a56..3b2956725e56 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="compile XKB keyboard description"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"
diff --git a/x11-apps/xtrap/Manifest b/x11-apps/xtrap/Manifest
index c3474c365c87..d9d819c90ec7 100644
--- a/x11-apps/xtrap/Manifest
+++ b/x11-apps/xtrap/Manifest
@@ -1,5 +1,5 @@
 DIST xtrap-1.0.2.tar.bz2 95471 BLAKE2B 430d6881b743094b1e9b6eb60479cef44d636108ace4d53db35ed0371c567b2623088c5997c1dedebf17143bdd81f2e531f7b7c728f3336fc2c419b1ff3c8b39 SHA512 5fe6e02dd36d2fb65e5b83cbdae81d89fcbf467c9fc3f943a013299c2fc03c76f125627294302acb808d8b53e3ec51a82ba288d793df6ba3e88e0c980c6b3f77
 DIST xtrap-1.0.3.tar.bz2 134065 BLAKE2B f0e67ff4436a2c7eafd2ed4e6fe5c1d41dbd397918cbffa81587c4b3276c206cc4b9e4e889d50588ffb2dd1b029f04304acf1f34c27b1dccc52c61342ed5be91 SHA512 cdb205859a96a64ede8ce1df119c318e5b6d35107425996c18be0ec56a6287a0564d768f93012f301cb91d517f67261de5c76441c0bfb796cc0190799aaf6c2f
 EBUILD xtrap-1.0.2-r1.ebuild 324 BLAKE2B 5729a161893d22d7de7965ccc2817bf6fe83a306a28aab19dd3c16abc8ab0b847e41d3c1e8b25a6ed34b7c017cdb1f35b6807ef244e17885d8de6cf808b3b2ac SHA512 6ff90efec4593cdce795f438a7e016029823264f4cd7f0759b4d74601926f29346e24aafbd1030d71249ea2e6570dcaa29cb52c12337a3f1a32328119ca6710c
-EBUILD xtrap-1.0.3.ebuild 350 BLAKE2B 449faf5bfcaef88ede862ed80f2ceedcb8c4ee36d4cc01e316a3ed51115b7aea598a3afff22f48e8d5975fd53ab4107684a12dfec0e8325b69ed59d9213edd66 SHA512 6229f0d3fbeb0eaec05052a8d9495304a805b2bba5810b2cb500fc67095f265ff5b569082d392c39742f1f88fa86a4683f57491420c9148e0d7a4bac3a76aba4
+EBUILD xtrap-1.0.3.ebuild 346 BLAKE2B fcdd39b579fbeefad5182f233c2fd640e4aad723ad37282617161f95d70d9b70b573872b2addcbe444e63050d848002e299ecb8c5065304408beb9045b93378b SHA512 37fc7e03f2f840c1f9f3c6dde0b77041813ab54e68cc330a93743388037e56779119e189f5b6858d3abb93656bbe1ae29d37973790a2c29e28efeae47f58488f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xtrap/xtrap-1.0.3.ebuild b/x11-apps/xtrap/xtrap-1.0.3.ebuild
index d9d12085a677..4575e7f8ec75 100644
--- a/x11-apps/xtrap/xtrap-1.0.3.ebuild
+++ b/x11-apps/xtrap/xtrap-1.0.3.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 inherit xorg-2
 
 DESCRIPTION="X.Org xtrap application"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt