gentoo resync : 09.06.2018

21 files changed, 203 insertions, 223 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index a14a740f0d08..0abaea3c4825 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index 2029e97d3e17..bd512f9cdf5f 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -1,3 +1,3 @@
 DIST gigolo-0.4.2.tar.bz2 243877 BLAKE2B 7536d8fc1a10abb465b2150785f593c88b4d0a40fc76e1f88388a1631f874ccf0169dec9328b1051c39d6334257c765b409aefeb008a4dfd30bdd9e61d43d269 SHA512 d6d8c65674097fb3eae586e4c71b0f36ba64df00b2ac84c32bd83cfb0fd690ae998c22cea02194acd1f018cdfd01b42f840867425ed183fb0ad98c8d97859532
-EBUILD gigolo-0.4.2-r1.ebuild 695 BLAKE2B 4907c4eb22c5532089bc86e8694a31ac7a5128eadfe9a914b8215abf54298a21e1fe58bcc31f07c53523e31751e7867598c62f9f683f76fdd621088eb29cd91a SHA512 2b5e4b5fc4c7d60d01e327022aa13e57537138b41d643237b424321582aaaa5089dea202e87a5396f5664b45f3ef51775a728428060dce7a5b337e832ebf8653
+EBUILD gigolo-0.4.2-r1.ebuild 696 BLAKE2B 63254c84c821bb92b0ae7144bf1a9d821e1b938b5adc913506042eea649ce0aaa388be9d6ac75effbd80ce960c1e3d8f81b16e9753b8928e9f043ab730a387f9 SHA512 9f89293852bf9ebfbdd8a62047a5a6b0fec965cffffc522283dcb3313debb24326d289e6a9e0683d7ed4eaec18c948f38416f866bb87ed71dac87d69b35b472e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild b/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild
index 1de0cadb8c63..0f8a1215a551 100644
--- a/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild
+++ b/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit xdg-utils
 
 DESCRIPTION="a frontend to easily manage connections to remote filesystems using GIO/GVfs"
-HOMEPAGE="http://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo"
+HOMEPAGE="https://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo"
 SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index 6d453e465c9e..03973465d30e 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-default-sysconfdir.patch 373 BLAKE2B 4483b6c4e838559997acff86c46a879206decc0e834bd92cf8573eab28f5ce3ec74f186ce53fe3e2a69f8e7006265ce956f677470828f8b3e1bc40b5ab925abe SHA512 db974877a1eadb1b37279dd4e4159b47947958f688aed94dd3e3c49457a94a0e5d803f221dc7a160ed2cfdc915399892d010a1083a49a7ba7a53d49572c16554
 DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578
-EBUILD i3blocks-1.4-r1.ebuild 765 BLAKE2B 02caadce1f62ed54ee08e5dec2e2d43dd0e0b6ef5d315b9802ab659314c6d997d39f0774f36f07ae61dd0eb45b898395dd5c47a5dc4a371181636025cfc526fa SHA512 f9ba4dbab272cfe526ebee27f9280d33a3bfc930ef1cdd63fed7d340d9aba3cc7c44e2d4b96e9bfc66faade5c37c8cf6dd1f3f1edb926990d9f22ba8cf16e020
+EBUILD i3blocks-1.4-r1.ebuild 772 BLAKE2B 95b265f0688bfe391f387915d9c97a03e24108c43962927f7673ce517290b01217d96db7bf54d400956343cb552d188385b36e8116ed9d99d1288b3d3f4c3203 SHA512 b062e292ad61e9060bcf5255344ced864190f0c355580467e633baa47681766fedc967959ec68ddda8f83b8b111cd13543184c483d8ead2a558082752f220fe1
 MISC metadata.xml 331 BLAKE2B 4e906b5d485968ff9cc55dca82cbd704cc57a5ecf77c230bb7fd6e2a910c236bc0afa1d457f4b90b758ca5ecba0b2505512fc21f7dd12179d2b275d425430a14 SHA512 2191950260e909fd05a03d80a1f9ccde802e4e3ab890a2e05305f2e3e1c48e4c56200fddc9019b630a9efeaeac92509910e1f9b22f1a2ce85a8d005930cd05af
diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
index 426e5ac2b8e4..e481e6cfda3b 100644
--- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/vivien/${PN}"
 else
 	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 SLOT="0"
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 4506c7dda4ef..f1f4e823600a 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,7 +1,7 @@
 DIST i3lock-2.10.tar.bz2 23171 BLAKE2B 1c1d0f8e3a85dcebe4a9ee181e399a4ff447ececfbdf5f9488df849316e47233118b7436c269a986fed4e907e6162f3758c8bdad2d20ac156e95a8be185a744c SHA512 ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517
 DIST i3lock-2.8.tar.bz2 19884 BLAKE2B 67d04d91cae22f14210cbdbcce1a2aecd3eae0d649c8182f044c1c6bec5c8e63ab4cca647fcd3c2ab61c600a83157ce0818b566b59a632b509390f9b4d069a80 SHA512 b0f2f2837e275ffb2874aec75cd5d7c69864f8861de5e3e6090a2bf9254a14f8bc141256b0faac3e30111f9612e97cc087efde0da939854fac975a87deb06e3f
 DIST i3lock-2.9.1.tar.bz2 20959 BLAKE2B 05f35e3cd8fa45dfcb7021d3df19eda85ec3ebc4be9fc5b0900d88569d078bc4a773e6de155f76c13a45c9c914e47171c5ba000e6ed3cbb3b50cd4e847b78aaf SHA512 9b1bfac67a97880e61f8655a9256662ceec51850005298f13247ab570c03715718db84b1afefa979fb9a53a011fa20958f38d05f5378becf7803ece3e804faaf
-EBUILD i3lock-2.10.ebuild 665 BLAKE2B 0876f897088c71ccb70e84a4154ad495e5bbebbdfaac24f10943db67de32662ddd787d82ac408585e813ffe98af4c1a5225c8c29dcdd554e1e818909115cb6db SHA512 7921de2d45369d490400c655f901b16f900961a491edc2e0fd887ea9bab84f7e99a14cf32487def1201134e72b0414ebbd48cdad766136d4053502cbe9288bd1
+EBUILD i3lock-2.10.ebuild 672 BLAKE2B dc61ec5b79951a8b3d3002be93b8d13aaacc3ea8684cf73cb92282d96a3cac03ccc72197760568d0e4b1c7b7c1d1d09ac6c9c54ab85947979b168b4279ada227 SHA512 c3470da5fc1adf898b78fec80836d2c1dc2607525101e00ddf23beb60e435cf6ca742fa8b121c982be89b7fe534feb583f313cd16544050d0c11e292106bc57f
 EBUILD i3lock-2.8.ebuild 678 BLAKE2B a5c8ebe54d6dbedc67ed3ef7a670b54da8ec83a9b9f6873ccf1804e15232f5fd96fd1ccc9f4112a47d72941f5ddbaf2f310b496b84b27c3d58f22cc706bff941 SHA512 6e563e5decd47299172fe2918da28810ec167ebe856795218fdeac850015f7562d2ccedaf29943bb5f74131ef1d459e2b344791f6b06af6daaa320a2ab40f65a
 EBUILD i3lock-2.9.1.ebuild 660 BLAKE2B 4968be77ba5f5ecda76bfe3674b40a3fb19ecf2d8a1abd9e3ee7050ff380f9017c1822054be71dd40ebc4a2420b1527a418ae22c0b02b051ca8ecfa640f52abb SHA512 6b4e95f87132276d0750dc75e8947b8a32ffdcc06c6a0d88805a6f066c72dd511d25b7ff79da422771a18e50839d9c40160d772ecb4e58f6fda45fb14bfb292e
 MISC metadata.xml 275 BLAKE2B 1d7a40dcd1ff56ed2b121a26c14db27d87f2b5417aa1068231041d59bd9f4af2bed01f5a92a346d8fb78013d921c812655d14906e2ee6ce3d25f24bf302a966b SHA512 f6ba8749c28efdef180ce22a3be528d6843d1c73cb6e8e41a5d009e6a0b707053daf3821dcab94389d51d7f2c07fc4dc9e0c3d349aa03f6c136b897deadb0c58
diff --git a/x11-misc/i3lock/i3lock-2.10.ebuild b/x11-misc/i3lock/i3lock-2.10.ebuild
index 0b51ebc8e525..7cc7504d5245 100644
--- a/x11-misc/i3lock/i3lock-2.10.ebuild
+++ b/x11-misc/i3lock/i3lock-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest
index e2f6a47b5c8a..ee42775021ec 100644
--- a/x11-misc/kapow/Manifest
+++ b/x11-misc/kapow/Manifest
@@ -1,5 +1,5 @@
-DIST kapow-1.5.4-src.tar.bz2 722095 BLAKE2B be90609a3dd6a6b521c39ef0fb4a6a20ec193f816a994f944f5083888d4e883829b2249c3ff0e0df6f232f87e33f5abfbbd0b4b624a1165a75c3fe8ceb9cb21f SHA512 03683e7a4f904c4b6efdf47401d8a15ba979484d52d58e4dea52a890351ba9342ef5fe383876c5cb8138c6d578122936ca7e9ffda0fc5eb090e719eb751764eb
 DIST kapow-1.5.5-src.tar.bz2 722262 BLAKE2B 5f1c66b38edded3f2ad1d76d97dab036264169176647a25dc618a6e4149b40f4d4ed368edbac7786440ef49fe77e896db084edd9c210cd278b92ba175d49c63d SHA512 d22f8c1de74333b31b49ec752118ce36624895f99073b4b3f57a78f32e331ed33365b5664a316604e573820d38f268f0ceb6531bbf60eca05aa4a09fe5436a20
-EBUILD kapow-1.5.4.ebuild 652 BLAKE2B 0b33b48374071d3d97320a7888b565a7c36fddc284d6b15d407c75b3fc7b6ee45e2b4eec9bbebce753cae4242ccc957d324e80fbd6f923745d6d5922830a3690 SHA512 0f7e97465d03dcd8ebbeba6782b22775f3c89e4ba6b7ad0883634757f5c68e1c7b01cf97890d47e3d5bb7b5a829cf472d30b7608fdce3c98e4866328a12a208e
+DIST kapow-1.5.6-src.tar.bz2 855057 BLAKE2B c0d5afefa4caf0f1be243e8e2e5dad80e52bab4dc856791d198d009a90c864aaafbe2eb624e114f6331c685b2bbc1664add045de9ed46699f865481461968423 SHA512 b0d1e1ed3cbe9a4a4e253399de4ec645f832a10633275b122729dd7653bbb40c7cd473251459fe1e0c35be314a02c704cac3fd25cb7ee498e282a58df6cf06a0
 EBUILD kapow-1.5.5.ebuild 1279 BLAKE2B 989422cebbf4529834e808b86ff4bd411a354a21fe50de1243943dd7cf54a02eed31af4cc269918f8ac839857ec162901174848a6dc15e80fdd83e10741deea3 SHA512 8f254fc7fd102555bb3a3143c4f1a60d965d5455764638b5010004c9b7d5819ace6e485b8973c051f437963ecd84a9f759487367d0b18acbaa6ab4459ea40b43
+EBUILD kapow-1.5.6.ebuild 1282 BLAKE2B 29d43e8b055f3cfb8d37154c85e5f84eea9706ba12d0bcb3995a458429fd1775b901291c5183b50fcfe5b2e46b2023b8fa6f0e0a8168320f024e737786827c19 SHA512 8f648b1dc1aaceed63f1dc1013bf6c2737ab8d13e0cef388505e8dec4df14245cadffac5950a4aab04b41431064916c6286d821bcb814f51555c39185f08c608
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/kapow/kapow-1.5.4.ebuild b/x11-misc/kapow/kapow-1.5.4.ebuild
deleted file mode 100644
index 4d8914e38d21..000000000000
--- a/x11-misc/kapow/kapow-1.5.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qmake-utils
-
-DESCRIPTION="A punch clock program designed to easily keep track of your hours"
-HOMEPAGE="https://gottcode.org/kapow/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( ChangeLog README )
-
-src_configure() {
-	eqmake5 kapow.pro PREFIX=/usr
-}
-
-src_install() {
-	export INSTALL_ROOT="${D}"
-	default
-}
diff --git a/x11-misc/kapow/kapow-1.5.6.ebuild b/x11-misc/kapow/kapow-1.5.6.ebuild
new file mode 100644
index 000000000000..2dd79d2b2ec0
--- /dev/null
+++ b/x11-misc/kapow/kapow-1.5.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="A punch clock program designed to easily keep track of your hours"
+HOMEPAGE="https://gottcode.org/kapow/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+K_LANGS="
+	ar bg cs da de el en es fr it lt nl no pl pt_BR pt ro ru sv tr uk
+"
+for K_LANG in ${K_LANGS}; do
+	IUSE+=" l10n_${K_LANG/_/-}"
+done
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	default
+
+	count() { echo ${#}; }
+	local lang_count=$(count ${K_LANGS})
+	local locale_count=$(count translations/${PN}_*.ts)
+	[[ ${lang_count} = ${locale_count} ]] \
+		|| die "Number of LANGS does not match number of locales"
+	unset count
+
+	local lang
+	for lang in ${K_LANGS}; do
+		if ! use l10n_${lang/_/-}; then
+			rm translations/${PN}_${lang}.* || die
+		fi
+	done
+}
+
+src_configure() {
+	eqmake5 kapow.pro PREFIX=/usr
+}
+
+src_install() {
+	export INSTALL_ROOT="${D}"
+	default
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index ff545db718b5..d8e92c99bd76 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -5,5 +5,5 @@ DIST rofi-1.5.0.tar.xz 354232 BLAKE2B 2478902542b994ba06c4d436fa9436659366e2416e
 DIST rofi-1.5.1.tar.xz 355912 BLAKE2B 710a35ab82bf960b331431be3cc3acfb5cc27b42d7fa8b02e8c070918679b90612d89f600a6e58215bc0a08dcb60087ea37a5498fa8c4ac39d246d5967f0b314 SHA512 32074e931199ff1529ebab8fef53d339eab09843888f862953b7d661323484ebe66d820feecc42604a16bd683a5af1ec4d1a2e7f097f408efed6cfe91c4eb5ff
 EBUILD rofi-1.3.1.ebuild 956 BLAKE2B 5d895c9370bf82c6e5470ffcfd15909a79a67e55a20ab33bb39407312832658e604a823e90e3922a9bf7a25dd3d73dc7f31cb1b8d8993f7797303fdfe52f3807 SHA512 d78be7b3ee5cf1b19e2761a746b0286185bc9f1b7c19526d2234cc33b0f6d1dcbec269be43eef672c77fd6a1a3b11d9b049fdf2ff38b2bddfe8c805c19d5b3bd
 EBUILD rofi-1.5.0.ebuild 1143 BLAKE2B 0c2bf36ffb4cfbcbfa4e815558ab64452f642e12fff1307559b3b7d13cc82f5c332db11de061709d066e8d06379a0a9d2fa11db28143c67d5ec808c211ac2d90 SHA512 c6b8ab4ea5ac3c6dd0db8f182e49e55a1660fb7b5b79ddf1bb2e04161d4415afb0a5f21b90de5a3627cd4ad5fa1797fca8dc9fcf36a5b800574a46646df6d319
-EBUILD rofi-1.5.1.ebuild 1143 BLAKE2B 0c2bf36ffb4cfbcbfa4e815558ab64452f642e12fff1307559b3b7d13cc82f5c332db11de061709d066e8d06379a0a9d2fa11db28143c67d5ec808c211ac2d90 SHA512 c6b8ab4ea5ac3c6dd0db8f182e49e55a1660fb7b5b79ddf1bb2e04161d4415afb0a5f21b90de5a3627cd4ad5fa1797fca8dc9fcf36a5b800574a46646df6d319
+EBUILD rofi-1.5.1.ebuild 1150 BLAKE2B 332daac7b4cce8741bdc2b00080a04df283d13d9d5b986a0a5459b2febce3e3a521791376a920b895e7717f8ff61fc0ed5f0cf5398fa4e24f0b36e2445a1f7fb SHA512 121484af2d9c19d5601b2199343aa88c639fd3fc0522829d904b5bd5a2bb6ec247c570dfb404dfd674a5ea5ece17eeddbafd786c3249f460a194992a86f94960
 MISC metadata.xml 495 BLAKE2B 0a6c59c1d1db2ae103cf8165f39dfda9beb4dad681379f6f6bed7cf3f0a44f06e9cbd77457dfea4bcb0c42e3df8c6e2c7c83ea4a9185e1a4131db214d26058cd SHA512 afcce018b90e20d190e8da510c57b27b92508a40972fc5e573c185561dd0daa3ce3fd57c689c2ec65902087aaec7d1273ed151abdc5c6be76706f694c1c9510f
diff --git a/x11-misc/rofi/rofi-1.5.1.ebuild b/x11-misc/rofi/rofi-1.5.1.ebuild
index dc85085b3148..d9dffef044ca 100644
--- a/x11-misc/rofi/rofi-1.5.1.ebuild
+++ b/x11-misc/rofi/rofi-1.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test windowmode"
 
 RDEPEND="
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 07f618d7c99b..48b3e132911b 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -2,11 +2,13 @@ AUX sddm-0.12.0-respect-user-flags.patch 779 BLAKE2B 3ea539e4e426fa745be2ae6c59f
 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.17.0-switchtogreeter.patch 1873 BLAKE2B b54ec315ceff3f6f2541a1a6436187fc684e347b00fe6141e0b30e580d04e722f96b320677f7b8f7dd5f5bf91492b05f04a81e4ef564c831d9bd84de2ea68988 SHA512 f50b3c23baaaae6bb605cb7b4eb6ff24bbfd3e5771e44a24d54f1843b727f9f02cdd2cb0aacd832e110e4350870e76bd4727492d0b0f58145d739181a1815963
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492 SHA512 81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
-EBUILD sddm-0.17.0-r2.ebuild 2260 BLAKE2B 3534b7fed704f024f923da35bb1768c55a53a375a46d7a45bad31b7fae0ce8d210ee12e4e0d1fc49fa27901b39a056e295f5e876b769fc2f0e139de926ea936b SHA512 dc610ec03262b560f973f59f0a0bd312c992332244620ee7e289286113a6380ccd67b39eb041c8d5b6f7bca72559ab2ca2471d3eb5d85ee12fa51cb58a7edeac
 EBUILD sddm-0.17.0-r3.ebuild 2311 BLAKE2B 39aca6a331d7b3946362cdc236681db3bc157a9383b5567927a5126ac2c4823e85a1b4cd590c33ffcb661f83915711e4dc395da9b8e817503248f3a89b320bcb SHA512 089e9d907cfec936b4f24f51c555b1b0811da2b83a79567b5a39b476e8dd2ef3a51c94f48a5e11fa34f6f56cd2de361a1ebdab7aacf23df990869571704c4dfc
+EBUILD sddm-0.17.0-r4.ebuild 2374 BLAKE2B 1c7f4137d94de2ded2f0137fc20384f0733bf1ae722b562bbfcca47a6472c60d616f833a6165979ab47b12e75812b10086755e8cf1dbd95b11b58c67c1ec7661 SHA512 b4ca829a4de85d7398b27a5090f7ba6e5b360ec05738ce7713063ea540c6cf05dfb269b97d35e8260886f17b440495c70de81259df4db59eb41f4311bc975709
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch
new file mode 100644
index 000000000000..ca265d131454
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch
@@ -0,0 +1,22 @@
+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-switchtogreeter-r1.patch b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch
new file mode 100644
index 000000000000..35982bceda21
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch
@@ -0,0 +1,54 @@
+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-r2.ebuild b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
index 6e91b0dcb037..090a03ea4de0 100644
--- a/x11-misc/sddm/sddm-0.17.0-r2.ebuild
+++ b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
@@ -42,8 +42,10 @@ 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
-	# TODO: not yet upstream
-	"${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888
+	"${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() {
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 35eb7d246693..2aa5f7d21fde 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -2,10 +2,6 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
 AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
-DIST VirtualGL-2.4.1.tar.gz 1116018 BLAKE2B b80977d530af8e60c6a0409d7240a1bfc0f218268db11e530a2f6c933ea23d23cfc4430e4f0dc801a9fe213a0d4767870f581704172a1402443c0541ea5c22d5 SHA512 b8901eccb29ea21ca1cb0743b6b3a7316ee02422a94be04133daa1c8a24b109e27504a63c901359c7dec22a8af2f0e26d909f9b74c834b97dc19f7491232db0a
-DIST VirtualGL-2.5.1.tar.gz 1165255 BLAKE2B 3b719d23e925baa5e94f8e20dd86e9c50337f3e9b514e34a7b956b7fffa2e8e64b2883e789137b3daf6819cb85294bbc912189c9267b6d170045222d80d1b4fb SHA512 a60a55bae58c80bcea418702f4d3b41356a9e599f007fd539043228c4fe75c28582bab376caf121a5eeee4a21cddb80f1edc2f89abfe88a584321c46383d3654
 DIST VirtualGL-2.5.2.tar.gz 1172965 BLAKE2B 2aac9db4fdbec49c5251f9ba85fda81efd5025891a124991e9787e9bf869b054e419c6c377c0dcf5988a1785c16159c12a4c45d5d7419f3d6c17a09316dfd7e6 SHA512 a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd
-EBUILD virtualgl-2.4.1-r3.ebuild 2352 BLAKE2B 7a919e521c6dac1a57e3bf13ca1ee0289ac580a944f372cbd102ec26be5dc4cf2bfd13dc856717193584d7482bedf1d64f2e73c26deb95c1b983d74d58b74825 SHA512 93d2e74d07c2298946d75098b04b9688cf996fd82e9d6d38ef1291515bcdf7a79257b39a9bae293ac0b215cc016451408e812750e41ac9296c7776af405faf7c
-EBUILD virtualgl-2.5.1.ebuild 2311 BLAKE2B 5ca79093b85293ecf7dc3c4d08e5f56c525c92673231f1d180d441390b689fe9fbfe43f969e936581ab6cf1df23f8d203b46abe99c27ae8e7b253c714fca538d SHA512 71aa964664ef87e51d8b6cb0904aeab5401d7615625a247dc4ed2a86e101de2f4c8e7cb564b12098a0170b14a2928ff86a4f8a0845b042c0c07362ef7c6e7ea3
 EBUILD virtualgl-2.5.2.ebuild 2500 BLAKE2B ba0f29fdaa60aef649e1e2db4acdab97ffc1dec3e94daa3624161313fe98d98c16630630974dec9b128773ff74bf8409aa00be2eb9d645383369da68f93e8df6 SHA512 1cd347416c201c238720c911cb006be783286a50dc7ab49f008e1f435c8955ca65aebae2d89284195f9e94ff3ae80dcb29133a31d2a3b5032f43f668215f7a18
 MISC metadata.xml 736 BLAKE2B b0fef33f453e573f7742dff774acdd66aae3a8ed586718eb2c88fb5776c8c8040a94285971022ea52a47a702911a6d0f0f669e0cc8facac09d127a73ab6d083d SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600
diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
deleted file mode 100644
index 8cc8c1f711e6..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-multilib multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="http://www.virtualgl.org/"
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 x86"
-IUSE="libressl ssl"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXv[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-		>=x11-libs/libXv-1.0.10[abi_x86_32]
-		>=virtual/glu-9.0-r1[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Use /var/lib, bug #428122
-	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
-		server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	abi_configure() {
-		local mycmakeargs=(
-			$(cmake-utils_use ssl VGL_USESSL)
-			-DVGL_DOCDIR=/usr/share/doc/"${PF}"
-			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DVGL_LIBDIR=/usr/$(get_libdir)
-			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-			-DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
-		)
-		cmake-utils_src_configure
-	}
-	multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# Make config dir
-	dodir /var/lib/VirtualGL
-	fowners root:video /var/lib/VirtualGL
-	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r3" vgl
-	newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vgl-helper.sh"
-	systemd_dounit "${FILESDIR}/vgl.service"
-
-	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.5.1.ebuild b/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
deleted file mode 100644
index 39757c09b612..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="http://www.virtualgl.org/"
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl ssl"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXv[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-		>=x11-libs/libXv-1.0.10[abi_x86_32]
-		>=virtual/glu-9.0-r1[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Use /var/lib, bug #428122
-	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
-		server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	abi_configure() {
-		local mycmakeargs=(
-			-DVGL_USESSL="$(usex ssl)"
-			-DVGL_DOCDIR=/usr/share/doc/"${PF}"
-			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DVGL_LIBDIR=/usr/$(get_libdir)
-			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-		)
-		cmake-utils_src_configure
-	}
-	multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# Make config dir
-	dodir /var/lib/VirtualGL
-	fowners root:video /var/lib/VirtualGL
-	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r3" vgl
-	newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vgl-helper.sh"
-	systemd_dounit "${FILESDIR}/vgl.service"
-
-	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 816811cd6b27..1273659bcc0e 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
 AUX xkeyboard-config-2.23.1_fix_typo_in_polish.patch 609 BLAKE2B cf0dd9cabb3195fc7edf09996ec2de854c37893fbe0dca935ec0cedc8f80778c8c45088f7e6952073b34c854635212a79d068dd3c7c6c15a101ddf86aa856193 SHA512 7cd6193496ee9da7867d5121d995e360a3e2c31210794496b62338fae1eb0cf434712db11dfc2f25fd6eebffb92243589bddba98286c189757923bff39cd16bd
 DIST xkeyboard-config-2.23.1.tar.bz2 1053991 BLAKE2B c5551eb39f4cb240d36943d1e2fd3f9156bada61bb33013f6c43d036fb55aef5332fdb133ab6cfb03ebdbc68dcb3df7d974e3972904936b1e6dd89eafc4ec647 SHA512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba
+DIST xkeyboard-config-2.24.tar.bz2 1057889 BLAKE2B be9c6e0e0885c8a40406b3cf761f854268026084f2025a1a9f3e0326570543dd7fa11a2355947da1018d35af2ab4818092abbef5b7bdc3da923fcfe65059977d SHA512 96b65d18a85443a9bf93d65a4423da6e2b3d44882dae6a03bf46768a92017e9762cf3721361ba399c2873d53782944d0292eb673484f1cd8a8bdbf643e7a1dc0
 EBUILD xkeyboard-config-2.23.1-r1.ebuild 1143 BLAKE2B aa3ff040bb72dc32bf836bc6b9411ecf5584de9bf3b7a2e25648a774fee753ad0a8773410219519ba41bab934852afc9b430829c2a664281c9038fec515c3cd0 SHA512 178632a8720598205c048a08d7936fd45bc3c3151c9563ba74df8453c0316f873615f3c97ec52592db091c154f4e3d331badd092602671f14a1706fa0a46155e
+EBUILD xkeyboard-config-2.24.ebuild 1095 BLAKE2B 5ff0f206560806df10edf855cf7d81bb94bca1e13d779219f3564d315aa557772054de31ed1f661c89b8793ec44bce2d02304f9ff2f270b7ca1274688a16d5a5 SHA512 f7bdf5f231a033420eac29903ae03936fcc11568bbfd92fd01c803ca5bcf7d4c9cd947a371b6634e78c437108200d7bce8ef7b953a82d8b3ec20f7551683da70
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild
new file mode 100644
index 000000000000..40b72722a506
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.24.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+[[ ${PV} == *9999* ]] || SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="!<x11-apps/xkbcomp-1.2.3
+	!<x11-libs/libX11-1.4.3"
+DEPEND="
+	sys-devel/gettext
+	dev-util/intltool"
+
+XORG_CONFIGURE_OPTIONS=(
+	--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
+)
+
+src_prepare() {
+	xorg-2_src_prepare
+	if [[ ${XORG_EAUTORECONF} != no ]]; then
+		intltoolize --copy --automake || die
+	fi
+}