kde-plasma: Version bump KDE Plasma 5.8.4

Package-Manager: portage-2.3.2

78 files changed, 2182 insertions, 1 deletions

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index c17d3f2c13cd..42363b2cec45 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,3 +1,4 @@
 DIST bluedevil-2.1.1.tar.xz 162060 SHA256 f18dc3848363dd7f7cce61475f336426c17b83224260cff705a96a535d0b9de5 SHA512 c5908db65dc2b3971af01b8555cb244257ed80592fe85417f2778cf3d236e34da402e8bf9bb4beba796b6d1401a1dcb1b4a651db1f57422314e3d030199e8bc4 WHIRLPOOL 858c29b76ac36af75d47c894f5da1e088d821801aaae695df619c95f8fab97ff22247d0451d3a9e7ec2253db836b4a7c1bf54a5f1b218e75030ba80189a6a193
 DIST bluedevil-5.7.5.tar.xz 139004 SHA256 5d1ca0db68f73ceed3bc3add8b9b9327a136db9740f237e7604efdd982536dcf SHA512 b99ee8f7f2834b62a8b73a6b4434c9cc762a572085c95c442096733a75f9eadb34224585ca18539832580094f855b89bff79c3e94712e1010dcc846d63e9de51 WHIRLPOOL 1797f775c47e34828e6cdb9e56e29f0a80c86fbddadf39183e5778719e07d6f2019af5310eaa79384aeea3e0def272f3c8fed25fe14e90caaa80ba12704f5d82
 DIST bluedevil-5.8.3.tar.xz 141004 SHA256 46d1138a7eb180eaffa01543af243affac251f85b905a8694dfaa81ffc5f05b4 SHA512 662e56df85d56e144fe01fb2861cff34f97212913dfba603bc3f51990d1f1ed516b4d9a861dc8c7380ae24f5a08066052b5b892157a931dc6c2da113addaa2ae WHIRLPOOL 7f3352b022a661729587efb0134d6eceb382d8c0902f02fc5756c696512faec104aa63a5ba49d79212c01fe29cbfb0eea9d20069dba115e241ac6811010fab81
+DIST bluedevil-5.8.4.tar.xz 143296 SHA256 d891104e08ab2646cfbb10859ea2f4e0374895e645e0400a46249153ca7089b0 SHA512 7be9b4b3eeb83f46ce48893af34d87b9b9826fd41cd5ad93e0294b7efda075b8cdc81f0d02e625cc59900bcb3da842b9f51995a1606b44c03ef361a65c8e5e0f WHIRLPOOL 28f64b365c51b96274c6012c98462ab2a909423c69d5d2c1da42f190baf0f64eef22cf6c08b0a8859694f8891827e001ae7a8eb176a72fd840fe9df0ec7399b6
diff --git a/kde-plasma/bluedevil/bluedevil-5.8.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.8.4.ebuild
new file mode 100644
index 000000000000..17b1025fba3c
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.8.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 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 0c3c902e28df..7d2f83078012 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-grub-5.7.5.tar.xz 153836 SHA256 7e4ba530a9c08f755d60757f2c85e21fade202d3038e50b32c9dcd775fef8f0f SHA512 8e7365f3306d508d041d59eb7ee3a29f93abe44edba5a253fb0a55a88791ce750e38749a46f19fa2fee26246799a6a9cc7f33603ea0ba8052f3b68f60e0d22df WHIRLPOOL 51df714aa432d81be88770187b4f261d4912c6ff38e81084ccd5c8f1512cab3184fb630856cdaeaa98b0b932382b30545450b1f9850c574b97dcf6179d7a569a
 DIST breeze-grub-5.8.3.tar.xz 3146576 SHA256 1351be467a2e45d62fc045107992622282e60a31e9e95c52ec75e6ce1887de07 SHA512 e0f3a2a34a3b1a2473f59862e79d4f1b4ffeead6327e54ca19fced84cb8ac50be4f6d9ded5042034a0e144ef45477ffed665426f87257bcaeeac6267f9ea1e96 WHIRLPOOL 1dd766ddb60bd6756888e879129432bae65ecba6fbcff538ac26a3dae629e1b09b2e0807278fb390de2c0da54ecbb4fc61a405ad8a4cdb69d76cad6cce329ad8
+DIST breeze-grub-5.8.4.tar.xz 3143040 SHA256 9589c394efa1076646e56992152019de76b8c53b7b19561145a6d4a7066fdaeb SHA512 260308a67de033e5e6781086bd268313b293407d83b88bf15980e42c1d9976a0e8ffaaf56448f6f833fb697e4d0a93349c6b4cbd7a4f3a5bd4118ab9560bc01c WHIRLPOOL d1883ec382662732141810a032a16653c1b2cbf70f1876644a2ba48af906e180f7e8de3e8cb456d4fff4bdc88d185fe1e078c5dc7dd313934763527cbd845661
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.8.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.8.4.ebuild
new file mode 100644
index 000000000000..fde18315b549
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.8.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 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 881d2b090505..2a17c2ac9f30 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-gtk-5.7.5.tar.xz 211352 SHA256 ac7fcaa4eaa9c86ed459c3582d58da1220bfb55956a2674ba437fd94d202e66d SHA512 2b01a74be9e3d8eaa1e2362898eb3396cba592660c684eed7978bd111bf07c19a9cbab177b0d154cc472226ed600767e799dc65802cfeab1d7fa859c0e5da8c1 WHIRLPOOL 7f3a706eb8b96939635a60cde957bbeb45a7ce8abcf34448e7fafc34bb81504e12b05725809d1d4fea539af6ccf773b9898b9f37603c00beca74cf79b52ca457
 DIST breeze-gtk-5.8.3.tar.xz 211372 SHA256 0f207067a4ab66e45de89f6c661f3be6b15d3df5faab61f99899a5ad1cd9a8f2 SHA512 d3eb49571594160f6c6299c0e807c716bb00c7ba15f59a88eea9c07dc836e0e309277bd2c46780fb16422442efaedd012611dc96405658ea3fe658db9a80d642 WHIRLPOOL 34773c8333161f5000618e12f4dd568fd441fb7f0621d1548f51f2a1db10171c2112a9cee17571c0c4528cdcd663391ccbc52b777db8cf1cb6495d89e2be2d2e
+DIST breeze-gtk-5.8.4.tar.xz 211360 SHA256 0a2cb4bfa9745af9ce74d5e9708188de0f2e86c48cb3147bd77930163b85f088 SHA512 058fe56a0a8e31ada124df9fca1afa609760da6bfb564721cd3f07e9b9a634900ac70a6356e90b601307569870f71cca1c76c1c6cef5dd8388ba59bccad9b233 WHIRLPOOL 8ca7cd06c950fb64ead9713e70f049989b62bbcd6e77a5ca7ee426a6c3fad5929943af52d4b3a1b97c95f47c9b789ab649378e8b7638e6cb08da2903bfc3c59a
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.8.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.8.4.ebuild
new file mode 100644
index 000000000000..b0820af83c3b
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.8.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 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 49e7147f8567..d42d786382d8 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-plymouth-5.7.5.tar.xz 56760 SHA256 ed7e02eafd44715e16067bc0194ad2526beb56d0fd9b7bfcc5e3ab2ba9d37d21 SHA512 f83f16e3036123a1e0e6adeb5f314356de35c9dd5d0e63d306d8e756d7e5b99e9aee3ed874f07961896a55fbda54b27ed662caa1574f9c4e0dd6733d4cb4ae3f WHIRLPOOL f9fbe5753b4ddb446297772285de0b5e7719460fa3d262361bfba8e78140a35ebc6cff2d9baf1396b1cb6bcade1faf1fca058726178a0312a0f0aaadb06d428e
 DIST breeze-plymouth-5.8.3.tar.xz 94948 SHA256 c3bd14099d65fa7a72fdd7233f0dfbff1509c2c1cec69615dbd975390730b43d SHA512 4464b32557ed46bfcc661f6ca2284bc7afb81a010fc86e60f712146ec00c3c6354e46fd7b3e42b2ba217944b3c488381a16bb2aeb594b6f409557a8e811ed2a5 WHIRLPOOL 199300a4236abbea38f26bf31ca47acd77e8397486ab2e535e1d83a93209c7be9a6ad718aef8d999f594a9bcb98ac383d4c64bf6d0695742378fdad7dc9f4e99
+DIST breeze-plymouth-5.8.4.tar.xz 94988 SHA256 72b669fd4e440b12d4f76f6ee925bf235e0b1fb7d83b1b56f4e5c0e7998d4d53 SHA512 1cf49553a08291a252b759155be465877153e7d0211361fa74101cebad9043c03d708396a08d3515f06722d589b06f8eea6bf512dc1922287e8deaf77abdd0bc WHIRLPOOL b0774479ef2c3ed50967d4a7a3fe30a0125df2c6fe5f921a1a8f575ba420cc4db91bd1ca1dfae1982bed8294e63549e26eed366557b052d98393642562fa6cf9
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.4.ebuild
new file mode 100644
index 000000000000..cbc38054f2a4
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 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 3b2b168939bd..664c776d6a88 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-5.7.5.tar.xz 12516824 SHA256 820f60cd2b4b92fb6ebfb890ff539f06b57eb7935aa3a85c7975ac45de60bd2a SHA512 7c86d17d6372cebb369621d183a3235affbf44bd02b63fa816864ce39b3570b7e0cc25f8c4ffbc61f35d241c63363cd4752303b49b9d718be57e8668de2b8e7b WHIRLPOOL e610b4271f80e590961f0c6bcf5800d19d35c6b3482fa5cc3b0f4535c8379475095032cbd6449020cbec00e0ec37c9b927147b1f693ba8c15bb01734f98d3a74
 DIST breeze-5.8.3.tar.xz 33277616 SHA256 97375eb29d91c05b8fa6a4eb3673e58c64c74751b9b8b0fac46baee857a8f12a SHA512 6181f8b02d3c8a40afb01aeb52a847d9f6248262fe71af273a094775f6bdc974ab0b7c7d614e16cc3242257773462ac3f574fad0f10c0421555c366e29d1d1e5 WHIRLPOOL 02cb24a1745d5a75852d593a439a5897d092b121e7caffcfbacbeb9083a9c75ac108979fb76e3b92536af2c4e24b3ce2ced6ba3699862235fa1adfab0d7d25c3
+DIST breeze-5.8.4.tar.xz 33280820 SHA256 dc27a3629beb6b4aa04380421110ea4f28131bea10febf25a7f11ee753deb44b SHA512 8670d1c2b30d22273499e3f770ecd5145f8f6b98e457185b91b4c5735f97740c617a6daabd9c3e8b12440af11b46a1df0c71ada07c51458df473d98c1f629654 WHIRLPOOL 9b05858624d565d02311e2d2f7c6552707712f9ae12eca85058cc77b4de922499bb7d4206e44aad1889f2c9cbb000e2981a0e9a03cc3ebf8b56a0d55bd7ec013
diff --git a/kde-plasma/breeze/breeze-5.8.4.ebuild b/kde-plasma/breeze/breeze-5.8.4.ebuild
new file mode 100644
index 000000000000..7a46fbc4719c
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.8.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 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-base/kdelibs:4
+		x11-libs/libX11
+	)
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kpackage)
+"
+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 94f734d776e3..ffb10bdc5c3e 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,2 +1,3 @@
 DIST kactivitymanagerd-5.7.5.tar.xz 80340 SHA256 d9300faedf6d27c0afca1d51fc9df669ab9bfb60b63e6154dcfb0826d239c5d3 SHA512 77fee918e36ba23e406a7b98027f162f6816f9f723004a75c038b734af4694f120741611aea1e2b5c2a64f530ead3e0e7a471474dfd5e2bc8ba7c19f83d2fe47 WHIRLPOOL cd8d8419f1f0849d8d1b4e00d1f10ca94df47f5e142ed88226ac84bda852bdb7c72151ebb5467053ad4f17201f717308b49498661f5e01a520081b9066578b55
 DIST kactivitymanagerd-5.8.3.tar.xz 82788 SHA256 d2492a54f6525a06ac59ed2d0b14302df3f26e6594a13a9398defe138979d3a2 SHA512 24c134603f924c4189f00bf0bd851411dd9b55ce79262814e6abc28e5a160893e195bacaab7470af18c58b432d1969b4b08095bb5e6778c302586213310179d2 WHIRLPOOL 09bd6f3d9fac1f2767b84b7625c86df607bd0b19f690743bd5bae3e7b1e7060b2b1ae5a061c889cfb94e101c051658b56a97657e08c65a333158c3ee2a73210e
+DIST kactivitymanagerd-5.8.4.tar.xz 83236 SHA256 22a207be17da60cd7269b72c1616483b620560a0390c9cacc30b52820a7b6965 SHA512 684c847fafbc5192e62f9353788b3753fb544096a867387fe80f9463377a39403c952491145483adce31ceb17cc689d0fd604d693546ea16b6fe5c635c8e98d6 WHIRLPOOL a683bd50b8c5043e49f045bf99a16324176bf997a63029d1b54f48b5a5c213f17b2fda2c19233825b6ef927533f61f690c55429dae7fd9b30bf393bd3be08ce2
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.4.ebuild
new file mode 100644
index 000000000000..2101992a37b7
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 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-base/kactivities-4.13.3-r2:4
+	!kde-plasma/kactivitymanagerd:4
+	!<kde-frameworks/kactivities-5.20.0
+	!<kde-plasma/plasma-desktop-5.6.1
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index b555e7b2f6f7..0924fa4e11e4 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1,3 @@
 DIST kde-cli-tools-5.7.5.tar.xz 489072 SHA256 baa03619271003e8127f270b1eb1e5e4150380f5ee4e5114da1b0f3b6bd9aa4a SHA512 1bcae220aa9a505b4c3c9bae71f3e08b7e5ab1d4f3de95e4d06927146d84d684754e7254e71754f3bfae62e7925d6843706ff978bcfcaf8bba44c95b7274ff5f WHIRLPOOL 3205a22ebf8f2a9d9f70959e18a59edaf90462ed3f7e38d263d8e8778d71dfe251e4e8c68cc0a85fec8815ffa9e30cd73c4c4694094e2decceef1ec0a96ffc83
 DIST kde-cli-tools-5.8.3.tar.xz 486136 SHA256 2bf139886a0df86e0ce932b4ff8be1798fe96e4d4e314e88f66e995e0d254a0b SHA512 a5b5e8ece7afab60ade0d988251ace7d48312cea25ff7b8a930c942172ee4d1770ad1c72004c677920b572eeaf9ff9f6c85643dab540a7202f0d18b03c00408d WHIRLPOOL 40e1e5afa94f41a135b5dee61a49b4d11280307322f13f27d079e906655762311ce22a8843e0118196e83a691a0c29bba0a40a0c31df5cc4c14a4da5a1ea51fb
+DIST kde-cli-tools-5.8.4.tar.xz 492488 SHA256 24a8a1288723793d9863454cb3b0deda0ff96f6efb952fc6ff9e4392f02beb6f SHA512 05400e69c2839a03c7c8161c8fb3f408bb9a420a37914fa0fa551d37c80c1820bcba1c1d089e4d12ec6b00140d29437d14942dfc5b0f2d45bc7eacf44ba20eab WHIRLPOOL af3509654f88ff7cfbaf4f557e2e1bae76cd35067fbbe03d5b8ddc0bfba4dd5eee9b3aa811b9a50967c1aee2046635b3c604e2821309246e545adb267444cc9b
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.8.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.8.4.ebuild
new file mode 100644
index 000000000000..d9c7a501a796
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.8.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 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 40d19e60ce4b..180225550d3c 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,3 +1,4 @@
 DIST kde-gtk-config-2.2.1.tar.xz 86472 SHA256 9c890d7e39ab6ebfad13c5453051f0759cb61beac9f7fc2df7e331c9a4415c85 SHA512 24623b5f668cb7d5dd46b96bcd0ee1ba4f2c9068995716f6658c2bdf8a41a81d76848cf63c1749d3ff365ece0399d4a54e98be4d03f992d49a04616e26f1baeb WHIRLPOOL 49f0186c6a265eef8aa8972a77502b34bc130fd2df04faab4145c6b181ab80fdefc2b9ca7d2d7979c89a5b57e36b8d0787c986e584bd6f332915316d73c07802
 DIST kde-gtk-config-5.7.5.tar.xz 147732 SHA256 3603055a4821a0aa4250a42261004b4384b53c337ee201d03e494bb18e9602e5 SHA512 88635c51a41a5a47351fa77483ad76c27b3881be28124e53fe0e4fc571dff1596c41e61d22a3e842a81180e9e3f955d8206dfc332965f84be20e47295142ffcb WHIRLPOOL 28231cbc4ac576b8b3d059e9b17faef099b103784386c0f54a6c86a1ccecebc500183fb200a438383c36211a49171b48096b0ce0218598746aed7662d847009c
 DIST kde-gtk-config-5.8.3.tar.xz 149984 SHA256 6d548f2143c0f7f2624aa857cb54c79a40cdb868942f68ab487eac86fef47d78 SHA512 247b8a07f077adc767b727b58406dff1148e9e21b695e98d63ef34c0590444933f0120a035a9e9df9e74570132f72f317396c7b7c6a68765733c5e1600286720 WHIRLPOOL 593998e11325e3cde9a9c6bfffbf11fd55ef877c6e24f27d5c6edbb7553cd844f0002d013e20598c98e832e0450327588ea59f306a17d85e1cca144c2ee6db82
+DIST kde-gtk-config-5.8.4.tar.xz 150876 SHA256 c4366e00569d8d9159ca05d183e48a1fcb5aa2e97b3851d9ca89ca31373f5c96 SHA512 87b7568fe3e20cdf5f7123752d734dc2f8abba370781cfc6d2dceddaf8d518b2543c379d539f388f151138dd3672919674c625c847309816e69b282249db6ec3 WHIRLPOOL 4a89a4165950751031460acb631283640a4c8eda2e60289c254e266c80e30fd96ae7196eb4602a8f0d96978cdb36a67f0d850f2d181b03d105a4326fa24815ba
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.4.ebuild
new file mode 100644
index 000000000000..a460448ab0bd
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 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 045d246cc3a2..6ad371516af5 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1,3 @@
 DIST kdecoration-5.7.5.tar.xz 34816 SHA256 aec3b7cbaf40a663fe4f39c5d100bd55efc1491cd0f87c99311395b9a3323024 SHA512 698eb0a403af497e51a34ca73f423cb5b4539d69f843e0683e1069805caf7c006f05e73cd4fca38ed53136a531ee536f13ca31d19c89683faca40fcc6c4d83f6 WHIRLPOOL 69e4a9548004647138f179ae3bd5833407425a57ba413e71574955b95256a2e8ee671d03c770605a0f181fe6f1fe0a645180c43c826484982c56a33e8f835bf2
 DIST kdecoration-5.8.3.tar.xz 34820 SHA256 8a4914d99082981920fa49525ac606ddaf0a8fa783627718cf3aefa1ab09f834 SHA512 3bb736ad2e1c00fee2580b282264161aab391519a6e5dfed74f2afea648b78807b8799aa2551d7006972153fdb7e5c0c047e4b9fad2651df9b71ffadedb4dca3 WHIRLPOOL a131598307480c7da9539ff2f6d1e1f2c98b1d575969d8fae9e0f71e7e54e3c5a9cf8a4bcaf93ac336c03728c1ae3bfb1da6bdb96785113cf2cf29976d485d58
+DIST kdecoration-5.8.4.tar.xz 34808 SHA256 84b619de6439256498c5a607a0b8e1781cb3f391e31fa3718dd3451f0e1a9019 SHA512 8f6667c22d8412dca2b02e081d89a3dca6d7e2c8ed85cea13ab4a3a6a99e8e2c59819a7e79b8f9f34c2d4179b8f2d604c4ad1c1cddc2f571dd9aa722505f0ea2 WHIRLPOOL db681bdadd9b291df4d6bd14314559893bdea219834ddc18d247d1e2af4546ba6b07960fcc9db3c7a131b4ade362c75419c77efe2fb121f5fc10807aa061a2f2
diff --git a/kde-plasma/kdecoration/kdecoration-5.8.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.8.4.ebuild
new file mode 100644
index 000000000000..02762505f5a1
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.8.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 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 2243afda4615..3243f15ccc31 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,3 +1,4 @@
 DIST kdeplasma-addons-4.14.3.tar.xz 1791328 SHA256 12d58e30362729473db208c0650676dac0fdae8b3f223ce92e8df41e3e928f24 SHA512 e4382aa1aab27ddcdecdd53ca0d931b9d53d27dfe4b53736642e1e030ac940ee6909029d7ddb865ee13567facb4e380d3c23601b9ea985151fccba8860077925 WHIRLPOOL 13b3a9f6706bbdda6ab4010aedbb1da4f677de771e3bd5f7c6dc2074db413860ea26bbeae919b7927e31116f535f51ef67ada1d2aa3b368ca4df23f4146a4165
 DIST kdeplasma-addons-5.7.5.tar.xz 2077476 SHA256 0066badd4c3a76d31946ea0824124c9efd5c05f073672e5123e70f9a155c1613 SHA512 3e3376a3ed19c0965a918ae939903cb99da89af9e18c0e6fa25518d4d6464f34ec84895d6aea3d78594c82b4978194fef8142166c5a788212ca8e8f801cf6b62 WHIRLPOOL 8841f86d20110b2e98220963b87c38a528969bd7c6f0a70d596d828a10e5c64159d8876607b0446941966cce79d7ee63484523d1614e355e1475da0af5413142
 DIST kdeplasma-addons-5.8.3.tar.xz 2073968 SHA256 63220c0b7301eb44ef3e96d4f1a7085b340a0bd49884d26b52237eb7333853eb SHA512 7a2f8cb3995b8e0499fed35cea5a1b8fbbb745e3695fedd57e719014adf1b75a785cb1287e386f6f9a38731d816079117839c5a6c8f9e938b9a466305f74bb26 WHIRLPOOL 4eccb2e7cdbf5c310210afc94111c0d8e7c10ecf94a800163a4ce8f3bb71fcd822f966d4b1c5c10ead8812b44779a55904e6e50412914e985bfa57dfb3627040
+DIST kdeplasma-addons-5.8.4.tar.xz 2094560 SHA256 e4bb570e6dd11f48934fafeef97f3e68504c8370684b184718ddbf7b9b292938 SHA512 88f087baf1a9ee7fc8c707f3f8db46a49c083a4b39f057ca7fd1f8b0c41c35eecbd5b6b2e6f600548fa580297234b2a3f0781378b6bafe09d4c80171194fa916 WHIRLPOOL 0c5be27d5e3c40adeba3b27c4105c2b59bcbd06002d5e3a78a425213a63731e3fd6987812ae69a0e61a01486e9d532887d63ef2b9dafeee7517cc6b58713414c
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.4.ebuild
new file mode 100644
index 000000000000..e77661b8b551
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 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 12b119f6ff70..ea2a5c85de00 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1,3 @@
 DIST kgamma5-5.7.5.tar.xz 60388 SHA256 53779db5bd9d92a817af9b59bca9965856ca89ecf3483ffb4f2b4fe38cb05bf4 SHA512 66e03850a4d30f499a839c839fcaeaae7199083e3c720f7e43fc0ebbc5607dfd7661665bfe38e4bafa7e8bf7cb72409f0d35f15f3c36ae8aa94e435d2ae4eb5b WHIRLPOOL 53e694ae64f00584bdf10afd841fe2147f454ee70cdfefa9bcb69bb1558e320a383839d0fa70607cdc6a8ce6ee49b0faaa3f9ee0c7f4c125dcf9fab35d7e155c
 DIST kgamma5-5.8.3.tar.xz 60420 SHA256 c500a511d8812db620bccbba7070f5b01bce0c2cb92b67745974776a6a1b110d SHA512 d6964b019236443b3ae18ea5d161e2e4d4c707a3b72d9fc9c007a08b1a9e21135220637d5a4c87599a3c0fcaa6811357083465ae27c3011dd70ebb52f06df5c9 WHIRLPOOL 8f42bf97cfae9d54ee3e4497099e9c8889e1f0f22a4ef57163c63be63b77e1711bf38e933addc83cdcdfb0130766f3d2c0f001ec93d8665a088c513f0712cf67
+DIST kgamma5-5.8.4.tar.xz 60784 SHA256 e1b94ff3920b1335b788f49a818e25d1ca13dc7a909c210bae72c72766fbb5e4 SHA512 ef787b6d09adaec3053e490197ea0851a443db113d4ef4ca3b7e1d2ef7c992ee5898f944a3be20561eea31c0d58f780b2800a1c21b15c3b59eeccbe84531b395 WHIRLPOOL a056bafebff9d9f4171bd1c76a11657d9391ed2f5b23427ef8af83f2212833a0af5ae273d8cd3d5d9ce37686a70bb130d3d096c4a672c715d3978f9d9e93a5d4
diff --git a/kde-plasma/kgamma/kgamma-5.8.4.ebuild b/kde-plasma/kgamma/kgamma-5.8.4.ebuild
new file mode 100644
index 000000000000..3e58d8907c0c
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.8.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 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 9de01fa57957..1b5c4981b6bc 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,3 +1,4 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST khotkeys-5.7.5.tar.xz 604704 SHA256 efca5ead90388e3ef8ad0612e7c035414340da5273dd486918af25b3e2fca430 SHA512 c6ce53a05277dc8ab579b75cd4b93758b789881e7918a18f44f8c9dbdfc4f8b242e6fd7f5c9e5751479e04858671adbbd50af5e4985eba242a9f8cab487ced6a WHIRLPOOL 09dc9022463eda08a2608325e282a70d9f685e5e138684e14f99bc35e8a8d48ca6829ae1ff274f4bfcfe1ca8f73b0c0aceb16e0214befe9dd6a33ecf3deeebeb
 DIST khotkeys-5.8.3.tar.xz 604784 SHA256 c97f533f64d500ed3eb3b0a2bd88f6c681d3f9a8e3b5a7d3f910a39157d31c53 SHA512 492d2157741ce0d51a49f79f3c3efe5c748f3c0405d19332f24f9e6757b17e29915e0c2e5f3019fe52d4511d7f3588c5b32e9bf8026eba6ed61ad772025f6038 WHIRLPOOL fc9a16f71db33e13734028070740ae46f9619e8c7e9e1a600d0e3f17a52beed11c9f8c75c38d87573783468d45a68aa59485bbf657909ed3593f4039726b145c
+DIST khotkeys-5.8.4.tar.xz 608024 SHA256 83da5352ba44a4f06d370c27c69645518554ef4c86d32ef783d1d0809532e6e0 SHA512 4d439f7ba6d3e16a126c9054fbfa51bd89692ef5683ca2880191ad35a496bb7f2fc33fdf1c5f419c699089e6b27006076eb736177cb8db524c16cfb1e3025feb WHIRLPOOL 82d0146ce87bd4cfe8c95c158ae65d36885db6c63138d5340091575c377cb63db8c92a2d723b2281b6d7e49f5dc9a23227b19d43dc8dfcd25b79cfa435830e0e
diff --git a/kde-plasma/khotkeys/khotkeys-5.8.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.8.4.ebuild
new file mode 100644
index 000000000000..41bdb50d08eb
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.8.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 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 260f55fb954c..648670834958 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -2,3 +2,4 @@ DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb4
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST kinfocenter-5.7.5.tar.xz 1248860 SHA256 f9cdf5575d332c4bd7f46238d3cd957a27b534a0e163d58fc7844bbc65115238 SHA512 3e08f2782004b56440395a5643f42b56a4adf6380eab15711a2397d20539e9116724f846f93a0db8bea9526f76db8c656fbda750e9742f5c9e0e33c060f0de1d WHIRLPOOL 5444078909e720501042aafc5420f60a2611d95f7cf578eee638d3f9a1d048830fcc2b66b607afa2a1c098a7cee70ea32eacb7e7604ccd7654ec0aca0a871618
 DIST kinfocenter-5.8.3.tar.xz 1250572 SHA256 fb06f1eb28aab68a4659b999a6b991ea28165cc25c1ca2321515c25cc2f349c3 SHA512 849f7ae522ff5b195e4f983c1f3b7c9ba980522dc1836a1a80755ddd93dca441552c53a088019d3725ec44bbf07c94269d7be1a466528e8fb268ff93bb6a714b WHIRLPOOL 44ee4424d4fe107cd1c62fa91463c88b720ffb489785d99ade7108e921b579c5f252050fab9eb215f14bd37df537d54f0797b10a570ceffb5e2c8ae66e6909ef
+DIST kinfocenter-5.8.4.tar.xz 1276972 SHA256 6dafaf7fc5d74f959aa358b6247045fce4093a73863c25b1c3b76e3817b9dbd6 SHA512 af1ada09df84cd9e37d99d7c340b1e1c9e1568cae1ad09b1654e9390eea053e5013bc9a7855b7ea6613e2faea643ed142d1714c914ca9444edd12b8a0dd6943d WHIRLPOOL 692d07cdb8e77ba81d00c59cd2a1ab31a8b69f3685217af3588a0360bc89a891d172e81859e1d5612ad8e6387dc14a33ed40aaaabe735c48cd74a88d16ae4cd9
diff --git a/kde-plasma/kinfocenter/files/kcm-about-distrorc b/kde-plasma/kinfocenter/files/kcm-about-distrorc
index bdae77a9c687..b55389fd8bd1 100644
--- a/kde-plasma/kinfocenter/files/kcm-about-distrorc
+++ b/kde-plasma/kinfocenter/files/kcm-about-distrorc
@@ -1,4 +1,4 @@
 [General]
 Name=Gentoo Linux
 LogoPath=/usr/share/kinfocenter/glogo-small.png
-Website=http://www.gentoo.org/
+Website=https://www.gentoo.org/
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.8.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.8.4.ebuild
new file mode 100644
index 000000000000..c9048810b95d
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.8.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 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 bb285f0d3b77..380a69ec23dd 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,3 +1,4 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST kmenuedit-5.7.5.tar.xz 652176 SHA256 a12f6160ba7b115cc5a23ef1e1579d742622e92e307ecf3ad13fad0d6ef42dd6 SHA512 10cf27a3addd360170f0179cb4df4f43b3b9abb6161f46eed1d4b4674be137e0bf1299ad80c7ea4abe247eba671eafcf07110406a37704ce0bfdeaeae3fffc36 WHIRLPOOL cffa0d38eaa9065bd00358ac3c0cac3d5898d6016bf99f8e768bfc35b4aadd1f4e5bb1f8057bdffb2c21c1ad1fff331eab5e2681ed504e2ecedbe84fa011c220
 DIST kmenuedit-5.8.3.tar.xz 652360 SHA256 8759bcd45ba0e4a8698ae33e975bc38a247c1a29b01fa49a45a1211e4589f21b SHA512 605495b5e85641eb2615443866d570d8ddc7361caa5e9068a8f08f89a4dabebf09c716d1345eb1e54ea30a3a8384617f0c20819a489a34370e9c5641a4e6f5d6 WHIRLPOOL ba87d26439da47bac4ada480ead7ff5534c896adff70469a879be291cc886f88d60353b4b2b294214e8c5a5668b1809cd6c49518308caa9e76a7ba330bb6f522
+DIST kmenuedit-5.8.4.tar.xz 654760 SHA256 1059638951ff0b6d7e2a16cdae875fd2836564e52187a0e1d9df66d5b906a472 SHA512 8648824b14e1f276c987b0b0415ce2b19f209fbd22c882c6921fa7058e26d900b6a5d61544c66ee40192a3cdcadae9fce9b6889120a1a9f926b5e4c9b7c13de5 WHIRLPOOL c8d4188f43546bf18ca7bc45b263e927237e856a77390a6e3fc7d67c3a5947c6aef50ad4da3b2593b171ac8f0f99bc3c9e7b2feebc3a3ef4cb925d5f8a41c020
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.8.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.8.4.ebuild
new file mode 100644
index 000000000000..d3331a964b38
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.8.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 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 d7ba331f6422..e5b706d7d646 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,3 +1,4 @@
 DIST kscreen-1.0.71_p20150824.tar.xz 93080 SHA256 ae0a1830d2d7dbb350e217188c77bd30a10decbd56f056f7e2fd0964071d95d4 SHA512 ac1f71219918363d298ee30022a9207da912c4293c6056d8875425b80c70010d7476591ca366eae5af97a298511c0e41ca748ba0c570d632f490eb5c3eae3c84 WHIRLPOOL 77721dc3a03a0a5eee543418379480da2c182497ab58a1aed7e513b228d406588187307ad848ddc3f6e6566e4a2039acec5428d04bcf597816c10b2d018a2f55
 DIST kscreen-5.7.5.tar.xz 109144 SHA256 8d1d8c28591b2369510440f99321b0d97468ea9aa5a6eefa2a3385671f5e56c2 SHA512 df057cb36b095385d0e634a149faabd6a7f9413256569e7a2dcb759387e80ed517ccc21b1e0a7f79950444579fb0f2e2a28ee597f1d14cd3ea9667c41517f43d WHIRLPOOL aea5c49a9b3d17d2393893097fc03902136aef15678d1139c7b6f7045d9598121b53f503dad18974e525cfe6e946415501ca20d67a6b19c6d39bd1e9b138530c
 DIST kscreen-5.8.3.tar.xz 112844 SHA256 de06798fa6d73b9dafcf25c90ff1739bdea0d78082a2aa9e453e28db7b6fb41e SHA512 74de567da96e9b086b8da45f289e842c93e00069c291d3e6420528ef91cb5aa79d9413b8458c6f6653ae5646875a08322fe1da5fbdcf735fce26803445c4585d WHIRLPOOL 9b3b4286ed039c5c9f4a999b93b23e1e666e4e82b4522f839e8a9440dcee9a615281606583c41ab71edef2b54b2dd6ded0c0aa3c0e11e1f27cdb20b47075d3c0
+DIST kscreen-5.8.4.tar.xz 113644 SHA256 141a75b8f888d5c11cb772f3abd679386b5a3732290dc4be968ec8b4fb7f83c8 SHA512 8a77a5ffd33c5dc0ed78f8d9f2bd785422ed87ccf9b73db786d6a9347987a9d9b19e41d12f3605e0e54490fe441bc511a749bf336a8131b24814bd607909f316 WHIRLPOOL 289bdb539acc360cbf028ad8c095992feebda564fcd1b470bf09acdb819899334fb5f8332b7730e0aacc7ce4458b2d08361043ff71d7e0e0f79df913f36b4dbb
diff --git a/kde-plasma/kscreen/kscreen-5.8.4.ebuild b/kde-plasma/kscreen/kscreen-5.8.4.ebuild
new file mode 100644
index 000000000000..db1af6548358
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.8.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 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_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 ae9c74108b69..15db271c4c74 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1,3 @@
 DIST kscreenlocker-5.7.5.tar.xz 102996 SHA256 65ffe3c15f71a8fe2a57a67f1edd91c26ac4b4be1dc566a3cfa8e57cb5bb0de1 SHA512 8985e9f4aa3a390c991c85ffe6993708a491df79e71067b7764c80e59ce76a2329ba22f26d89e9b44e2c11d4cd7c563ae60c61052eb217b9032cc1583c34d8e4 WHIRLPOOL c7c686142b64378235341c1eec2d49b6f7fd42b715b7493db9420f7ca3832209a487760f3a7a4b4016229fb0995b5ee12cb73c78ff7080f406a0ca40ea0507b0
 DIST kscreenlocker-5.8.3.tar.xz 108092 SHA256 fb11eca8c68ee60342433d0f8e2ca564d3afd4abbfd86daacb6f3c445800310d SHA512 91bcdef2b71a94ae6591d55ead9456a001a291d30f83978544aaff83e148fd446d8c2d5165e628056d8459711861a48d1234fa7689fb7d84a7e7ebdf6e0ea0b2 WHIRLPOOL f1e24732a7e67ae6fbf73bd2fe6ae8d6d9d5ba2cf997e6f8bc2ed8fdb790011676f803a7d3c2c16693db761b7be4d087ca69340ffe482359c386bc3ead1895d0
+DIST kscreenlocker-5.8.4.tar.xz 108576 SHA256 1b9b99fb8cb5d67050f6bd23b2f10a7e1520f02031e2f090ec344111dd5f9cd8 SHA512 c14403b4218a806d093036a4e9d1950962f42e3917909a51c4ee6a7341acef2836face53322a77426fea0bc3febfe4c496a2a4a5d6f0a7cb84421db0acdb933c WHIRLPOOL d0f751c68cd04be81559a0d67172c2785e88f257668feaf3e5591b77ce05ac3635564d8104b53ea5d0f8141414bc1d6cc94879bfe06f4f55ac1521b4582a39df
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.8.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.8.4.ebuild
new file mode 100644
index 000000000000..888250eb79d3
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.8.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 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-base/kdebase-pam:0
+	!<kde-plasma/plasma-workspace-5.4.50
+"
+
+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 121f029356c5..7a771c2417ba 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,3 +1,4 @@
 DIST 50971-ksshaskpass-0.5.3.tar.gz 11010 SHA256 a3a47eba74a52ec3d9d8740ed9a29a5aa852d4e268b5d81154f85b90258a2124 SHA512 0274b58fb9dbb634688e5ee8b22a88012483907769796733c79f8e3c115463702a9cdd787d49d0b94a7942f5f88ed3465a6161d6e4516711b2bba5c47a91fa50 WHIRLPOOL d3e68640d3e0049bdd071fe72bf0bd9767bf349c94b2fbb42e7fafe6259d895ec2d5122ae9477e66073c53cbbda704ec0237328dd948b21207b2db2b39946450
 DIST ksshaskpass-5.7.5.tar.xz 19232 SHA256 967288a9ba7b007dfdc540db00b3b9ab44c4195630144f26b1fc5b780dd00939 SHA512 4ba4d865e51e8e8ec416b3b164bfb46f0e44423b7abdeb6360cfbd9b2f743dd76664f9844120e102f575d5b0babad20a36846b94e921db43ea414ecc08fe43ec WHIRLPOOL ca55d956678b73e803e0463c82740e8b10314c598ca6a394b8b436155f6d0b36a0ca79e72d9016f4e55639b8ef328362678567fab2adce3ef16ff9f573938697
 DIST ksshaskpass-5.8.3.tar.xz 19252 SHA256 72de4eb6adaadef5e4d30f10c22bd0aef1d5197070589f54d03b7983d7b76e4f SHA512 21d4650e841333bfb6093c4614c80c3e848be1da8f1cdaf0ba3525ac72ea75f31c10043daa1bda250203fa42726928e7103b8a5082d53aa02032fdb314d7b9f3 WHIRLPOOL 9c0ae0fdd09fae5a6aa8118253994fcd72b91efa5fc42a47f1c9ce4c4c68219ffdfaeb912dc835a8504c0a613b8b66da0bb14ffac091559c1081c880d8466e07
+DIST ksshaskpass-5.8.4.tar.xz 19408 SHA256 ecb30f3b9d66853116c096c26ebdca5eb6dc731311f0a454137f41e07395750c SHA512 8cb1b34e495aae416180d20219766811c5776b32bf86a6833f3635661c422b6ad988ab172cc8ac1e35acb06f42ad985296f4427d905b18a68d2a186da63b0f90 WHIRLPOOL 03096f22439297c97c57aa6d23c7dd813e7a2a3266262a7b2e923be56c958e5cd9ad1ad19f3db6011137ecfa961506524594d0631918a28e01d20f9121a1a4e1
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.8.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.8.4.ebuild
new file mode 100644
index 000000000000..4fed5b5ec2c5
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.8.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 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 de22a8b31328..0bd37df731d2 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,3 +1,4 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST ksysguard-5.7.5.tar.xz 487508 SHA256 4767872c282ffade3f113b9aeca95f0ec4d70fa7c3e8ef14e12ab341004a3e2d SHA512 b882d57d0fe5fc36d8d9d56819a3a9d002df1e60ec324e61ac9cc30f933b737658270a47c9482985724d8cac8c2c582ad494ac870df6e2c2ac9213966bf3ae21 WHIRLPOOL 3ae8b03e2666b69d6aea0043f5cc16dd7e90d1f7bcdb89e2c8ae42014630f80fd068d9271e6612e991cb4190ba9086fda7c1f9a0ab0d217e0d06576d709defe6
 DIST ksysguard-5.8.3.tar.xz 487732 SHA256 ed9bccff28f62aadf201ab6c88f35eda997bd1ccc2d4c3d259216af740753528 SHA512 2fa7251c1be8bc1dcd77530d4cdcba32227116bbdcda05e61c0e911a9a82ae2d73eb8316cc80fc9fb5f0015fde1f5c997ba2f7676d765e2750e95bb14bb89682 WHIRLPOOL 391b4b2d7665f4d3e358fe7754e3d68c24c145fb24e644c9490c53c2a68ebb13ef769e07f11b1a519c737707bc7028c8266878aa98b6f0cf41baf7313e424f86
+DIST ksysguard-5.8.4.tar.xz 495320 SHA256 63bb53b909081b56d3f1a278881dd56e8562828c03b6bdb833737f299818b2c2 SHA512 20c82f655d68c9eb017794a1b458a95588ded6e24b8984df774c3ed35e8b4df91f34310c87f3c715e7553e5f9c1950748c446710ed431abe6d89080cf0f2a02d WHIRLPOOL 6ea82664b2e878487605da5d14e8e6fe0f8821528f62454bd023fbae1227bf0c22e326daaebef44f913ea62441af7f9956613c77a7084ff73b88ea4362c2413c
diff --git a/kde-plasma/ksysguard/ksysguard-5.8.4.ebuild b/kde-plasma/ksysguard/ksysguard-5.8.4.ebuild
new file mode 100644
index 000000000000..6efbc0b300f4
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.8.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 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 2aed0f263f36..9af79df92640 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1,3 @@
 DIST kwallet-pam-5.7.5.tar.xz 17648 SHA256 4a1bbb60eebae92469169826314607ce5592559a13027f0c4b6200c1d1755dd2 SHA512 ff8694ce9587b402a0ccc74ac6c293bcefbbd4ecc01817f958c28b5c18da28ca9f3a0ff8eb48ac8a55d54e2d68cfefe147112bde11395d5b1350819be26456de WHIRLPOOL 854d3263d0de34c96f7a49b7fe905a1d0d586634640b4fee8c7bb4577295db2d56c7a102b342b1314d6d0b7cc07a2adeedfd4d62203d8d1b57bc1969a3dfd1ca
 DIST kwallet-pam-5.8.3.tar.xz 17668 SHA256 ed624dbd26ce447128d85ffea988a9b58a7537e0b936f008bfe2d67841fc75d1 SHA512 fcee6e1c3c3f8d92c461df5a28400147787b5e7e08a0ba2ce1f408d9bb6dc8a0be06cb8850475518fedeb7527bbbbe0b85241779ceef3de91e2ec07e0c75722b WHIRLPOOL ac2e45fa5299fff60aafd403ebf7e432a39eae50072e26d5ada1cadbffa65413abd94b537b659046dd6f1e16f68a1475081891a29511f31ac79a91d0921edeeb
+DIST kwallet-pam-5.8.4.tar.xz 17656 SHA256 9689604b63e34a3ec17fa945e21a3184ee46c510886cb754415bfa4362e63891 SHA512 c52cb70c71fcaae2db1c3e3365457e8898dc395c77a953ce9666e8ca795f3a0f255175d081d017e6c4ec0614fd146a2d8e6b70eafa2ca1e5eddf58e8ab38650a WHIRLPOOL f2a5669e86842d60029bdb7183b37b5283d451c51fabfeb8151718a2803302358c25394c702e9f3907a74cd517d86c2b34e3638db0c0034782025a1fd4c8a469
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild
new file mode 100644
index 000000000000..18dcab74b264
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.8.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 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"
+	has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
+	elog
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index bcbc54432c09..ce9cc6d3bbbc 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1,3 @@
 DIST kwayland-integration-5.7.5.tar.xz 18076 SHA256 d487d994414747db0efe6a838b7696431ceda1392fd99e158d4b587b0cc648b5 SHA512 765c5dea8cf1c9cb2fb93982c438544c49943203d037468e605720cda8831ecd47a618b2bc32dd12832c560cc6d2b23eca1c546acf11bf539b548e824d30b2c0 WHIRLPOOL 3ff2f4d8db914811d17deb3ab92f542e2b64ea5a75a452441389b98a4b44cd6af2a4eea0be9bb3f60ff85d18b2a075a6a46ec4eb2218c63cb50231dd8aff159d
 DIST kwayland-integration-5.8.3.tar.xz 18108 SHA256 842a8eea9623a5e335ac585f9ca0453518c93606d0d37ce576f6ee188039e1f0 SHA512 54d16fc90da994994d63393fc272688c322c6024336f3216016759b3f215f68718ded5c23545b78ce75d30fe433b236805b6e30518f285429bbabf222d80cd30 WHIRLPOOL 6bee19a28e35b45f290ba07593cb4672cc579a5c95b6112757d2084f9650fd1708bff07d187dd72e656769696862aa07d3fff29f181f792814a5509048bbb8d1
+DIST kwayland-integration-5.8.4.tar.xz 18232 SHA256 4789c794af752f29f8e01577719e6ea7382acae8a995ea134f6497b0d6f072e8 SHA512 0cfb25fd5dcb9ab72b67ada0cdaf7103e66539930bebefac6db127ddf419580ea5fc9448a281e768313f6f68ac4f4e221ee9d7b343c3980d59be5dd7a1e29d70 WHIRLPOOL 9e08d432d8b964dd57e0325978ec0497d0905e2b2e9de409746bfd7b7dc59285aa8f8d491b68ba895b65a630a2c586299b0adf3213656c9b9f0d2a7b9eabb608
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.8.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.8.4.ebuild
new file mode 100644
index 000000000000..a31f195c043b
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.8.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 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 be35dff21b48..89416660ec27 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,3 +1,4 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST kwin-5.7.5.tar.xz 3936628 SHA256 ab1e98d3ff19699c89343a51861202dd93c913eb9d9215118c3fab86e99126d6 SHA512 6a7dbf9cf66006516179c5868e47038e0f967f3b2bbe6b431a707cd8ce03cc8dcea800f1dfd6a9482c30321e3b3b84593162bb050f045be4cffdadbc0090f9d7 WHIRLPOOL 75537ec4717e6a41280f97fb137ff28459d03789e79897a81da558c7fcae0ac08c64e9f034d6d9ef42e290d894173c96a1a3ab9dbaa9c6193b3d1272fedbaaf6
 DIST kwin-5.8.3.tar.xz 3976096 SHA256 3ce0be9e6908b8658df2bcde203b71f4c1132e0bd273a2d7d5dea81adc097f28 SHA512 a4f8b45411bef9a4cef9a0899a5cc9b2133af9783fd40e5b4cd0b11f8e426eb57bfd40cc97c055d6a9766b3e938fcba166efca9ce206ed6746f938234bbf724c WHIRLPOOL 13258fb4c3dcba82c5a5db70fd54f7ee9d3a4e45703cebed925ea1968f8d8bc0a8b2344639b8496efc64c06bd870fb6acbb3a4233bded264126a01745521c153
+DIST kwin-5.8.4.tar.xz 4018848 SHA256 d60d7ffece656fb693da54369034bca14b6c3f2c750454b7213c2ac1c4aff4fd SHA512 b554e8962d07771faddc73531ad876a2bd7ca9c069a5fdbc0467f45f5a4802d98df8a87841e8c3fb4cc5deff04f2279161237fe4f1cf0c377de6885f68ad5b9f WHIRLPOOL 2adfae9d803483021f28f6b19694a3628e66b7d6ba7fbccc7f298ebe6c86c0cb9daf62099cab2cb1d292689d261970dbc97339b2b67d0ccc9c210cb8b9a3566c
diff --git a/kde-plasma/kwin/kwin-5.8.4.ebuild b/kde-plasma/kwin/kwin-5.8.4.ebuild
new file mode 100644
index 000000000000..7110fb49890b
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.8.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 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 6e74b6a172e9..ddeb7e57c231 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,3 +1,4 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST kwrited-5.7.5.tar.xz 20216 SHA256 3a63a54fa5c199463da526a05e755c5ffafd2b12ea4c7d1212a96991307e124f SHA512 a82c824791e2bffb08fcf39d37082bf6cd12aa98374297b470e545e5f89ef8ac643a29a6f0747ee89cc383a553851328bd296bf4c0cd6b0ec4357399d7547ec0 WHIRLPOOL c906d062ce4eb67eb86bb2cd051bad62f6bfa5a2cf641ff96303f0b4cf925a405bd6ac847d9897040d4b38797658e1c222fcebb6854f8fabb7a18596cd7bab31
 DIST kwrited-5.8.3.tar.xz 20396 SHA256 893131e4720f2d861a9a5decdf7deaf0ab0fdc2f6dee95e325c674c37dd74e68 SHA512 7564e5eed2191d743939fa39e443d1ba27520afc6e3cf1d58267fd191ead53c719ded02a6f394dd003a020a83c23febec8bd128ec8df7b7b636d4a60821d6eab WHIRLPOOL 1f2a8cce2b826582d7544e05049e3fb0f4803f1f10e0e2b045bfe5bef2c4d29a4cdb91cf4ff13cbb511e65918da7190c99ee02772cafa66803bb0586f59ed5e9
+DIST kwrited-5.8.4.tar.xz 20412 SHA256 fa5c43a71fd2bce210fc2c5bfc7661986f28bd69823c5ad615b17b932229a014 SHA512 326ccd114dd8abdefdfb8cfababfadefefd09fdd99d3f53061d828d20b40fb5817d47d66a1031c08f68d7d23aa3cb388029dc51283fdb1801ed540524bb340e7 WHIRLPOOL 42fdc9725a9389921fc02092ae4f91824dfec309cfe7fa200c0d90cdecf7099aa694436582afdbc2a91a733f6fb386358bb820848e2861c61718e265e5f2e29e
diff --git a/kde-plasma/kwrited/kwrited-5.8.4.ebuild b/kde-plasma/kwrited/kwrited-5.8.4.ebuild
new file mode 100644
index 000000000000..c2921dbf4d4c
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.8.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 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 2c52da0b3768..7d7f013ffd72 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,3 +1,4 @@
 DIST libkscreen-1.0.5_p20150822.tar.bz2 38419 SHA256 25cf4117dc99c3278a8abf315fa31ea3a3a1e065a2b28c37a26b2da508bee4f6 SHA512 2a35b63f65d4440205ff11fe35cf1b87cb656e0647eb7d2c7bada7dd6b71cb86d32ffb20a3b63e57d6444f17d3cb0758fc015e95bec62747189fba5a50fab48a WHIRLPOOL 8ccdd2ff43fcb186ab31653ac47e8b8f86be4a5cfdb9231b2e4f57bb335be578658716fa490141ccc91ac636982f28ec0ebc724d69058242d3deacd3e8c00383
 DIST libkscreen-5.7.5.tar.xz 90280 SHA256 e11894969cfb6d094f6cdcca1ab3a2d3b1238f17fb6645119629737c1e989c7c SHA512 a4880911b931251dc12d1d04f9157d5815e382b42b6337aa9ce1ea580cb379e748b2b5b8aeb1f06af63d28c6a9e7e7ec21703d87d7d7655b7522336138c350e4 WHIRLPOOL e73a9a4f81a0d2957e733a8e243ad19fe3365c42753ffb32421d2279ba3d96e17c21b1e45b7fd6c30b8aa53b5897c3c0f2434d6a9ab72af4fecdf6f46c323b98
 DIST libkscreen-5.8.3.tar.xz 92896 SHA256 a76f976494ac98b742969830c350b89b354b11a854c1d884dbe0daecc79c4a26 SHA512 781610f438189dfe0afb057a97c3aae9b134faafb7b7badfc625c514838eb42fda4f591e19573ad33ffdf479648e67f915b0e7d23bf7142ec3972219eace2d9e WHIRLPOOL ad163590618b3dea408151e36f91d17eea718aaa747c335700f88dbd5bc15cdc55c34f5042213e95005eac94d8a20e662b2ff25489d9567e1198ce63b53b2403
+DIST libkscreen-5.8.4.tar.xz 92812 SHA256 d7141d177438a29c40802646921bf005a8df7f8483127668b6dbbe76ab2730ef SHA512 1099d9e33b852005c6d4761f13d718f6c6f8f9f7376cf0904cc493388db46876a0d4d47e4bf8ab9cb62bfe4ce0b47ff12eca895de6297ce7298f7bb2226ae55e WHIRLPOOL c922facc70e9ad4f6a1eb0d76f02a46065413c0875e9acbaf06064e45fc85db8a521dc5c6eea851471e975d3b140d9d7b85e4637b557b083554e7276a63614dd
diff --git a/kde-plasma/libkscreen/libkscreen-5.8.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.8.4.ebuild
new file mode 100644
index 000000000000..88ad88a41117
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.8.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 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 b149fd1cbb9a..52b25988c69e 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1,3 @@
 DIST libksysguard-5.7.5.tar.xz 571364 SHA256 8584e4ee30b7e260c82e2804710781b584c4f11eda5e3640d9e551715828da47 SHA512 1998d96183768fbcb78d088cd26bfc248ccffa5b7e3311ca67a985b731a49b8e135a0f4b3ddf14865075ae2de8b41950599411b9b03fc45df554ea80ccea64ff WHIRLPOOL 2a3fcf162d029e55f8a2acff090a8cc4500089b214440e40d2599a6f9ca5ace5442b49d0d8d0613af7d17d0ae32d7883fc46bb210582912fcefb5c85df424310
 DIST libksysguard-5.8.3.tar.xz 571500 SHA256 9e290e62e21864de32d248dda75d6adf9b87ce119d45c1f306959a9a290cc084 SHA512 2f1fd3c35f10e05ac89a193ebcb86ad968abd4e2dc3c1b8bc929128866c6152671b8d5305a9decf66c777895bc4fbec61ac31fb2d0117d306581d85252cef8ac WHIRLPOOL d33e7545c86b2926404de511a4e55456d4d62f83e136b829c62419f31eb15207b44080ec13829f32c5badeb4775b87f3f3d8a3784f0e688bec02cb014cbc637a
+DIST libksysguard-5.8.4.tar.xz 578252 SHA256 f84b37d6e5f605639d96d428f8eab6a9ea8d995cda6bb5610e53ffb971218055 SHA512 db7b00d95bf1e59fb012897dbaf9e132d86440f9c89ec3bec23398b405fb7a32ee6244d554044cc4439d966260195e15cf5ca6529ed28e76ae9149ff9db3302d WHIRLPOOL 882a81c121f6572304b9e85bcbc77f58d46d6a5b8ee0703e78ae0cb0fa9b453d6989013ffca9a7006c7d005f6a48f5061e88782e90d35045c635cb9a23bba7a2
diff --git a/kde-plasma/libksysguard/libksysguard-5.8.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.8.4.ebuild
new file mode 100644
index 000000000000..36331c990630
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.8.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 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 9c770c3f4b6f..864193660df3 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,3 +1,4 @@
 DIST milou-0.1.tar.xz 53196 SHA256 cd79e5a95310146269ba2d0da4aa9dbde300ead8d54747b8edecfa863d9fdfe4 SHA512 0de077d12237e1cefcccb498b80238a02fdf2788931f835858551097337b71c5c3bf80d7e4c70d9db9fc2940b2127e0c68511130cccc7a72fd7cd67e4d7b0e1e WHIRLPOOL 31901e729d4468927e546b46e7ead5082ae7e0470315d3835fe55f3b0b6fedbaadddb296fbc29055e28401dd5e1fdab4480e92ef975578e055af46c9d1384046
 DIST milou-5.7.5.tar.xz 54128 SHA256 05fb2dfa8cf892a0bedbb3faf4138e58521a8618f28930bf3862e6236416df72 SHA512 1eae0deea3491b30e0a64c94542cd11517615ecd0786b5227db1aca8d28e12d487d8c31a5dd0da8946cdff8a846603fb247c9ecd9f6ec6e8175bdb9a552b5270 WHIRLPOOL ba405a92fbf324ad77c32a90dc80c953165aacb6218d7360ea34064a3c4752f04bb45fa87f67029f4c8faddd5788848440581e10a6f798b7f30aa38727b980f3
 DIST milou-5.8.3.tar.xz 54356 SHA256 543b6b5e876b8499fb5865ee0117e430bcb208a61c02fc42085391909b45790f SHA512 96a43caf2294df088069d5d11f72e660632c9abd28278f34f9c2f473ab6688938ef669e8b1401976632eaad24668c3e3de5f74d2f57a3cfa236de5d141444985 WHIRLPOOL cae4534bf49b015b394cb207bb7a1565ec76b45a615ec654b547f05e0ef93208cb054a7afe69539691a26feb68b2e8e892157cb48f31a13441b372de7c3df4c4
+DIST milou-5.8.4.tar.xz 54628 SHA256 888d1411256cca8b8444b6af91bd920d558c172bbef134fe77b535bc5e632b99 SHA512 5ceb985c681f7df7e48967cbda47c2819a3eff824af683a0141f300c6230353543b1576a36730c11f331757eff1c490d7d609e6b477b4c659a08fb0896ec28d1 WHIRLPOOL 8dc516783a32cf4c826ca5a2ac977c0dea60e7bd3199fd57a4eb0597659ead4f2b817e5ee569a3f1ddc2bebbd154acaa18cd0a7379ef1813b036a9310ea0c701
diff --git a/kde-plasma/milou/milou-5.8.4.ebuild b/kde-plasma/milou/milou-5.8.4.ebuild
new file mode 100644
index 000000000000..c37acb7ee132
--- /dev/null
+++ b/kde-plasma/milou/milou-5.8.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 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 cb0d5868ca3b..67550066390f 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1,3 @@
 DIST oxygen-5.7.5.tar.xz 4457656 SHA256 69708bf9a0944720a1bccfb761f41ca964163ff1d2b836d3fc24e1233828da78 SHA512 42569d0aa342a951c85dc6987028c271aaac0269fc0b8a4e21d88285d629c07cce59a39c5b07a80d40091e3aa324d5bcfab19881cd90a086f94a0dff18aab07c WHIRLPOOL 0e9be5c76e95de4775e95c4ae5ffb13d6e890a45276a6a0fc214f23f2447510cc5c26622202821bb93a93f135a8671f42b8d1e12142b16d4c407ccbe79a54ad9
 DIST oxygen-5.8.3.tar.xz 4457872 SHA256 4f0e48a205352a63fe80fa7a24a052154d1ca7bfc7f7af5ebcf5c159366a2c47 SHA512 7ea53857a1083f98805e5f90ffa809f883de38cd7f2900197e9155965ee64bcaba4e6e0e7e5087f8dfc4ff50189b9f7ab0734318cd7e0721e9be524b89ed0f5d WHIRLPOOL 5abdf39d693d5f6f2fe09bc425e0abd95efc3bd04ba9995402633939d7e16778d52827ed6c4221c545260153745fda95be3f3d8d173956ad91f86ca3a234a532
+DIST oxygen-5.8.4.tar.xz 4465952 SHA256 e40a7df182df7b8c104acfe809a8d94ed2841065bbcec0faf7558731c3a91fbd SHA512 504ee39cf5e7730d5779fb4794e64f44134e1841aa4b0be846e2a5398ae617f49a17b470a6b8ca0e54baa5bfc7b948717d4040859e590c5ad478f1fc63db5766 WHIRLPOOL 7e784d727ac83372975a759427d5b9d215963dafaeb812492563e9d4ee2898d9bc376dada450de0fb76c6ab0630ac360657ab4736a9c034bb4d9f560857b4798
diff --git a/kde-plasma/oxygen/oxygen-5.8.4.ebuild b/kde-plasma/oxygen/oxygen-5.8.4.ebuild
new file mode 100644
index 000000000000..4c8fcd1b70a2
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.8.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 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-base/kdelibs:4
+		x11-libs/libX11
+	)
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kservice)
+	qt4? ( 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 e2b44de6996a..2c7f67fb2daa 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-desktop-5.7.5.tar.xz 6248276 SHA256 7ebc05cbcc2f8d3332aabfebb6aaff5646e748ca7bcf8417ff7301584dd6a613 SHA512 f56cc901e3f10464ddf6dced220af66acff5abd2b3d6105791735b1c67897c7b2be9400aeb04f1ae2f1ab083097f8e083920af337f19c071e3b80f12cc635fe3 WHIRLPOOL 48ec7c3dc9c2dbf2ab1c614d796919d714187c506eeb8160e5aa481102345c6708c50858957269fa0ea4b83e3fac141f79dfa8d6e6a3f85036aa5accc49c3835
 DIST plasma-desktop-5.8.3.tar.xz 6373808 SHA256 e77d1ea55ba521b6f281077685db9956269ad8b694153adb00c2c687399c725e SHA512 98f4c9a7b3ebf0e8cc889e458ec622bebcd09856ded9c887354f9336111f91caae2dc4819492357c7694e2effada6b00ec5b70f9eb8d8354de0b397a4abb9aad WHIRLPOOL 53cdc3b2c16021dc8eebcaaf559d3a649e099bbb6178e59c6e1e2a7b65c589874e568a4d758fcf9c169782d04840ddde0c019c285d6e74b78d91cb01fcc7456c
+DIST plasma-desktop-5.8.4.tar.xz 6435692 SHA256 78902e67664e5a1bcddc833b28cce9734c0a3993e0c5ddb3285501494e47bc1d SHA512 04d86518c7a23dd42f90b1c99b980659a2f0536c3c7faefb15095327c1c7c3c04d84f15a5011e5fd5eea32f02bf3bd48eecccb323e0f33b8973ff59c00a66d59 WHIRLPOOL bd3907bdcb5fe53bfb7110ac8b9b242d4f0a4a373670dbe8f80acc8c2affe5d3ae0d8acf86b4242060561e834a8ea4efcd07cacbb3e3327db555e78acf0111ee
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild
new file mode 100644
index 000000000000..30fdc9fbf065
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.4.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2016 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-base/qguiplatformplugin_kde )
+	!kde-apps/kcontrol
+	!kde-apps/kdepasswd:4
+	!kde-apps/knetattach[handbook]
+	!kde-base/plasma-desktop:4
+	!kde-base/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}/${PN}-5.7.90-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 122fe6d866c2..03a2657cc4c3 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-integration-5.7.5.tar.xz 49240 SHA256 d41abdc63832d3fa1489aaec93dd382bb66e056982e3c49824f808f917f3ce16 SHA512 67b6b33e24b5e87b80694c7edd7d4daab8838f54a04922913c4138d55d02501d2dfe43c2718cdee4220dd194c424e50c83b711be5ee259ed58660b6c29d9e97f WHIRLPOOL 60d16269ea3ad267050c09337064ee25d98038314a5d007747cbf5970571f7c6cc6baeb1383e675ac741268133ce48a404d9f399d0dbf343aa57148444658728
 DIST plasma-integration-5.8.3.tar.xz 50640 SHA256 437cfef7c1a7de3b422e7003850025355a759d50514cfcb6cab2e5e5aaefcfa4 SHA512 25fe61c4d9884025f3c366072d5092bd57b8faba64bbe7045c8ef8f52e07375f1d88e2ae6598c48372ec455c14dd9b42ed3392e7427b41bd38e3f05a19753da8 WHIRLPOOL 69f1ca042518240f96172e0e363b329d55ef9e04d7aaba648ff54763521ab3b9b642791abd78b97b81991617a337e88923cf494fa2bc7afd1d28c107e0214175
+DIST plasma-integration-5.8.4.tar.xz 50756 SHA256 76c6c6b1c4b07d2924efd0fdf903cb060bb774d06f6b139aa3c0e1e681e684a3 SHA512 9391fdab965f531f79e1960f1069f8037561ab3d09280bc5bfb160af9396286a4838b8ebd27d39433c016097838fb7ac1c90bc1e941091651ccf15a367ab03f5 WHIRLPOOL 5cbd5f216c42e48e9a0b53771fa309e6211eefe22442bfbd8f7d994dd0cbe3d586b24ed53eeff02ea7f2df9c1a998cceb17e03947b9af601e44eecf4abbe8bc5
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.8.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.8.4.ebuild
new file mode 100644
index 000000000000..2805c9b63a61
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.8.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 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.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.8.4.ebuild
new file mode 100644
index 000000000000..abcc9e4a307d
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.8.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 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 60e29b5ca254..194cd7a43fbd 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,3 +1,4 @@
 DIST plasma-nm-0.9.3.6.tar.xz 551320 SHA256 56b5c8221761fac30808117c7f8fa11a9e3cdb4b2d16a733d33996bc7136b64b SHA512 50f3e5020f4437d710709a301b981f888898c293a71dff3aee809255207a0f97caf5d3811b453da2338df93238ef33a79e85cb3598ee38d8a41255d8a572e256 WHIRLPOOL 2486304f8c5c169105e2ea0527e7fb291cc9c9f9fee36a2cdc9d5aff7f5a72cb8bdda692ac54f621c63a84b2e48ba2c429e20a4bbe7efa91ecb48a393286dc7c
 DIST plasma-nm-5.7.5.tar.xz 638176 SHA256 eb74256c962703097bb6f20b10c8ef2f1646e92256772db4ec81ff4df71aedee SHA512 f806ee6b764fe7022ad82f55fb2ba28d4157a655722e02bc1b344d5e6c97ee1137938134a25ab842968174a03d72dffa20e7ab6eea4bcb5d44c5a609fa41817a WHIRLPOOL 36bbe87dfb6a783dba6d240c0f8a6361a1c4211c7f3892338288e479fd82fc22d79a018d400383e2b0085d7797a45adcecb55f5c3f54be959578e20127b96268
 DIST plasma-nm-5.8.3.tar.xz 644172 SHA256 674d56f479304d4d06b60e68bbdb3ea62bdaf78dc1843ba73fead39be80352e7 SHA512 fa2091f028dc92556234345cb79ca365b3137a14cc7bda2961d3dc91ba9279bcc122fcc1ff13e29ad580c47b681403334f054f302f8383374973781e3dc9b6ec WHIRLPOOL d944174a8cfdc24665209aceab972b6224844246c293f1895868c1cb3af96b2e261c80f417e01edf0be30b24e8e1e7f05d8b19f578ebb5fe1ab3a0ab88b7d666
+DIST plasma-nm-5.8.4.tar.xz 659184 SHA256 58fe3beb85aa985015e0966da56e5211a1591bc2d0c3dd39ad89eb661437f337 SHA512 b5cd64d2bfd35a8960d5d8a26b3c4119113413b89b0d4dbc69132f2572135f6412ac60b5fd43490698ea49fae83f774e8115b3474a8ad13cad489b1fdef9a978 WHIRLPOOL 6fb21926aa85ade1f60e73990849a664e6550b94afcf3dc2b3902bc2a5635d4a21936334be8980782bdd8243856e14f5603db32037b45a75d0820e479bf85a36
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.8.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.8.4.ebuild
new file mode 100644
index 000000000000..d88fb05f82df
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.8.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 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 fd5a1fc52cd3..14997fc09323 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-pa-5.7.5.tar.xz 145348 SHA256 d1289d87192ef74184214f08dc00d03d32a81c4aa46d843ded738c7d9e7d8a27 SHA512 11f4242e2247010324088b9bbee717f2e28a18928076adff9b9e582d84d8b5abb2cc910721f7913e1a03088422539a128d445d465c77f3b35b12eaa1933b0c6a WHIRLPOOL 596b72ebe58f5c1870d22cfe5bc2aa0e00c7788b9b24dc8d0d0a4e49b11e2b1516e2246b475d5d69da5961bdf13f34c7bd69c98e6fb2b1c00076272e7c3de5ea
 DIST plasma-pa-5.8.3.tar.xz 69468 SHA256 04574c84ada093be461b95f6d9c32c7fc28ebcd11943bfffaaf5ca3d336b7dd0 SHA512 1f86d9bb88620fa0b7c9584e27354b5bc10179ce0f7a80513d1900e661e3843f68513f25c542b63098d2d9f185c71dfcc9349f385c6079c0d1667e641ac68da6 WHIRLPOOL 1dca63d521f0a96da7afcbccf799ba8a7f518406560b5cff2d98ed896ab79bc01cbf29f3fab273e9268c6f2e4d188b8034e200a8c77379098cd82fd1a552e120
+DIST plasma-pa-5.8.4.tar.xz 69756 SHA256 91381fae36a644f97edc936e94d53ffa28db01be93ab982c03857592a13aeedc SHA512 efaa78c5ae4f1022cd16c73c2f749fa8813d54f10d3335fc5e7af7d569ee96d2e47b46c49ca5e231548155747b1e48c012502a0a184962cdef1b0acfb0dbb230 WHIRLPOOL f900dc15f2b082df612e533a7c8bae736db4fe3f0b3b4bab21010b6432cb1140645b98726c29aa9b565e7c6e9d607d0c0bf92ad75c62773efeda05d103f940f5
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.8.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.8.4.ebuild
new file mode 100644
index 000000000000..e6229191df36
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.8.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 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 2c31448dbe3b..833071029539 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-sdk-5.7.5.tar.xz 699380 SHA256 420bd69e91bc1ed3343ae8be5d088697f28c25a8371a76ea1aa997dab86fa11f SHA512 8c47a38658fbbaa5cb97725c6e96100158da361d829b4619f05163dfe1e88104368f7b3c718e2fc71429981ab34dd7284dabc9f9b4949119fbd6e311611a8b51 WHIRLPOOL 59700ba73f18718e264bae31e5cba685de5952c8e0aa71cc31507ffcafd0d438ac45bba9cc4a49e967b9975a593003e53c94c0147148773ff8bf737ca96696de
 DIST plasma-sdk-5.8.3.tar.xz 716796 SHA256 a7666c9b9356e64fd653f6ef9d6fbdde143553166fe5cb9241a2a77a9c37fbc9 SHA512 7b36949e49097a317a553a262e7a425d4c4d35d2f26f6ddf0787ed4bd7e0dcb2c47ed8333fec481e6f7497821f67db7e2d9d8d855ba8a6cc5b94d609779e87ed WHIRLPOOL dad9b758c79d00e971516b2ffbcb2de17d6b5c4b735ab2003fbc2edff5d072494a8d1c0915fc627fedc85a838f1e15211f977819f225f48f64869c1c615bc957
+DIST plasma-sdk-5.8.4.tar.xz 723176 SHA256 491f81481b644f3ccf54d60718f3177e06e55fed11c6f192139bd012f6bd795a SHA512 f0e37c73f121ca8a994a9a7ededed4e93580ed4eae6ac701f5fe4dd3eab8b6107fd43a844d893918188cfc46d965f09502801e7194d0526ae32bfd2e0a765257 WHIRLPOOL 44d5ae3397168e285accb93003f67f16a6b968aa1e0759b0ee9cba74de0aaf8eb047a6e080306fce21546cb397f139eb485501ccda287559564d9479927c48e5
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.8.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.8.4.ebuild
new file mode 100644
index 000000000000..f2c060d46637
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.8.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 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
+	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 446d11cd2f5f..7fb369bddc5b 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-wallpapers-5.7.5.tar.xz 45918248 SHA256 f1ae44fe8dceab64ac2cbe53dbaa5c3b86b82b6c3681f24e801cd902aaddc4fc SHA512 77817f7a41fef8f9da57804d20b3947a88b1f60d11eec54d371e68eb0c6bf93988f511795bff17a8727ee5ed7d4f64a2514c4d019c30211c2f1145f9335ef34c WHIRLPOOL 704641a7ba6100ebf31db11d6bfcb84b8056bb8236f4c6af0df9fd1b203bf0c58a5ccfc2bfc2c322380cdf884731a5fcb711a8fc493c4a240ca8d130de69c45f
 DIST plasma-workspace-wallpapers-5.8.3.tar.xz 45917560 SHA256 e2698f8292f8f1e8e714e9c3512418d9389c2bd4d8ec35c3297571d280e1c337 SHA512 16c8a93dcc0e667f20eedfde9caa5c7c12d0e680f8c26c5fc5b58badfff1ea707edc0a4a37a9898a76a909907a89a7a14d332f3d5a8f1e8671089f9b71394b78 WHIRLPOOL cb9d027922b48e243a0bf977c53893fa9cab16d8e876d381595e6b24852d33cd4acfa5c73706fde5267f44427bd3dcd75921b539497a94cb4342e77611bdf92f
+DIST plasma-workspace-wallpapers-5.8.4.tar.xz 45918184 SHA256 436dbda41f854fb538dd172c6f25eed70064b1ab0ab4656479cbe739a2ad1b21 SHA512 75c0925244adabef31a3489349b47b24741fa5c8d47327399ba8c058e9e4b37a2136906faaa03762ac4167cfe42c5cfe31e6178ba1d10914992e537744465439 WHIRLPOOL ab866970662c439f47616759ae83ea8321f7dcdb8cad1f6312e1b28475acfc6475e67494f6b86299e6bf0d46feadffe606b0cf0c166171bba9ee93232b1a90db
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.8.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.8.4.ebuild
new file mode 100644
index 000000000000..43ed73a1fb7a
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.8.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 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 59575e45361b..7465e7ee6df8 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-5.7.5.tar.xz 6844616 SHA256 116d9af304c212d58163130f1b7d5478085523c967f96f0d9b4ba2c5a73eb9f5 SHA512 cd7c710565a39d88ad353ebb8fd28eaf002c54672257fa135c2914114af5f2f57a533733654317a5d1050026838cafd7916a82373171d543e733c617cfbb7610 WHIRLPOOL 93f151572885b41a58410c0d5c768edae49dd7ccac601d271c9e5908741d6bffa6bbf9bc67fccac4ccee4e67b42c122174c8755929d8eb5872ef146ec7b443e9
 DIST plasma-workspace-5.8.3.tar.xz 6955700 SHA256 8b2f455bdf355d7d771bd6fb4e19510ec4b131c093b23268cb9c1a321c75059a SHA512 7ed6887dfd7b10c98bfba128a7d0bc6b534f067f519495fb389023308bec178043154bbe755158df6dc65623987f390389b9fde1b9d1780a87fd4450e41bdbeb WHIRLPOOL 3afa4bba6148c4e14cd17e83b71c744288a802161a711179c12b3190dc27c746d97476c8148130fd0cb39505697da1c4044af613dd4ba8ebc3a7682f4022227e
+DIST plasma-workspace-5.8.4.tar.xz 7018972 SHA256 8d732e141ccf6f56c02fc8f4234323ceaf907d159a736f907715e84118cf8dc3 SHA512 5f28779fbd34522bdfe1818a4015bc033e102da7f0d34af2ed8068b91f4453f5a466606d7dc87dd904a6d01044cc146e5936ed8033ce7302de2fab8408ff6252 WHIRLPOOL 70c4e5b29eef525096bc90353fa96aac52d6670b75ec9bb54d957f48b357ea662f983e06b61e43597004637c03a399fbb126261a1b93d2766572b2f236141749
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
new file mode 100644
index 000000000000..3114e7b356c6
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2016 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? ( media-libs/prison:5 )
+	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-base/libtaskmanager:4
+	!kde-plasma/kcminit:4
+	!kde-base/kdebase-startkde:4
+	!kde-base/klipper:4
+	!kde-base/krunner:4
+	!kde-base/ksmserver:4
+	!kde-base/ksplash:4
+	!kde-base/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"
+	"${FILESDIR}/${PN}-5.8.3-systray-cpuload.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 c0c9a2286ae9..f5e3282ef1f4 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.7.5.tar.xz 40340 SHA256 4e2195a535dbad15f771df07b3b87ce74cb2a2c6b9d8e5559353730ee2a90ad6 SHA512 7e5e30b19170e780d934ac9bcce0eae556b37cb9cd4ea444d2a4263233e5ceef813c48d6631d04a5783c292c3a5bacf91f8c3c062ef39be491fd3bf39c21d2fc WHIRLPOOL 66e9596d895f2cb3ba02037911ebf47c6e2276a42772e01336e9741b2d1a0104a3e14e7a1b00f206d06d4165e4ff2f2b6f53f3b60fbee4b92de5ae784a40bc25
 DIST polkit-kde-agent-1-5.8.3.tar.xz 40856 SHA256 1ff01a737c22063a095e4b79c29d7c8ea3bbe7621c362e1d637f7e39a5cf9412 SHA512 cc5158b930ced58290403d84e7c0a751186e7c25e669231a63291ce9a73568f9ba8f862f31515fdbbb8c0d44ffd2d6abb95009e6355817ef690100ebed2b91a8 WHIRLPOOL 7076aa6630ce0675d83431b162cee5e8e57ea59873a888258b94c6fb5ac6bf219da038116e2fcc86bef208cc5e72b70a642f7731e7c740c986b98a7e99ed3b5f
+DIST polkit-kde-agent-1-5.8.4.tar.xz 41276 SHA256 4fa694a94a2116c056dc82eab579d16f9f43ff70fd36c6480887bca8a2ae014a SHA512 6ccc754b3a3d74162aa1f091dcf0478c036980d7960bad6c6f0f3fa7f46751762e267f8c083df45fc2c851823ad402764a212c07e0070f42396e17ecfffcfd8f WHIRLPOOL bcdc193fcd5ad32504f7f59ba8aa0b81c7ec7c13eab1984cdb3c5bfedac524784ded11ff6a03da56f5fb5d4392ebd29100a87c91d6b0a8fee2507f27a334a1a7
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.8.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.8.4.ebuild
new file mode 100644
index 000000000000..8d3e3efe2a45
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.8.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 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 d0ca8f3e6c45..2a25db9bb68d 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,3 +1,4 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST powerdevil-5.7.5.tar.xz 359656 SHA256 53f90edf793bb055e397d1860930a653a7cc519635c9a775ef97b1d7b18f2ec9 SHA512 f9261c8758f6f44ae4232f7182a3cf4afac17b672700d6ec8f277bf20306ab4f739a790c7738e5e30afdb8c4c7cf1db1b7c3327a547f12ef4dbc5f07879c7102 WHIRLPOOL a4e64f01a19c6053ca9b521f690d89c3c01c5a350d92510d8fec8162bfa2be2f72af9c838338af1787daefaf923b14255f34b37b78b87209be047a718da63476
 DIST powerdevil-5.8.3.tar.xz 356356 SHA256 415f345af1efb94ea9d64942e149aa7686e769ebeec74f2fbd6c30b27ed7a9c6 SHA512 a250d7f93d268b4edd1b82fd28412dd7eb427485c805d319fc3806780a776112d576f3a6958c8826008889f13c6ba9e7d203512ee009046aa084e7024b4f7828 WHIRLPOOL 72ea1fbeac08df5c5ae9d30c5e85443fdb456b8b15227deee0b221825af6b37e1e7c29581c1d8684d2682aa929e97e5646644e001a7511dfab048f10c60b13c4
+DIST powerdevil-5.8.4.tar.xz 357992 SHA256 9e55f6405da947f7a8dd97b41acd2eafbb5d77fd1943d024e28935f951f22cac SHA512 250ef5d13649f4826356b72d2d98cf7379f5f4f27757b63f9937bf2ec438d6f038adc21ec3410e8fd8825bce6282c22ddcf1b7be1e8e8704a4ab3af3b7d537dd WHIRLPOOL c05a605f798ff4ddbd7d8c0078a6823640c64fa45e6b3cb530403791baee8711f15d8d3cee5bae010f8e5d14becc78203e227cb48e118c4395160e7e70f7dc30
diff --git a/kde-plasma/powerdevil/powerdevil-5.8.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.8.4.ebuild
new file mode 100644
index 000000000000..5bd908e80ad5
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.8.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 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="systemd +wireless"
+
+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 )
+	!systemd? (
+		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 ; 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 ; 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 aed26d5a9709..26b73eb56a07 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1,3 @@
 DIST sddm-kcm-5.7.5.tar.xz 48572 SHA256 41c3bb2fc8ee291c337700938ec37d2ffd6588d744ea0e28955458576e9c12e9 SHA512 89e72a62503993a481b1e2cc7cbea3c43a0858febef0e4c4988efd752e8bde5986193756d1bab5768c4abb8b8e74949ede926be27b65a228480314998e816551 WHIRLPOOL 7d8b7f805dccb3bf1ee0c9341e21a5cddb8b09f21be50b8ce40bbca01155a7b318160f3886460e2f49f1a051b6f27498e71f44db49590ad28026db9502ed9b3f
 DIST sddm-kcm-5.8.3.tar.xz 48968 SHA256 0d41f5d7017616ea17e4e4c37bb9dbf8ff2efcefd242c7b101ffa722564e42b3 SHA512 7b5f1b60b278cf2021e0738ca7f3a65c4c2bc669feee2e905b08c799646cb4a66b4c5f7ee690dac086618af7e8e9f648f08ccf1aa6db85a546ab98c9ef8abf9e WHIRLPOOL 0f8b9fd872e4ae7ecbc3bbb847a0474a720030431cce4cdaea1154901d41e2d14e2365c2d0ff91820118c2d124d8d0bb0b32d56e2089cbea177715418f2f094d
+DIST sddm-kcm-5.8.4.tar.xz 49560 SHA256 dd770bdccb4a0c327b51d9f1585fe0db5a72b13c7a13a0d9ad8d6fb9a1e9a20d SHA512 1683ce7813189949ed27b1ec64b40f5eea9e2f9acb3a0c650d4b42bab2b6621486e3ee85314848b1182c13354c59f7f6a66711c6597f37dd335e7ed42c3a8be7 WHIRLPOOL 01bc73bd79c927ca9adfef2ea4ceebd136685bec5b52e38699cdefd0f2ce78c50d12b77b1af8437eaa611b082db5a6369a37ab77930ce96a69aee78e2fca7312
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.8.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.8.4.ebuild
new file mode 100644
index 000000000000..112a759534f9
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.8.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 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 ddb3f0adc0b8..5f51831debfa 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,3 +1,4 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST systemsettings-5.7.5.tar.xz 158296 SHA256 960938de95c04dae98df3e6189529c1d0d8eb99dbfd7ebcf0b33bc24bf54209b SHA512 c3bbbe243c97905cd4c0cdfa06576a94efcd0274522d4f17f6f3eabf725b271375de53071b4102bf01488c4c77056c6779dfdd97f94ed72ae6bea50a711eaad4 WHIRLPOOL 411226593cfdb954d3ef4979565e9a0a97b244d8e57198b215cdacee9f15eeb6b0f8894ab566dc6796d8bbd8459ec42c7aea998200952e8cb109ba49c078141d
 DIST systemsettings-5.8.3.tar.xz 157968 SHA256 b50ec8fb4402d332d9fb6c1aa00cd7431ac3299da3003cc54522c1544c610a6a SHA512 d1a81880057bf648527a42cf2a93f51bca8a10bceb4bd04ed3ec47fb57195840b6d4369425b3605ca791ebd5f612071e8dc0a154720088541a00093b0ddb03f3 WHIRLPOOL 595a298541cb39da14752431fb034d02bb3380246337e450b51bc8c962782b614aa4ce1416a7d1f51e5aa85e72e15be75724da40f1cda9ddfb84a2a26850306d
+DIST systemsettings-5.8.4.tar.xz 159288 SHA256 1b327b813f3d6dec3b1c873309ef88648e5e743aa90bfcf9b6a15354f7f685c8 SHA512 947f9f069c3f2d6db732e9373212be66b146f157ca4b996c05824e5f6168a9e5af761649bc850d4c4899658d1034bf393c3395cc074a7f4e03db6ddf4f0ffea6 WHIRLPOOL e2e880dc2dfe32c8709d3abea41da1b24536e2b17ad0b5066bbc86202816e791477201393d077be30e6ca1904ce8cb1665bf8e44393aa3b4171706408375c819
diff --git a/kde-plasma/systemsettings/systemsettings-5.8.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.8.4.ebuild
new file mode 100644
index 000000000000..177613b6e606
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.8.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 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 92eea8b4d944..298e872f8d8f 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,2 +1,3 @@
 DIST user-manager-5.7.5.tar.xz 280052 SHA256 da4c38be71f08c48d39b7f120a787a89d7b9292215477aca02aaa72237f22cff SHA512 0ae1129435977cedbd5314e0f385bd4869616a93e8b9b2501d025d5713a01bcf6951470d5c7b131cf2329091b4ca89267401ebbf062b4c8384297a40bfa42d52 WHIRLPOOL c1655c269be55871e062f4227f78e2155fa3f0c5d778ea27986e215fcd2198a50b754227215000e919e37ef9a601d4962f6417d0890b672a2d16447111b53801
 DIST user-manager-5.8.3.tar.xz 542076 SHA256 1be1ed786e8762bf35b9ad56455f6441ec14ae622439dffe5430bb2cb29d094e SHA512 ffe798bb982c98601b36924a32e7f4206a96c2a3c56afa90d13f01978c1384fcf0cc705c0ca79e166ad9a2e8a1ca4ad93f1670da79db9ba75bc02e3e33e451ea WHIRLPOOL 798a3cedc89e1606315b51e471969513d469996e80202285b306e580a257518666030130b32ebb80e46a15ae6b19a6bf1febc13898c17c364722e316d20e1379
+DIST user-manager-5.8.4.tar.xz 542716 SHA256 2da8fb75f2de0d15f167698ae168d1f9cbc1b94200b8d1cb2fc90349f1d95e54 SHA512 02d2075798f3d8350eafc31356c77bb95aa527d3c658c96d8bbefff933e19d6f8d85edc494dbe6b19510e2fd4023bd5d4d53a1f82b8ae82a849868d3ad9a18a1 WHIRLPOOL 6a1aab353d9ca4b36ddf2a548e48effb2ba3425e8e7088a73ed31fbd2a88e9a6ea3283c61089c4a75da9a3238d4b5e633195bb42cd20b31e2d1d347f67e893ef
diff --git a/kde-plasma/user-manager/user-manager-5.8.4.ebuild b/kde-plasma/user-manager/user-manager-5.8.4.ebuild
new file mode 100644
index 000000000000..8580afb7f457
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.8.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 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}"