gentoo resync : 18.11.2018

46 files changed, 88 insertions, 379 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 2b9c1f83acc4..639ab96ed872 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index 0e6114e87e5c..b5ed0a46f55c 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 962 BLAKE2B 6519051caec72def71150721a012341f3154621eca3e8f3d2f9a2235ce7fc9c405554630a312c56109e01d2a71d56b128d0a4cbb8644f55cbc818a2fd6da9b76 SHA512 342b430f8514825e8c450c4ca0ad54ed941e3fd22acc13d99f2328f9d0e59acfe00a339a984c8282bf254702b219b05a4f815d3978f81f3f7b614a7d4d461928
+EBUILD gccmakedep-1.0.3-r1.ebuild 952 BLAKE2B 7d1fd26ff879180bc37eb0be16c4c100a251082e8af794f76ff3f4981c3a8fdd87cebf5aa4b1f6976a933cd39f74ed75cd6ce02085925eeb4600b53a8ecb2679 SHA512 5d63b5fd8cb0e747a96e056bb5a69407f0f111aa9a8d3013347c3362f00d680c62c3ef70782a22584b65fc2de0a7cc90b6b24ca534bb5958f463d82791e12713
 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 f324c514b6bd..6a322acff094 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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/imake/Manifest b/x11-misc/imake/Manifest
index 1b2b57671318..19b40756e2b9 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 1170 BLAKE2B 4c9722b3260289f3244313ee6cb8cc352dfa8d419f40fc8d3332ea56916db9e66f8b40d7d911afd920ee05dc47b0493d95dc4bb0caed0e626fe39483b2b178f4 SHA512 89c11988a9d639352656d212d87e747c55d7e6fa8bdcbe34b84e45e4db08f8138d3d22fd9cf57b3fa2eccc112c4070fff0695fbbca3f28882a83139353cde921
+EBUILD imake-1.0.7-r1.ebuild 1160 BLAKE2B 147e956a4734d058b0460c16f25da38818b2467903a9a8218d7f497cb87ef19abe72849f67fddf0bf44c10b65fa3ea1adb838cdda8194c0cb79cdca2e3f6aca1 SHA512 95742cb8a5c43b4ad4fba7fb86f70662666011b84cdb32ffc0076e483eda7cadd7f355828e1299b8233f837740ad9ef960df38126c51106f6ff92a08d5cbe9ed
 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 ea7c9d7795f2..df4b24e92c55 100644
--- a/x11-misc/imake/imake-1.0.7-r1.ebuild
+++ b/x11-misc/imake/imake-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index a79b5fcc549b..2841a304c287 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,6 +1,6 @@
-DIST libinput-gestures-2.36.tar.gz 16598 BLAKE2B 3c30408ce394cf8bbc5a68c5f37c9106bb481ad47c75f25bfbba7470da0cbfb330512fe0422588408f177085c23a5cf0379c13a49c9fce438e8d8b1179c91d50 SHA512 69f77d0681f37deee3f215e71e4410d5c45107d2d0a1addb897de14d7f83bcb3e2285ed9ba605f30db23441a9d7bc9a6960b2a49d53ad71a379d0b874d36d645
 DIST libinput-gestures-2.38.tar.gz 17054 BLAKE2B 037d095674df9b00c9d23762745d35beaab03d0f5b361030a9177f84c540ef2ef45fb6fa4b9fe80a6500c81a8973aac46019931d8a548b02a6527ba09ca1fc13 SHA512 3152bcb0fd78551be14dda23fdce9f9216fc56e7a2dc4734b73949b4bd9c87fe6c9e2fc95f65a328b46c577abc05889a3a6290c6eb9390a94d9eb254c2fc7550
-EBUILD libinput-gestures-2.36.ebuild 1369 BLAKE2B 480f4582ae605fe66662eddee2172b15542055c03ee85bb0b12c3bb4e6dca264860b6a3ef50006c016f8f13e1245ec9a495c87afd4dd169465e9b5eb084401d2 SHA512 3ff9eff82d180809d1fc802d93ac647e1333d8e1bbc0f155a2888a34257b618e667874a99f0ea42bfb0c09d21c0d2f358f69ba8a53b12ab72bdeb5033ff80d1d
+DIST libinput-gestures-2.39.tar.gz 18028 BLAKE2B f7d24a1ca8a6ba7064359d3f1c4e1cc72419205d94c9da7efc85b1fa0561f8353a50e126b6ec15cd79f6ef6c82b5d1ed94d44f0af6fcfc21eb2644695dd66337 SHA512 5aa54c9da01de76e279924bc2840b704f163512e06734fee1fa37e6905c33fa2aa734f4bfef6e8bc75a654f0345dfd8928be298d880229cc47be791a65ba1927
 EBUILD libinput-gestures-2.38.ebuild 1305 BLAKE2B d324f46c616f20588614678f741383cf5e2dc7f916f82e493bf282cfc4a9be6a0f2abebb7c819831ce6ed5a9fea30e009ec71ea323f66e44d614ad4c28d2c3e7 SHA512 f552a25ee6da9a229bbd1002dd905c6bfeb5f435cbefc9c549c5047f3faee1fa06b4c4f0bfa341c2c658a0c8aae5f29a03da456cdb6e4517a52ef8dba8474f3d
+EBUILD libinput-gestures-2.39.ebuild 1302 BLAKE2B 5616faf55e1b06d9286107f3b5f1ed335be2f90a7a0b4d81c197f8dfbc7d62ee1d1cf009cdb7df768dea8e0e65952c35542b04808a599d9d67929ab772b36701 SHA512 30a5b865bc890405023bab20036d1c353253c344850aa9b833e544ceba916fc57caecc672859e239f338d02836d1d9a08e159390591c32d40a8c55dc96f38dbe
 EBUILD libinput-gestures-9999.ebuild 1305 BLAKE2B d324f46c616f20588614678f741383cf5e2dc7f916f82e493bf282cfc4a9be6a0f2abebb7c819831ce6ed5a9fea30e009ec71ea323f66e44d614ad4c28d2c3e7 SHA512 f552a25ee6da9a229bbd1002dd905c6bfeb5f435cbefc9c549c5047f3faee1fa06b4c4f0bfa341c2c658a0c8aae5f29a03da456cdb6e4517a52ef8dba8474f3d
 MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.39.ebuild
index a2cf956e87db..ebd4d9f424c9 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.39.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python3_{4..7} )
 
 inherit gnome2-utils python-single-r1
 
@@ -19,17 +19,15 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="test"
+IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/libinput-1.8.0
 	x11-misc/xdotool
 	x11-misc/wmctrl"
 DEPEND=">=dev-libs/libinput-1.8.0
-	dev-util/desktop-file-utils
-	test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
+	dev-util/desktop-file-utils"
 
 src_prepare() {
 	default
@@ -38,6 +36,8 @@ src_prepare() {
 	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
 }
 
+src_test() { :; }
+
 pkg_postinst() {
 	gnome2_icon_cache_update
 
diff --git a/x11-misc/lightdm-mini-greeter/Manifest b/x11-misc/lightdm-mini-greeter/Manifest
index 9b1651354b7e..8bb717f53459 100644
--- a/x11-misc/lightdm-mini-greeter/Manifest
+++ b/x11-misc/lightdm-mini-greeter/Manifest
@@ -1,3 +1,5 @@
 DIST lightdm-mini-greeter-0.3.2.tar.gz 25165 BLAKE2B 677c3544607354aff252cf19448c7b8a63ee98e836bd4a42ec0043782af5c76890b2c6d0a2f83279b2a69901a009d5d6afcf5c356b7bb2ffcbd845341822e64b SHA512 eed48cca47300c2461c75a467f247bf9242c762ed868f0c00842c17fe42ddbd389b5aa03e4bb588089dae763b2927b59fe296ed9ceee80122cd4198455275380
+DIST lightdm-mini-greeter-0.3.4.tar.gz 27327 BLAKE2B 5f16b3d785e6773c127927caccfcd53089f3f31a8f1cc4c34ab09baf3cfebf9aabff45b5c76b1efdb850cde550e9335f3b8e8cd00d623a501346b9fe4e0d8e70 SHA512 dd605aaed14ead44962ef34d1d42bb350abc25f2975b2d1ed0b58e852b8f75805015ab4908a2414ebee3339e087f7d1e757f09345affb6a69bcac250ce47914f
 EBUILD lightdm-mini-greeter-0.3.2.ebuild 589 BLAKE2B 4280fb27639c62bb43b1b9682b60c38ad1f711cd423ee6a69de32a8b16a522fd5da4a8883599e08ab356333575289ccc823eeed73278e227972505c0718d689e SHA512 f2b0ba58e4f7843561c30ecc072522d592eb57e5b0576bde34c924936775bfd1e9c3ddfe864adb9a4eed092918616c2afcc3cf4ccf4e31d2351a6a6cbdc7f2d1
+EBUILD lightdm-mini-greeter-0.3.4.ebuild 586 BLAKE2B f9a8847e8b5a2a93fefc3100dbd0f708f48fc095b2c6ccc10ca8b783348cf88ddd9f70b6e9f83df2115197e29835337f5c53971eb9cf11fe9ed9180c5737e1e2 SHA512 6e029e59fdd2e9f978bc508259aec005e86d51a7fc3392f86cef91953563e9194c2c5205a2ede04e170702a215be6811965eb375c88673dac440d454f9e34f69
 MISC metadata.xml 353 BLAKE2B 364a6904c6b871e3a331928070a8d65a75c04ca8646636cc7978abfa8fb69cc9286556e93a7cbafd793236f6a3e5ad45ace236df780710f3ff1624b7e81211c8 SHA512 346fabfe019f6c030e58de94c7de3e344aeabb9227f931f5d3067338a9cb795fff6ecddef18d2f6af97c2fcbcb0d5953f2984914841278bd5a8632983e5b7734
diff --git a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.3.4.ebuild b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.3.4.ebuild
new file mode 100644
index 000000000000..a895e39cbe5d
--- /dev/null
+++ b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.3.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A Minimal, Configurable, Single-User GTK3 LightDM Greeter"
+HOMEPAGE="https://github.com/prikhi/lightdm-mini-greeter"
+SRC_URI="https://github.com/prikhi/lightdm-mini-greeter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.14:3
+	>=x11-misc/lightdm-1.12
+"
+DEPEND="${RDEPEND}"
+
+DOCS="CHANGELOG.md README.md"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
diff --git a/x11-misc/lndir/Manifest b/x11-misc/lndir/Manifest
index b6acda5bf33e..a587b1e57c66 100644
--- a/x11-misc/lndir/Manifest
+++ b/x11-misc/lndir/Manifest
@@ -1,5 +1,5 @@
 DIST lndir-1.0.3.tar.bz2 114392 BLAKE2B 2e9feb3057f1508a118c4dd6212305e626ba25dd32296d35a553b5c42cb441e494d386d4c9afe15f150a9a8da2b7fac0ae7a128948544c4545ea740d7e7e21a6 SHA512 c9f03c825c627935abe399bf8292bbf69304cb9e9d65a4c860b49e32e2ed4dde25bf658a5ab2116cd215381d0a52f464a8a53469c27adddbd9fa2bfd135a7289
 EBUILD lndir-1.0.3-r1.ebuild 329 BLAKE2B 9db3fce24ee36408c424c6aca65d16e8e56a7db7dad4d9733363b09183b8e7eb7b49f6a846fd4731bc212aee653d96fed30af6033cf3adf05d6236961c638152 SHA512 c5696fbfa2394fac512f6a2ab005af434570b3cc8fa2689d5aa61bd17dcf491cde2d894d9bb12e7b68bc166bb0f27f4001d8c5e4d7f619be59eee3fbd04446ec
-EBUILD lndir-1.0.3-r2.ebuild 882 BLAKE2B 8d818620a5e442cc56e9cf4c72d6ab63fa0a2f8d1b0b91a7641013cf727e7421642e6ed7b9639ecd656b0c9783633bea0f843ab2661179c6070ae2724e927ce8 SHA512 9330d8504ea7427de7c4132dab36fb0a9ea8c7cd432391863eeb9b37d14f77de0134c031723f273d483ca8d1626a5b0252fbbfa91476a5e3d586f1e72dbfe8ba
+EBUILD lndir-1.0.3-r2.ebuild 874 BLAKE2B 3107562ee473f7faa7a26710703c8cb0dbc2cd131597000e6515de9950ba110c45fbb6bf8c0c39b6285debef012d0a6b10369e7a9f6deaeab16c06367f3eda52 SHA512 11e10fe29faedb6aaa01f8e9a221527d5293ef3e9e98360139990a0411abdbfae89c04dfef5da0a1ade07539b8fd16cbc071bca91ede07a48a0b60a228e7ad8f
 EBUILD lndir-9999.ebuild 882 BLAKE2B 8d818620a5e442cc56e9cf4c72d6ab63fa0a2f8d1b0b91a7641013cf727e7421642e6ed7b9639ecd656b0c9783633bea0f843ab2661179c6070ae2724e927ce8 SHA512 9330d8504ea7427de7c4132dab36fb0a9ea8c7cd432391863eeb9b37d14f77de0134c031723f273d483ca8d1626a5b0252fbbfa91476a5e3d586f1e72dbfe8ba
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/lndir/lndir-1.0.3-r2.ebuild b/x11-misc/lndir/lndir-1.0.3-r2.ebuild
index 3009d675272b..53c90ba0cb3e 100644
--- a/x11-misc/lndir/lndir-1.0.3-r2.ebuild
+++ b/x11-misc/lndir/lndir-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ppc ppc64 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 217f79c57ce8..e05f0386c059 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 1006 BLAKE2B 12477fa6688cf2471b147712eb4de65f3f3e6a6a6be374dd33035b3274557804c5c44d36b22188c636f92d3808952986c7760fd7a6b1d349dbb23afe68af39a0 SHA512 046738edb142cbac1b7eea3cf06f616b2b259a3fa420f7c91206ce298ece99657d13b23a5d5e9957522f12f6588e91f8534fe41f6cbc2526d3b054e570cf7251
+EBUILD makedepend-1.0.5-r1.ebuild 996 BLAKE2B e78886be6759d91b4de8e5254e68e432b9f53d370293cf4f0768a5a4350a06d0b968bbdd395f94585619c822cccb21822998df353ea62e13fe83a9dc99ebe1e6 SHA512 0a3697895c0b812ac28459ad6f74cb0f30a018a3f9105c2b26a557e033a2f0193ecfd2dfa314e68ffcef41c52e5646a3d92e8b187fbde53eb73fbadb74aadf8a
 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 acc8c0eca350..8b75f8eafff8 100644
--- a/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 70c42297deba..c402a6733e46 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,5 +1,5 @@
 AUX mugshot-0.4.1-missing_default_face.patch 782 BLAKE2B be9ef8633839b505c37ae13430ebca92b95a0632fed667c49b5885cc393ee0bb6743453e9e5fa621959113c43b87590842e56d735f8666533bb22a6522606027 SHA512 5abb02cd511482c3f32e56a7f121bf6cce102dab7dfee196a105ff5ed2cbf3d9ee3f20f0d75eecfe192d0c16603dd80555fcdc872cc85bffa74de7d0bbab79b1
 AUX mugshot-0.4.1-use_office_phone.patch 996 BLAKE2B 4c8647647f424775a1557f176b271e7f23d5df99a4db3246c37f7d108640a1d18bb6a8185f1e1bdd2f31bba2cbc62fc4d39df5172edc72e3142dd3954afee329 SHA512 488f99fde5c09aa2e15bf9b78bb19b6e244476a1b0e8053f3af5e0e6ef70febbc92d3970f774332dd961af7893e29a5fab7cc7e964d24ffc46d67c9567e2579c
 DIST mugshot-0.4.1.tar.gz 121660 BLAKE2B ce0c0d4b76184f35e4ba5204b984393412924c0288b09fe51ec0e6635b1556e24ed98ce4a893ae57f25810bb39ce035fb40b6990e1b6516406cb0f670acdbac0 SHA512 f7790b3f80fc98d9b19e9b9dd74eafc41ae7598e38f70e148502056b4bd375922271cc72cf4664280f1449b2f5e1d89052ecc5d37c6dc453041e5312f736bbbe
-EBUILD mugshot-0.4.1.ebuild 1386 BLAKE2B 10e4147c3c35da0cd4dc88fa938fd0362f5f17962d6c51a82ba539a5d0e3f8fb5fa965815a21ccc771d195431a3eb8cc9513339e3f85cf37d50a2774cb68dc1b SHA512 9d9a46899d20cb99ab35b0a0ce155a15b03aee5394ea6beb422d90c19653a58044636a0ed5ec31422bba150c2cd30886dd225de70241d452f7b6f1a6d058717a
+EBUILD mugshot-0.4.1.ebuild 1385 BLAKE2B ec355dbe25dca240b058cc90fc0de569746452f4dd6b2b5d33222a73408d3c6f16a0562e1d55e9bee1619d653ec8dcca806536a485747c9eca488e1278b84dd6 SHA512 f96feab3b7406fcec7536a432fab0b342d76838bddfab0b4528cfd169f95ea125b2abfa46cd5567ad707459c4213f5b9da6277dd116687a2c693d4e476d77971
 MISC metadata.xml 1046 BLAKE2B a0aed33d0d8110e8fc4038e3831d39f4696dfc712d4fe0c7e963c9f5861b2bbf7f087d6d74e519f1fbd8cc1212110c7298617bf5e9481dffbb7da820580440d3 SHA512 3c2cad8d7defa4719ba1497605dab8a3ef271decceddb690f2e5c5a24d4caad53dca82e347f65eda7cf70af29f558105b7daa4d0ed55891d2ff1a38565ec923a
diff --git a/x11-misc/mugshot/mugshot-0.4.1.ebuild b/x11-misc/mugshot/mugshot-0.4.1.ebuild
index 318a2410d3ad..d66aae8136da 100644
--- a/x11-misc/mugshot/mugshot-0.4.1.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome libreoffice webcam"
 
 RDEPEND="dev-libs/gobject-introspection
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 36e38cb0fc48..7fa09218bcdf 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -4,8 +4,8 @@ DIST notification-daemon-0.5.0.tar.bz2 330034 BLAKE2B af201d3084716fbac02095140f
 DIST notification-daemon-3.14.1.tar.xz 280344 BLAKE2B 8e965cd52f97129f8f6116c9e21ffe73213b80f0652b7b00732c1afe3817e57a96c094a2ab8cef1628ef0e941aa90c759ff641d5d9fb3e5be8d4c8c26f27678a SHA512 977d028206d6a2005d346f697af5790b404f56399c451774037db25e37724f0cfbd558ae413c9ada40d2d7f399c1911392b19194e8fd093de74f65a6783ccc05
 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 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
+EBUILD notification-daemon-0.5.0.ebuild 969 BLAKE2B 2a68f40ddd286ffe671223695c6787b72572a20e5e65f1ec613c06a56b2acdd23c4ea3729b2fc6d3a17778756e057be117819349ab8eed9145a364526997f35b SHA512 c280d0805d07355a65b7dfc6de6f028eb73d153968a31cf3e41139b0dde29820b7ae8fa69542b6ec81618044113e783f63990f380b55567508dff9a321bfda3b
+EBUILD notification-daemon-3.14.1.ebuild 988 BLAKE2B 0faddfdb82d045022ce71e84d2193827379161abed2ff5384ee2b3ecee6fb4989bbf3e29579ac4435cde59bd1b0ca4711514d6f720ac8670bd01f0af8b49e6a7 SHA512 60f13a07051b020b47ff323a63313a41d7dd475d9eedd923beddedc9e41cb8dc77ec4bbae4f2bd46fc9d5a7d1539a86be89c95854623eea287f0d2d36b13ce97
+EBUILD notification-daemon-3.18.2.ebuild 962 BLAKE2B 62221336f94d9898d4d7922e967a78ec56e27069e44e8650cfeac3e2232ef97bf8267fbbe52b319008660f6402392568cf6f772481b075a140111adfa6f2346c SHA512 73fcddbe382e142bdaa74e4976e2b2555c9a086112374ec2b337ffbcf222c67bcfe6c65d121feea91eea80ae811385e9f21c3ebdb4de500f5093d25c1f14cea1
+EBUILD notification-daemon-3.20.0.ebuild 964 BLAKE2B 07218d5d4ab668635bcbb0711a4fcc02f2d26b2129ab6783a28aa02714549638fa34116a9b8a04fbac1173e7b884bb982ae0f130a6ab38fd07fb23a7b3192939 SHA512 c7852c7a31283bc71593663a31d5e37105ad56522046ada6d4f882c1487f32704643738d722cf4d5a0246636a36b4a464a6b6b92a0035962037683adbccb5787
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
index c07fd3c8dd70..fc507b776204 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ GNOME_TARBALL_SUFFIX=bz2
 inherit autotools eutils gnome2
 
 DESCRIPTION="Notification daemon"
-HOMEPAGE="https://git.gnome.org/browse/notification-daemon/"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
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 cb3ad67ca632..690247f940f8 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.14.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
@@ -6,7 +6,7 @@ EAPI=5
 inherit gnome.org
 
 DESCRIPTION="Notification daemon"
-HOMEPAGE="https://git.gnome.org/browse/notification-daemon/"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
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 8a0a9884722a..d05dfce74b96 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.18.2.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
@@ -6,7 +6,7 @@ EAPI=5
 inherit gnome.org
 
 DESCRIPTION="Notification daemon"
-HOMEPAGE="https://git.gnome.org/browse/notification-daemon/"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
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 a0923c395aa6..efc0422e1d1f 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,11 +6,11 @@ EAPI=6
 inherit gnome.org
 
 DESCRIPTION="Notification daemon"
-HOMEPAGE="https://git.gnome.org/browse/notification-daemon/"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/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 ~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/py3status/Manifest b/x11-misc/py3status/Manifest
index 3bfe49d9093e..4410af60ad1f 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,5 +1,3 @@
-DIST py3status-3.12.tar.gz 278589 BLAKE2B 9a0e153d19fd6e60a825e688320f1307465f80c18c62910b514bf5fdb0db98fd50dd54325219a7160b56febefc0a4ba7b8b0db61bbe8ae36bbfa68bb50b69a60 SHA512 ca236d14ef4a01df4015931460032bd9fb48ffb94e7c6a86b783d83149c6b3db3e25159e1ea0593d49c937abfc8362e3e16c7e376424aaa42cd5ebee67bc5c6c
-DIST py3status-3.13.tar.gz 298746 BLAKE2B df0d24a76da60355f715aece9e0080cb3a281a0ee2a57407d8155f5ed4fb56f075852921d9a43713e3c8c98a9d1376e530f6113f6bb247b0c77e9dda50e3eb2e SHA512 41ff404ced56e3c10c31d1629e701299d5ea7676cecdc1bd4226d81659ec320e16d9ac8c07ff302a210ba692249b262257c706d06605e1dd429c2ebcca736787
-EBUILD py3status-3.12.ebuild 602 BLAKE2B c374db1feeb7d074f65a8010d5efd29a559cb6b3ed1df755a7bbb73060a667f7c3fc2749dd66ba08f7da1705507c63915ab58c89db815acf24be00d875375780 SHA512 66046211220702cc421d3e16facc2d88732fc79e2ed5fbd54d70fe3fbaad0af5bbe7f618eb0ca6ea5c374ea4ced8565e44869a8d472b94a119b0e5b99ce67624
-EBUILD py3status-3.13.ebuild 727 BLAKE2B fde811aa5971c357e29f60c891876f50ebb906e3c49febbcd50569583acab1097658bc23ffa6563adefdb7319820d933e4957d7bc26b1184e67accd9ac967728 SHA512 5d4c3a6e4eadc650d8f6968266155a866c8967547ce999ba07d402d5a0886cda741f83bf8cf9b92e24b618e8c5ba2301aa4c3801419d73a9549a0a88aaa710b4
+DIST py3status-3.14.tar.gz 302768 BLAKE2B 17b604cd4fa8d832a92c3fe74d20cb2df6a7f697dc7c165472315cb2925dc3496757879777bcc9fbba867303ea046fb88e53f976fff85011ac3458dfeda34a16 SHA512 1e87f338faa3c7ea4e1e14e5a40aa5913b33bee06e5b858e876453787694db4f285d93396efa44b82dc59cb2b296d6a3e6d358d008a09056257844f919555782
+EBUILD py3status-3.14.ebuild 727 BLAKE2B fde811aa5971c357e29f60c891876f50ebb906e3c49febbcd50569583acab1097658bc23ffa6563adefdb7319820d933e4957d7bc26b1184e67accd9ac967728 SHA512 5d4c3a6e4eadc650d8f6968266155a866c8967547ce999ba07d402d5a0886cda741f83bf8cf9b92e24b618e8c5ba2301aa4c3801419d73a9549a0a88aaa710b4
 MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
diff --git a/x11-misc/py3status/py3status-3.12.ebuild b/x11-misc/py3status/py3status-3.12.ebuild
deleted file mode 100644
index b555901801d3..000000000000
--- a/x11-misc/py3status/py3status-3.12.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-inherit distutils-r1
-
-MY_PN="py3status"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="py3status is an extensible i3status wrapper written in python"
-HOMEPAGE="https://github.com/ultrabug/py3status"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-misc/i3status"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/py3status/py3status-3.13.ebuild b/x11-misc/py3status/py3status-3.14.ebuild
index 10ccdf7c1270..10ccdf7c1270 100644
--- a/x11-misc/py3status/py3status-3.13.ebuild
+++ b/x11-misc/py3status/py3status-3.14.ebuild
diff --git a/x11-misc/rendercheck/Manifest b/x11-misc/rendercheck/Manifest
index 9beb2b903151..c56806b27c5c 100644
--- a/x11-misc/rendercheck/Manifest
+++ b/x11-misc/rendercheck/Manifest
@@ -1,4 +1,4 @@
 DIST rendercheck-1.5.tar.bz2 143656 BLAKE2B 50de34193aeb4751f967fbc04b54e75909672dc7bbac29a1fbf6ac0e648ac032c877bc215586feb44c89cb7625fc2ac2317d03ff30dcab83625290d85aad6cda SHA512 ffa1abf317f85a8bcef3544e3f810b34567553524ac0a784d2a67470e0811854d7983af8600a04aadecf42871ccb83ad5c0e9e25179142fda2a8f5853a07f616
-EBUILD rendercheck-1.5-r1.ebuild 562 BLAKE2B 56d43236100f71ac927a430b494241ec76c67facd6e6a2042684201aed6ca453d6f281c733bf07624d4bae2a9d76726175dd34b641b9e0c2fce38537d4051374 SHA512 0efe3a36e22e98152d8583bee67358a9a3ddf539c21149edbda2f1f0f85c6bbe5701fc26d1b7e00637264bbf979707b7d4e5dc8c4d74122004e4008e43ad5000
+EBUILD rendercheck-1.5-r1.ebuild 555 BLAKE2B 8c6637637865516ab03d4ef60307401b20cfdd7bc789b7e4175843dea00fc2ed61959cd7202f7a2738f090f4f05ae098278104391f9ed2907582b859e59d995b SHA512 2a4bdff874c272a764f5db08a10b6815bb6f287e814d6daefb4d8f86594789da4fd334f706393fe4a931ddbc8ffac8830850f5235e0ef4b35b2358a5270ddc6e
 EBUILD rendercheck-1.5.ebuild 345 BLAKE2B 7515bbebf9da063e91acb7953767d4fac4baf7d9c2b00b973032dd6e3069f6953d0e197e1081e320f41a75278791d12530ce144de62bd768c4d169ad91f94a12 SHA512 37c5b8b56343b14eaca7aa6df41e54746841602f910cbb992689d74f9d4b4d5476449ee2fb21dc91424270acc41816b3d452c3e59663d136c7d07126fa596f93
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild b/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild
index 70a68e865b0b..8efe587b40ed 100644
--- a/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild
+++ b/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://xorg/app/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 BDEPEND="
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index f8af235f6cc3..90c6bb1619c1 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1,7 +1,3 @@
-DIST screengrab-1.97.tar.gz 161792 BLAKE2B c2f53cd3d7333d89737ae55753a03de2d3c39f7adcc85f278d54bfb6d734e6f71d9126f035184262bf437e4a5032350f4f7a07060a3eb4014dab15563f78db29 SHA512 4fea4fe68a212ef5436b4f2b2db64e6f830233e5af0cd28259ad84d292e5df6a38e22de1ba40efe083f18ffc973be78aafa0d9eed990229b5e2a8660d1b6ece1
-DIST screengrab-1.98.tar.gz 146776 BLAKE2B b795a881c4d12f8d0328b6eebb9632983ef9b2da3acccb3d2afd2b065b90a0c393605095512973075162580bd05e5365f2f356e4b8078d11bd4cff1dbbdd3469 SHA512 3d39874609b389263875247dce5f1b82ab215942be66eade4c5cda462259cab75607b92f3676798d8915f2d2bad3e16582fe38c61f049757706adb944d9229fb
 DIST screengrab-1.99.tar.xz 118756 BLAKE2B 0c18d07ee9fbce0686604e90a988e903bf9a13346e0667091d0e7e5bd42ce03975db1d43dda3d809d92fd2469101efc733fd58bccf9f2ce3af80c210c35179a1 SHA512 06666cad70a9309f987b6fff8f85028b877f0c621cdcc5cb91f8b82a954637a45af30a144cfe50dc6dc04fb24c17ff2768368f3bf318f244b8a8d5b922bfa42c
-EBUILD screengrab-1.97.ebuild 718 BLAKE2B 9ea014854d796cc578a7ac45b172d01d3f0f2aba416ace4128f75b66e6c4a2c1fe3c00fa88242d3e4e27e0ab9a63e4f558a8e1399a38caabc8c0ddbebd2344aa SHA512 fe7adc46cd3f8b27ef1401b0f88018b484755a73332037191b2cf4c23752593eb76b52a4c25c08d6174e16718a931b3e30ddc7271091dc2a5496d372397eb137
-EBUILD screengrab-1.98.ebuild 720 BLAKE2B d04845edffa7d7380476f0026cccbe2dbad20f9271300f0c30513f412f52b8b899da9333fab7f6c6feb5fb0ea3e35ad236adcf16916ba45bae04a9be27a299e7 SHA512 afb366bed856d58deabe293a591b29e774c4a65ebf52fe69d6a77e7891bce528a3faae78fdedee6183a0020fdee6a18adbc3b0679185281a732f0c85c8f1449e
 EBUILD screengrab-1.99.ebuild 776 BLAKE2B 51c00451c1bb6d6a67d2c67560e9fc19646340cd61621febdc5f02a1f8596fc9632dfdbba6d727f0a1111fae33bd1eb84517a5701d9d0c63372ec9da875501ec SHA512 f80ff00faa1161087455689bf8817ae79736b423c057f3f6e9ee6700f164fe2428c7bc2b78e70ac7abf75557e8fad597fe8275b06fd1b719c27f67b3af654255
 MISC metadata.xml 439 BLAKE2B 87d0955baa4cf7c8587121cb9cbe863bffd94cf8886019b9c97153fdd034aa10425d71e5fbc172be6605534a45cf838b2c04aace8a63e1cf4c6adc91251e2e63 SHA512 991791fce13ef70f4eb0c0916150d0d46ac49dbf5b56b4644cc6b399f6fbbf7f7391ad9359f22f3ffee03759fb3fea1e88905a2f444ede1b37e9a4136f3f6e58
diff --git a/x11-misc/screengrab/screengrab-1.97.ebuild b/x11-misc/screengrab/screengrab-1.97.ebuild
deleted file mode 100644
index 6e9bf5da14d2..000000000000
--- a/x11-misc/screengrab/screengrab-1.97.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Qt application for getting screenshots"
-HOMEPAGE="https://github.com/QtDesktop/screengrab/"
-SRC_URI="https://github.com/QtDesktop/screengrab/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libqtxdg
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtnetwork:5
-	kde-frameworks/kwindowsystem:5[X]
-	x11-libs/libxcb
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/screengrab/screengrab-1.98.ebuild b/x11-misc/screengrab/screengrab-1.98.ebuild
deleted file mode 100644
index af621c5c6208..000000000000
--- a/x11-misc/screengrab/screengrab-1.98.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Qt application for getting screenshots"
-HOMEPAGE="https://github.com/QtDesktop/screengrab/"
-SRC_URI="https://github.com/QtDesktop/screengrab/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libqtxdg
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtnetwork:5
-	kde-frameworks/kwindowsystem:5[X]
-	x11-libs/libxcb
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index e07e3bdc58d8..4681877a36de 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,16 +1,10 @@
 AUX sddm-0.12.0-respect-user-flags.patch 779 BLAKE2B 3ea539e4e426fa745be2ae6c59f6bd96e42d864ddba9942681397a2cdae69528d837001535502e83e6ef50a9ca65a30b62601af76a11465a5b42feffef348edf SHA512 77e3f2ec4dff122e40428444055ed7cbbb177242c9c3c034b1934dda7a3ff2345dd8fcee4b927b797f66163bffc23a5760dd55c2fa24f2c614cd7dec88ffde88
 AUX sddm-0.14.0-consolekit.patch 322 BLAKE2B ace6c045ab0282eca8bf8a11aa8aa2690fac3ce7f712cd71e48bc9ec8f04dc18b9afd997d04550ade8a37a24a66e430f6b5ae8e752345c7c132cb95ae61b2e73 SHA512 aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a
-AUX sddm-0.16.0-Xsession.patch 606 BLAKE2B 8d437038be2b5fd3934174320aa14484ddd5de5b3d8529100af2679b4cb8ac2ef846ca2812ac8136b7482cf8010d724e37555636304fbe1e72b3a53c0d6b5b1e SHA512 ce01832d8af011c4e244c9357f540182cdf3b7af8d00616132f94c95a95b32df41beb1760ac8cad7a0a5a34165b8b289df0308656268d67f9bc420b5d3fb40f1
 AUX sddm-0.16.0-ck2-revert.patch 918 BLAKE2B 803f3370260ce40a4b46d3d7a9f2f7529db90baba039c080606f9333e4933c6e3a219331d57dbc577e6a32567fedade3a4aec8bd1706bfb5887a0c281d37c2fb SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60
-AUX sddm-0.17.0-consolekit.patch 1192 BLAKE2B 1ab5dfb6995fffa033990380c2a82baaab77de8f95c9b28b301b7e6e4db0de0dcbf84e0767fc404d75361d6171c566c9c44cc52c741f884fe7cfc93f53d42b9b SHA512 f05b88d8faf63dc492e0177cc1f7296074738470172fbf9b97929a035fecc4116388d839a8ec504a02008a3f14be1a4780f8796e3dec2269ef8d59d96282a7f6
-AUX sddm-0.17.0-logind-race.patch 944 BLAKE2B b92897b1d1de88de5f6edf9862221bfa56c1d5294177651431099dd09c25435037e03095ec2fb3f776cb190ca16808a9caea35282045ca9e353176dee75883b8 SHA512 4e4c388529dc898da2b8983f46e809bc2939cef02d4aa605761cc9978b4946121cd2d949353bed3d19a14cafd1628fdae3eb928dd56f81ddc976005cafb4a939
-AUX sddm-0.17.0-switchtogreeter-r1.patch 1891 BLAKE2B 1d06c1fbca6d7c0af8bfd4cc0f4cdd1bd1f60fff32626fe74763bd6c3a3cff30d13588471ae3377db8b272233592250079dfec2150e62f30f2ba385451044701 SHA512 c8c1f11b82521343422e1d792c53ad2a9f101210df5e2bbd4767c1c5d7ef637d750fcc8e9e00544f8260c522d7a8463e2b1f4996c611accd0b66a73fae4b5232
 AUX sddm-0.18.0-Xsession.patch 606 BLAKE2B 0af5d0d6b8da47ead31b14ee6e21dc05e173765b64e74332c01bed2d44e6e5f3d3d67166cb460ffbbdcd0cae41d15883a9c4385b2ed242b858f337baa4e3f614 SHA512 19921eea20964f8f697e7839ce58c63412034ccae6db7d4acabddb5ca43523ccacaa8ba10dfe221d3241eeb5fa0f9ecbd205f10025afde4dc48d4106d38d140f
 AUX sddm-0.18.0-sddmconfdir.patch 1894 BLAKE2B aef497f08bd11c4fa4fdfe584b73b69192b875fde9050dbb39d6a0b1924759fedd5c50ed4fa54316f5cc9bb25c667c96eaaabce60d2acd826a4fb0bda2bb7495 SHA512 ebfb026ffca4f450005ecdc64c816720b0714ffcec7c03316148c7835919f01bb47c4c6e5041fcdbb271b70b38de99d74d959fd94b6c30b415159035b0d2b784
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
-DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492 SHA512 81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101
 DIST sddm-0.18.0.tar.gz 3526688 BLAKE2B 96db3f7b4745b7b5686c3c5e4353c99f175f28c99d329df3bc49cf41788257eaf823c6998b165de90e2150e34470e65ca69731375194072aae7583c8e8dfa811 SHA512 474be3fc159ca31cae409ef5263c47376d41f500d8b495fc7ef896ad0f1a599a5fea9a58d7df2874493dfd9230d0121cdd836ec6171774df2ce1639e8e4c652f
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
-EBUILD sddm-0.17.0-r4.ebuild 2372 BLAKE2B b17f693274d6d62724fbc42fe06b84bb9b35ecf0104a55d3ed6b3d9731520a7a1c498ab4179d7fc57ae54350a310527531c86c5aa3d13325aadba6c3278d675f SHA512 1bdeea78d6c7af3353a5aef8f1785ff239bd11d1984fabbdbc6495900c1b8d80e12cc1f7b6d0a9dd8fd6630d7f43a91f3a0ed62af3a0e214e0ace34266c05b37
 EBUILD sddm-0.18.0.ebuild 2781 BLAKE2B 987031023cf37e50acdcf97b715ac6b99b7835d066bb690680aa0db5bc76012e0ef57973eb473982a5e967005ef38456daf0cb689268a0099ce530a37acd929c SHA512 69d08114ded9191b0ec8df902edf900afb89d80dc6880ea6e081c77e0d87dfbca790fe2658d896cb34d938c6cd375593824f41d0f1d8bfdfdca20adff886f8e8
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch
deleted file mode 100644
index f341e1863f76..000000000000
--- a/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/data/scripts/Xsession	2016-08-28 14:52:04.910181422 +0200
-+++ b/data/scripts/Xsession	2017-10-21 15:25:47.668886596 +0200
-@@ -50,6 +50,10 @@
-     ;;
- esac
- 
-+# Make D-Bus and ConsoleKit start properly, see:
-+# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
-+command="$@"
-+
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f $HOME/.xprofile ] && . $HOME/.xprofile
- 
-@@ -94,8 +98,8 @@
-   . "$USERXSESSION"
- fi
- 
--if [ -z "$@" ]; then
-+if [ -z "$command" ]; then
-     exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
- else
--    exec $@
-+    exec $command
- fi
diff --git a/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch
deleted file mode 100644
index ca265d131454..000000000000
--- a/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7bd9f322182d840f3cfaee9a49f5cbd5f426aa1b Mon Sep 17 00:00:00 2001
-From: Erik Ridderby <tech@rby.nu>
-Date: Sat, 12 May 2018 08:04:26 +0200
-Subject: [PATCH] Fixed typo that prevents ConsoleKit to be detected (#1027)
-
----
- src/daemon/LogindDBusTypes.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
-index 79c70312..011bb7f5 100644
---- a/src/daemon/LogindDBusTypes.cpp
-+++ b/src/daemon/LogindDBusTypes.cpp
-@@ -63,7 +63,7 @@ LogindPathInternal::LogindPathInternal()
-         available = true;
-         serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
-         managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
--        managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind
-+        managerIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind
-         seatIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Seat");
-         sessionIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Session");
-         userIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.User");
diff --git a/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch b/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch
deleted file mode 100644
index a55702061c91..000000000000
--- a/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fca8c808b7fa4a947a0c60157f0eb5227b3ccfff Mon Sep 17 00:00:00 2001
-From: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
-Date: Mon, 26 Feb 2018 09:03:05 +0100
-Subject: [PATCH] Fix race between sddm and logind
-
-Make sure sddm is run after logind.
-An explicit dependency will make sddm run after logind every time.
-
-Closes: #978
----
- services/sddm.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/services/sddm.service.in b/services/sddm.service.in
-index df03d92a..9d7618c6 100644
---- a/services/sddm.service.in
-+++ b/services/sddm.service.in
-@@ -2,7 +2,7 @@
- Description=Simple Desktop Display Manager
- Documentation=man:sddm(1) man:sddm.conf(5)
- Conflicts=getty@tty1.service
--After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
-+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
- 
- [Service]
- ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm
diff --git a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch
deleted file mode 100644
index 35982bceda21..000000000000
--- a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Subject: [PATCH] Fix switchToGreeter not available without logind
-From: Alexander Miller <alex.miller@gmx.de>
-
-Seats can't be created until SeatManager's signals are
-connected to the DisplayManager, or the latter won't see
-them and switchToGreeter doesn't work. So split SeatManager
-initialization from its constructor and call initialize it
-only after all connections have been set up in DaemonApp's
-constructor.
-
-With logind there may have been enough delay before seats
-got actually added so things would work, but it's still
-cleaner to fix the order.
-
-Fixes: https://bugs.gentoo.org/644718
-Fixes: https://github.com/sddm/sddm/issues/824
-
---- a/src/daemon/SeatManager.h
-+++ b/src/daemon/SeatManager.h
-@@ -31,8 +31,9 @@ namespace SDDM {
-     class SeatManager : public QObject {
-         Q_OBJECT
-     public:
--        explicit SeatManager(QObject *parent = 0);
-+        explicit SeatManager(QObject *parent = 0) : QObject(parent) {}
- 
-+        void initialize();
-         void createSeat(const QString &name);
-         void removeSeat(const QString &name);
-         void switchToGreeter(const QString &seat);
---- a/src/daemon/SeatManager.cpp
-+++ b/src/daemon/SeatManager.cpp
-@@ -93,8 +93,7 @@ namespace SDDM {
-         }
-     }
- 
--    SeatManager::SeatManager(QObject *parent) : QObject(parent) {
--
-+    void SeatManager::initialize() {
-         if (DaemonApp::instance()->testing() || !Logind::isAvailable()) {
-             //if we don't have logind/CK2, just create a single seat immediately and don't do any other connections
-             createSeat(QStringLiteral("seat0"));
---- a/src/daemon/DaemonApp.cpp
-+++ b/src/daemon/DaemonApp.cpp
-@@ -75,6 +75,9 @@ namespace SDDM {
- 
-         // log message
-         qDebug() << "Starting...";
-+
-+        // initialize seats only after signals are connected
-+        m_seatManager->initialize();
-     }
- 
-     bool DaemonApp::testing() const {
diff --git a/x11-misc/sddm/sddm-0.17.0-r4.ebuild b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
deleted file mode 100644
index ba166f9c67fe..000000000000
--- a/x11-misc/sddm/sddm-0.17.0-r4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
-inherit cmake-utils l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.6:5
-	>=dev-qt/qtdbus-5.6:5
-	>=dev-qt/qtdeclarative-5.6:5
-	>=dev-qt/qtgui-5.6:5
-	>=dev-qt/qtnetwork-5.6:5
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb]
-	consolekit? ( >=sys-auth/consolekit-0.9.4 )
-	elogind? ( sys-auth/elogind )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd:= )
-	!systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	>=dev-qt/linguist-tools-5.6:5
-	kde-frameworks/extra-cmake-modules
-	virtual/pkgconfig
-	test? ( >=dev-qt/qttest-5.6:5 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
-	"${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
-	"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-	"${FILESDIR}/${P}-consolekit.patch" # bug 647254
-	"${FILESDIR}/${P}-logind-race.patch" # bug 656286
-	# TODO: pending upstream
-	"${FILESDIR}/${P}-switchtogreeter-r1.patch" # bugs 644718, 649888, 655912
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	disable_locale() {
-		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-	}
-	l10n_find_plocales_changes "data/translations" "" ".ts"
-	l10n_for_each_disabled_locale_do disable_locale
-
-	use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PAM=$(usex pam)
-		-DNO_SYSTEMD=$(usex '!systemd')
-		-DUSE_ELOGIND=$(usex 'elogind')
-		-DBUILD_MAN_PAGES=ON
-		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || die
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-	systemd_reenable sddm.service
-}
diff --git a/x11-misc/touchcal/Manifest b/x11-misc/touchcal/Manifest
index a9fba0954f67..fdad13199962 100644
--- a/x11-misc/touchcal/Manifest
+++ b/x11-misc/touchcal/Manifest
@@ -1,3 +1,3 @@
 DIST touchcal_0.80.orig.tar.gz 109075 BLAKE2B d33c60c25502fd4dd5af1264b15a88732e392afb6ee5a0d0cc163f5e310c26c2c968e662da306107124fd5528e045ea9042c2525f911e11cb0fffb3298eab5f5 SHA512 e4687eb2b401d16814b256c97725d0ef7646e3fa1fc020dc0af41486d6a959c968095b6d2131d6042791db37ee02fc6c9d7cf06a61722af1b4aca5e7c0a3618d
-EBUILD touchcal-0.80.ebuild 434 BLAKE2B 6e6715a14881a75147b1de26deb10a68eb4797e5d409fad50e7cdd4bee18ed69007faaffd9e9c544fe3f9757aee448d8439151cfe1124639abfc1e4c9feafa9c SHA512 0b54e31b5d702e01682c4ba2d90d19b1e75e03353c917772e8245c50f259c4b963a182e26b1a75757982a941c9cee4723a5364738254c6233d08d9c6d7a0ded5
+EBUILD touchcal-0.80.ebuild 436 BLAKE2B 8e543117429fafb4e6e93bed9ce069cb93cdeaee6435d39611a86f5e86b94e4dad88f9335f79fb8653dff1849e12e65dec48212efe9e70ac1c620888fc667ff7 SHA512 2104bc7e9f0fd1da35ce95dad2bffdba5363eab5a70d5c967baf75a6f646923311e74e9cb29f5deba3ea6dafe9f5ed6395f21a7facf5256fa70e32789fcc5499
 MISC metadata.xml 245 BLAKE2B ebe9520a9d0d939a66c4c1fe20f030c85f65af8acd55b823a037335957bad36fa7adf597f79d44c5d1475f4cf2caddb514e24739814a048906dfc83c5d6912f4 SHA512 a77a007ef0ae6b022a5d89748b262823a04305c08f618982472fe9e1cc5f59692516a4f11cab608ed4183f23e14de9c48a66ee2a1ac55479fd2a4cc7afeeba02
diff --git a/x11-misc/touchcal/touchcal-0.80.ebuild b/x11-misc/touchcal/touchcal-0.80.ebuild
index 43b2a16c3744..3f8ab64754e3 100644
--- a/x11-misc/touchcal/touchcal-0.80.ebuild
+++ b/x11-misc/touchcal/touchcal-0.80.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 999ebeba5bb9..645c34b81c12 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -2,6 +2,6 @@ DIST util-macros-1.19.1.tar.bz2 83274 BLAKE2B 014cf10cb1389809c4de793d28aa794140
 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
 EBUILD util-macros-1.19.1-r1.ebuild 701 BLAKE2B c8718b974072425244c92bae1fd5082cb8a7006af17218cd19659c38907d995da94d08fc512e52dbd9eeb7bac7103e3bafb2b6ff712cf9dc6921aee186c5ee06 SHA512 5ba39f90314dcb22b4a873915e1d953e8ef185941dfb5b9c9ef7b2e7f6807f7f39606750968961a805a8f2e83d4ca7e0d8d50035f70af91a412c1aee73eeb5a0
 EBUILD util-macros-1.19.1.ebuild 483 BLAKE2B cf7ad79fa74ce7a9f3d50a4f4981970d85e11029bc2d05a1f2d1ae3964088255bbbb14aa99339e6055d093a698191c73876d2c2379064df2936b7e2e1b6689a3 SHA512 6107a49a06da5d5f508528eb4d0cb92559e33f0944f690bbf412b0858f3e2d6629c2a2286ae521b55f769ab69d0338873be05182a55d7a44fcf9d357ead14c64
-EBUILD util-macros-1.19.2-r1.ebuild 701 BLAKE2B c8718b974072425244c92bae1fd5082cb8a7006af17218cd19659c38907d995da94d08fc512e52dbd9eeb7bac7103e3bafb2b6ff712cf9dc6921aee186c5ee06 SHA512 5ba39f90314dcb22b4a873915e1d953e8ef185941dfb5b9c9ef7b2e7f6807f7f39606750968961a805a8f2e83d4ca7e0d8d50035f70af91a412c1aee73eeb5a0
+EBUILD util-macros-1.19.2-r1.ebuild 691 BLAKE2B bfabd62a9ff7ec96cd78b9754a63cd4bb8d634b6dd17bd28b962ba326bed03aa48f007982321790cfbc1a956889debc81e2fa75c53afdc67840cc4442de0be6d SHA512 7c896019024c64992822e375264e7300d3f80001da2088a8f42ebea76dd3009845ff4322a5eef0d322bf406721ade417ff430f82b6edd2b8896f5f833fef7baf
 EBUILD util-macros-1.19.2.ebuild 482 BLAKE2B e4d3f9ca69f9f0a76a8e08c0afcb4a673cbbfdd38c7ad2ebe73104cae39f4c84d63c72c4de0e3e68ad5d146b313322b20967416f7922718f973ada9d90115284 SHA512 79d70e4ee32a706daf0884a5839fcec36b63ea49abe7b9da80e56b445af32d8c288170ceee9179cd70a57bafe20afb8cf9f3b5376aea57a980a345b504d904fb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
index dd326f167cc6..c0987abe7e25 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # there is nothing to compile for this package, all its contents are produced by
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 78bb76e536c7..87fa885119e6 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -2,6 +2,6 @@ DIST xbitmaps-1.1.1.tar.bz2 113346 BLAKE2B 2ecedf3208ca8d5e4802bccae0316e0dcb5ad
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
 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-r1.ebuild 674 BLAKE2B 87248ae5c46c14ee9f72fa4fd83aca1301e942559db4484d7bca9c621acc36c324d08b418f90d8ebb6d119237db413d58a54c030a376997f9a0f218e82c688b1 SHA512 85f126d695e25605aa371042ffda1a6488acaf00df555191f95b2ae7ea7487ed27b55e32670fb39ddc49c3d6609237fe97fa95410a9834c1fe1373fadc93b56e
 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.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
index e389753a928d..7af6e944ac24 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
index ac0363459a9f..44e13f6b4dea 100644
--- a/x11-misc/xcompmgr/Manifest
+++ b/x11-misc/xcompmgr/Manifest
@@ -1,4 +1,4 @@
 DIST xcompmgr-1.1.7.tar.bz2 136667 BLAKE2B 3231cca0cebc13aade6f008414d77461913d274303289c28b8eb366640905cf9bbb4715d5aa7ad8eb897ac94db099b040e408b2e3867dd2ad46940b3bcfe518f SHA512 f93a6be78169dd41ff08d71409e28746fd62902810a2f6930c0ac44f1415bc7391a8fb885b074fd40afedd7f1c1590aa7c67fc101c3b6488ddaa74495b42149c
-EBUILD xcompmgr-1.1.7-r1.ebuild 911 BLAKE2B 697a60c13fc12819fcd418e2b39325d2ca4b85a896296413144a195fcac821a40cf777096a8c041fe2884981ea9ba7e2aa6c9cd02640daa8acc0a2f3a096aa99 SHA512 6b9658a761f2b2ab10a60dad9a0b7345e569cac84ae158f339718455a2caa5449d8f435a8c887a8ec74732a2304756a1f706c76692021795c867d0a68998769a
+EBUILD xcompmgr-1.1.7-r1.ebuild 903 BLAKE2B c5ac0be9a22e015b681ad4fbf3865ac7ea8ddd2256db8963c968dfa78f9271919bf72226c55e9e26fce4aa06332c0e7d929536abe5f32b6c93b09196294a3c06 SHA512 d368887b90d71841045395bb5b9127690e024358422124493d9e518c7d34ab58345308f478b08cf400a784426d55806f95218f273117924b7246920d717e62a3
 EBUILD xcompmgr-1.1.7.ebuild 500 BLAKE2B d0876987205a64069657b80700578fc71c137f75a73b12034d1e2bb442eec8088682884c21a6b3cfaa353f7b903a7df22712fa3add2f30ede15a27c09565b7f9 SHA512 5e62cbc526635fff3dc68f8a0b038ed0e8197e675ffec37a3abb8ab8aed8666e0e5ad35522e8e6852ba1ac99bc5a42aec4a417d1a68a5aafbdefe5026a9b4aa3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild
index c271eab9415b..b563b993866e 100644
--- a/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/app/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ppc ppc64 sparc x86"
 fi
 
 LICENSE="BSD"
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 73c14eee274c..7a085fa2227f 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -6,6 +6,6 @@ EBUILD xkeyboard-config-2.23.1-r1.ebuild 1131 BLAKE2B c959f3a2c32887490d4e5723b0
 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-2.25.ebuild 1189 BLAKE2B 28da1b87ddede17e959e2e41334f008628c574a67c17338c3178eda168c02ff142ab8806e06de6503451065772d2eb96f44a69e73c9581446c322f4dfb8f1a0e SHA512 5f76c09ba657c602fab4337afceb1087629ef4caac8988dcc2cd877db264ed4ac63804d5502adbdcb20f87bb5130dc6fd259a192b2e8674017d90a34a6292200
+EBUILD xkeyboard-config-2.25.ebuild 1182 BLAKE2B 0f2f8dd9adc245080b1f690bf28cffd99cbb1e11759cd99f470988bc433317709f3b2e646fc898697c428daa0b653ed0d055d0aa4ad6991a0798c6cae07068e9 SHA512 0ba5b4ed1ac1365038f0eb6678f6d36004ad119e1f94451ae3b4a295f7ad6085377f73440509cd22cc4274711538e59c937946dbabe2b454f9ea880f70718700
 EBUILD xkeyboard-config-9999.ebuild 1189 BLAKE2B 28da1b87ddede17e959e2e41334f008628c574a67c17338c3178eda168c02ff142ab8806e06de6503451065772d2eb96f44a69e73c9581446c322f4dfb8f1a0e SHA512 5f76c09ba657c602fab4337afceb1087629ef4caac8988dcc2cd877db264ed4ac63804d5502adbdcb20f87bb5130dc6fd259a192b2e8674017d90a34a6292200
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
index 9c806160acaa..caac1366e392 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.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 ~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 41ae867e3bde..c7503475f753 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 2113 BLAKE2B 6df86cba5e6698f93c04be474d11d62d62b8a96cca53771cf57dea77e11e8fd0f8dde5aebe9898c51305859c000d6da1f978ca8d1b053de32fedc0317e720336 SHA512 f18e31812539ca4a75550f8dda2c8b504d547cf491c17568fd0406395ad97534fca5cc5a5c234bccfdcba5fc24d24c4e8553ccdff3c2fe6d29184910e092005e
+EBUILD xorg-cf-files-1.0.6-r1.ebuild 2103 BLAKE2B 8eb901e84582c25e39761d3b696baca9289cccecc0a99a53ce1c9c3cc61b67f92396cfb49e0b880c180bd0c87c3ac7e598d682b6021142052bd717d95114914f SHA512 2e5cc3c55b172a28b98b30397c463901e3440e122c0f9286c22aa1a88d1ed0a21ddd8e84296c9eebe0092fc42aaee58ed64cec2ab33f3fd035a9aca6ba27ba78
 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 a23c241bdd8d..2dda467e5bf9 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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="