From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Wed, 22 Feb 2017 11:36:12 +0000 (+0100)
Subject: kde-plasma: KDE Plasma 5.8.6 version bump
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5cc6d781e408461e65e00320c7e1c14dc2e38247;p=gentoo.git

kde-plasma: KDE Plasma 5.8.6 version bump

Package-Manager: portage-2.3.3
---

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index c8574768f8a4..5e8389046c57 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,3 @@
 DIST bluedevil-5.8.5.tar.xz 144572 SHA256 fb7dac6c2cf5dc31162ca4e6a800d4821a6f9d6ecd93da81356266e04a1df21d SHA512 3b39da119843c5774d4d606e2deef59cb0f80e603937eec3cbfdec14641f5e4098a0ff195aab6e8c6dc2eaf2fa8e3539655b08bd4e4ac6b6c3850cf6a7a3ac39 WHIRLPOOL 12b7a79a5caf76e2121b7c5ddc0de14a6803c1420edbb5d0510855c8903eaa72bb8ba90582ecdf9d85ba0fe35a96b52b02c334dced952071f683bd5a4f01c1d7
+DIST bluedevil-5.8.6.tar.xz 144572 SHA256 927e05fa0ac6c3c0131cb325744fd787ce30d2397544a8431e5a9c9e79d9e963 SHA512 4dd48b667d23f2af741a4d3dd52149735f8cac67bf114fe1c9e41c4eff236f572698bca05461b865b33152829aea501767d64032a64952ebe01401f4add0faef WHIRLPOOL 536e3b012bc076b572a2a1b30208748f38f691ffdabf999c7c2c1646abf5f3e5a3de086a3651412a7adb3a32b27d3318bd15314c872b9cb9691ab041979790d0
 DIST bluedevil-5.9.2.tar.xz 143428 SHA256 2316c455f8656d3e59d7780be94e751197781b9d2bf5e991d1d3295fa9637c1a SHA512 0c9962838186a8f44c3fc4ea0f36b6d817480abe61b74e653976644e80ffa1aa5c4430614aa985df4d4a993647cecd1f7e7b92a3b0fb2340e24fcd5466bc7153 WHIRLPOOL 79d3395216db72701baee81af227d6afc69bfe6a1a89305a41a9fe396850fac4acd61e021e01f62fff4d2a1f79a02ee3254e51b1687ce7905140db33fffa8338
diff --git a/kde-plasma/bluedevil/bluedevil-5.8.6.ebuild b/kde-plasma/bluedevil/bluedevil-5.8.6.ebuild
new file mode 100644
index 000000000000..05af2ef39bcb
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.8.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep bluez-qt)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!app-mobilephone/obexd
+	!app-mobilephone/obex-data-server
+	!kde-plasma/bluedevil:4
+"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 5a04b75db75f..c040ef156acb 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-grub-5.8.5.tar.xz 3138572 SHA256 0e173ad1819b95afe7896f639501cf7ff6e1f8862efbb4f9825765e65acfd68b SHA512 031d6d60976b03093b1e7fd278b850c4bb177d6ba843b33a78c0f26c6e1eb7c24602d4bbc0517eeb404324ebeda59a8c6086751c41a99f6c35f0d7ec615054df WHIRLPOOL 14fed6ed2b72cd627e41c52a1b7658381e39d057358338bfc24149a2cfedb14921b0baa083a1c6155c13d39b99a9b3d0d117d3ed3c9dbbf0e9e9326f1d29146b
+DIST breeze-grub-5.8.6.tar.xz 3132920 SHA256 d505f9deef67bb27a9ef8be9b38612800e8cd66086759933f94889d1e26794fb SHA512 9c39d75599b5f1775c089498a041b7a774fd275caf26af966a5a0639fa509682d7a4917ba2b79d9d877e8d12a3142b882fd3919790ebef79be441c0ca2fca122 WHIRLPOOL d18c1788518c9d68d797e3f39013012bafc9df445f117a2b839b377d5e72f632c77ff0197242872b43eaa50897f2deb1a586c724b1f84d98b1a3c60cda493f0c
 DIST breeze-grub-5.9.2.tar.xz 3156192 SHA256 b96612da1d1b4636c14e34d195ede39394918b203d25d141e4615edf5e3434dd SHA512 23ab463d3de49b60ad7b527d9f7915e5b0d16edd5ff2fcf2ef7fcea7154e83315c6a834b4a0fb8daad2ca31e2bf24bb963164542e83916691e0c6de56400637a WHIRLPOOL 6eb6210a9c95eca30c5c251668c5dee5bafb73831dfd3706c20960186db9430f67e4956466d02fda68d05523245a4a1b664986396e76f737ec915bbaa42623e6
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.8.6.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.8.6.ebuild
new file mode 100644
index 000000000000..53d7a4790f78
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.8.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for GRUB"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/grub/themes
+	doins -r breeze
+}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 0ef45fdc79ee..4956078daf28 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-gtk-5.8.5.tar.xz 211572 SHA256 edddef80f31d58edff43100a921b980c1e68385ff36d30a056d1259e282cbd95 SHA512 a00f0fab1f2f38e4139f77475d89a16fb0848304f132eda7394fcc8ba9726c6cd83d80d23ade8039fff661cf0cee39eb0bd2ac1cf05b38ef4c5f15b7fc1ba7cd WHIRLPOOL 7c2463a11944796d30d406590ed5b4e057d48fe3d9af05b867336ab1b1868467ee01fb97b358b7d8b38fe9048c923576aadf6185418d905cf490bff58e5ff3cd
+DIST breeze-gtk-5.8.6.tar.xz 211568 SHA256 f4f6db0e9a8fc8dedb1aec1e7b61077a61cedbb21085dfea4c5b346490d3fdde SHA512 921312218f25156ef4e54359ffbf6c409957834f61125b41ecccf5aeef54e0ec1cf9c068f2037641099882edf79bb67beb5ed6d27564597a927322b9a5dc1a3d WHIRLPOOL 3a1c5bb7cefc4894174c68bba110dc9df723fd70e9d8ca12b5ad34dc417750dd4c8d593380815e6e1698660547627068308bf0a9618a23c6805896f1e79a1cc0
 DIST breeze-gtk-5.9.2.tar.xz 211584 SHA256 70185746dfe98e07294848337af03b0ae8b7710084c9af020293ce31a2f30f58 SHA512 32ba29c42c02a7c10bce31c1c2ab7e398b1df5ab19401ebbd964e54578f6c2090aed0ec1c74f50f35af90051feca5ea7d77538bb43e54cfa7bafb12e64dce16d WHIRLPOOL 439b0127ad1f96c58984f7f529dfc229033d2f4c1b8f026a9b1b6ecdaad6dbb8f7c53552560f836f7a3570afbb7187809eb843d936fe0f4f9aafa729b4871987
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.8.6.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.8.6.ebuild
new file mode 100644
index 000000000000..b72b84697e3d
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.8.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Official GTK+ port of KDE's Breeze widget style"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+src_install() {
+	kde5_src_install
+
+	insinto /usr/share/themes/Breeze/gtk-3.20
+	doins Breeze-gtk/gtk-3.20/gtk.css
+
+	insinto /usr/share/themes/Breeze-Dark/gtk-3.20
+	doins Breeze-dark-gtk/gtk-3.20/gtk.css
+}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index fe60318ff7b2..26a899b4a5a9 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-plymouth-5.8.5.tar.xz 94964 SHA256 01c74f5422382dd6b1ad8777a971dc58b43122980592174fbc7f01feb314cbe7 SHA512 0dc6db741fdcb689a92ac83e7b4af32a5bf8b72047613d23801843e8c6c507a1f2b97289e33e3220dd2800724171d90887d6f7262d95c8140d5a8b29ae40319c WHIRLPOOL f34ea196de0dd4dbab2b4375ee0912d5c5acd14001ccc0368f7a2c996ae174d457b7517eb28c5615119cd508ee162fead983a039d4543d4cee0f122d108bdb9e
+DIST breeze-plymouth-5.8.6.tar.xz 94952 SHA256 689fe7709423af61ee3f6b735d87c5862966759d702c8e1a5dbf2c1233a0b931 SHA512 72095d48676ad5c33d595cd6b369986fc69f689abac4af5549e3f5c77beb876f902866feda034cff0ef3bfccda733f5d87cdf246a203b7ecd05e341041b0a3bb WHIRLPOOL 9cc38f78c4416ebec83fe1e9aa375382027947dbcfcce6266701d9fb26b56a44cd481c96fedb4581b49b5ee485723ecb092dc7913dddc0b3cf8d27aa16b5e1cd
 DIST breeze-plymouth-5.9.2.tar.xz 96912 SHA256 0a810255d609f45d1d75eaa33a5e935ba336b81c791e2fe311cf2345445d3965 SHA512 d050ff4223efe231255e156c74a0def92b52dbb04f3de01dcd6c1aec744f5fb611fc717f26a3ce0efb931d2f61ffaceefe057f578dd67367c17337c5982c9f4b WHIRLPOOL 7342a74170904a62082724fe9af530a61b1958f176ee76d0e3c160724e412a3d2c1078699957a25927194ddabf0c089c49cda8ff5be071c4e3eb96310969381b
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.6.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.6.ebuild
new file mode 100644
index 000000000000..81b38b175166
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for Plymouth"
+LICENSE="GPL-2+ GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="sys-boot/plymouth"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep extra-cmake-modules)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISTRO_NAME="Gentoo Linux"
+		-DDISTRO_VERSION=
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 9b6bd37a70e8..5f99cf15cb9e 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-5.8.5.tar.xz 33279848 SHA256 c1dc453ac2461bb6edf2d115741afb2f1933d9476e1b0e5470451d1c01d096bd SHA512 dfe5640883b05b5622e3d5d74e479ff6027d5f55f0c318c11c7eaa39b05fe30c5392a951d1efd8efde5b150bb47a514a2bb3620006e55fa64650c5c19b78df7e WHIRLPOOL 4881bbaef5e16f116d8ae5ed499163fe2d27be8b4f013ce408ef9e14de7d2c1fd14a9faaf72c4653a4ff6e5269bd888a7cdc1cc58c60c4045a212a8173a40694
+DIST breeze-5.8.6.tar.xz 33279132 SHA256 559f1b80daed76d45a6f7fc5c370ddce35299983487ea3ae9aa98c496dcd9d9b SHA512 175352b36e5915265a0a5e1f1d8bafa13e4a56e36a328abbe4a1936c6f45b4445f3b2adc703da9b388400f255e5f7cdc2b52370fb422cbf2e5af0f6ac6a379a4 WHIRLPOOL e3d51fd8b5ade5481122e081ea862662c5bc87da14e1bf8aec09a3a404531f3c89c005afe25e0db90e774b916f0aa12e9f5c9d70e951f754a6c3eca3e36b1e48
 DIST breeze-5.9.2.tar.xz 30680768 SHA256 2b0e9c8e4b92bb169d79b6815f1c7adea70056aa73949600cc1485eb6124693d SHA512 95cc9897f8f34a2d41ba6aa8e031003bc0e478250aad10892133734943b98ccc5c058f91251c9f45ba0abec68ed5551f4c3897200157770eb1c2862b0d32721c WHIRLPOOL 47fddf80cc6817c0826c99c60d774f7bf8de5628ccb8e3bbd2928a7196ae840b0586de13ced3016fa08bbf615ccadd25e73bedcf2e772e718b06959569b748fe
diff --git a/kde-plasma/breeze/breeze-5.8.6.ebuild b/kde-plasma/breeze/breeze-5.8.6.ebuild
new file mode 100644
index 000000000000..3015ce65cbc1
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.8.6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5 multibuild
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="qt4 wayland"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	qt4? (
+		kde-frameworks/kdelibs:4
+		x11-libs/libX11
+	)
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kpackage)
+	qt4? ( dev-util/automoc:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep breeze-icons)
+	$(add_plasma_dep kde-cli-tools)
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			$(cmake-utils_use_find_package wayland KF5Wayland)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+			mycmakeargs+=( -DUSE_KDE4=true )
+		fi
+
+		kde5_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 8fffbfa2dc5d..0fe6ed66df36 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,2 +1,3 @@
 DIST kactivitymanagerd-5.8.5.tar.xz 83284 SHA256 90bf07e74aa2923550a5188c75c7d2031ea80a442d7a9cf7f1bc58fbfdb2981d SHA512 7835baced0ee962133adeb4df91e7d9388ed02cdfa269060da73821f234c94de629964f65e9afe1b743c7b65c651d1076a1211cd3548d845c126fb58b76fb41c WHIRLPOOL 97f906a7b15a2f0c2e41678f2f7ab6ecb5d0a3e44161c09cf5ca3e3b5bca1035f60bcb6913e2c99e7299d81f307c620ed5c6d6226c04d02c9c4a67a2230b03e9
+DIST kactivitymanagerd-5.8.6.tar.xz 83312 SHA256 043efd8b9c0c9193b9d98bb40bb1cf206c3ebd5c3ed4474435570921d570b733 SHA512 969e33c195e4318fcb7b47fa0d33303e3bacb63826d2fcada8ddaac78b575e4047447260c5487d3a3b151fe7b2780980f7d3bd344632ecb295f47253d5b48bda WHIRLPOOL a8f6c3c8c0b788b561e93ae2b253788ba1f1b81d8090f659dc82edd5e34e5e49afa8db9fa4364695ecbd461db638903f532cb5fb528717e849d049a747c58eaf
 DIST kactivitymanagerd-5.9.2.tar.xz 83416 SHA256 47e652cae3f59288c0d7a08d5a7cccd1de98475a9908bdbb36697c6571730be4 SHA512 022e64269136bc7da2a102580616881d5e8dca1984a555529a6b325f359c20abb3980fa16f82fb15ff4a6f88be5ded8c1192ac31fd486d58bbde46e7ef3600f4 WHIRLPOOL 57c289643fb7da6ef0f2939422b90d06c2fa6b23cd5d6f1654cf3a33ae82605ab4702315543725ce009e7aa5e80f53c82af96f41e300f4333b0ebc63732f6e4f
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.6.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.6.ebuild
new file mode 100644
index 000000000000..a40af43b39b6
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.54
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-frameworks/kactivities-4.13.3-r2:4
+	!<kde-frameworks/kactivities-5.20.0:5
+	!kde-plasma/kactivitymanagerd:4
+	!<kde-plasma/plasma-desktop-5.6.1
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 616478930e6a..a36fef2bbf06 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1,3 @@
 DIST kde-cli-tools-5.8.5.tar.xz 489952 SHA256 e7fa88cc67eae200fab34d1e32e63da76ae263bc72bef763d2f1cf9e60e9e9c5 SHA512 24132abc7852d325a5a9fb9e0131460554f3a1b58eb863ee7c406332a703eb5dcf6e640f7241bee39ede3d35fc2de96775c223a005ff6f696b6848649a4c9c8d WHIRLPOOL 57c1c1db1efd8de9821b1e1f2d1b795df9fe1b05105ff7224791a693625b5af7f2ecab9e32e4736b2c9d3eeee20683b80e4ac0e7cdf2d90a5066212cd0317a26
+DIST kde-cli-tools-5.8.6.tar.xz 489936 SHA256 9a815aca6919e79b77bd95df491a1fed49e737cea53a49236fb99267ecad4622 SHA512 b6bb780a229d0c1f09ad934ca4cd0500d35db730016317d6fe96e864ee3c586293b49007c9db50eb331dd50fd474aabb86e94d2a7e1469fe61b165631e7b43da WHIRLPOOL dfee2151be89eb0ccb517d6dc6a7a5c5e36af3fde70b430a98c7d6cc3bfdc235e498a1bc361e88e426a1ee379b38d2f7e2a1a39eba6eadbb16df2b588f9d482a
 DIST kde-cli-tools-5.9.2.tar.xz 501128 SHA256 abe6805e8ed108ac693c8459093255bab42b3f132a2d73d61e362bbf866098f1 SHA512 d1fbaa53b9e31622734ba84b2b977829a9d35d8649951aabd11c9fb6b4938c02f8a47e66be062ac38eb7d8fc4d0e7c4627ed6dbf35d99b388c0588a8d6b6e1be WHIRLPOOL 4cb5d21360fbf60ada4284d42158c80eb67b76ba79de7000c03c02022c6a673c2d9a78a0b03b0817cd2aba5c95412c8f1cbaf96a384b95fdef00094510a2b23d
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.8.6.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.8.6.ebuild
new file mode 100644
index 000000000000..0d80fd7487cd
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.8.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+kdesu X"
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	kdesu? ( $(add_frameworks_dep kdesu) )
+	X? (
+		$(add_frameworks_dep kdelibs4support)
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	handbook? ( !kde-apps/kdesu[handbook] )
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kdesu KF5Su)
+		$(cmake-utils_use_find_package X KF5KDELibs4Support)
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+	use kdesu && dosym /usr/$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 0baa602c48da..20ea38c204ba 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1,3 @@
 DIST kde-gtk-config-5.8.5.tar.xz 150384 SHA256 399464281ae04425a1881f4fc26a40c0e2079a6246dfab2e52a361d86afd15c8 SHA512 1cd73040eeb7709920c6d534fcb6aaa69de76d96926e7d2030b07f109ac9fd8b96c4f1d0d40d7449f39b87f9e795364283541fdbd7868ffd8679cd5bc6979bed WHIRLPOOL 5b5181dd90f3927033b9eec07d5f1ca257f371e842a98f4d06aaaa00f28f2e94e2f7d662cf8f72322a1c07399c1f06852bd6fd0bc9cf64eb9ef4e8c9736c6dae
+DIST kde-gtk-config-5.8.6.tar.xz 150436 SHA256 4d54fa4b579c717e8c9792ce7f6b5ed1a728162df2faf50f79781ecb153a361e SHA512 fdf6929059c9c94a9ed9dbd410e4852922870fea77ab2985d003db027bb1b11e805ececc5dd87c03a8228a2b9008a65e6a143df59b513ac31083612f102a9641 WHIRLPOOL 578df193d8a654c4af876cf97aa717c24f9e61565ad9de8399ad8da8f9d2eaa8494cbd9aa1a0f54c30a9dd8cf1a65da68f19f86bb0a16824458e00f1914e3ce7
 DIST kde-gtk-config-5.9.2.tar.xz 150964 SHA256 f1739eb1e1a2ad68dc8fea7b39371d331480d3e1051b159becde16cecbaf89cf SHA512 76cb34dcacad6f399c3d701b7702c5a1b523be642b2b9fa446bceb25a294691fdc7d294ce8f79701d3285b805d5ba1b427696f5d5be32ee28b971bfa5b41e0e2 WHIRLPOOL 687a8cb058593b27d343328675e7f8a8eae88693fbffb96f8e2cadb4ec862560da20883538bc992025ce5c82450b6b3fc49859eff15b91f6eba96cf69b93da58
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.6.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.6.ebuild
new file mode 100644
index 000000000000..c6012d1f6bd5
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://projects.kde.org/kde-gtk-config"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+gtk3"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/libXcursor
+	gtk3? ( x11-libs/gtk+:3 )
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/kde-gtk-config:4
+	!kde-plasma/kde-gtk-config:4
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+		-DBUILD_gtk3proxies=$(usex gtk3)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	einfo
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+	einfo
+}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index b2552dbc948d..cdf4aa740487 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1,3 @@
 DIST kdecoration-5.8.5.tar.xz 34760 SHA256 383a7bd701a3d80a79c47a8770e32a6fee6763c564e6982211a2c424ef291cee SHA512 443fe6413b09f729e2f6c828993530f9b98438702268f5fdc6fd15e945f85e081f601fb9b242bb1cbd1fb186574a55ff4fa02f8a35f80bf7cd7ca2227fe14db8 WHIRLPOOL c18e796800068d9e1e45aff133203e4e97be91021d57815eadff1bd16ffaf33e2e2005170ecfba70aa6641fa215c50a40054cabe501731ff8c2ad1204c37920b
+DIST kdecoration-5.8.6.tar.xz 34780 SHA256 de729ef251a6abe5a6c4318a77c57c5f4d57ec1bd836156890857df7e0057059 SHA512 e6d85e31e8a4c45f0e62b9920bbca52d33b40559e491f0db4aea04180bff97aac0cbf4d9f14013b69c0e793f4b82c49fab93c2ee527b594e87cd8164ba77c0a5 WHIRLPOOL e381cdbbea48b3183a8f6a00136b5c228d3e8faf2b9d8420c0d5f621fb52266b2725165f0a3aaed76ff18cf6a7d77910dadcf06d7fa5e80dedb13b79bd6f88c9
 DIST kdecoration-5.9.2.tar.xz 35544 SHA256 ced8508d9e86f13b6fdcf07a16b4b830da50f15c1efd9d931032ae6a16dd4940 SHA512 c0bc080a6e7019b3b513bd04026e81bba32be96bfac601c38600195646accd755b7b11d0cb2da63b11671bda242a620f90eb07695c8a4822ff4eff15e784e0b1 WHIRLPOOL f2252b27e72b07761573b48c897344c7dc34369a20b048d35e15d898ad48782bec7de3e6a9af1e6a3b27f3efddeee787871cd6fb57a4a4a69e2f54412e8b4101
diff --git a/kde-plasma/kdecoration/kdecoration-5.8.6.ebuild b/kde-plasma/kdecoration/kdecoration-5.8.6.ebuild
new file mode 100644
index 000000000000..1d32f7b6bc4d
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.8.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_GCC_MINIMAL="4.8"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugin based library to create window decorations"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="$(add_qt_dep qtgui)"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 74af9c9db438..b919765a8898 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,3 @@
 DIST kdeplasma-addons-5.8.5.tar.xz 2091012 SHA256 2dfdcc0be58550f4018c4f2d05fd2652d4b326a73a9d39d551892e4bd65333a0 SHA512 45de4a7243124a1099fe1f7ae66ccb15df0d45c36ffc89b5e6b94c4e7979a35d2d79bd58997737dd9db99acd31e4f43ad189fe180d7b5cd16e48b9550868e73f WHIRLPOOL cbe7360b3f28369d895bf92baae27ff9347f9d011aa3a4829868ceb1d67b7182a17fc52a535c2acfeb9bf18969ed01c788dbd0f16571486381bee3e6fd76558e
+DIST kdeplasma-addons-5.8.6.tar.xz 2091160 SHA256 fd1a701e434b22a56ea05455a5d8a7dbcba4c01aaecdc2f077eb2a338e15707b SHA512 19adefd9857b31b976d6f7619e5e0d487e69036f2b246a9e7bdf9846cec011fab6f788ca234042cdf898c8f7a3c8728598a049c113077760ecaaa212b7ea1d88 WHIRLPOOL eb3c757181250dd14688428748a615f0adb8d2726b5b691eb92d67f1180339176999d67252769fb4914a9edf7f344a901f76f9dab121cb3b372afb306d5669a2
 DIST kdeplasma-addons-5.9.2.tar.xz 2047892 SHA256 e6221a2b1f86b1ec442767172b527e081d27c8cb4f159e2efb69be937470287a SHA512 80860c173928e6721ba1312cd537d664b0ba2c91349e726824c8d4aa02e131c9223efd44383c608c2ac19a8d7798c356e0c4e1d49e69a693b41f475da93a5411 WHIRLPOOL 3a5154b94638364d9b23afe7cdfd8e0fb2d0a29482e8621a14ad1542c5d5c30ba8209e3a8769d393cf15d8901267b3684e4d28216d2ea16a205fcf99959c4236
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.6.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.6.ebuild
new file mode 100644
index 000000000000..83dad8681499
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="share"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	share? ( dev-libs/purpose:5 )
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace)
+	!kde-plasma/kdeplasma-addons:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 3d523add2118..b254ac7a7116 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1,3 @@
 DIST kgamma5-5.8.5.tar.xz 60484 SHA256 22b2ff2ae14a8db4ddb9fc27980c601fda531ae2803ad61fc69a431109277f1c SHA512 eed9684bb1175165edaa921b0b0b50cca921705b61361d3b683446e453d6a38bbf34ab6cf9ed4aacdb5e3ffd556afac9c907b9b8ae90cb37c2b46d04f002998b WHIRLPOOL 7086ba90ce461571acf4fb3db388397a0a2cfd723eca9d5f1e92bcbcdff3c05c26daaf5a266f76c735331ffbcaa4bba1c1aecd64323b0eebbf5f26e34cbeb485
+DIST kgamma5-5.8.6.tar.xz 60488 SHA256 3fee7212bb608f3a2b2b33d5fdab8c22310eda5ac1f55727a9ef59189f5f69ce SHA512 21ca15e8cf925e152412c8d1657848203aefc863dad46941fdf9ae54fa7cf10647de26d31df1f8be0bacf52157f4953cbfcebefbaa2cd1f7d26bbf2690f9530e WHIRLPOOL 7641acce81db1c4d54e4dc6dbc65681fd5ff56d856b7cb8520cdd2e10eaac840a0b771c719954cc1956349d3bc59eda8abb3dd2bb065c83af826d0122620ff90
 DIST kgamma5-5.9.2.tar.xz 60456 SHA256 3ab19e0434b11d9d55aac97413b3a0ac896776f52b20332adc112d45aea6d3ca SHA512 8fbd3d7efb5fcecc81f2d8707757442a2e328a97fcf08ee496b472541e417d9cf844b080a0cc88155dd7f948c5ff8141850a60b18405abee4adf3d78338b52a8 WHIRLPOOL 64df1b63e32c1c9a30c342bb2bd6a94b76504e8d4caa3fbef5782122a033a49890f599bb0583e7e2d4d07aadcbbd71927ec8e7aaaf5984ee2cc811f9eb039acf
diff --git a/kde-plasma/kgamma/kgamma-5.8.6.ebuild b/kde-plasma/kgamma/kgamma-5.8.6.ebuild
new file mode 100644
index 000000000000..c9e056592996
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.8.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KMNAME="${PN}5"
+inherit kde5
+
+DESCRIPTION="Screen gamma values kcontrol module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 8f416859b6b1..122399ebd7a5 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,2 +1,3 @@
 DIST khotkeys-5.8.5.tar.xz 605632 SHA256 90fa906efd0a36b481d2651ed462596cc9527e72d3ea21f9b208a4e576fa00ba SHA512 6ec0a956f7c99ccdc5c5f6bb01d77d821a226fb94f16f5966f8609eaeb9c3eb7344855d6fe5e3c4feff36e6da36a9e35dbde1d0be583fe911a61ee5ef292db21 WHIRLPOOL 6b9fd522c69ecd450fd69d000d4f643d64d6c7045df873c10c439c9a65df64af527b803ecc069fbaca3a4f8c52b6d74a76f1ec1d8f1c8cadff434052019a6a90
+DIST khotkeys-5.8.6.tar.xz 605604 SHA256 b2533537aa9e8ec99a73929f76eee0371b9c1573ca1e8a3df88cddbf8b00df74 SHA512 0ccfb1b4f503996d517ab9823e37dd080ecf810ad96c7d4fafd124a715e1f7f4b11c5124a645e3eb18208f0ce1e13ed4c21389e155f56eca7369cfce0c042fae WHIRLPOOL 90086022c2b90261e4c932c0a73bf93cfd296a117a47b16a012727b64d48a49b0bdd7fce9583077e4fc952a663c73565bc2177e990cf15cefcbd5f6e73d728d4
 DIST khotkeys-5.9.2.tar.xz 605440 SHA256 88d1633e7271e8d90814501d10d2e393f3d43428ad0240e8f03bb9fa7c348e26 SHA512 a2c24827bec2b3b530cf63db763555094db093c23bc89b127111bc0b9a8b4a88b25ce0514a5c174743db015ceaddd09f6c9c29c92739a107977b1393feb66531 WHIRLPOOL cc752acb3675c98a9bcd68c0909bd408c7ed9f3967164b4702554766718f14e3fb94ee15b79728341fe0a301bae0b28385172f9d099aef2a40e120ac85fcc7fc
diff --git a/kde-plasma/khotkeys/khotkeys-5.8.6.ebuild b/kde-plasma/khotkeys/khotkeys-5.8.6.ebuild
new file mode 100644
index 000000000000..3033e65bf8ee
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.8.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE Plasma workspace hotkey module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support X)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/khotkeys:4
+	!kde-plasma/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-proto/xproto
+"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index feac6360519b..f854915b217d 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,3 +1,4 @@
 DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb47dc3229505abbac0c6 SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 WHIRLPOOL e161bf40c5e16180fa65217cb49314fb230c45329f4c518d6014083bd71da82d4aa048811ee814fde7fa300105cef16c182688445164ae84d0d700e23641b342
 DIST kinfocenter-5.8.5.tar.xz 1269580 SHA256 f7bd2b1389245f73d89dfe0f6229e3ecd9e04bf7a235e369ca992d3ad3b27aba SHA512 35c66179f9947cc5b323584ca74040622c39ed273c9609bba4c712b07965a0e97c65d0c1b4b0d29a458d1741d59f657ff5d3cbc8ec92fcb4ce6ac402bf113e92 WHIRLPOOL b0ab085af294f93b00e35fe52ae6b955b70c9b7cbd1446f5faa00ccf1a59202fed94a9c0879a5b7e278b9867ab201ff1f11a64c070793cdfdfbd75c01066d387
+DIST kinfocenter-5.8.6.tar.xz 1269552 SHA256 8bcc2438efb20106c9f0c8cae3a66ff202f71bf9acaaab940ffaf816002c10b5 SHA512 8eed4a548d782e0a29b9ce372b30ab250b619491dfa9efa73d3ec463cc43bb916a36702c949a4d6d25dfb7d4c350c84ebec08af7722a3a3ae5a37b2d9fca57cf WHIRLPOOL ffeeb1541e7eda54fc577d6c134fde491f8aef2d40e94615ad917d26705e72ca7a5b2a28771a823cbc273835f8c98ce45d93d58b8b57fa5dcdd47e3506eb2196
 DIST kinfocenter-5.9.2.tar.xz 1266164 SHA256 bef138f07707893832bceba86525f43ce0605d0bf8633651024138b5b46a4be5 SHA512 6e9cc5f72cf55bf6cbdc5c31e3073b3c1e3c080144c4879e7fe42354c9d25d3e444873cbd319d24f3cab839e547ef4d6b6a6bb47361febe21b89c66a34a28553 WHIRLPOOL db2a0f84f1c56ffa48ec3ecbc614b60928f61a314b095875a9ce7f4b67f6f5e90afd85e51db53df7e781dd179bb57ee98a2c4df60288fb9d2d0bfb55811b8976
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.8.6.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.8.6.ebuild
new file mode 100644
index 000000000000..32bcb3c6afb4
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.8.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="A utility that provides information about a computer system"
+HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="egl gles2 ieee1394 +opengl +pci wayland"
+
+REQUIRED_USE="egl? ( || ( gles2 opengl ) )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	x11-libs/libX11
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		$(add_qt_dep qtgui 'gles2=')
+		media-libs/mesa[egl?,gles2?]
+		!gles2? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep plasma)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/kcontrol:4
+	!kde-plasma/kinfocenter:4
+	!kde-misc/about-distro
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package gles2 OpenGLES)
+		$(cmake-utils_use_find_package ieee1394 RAW1394)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_find_package pci PCIUTILS)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	if ! has_version "net-fs/nfs-utils"; then
+		einfo "Installing net-fs/nfs-utils will enable the NFS information module."
+	fi
+	if ! has_version "net-fs/samba" || ! has_version "net-fs/samba[server]"; then
+		einfo "Installing net-fs/samba[server(+)] will enable the Samba status information module."
+	fi
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 1490367c6069..416726b4c299 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1,3 @@
 DIST kmenuedit-5.8.5.tar.xz 653640 SHA256 75b8543bb7ef5575a6c98797c622dc9fb08e2942ab95f36d409296c3937105ef SHA512 7c9d5d8d1d16afee4173ae65bcc17e7c45a5a163753f52962090ac13384b5b38dc3fb455fa5b246e9131c5d7f87deea35fe7f1cbddb8158b0827202684d15f0a WHIRLPOOL 79708c70fc2901d0f3edec9ccd17f5a0a661cab8dfb0abc76697b0c8c8856c42bdf4c5bdb5164fd4fbe683d5dd561d299a8483b1607cbff5536f6eadc4c8287f
+DIST kmenuedit-5.8.6.tar.xz 653636 SHA256 3c586c8fd5772905dd0eb279d4e727633b1ff4311188623edf84bd571dcb717f SHA512 9c4e7ec692347fd9dc4c2236eeddff449928f868092aadaadb09840f6b60ce31ea1fd032f1802a6f690d876be61af7a192049f4d149d9b6698bb4f4bebea6d24 WHIRLPOOL daf1b0312183f396c2c4a6c94cce47b9757b92bfe969aa3e10466c2bf76d9a8be5b066857b209519eebaa8a524aaab8f3e7e2ceecb6c2b633bf22057c33bd223
 DIST kmenuedit-5.9.2.tar.xz 653268 SHA256 630bd3ec270639fe9d02f03b7d8c6f4fca0cfc7c16ad50e3225287f2ca68984f SHA512 c1ca434eb244728730dfbf24d3c3ed8210554f5fec7a0954c9098abd9c84f84b15d4a714cef596bb563a61bb66dab07238cec73a14d741b0e88764a914ec9bc7 WHIRLPOOL b070efa34647176612be2c4a1a68dd893f0b02f9a630858c7d031cf0eb84d0333a29f8ca258db39f0a895f6a8d9937c0801a4f1c5c7fd128f0d62013f8488de8
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.8.6.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.8.6.ebuild
new file mode 100644
index 000000000000..4b4eedb06558
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.8.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE Plasma menu editor"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kmenuedit"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+hotkeys"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	hotkeys? ( $(add_plasma_dep khotkeys) )
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/kmenuedit:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 8f103342d01b..5da9843fcf8b 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1,3 @@
 DIST kscreen-5.8.5.tar.xz 113516 SHA256 b006fb93d03bfeb3f6260b48d6356fcf6f09b34646397f32c23547ecf41e3d19 SHA512 490a4a8f831b3afdc03648bd70c76d065d7147a2f81ab7c6f5eabd52a445bab6e7e331e9b193947a47a41795096ed594a1ad19de96ccafae556736fcf9a1a23b WHIRLPOOL 4f42970f3a1020cda689a2f591b310ca51ae3c924ad786a9c05bf04cf4b66a1f3b9ab172e174d5c07b4d711fec485e86d149a1fe39da793998b69995128143f4
+DIST kscreen-5.8.6.tar.xz 113496 SHA256 99948bf562f6dbde5a4fc33a6c0aee3a47874cfce52cd2c7c29d7a3143bd6896 SHA512 c70699d39380870d34f32805f579c40e20cc42ad697eeeb600afcd3d06b50a54e91af2d4f110b3eae242c9600488d544aedbf3db920343782691c7ff361ae466 WHIRLPOOL c1c67efb185fdaaca84cd863380c81b963caae82ee330b4c5831d2cb67e441eaf8936bddcad3cfbaf87c157966839b9048fa2f6d52d600d03280c644928c7d19
 DIST kscreen-5.9.2.tar.xz 113320 SHA256 d06eb4ea86446b3d898f85c56b37629587b3f3016850270624ff3177b3a6d86e SHA512 bc71e1b2b6d931fbd2e943f53584630dcb161e262a3fba4cf7af1410b5353e37e249334b1f67bb794cbee6fe596e15ab978c44529201264b835bedd2936fc59a WHIRLPOOL 8a70268e01cbf551345660bd0483da5b67d453f948c767a47d1a255ae73fb423162c7bd19929539c1f3c0518587d9a7c389b99043bbd63e100dcfeb51c132fcb
diff --git a/kde-plasma/kscreen/kscreen-5.8.6.ebuild b/kde-plasma/kscreen/kscreen-5.8.6.ebuild
new file mode 100644
index 000000000000..9023511299dc
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.8.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep libkscreen)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_qt_dep qtgraphicaleffects)
+	!kde-plasma/kscreen:4
+"
+
+# bug #580440, last checked 5.6.3
+RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index a0df375d7d0a..d46da3e3843a 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1,3 @@
 DIST kscreenlocker-5.8.5.tar.xz 108100 SHA256 72d64837393dd5c237d2985574b85a0f6507152ec3d5256751354c08d9d86285 SHA512 63d25d3e8c1477a7d1a52d49c32265fe344d7c7c1d5f9cb642d6e9ab524fc0a24c1de30e7134d3d92d3bf47a1d93d2a4713742aacb1405d35f8d5a04e66e0685 WHIRLPOOL 131cb22cf4830abc21bb1a1116ac11c6817fdd1e99441938e938a5bd44ba470b0f63bea073122bc093d016c3c72d733ca678688b1a311cc33d8c9b3127e65960
+DIST kscreenlocker-5.8.6.tar.xz 108416 SHA256 ed519a5c30bc350438d5b8418b484ae72513baf77645fe286f1ac14f302f14b3 SHA512 c2c7dd78abdcdfdbbdcffaa9395d8a8c0d84511f484bba2aeaefea05957279cd53253ce59f4bc279f811a369b0e65738ed92bd4f2a3006195bcace352707302b WHIRLPOOL 9b8cfd9dd35e07df847283195b7fa109788ed0809f30d8345290a6cb922bf3369cdc5ad69e35b8ed07b18d51307156603fba5e7c6adc4d9ee25194e1ee21d2ab
 DIST kscreenlocker-5.9.2.tar.xz 108180 SHA256 69c264e7c9f0fa5c826b912a5ebe5f1e582d338bd93214df8ece064bb4e7bcfd SHA512 c3be644708e93535dad7cf9a49833a75998ce8a216e6c6e3775bda876bed0899cb6fdf524b81a210810e8a19f99042112a74cae2ff06bc5c566fe0227ba96739 WHIRLPOOL c855024392e581d3ebdfa4c54d0a7479e8488c9938bd9ca17c32fffae40a9b503c3e3df86eba5d98a8349cd4104c5eb68b1f033d890a7d91e819fa1392ba4162
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.8.6.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.8.6.ebuild
new file mode 100644
index 000000000000..9c1a67e6f762
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.8.6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="pam"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	dev-libs/wayland
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	pam? ( virtual/pam )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!<kde-plasma/kcheckpass-4.11.22-r1:4
+	!kde-plasma/kdebase-pam:0
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	use test || sed -i \
+		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	kde5_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pam PAM)
+	)
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	newpamd "${FILESDIR}/kde.pam" kde
+	newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+	if ! use pam; then
+		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 3f729745fbbc..d6623561cdd7 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1,3 @@
 DIST ksshaskpass-5.8.5.tar.xz 19456 SHA256 b0abeaba2a3eff16e233e047b41c20bf4065b4529e706929f4c0e6a9884324bf SHA512 0ab10f04fea8d97bb7e942cfd11563d22e065e19414aad2484e5b1661ed7b492d769da69b30eeed9e392ef75a3cc518e0a8005fe5afb84dfc6192ad9a4c0bc8b WHIRLPOOL 19c08e63ef15f0e5a38cc10d02f71e3bb616ec7d219f06cf1004af9789832a6e2a031548ef78790f67a46bf5e69b076dc2d7082ba25b6c39621eaa97a9113546
+DIST ksshaskpass-5.8.6.tar.xz 19460 SHA256 0f195e6344b17cacb8ee0499c36f911970edd968b6dbbc008ccff4b659132179 SHA512 7d2918b95f14f41dc1b348a66a39f2d739c01e8061136aa97f27612c18fe85f779dcff7df82c22450869f31c94f71e3f5eae743cb976c0e6e6d0692db2dc450d WHIRLPOOL 5237e9409904382cf79e8caae65c2b6d730141d04acd2e643c5ac7aac04d9707a0a459a343f1c485ccb10a7abf36a90f5bbbe47ab73d1796fd03fd5ffcc5dc33
 DIST ksshaskpass-5.9.2.tar.xz 20072 SHA256 e4ca4282814da54595919f617cea3050a8e266d1cb8b83e05f26c84b5e3c209e SHA512 b43bb41aecf781b8dc8008dc0a7b4803b536c05ef9283a497fe36b0c435b162abe7208a23276c8cb42b524e8e7817833d513c8ace9a2d519d9630a143a9e583b WHIRLPOOL 86bed00de405a5f4d9533b8644affa9bb435b6fdd7976341178de315b7e27bab19b5515c0d728713c2878c2560afe1b64365fa4acda218b2a2490e9c699d4e4f
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.8.6.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.8.6.ebuild
new file mode 100644
index 000000000000..37e0a49e1497
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.8.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/ksshaskpass"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="
+	${DEPEND}
+	!kde-plasma/ksshaskpass:4
+"
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	elog ""
+	elog "In order to have ssh-agent start at kde startup,"
+	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
+	elog "the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
+	elog "properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 5 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/plasma/startup/05-ksshaskpass.sh"
+	elog ""
+}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index e55e5ca4f10e..e16f6733a0b1 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,2 +1,3 @@
 DIST ksysguard-5.8.5.tar.xz 490664 SHA256 c9bb8ff40d8a5092ef3c345b234a4d609fcff8ce6ec65bc32c3215a2840fa8bd SHA512 d3ad3e781e71fb1c179b9d07fbded060390f1c24836acf3f7e5027720e340d117445e04759ad79e46e8391db082d64eef62d52d5ad6572d688e83a86062d7b0a WHIRLPOOL d63a9b7dac8ea1d574f5b4e8505a9c2b315eb78b65d611c63278ebb5a77b939294defd8e9e0b4983eca75b9cfedbc151baf5767a35dd12fb6fafc79cbb6fd0fa
+DIST ksysguard-5.8.6.tar.xz 490768 SHA256 89806dacdd9e9c0de3626f96640dae504dd1c933a49bcc3ff6f14f50cbee0b30 SHA512 366f2284ab1bef4d68fb109f6d396609523131afafc0e3f7e464c69d5a4cfc26937af2d77de0b8da47ef215d8a2f730ccdc2d4e2c70ebdf561b9f7b589b0fc32 WHIRLPOOL 6a7b5ec77cef6e896ed8e16db8b239aa665125c1d2604b26fe5a4ce7762333a1ad2864fc395aec9d49dd7ca37626fac174078c2a8789dd3aa592debb025d3aa8
 DIST ksysguard-5.9.2.tar.xz 488140 SHA256 664763f003d863df6d8477cacd76f17e70767ee5ce1730886bc4ab8b7faa8c36 SHA512 b8e5e26583dd4bec6b3759461059bcb418140cb76132bab01e89c87f6864e2beb8e354c56c7a63b70906d776c2b5ba658ba26fa5aa5669a1b97362bfd994fa3d WHIRLPOOL 9ef337e2001257ed557d98e87effa5b5efc919cf333f72495225f5e6e4a16190291f29a7a51eb709083cf950fa3d4925bde700f92be95a187ad43d57e312d53c
diff --git a/kde-plasma/ksysguard/ksysguard-5.8.6.ebuild b/kde-plasma/ksysguard/ksysguard-5.8.6.ebuild
new file mode 100644
index 000000000000..14f94fe17201
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.8.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Network-enabled task manager and system monitor"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="lm_sensors"
+
+DEPEND="
+	$(add_plasma_dep libksysguard)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/ksysguard:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package lm_sensors Sensors)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 34a294043174..3b8376c368d6 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1,3 @@
 DIST kwallet-pam-5.8.5.tar.xz 17752 SHA256 84d0e3b09c353ca81af52956842fbb6170d3990293ced7f81eb4bb7447de200c SHA512 749847751872b899a4675dc7e96d4f88e47f1ceb992d84b4c99140bf2916f981fcd8c26486459f492ef810d84fb1294007c073ce238bb11bba106f9d96640f62 WHIRLPOOL 4c0ab2bca3abf5dfce7b67ee0c9e3cf2cc84e938278529aa83347ef7f77411a53490de1b0b76753d558f916860600ead985f9b28f44edc4f2f16fc74b5496951
+DIST kwallet-pam-5.8.6.tar.xz 17760 SHA256 63bc9333a89d545465ab7cfb7d7a5cd61d8c098e454e06ea9a1b77c4cb0021c6 SHA512 279d7c663ee0802cd0d8939f1be0c4db0d8c416b2f118479b9c2eede59af7005cd3aa2f57817c0ef07f8e57ca63366b49a3d7d111d605c45f2887a04b330042c WHIRLPOOL 214ffc9d9ff033d4b5de4a9d8fc866b31bd765c38b9f714b16d250103e3c9a2da5e4f9502519050d1a3a5edf9852bdea0ae183e0c10cc3d001298623306b1c19
 DIST kwallet-pam-5.9.2.tar.xz 17808 SHA256 4f57e7b5918ef196d00ec8f33875b30c6bfdeac85d44325cc6a733d23cbb2975 SHA512 58916ee68aa14b2253ffdd8cb02df2b60983ff4a0a8db60efa31367c665e422a1e757f69cffcde0384008482e350d8b7359b8a5137ae4ba360c90f18a31400a1 WHIRLPOOL e24883bf1b96b2bf35d9cb8f95bbc477fcdbaebeb454c84c6021ccb5bbc4d10d6150ffaaba085098f09b8702fe269971b496e1c49f984d3f6b85c4cf29f33493
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.8.6.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.8.6.ebuild
new file mode 100644
index 000000000000..da92a7451167
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.8.6.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+inherit kde5 multibuild multilib
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+oldwallet"
+
+COMMON_DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kwalletd-pam
+	net-misc/socat
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		)
+		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
+
+		kde5_src_configure
+	}
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
+
+pkg_postinst() {
+	check_dm() {
+		local good
+		if [[ -e "${ROOT}${2}" ]] ; then
+			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
+				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
+				good=true
+			fi
+			if use oldwallet ; then
+				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
+					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
+					good=false
+				fi
+			fi
+		fi
+		[[ "${good}" = true ]] && \
+			elog "    ${1} - ${2} ...GOOD" || \
+			ewarn "    ${1} - ${2} ...BAD"
+	}
+	elog
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
+	elog "List of things to make it work:"
+	elog "1.  Use standard blowfish encryption instead of GPG"
+	elog "2.  Use same password for login and kwallet"
+	elog "3.  A display manager with support for PAM"
+	elog "4.a Have the following lines in the display manager's pam.d file:"
+	elog "    -auth        optional        pam_kwallet5.so"
+	elog "    -session     optional        pam_kwallet5.so auto_start"
+	if use oldwallet ; then
+		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
+		elog "    -session     optional        pam_kwallet.so"
+	fi
+	elog "4.b Checking installed DMs..."
+	has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
+	has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
+	elog
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index ec86cccbfef7..649785caf099 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1,3 @@
 DIST kwayland-integration-5.8.5.tar.xz 18292 SHA256 91d2c7422aa0e286111e647b167ac9124d085e47d88415dbcd4b6776701dc685 SHA512 6d269bb1a7ac26d4adf87ddb9791f881d8d52291f4967ba852003897ef056eb723ecedf433f9e4c0aea64bb413ea92c18470af4f0d13302e87aa7075bad18eb6 WHIRLPOOL 6f0080198471c715f9568542edbd3f6cb7c346b0a1ab0d656fb7eebc7a4644d652f0ee644fa7f03b61ebb413755fe2a14af4d8b52ab77ae4739aaac3bb0f2abe
+DIST kwayland-integration-5.8.6.tar.xz 18292 SHA256 db14f5405dbee1231aaa08a8b0aa8a5650db9b34b3fa8cc1fc146b93b185a82d SHA512 d4e00d7db1fb0bc9150a40e04e9ad14fa0c88092ce95b6cf9618762372c5c27688a7ec683ecb6b07acc4da6df8e66ebcd9be7ea7dbc424d756887bc549c44f9e WHIRLPOOL b53b40322f82987b106f0d407e44a38355d9e7df89ff0c644c0f38abf5fc145ea609cc473e03e7e900e7315907a366b378874f96e8222250cae428667d99ad4b
 DIST kwayland-integration-5.9.2.tar.xz 18372 SHA256 e9154d8979d596216c8e11494f7b59ebc37e03986787123f8df8faf9f00f9741 SHA512 f458d23783fcf2d832a3cbc6687f98e34686aeaa1a5cb0eddd6050353435b0e0a78c434c63450bd41009c3db5956eae975b9ce482d1e907859768a669f1b2736 WHIRLPOOL 298b30dd20da5618306dc845a141f94a87ca0cdc68e00387b79c4865d144f89176a857acc02738a3db77aedb65313289ca51dc1c6b6ecda01fdb8c6c3834f6ba
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.8.6.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.8.6.ebuild
new file mode 100644
index 000000000000..959818c21905
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.8.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland-integration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 309a513c4984..6942fb6c9ea8 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1,3 @@
 DIST kwin-5.8.5.tar.xz 3998948 SHA256 a703a0d1628e36d3a92dfe3e0a8df7ec733ec2f7a93f854b90a9294dda095fa0 SHA512 3393dc5a5cda0f9abaf71dda8867e312972c5893dd4d61eeee67f9230c5e0e3ca42e941e68c0a2f50ee11d6699e0a815a3e3556f69f9c805acb9c381f5baafe5 WHIRLPOOL bf16c5b3745ecd7bc0fd5b1a90707945769cd6d29a5685a3b78564d2b698be734f7a8affeec0b4f59465d6749c3e90385bab22468b32880c7d8683654951b359
+DIST kwin-5.8.6.tar.xz 3999644 SHA256 e549dd4e6ab3c8e4779209fe3583615e9e87d3f251a66edf0a0416d10c7c2ddd SHA512 bd1a4f0ce46902905690efa6d2b54d34cb03ef95c3e14c705219d258fb11fbf3d4be0dd0c368ef3eb94820191dc49cc8b320012117914928bea4f69d8f25e407 WHIRLPOOL 9c7432febd0f4c0f6cf08d230c9a3f154d3bf24a37b6b53c9df2cdc0d66ec4297e297ccb61dd0396613955d6c777ea245c56213cca0a1f5c413f896ba22e5bbc
 DIST kwin-5.9.2.tar.xz 4626628 SHA256 3cc87aa4c9a092c2c0df2fcf536d1774928c12c5410a389c0127164b33530c3e SHA512 1930c7fc046302376694cf855871cf72dac15d91a56d228ae5d08a9484464dd6e49a497f9150d13f642eae529ae189848026b8e7cc9932d779794ba0f72fa2d2 WHIRLPOOL 63de01173155d14300c96eef8907b301229fb1b4fe7905e4ab50f9b281244110836427b6f5ce22cef04c4ce403ea743bdb48b2ac125872d7478cedf68b54b9fd
diff --git a/kde-plasma/kwin/kwin-5.8.6.ebuild b/kde-plasma/kwin/kwin-5.8.6.ebuild
new file mode 100644
index 000000000000..e5efe49d3d4a
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.8.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_GCC_MINIMAL="4.8"
+KDE_HANDBOOK="optional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE window manager"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gles2 multimedia"
+
+# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem X)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kdecoration)
+	$(add_plasma_dep kscreenlocker)
+	$(add_qt_dep qtcore '' '' '5=')
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=')
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	>=dev-libs/libinput-1.2
+	>=dev-libs/wayland-1.2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libepoxy
+	media-libs/mesa[egl,gbm,gles2?,wayland]
+	virtual/libudev:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libdrm
+	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxkbcommon-0.5.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	multimedia? (
+		|| (
+			$(add_qt_dep qtmultimedia 'gstreamer,qml')
+			$(add_qt_dep qtmultimedia 'gstreamer010,qml')
+		)
+	)
+	!<kde-apps/kdeartwork-meta-15.08.3-r1:4
+	!kde-plasma/kwin:4
+	!kde-plasma/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep designer)
+	$(add_qt_dep qtconcurrent)
+	x11-proto/xproto
+	test? (	x11-libs/xcb-util-wm )
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 3b8b14e7dfd3..2e2a683cb21c 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,2 +1,3 @@
 DIST kwrited-5.8.5.tar.xz 20324 SHA256 793a391d74ccabd107b323504b3a0c10482c6ec098019dc45c02fb68091159db SHA512 ea13dc1f50209c98d2a0377a985d5a2783773a583daa3a52fb657a19f9e4c2436d01dc5994fac5d1bd5de11d5bc1de715574440a67059ed1d9a04bd04c28a4e5 WHIRLPOOL 5089fee27309954a02e57a638671ef07832be37b7d1e61763fd6ce2743663d00f76d960424c9967c4fa30da1cad35b46b2495627de154f0f872b9876ce30d8ae
+DIST kwrited-5.8.6.tar.xz 20324 SHA256 a59de4adc45120d2bdff5dfc5681a9bb5fdf48a744803da22611e2effe5bd921 SHA512 b933f49073d0e5f5306f9ae7914e471258edab45e06336876a108d104cf71cf246ef8e97613c93ff0464533d21794bb4f829bbd06043769c1f438a82ff72ac5f WHIRLPOOL d3aad70e3d71c2805d82111009768d2b3754717b86af4c9dd46b17b6bb8fc6a668328437c5e6f00252576ca1589debceec38838a06d050d7f85941bd0313fb5b
 DIST kwrited-5.9.2.tar.xz 20196 SHA256 2b65b6c50180322c33c55278fead0f9b62e05665c8cb4ed3908ae5ed7a923ecd SHA512 a52eee1d5394f2898195bba12675ab3523d06604d3a1cca719028f5c3a3143a845938c092fcbc0e92400c99cfe6635a566af3e94f78c777252ee3f109ffa9edd WHIRLPOOL 45165562fccd0758be63cd3fd20009e92dcce37ae044ca4b59af8e534071653c45745399fec5d1dec9f10946e500dc0b2be79985a4892c067460821f69b14130
diff --git a/kde-plasma/kwrited/kwrited-5.8.6.ebuild b/kde-plasma/kwrited/kwrited-5.8.6.ebuild
new file mode 100644
index 000000000000..543a7e01c907
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.8.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpty)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/kwrited:4
+"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 8c90bfa124c9..f9da543b3212 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1,3 @@
 DIST libkscreen-5.8.5.tar.xz 93668 SHA256 c9afda7f80af8d07a659240de0ca70c96cf72dc124f338d42faf5a40fdb742fe SHA512 d907fbd1348c2e6094ec1cd51cc0131170a8e86d033da386ef7372ba08a5e8ddbbdbac3029a4e512ff3a9ba9d00b90de6fd294552966b1e85d787d25281cfe96 WHIRLPOOL 4b425d84c50c0867d769e002537fd37752a119e0cbc00ea72695bde6672b2ad462985799eb14cde0e3a239209d1f9983eb8d3f5945225ce50ce5718c53972808
+DIST libkscreen-5.8.6.tar.xz 93708 SHA256 aeb663412141c5869b56f44a53f477f4140b64526aae21b73e95a7a9b7a72008 SHA512 799e042039724355658a9dc84fccb074fcdece79d63ff06ef4ef836f23f03df2d33c28e11df1b8b096320de50b13c2308b69b3e6b7136f883f6b2ea07952e23d WHIRLPOOL 38a01f7354a026febb1c12d8de07fe493b9610481e3dc6c32b04f951677a7ebb819e09cab440de88f44d141100910f0b321c8688cbb4c3f220e58c6195ef3334
 DIST libkscreen-5.9.2.tar.xz 94068 SHA256 ef41b091c5a4c1525d3ac398f7e4af84fd56801b8299b3b2856d4143bb0aa546 SHA512 6342f0ff6cc8b72a5c4706a75d27f2d1ac5c69d26fc0184a734db1e9bc8e049e074ffc5735230b49afee11cb3e648f06c0c54363224e6978411067c2542dd14f WHIRLPOOL c2e32ef1434c0a7f31005a65f85c424f46b1bfea0f6a1aac48145ae3ecd2afdd3440a5fb973f09a868996f30e582f8c0e38e102729bb8fc7101c05315cfbce58
diff --git a/kde-plasma/libkscreen/libkscreen-5.8.6.ebuild b/kde-plasma/libkscreen/libkscreen-5.8.6.ebuild
new file mode 100644
index 000000000000..f4477d5123a0
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.8.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma screen management library"
+SLOT="5/7"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kwayland)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"
+
+# requires running session
+RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index e5dc7c757049..696ed77ff65d 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1,3 @@
 DIST libksysguard-5.8.5.tar.xz 575840 SHA256 976f9506037b45570475ba71a7445810cfd57c6079589038d63742d9fe2497a9 SHA512 5f3f1b924589dbb50e7e7f133da5325817a6ce100915682d3b6bbf80124299d85e66f83cd7adc33771dfdc9ee49c226fcb8a47204873a21231c2fe2829685089 WHIRLPOOL 89e7b1ba622356d572b31fbabc471c2b54312c26361b16183ab9f278c0bf3d877be7f7df2e95156b5ef5df3be80c263e3c521b02cd16dd3e642117e23cb36745
+DIST libksysguard-5.8.6.tar.xz 575748 SHA256 a8ae640da5fedae7b59735a745d6da36eb4a3231afb116f2b453ff443f2c6244 SHA512 0f78ca2ef2b862da941cc58e8bb781a23c02e885a3545aeefae43b14b32b5b3cf03b4f6393141966e0d72490afab9f350a479ab319cfce15082f3ef38f761a20 WHIRLPOOL 1f70a97c17e904a01d2800e2579bd124fa5d6f397ac45be3be2a6979a4115fad0e82ea2a71eccbac9ff25ab5c0d8e810bbdd621210e1fc62ec29a38b06767444
 DIST libksysguard-5.9.2.tar.xz 574724 SHA256 897ef20ff4a62a3ec8250653b2912be90971234fc43b8ce4b7ae0d00489d7504 SHA512 78ab4cade126e0c62edf9a41a5fee41f506ad1eea71e8c862a0db1c75e58fedc43042365760cbc2e4f0e8b2d28c64c9c5b46f14fac76bc1d345105eb31ce0159 WHIRLPOOL f5767c946a32b82763684b03ad26d2553c73ccab7385b1dbc4824e67f262f0aad71f91e8f2b345f0d221cbe64a12b475bd82f471d064e4ff2a50324247859733
diff --git a/kde-plasma/libksysguard/libksysguard-5.8.6.ebuild b/kde-plasma/libksysguard/libksysguard-5.8.6.ebuild
new file mode 100644
index 000000000000..010ce0194e05
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.8.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+detailedmemory X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	sys-libs/zlib
+	detailedmemory? ( $(add_qt_dep qtwebkit) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/ksysguard:4
+	!kde-base/libksysguard:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep plasma)
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index d2bc78060e97..90148ee841c1 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,2 +1,3 @@
 DIST milou-5.8.5.tar.xz 54536 SHA256 6dfced99ee3b1eb163dfc55c5546e06b6aee664b4333251e461a4f39c8624552 SHA512 05002a23c5214a891258f3b9a0be68f3beede42e32437f55a887ae7635a14d9c12acc327a2d3fb8bb5e753666aaccd2826abf7fd3154e8ea6aaad4b43610f6e6 WHIRLPOOL ac6ded45107ab6a54bd42e82876e054a43a3d81efa3ceeda271a1067be182c73ea1c4b4cef3d124eb43998fee5aadcd7c9fa72ff64816cd39b2d6174445acd5a
+DIST milou-5.8.6.tar.xz 54512 SHA256 7a6d224fd0fca331e3a696ad8bd03cfb4be2fcb31bb939fb3335a89bdc895b03 SHA512 ba6c5898c46091906843cf0de4645b7e087adf5d8e789a98f82f15116f818545790ea631ec1c31b2e96c5110cc9fde48f6a3a98dcbb449aae76452d12cabe260 WHIRLPOOL cf24f12f35fc277ea0f60c9cc30c984cbb735584d010a38eb9c13abf948081492ff640e8ff446be5e24989ad1f955cf380b19fcc7e524562355d9543e8809772
 DIST milou-5.9.2.tar.xz 55100 SHA256 ad43b448e916f5f390eb4929472db8f7b514d89acf2c46861f822e4e601ad42d SHA512 d56df73f23462406d0f9ad9a729b7dbf6c3ee76b658d8f2fe37e7acac091a3e97fb67bccda119d925c063260fbd072101fb704ff54eaff3d2290c398999f91f6 WHIRLPOOL 8d04cbfe3b1c4a7251f61355cb6787a0f22d48508625e060b7f13c1e2025c4dd159e72a2b76fe83a6fe7c936df7593916629380fc743127d0cb1aff8a0d4055d
diff --git a/kde-plasma/milou/milou-5.8.6.ebuild b/kde-plasma/milou/milou-5.8.6.ebuild
new file mode 100644
index 000000000000..16677b9a86e8
--- /dev/null
+++ b/kde-plasma/milou/milou-5.8.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/milou"
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/milou:4
+"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index af0c4791f58a..8dfdbdc228d5 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1,3 @@
 DIST oxygen-5.8.5.tar.xz 4461696 SHA256 07d2740709c9979eac381d4e728a3bf6670015a02c2c3478ed30fa8f8d6532a5 SHA512 0c1f285977c3a6abf4c62b6edf389d15570ba1fefa1972e92acab406ecba92eb4559aa41206487988c96c4512256736ff42dd46c45e871a0fd803d7367d38a4b WHIRLPOOL 6e3b6d5ac914be3c1a1a787be68d0602a138fc6cd5b854dd678cb05793b734e76c1d389e00b6ecd825fdff40bdc6a87ac8926403ab77e3d53ff34c2307c5b7aa
+DIST oxygen-5.8.6.tar.xz 4465080 SHA256 15cc949a44b80f37d5af96c2fd31337ce16b3de04e8b4f97d9d6565fe5af57b7 SHA512 cceb2433c89301c3c60aa54df8231d022fbe80047ccac8107ab773badcdf4fa91beb4aaa01787b688c7a844c99690a5c4248252708b6f3a56203eba40b1c4e67 WHIRLPOOL 59d90fd0fa7d3d019d2aff56b5be6670325a14f3deef73641d445b5461c2123502815b750ffbf6c3314632f62c562cf89cfa4995cb07539c2af7cd57c90776d3
 DIST oxygen-5.9.2.tar.xz 4463188 SHA256 482f814e7d833abc7295a8cccf324fdda9e927bc2001de37c6ff4cad07f3ad0b SHA512 1ffcfebba3b783a853d4ea2052b42b15179bbfb3490ae9a531ec41984a2340789beb5da28ffb413447da84bf23d3db2a381db29cac833914b083c1434e1e54e4 WHIRLPOOL e6fb0e7975fce82e2b29f45f2551fc643c90c424e2bb9ef890c951c98ef7ac1b98c7fa1b349a5bdebfd7035b37d9cc087ce9514ab4955d1628773a1cef5f2bfc
diff --git a/kde-plasma/oxygen/oxygen-5.8.6.ebuild b/kde-plasma/oxygen/oxygen-5.8.6.ebuild
new file mode 100644
index 000000000000..f0e71e7a3291
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.8.6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5 multibuild
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="qt4 wayland"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	qt4? (
+		kde-frameworks/kdelibs:4
+		x11-libs/libX11
+	)
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kservice)
+	qt4? (
+		dev-util/automoc:0
+		virtual/pkgconfig
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	qt4? (
+		!kde-plasma/kstyles:4
+		!kde-plasma/liboxygenstyle:4
+	)
+	!kde-plasma/kdebase-cursors:4
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			$(cmake-utils_use_find_package wayland KF5Wayland)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+			mycmakeargs+=( -DUSE_KDE4=true )
+		fi
+
+		kde5_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 9f7dc78df5c7..0a567ae51abc 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-desktop-5.8.5.tar.xz 6410960 SHA256 d95eeb976cc18a50cff141c509f9e67430b81efcf36269a283fc62b81d48a910 SHA512 d8ef41f5e2a041de04f353e04274062ca4be069ffe88b5cfb0c9a2e5b1395631a8adaf0fda50a784a61a2585c0a503d84730a8c2df844aba71e894bd1f17915e WHIRLPOOL 1ed15a97ab966d682b89a2e7b146220e55495acbba9707a057554044e4ba9f1198712a16dc56d9082457b73384683c7e97647a6ce845df3987d98202e9b8dace
+DIST plasma-desktop-5.8.6.tar.xz 6413204 SHA256 de5c0a2dc8bcf79cec95d660ba535d5d236f11bcee2c5a72e328f3734e0e1f83 SHA512 703dcc555da6c609f858185468694d2c204478d2c7c5822ebfc57a7153899e57e81ce7ab0b2533f30e3e1a3c20bb358f63c5ff26f833b0bf4ab3bc5dec283f7e WHIRLPOOL 4b3bcf398b115ba30c4d96171cdef6255b4bd835a5b90261278b65500b4bcdc72afe66c5b6d138a6946ea4eaa99f6a629cc0980084fa817dc9079c41cedbde47
 DIST plasma-desktop-5.9.2.tar.xz 6056932 SHA256 2a5644228762137e83aa481767d6f061d1f8b51a04e24fa9ef78bf26a6ca5b38 SHA512 20cc5c9892eb3d51fc470ad545953c233aa9cf193feae2775cbe8a95047e6311d007b0751ee76a4e716725ef0750c56c817f44ea3ab93ec1bd8b9c57f99dded2 WHIRLPOOL 7170a14da53b7a5c1dba6b5466428c6485d7f91e5e206d23f7908b95b3bf6d76182c952a0b991856c00d2da0e78e327fbb7315ad56a6696615a9e3f57de5f2a4
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.6-baloo-optional.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.6-baloo-optional.patch
new file mode 100644
index 000000000000..016a34b4284c
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.6-baloo-optional.patch
@@ -0,0 +1,51 @@
+commit e56ffb0914d5498f4017b0046524009d2b617876
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Thu Sep 15 00:39:43 2016 +0200
+
+    Make KF5Baloo optional
+    
+    Regardless of the current state of Baloo, it is not very deeply tied
+    into Plasma. Usage in plasma-desktop comes down to providing the
+    file search kcm. This makes it possible to prepare systems without a
+    use for indexing.
+    
+    https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html
+    
+    REVIEW: 128957
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8c99352..b229dd5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,14 +67,10 @@ set_package_properties(PackageKitQt5 PROPERTIES DESCRIPTION "Software Manager in
+                        PURPOSE "Provides package management integration to the application launcher."
+                       )
+ 
+-# Baloo is currently part of the KF5 namespace, but it is not
+-# a proper framework. Hence the strange versioning.
+-# This will be fixed with Plasma 5.2, as Baloo should have
+-# become a framework by then
+ find_package(KF5Baloo "5.24")
+ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
+-                       TYPE REQUIRED
+-                       PURPOSE "Needed to build to File Search KCM"
++                       TYPE RECOMMENDED
++                       PURPOSE "Needed to build the File Search KCM"
+                       )
+ 
+ find_package(Fontconfig)
+diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
+index 53ca49a..3220bd3 100644
+--- a/kcms/CMakeLists.txt
++++ b/kcms/CMakeLists.txt
+@@ -55,7 +55,9 @@ add_subdirectory(useraccount/pics)
+ 
+ 
+ add_subdirectory(workspaceoptions)
+-add_subdirectory(baloo)
++if (KF5Baloo_FOUND)
++   add_subdirectory(baloo)
++endif()
+ add_subdirectory(solid_actions)
+ add_subdirectory(cursortheme)
+ 
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.6.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.6.ebuild
new file mode 100644
index 000000000000..9dc3f49db24f
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.6.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus
+legacy-systray packagekit pulseaudio +qt4 scim +semantic-desktop"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	ibus? (
+		$(add_qt_dep qtx11extras)
+		app-i18n/ibus
+		dev-libs/glib:2
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
+	packagekit? ( >=app-admin/packagekit-qt-0.9.6 )
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		media-sound/pulseaudio
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep oxygen)
+	$(add_qt_dep qtgraphicaleffects)
+	sys-apps/accountsservice
+	x11-apps/setxkbmap
+	legacy-systray? (
+		gtk2? ( dev-libs/libappindicator:2 )
+		gtk3? ( dev-libs/libappindicator:3 )
+		qt4? ( dev-libs/sni-qt )
+	)
+	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
+	qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
+	!kde-apps/kcontrol
+	!kde-apps/kdepasswd:4
+	!kde-apps/knetattach[handbook]
+	!kde-base/plasma-desktop:4
+	!kde-plasma/plasma-workspace:4
+	!kde-plasma/solid-actions-kcm:4
+	!kde-plasma/systemsettings:4
+	!kde-misc/kcm_touchpad
+	!kde-misc/kcm-touchpad
+	!kde-plasma/kcm-touchpad
+	!<kde-plasma/kdeplasma-addons-5.5.50
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-proto/xproto
+	fontconfig? ( x11-libs/libXrender )
+	input_devices_evdev? ( x11-drivers/xf86-input-evdev )
+"
+
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
+
+PATCHES=( "${FILESDIR}/${P}-baloo-optional.patch" )
+
+pkg_setup() {
+	if has_version net-im/skype && use legacy-systray && use amd64; then
+		einfo
+		elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
+		einfo
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package fontconfig Fontconfig)
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package input_devices_evdev Evdev)
+		$(cmake-utils_use_find_package input_devices_synaptics Synaptics)
+		$(cmake-utils_use_find_package packagekit PackageKitQt5)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake-utils_use_find_package scim SCIM)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 95da1762b7c6..0f54a9aa8d95 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-integration-5.8.5.tar.xz 50936 SHA256 cb4da56f940e87e1195a0ba19e07ea3384fed1dcd26ca91dee1d7dee8f00a7ea SHA512 5e894b334d0d012e6ace38b02f3ff9f8623f75182a0e585406fe5d904658e9ce631c467738a9a79767505028715eb6d27de5c35a4f9d50ad9a83a70e0951dd75 WHIRLPOOL ac28acc14138d95b1228482b4889c4678c12856a9b4a8b915043af3acf434b58121f165d20dcc8a8780d0be4b3548d3053b1d45e58e0bdd7bb5a01a5a9afe733
+DIST plasma-integration-5.8.6.tar.xz 51160 SHA256 ccb22bc771940ec9b6ef7a742af18b8b456ccc05b50b1d29b8b9ecde4b8a076c SHA512 8046549ebd6f0085779de0cd4d85c79d1c03109925b87a3e6466909c006321dca658f95f82cd573cff5403662d47e067765b976221dc2f6172ad2f163973553e WHIRLPOOL b9398ee52dc4c73d373bcabc270a821627594cb0d934b0b3803a9f32e22dc1e16dad53d56720fc026c8e6fabde9ee1a36023dec2822e1b9eff6d38081e971b32
 DIST plasma-integration-5.9.2.tar.xz 49824 SHA256 239f68671b1d1c7eb7e937dc9acf9b01ab1e5e13f69d032fa645aa7d880b3afe SHA512 e16d4897eccc08cb37b7978aa16ad80b2351a02d2369009e48d92b48545273eba06c7044950107d1250ef69f475f425eacf550deddc57a634990ad1337efb13e WHIRLPOOL 49013dfc2adfe63d1c9b0524d5cd485285b3e2419652f211629b7fc1753c620eaba3b033fc1abda5e47420733644a3e471550cd88e38d863cea4aba142971e55
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.8.6.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.8.6.ebuild
new file mode 100644
index 000000000000..b2251d076bce
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.8.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep breeze)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui '' '' '5=')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libXcursor
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.8.6.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.8.6.ebuild
new file mode 100644
index 000000000000..ba3b2cdea044
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.8.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5-functions
+
+DESCRIPTION="Merge this to pull in all Plasma 5 packages"
+HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bluetooth +display-manager grub gtk +handbook networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
+
+RDEPEND="
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kactivitymanagerd)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep kdecoration)
+	$(add_plasma_dep kdeplasma-addons)
+	$(add_plasma_dep kgamma)
+	$(add_plasma_dep khotkeys)
+	$(add_plasma_dep kinfocenter)
+	$(add_plasma_dep kmenuedit)
+	$(add_plasma_dep kscreen)
+	$(add_plasma_dep kscreenlocker)
+	$(add_plasma_dep ksshaskpass)
+	$(add_plasma_dep ksysguard)
+	$(add_plasma_dep kwayland-integration)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep kwrited)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep libksysguard)
+	$(add_plasma_dep milou)
+	$(add_plasma_dep oxygen)
+	$(add_plasma_dep plasma-desktop)
+	$(add_plasma_dep plasma-integration)
+	$(add_plasma_dep plasma-workspace)
+	$(add_plasma_dep polkit-kde-agent)
+	$(add_plasma_dep powerdevil)
+	$(add_plasma_dep systemsettings)
+	$(add_plasma_dep user-manager)
+	bluetooth? ( $(add_plasma_dep bluedevil) )
+	display-manager? (
+		sddm? (
+			$(add_plasma_dep sddm-kcm)
+			x11-misc/sddm
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	grub? ( $(add_plasma_dep breeze-grub) )
+	gtk? (
+		$(add_plasma_dep breeze-gtk)
+		$(add_plasma_dep kde-gtk-config)
+	)
+	handbook? ( $(add_kdeapps_dep khelpcenter) )
+	networkmanager? ( $(add_plasma_dep plasma-nm) )
+	pam? ( $(add_plasma_dep kwallet-pam) )
+	plymouth? ( $(add_plasma_dep breeze-plymouth) )
+	pulseaudio? ( $(add_plasma_dep plasma-pa) )
+	sdk? ( $(add_plasma_dep plasma-sdk) )
+	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
+"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 1e523ad4c309..b230c239a013 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-nm-5.8.5.tar.xz 652716 SHA256 6c2fee26ed36ebc7929f8d8da42d29ed475fe8dd6ab3e8987f1a0a8fd8f73ebc SHA512 adc4a7bade44e16a8d47b7defb73db550347838251f2fcf9e7c879741934692cbfd97df8bec3c5c540f01d479138f0cefba96b1332f6690c1a08817d1365ccf2 WHIRLPOOL 475d90ade58b23ff70362a030d6505862b1ad94474e0b8a664cc480ffde482614ad7c43b400f12df4b4e7252a904cffdb797a46bc01a707f313d67f7f182d942
+DIST plasma-nm-5.8.6.tar.xz 653420 SHA256 e81819b2d7f19749d4b9046953b6ab7b4bbe103ca69b8e7809c4c52cb2294798 SHA512 e1b2bbe31bbe1b27eb64b461b537c9bddd911bc5dd7e001586367c1051e3a3dd0d319f6ed5e24a726688c7e1460d9bca2d01aa828a8d29a2c1392b597f378812 WHIRLPOOL 635fde323022a65096ac0745e905c244514b2b46f1364ef23830155db57cf38ce25a5ec3e9a66979c554772a5ff72cecc04b5eb0b59b926dc871264880ee85c0
 DIST plasma-nm-5.9.2.tar.xz 668604 SHA256 e072ebd1c3614320a65ea3b10b23971bde0688827525e232b53f4365e345298f SHA512 37e2f1f04f27c1c1affd84f736096b89a1f5c781bafdc15bf7cdfebf124b89b929673efe5204c4fa5613d1b39ed3648a611f9ee526e1aecb46a4f95145e1cab8 WHIRLPOOL 19851bdae7f797cadc4f073a54590499d6c33e9723b9ee5f8d8ee2dd8a6810790a3901ca2aaaa85ebf3fcc7eea5721a4878b8615c5459d197c0ecb2af1b8cc40
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.8.6.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.8.6.ebuild
new file mode 100644
index 000000000000..42bb4515d299
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.8.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep networkmanager-qt 'teamd=')
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/qca-2.1.1:2[qt5]
+	>=net-misc/networkmanager-0.9.10.0[teamd=]
+	modemmanager? (
+		$(add_frameworks_dep modemmanager-qt)
+		$(add_qt_dep qtxml)
+		net-misc/mobile-broadband-provider-info
+	)
+	openconnect? (
+		$(add_qt_dep qtxml)
+		net-misc/networkmanager-openconnect
+		net-misc/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace)
+	!kde-plasma/plasma-nm:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package modemmanager ModemManager)
+		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake-utils_use_find_package openconnect OpenConnect)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 73ad46e63b46..ecaa342b13f0 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-pa-5.8.5.tar.xz 69856 SHA256 2bbc3e6e12f743c633a5c2101efa6a19dd5f120b64da0ea0ff3da3e7ba6fe16d SHA512 87151c05d2f919c7b25274254d690eb7dd0c6e1068a230e6110092bf7622bcfa14c553e0b09253b529e9f4531ed13d484a874e29402dc13d8ec66315111abe5e WHIRLPOOL c2301cd34faddff497c230f4d0d4f0e66ebe2b506727e219b3b025dadb8e76e62e53e3d3246e190da3543d3259907083de507fae1320d7df24b6639713cf797a
+DIST plasma-pa-5.8.6.tar.xz 70040 SHA256 e8ca46cdbfefbf8a3067a5a6e153835a2bd44257f30eb94dba9a542bf4147c9c SHA512 6131057d00fd3d7338ce9bc6eb9e9233ee16e32fdcf43cdd9356c9c7bb6976ca2bc78ece649a7fbe7376aebb0d6566341ef7d8e6814effd41c1bffd32b8cbfe9 WHIRLPOOL 7ef43b69b5c9ef80814dcf16edfa6a4070ebb067f560613a75fdb7baae1b06a307e7117bf27c22be4c49d26cfdd2152162c4ae9a4cc571fa65a6afa6928938e4
 DIST plasma-pa-5.9.2.tar.xz 70288 SHA256 a6e35cf87acf10ee8d55c1fb04a574d1756d350d52cf663edc9c65b26c55b21e SHA512 2c2d35ef20a6a9f44818ec925ded69cb0e90b0cf4e05bba1dbcf4cec49c0fff8057db8ced8b14e0ef08664b2b5ccaf979f6c1bce40e82f7ca3d0515f6eff771a WHIRLPOOL 0c1d178680f2a193c4e7bca3a4d5f4dc0e94d4eb4e6307d722e0b34b80968051771a8c1ab4a7fd6860df670a8b3e4e20afc13788c7eb4498379109d6db847700
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.8.6.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.8.6.ebuild
new file mode 100644
index 000000000000..f5ec51f05316
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.8.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	gnome-base/gconf:2
+	media-libs/libcanberra
+	media-sound/pulseaudio[gnome]
+"
+
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index d2ffc9e21bdb..5769d31ab892 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-sdk-5.8.5.tar.xz 723240 SHA256 edeeb529e29307f5efedb0371706269ab0edcf0861b73dbd235821457a599e8e SHA512 e805b803b85baaa376069d6ca56f1df4db81252a1fade74629333a236e320835d3fd464fd64427177817ed22e8b3edc55a28bccab4360339ceb193fc9c4008ff WHIRLPOOL d658cdd8bfa8b39c1a31ec1ed7eea3d3f773b1a836458967622cd5de08f7dfe8b2bf5b523c8cc68766d057181d7f0c2823e9d227fbed373d799435f19f2c3e06
+DIST plasma-sdk-5.8.6.tar.xz 723612 SHA256 19716fff4b3519843d3e53113131c90429112a927f38e5577163e42136774ded SHA512 cf664b8932ba16f399408aab4c7c022a52732311beaa9542764eeaccf6c1284b32e9739349fae8b8dbda5ab850aa70cc0acef65c6e4ba0cb68d0e34e00f277b1 WHIRLPOOL b0c9da6dc41b1a5de79abe9772b5ca2af84308356f99411d8fab2b0866bb736410f4e29565a7c8e02c080e7045ddf5f18d126afa8ee0f934c6c4687e855f9ed5
 DIST plasma-sdk-5.9.2.tar.xz 722096 SHA256 af8423848c278cb8ffa667f5293376350d1552a37efddeeb7f7fa900754bc36a SHA512 ec8cdaaa760a3aad7c5bfda9e5d921f31a22957ce7183e8ec40d1f7db6ba5f0a84986fac867b684bc5bc8cacf2301c8f21a45bbad3a15e823822ffb7e7aedbd9 WHIRLPOOL 59d94659b2c552274256541cf212d48f5e1e8859142e8a152cf3a4dec53111487de138ea6b6e59b0cf7c7683b88aa8a9786bdadfdd9d2dfdf96b1740a5772c75
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.8.6.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.8.6.ebuild
new file mode 100644
index 000000000000..1b08de0e6d32
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.8.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Useful applications for Plasma development"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="plasmate"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/kirigami:1
+	plasmate? (
+		$(add_frameworks_dep kdelibs4support)
+		$(add_frameworks_dep knewstuff)
+		$(add_frameworks_dep kparts)
+		$(add_qt_dep qtwebkit)
+		dev-util/kdevplatform:5
+	)
+"
+RDEPEND="${DEPEND}
+	!dev-util/plasmate
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package plasmate KDevPlatform)
+		$(cmake-utils_use_find_package plasmate Qt5WebKit)
+		$(cmake-utils_use_find_package plasmate Qt5WebKitWidgets)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 21b55ef4fa02..c872a77a9ad6 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-wallpapers-5.8.5.tar.xz 45911280 SHA256 dfdbef49a8b8feb27a0927bc28728fefed94943baebf97587f8b2284384eda84 SHA512 2772eea021db56de425e094783c88bbd8811484720be38816bbf9a525a244c2e9f07f4223bceec4045bee5008eb154d2cae3d532a7e35fca4544d68bdfde3f24 WHIRLPOOL c9aef7c817c96bce3f0f5a8d3f8055a3bed7a5bf82fe1743ea1c70895c964dfdf183249b1e2fa3455d529274313fbb58ab44826db50286fe9146bc0c788f1c67
+DIST plasma-workspace-wallpapers-5.8.6.tar.xz 45911424 SHA256 2d8e11063378a7569701195b3f2fe9102ac32785767bb0bc4327da7e06d34287 SHA512 9bc20852430214ba7b6bac0340a8e6e4dcf82c0a8b2cef40bf5b9ba8eada91fc276fda34c589a57b414c4f36eedbf305358eae02ecbdd2dbb429ac04d2d6d465 WHIRLPOOL 53044e54d0f7b812127053e44e43d8d62314a631de2988592202da847d78c0e7338bd4fa5fd2586ff70ec655858b24b3bb043b4a9ba8b912f117ae0fd4ec5a3e
 DIST plasma-workspace-wallpapers-5.9.2.tar.xz 45911392 SHA256 dc67f29fcf9a721bc5b00ddca66bd81e3ad50383be7459262d2e048bae68b163 SHA512 6dc55bdc1ee557f74016fa51289c2863feb3caf26ba3618aec3db0bffa480a919680f8cc9d59cf432abf09647ccb076492a0ea0b7b5ea0452f2e705bdf48a91a WHIRLPOOL 4b3c80dd0a594ef0525e5c73aa3d4bbe62217b50109ab4dd555b14d9783bc1fc1889ec67d51ea967b058c452272767e72f02b757793ae0002c8e1043621fa48d
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.8.6.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.8.6.ebuild
new file mode 100644
index 000000000000..217333eb5cce
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.8.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Additional wallpapers for the Plasma workspace"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+"
+RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r2"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 580034908cf6..3b334bd96afd 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-5.8.5.tar.xz 6989928 SHA256 6d25077205436e3e721d7dfa4dffce7aea62a6e652ee7897952885e52b2f6ea1 SHA512 c4173bd4db3dc31c0435192b1569bdb44488f9f17b4cb5468b4af562b9dbb0934106caf92ea65e9e6b24f8dadcdda08cee07d64bee8b0f52398e07f39fbb97f6 WHIRLPOOL 1f42679ab9f9e1abd446474f03cb8b65c1d49875f2f1dc689311c1e62985d7e8b4276774fc1717ad8512b8e90b1f654f5f0a93aa7da06083e5a0e4b7c5251936
+DIST plasma-workspace-5.8.6.tar.xz 6992264 SHA256 51ab8b5f4c33c83fb64eb3f27561f3699b12b5e5c9fa7d38b73d93e57da50192 SHA512 fdc22db98942db8debe24a4364b2a8c5d02ee850691a8e7788f812b6ee9b3324a26b5cb71d248f49fa71eba0aca47f838ef671dd428e26fb60a5a5650d9d3144 WHIRLPOOL 9802e399f357ca5585e1cf2b838d601d330fb1c8d97fc012c5c7dd41a2742971e0539153a78ded8fa4196a8559a17074cf74523df5b8c4f1ebe902d6432311b5
 DIST plasma-workspace-5.9.2.tar.xz 6936424 SHA256 a66824802fe9d7b42e05251d31dc677e3932c189de53328d83ef19f564e41a51 SHA512 45a4fc99cf26e1c8df7a6d9af4ad2583138269b7de3b9dbe676b590565ed1b4081fc2460276fab03ebb9ccb2a488f58b4bdc74dddcacc576bea60ca8929aeea3 WHIRLPOOL dceaf24c7a128182486c676aed99793909431e2712a3fcbe84c88f9b71fbcff3e999079b303e9311a231eab086e0b6f1b40561f35b3886fc757738e73a21d2bf
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.6.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.6.ebuild
new file mode 100644
index 000000000000..a3ab60febe22
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.6.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kjsembed)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep kscreenlocker)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep libksysguard)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui 'jpeg')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/libdbusmenu-qt[qt5]
+	media-libs/phonon[qt5]
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	calendar? ( $(add_kdeapps_dep kholidays) )
+	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+	gps? ( sci-geosciences/gpsd )
+	prison? ( $(add_frameworks_dep prison) )
+	qalculate? ( sci-libs/libqalculate:= )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_kdeapps_dep kio-extras)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep ksysguard)
+	$(add_plasma_dep milou)
+	$(add_plasma_dep plasma-integration)
+	$(add_qt_dep qdbus)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtpaths)
+	$(add_qt_dep qtquickcontrols 'widgets')
+	app-text/iso-codes
+	x11-apps/mkfontdir
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xset
+	x11-apps/xsetroot
+	!dev-libs/xembed-sni-proxy
+	!kde-plasma/freespacenotifier:4
+	!kde-plasma/libtaskmanager:4
+	!kde-plasma/kcminit:4
+	!kde-plasma/kdebase-startkde:4
+	!kde-plasma/klipper:4
+	!kde-plasma/krunner:4
+	!kde-plasma/ksmserver:4
+	!kde-plasma/ksplash:4
+	!kde-plasma/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	# master
+	"${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package calendar KF5Holidays)
+		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake-utils_use_find_package gps libgps)
+		$(cmake-utils_use_find_package prison KF5Prison)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	# startup and shutdown scripts
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/10-agent-startup.sh"
+
+	insinto /etc/plasma/shutdown
+	doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+	kde5_pkg_postinst
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+	echo
+}
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 802f5cd31d6d..fd9d9c676e9c 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,2 +1,3 @@
 DIST polkit-kde-agent-1-5.8.5.tar.xz 41136 SHA256 87eb786344042d361c1af1b40c0ac6e153692505101508e24a8d49ca114193b7 SHA512 8491fdacd849dffb76f1b47bb2c20ed3d924e37b698599003d3351dd3e4923d0ed7565030cbbd4065dc823d3d5960b7667f634c176781ccc2bc88eb163fcd614 WHIRLPOOL 7ff11dae2a0823104732f8a2ecaaad2f7b1075bfc1ffa89770f573987dc3b362397549b028d0ca4781b07c4e59bdea5f844324a3b5fe46a0c2dc030cf410f380
+DIST polkit-kde-agent-1-5.8.6.tar.xz 41140 SHA256 8227e8ccd12d799c7ec25940afa121d3df5fe4f66e1645a85ba96e7df2a26f81 SHA512 3950ddfdb91323ad5045d700403f6721598662e646775397242a022e22682514abbcdc447e35d02b96077883d3bdb97f6e7244ccc5ea30812c9541162d06e90e WHIRLPOOL 1690e3b7f05bbb64d4f62f5209b5cd0c6f3830a86632274721044e3633e39a9c8e4d734656ef6758c7cddc220798e8a067b71a0955e86fac2058f5311d486bd3
 DIST polkit-kde-agent-1-5.9.2.tar.xz 41044 SHA256 c3d95e6c3ffc827f209bbccf1a663268bc3d3ee495c611ec363b6e98f89e22ee SHA512 5203a65048aa9d4bd57896c6382e85e0350a7e726880aea412bccfd284b68aebc46b4f408b45da648313a947a249d3622bb3b4cce560293fcc0c925ca4e0a694 WHIRLPOOL a6da5e6e8188366aa8735aba3793720eb2eb764a1286ee2b24fc10733f2bbb34670f0c248cc50291eea58ac04a5f28605293798357133a37b6c5f562e205a917
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.8.6.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.8.6.ebuild
new file mode 100644
index 000000000000..7db0256e7d99
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.8.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KMNAME="${PN}-1"
+inherit kde5
+
+DESCRIPTION="PolKit agent module for KDE Plasma"
+HOMEPAGE="https://www.kde.org"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	|| ( $(add_frameworks_dep polkit-qt) >=sys-auth/polkit-qt-0.112.0[qt5] )
+"
+RDEPEND="${DEPEND}
+	!sys-auth/polkit-kde-agent:4[-minimal(-)]
+	!sys-auth/polkit-kde-agent:5
+"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 6b6e3c2b36a6..7f3685134b5b 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1,3 @@
 DIST powerdevil-5.8.5.tar.xz 357872 SHA256 041cb684b981ba1c618627b7b6a9fb58bb4b2e4106937e228f376a8715934752 SHA512 8b2653c4e73ff4bb8fe4fc794f803e5e5ca525bcec749a04f715f7e518b3f5dacba8b83afb002804af2db6cf276ae3262e5972ad6817683fe5e7bae86bc01f9e WHIRLPOOL 44282d5d12cdacfae8ed88d643e03402a321915f67f1ddb40685f01db8e73006b0147d30c07ba2fe124acf170cef8b3b4cb900a622511d73fc4a86ba2ce8f5ca
+DIST powerdevil-5.8.6.tar.xz 357808 SHA256 64db4d23c631397632cc84183008290e86fe1ffdf8df662fc627a47f8ce8be32 SHA512 90afa4e771e33e776d78fded893e90829553f4e4e60e0d4bce49c0fe12cbe97a3b8bd3cd8a6734f87edd4c19c85b8dc5bd890bbd26282e850391b465714df1e3 WHIRLPOOL 7cb04e359995e43c11fd7b2d4f7aeb82943e61d4d377eb5ced37e65d87a204381f9162c40c599657777c4407ccc3c88030191a6dd159b310c095f13b002aacea
 DIST powerdevil-5.9.2.tar.xz 358244 SHA256 69be5802b9ba9aac8adbc835ec6c5d0c98603e4c04e5666e9ca74e936e824c8a SHA512 fd243b05893b27d821fc696683148fbb1afaea52f89cd206e9e72ed7decea8e798d17beec45457ca537506aaa4ea722ef3d371205dc06df14bbf5882dd2089d8 WHIRLPOOL c7da307d0e13d3d3a743c9e87675bc8e8641ac26b5a0bba7e6a89b7662d4c9484bbf287105c18014a2d6eb7df97a4fe8b7a2cca100466391c3e8beaf7a1c814f
diff --git a/kde-plasma/powerdevil/powerdevil-5.8.6.ebuild b/kde-plasma/powerdevil/powerdevil-5.8.6.ebuild
new file mode 100644
index 000000000000..3f394ae5887f
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.8.6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_GCC_MINIMAL="4.8"
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="elogind systemd +wireless"
+
+REQUIRED_USE="elogind? ( !systemd )
+	systemd? ( !elogind )
+"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth policykit)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	virtual/libudev:=
+	x11-libs/libxcb
+	wireless? (
+		$(add_frameworks_dep bluez-qt)
+		$(add_frameworks_dep networkmanager-qt)
+	)
+"
+
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	systemd? ( >=sys-power/upower-0.9.23 )
+	elogind? ( >=sys-power/upower-0.9.23 )
+	!systemd? ( !elogind? (
+		sys-auth/polkit-pkla-compat
+		|| (
+			(
+				>=sys-auth/consolekit-1.0.1
+				sys-power/pm-utils
+				>=sys-power/upower-0.9.23
+			)
+			sys-power/upower-pm-utils
+		)
+	) )
+	!kde-plasma/powerdevil:4
+	!kde-plasma/systemsettings:4[handbook]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wireless KF5BluezQt)
+		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	if ! use systemd && ! use elogind ; then
+		insinto /etc/polkit-1/localauthority/10-vendor.d/
+		doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
+		doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
+		doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
+		doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
+		doins "${FILESDIR}"/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla
+	fi
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if has_version sys-power/upower-pm-utils && ! use systemd && ! use elogind ; then
+		ewarn "You have sys-power/upower-pm-utils installed, which was recommended in the past to"
+		ewarn "enable suspend and hibernate support. This workaround is no longer required, and it"
+		ewarn "is now recommended to use a recent version of upower and consolekit instead:"
+		ewarn
+		ewarn "emerge --ask --update \">=sys-auth/consolekit-1.0.0\" sys-power/upower"
+	fi
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 684bdde99563..8ac0f7d31f63 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1,3 @@
 DIST sddm-kcm-5.8.5.tar.xz 49008 SHA256 0c3b903ce09a6707453edd6a89da9676ce417dbf8c0dc360f9046336dc989b35 SHA512 12ab54496dcb07ae662eff7bfe0b3c4a12ae91b4c3b3de8186f310305e7a7bfe1060ccf2d6b0dadff1ea15cd6fb666385c71230e35b86de6383122cd88ae66b5 WHIRLPOOL f3e57d59f09ff1a11a6560eddf9da0195981482ae0140a51414f92e88627261b0ba64779f391d787edf6272dfb9b6bb7124f03a4dbab3969bedd1db6f1150c6f
+DIST sddm-kcm-5.8.6.tar.xz 48976 SHA256 8cc61258cbd4c2d2a23383bd3cdc663b28feff0eb66c1edd4e808075cf08a875 SHA512 eedd94c4ceb251c155fc4a6387480f834854e3a435723af5bf0e6fab31bf036a628eec3ed1fd836e5da0beae7c1e82595a18ffa87e3c701c2c29955adcacf785 WHIRLPOOL c21c5e63c054b58d1d14493cec543e0e460014147235baf254fdfb63aca3e409f028b62e79f18efa983933864396149bc260336f62cef253ccf33ef37c9be5c9
 DIST sddm-kcm-5.9.2.tar.xz 56080 SHA256 d0ae0b53ec61fdffe4cbaa3893c97b21430eb71b54ec6fbc7d23caa5b57ea289 SHA512 eb5c3915cdad8e94bd3520de20a8324e469bf3a3e9aadaa0046d7740eba4390f91e720d89fd33d0fa453db66e96df310553bfb58f2b89a260dfef207fad59b50 WHIRLPOOL 76ad1dbc955368f02d9f045f489f1e1b0d42b81ca697e517815983244a6a425175044c859ddde5b81013764800f3db6c4ebc419d472b72256c665276470db6a7
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.8.6.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.8.6.ebuild
new file mode 100644
index 000000000000..7d96ef2461e7
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.8.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma control module for SDDM"
+HOMEPAGE="https://projects.kde.org/projects/kdereview/sddm-kcm"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+	x11-libs/libXcursor
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXfixes
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	x11-misc/sddm
+	!kde-misc/sddm-kcm
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 065410fc79c9..04eebe34a2d5 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,2 +1,3 @@
 DIST systemsettings-5.8.5.tar.xz 158604 SHA256 eaf1295d0d681a33514a6e38375c13e448655f813b422122627ed127d7ab7c5e SHA512 6a9d1819f29d5bff4a30d28e9ae799b5584384a7b75ce0832756d5925b68ac09c0dc6d43e9b5113d93aa08ada3700d3193c9e571dc8e5762d210ca75ac75e07c WHIRLPOOL 938f099990d2a2da0b56e91a5b76d4ef41b3594d6e15ff7ea84af0ce94b0f8e277ccaa9fbfe758ea43a6bc994f0d4c6ad00548feee9f72006fdd64cf6c45cc19
+DIST systemsettings-5.8.6.tar.xz 158588 SHA256 3b1c4a59df96c1623d02bbac6731f52a8deaaac30b9a30de5f3d71b4ee19c0ff SHA512 b3cc27a44bef1a065d6b3cc5157ed17fd7f7866d209e6aa9b6231ab8e88458f4eb50a1f7a6847f2e3ea57125afeb4d0f35fe1a31ed27cd9d4b2c0b15b3302be6 WHIRLPOOL 68576bdb4107f7ce7f7e8afe0e9149ac7d2132fc11d981f41d5ca0c22199f5f6474fdcea01ab04519b4f5a8a26c76c6c50fdd570c2dafc16d826405158cdaf83
 DIST systemsettings-5.9.2.tar.xz 157868 SHA256 a7f9827178e04f8fbf2f729a785b80261f9ae150f907afdee5718fb574ab0736 SHA512 f2ea3b053699c57874661b83b8dcc9c24cfff1de90abceff791c534e4497f212e8deedec92d24258f34794321159df8d2f28ab8b30e562455f433ae037049b74 WHIRLPOOL 2411b8155d3a68f19ab094d7c8269d4d4dd386cf498152b7843a97a3f1a48733cb96ebb69e9279eda4e67ea3873454f9bbb5081a74b0c0c4602a9da85d7881e7
diff --git a/kde-plasma/systemsettings/systemsettings-5.8.6.ebuild b/kde-plasma/systemsettings/systemsettings-5.8.6.ebuild
new file mode 100644
index 000000000000..7f6edda2b6a4
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.8.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="System settings utility"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="classic gtk"
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	classic? ( $(add_frameworks_dep khtml) )
+"
+RDEPEND="${DEPEND}
+	gtk? ( $(add_plasma_dep kde-gtk-config) )
+	!kde-plasma/systemsettings:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package classic KF5KHtml)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 1cd875c162f4..3de429395918 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,2 +1,3 @@
 DIST user-manager-5.8.5.tar.xz 542472 SHA256 bfd047cc2d01acd0139d29a88d31b4422f108186cdf1f8d67a580d0c0cea68b2 SHA512 dec55d0ecdf628637c3d80ff916109f24bf08f241756c15cbcbe4200082d7ae5bc066e15cebdfd8fbce478a37e040ce63fdc0fbd021814edc0409d74c3ca1e34 WHIRLPOOL dfcec7e46ba5ddf3634ca82e129cbecac665e5307f0f6305521d74fbe047126ccc91f5db10a330b55577997a854fc5fc3192a7597852fc56137cb14e04538787
+DIST user-manager-5.8.6.tar.xz 543260 SHA256 371edab0a7588236e17ec3694d46ed12196f70036fe7bdd68c3d17ba59910afc SHA512 317c595883005cf39e4d5552a676e48015fcb613e70118339d635c5fcddbcc4a335b5fafce36efd10a57ad7034f451ea8d8228e4fd92e5436fbedacf8a41a7c5 WHIRLPOOL 6224e4c729067cb4456c5d06f109f55a9d036894250a7b4cd6dfe71f3f4227d2e7e5d300ca327376c3db516d251bf427b8348c191fe86d79eec3669e5081eea1
 DIST user-manager-5.9.2.tar.xz 543020 SHA256 a767012194bdcf305080457885d50aba267fd0b85f6a8bebf66b4f2bbe8c35a2 SHA512 a7d4d72a3d6254283604a6db1761316654c99a02fcf5b1a3607229e425e25f24bc89baa9021c66b27c87d3640a5416cf9cc85758d2e848180c3c7195b2ffdd13 WHIRLPOOL d2485339788970589859aadb1ed0507637e31e3aaae239c140eccef61e3fc02d1f759dc89bd9dd2178943940ae697552acb62f0f1b4df199f8beafd72c4fea85
diff --git a/kde-plasma/user-manager/user-manager-5.8.6.ebuild b/kde-plasma/user-manager/user-manager-5.8.6.ebuild
new file mode 100644
index 000000000000..fd3a7bafa6d7
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.8.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Simple system settings module to manage the users of your system"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/libpwquality-1.3.0
+"
+RDEPEND="${DEPEND}"