gentoo resync : 22.10.2018

54 files changed, 261 insertions, 854 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0c1244f75bb6..bb36ecb23fe2 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 654669a4e67e..6147ea09b773 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,7 +1,8 @@
+AUX albert-0.14.22-qt-5.11.patch 703 BLAKE2B bac316c4a75d1bed79517f4e25c7844c5e3671f85051a9654c31a1337dbb692c6f52b2adee38c0ede081b0230db0c1cb4e963e875cfae717fc98839180dfd42c SHA512 e27bff9359ae9b3c7ee1be0ab1098073ccbaef65eca316351c63c616a4772be73cefabb9ee62f9b79238eb039520d89f4aecc79eca5f0bda7490e231000490eb
 DIST albert-0.14.21-plugins.tar.gz 538315 BLAKE2B 84c482bd2c9a7dfe38927da4531727a361014d0a8f6e4da923904253d5a322c37837f9eb7873621fd55581be7b0c1c7149b005f7729606444a9fc8b8e96b70fd SHA512 ae680b3ea8292c49858d029a16fb3ee6b5c33a96351afb9e962538ebb4d39fd5b862fe6da5592b03bfdc3c9622671a0d1140d6924e36ea2b67842490ffd102b0
 DIST albert-0.14.21.tar.gz 85541 BLAKE2B c8ddf61f3f001e92b3c889c8a3b748cb45ccf06896c990f1937484917496cb78510c17b479e61af8fbfc13c2ddc84ede7f70de15e09246c7dca4876eb644b910 SHA512 dc1e1121abb3534d32775cd8c8e3b832c037e997588b7e0d7356d933f6a1d15c669c3f0362c9c2bfb37256d80cef4175c9c8d22a095b5191453a44e0f20f9cc6
 DIST albert-0.14.22-plugins.tar.gz 540446 BLAKE2B 22cf69698614a1b0e97fd1f5e3224b9097141c4a32c7999b9468c3c59b6af0d7a753de59a7abeb07f9ef9655abc05b8cb5e5079c9b41eb9f51dc09291b89b635 SHA512 4cce6ad717991a6a2293b491f17838a01ba51e4222deb78d5b793ab3390692131f4938027b96863c6cd61ec7a764fa6d52b3c3ef33cadd3183b2fe1498b6d344
 DIST albert-0.14.22.tar.gz 84925 BLAKE2B b009bd0420f2e5894e2e71e526361c6b177ceb0ed9339efd276228e3cb8aed52eba811b8f2f6ade8f39357017458f2cbfddec25f0df4de8d12397451bd98cb57 SHA512 91c131140f666dda665e07e617ce0d2af5c776233f9cf1430aedfc18299dcc22c6dcdec4d82f15fc2d81fa44679f9d3608a47128d33bfbddeb97481b430608c8
 EBUILD albert-0.14.21.ebuild 1364 BLAKE2B 23c4f8216726ada93c05fdf7b951102ba6f2d940b7ee6300dbd319014f7141bcffe56c8ae2d1e97a234f88e71ca77363a9077dc509222f4a1a3c4a9466fa7dd0 SHA512 2228e31c4f9a751fccc113c85e78e29c49fcc82fcdf8e5c33fbf691cc9eb4edad7b5703ab82d1f1227c97a67f44a151a0cd99f48e11c9b3431a6518a90ee0cd6
-EBUILD albert-0.14.22.ebuild 1365 BLAKE2B 59bcced9cbba35cd9baf10c9aa6cd7e4ea819fb703fea3becfb8958d0664e3baffe9ad2286ec583ba2470e7b5ef3e780b6523b6e34cc7891f835319798b058f6 SHA512 222145e57e28fb5b12951a58d50f14a9ab3ce1a593956ff995d304ffac36d1d7fb1410d81ec31018671c893a4892f39ef30a3861849ee65366718a2808eb4eb6
+EBUILD albert-0.14.22.ebuild 1408 BLAKE2B b9cc7d816da0aa763e9fc9f04b835c734a5c3c2cb5bb6c7a80224a57c3536094fc463a33ac15a0ae999ee2a084b1107cc97e07cb12ba5a6668fe7e9dc279cd03 SHA512 62191f1b9a94682e602566d276f901e9b67a702a8446f94f51db54aa55e16f3c662c08bf25ca1616d0db1eb54302d64af3d67e17d7f8e2914100557985d75a2c
 MISC metadata.xml 307 BLAKE2B 8113fd9d5c144840eca96ffa19f81d1406343eb5fd60030739bce0a1fe3b469dfbda7066137a3347a4743abbfbbbb08a61712ca2fd681dd6f60e8d7f166336c7 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a
diff --git a/x11-misc/albert/albert-0.14.22.ebuild b/x11-misc/albert/albert-0.14.22.ebuild
index 3eb4aa9e5eb3..7c672bb96f35 100644
--- a/x11-misc/albert/albert-0.14.22.ebuild
+++ b/x11-misc/albert/albert-0.14.22.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=6
@@ -34,6 +34,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_prepare() {
 	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
 
diff --git a/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch b/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch
new file mode 100644
index 000000000000..1fa8a2fa7126
--- /dev/null
+++ b/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/666998
+
+From 97fdca06dc7f82c92e5bb71e05f4fd7e74bbc616 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 11 Oct 2018 23:09:51 +1100
+Subject: [PATCH] Add missing include.
+
+---
+ lib/albertcore/src/core/telemetry.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/albertcore/src/core/telemetry.cpp b/lib/albertcore/src/core/telemetry.cpp
+index 1fd6b06..09b7713 100644
+--- a/lib/albertcore/src/core/telemetry.cpp
++++ b/lib/albertcore/src/core/telemetry.cpp
+@@ -2,6 +2,7 @@
+ 
+ #include <QApplication>
+ #include <QDateTime>
++#include <QDebug>
+ #include <QJsonDocument>
+ #include <QMessageBox>
+ #include <QNetworkAccessManager>
+-- 
+2.18.1
+
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index dabaf307fc6a..a2437633cbba 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,3 +1,6 @@
+AUX i3lock-2.11-version.patch 395 BLAKE2B dee64a9c8b255e3cbadd27419929da66a8fe66c097dac64ada091d78d900595cd32645eac912eaa151b11fa565cbd4d613502e218cef8d118892bf7455fb0749 SHA512 26bffc363d833a6c7049bd6cc0b05d6d2e737dce184e0265d67949f04371c399f41cc54e7071a63d1bffec5d9166aa7c4a4d0bb8fc3fe6b67cb1366963dc08b0
 DIST i3lock-2.10.tar.bz2 23171 BLAKE2B 1c1d0f8e3a85dcebe4a9ee181e399a4ff447ececfbdf5f9488df849316e47233118b7436c269a986fed4e907e6162f3758c8bdad2d20ac156e95a8be185a744c SHA512 ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517
+DIST i3lock-2.11.1.tar.bz2 145434 BLAKE2B 9a2ff0be922162710f9dbbf597f93ad939684641d2264c6ed38dc8a7eeb77c253f61aa1a2e873f03de2c8cc6d661e79ff166e4302c423261a65f66582749c962 SHA512 8b779aa0a560884adc1a508e1f07f712bdf043f72c377c24d5e7e186a6b97f34a5bda7aa67de41f5e15a1a541f4a2c2d28bc284057926a5833d70b67437d073c
 EBUILD i3lock-2.10.ebuild 670 BLAKE2B d0da8763dd30fc3f354176f3c1d8e0ec2bc0758c4a732c485cdcb9b6510445644117a3b3bff77a78e2eb5c45df09b948e75c8fe186888baabad0d3e06d3e9a2e SHA512 1e77903498fc04b1f8daea6ceebace300dffa77eb97156c33e0be880cc73dfdd89827bde6ee1db23d83f23f8b9466b3520cfd6f9ef57397d515fa1a785e5fd14
+EBUILD i3lock-2.11.1.ebuild 789 BLAKE2B 612927a6c0f810b9516070a650dddcb67571ca544dda01c99e574df67013364cfb3defd3bc2bcb2dfa7cbcef57f618a13628f6ad9fdfdc9b4e64435b46ab4a27 SHA512 3891d25eb3dcd515356e2892fb6f0e1404de3c83c9d6070cecfddc4be9ef1e1b42494768cf35c25d897167b7f85055ac284f3ff413ffc9be1991f3eb023eb14c
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/i3lock/files/i3lock-2.11-version.patch b/x11-misc/i3lock/files/i3lock-2.11-version.patch
new file mode 100644
index 000000000000..df133cb91cdb
--- /dev/null
+++ b/x11-misc/i3lock/files/i3lock-2.11-version.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@
+ # Run autoreconf -fi to generate a configure script from this file.
+ 
+ AC_PREREQ([2.69])
+-AC_INIT([i3lock], [2.10], [https://github.com/i3/i3lock/issues])
++AC_INIT([i3lock], [2.11], [https://github.com/i3/i3lock/issues])
+ # For AX_EXTEND_SRCDIR
+ AX_ENABLE_BUILDDIR
+ AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2])
+
diff --git a/x11-misc/i3lock/i3lock-2.11.1.ebuild b/x11-misc/i3lock/i3lock-2.11.1.ebuild
new file mode 100644
index 000000000000..2df68dac048d
--- /dev/null
+++ b/x11-misc/i3lock/i3lock-2.11.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Simple screen locker"
+HOMEPAGE="https://i3wm.org/i3lock/"
+SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=x11-libs/libxkbcommon-0.5.0[X]
+	dev-libs/libev
+	virtual/pam
+	x11-libs/cairo[xcb]
+	x11-libs/libxcb[xkb]
+	x11-libs/xcb-util
+	x11-libs/xcb-util-xrm
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+DOCS=( CHANGELOG README.md )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.11-version.patch
+)
+
+src_prepare() {
+	default
+
+	echo ${PV} > I3LOCK_VERSION
+
+	sed -i -e 's:login:system-auth:' pam/${PN} || die
+
+	eautoreconf
+
+	tc-export CC
+}
+
+src_install() {
+	default
+	doman ${PN}.1
+}
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 8544aa902d94..a79b5fcc549b 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,8 +1,6 @@
-DIST libinput-gestures-2.31.tar.gz 15872 BLAKE2B 0fe671f50ee6e7b06362591d68d259587347794c80df27c73d833e459eb9499ae919bf3e4f12e1dfc2852fd9b70c3962963f3a291107bab8ea0a8f1576dddde4 SHA512 fc3c90025486c8da5b2419f99666737dca40dfc962a549bd1955ea792137a1377a9697c8cab908991503fa9dd6d72520a04ac2dbc9463bc228566569be43ca67
-DIST libinput-gestures-2.34.tar.gz 16321 BLAKE2B ae1fc850a075fd0b8e4aec6b94f0257f10f309a28a4893aad608eff59afede28b4126734a14f510ca569f64d79492461000dfca8c34e614a5e99839f3c5d952d SHA512 47ffa36b9abb01e62a046d1135cf3ec2773285f94ba68d66c03f877b6acf057491fb4a7645198d8c3bde39e38e12e039f3b10c6987d5765798d969d23359269f
 DIST libinput-gestures-2.36.tar.gz 16598 BLAKE2B 3c30408ce394cf8bbc5a68c5f37c9106bb481ad47c75f25bfbba7470da0cbfb330512fe0422588408f177085c23a5cf0379c13a49c9fce438e8d8b1179c91d50 SHA512 69f77d0681f37deee3f215e71e4410d5c45107d2d0a1addb897de14d7f83bcb3e2285ed9ba605f30db23441a9d7bc9a6960b2a49d53ad71a379d0b874d36d645
-EBUILD libinput-gestures-2.31.ebuild 1017 BLAKE2B 611b39ec192cc040fd79ef4d262fc15ee31515ebafa478d1a406f64b4da6d32679945d5e0554df832a73cc7ed19c1cc41e830205f3fbced34f40c54f44542a7e SHA512 26486d673e801c4af689661765eca932cc46bf1abc68f67038455ccdeef036bed0ec579bebf3bb6abe74f8daaf12df9772d9e938bc70de314fc3a23fd68ec9a7
-EBUILD libinput-gestures-2.34.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
-EBUILD libinput-gestures-2.36.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
-EBUILD libinput-gestures-9999.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
+DIST libinput-gestures-2.38.tar.gz 17054 BLAKE2B 037d095674df9b00c9d23762745d35beaab03d0f5b361030a9177f84c540ef2ef45fb6fa4b9fe80a6500c81a8973aac46019931d8a548b02a6527ba09ca1fc13 SHA512 3152bcb0fd78551be14dda23fdce9f9216fc56e7a2dc4734b73949b4bd9c87fe6c9e2fc95f65a328b46c577abc05889a3a6290c6eb9390a94d9eb254c2fc7550
+EBUILD libinput-gestures-2.36.ebuild 1369 BLAKE2B 480f4582ae605fe66662eddee2172b15542055c03ee85bb0b12c3bb4e6dca264860b6a3ef50006c016f8f13e1245ec9a495c87afd4dd169465e9b5eb084401d2 SHA512 3ff9eff82d180809d1fc802d93ac647e1333d8e1bbc0f155a2888a34257b618e667874a99f0ea42bfb0c09d21c0d2f358f69ba8a53b12ab72bdeb5033ff80d1d
+EBUILD libinput-gestures-2.38.ebuild 1305 BLAKE2B d324f46c616f20588614678f741383cf5e2dc7f916f82e493bf282cfc4a9be6a0f2abebb7c819831ce6ed5a9fea30e009ec71ea323f66e44d614ad4c28d2c3e7 SHA512 f552a25ee6da9a229bbd1002dd905c6bfeb5f435cbefc9c549c5047f3faee1fa06b4c4f0bfa341c2c658a0c8aae5f29a03da456cdb6e4517a52ef8dba8474f3d
+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.31.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.31.ebuild
deleted file mode 100644
index abfc20a74249..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.31.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
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit python-single-r1
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
-SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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}] )"
-
-pkg_postinst() {
-	elog "You must be in the input group to read the touchpad device."
-
-	if ! has_version x11-libs/gtk+:3 ; then
-		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
-	fi
-	if ! has_version kde-plasma/kde-cli-tools:5 ; then
-		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
-	fi
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild
index 39fb049c736d..a2cf956e87db 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild
@@ -17,10 +17,11 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/libinput-1.8.0
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.34.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.38.ebuild
index 39fb049c736d..87acd6131454 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.34.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.38.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python3_{4..7} )
 
 inherit gnome2-utils python-single-r1
 
@@ -17,9 +17,9 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-IUSE="test"
+IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -27,8 +27,7 @@ RDEPEND="${PYTHON_DEPS}
 	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
@@ -37,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/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
index 39fb049c736d..87acd6131454 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python3_{4..7} )
 
 inherit gnome2-utils python-single-r1
 
@@ -17,9 +17,9 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-IUSE="test"
+IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -27,8 +27,7 @@ RDEPEND="${PYTHON_DEPS}
 	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
@@ -37,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-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 42d6dabc038c..4380a3fd9331 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,10 +1,6 @@
-AUX lightdm-gtk-greeter-2.0.1-gcc6.patch 512 BLAKE2B d694ae119437b12ad13f94fcdbe6b18ea14f84de507ddcb602b081af6f22b3406e7e3c1cd67059cfb6bcba942c943133aed660fa84bb53eea492044b6553d67a SHA512 50ad27370f0ea355c27bc91d3a1c2df234dd7bb39e2763d37b93ed5ebdb69bf79be65b07a22fbe94cd3f2945cd4672ef4f97a2862ef15d245a7d0b2d2f7ff009
-AUX lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch 2129 BLAKE2B 5f6d70a42a986c7da34c563487583a2b520bf6f56208a4fac9e5aa0122a89135a5eb007f160464a6e0f7f94ab33e308e16e3004d95f34e0b07d88d06269336ee SHA512 70bbed98680f6cb6746b4d4cb2ce113d6900373fe701c72a95e70e890e700b337b2ef6f7283bceeb22cecc3098f2cd94cd917bc0c21d034bf2e19be0688f62a4
 DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
-DIST lightdm-gtk-greeter-2.0.1.tar.gz 467375 BLAKE2B 9b6e4c597b0dcace770609f7bbe55dac627445b609619b7965566e964f1584bb75ed3ff7d45567dbdded5fb777578043990b9f8ba6f17d27951adf222740cee8 SHA512 fd41cae828f7feafb462143519500d0d98a8b6729eb5ffd9be4247d47fa0074fa00ac9892c8cbdda9d7656e9d6949ae65e69911ae911269e99e80e4fefb19a08
 DIST lightdm-gtk-greeter-2.0.5.tar.gz 571189 BLAKE2B 583e75b1d621ffef4ade7e65fb3ab4891a119f1d416c8011a80d06e1916ecb5903f4c1af432052cb05a72aa38cde38293dd90eed00295fec5ff758e78576e10e SHA512 1ae31a36e19a2e8825bb0bfe4eef51f317306636bc0f14df9ee4c89c81d60ce7193d74e053ce59ae50c6fe05d27be73fb5a83cce732a0df4a3b4390539418fad
 DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
-EBUILD lightdm-gtk-greeter-2.0.1-r1.ebuild 1759 BLAKE2B 73e02d31e97346a014eb288309af245764e490fe37c51e274392435bd36e1c4ac1c56c3ca6ff2c53cae1a2ee1a540c3e8ab9dc6e9c9fb048ddb1bd9b14cd6e28 SHA512 b5c7c28333f7d09b9984e4bc26692919662e5a2e4b66bfc5683c1d8c5ff2e4f7733e9b544e6091f0f903eff993394665df6babdbaa18caea758fd782453e0f33
-EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2085 BLAKE2B 5b74f1788e563c1b32615df7d1cb37f54cabe2d2e1420df73805e52ce32b31cf228334f7188bc6a0bcd586a47f8d50c1ae49577fa1dc34eb48ff29dc0202a1f0 SHA512 88497f45067513784612497866e0029927116f1fed2c9eb4de09f68e9244411742d45ea0b7b8bc757805d45c2a22b21fee054ad248ad7651b459a55c9afc2628
+EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2084 BLAKE2B ff426d325619f5c5cfa3743489f1fec4d1aafbe069aab8b1161e3fd725fd952b2964c4e359cfaa5f84634670c61121be2b136c8ed14d55ecf377cbdbdd0fdfc9 SHA512 d4b4f3abc92be4cd211603a976ace4aafb6442c837e3b2d6edb03849cf4da860c47abaffcd342843915cac26d147930b3a5e6ab72bedc218b89519ad14dac405
 EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2070 BLAKE2B b02fa7a18a45fe31a7e94ddef55b037dd0ebaa40513d38b132ce4312a150e797b43fcdc348cddc578628cdc96655916697287166a55568d920b4c9462623da04 SHA512 0a2d0a5dd3af18c833b0e948690d1382828f8178f19df5db36b5b2bad53c6ef35b89d2dc39e0847a31913ea854750037f52c206ecb20ac388aca46864f0ae03f
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch
deleted file mode 100644
index f72a93abfc1c..000000000000
--- a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=619782
-Upstream commit: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/349
-
---- a/src/lightdm-gtk-greeter.c
-+++ b/src/lightdm-gtk-greeter.c
-@@ -677,6 +677,9 @@
- 
- /* Clock */
- 
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-+
- static gboolean
- clock_timeout_thread (void)
- {
-@@ -697,6 +700,8 @@
-     return TRUE;
- }
- 
-+#pragma GCC diagnostic pop
-+
- /* Message label */
- 
- static gboolean
-
diff --git a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch
deleted file mode 100644
index 81f158b2176f..000000000000
--- a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=627208
-Upstream commit: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/350
-
---- a/src/lightdm-gtk-greeter.c
-+++ b/src/lightdm-gtk-greeter.c
-@@ -1937,11 +1937,11 @@
-     {
-         gtk_widget_show (GTK_WIDGET (username_entry));
-         gtk_widget_show (GTK_WIDGET (cancel_button));
--        lightdm_greeter_authenticate (greeter, NULL);
-+        lightdm_greeter_authenticate (greeter, NULL, NULL);
-     }
-     else if (g_strcmp0 (username, "*guest") == 0)
-     {
--        lightdm_greeter_authenticate_as_guest (greeter);
-+        lightdm_greeter_authenticate_as_guest (greeter, NULL);
-     }
-     else
-     {
-@@ -1961,7 +1961,7 @@
-             set_language (NULL);
-         }
- 
--        lightdm_greeter_authenticate (greeter, username);
-+        lightdm_greeter_authenticate (greeter, username, NULL);
-     }
- }
- 
-@@ -1983,7 +1983,7 @@
-     if (lightdm_greeter_get_in_authentication (greeter))
-     {
-         cancelling = TRUE;
--        lightdm_greeter_cancel_authentication (greeter);
-+        lightdm_greeter_cancel_authentication (greeter, NULL);
-         set_message_label (LIGHTDM_MESSAGE_TYPE_INFO, NULL);
-     }
- 
-@@ -2017,7 +2017,7 @@
- 
-     language = get_language ();
-     if (language)
--        lightdm_greeter_set_language (greeter, language);
-+        lightdm_greeter_set_language (greeter, language, NULL);
-     g_free (language);
- 
-     session = get_session ();
-@@ -2238,7 +2238,7 @@
-         start_session ();
-     else if (lightdm_greeter_get_in_authentication (greeter))
-     {
--        lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry));
-+        lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry), NULL);
-         /* If we have questions pending, then we continue processing
-          * those, until we are done. (Otherwise, authentication will
-          * not complete.) */
-@@ -2331,7 +2331,7 @@
-             }
-         }
-         else
--            lightdm_greeter_authenticate_autologin (greeter);
-+            lightdm_greeter_authenticate_autologin (greeter, NULL);
-     }
- }
- 
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
deleted file mode 100644
index 0a245234b38b..000000000000
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit versionator eutils
-
-DESCRIPTION="LightDM GTK+ Greeter"
-HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
-SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz branding? (
-https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3
-	branding? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
-IUSE="ayatana branding"
-
-COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
-	x11-libs/gtk+:3
-	>=x11-misc/lightdm-1.2.2"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-themes-standard
-	>=x11-themes/adwaita-icon-theme-3.14.1"
-
-GENTOO_BG="gentoo-bg_65.jpg"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-	if has_version '>=x11-misc/lightdm-1.19.2'; then
-		epatch "${FILESDIR}"/${P}-lightdm-1.19.2.patch
-	fi
-
-	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
-	# I will fix this once I decide to update the tarball with a new gentoo
-	# background
-	# Bug #404467
-	if use branding; then
-		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
-			"${WORKDIR}"/${PN}.conf || die
-	fi
-}
-
-src_configure() {
-	econf --enable-kill-on-sigterm \
-		$(use_enable ayatana libindicator)
-}
-
-src_install() {
-	default
-
-	if use branding; then
-		insinto /etc/lightdm/
-		doins "${WORKDIR}"/${PN}.conf
-		insinto /usr/share/lightdm/backgrounds/
-		doins "${WORKDIR}"/${GENTOO_BG}
-		sed -i -e \
-			"/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
-			"${D}"/etc/lightdm/${PN}.conf || die
-		newdoc "${WORKDIR}"/README.txt README-background.txt
-	fi
-}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
index d0278ccc4699..199f3d937304 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="ayatana branding"
 
 COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 40729a78002f..a2d3fe7b6d73 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,16 +1,10 @@
 AUX README.gentoo 494 BLAKE2B 8a92171cbc9e8a93cc5e73101bf478b27945e85f843ef244daea881f0aa061820645c425e52dd6a75adc0bd09c95126a059694bc7d5f6084e4f0222fc5e8ab85 SHA512 07e35ef0ac603b2b817c33fd2bc06b9b254a2e3fee16e7ec8fc0c86d27330c795b8d1eae660c42c414de4d721faea2cab1d41c5950ca7a1032d758626011ae3c
 AUX Xsession 1819 BLAKE2B 3d0502ca0d353c4bf16aec063dacde3a57da0062595821aaebd783fb568368b540cf1dfb2f9f888b3131238abac70e970081e59fed74e19f2380729c7f3de2b4 SHA512 f1f9264ef6103e66ced2d94bdb24dafb71a37ed8286b35536fa992d774f288bb9b8e338e184c955b39f0448da91af5d7c2d12c5536521186d8ee5db832e20e7e
-AUX lightdm 257 BLAKE2B e5923b3bfa6bd72078163347b54d1ab51ad0f46d4cb1de05dcd3efbaa62405206c8610ec23dde727f0c820afbcfca09f1fca4afab38e37f6793117b505941d34 SHA512 b7d08013758d8755eb015e64dc67d58cfe13006c4ccfa7f22d795233b932888a36fb2ede938db619f718769cb4c836e960385c21a5a16df5e7235550148eb6f3
 AUX lightdm-autologin 155 BLAKE2B 0236489d922c07cc84e17b403e746af052b9fcec1671c4b41184a26399ff8b310083c17959327eb752f8ff9ada04a7ff012ed6708c7ff50324dd0a3cef42efd8 SHA512 d09be0a61b7eea18a5c5977182362226e82a39b238c401f636bdf0a83381b97a16efc19e67be10b76854c95186dd65f539431d2352ce87a4e35dd1d40e388064
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
-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 3863 BLAKE2B 3b9b8f07798911884e83c357c0ad96c0f84057f9e77f3c1d183daf41b2f9c82a93260ecb1d6604b6bff42fa7f351cad07f637aeb356f5a2c4ba025c74fa62795 SHA512 3b1c19fec5028778e074170bf0811fc2ec089b0fbf7ab3911bad1813a99151ee7f7a8cddfcbd5c5651b69f9bd36fcc0d235ad48a1068526cc63de80f54eef26e
-EBUILD lightdm-1.26.0.ebuild 3780 BLAKE2B bf14b85e4a808d3f0743135c325b5c91289ff80097ac22d968942e520551c8a6176e02a4444032ab4cd917d6c2a264901ba517918baa2d78d24e48c72bbba390 SHA512 6fdeac35cfab56c7df81cbd393b1eca4b39114087593731dcd340c9bb30781404c2365d448002c30f863a9441d3709d0984adaa638740bf1b2facce440cb789e
+EBUILD lightdm-1.26.0-r1.ebuild 3862 BLAKE2B c5eb278cb20a1a0c5ccf12c1a6b2a318ef1b8fe6aa166336d479420acc4ff30ceb8cdb2c8ef0dc9f6e18f265ee61ef383e771cbb032357a4737f726f0726f39d SHA512 8244d0ecdc706273d3735da5846c27bbad57e5319b0fdbc6d941378c83d5ba2107886016bc914d886f4c7b8acfb0d9d0bc5c87e8367265089387b56548e7ae45
 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/files/lightdm b/x11-misc/lightdm/files/lightdm
deleted file mode 100644
index 6286d6ab4f66..000000000000
--- a/x11-misc/lightdm/files/lightdm
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth       optional		pam_env.so
-auth       include		system-login
-auth       required		pam_nologin.so
-account    include		system-login
-password   include		system-login
-session    optional             pam_loginuid.so
-session    include		system-auth
diff --git a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
deleted file mode 100644
index 2cd6c3cd5cd7..000000000000
--- a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils
-
-TRUNK_VERSION="$(get_version_component_range 1-2)"
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${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 +introspection qt5 +gnome"
-
-COMMON_DEPEND="audit? ( sys-process/audit )
-	>=dev-libs/glib-2.32.3:2
-	dev-libs/libxml2
-	gnome? ( sys-apps/accountsservice )
-	virtual/pam
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5
-	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
-	gnome? ( gnome-base/gnome-common )
-	sys-devel/gettext
-	virtual/pkgconfig"
-PDEPEND="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 -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" 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
-}
-
-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.
-	econf \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-tests \
-		$(use_enable audit libaudit) \
-		$(use_enable introspection) \
-		--disable-liblightdm-qt \
-		$(use_enable qt5 liblightdm-qt5) \
-		--with-user-session=${_session} \
-		--with-greeter-session=${_greeter} \
-		--with-greeter-user=${_user} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# Delete apparmor profiles because they only work with Ubuntu's
-	# apparmor package. Bug #494426
-	if [[ -d ${D}/etc/apparmor.d ]]; then
-		rm -r "${D}/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
-
-	prune_libtool_files --all
-	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"
-}
-
-pkg_postinst() {
-	systemd_reenable "${PN}.service"
-}
diff --git a/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
deleted file mode 100644
index 21d21a811118..000000000000
--- a/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils
-
-TRUNK_VERSION="$(get_version_component_range 1-2)"
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${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 +gtk +introspection qt5 +gnome"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.3: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 )"
-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 -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" 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
-}
-
-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.
-	econf \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-tests \
-		$(use_enable audit libaudit) \
-		$(use_enable introspection) \
-		--disable-liblightdm-qt \
-		$(use_enable qt5 liblightdm-qt5) \
-		--with-user-session=${_session} \
-		--with-greeter-session=${_greeter} \
-		--with-greeter-user=${_user}
-}
-
-src_install() {
-	default
-
-	# Delete apparmor profiles because they only work with Ubuntu's
-	# apparmor package. Bug #494426
-	if [[ -d ${D}/etc/apparmor.d ]]; then
-		rm -r "${D}/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
-
-	prune_libtool_files --all
-	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"
-}
-
-pkg_postinst() {
-	systemd_reenable "${PN}.service"
-}
diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
index 8d4e3781fef1..427dd1c1e1ef 100644
--- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="audit +gnome +gtk +introspection qt5 vala"
 
 COMMON_DEPEND="
diff --git a/x11-misc/lightdm/lightdm-1.26.0.ebuild b/x11-misc/lightdm/lightdm-1.26.0.ebuild
deleted file mode 100644
index 4d2efe7088f5..000000000000
--- a/x11-misc/lightdm/lightdm-1.26.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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 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 +gtk +introspection qt5 +gnome"
-
-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 )"
-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
-}
-
-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)
-		--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"
-}
-
-pkg_postinst() {
-	systemd_reenable "${PN}.service"
-}
diff --git a/x11-misc/notify-osd/Manifest b/x11-misc/notify-osd/Manifest
index 9fb87c91a293..49caf93096bb 100644
--- a/x11-misc/notify-osd/Manifest
+++ b/x11-misc/notify-osd/Manifest
@@ -1,3 +1,3 @@
 DIST notify-osd-0.9.34.tar.gz 635387 BLAKE2B 469369f9fde562c605c131608b56eb54ea2a5f3d16f530e5b383d04fd8de2fbd531b58ed43caceeaeef65840cb00917484c02f8af0d7a0fc464ab131c1193853 SHA512 60ca63c2041f129d5139537242c2260908cedef633df977a608e19dcb01b75b2280ec80abe2b6da5eff76621107ee9d294742abfae301bc24eaa3aa855c56ce1
-EBUILD notify-osd-0.9.34-r1.ebuild 1485 BLAKE2B 718cf2009f2f6d4831037a8d222eb3330ace30b4bd07311f204a6335a269d49199d6b668fd10d9caee1d3b3758a92e0c5f89547422644342da3d99ef8603f8fe SHA512 1c7d9067cfb61eb8627a47bd8a0be03c30e031e1f946a7757183cc6d51652dc22ca7502a548b4f21a363f0131bb2ecbe9e51ea0f4809ec347eba126fc3aa90ea
+EBUILD notify-osd-0.9.34-r1.ebuild 1503 BLAKE2B b59b0bd60fcb8c299121cbd5feaff737bc7c610082c5ad6fea5e883bb1160a18f265b11282d611bc244aab61644bb06691df4200944b9a649e3b53e63a09360c SHA512 cd212fdeef62bf4c45a24bc895d5512437a13649aa92930fc16746d71acd0961a30b02017c16e58d491d427c62d7fd33b20277b5216113ec9b0ecc9a30160795
 MISC metadata.xml 250 BLAKE2B 138c4f4c717e9e24abf19f3d4cb9a8a8b49761ac301ac26b527c86802bbc509a4afd2678adb71bc3a9ef3d0ea17438d57d03211627bcf6ace221f08f39151f56 SHA512 0bed48908552a27396c77549264bbb7516677909afdecd967cce446529ea944c8f9ddf167241a033ca790123be27f8e3a4c503954100f9ea076f40b8ef5b0209
diff --git a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
index d94dd9b86c08..6a1096cc8f5b 100644
--- a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
+++ b/x11-misc/notify-osd/notify-osd-0.9.34-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=6
@@ -29,9 +29,10 @@ RDEPEND="${COMMON_DEPEND}
 	!minimal? ( x11-themes/notify-osd-icons )
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
+	dev-util/glib-utils
 	gnome-base/gnome-common
 	x11-base/xorg-proto
+	virtual/pkgconfig
 "
 
 RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index 6d4459ac051b..316043ce787d 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,5 +1,3 @@
 DIST obconf-qt-0.13.0.tar.xz 34348 BLAKE2B c44a79f4c70d07907ee4332ea75267b1b9c000371ee4d53b8db9eb9c624c6bd62a739413b8cf4038a514a1417ebbb8318c791bda2774d7420ac8a7b8b211d09f SHA512 537c10e286311d39f3e69c2940f4267d7dd2e55888e1e50d6aeb3cad8f694fec7792ca30e258a69cfe0c5361acecd4232605e47e71e27fa53b25f4bb65a0d703
-DIST obconf-qt-0.9.0_p20150729.tar.gz 96660 BLAKE2B dea66b2bd4084ecd5936612bb52cee1395866d7b4b3b3f211abfa60bd5b4318cc6e31b04867dd600caec5347cb38bad5be854be1e1051bd232b4f4328a8d3121 SHA512 cb4318608fb49926212130de368b059af34c9731d5edf19fca4b05f583ec0d37ce7568f95a5a3f1533642503fd3c7f03fee65ca96796cbc0bb16e92f9890efe3
-EBUILD obconf-qt-0.13.0.ebuild 986 BLAKE2B b29461611694ae86e7eabd7bf4095544d324537692631fd05ed9297970155fab530d8bbd9f54d3dba77e96c7b4f96093de9dfc62cf500df761b7683119a03be8 SHA512 e23f6e315bcc9d8ca4bc098af878fb69aa14cbf47b3ccf7b60e72ea7038afb6372d95d37bfeafc8073f419c85c95401c611b3c4b2a1fe05fd6bf38a5c060946b
-EBUILD obconf-qt-0.9.0_p20150729.ebuild 814 BLAKE2B dcb1c53f696945f8234d559631ed11efbd26e57212cf806838fab6257a91b419c5f66237beec924479f6d76c7bdf03abc83e3d5caadc6c158d52f35a6e0b96f5 SHA512 e48ddaec10f0329b230278138a6d03eda8291fbf5a22f7307b2e3cd8c2159e47cb55358441bea89e4f67a09eeb87bc50cc67bae279d9e553973de6570b4fd22c
+EBUILD obconf-qt-0.13.0.ebuild 981 BLAKE2B 7d1e7bb88f8439c558bf752d1a534839fb8ae1873365ffac8b688e4ac327e98d38f86a7492e3b064a80a4a34fa8af0004ef4a4e9e0857d24964821513b931572 SHA512 2d618927d07d3ebceaedf3ce5bd84a998301afd8dd41185cafd413d20e30a41c21b66b883d2a2f6b6bc677232be5ddebdf17252622cdb9ecb54eb73fea682c4b
 MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.13.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.13.0.ebuild
index ef705f4bba6f..2218c7e93b9c 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.13.0.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.13.0.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=6
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild b/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild
deleted file mode 100644
index bb19a85d36f9..000000000000
--- a/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Openbox window manager configuration tool"
-HOMEPAGE="https://lxqt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://dev.gentoo.org/~jauhien/distfiles/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-wm/openbox:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index e4003594eacd..6df158d55c1d 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,6 +1,3 @@
-DIST pcmanfm-qt-0.11.1.tar.xz 92916 BLAKE2B 8f71b5c1845ac4761fe8ba48734905e63011b98a4856b1d7759259b387d897483315dbadc6d68aa588f1ad223c4a3cefd83b00979a04723cc706d75cb26611c4 SHA512 860a0853b6c42e04ba6cdbe617d4c5f61e0033c9ae5483c5b8a457368fe23084af813feab5fa50accecc8d21055a5ef073731b94ea3eb4b3ca6eacb0dbe41450
 DIST pcmanfm-qt-0.13.0.tar.xz 104864 BLAKE2B 47e24ccb415bea27db9cb5f0ccd1ce6aebedc2f7140572939e533c3da9aca6aca29227a5be7954944ed82483b4420501adf22152628e3d44a206d4f9d5250412 SHA512 7b0d4ca5274e369e3af3c4b332a95ae78af54142aee39aae36832e85ca27d1f2f7509f00dc29d18a1e5a2558c8a82acd6569d2433acf13b2f95174c47779c089
-EBUILD pcmanfm-qt-0.11.1.ebuild 976 BLAKE2B 54a2e5395fc1ed8f0ee47b0110225dd996d773f4ea3b0ce6fae89b9a85b2d09cbef9273fb3ca8ea24a669a637cf327b87c4c7ccd7173da9f091061b238396288 SHA512 b9d6f0335b90d524eb8921a94891d715603f3a90f62874bac37fd052d1ba1ae1ea96054867d450503437e8f0e723625341598bcc1e6a30b45fda4315b710c121
-EBUILD pcmanfm-qt-0.13.0-r1.ebuild 1069 BLAKE2B bd8acc860ecdc1088b84a29250051e88780d48f5945de53c7047b61b49d95101e2258c67d90abd69c3789d060b308aafa3b413b8d2053cf9240cee60be549a77 SHA512 f438d3997af5af6a073556bfaa81938afe9046c94bb1e126380dd050e085af3565a38a0806661d4b32823a5040eabcb460a717500f6101d54e8f2d57ecb12c46
-EBUILD pcmanfm-qt-0.13.0.ebuild 963 BLAKE2B bdcbfd42fe5b2e2bb6aaece64906c152683ac31da4c410c3d02644ef0df625ad84ef60a8ce5c2bae2bab80ff34fb45add2cd38946ef01c016d97e807d7edbad8 SHA512 caf7eda87637c65038ec56d21e9048c16880b6734f6808b9b2317153c20dd836d2038bff22295075e14252b4d5a4e3d24b8c7fb882f6a5682f1ed6bced204883
+EBUILD pcmanfm-qt-0.13.0-r1.ebuild 1064 BLAKE2B 2281e8f6f34669d2069a36a1a73a9246d1bcd6aa45e9f5f03d2b4f8f661b94975ce446e8d71c8f1384f5ec76d1e6a0a1bc28cabda36275c6ffb98b5563adb12a SHA512 8b27f29933e62f1f0545509924d2deff9712f9975ffcfed25e3d8fe345530bb3746d0df1eb243677ba826d32c1728275052743a152b7ab58bc6715b95fae2964
 MISC metadata.xml 316 BLAKE2B 1dc58d42a91390bd5c19ee7dccf75687a2b612f7af9569f4f3a731e8eec49eba2e244c1ced6107ed51cdd377f8d026cf6589a49c3314c60d38f58a68d7e82415 SHA512 910454c7d138693e0020b922b7b32749fdb70bb6057f4f16c7d72e3385cf278ce0dbddb0d75e57a90d5cdc14b10c0bad740d77c085d2f8d14b25b100b594a597
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild
deleted file mode 100644
index 1abdd3e692e1..000000000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
-else
-	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-CDEPEND=">=dev-libs/glib-2.18:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=x11-libs/libfm-1.2.0:=
-	x11-libs/libfm-qt:=
-	x11-libs/libxcb:=
-"
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils
-	virtual/eject
-	virtual/freedesktop-icon-theme"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=NO
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0-r1.ebuild
index 3c0eff8e3ba3..45339fe1683f 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0-r1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0-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=6
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0.ebuild
deleted file mode 100644
index 7deeb4f0f2ec..000000000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.13.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eapi7-ver
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
-HOMEPAGE="https://lxqt.org/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=x11-libs/libfm-1.2.0:=
-	=x11-libs/libfm-qt-$(ver_cut 1-2)*
-	x11-libs/libxcb:=
-	x11-misc/xdg-utils
-	virtual/eject
-	virtual/freedesktop-icon-theme
-	!lxqt-base/lxqt-common
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.5.0
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index 71195a934a97..c0c43c069998 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,5 +1,3 @@
-DIST qps-1.10.17.tar.xz 163212 BLAKE2B a6832212f338cf9ac41d3b6916a2a22a8728f8dbb1a0f16c44a0bde6e275f7c83a31bfd1c6d5eea40d738857f28e3b2993be2fa8a81f082841bc86537bcc2457 SHA512 81d4ef9cdd732edc6dd060998f10124663d26ec8250fc1de62eb020624111eb3ba595058bd74d5cee1bde84326f26579ab40c4ed7ef58f0aa44baca96921cfb5
 DIST qps-1.10.18.tar.xz 164256 BLAKE2B 5eee79c2bab6eac23a91292132da4054836f86315a18399099aaad8853a06dbd79cb7c52af8c0e7098125d5cc06c04516235d6acb461e2caaf72584e7e05aa1b SHA512 f2647cb814e6cefba71aa70ee63c92dde88b312c9ada67e677de2bf22141afa3d7196d089606d270b610ddf3bd7466e6534de3614bea1a68d3a3b61a23b1c37d
-EBUILD qps-1.10.17.ebuild 638 BLAKE2B 7c3d7d6a1318b8eb0e838bd6270267256f3a1efbb25208631624a6301234d85c5bb5b25f6ceb79edf849fe8934d69f53b1b2bd21300d52ef159fc4ec001bd19d SHA512 89d67357e91e64f3624a1676ba9dad67850649010de4956e21f8730900a8015ddc8872a8ff1463b18751ce304989de195f18c63f43b7591124d921605c3d5fcf
-EBUILD qps-1.10.18.ebuild 747 BLAKE2B ce1b69d0926fef3fab0af67bf7a9a3b54090ef676c6243d83974bf06750d1d9e639163105b1f65157e30184a059ee4e3535819a674086d0dc151e3e03c0b9de1 SHA512 814beb1de0fd95b7a012ceece5e742fd3746ec183b6a6867bae16d4489ff018f5d55cb69ae5e5ecc689fa3721e21833cfb3e7b9ffc9050db2359181b62bc9892
+EBUILD qps-1.10.18.ebuild 742 BLAKE2B 6c0df4f82820d6c0fcdc54a28af624a301759c3b490585a61d74a16202a6ccc67af22f948d64cac14244a674304442e2f92a9fe9d7d39307152163c29ddbd04f SHA512 cc59e7c752c5f3ee9472e1d92713db7fba7df21b793af980b86d0d6196451f99e0cedf9cc3897534fe27c3382c0167eb258f74983261f18db6eb1914e2fadfb6
 MISC metadata.xml 320 BLAKE2B 7a6824c87e5ee071bd4219df12554d6363050a126b5838af05dc627134e57d2452eab17569b3e144dcb476ec35dc41649da438b8eb7b45d9e695b2ad900581fa SHA512 b0c5950c5803e5bb765271787eab2bb755cd681f50ab183a2bb06b9f773d0dc8c959e7d9c3f15d23692b3c106d6a0bfd0db43f439225539a3a019b7dceb33292
diff --git a/x11-misc/qps/qps-1.10.17.ebuild b/x11-misc/qps/qps-1.10.17.ebuild
deleted file mode 100644
index f0a63360792a..000000000000
--- a/x11-misc/qps/qps-1.10.17.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Visual process manager - Qt version of ps/top"
-HOMEPAGE="https://github.com/QtDesktop/qps"
-SRC_URI="https://github.com/QtDesktop/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/qps/qps-1.10.18.ebuild b/x11-misc/qps/qps-1.10.18.ebuild
index 017fbcf6cc56..90055187fdf8 100644
--- a/x11-misc/qps/qps-1.10.18.ebuild
+++ b/x11-misc/qps/qps-1.10.18.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+ QPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 30361aaba857..f47ab5f74793 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,4 +1,6 @@
 AUX qt5ct-0.35-fix-qtdbus-automagic.patch 1194 BLAKE2B 7a076ca63cdbcae61a517f91c501eeb48a93dd484b6472d95fca2e4ffcbd7240b2169d316e9f5f10385c7fadcfd89195ed13ab673b2de8769d71520e7f594874 SHA512 e90688a59a3fe81cb8ffcce290d061728dcc662b3763e258745361e2eea2a6b32efd51e0e338378b83d2fe5ba73c7984e8d5f858e8ad772ffc19246b4465de60
 DIST qt5ct-0.35.tar.bz2 62547 BLAKE2B dd61f151e1c6c58095889b90cb30bb2baaf21fd8f181af37ee43c1d00404655d57c941cee905e737aff29122ae3f588d5c7ba46dc80ca76d749cc2dd66f35d57 SHA512 2bd24221d391c420e73488738ff10762d27eb21fb28dc69da27dcbfface0cd0f16049768b55867a059c93da07eddb76da1bc63aefd516e07e5049c847da3970a
+DIST qt5ct-0.36.tar.bz2 68181 BLAKE2B b2bf21a1e3f4c6045af5f2e633c2a839bdb49165eb7f3a7d84021faa1c178e4ab84556460c2aa5e2b530fa32fdf29e0f7d3b37c9c839b7bbc7cfc8b77dffbb70 SHA512 dfd6f85328fe8f14c8f2349bc0cac698e549350e2c000a73ac26474ca38ec5f44fd4ebed9b6976fc3423dda8322fd80355eafa6ecbec17495d1e2278c3189a88
 EBUILD qt5ct-0.35.ebuild 1092 BLAKE2B e429fdfa2eb628ad2b6ca420258dc45873fb1b4d3d904905c06dd9489bb69a913b8c69c6e5136e0f422700c8c9f32717b36c4ba3dd8d6e4bdc29096d09f88578 SHA512 57ae70772ae917725776b4debcd2a90264655d2c4c5705fb7c07c12da2fba77917152f47832dcb537990803649e0152e16a09ad25750a2c954868ea2b612f600
+EBUILD qt5ct-0.36.ebuild 1001 BLAKE2B 51d2ad811d8610bc1884f5bb5ff5b4a1e83d8d4893cc34b51c3c3ad095de5893343983540f4cc89f7ceee76db6b84f587dbee8f056e35c2ec4e2882f85e3b858 SHA512 8e63386f4399da9ffa2a74182fd29a89747664a8798f35258fa46228c220e30f5abed841baec6679433f46b866f1b49e4b14c8255ccb505b965c46988cf590f9
 MISC metadata.xml 685 BLAKE2B a1a01cf474fd069651dd4bdddd4b58e7b352f91bcf147dbaf6ab0c6992d4f5636abbd6514be1c125802c21c4f8fb7ef3220474f45c55f3aa570b1128ae6148c7 SHA512 0fb47a823c4ef40aecf8775ae89dacfc8b4c16fef6baceafd3a36ff2864bbe63f40b2bbab0ac4ab16dd3e15f6e618be050f515af2d474e2752035bf311fb0d0a
diff --git a/x11-misc/qt5ct/qt5ct-0.36.ebuild b/x11-misc/qt5ct/qt5ct-0.36.ebuild
new file mode 100644
index 000000000000..ddf6c018a695
--- /dev/null
+++ b/x11-misc/qt5ct/qt5ct-0.36.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
+HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+dbus"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5[dbus]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+src_configure() {
+	eqmake5 DISABLE_DBUS=$(usex !dbus 1 0)
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	newenvd - 98${PN} <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "qt5ct configuration won't be applied to the currently running sessions."
+		ewarn "Please relogin."
+	fi
+	if ! has_version 'dev-qt/qtsvg:5'; then
+		elog
+		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
+		elog
+	fi
+}
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index 644c42a0e9cc..eaf85d92318a 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -2,5 +2,5 @@ AUX revelation-0.4.14-random.patch 2127 BLAKE2B 9fa01845124172e9544679c144cc49f2
 AUX revelation-0.4.14-xor.patch 1874 BLAKE2B 44b4e6b6f1323201818c55ecedb464304dc5265a7d356224dff41021554f8611f05fabc2fc353bf7a43b7bc4e2afe32f16c7b57ef30539abeb307de50f7b270d SHA512 c4b76a92f0b6e4e1856948e1c1d4bb118bc8f2383e9ec778515fd87949814b60dd51b8dc814a070665c0138111b3ffd9d8fdad03c43bdbb0320ad19ddea23ddc
 DIST revelation-0.4.14.tar.xz 316096 BLAKE2B 163fe15fe9ae1f35613390cec6d67b7b0193aea1d613d8ed0b237c190680b700fe509e076911cf28233194c3e82917ae0772d9fbe842eada0ac8bffae256dd4d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145
 EBUILD revelation-0.4.14-r1.ebuild 958 BLAKE2B 405c6fd1723cf31a4b00763b8f102e88716e8130a2f5b146184bfd64fa5cbb700aa230ff1176f002b7ed16179cd7037da504c57ba0e7826e1abe65a4435c0b87 SHA512 31dc4c383c5992570206f779f9bec62c6ea2511d2997c19eb5e758ef2f422e00bdd4f8c8172583e983b573c97bd944cf2e4ef8f5e376ea64ed342f049d13841d
-EBUILD revelation-0.4.14-r2.ebuild 1051 BLAKE2B 626492e800adb5e7341afd7d647c9667fee7e8bc31764a0d9fc333bdc2ffc3ad1e40cb31d20e3b4353747a2c0a7e2f9670cd0081527aa35390a265eea6f9cbc1 SHA512 0548637f2932d677a9ec7c04fde0a53a470ed0612e74015df0e6a7254c8ee03436ea8f22df173d28ba7ef39c4185a2c6d60e3bd7f061d3caf2b197a20bc66aac
+EBUILD revelation-0.4.14-r2.ebuild 1053 BLAKE2B 480c69cf01fde86f00102b0a0a5ceece8debd8574b519d3861757186692b8580b04840be01350a4e87a5c122f1b576e09fb3eb696af0568b9d798a77ba799046 SHA512 a41a193fa0f0e6ec10b97c9d6f03f5816efd3844d82fc8693fc7f3a10f54d9d5ab7e1e5430a32f9a9bb821abc423286710769ce04a7f7f58e4fcd31bc54b2427
 MISC metadata.xml 221 BLAKE2B 62f515310d9bccb1e3747264848ac800fc9489f83567f3e23f1b3a2f6636f6a499652435e153728de911f47a8534279f3ade767815414523f15077584397a632 SHA512 9ca3dafa7e44ec0f210681f8f524549f103695d57d0f8463a9044ac9456e6bf99ad6c7448e62a672471b7e82535b76214b924e3b336f186bced032750e68754b
diff --git a/x11-misc/revelation/revelation-0.4.14-r2.ebuild b/x11-misc/revelation/revelation-0.4.14-r2.ebuild
index b3589929fc21..3c4415d8beb2 100644
--- a/x11-misc/revelation/revelation-0.4.14-r2.ebuild
+++ b/x11-misc/revelation/revelation-0.4.14-r2.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
@@ -12,7 +12,7 @@ SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index 56cd1a8deaa9..f8af235f6cc3 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -3,5 +3,5 @@ DIST screengrab-1.98.tar.gz 146776 BLAKE2B b795a881c4d12f8d0328b6eebb9632983ef9b
 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 781 BLAKE2B 4fad1ccbb909715cfbd4da6a5d1de9778f699d02df95b236d7bdbcf97e90130ac06c90a75ed7d5f081bb18d82f5c0542a6b4670e54482a642b17f27cc4d183d2 SHA512 6e257c3fd132aabe08d04250e99ed5237ece6e859eea3f743c980e3fed57de3a2716b195feb6dcc8a30a06764c58d75081c231392bc27b56110410e317105d0f
+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.99.ebuild b/x11-misc/screengrab/screengrab-1.99.ebuild
index dafad04b9e77..6925d882f65c 100644
--- a/x11-misc/screengrab/screengrab-1.99.ebuild
+++ b/x11-misc/screengrab/screengrab-1.99.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 4f4c5c5e86d1..8996e372571e 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 1499 BLAKE2B 35b714f53be2155c2b52fff34a1433ed03538dfd000a90aa9be84ee11a5449eaaedf5e98178d9e53d071e9a97375d5f28c34bd3d3658baf19e30f6f7b987a351 SHA512 6a01d4bbdaec281003bb7f580d75a7964921c0d3c8250f3adff57dbb8055954c24b2dabb211731a76142363c4c54468060be3519fcc6c2e63bca71205e91e9db
+EBUILD shared-mime-info-1.10.ebuild 1494 BLAKE2B f958e53f7f581f9b081a16f962e82a4f56c31056b9203bd1969be5f97e393505018c37efd3502f95b64a95ec03d434e107e934ba8ca8af6fa0793c79ce568e01 SHA512 9ac4861ae32f3bc9120b1a84d318f0ebdf5b026a4bb899a538833ac365a46958637f7698cd4d7db561a7a26cbb003e0c09208ae535a34f69258b12092a9c2880
 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 95efb722f106..6d7292882049 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 ~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/wmctrl/Manifest b/x11-misc/wmctrl/Manifest
index 95f6a8622ddc..7f43ba829a52 100644
--- a/x11-misc/wmctrl/Manifest
+++ b/x11-misc/wmctrl/Manifest
@@ -1,4 +1,4 @@
 AUX amd64-Xlib.patch 1126 BLAKE2B f867b520c9175f0ecef50734ba3a7af78e474ff30b5c40bc88e3df5cd7dd85889a07e0d2f197f23807ae7234c6e407d3562801799c76001e9afa4964026a04f3 SHA512 8db78cf8c267bf2af30e3e91bcd334ea3c6fc8bb5e76afe4a6d9923341631402bf09c7ad55975c8c74f7b54ae288fae7dfdfe737227a72663785b02ec3416f63
 DIST wmctrl-1.07.tar.gz 87820 BLAKE2B e1059bef92fd4cf6cca3f539c68bfe3745c95abbefecabe3b1592a7dc3c69d769551f0ea4acc1d1e0c57024ce64e3fa0f0248fcf0f5776617d1ab88d667b662a SHA512 4c77ad1e204e8d444f682ad1d05c0993bcab9097ac6d4b6a944556ab85acbe713f549dbaf443cd4d1226a162ce7d46fbd209c92652e87fc8e609feee74907daa
-EBUILD wmctrl-1.07-r2.ebuild 687 BLAKE2B 5f9a0dc862b5c56bffe936c599d7a52d7850dc98c6a102bde7f252e540850fe37f35d194b9bda46d1e9ae8caae3ffb9273e83e86daeb0bddb312240c416f734b SHA512 a773435ed52d33530948ca91853b26e8790b91ecbadfa75dc5233620b1d999632cf44559d99c22c8c18908fef1b2a531cbfa4599f5d55780cee0c7adaa126b0e
+EBUILD wmctrl-1.07-r2.ebuild 586 BLAKE2B f26447f8373740cfc4e5b3cfebda3d6f487853336b4f4b97278dbd78574f03e3764cd7c3ee6bdff87055d389643377eaffdcc47df7efa1009786d4fcfdf86d10 SHA512 2b47fa26f961cd299c7cb385771b63ee1b7cc362d767fa5f847268691a67a93a6179873f18d67b8f38bd478bd8745cbdfe96b57bf3a704f4e6eb17e39caf1de9
 MISC metadata.xml 725 BLAKE2B 51248fb91da3dd937aaf5635c0593fd6ad53382f697fafeb12e489ffac96ea397dba3fb72a6ee0d7eefcedcd7af764dd7ab39d5a3bcb6870d928864ed0d71281 SHA512 40ab1356eedf0c9df493bd7647e789b60d38c49cc7d859605ece25743867e9b75e4083f2dbd71ff61422564e6d4172ca9ba02061e35cbef2ea885248abc8fbd6
diff --git a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
index a4def6b97b6a..b2ed49feea27 100644
--- a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="command line tool to interact with an EWMH/NetWM compatible X Window Manager"
-HOMEPAGE="http://tomas.styblo.name/wmctrl/"
-SRC_URI="http://tomas.styblo.name/${PN}/dist/${P}.tar.gz"
+HOMEPAGE="http://sweb.cz/tripie/utils/wmctrl"
+SRC_URI="http://sweb.cz/tripie/utils/${PN}/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,18 +16,12 @@ RDEPEND="
 	>=dev-libs/glib-2:2
 	x11-libs/libX11
 	x11-libs/libXt
-	x11-libs/libXmu"
-
+	x11-libs/libXmu
+"
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	x11-base/xorg-proto"
+	x11-base/xorg-proto
+"
 
 PATCHES=( "${FILESDIR}/amd64-Xlib.patch" )
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_install () {
-	emake DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 3d9168478508..ca7966655f2e 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -3,5 +3,5 @@ AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bf
 DIST xdg-utils-1.1.1.tar.gz 295213 BLAKE2B c52bf6bb4d5e2cd2848b17dc4f478debe1d9d399a02f014d0507ed26330ce47ac77c047919fabffff06c3cc773fab6bd4744bcdd9338e0726aca8e690bb76c0a SHA512 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb
 DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
 EBUILD xdg-utils-1.1.1-r1.ebuild 2181 BLAKE2B 18d2104aec42d81ff47e5ec2fe6659304217af3b36e76c8ab8212282c2cf3e75f087cc3787eeb76d4050742b59d35d12e62c99a4aecad3c17ba9f9369dc04ff3 SHA512 c6681cc7404329d3206a20188380c923ab24fdee29f917e42c55bdb3aa31a06b6711103d599f817f4c05121844c262489b2de374421796e4ba06c509d6d8c619
-EBUILD xdg-utils-1.1.3-r1.ebuild 2138 BLAKE2B 28b572021c43fb8d04a2c27e88599cd2297af917dd72db1df51547c37a8519e56589bf989e8b6616510f8f2ff328ea21a8fe0625c3d2299ceb7063960d0a0f14 SHA512 751d728cc95288d3e9a4ed99f9a4ca4d9e524ccb0929574ca7702dda0c92654daf04c01598b812368597744a438db6a109022acbd9a30e1557de89344a6ada29
+EBUILD xdg-utils-1.1.3-r1.ebuild 2136 BLAKE2B 3e73355bf3c1dd246f6fbf7447e4da0b1f8e20b32a854bd13886967c35054cf6b5d79879a6e631319f8dedff0f1319667512034ac44453cb09397c5e8d243b7b SHA512 10945ca0a93a3e8e76b05e926b1b82a95f8fff298129d4861a776c742f5b789ad80ac0aa1b162cbdafa1c9a7a68014e8d1dcc61609fd52f4d97a7fa6c01ae9d3
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
index dd9b39c7adb5..88c11df35fcc 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index ddb34d10e73a..73c14eee274c 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,9 +1,11 @@
 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
+DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb
 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
+EBUILD xkeyboard-config-2.25.ebuild 1189 BLAKE2B 28da1b87ddede17e959e2e41334f008628c574a67c17338c3178eda168c02ff142ab8806e06de6503451065772d2eb96f44a69e73c9581446c322f4dfb8f1a0e SHA512 5f76c09ba657c602fab4337afceb1087629ef4caac8988dcc2cd877db264ed4ac63804d5502adbdcb20f87bb5130dc6fd259a192b2e8674017d90a34a6292200
+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
new file mode 100644
index 000000000000..9c806160acaa
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	!<x11-apps/xkbcomp-1.2.3
+	!<x11-libs/libX11-1.4.3
+"
+DEPEND="
+	${LIVE_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+		--enable-compat-rules
+		# do not check for runtime deps
+		--disable-runtime-deps
+		--with-xkb-rules-symlink=xorg
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index e517c9fc8366..9c806160acaa 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.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
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index b94ce7dc5e2a..9b08185bde6d 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -11,5 +11,5 @@ DIST xscreensaver-5.39.tar.gz 12157285 BLAKE2B b33bf64541d07b2f65788160af0bac308
 DIST xscreensaver-5.40.tar.gz 12248135 BLAKE2B 78ca8effdfae1360d4fbf79c269884b6f7e1648e3be841f99d63cfc6e43f2c813f01cc5e87ec3b502c286e7d1d5562b3f00fe831e1e2f55dd47c4dd98cf84866 SHA512 e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d
 EBUILD xscreensaver-5.38.ebuild 3397 BLAKE2B 9848d30fdb05f6ddc95d11272832f4b79e7b775e4aa08119a7892e373db9e5698fd3034749a64faa3a99b1bc964481270926df750ce151a824508bc58d410853 SHA512 950d1b8b3646c14bee671f75aaf5ed25cb6b2443922f131eb1c6d024efb4e5a2c856b4fd9d59a1d5727f738a6ccf340b99e304f2af4a5986a859100d5e835077
 EBUILD xscreensaver-5.39.ebuild 3406 BLAKE2B c584e9332e24aa43d35b80aa9b55114e13f0f3ceb29504034f27e0143594949c419d08188c16d814553c71acb915ac622cb37e0484db8a03b605ea8c0048d45b SHA512 0a721d26c16ff1c6d1f78975894b2ac89930dbf215f9265f834136a0400717dd08906cf4a7b41a33865445d61dae1780c5d35e0818c3373610fa0eabf2b07f64
-EBUILD xscreensaver-5.40.ebuild 3357 BLAKE2B b1e8e9aa0d5edc8c6c831e2c75830ac785773c24f0b4d2514f0a1f3c2b384ef2a58bfafcdd0f6295e7a7070447f6f4ce3753352cb355708d4a8b3319f399ca3d SHA512 73def590ba9fbbbcda87871665197673d52fce08067d3fc375518553a6529b9b1c4082bf9e45c53c70682bca60950c0ade456810ed24fdd4995601ca3aa752b7
+EBUILD xscreensaver-5.40.ebuild 3351 BLAKE2B 8c649d16315f36741e47c58dfc42de728c3010dfefcc33a9572252f87a90359d66af3feb938215078ca88a6ffe9b0af7cf13d4bdeb099635af8b75aec1a41ac7 SHA512 7b61319958afb344ac5569d78e0db09f8287e9bf1ecbeccb2bdefa261fcd972fb31deadff0c8faec440fd000151dabb55a3ea6178bd2f7edd6c03b477c8079b7
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.40.ebuild b/x11-misc/xscreensaver/xscreensaver-5.40.ebuild
index 8a99a27c81fb..ba1e3200fe98 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.40.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.40.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=6
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 83cd3533ef83..e6a7741e6e23 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,4 +1,4 @@
 DIST xwallpaper-0.3.0.tar.gz 104300 BLAKE2B 23ec3b4ccbaf910c9ba4afbd1d9237223654a85c90b0a147141b017a9b3917316f745e1dd70a89e385110d380d5bbba8ee7c2d1ed4188d87a98ba0e94c5a7b6c SHA512 c73583fdbd573329951178d7db36fb1ae18a4294207de85dfb93e367be0ed103e8de7e2dd8ec61a0a23541457c930e8b0e5eb12dd5024808de3e02ddefb6b4a3
-EBUILD xwallpaper-0.3.0.ebuild 985 BLAKE2B ca30cbc340bc8fe03c97580d31e93a48fb81c67e9fceeffa491e0c193e297a7fa6981abac9cbc8e24913c2246c850c78e478021de5eea3f6f50ef4412ddfcb1c SHA512 514fa89bfafab2b0e2086d74eccf45f6e64b1d447167f5ba83c185ae0764cd5c03336f08a3755a80b947eb80ed9abf6666648288ccdf1c6731aabe0fca73fde2
+EBUILD xwallpaper-0.3.0.ebuild 984 BLAKE2B 57285f28d6321e391eb65d1263dc41e65d6a393451aa25ae1601b7ae0ac89d56e3c756e5967eee7ade1b1cc1e7b219b9b99046a6a2e544663ca65bd3d9c475aa SHA512 64b915f529ce987bceac1d59b86dbfec49dd4b7e67725beb7b11c5607de5213ea6743af0d1f24225a35405557eb0e808b3c2f07ea188a6a7508a073a63490299
 EBUILD xwallpaper-9999.ebuild 989 BLAKE2B 99fb573839f4990f7a3ab6b0ece3e87f8389b66e4dac4a303fb5372d143c008b808fc06a0ca43636d612d6c976717cea5d7f8cd711136476a837bf7f3a26fbec SHA512 b338de596750da56107cf760420451b129ead2bd233b593012e921fd86bd5b19554b74e1304442a038c79a1542ad64a2e9016d9212f30a5d783020b95204da19
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild b/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
index bcd7c89858c7..914adac64a90 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="ISC"