kde-plasma: Add KDE Plasma 5.9.4 release

Package-Manager: Portage-2.3.3, Repoman-2.3.1

79 files changed, 2220 insertions, 1 deletions

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index d88e2acc744d..007c982d24b4 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,3 +1,4 @@
 DIST bluedevil-5.8.5.tar.xz 144572 SHA256 fb7dac6c2cf5dc31162ca4e6a800d4821a6f9d6ecd93da81356266e04a1df21d SHA512 3b39da119843c5774d4d606e2deef59cb0f80e603937eec3cbfdec14641f5e4098a0ff195aab6e8c6dc2eaf2fa8e3539655b08bd4e4ac6b6c3850cf6a7a3ac39 WHIRLPOOL 12b7a79a5caf76e2121b7c5ddc0de14a6803c1420edbb5d0510855c8903eaa72bb8ba90582ecdf9d85ba0fe35a96b52b02c334dced952071f683bd5a4f01c1d7
 DIST bluedevil-5.8.6.tar.xz 144572 SHA256 927e05fa0ac6c3c0131cb325744fd787ce30d2397544a8431e5a9c9e79d9e963 SHA512 4dd48b667d23f2af741a4d3dd52149735f8cac67bf114fe1c9e41c4eff236f572698bca05461b865b33152829aea501767d64032a64952ebe01401f4add0faef WHIRLPOOL 536e3b012bc076b572a2a1b30208748f38f691ffdabf999c7c2c1646abf5f3e5a3de086a3651412a7adb3a32b27d3318bd15314c872b9cb9691ab041979790d0
 DIST bluedevil-5.9.3.tar.xz 143680 SHA256 8d2e8327f318c387d6d1c0d166c339fbf3d71cc711f65b358b4e98c6e004d331 SHA512 ffe4dabdf5a37e185a9425daa62e0908d312494d98537be82c89a68ba1858898dddc11c289626f7c44a7a8d404a43cf45dd3fef5a75e7f4ff4751077ceac8ab9 WHIRLPOOL 390133ac1f44c569c32fad13368c3ee256d6018cf53dccac1d9979fd677cf319fb6879d0826412c7282193eb7c42cb2931372b1bada0604ce417761341bdced3
+DIST bluedevil-5.9.4.tar.xz 143604 SHA256 acf5c2657294eedf2af6b0c33bd44aac1b93545131ca990e5f7f1e1f95de61a8 SHA512 67b8f0d919df52c409b7c1c0e5cc99149d0f37e9babde7f8fa1118f8013d80d4a402cb7609a5656b9051a8dcfa4f4abcffcc0ad17c510b169b28cc2007646ab1 WHIRLPOOL 0b20fcf7043e7e796bab45775333951c1d095582e3440f249ed00fec43e8e57466163c9de2354d42cf804fcff82a77b912d85a956d32558acfed3280f4c4f11f
diff --git a/kde-plasma/bluedevil/bluedevil-5.9.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.9.4.ebuild
new file mode 100644
index 000000000000..1b30c235b02b
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.9.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ea1f72e23a04..7bf534a39788 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,3 +1,4 @@
 DIST breeze-grub-5.8.5.tar.xz 3138572 SHA256 0e173ad1819b95afe7896f639501cf7ff6e1f8862efbb4f9825765e65acfd68b SHA512 031d6d60976b03093b1e7fd278b850c4bb177d6ba843b33a78c0f26c6e1eb7c24602d4bbc0517eeb404324ebeda59a8c6086751c41a99f6c35f0d7ec615054df WHIRLPOOL 14fed6ed2b72cd627e41c52a1b7658381e39d057358338bfc24149a2cfedb14921b0baa083a1c6155c13d39b99a9b3d0d117d3ed3c9dbbf0e9e9326f1d29146b
 DIST breeze-grub-5.8.6.tar.xz 3132920 SHA256 d505f9deef67bb27a9ef8be9b38612800e8cd66086759933f94889d1e26794fb SHA512 9c39d75599b5f1775c089498a041b7a774fd275caf26af966a5a0639fa509682d7a4917ba2b79d9d877e8d12a3142b882fd3919790ebef79be441c0ca2fca122 WHIRLPOOL d18c1788518c9d68d797e3f39013012bafc9df445f117a2b839b377d5e72f632c77ff0197242872b43eaa50897f2deb1a586c724b1f84d98b1a3c60cda493f0c
 DIST breeze-grub-5.9.3.tar.xz 3143196 SHA256 89c0175a2b3ea4881f5c7683d3492d82f723261b8983c32ed8c81517a4af7bc1 SHA512 ae70b5bce1e32de334847ee5a4f4c72135334aeb5ec161f4cdd04ce14650c56ecaffb02e2ac7a3e543cc8605c7d73f1572ccad813bcd91ec9dad0cbc5081eb21 WHIRLPOOL 29a7347a2fc82be0d8c47bce03eb0bb912c84d8e1b225857a5dee2e741875cb3696df26a563ffa4a462618cf8c70eca14363910d9a90ba00c3df1feea7162c56
+DIST breeze-grub-5.9.4.tar.xz 3135884 SHA256 795ae0d5372864d106a1408735b852526a9451df8f5acd6839a524c2eb6bc766 SHA512 1d763d946129b9c585870a543cbadc39516ab0c87a89904444d5b35a5935f4bf3379be0f902568b76f0da632524570819ad4eebf287b8bef2dde56e19452cbac WHIRLPOOL a2772dc67a66b2a38b46dbb1c57fe718e29ae32866a7278f37cbb31e77783f8afe2e77094a96b4b0689fc07071f79d98c0cfd6d830f2f5f23964e87a52070879
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.9.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.9.4.ebuild
new file mode 100644
index 000000000000..70488d313e71
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.9.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 df382a8c964d..5564b627ab3a 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST breeze-gtk-5.8.5.tar.xz 211572 SHA256 edddef80f31d58edff43100a921b980c1e68385ff36d30a056d1259e282cbd95 SHA512 a00f0fab1f2f38e4139f77475d89a16fb0848304f132eda7394fcc8ba9726c6cd83d80d23ade8039fff661cf0cee39eb0bd2ac1cf05b38ef4c5f15b7fc1ba7cd WHIRLPOOL 7c2463a11944796d30d406590ed5b4e057d48fe3d9af05b867336ab1b1868467ee01fb97b358b7d8b38fe9048c923576aadf6185418d905cf490bff58e5ff3cd
 DIST breeze-gtk-5.8.6.tar.xz 211568 SHA256 f4f6db0e9a8fc8dedb1aec1e7b61077a61cedbb21085dfea4c5b346490d3fdde SHA512 921312218f25156ef4e54359ffbf6c409957834f61125b41ecccf5aeef54e0ec1cf9c068f2037641099882edf79bb67beb5ed6d27564597a927322b9a5dc1a3d WHIRLPOOL 3a1c5bb7cefc4894174c68bba110dc9df723fd70e9d8ca12b5ad34dc417750dd4c8d593380815e6e1698660547627068308bf0a9618a23c6805896f1e79a1cc0
 DIST breeze-gtk-5.9.3.tar.xz 211628 SHA256 4658052abd99fedbb28ab5d6b5815e6bfa770904b8d37c1bf3a2e44729270a8b SHA512 56a7a7792293b54b220f3d81543294ef0e099a2c6bb16b21910582fe6d5806adb68a7b9468e04fdc0ceefe917887b113e521b5764ff93cb11786d5f5128da4b9 WHIRLPOOL 66d1d3ca037f3433e789f622b407c81218c0ff78649f87a42101da0976aa530587482a109b039b69415800194f88b2b81528b4f48857abd4b6b277fe83c84f0f
+DIST breeze-gtk-5.9.4.tar.xz 211612 SHA256 f47540d9df7a21cac778ec30d57afa215a14c0cbb2c14b352ead15cc4c8459f6 SHA512 8a51bf9ab1abd6ccb7fa98a960e5852024fd6f18a0360a71b8a9187991189795b1aae134d3ff4454082b1fa61753642332d42bd4fe5b202ff4d39e78ba8010f9 WHIRLPOOL b72a7033ef6b3b6610b062994a8948ca57a66736afdca0c7217d80a141b71036f25e123103312797d9d61e0d60136f2c2d76bf89d67bdf92b05ad82cfc14d867
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.9.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.9.4.ebuild
new file mode 100644
index 000000000000..8ae0e2129028
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.9.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 65b85e9282b8..3ddebec1aeff 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,3 +1,4 @@
 DIST breeze-plymouth-5.8.5.tar.xz 94964 SHA256 01c74f5422382dd6b1ad8777a971dc58b43122980592174fbc7f01feb314cbe7 SHA512 0dc6db741fdcb689a92ac83e7b4af32a5bf8b72047613d23801843e8c6c507a1f2b97289e33e3220dd2800724171d90887d6f7262d95c8140d5a8b29ae40319c WHIRLPOOL f34ea196de0dd4dbab2b4375ee0912d5c5acd14001ccc0368f7a2c996ae174d457b7517eb28c5615119cd508ee162fead983a039d4543d4cee0f122d108bdb9e
 DIST breeze-plymouth-5.8.6.tar.xz 94952 SHA256 689fe7709423af61ee3f6b735d87c5862966759d702c8e1a5dbf2c1233a0b931 SHA512 72095d48676ad5c33d595cd6b369986fc69f689abac4af5549e3f5c77beb876f902866feda034cff0ef3bfccda733f5d87cdf246a203b7ecd05e341041b0a3bb WHIRLPOOL 9cc38f78c4416ebec83fe1e9aa375382027947dbcfcce6266701d9fb26b56a44cd481c96fedb4581b49b5ee485723ecb092dc7913dddc0b3cf8d27aa16b5e1cd
 DIST breeze-plymouth-5.9.3.tar.xz 96896 SHA256 b50a4dce450628008c3ded99b7e4a84ad2d654f38a65373381035038fa83e06f SHA512 e31c9d6d6213646c6d4b5ca18821536f9f5d7c629c0221629cff956b7c1a6e1a155b0ae542a03f0aa3832203ff6566f8db3b23633af1652cb763e96bdcc0665b WHIRLPOOL 3108e8d3531a932ff024ed56dde51142511086e988162120fd25d4f70e245ea25c17aa5eb3c82bda2a6689ec735e849984cbf2880ed87155783bc4eeb5d3233f
+DIST breeze-plymouth-5.9.4.tar.xz 96864 SHA256 0f217d1600b83e34a6eb9a4ae7522f07d44873507bbe9b37fefd18a697dd94ef SHA512 e1a84b9d0dd940b521fe2b1a36014a7ebf709cf96ae3b7a0735bd49b45f800d0e86c9cf2c285db6ac7183701c3085f4f8010c6b80e7468cdf261895da7f0d1a5 WHIRLPOOL 8daebc43597f924a68ae5173d8b70b775a45b92aa555c8460b5ff7a2e3472f575b08e4a7a4308cc566067963c9cc305c15f20995cca48898a97ea6c9304c144d
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.9.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.9.4.ebuild
new file mode 100644
index 000000000000..a87a824cc8c0
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.9.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 d85b8934c9c1..268adbd7f5a7 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,3 +1,4 @@
 DIST breeze-5.8.5.tar.xz 33279848 SHA256 c1dc453ac2461bb6edf2d115741afb2f1933d9476e1b0e5470451d1c01d096bd SHA512 dfe5640883b05b5622e3d5d74e479ff6027d5f55f0c318c11c7eaa39b05fe30c5392a951d1efd8efde5b150bb47a514a2bb3620006e55fa64650c5c19b78df7e WHIRLPOOL 4881bbaef5e16f116d8ae5ed499163fe2d27be8b4f013ce408ef9e14de7d2c1fd14a9faaf72c4653a4ff6e5269bd888a7cdc1cc58c60c4045a212a8173a40694
 DIST breeze-5.8.6.tar.xz 33279132 SHA256 559f1b80daed76d45a6f7fc5c370ddce35299983487ea3ae9aa98c496dcd9d9b SHA512 175352b36e5915265a0a5e1f1d8bafa13e4a56e36a328abbe4a1936c6f45b4445f3b2adc703da9b388400f255e5f7cdc2b52370fb422cbf2e5af0f6ac6a379a4 WHIRLPOOL e3d51fd8b5ade5481122e081ea862662c5bc87da14e1bf8aec09a3a404531f3c89c005afe25e0db90e774b916f0aa12e9f5c9d70e951f754a6c3eca3e36b1e48
 DIST breeze-5.9.3.tar.xz 30677068 SHA256 a0971024c1609e8613e543aa26c558f3401dd88d9c1694515d564396fc3c3038 SHA512 1439dbea5f06e8bbd5d33db448b64de56a867a0fa58f1b268540f0808f69b91db78e259ec89153df5273e859f87a266b6a89c5d3e08e46a6f501c88ada348b0e WHIRLPOOL c8c5ae0a6b534311d3fda94526ae7f4eb55e6111a23e5a535420159d47ffec4c586ba175bd337405b3dc84f4756d62695b7570db8aad2559dc3388f7b19e8955
+DIST breeze-5.9.4.tar.xz 30677876 SHA256 f207bb1fe4ef988aa2c2f5fddb25c58346a8a6cdf37c21fa1632611fd31b211e SHA512 1b7638a0345285159cfa2b449b9029671a21016d46e6d6e4eda34ccaffa29cdb625a4f487df364e901acc8e4939e80da7e92b755cb656e8f1156343c93086e5c WHIRLPOOL 1c6b518b6cb552c2553ba05ecb08c03e67e656a0722703c44809238ed5a89a07451e335dc133888310d01c8beceacf5bc2ee19f56be959c5a97a1a5405af66b9
diff --git a/kde-plasma/breeze/breeze-5.9.4.ebuild b/kde-plasma/breeze/breeze-5.9.4.ebuild
new file mode 100644
index 000000000000..37dd4fec2aae
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.9.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	qt4? (
+		kde-frameworks/kdelibs:4
+		x11-libs/libX11
+	)
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kpackage)
+	qt4? ( dev-util/automoc:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep breeze-icons)
+	$(add_plasma_dep kde-cli-tools)
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			$(cmake-utils_use_find_package wayland KF5Wayland)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+			mycmakeargs+=( -DUSE_KDE4=true )
+		fi
+
+		kde5_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 3522e89f7a34..a9bd4a4993fb 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,3 +1,4 @@
 DIST kactivitymanagerd-5.8.5.tar.xz 83284 SHA256 90bf07e74aa2923550a5188c75c7d2031ea80a442d7a9cf7f1bc58fbfdb2981d SHA512 7835baced0ee962133adeb4df91e7d9388ed02cdfa269060da73821f234c94de629964f65e9afe1b743c7b65c651d1076a1211cd3548d845c126fb58b76fb41c WHIRLPOOL 97f906a7b15a2f0c2e41678f2f7ab6ecb5d0a3e44161c09cf5ca3e3b5bca1035f60bcb6913e2c99e7299d81f307c620ed5c6d6226c04d02c9c4a67a2230b03e9
 DIST kactivitymanagerd-5.8.6.tar.xz 83312 SHA256 043efd8b9c0c9193b9d98bb40bb1cf206c3ebd5c3ed4474435570921d570b733 SHA512 969e33c195e4318fcb7b47fa0d33303e3bacb63826d2fcada8ddaac78b575e4047447260c5487d3a3b151fe7b2780980f7d3bd344632ecb295f47253d5b48bda WHIRLPOOL a8f6c3c8c0b788b561e93ae2b253788ba1f1b81d8090f659dc82edd5e34e5e49afa8db9fa4364695ecbd461db638903f532cb5fb528717e849d049a747c58eaf
 DIST kactivitymanagerd-5.9.3.tar.xz 83408 SHA256 9990aa0da6e7c9608b8fcec91c15d3a48b7997cfa7715cbca412122ce3f08b7b SHA512 421c6ec2e2cf938216a400369367f2a1dc9697e73c67de5518574249e49e6baa80b265a40373fbe1d0c0c59154d6d9730db867d118e56f16420287b40e54a5a5 WHIRLPOOL d177037db414c84344e712c678586418e84f1bed57db953823de3f6d4aed66ac6ae6bc46f23507c889e5c0f57776d9a09e90e9ecb3ae74e62d04c193a0ee95d5
+DIST kactivitymanagerd-5.9.4.tar.xz 83380 SHA256 32f48236fe6cbecbee874cee68c42e19f8391a46a812bcc7efa36bba56fd2412 SHA512 ef2fd3c24f7e601bd024961e99280f7401ecb40a5b8514ef3edb0854e7743af736f3565ac49473da02920206ef1469fa3e487fb406f57c620b794d9fb9a895d6 WHIRLPOOL 806bfa4fcc46e09a0e9d484ce70be74ba8dcf4dd02483b2d684b539ff14f07474f0728555a0732f5a31f46e93254103819c16d7d7ceca9447db9efbed9d57098
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.9.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.9.4.ebuild
new file mode 100644
index 000000000000..0f46deed0f5e
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.9.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.54
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-frameworks/kactivities-4.13.3-r2:4
+	!<kde-frameworks/kactivities-5.20.0:5
+	!kde-plasma/kactivitymanagerd:4
+	!<kde-plasma/plasma-desktop-5.6.1
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 387dde049a63..6c76673bc5db 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,3 +1,4 @@
 DIST kde-cli-tools-5.8.5.tar.xz 489952 SHA256 e7fa88cc67eae200fab34d1e32e63da76ae263bc72bef763d2f1cf9e60e9e9c5 SHA512 24132abc7852d325a5a9fb9e0131460554f3a1b58eb863ee7c406332a703eb5dcf6e640f7241bee39ede3d35fc2de96775c223a005ff6f696b6848649a4c9c8d WHIRLPOOL 57c1c1db1efd8de9821b1e1f2d1b795df9fe1b05105ff7224791a693625b5af7f2ecab9e32e4736b2c9d3eeee20683b80e4ac0e7cdf2d90a5066212cd0317a26
 DIST kde-cli-tools-5.8.6.tar.xz 489936 SHA256 9a815aca6919e79b77bd95df491a1fed49e737cea53a49236fb99267ecad4622 SHA512 b6bb780a229d0c1f09ad934ca4cd0500d35db730016317d6fe96e864ee3c586293b49007c9db50eb331dd50fd474aabb86e94d2a7e1469fe61b165631e7b43da WHIRLPOOL dfee2151be89eb0ccb517d6dc6a7a5c5e36af3fde70b430a98c7d6cc3bfdc235e498a1bc361e88e426a1ee379b38d2f7e2a1a39eba6eadbb16df2b588f9d482a
 DIST kde-cli-tools-5.9.3.tar.xz 501412 SHA256 0a5470bdd4d6fc5469aeabe72eef6dda05433cec632bd30482dece2ad3953fdd SHA512 1fd1340fe7349d4f47e34a78df59d135b48ae999d202a2357b7fa8485d6d5eb19b4c37feaf8b4c38af8e709bea2e5a6288607462ee91211845c7bbb734606ce7 WHIRLPOOL 271d19c9703964153fa81d229b80176ff5a477e1597998dfad6b3bb369a6a6920598e643835aaa060ea743bb01893eeabb52df2f784f3c59c234f51dd4b3bccf
+DIST kde-cli-tools-5.9.4.tar.xz 501964 SHA256 a8fe385e2fd96a5d1a4f0a4005b2588993071e80d3a2062fff16c35bcfd65aa8 SHA512 5f63a3404d13216aa9e9c260d6363aecbb64adc78879944775db91aece58d6190d588cca42e7d647d1b80808208c22c4c7c8988d10bf669cde9c0afc8288c0ea WHIRLPOOL 92825ed3c860d5f45367a488bcc6f01b6b097fc7199682a07de51375b1094856417767e47a4024ff9fa196cc995435700b7f371b2143e463fc01963b812518ad
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.9.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.9.4.ebuild
new file mode 100644
index 000000000000..a571500c2d41
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.9.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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_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 02a6e4d7493f..4e7078a1c2ca 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,3 +1,4 @@
 DIST kde-gtk-config-5.8.5.tar.xz 150384 SHA256 399464281ae04425a1881f4fc26a40c0e2079a6246dfab2e52a361d86afd15c8 SHA512 1cd73040eeb7709920c6d534fcb6aaa69de76d96926e7d2030b07f109ac9fd8b96c4f1d0d40d7449f39b87f9e795364283541fdbd7868ffd8679cd5bc6979bed WHIRLPOOL 5b5181dd90f3927033b9eec07d5f1ca257f371e842a98f4d06aaaa00f28f2e94e2f7d662cf8f72322a1c07399c1f06852bd6fd0bc9cf64eb9ef4e8c9736c6dae
 DIST kde-gtk-config-5.8.6.tar.xz 150436 SHA256 4d54fa4b579c717e8c9792ce7f6b5ed1a728162df2faf50f79781ecb153a361e SHA512 fdf6929059c9c94a9ed9dbd410e4852922870fea77ab2985d003db027bb1b11e805ececc5dd87c03a8228a2b9008a65e6a143df59b513ac31083612f102a9641 WHIRLPOOL 578df193d8a654c4af876cf97aa717c24f9e61565ad9de8399ad8da8f9d2eaa8494cbd9aa1a0f54c30a9dd8cf1a65da68f19f86bb0a16824458e00f1914e3ce7
 DIST kde-gtk-config-5.9.3.tar.xz 151016 SHA256 d9bc376a01fcd7df852ef7ce175b145060742c4ab4f46651110504ccf31ab3f3 SHA512 5970d61cb30540cabd55794a80df883e5368fbd1b4e75879b058a261f0c96581cf50a5ee9bd15fb1d51e42ded78c6a6d7909850e1e55fbd8544c14e0b6958b92 WHIRLPOOL 7d326460901c9482e68fad7a1a805d70b79e677ef7d0312295cc285d5ee542315b420c8ca7781c1e7b726d84f60de5016ba181633a4c9a5c20a7ef5a1ada63f4
+DIST kde-gtk-config-5.9.4.tar.xz 151084 SHA256 0661ab7a75f433b9f4dbf89ba44ab09de9ec8f7ea82d7cfb26316539b2afe331 SHA512 83a35e7cc8e0aff8ee2f0f53c65153dad66a3cd1ecf3e0f5dfb10f49550507eb17ec6606dfa18d27346942df5d3e913c6678be042c063f3eb799f4c802ab11fe WHIRLPOOL f3d9cddd69b768a9bed26d322e795ca454f44d1fa2f26eda4ddca730d1c71d28d63f9b9bf707f6d9860224cb071273e92de073504e081b2caf3d7a2a01bb2b85
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.9.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.9.4.ebuild
new file mode 100644
index 000000000000..b133b2f20891
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.9.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 2a5dc1ce92c4..202858e9e0e1 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,3 +1,4 @@
 DIST kdecoration-5.8.5.tar.xz 34760 SHA256 383a7bd701a3d80a79c47a8770e32a6fee6763c564e6982211a2c424ef291cee SHA512 443fe6413b09f729e2f6c828993530f9b98438702268f5fdc6fd15e945f85e081f601fb9b242bb1cbd1fb186574a55ff4fa02f8a35f80bf7cd7ca2227fe14db8 WHIRLPOOL c18e796800068d9e1e45aff133203e4e97be91021d57815eadff1bd16ffaf33e2e2005170ecfba70aa6641fa215c50a40054cabe501731ff8c2ad1204c37920b
 DIST kdecoration-5.8.6.tar.xz 34780 SHA256 de729ef251a6abe5a6c4318a77c57c5f4d57ec1bd836156890857df7e0057059 SHA512 e6d85e31e8a4c45f0e62b9920bbca52d33b40559e491f0db4aea04180bff97aac0cbf4d9f14013b69c0e793f4b82c49fab93c2ee527b594e87cd8164ba77c0a5 WHIRLPOOL e381cdbbea48b3183a8f6a00136b5c228d3e8faf2b9d8420c0d5f621fb52266b2725165f0a3aaed76ff18cf6a7d77910dadcf06d7fa5e80dedb13b79bd6f88c9
 DIST kdecoration-5.9.3.tar.xz 35552 SHA256 29120c9263ad4913d20667337bddcb39940cd776ad1c171559b9268715a567fc SHA512 8cf4517aada5399d9b33896e661e07b7cb3a9e84b6258dda70ee48a662ff369f11fa34a06d5f52b85a5551ebd4cdb8e264fa844929681da9d7f235139c9460ef WHIRLPOOL 80deee5f16f88512ef72a5890d54e481d07feff9b404ca870c903b79eb60dec0e8394ba2519d085f9ef31bc0ca69e30eae57819bb6da30c213c5cc2d482af32d
+DIST kdecoration-5.9.4.tar.xz 35552 SHA256 e2a4a9de70aae0d554c251f836eb09219beeb3e7d5560fe57ade75b835b98e89 SHA512 be7deafdd3912db967cfdfa6bfc1c3be5d273a9d20e70bd086d5fea52887577a73c627f01d6272c56e3646822f01787877b925a178e40290dd6189f6229ede87 WHIRLPOOL 092a0c9961380bfd917461a98cc87ed29bc2c92fd11ff98f2a8aa2d945ccb7903b453a683d41117b2df1da1d2e2f9b2eadba2d4435bd0da9668d562c9ab2bf90
diff --git a/kde-plasma/kdecoration/kdecoration-5.9.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.9.4.ebuild
new file mode 100644
index 000000000000..f50d761b2e76
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.9.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 34386c25617c..91d2e1b73e2d 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,3 +1,4 @@
 DIST kdeplasma-addons-5.8.5.tar.xz 2091012 SHA256 2dfdcc0be58550f4018c4f2d05fd2652d4b326a73a9d39d551892e4bd65333a0 SHA512 45de4a7243124a1099fe1f7ae66ccb15df0d45c36ffc89b5e6b94c4e7979a35d2d79bd58997737dd9db99acd31e4f43ad189fe180d7b5cd16e48b9550868e73f WHIRLPOOL cbe7360b3f28369d895bf92baae27ff9347f9d011aa3a4829868ceb1d67b7182a17fc52a535c2acfeb9bf18969ed01c788dbd0f16571486381bee3e6fd76558e
 DIST kdeplasma-addons-5.8.6.tar.xz 2091160 SHA256 fd1a701e434b22a56ea05455a5d8a7dbcba4c01aaecdc2f077eb2a338e15707b SHA512 19adefd9857b31b976d6f7619e5e0d487e69036f2b246a9e7bdf9846cec011fab6f788ca234042cdf898c8f7a3c8728598a049c113077760ecaaa212b7ea1d88 WHIRLPOOL eb3c757181250dd14688428748a615f0adb8d2726b5b691eb92d67f1180339176999d67252769fb4914a9edf7f344a901f76f9dab121cb3b372afb306d5669a2
 DIST kdeplasma-addons-5.9.3.tar.xz 2047808 SHA256 434b135cfcfa828160ad13a4afb5ad22cd439519328ae8abc7e2b4ec54d66ecc SHA512 dd5939b72f38aabe490b8ea77633ab074859dd8ed0bbb8ec21c38afd4effd54d0e81030ad605a7dbc96dc045cefdfb6d3abd4bf674244a462905cb29e46789c2 WHIRLPOOL 0f9fedd975a40213c40aaf2c52688f0be6c3a97bafb7b04a52d79f0219d485ae91f6687cda998ebd2be14db94f5b5756098f4fad293f09369f5db84cf80c2b3f
+DIST kdeplasma-addons-5.9.4.tar.xz 2048416 SHA256 d799e680206a251d20e34a43d1faa033497fdec95abdd70e352cf079471b2d05 SHA512 d9a115551401dff1a4441af0c0d6426d1c0022bc4eec29ed76c8fdf0e8d4ec270c6c6139677ef7d0a1ee7a5f300194fd358335c02888687030222646b16c3828 WHIRLPOOL adc46e6836757af96f54e97c96d7ba07beb85899565cada8cd5a6c5181cd89599ffcb65f960c19367b4b478ddde0b5de30173255d0fb0904c7d1cd5d17fdd4df
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.9.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.9.4.ebuild
new file mode 100644
index 000000000000..881f2a38fd29
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.9.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ec9a2050ed65..c9437f5a41d8 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,3 +1,4 @@
 DIST kgamma5-5.8.5.tar.xz 60484 SHA256 22b2ff2ae14a8db4ddb9fc27980c601fda531ae2803ad61fc69a431109277f1c SHA512 eed9684bb1175165edaa921b0b0b50cca921705b61361d3b683446e453d6a38bbf34ab6cf9ed4aacdb5e3ffd556afac9c907b9b8ae90cb37c2b46d04f002998b WHIRLPOOL 7086ba90ce461571acf4fb3db388397a0a2cfd723eca9d5f1e92bcbcdff3c05c26daaf5a266f76c735331ffbcaa4bba1c1aecd64323b0eebbf5f26e34cbeb485
 DIST kgamma5-5.8.6.tar.xz 60488 SHA256 3fee7212bb608f3a2b2b33d5fdab8c22310eda5ac1f55727a9ef59189f5f69ce SHA512 21ca15e8cf925e152412c8d1657848203aefc863dad46941fdf9ae54fa7cf10647de26d31df1f8be0bacf52157f4953cbfcebefbaa2cd1f7d26bbf2690f9530e WHIRLPOOL 7641acce81db1c4d54e4dc6dbc65681fd5ff56d856b7cb8520cdd2e10eaac840a0b771c719954cc1956349d3bc59eda8abb3dd2bb065c83af826d0122620ff90
 DIST kgamma5-5.9.3.tar.xz 60420 SHA256 619760d69286e76bff9ff926acbd0c893768f48f1a1192ce3a9bc9575890430b SHA512 0f7dc500606bb68623abb3b0cb917289ae72fd1669c1ec8f87c2a1109bf928817a47f5fbe5dfcdeaa9af0ce1f4abe2ea4cb45b08765d3aea73ffd0ae95dd0368 WHIRLPOOL 487a7c345492daf114031a0f58b25717f4344626422b2b5cb47d847f348c1d98f8992efa95a417c586d0910ccbdb4405c27be687be2a55dd0b8f7f4a7d7b2cc3
+DIST kgamma5-5.9.4.tar.xz 60440 SHA256 5b0259ae1974d0b75eaffcd8ae596ba7751b4c339f4761246a88302773938f63 SHA512 f82c43db27c5563c15cf2d119e2a099f8c3db5af65c72deee6d6c8b024a72a116b0674c9031ae999c46ff8aa009810096b6618767aa118f9edbf17a88d27167f WHIRLPOOL 8ed8b31f9e51efc3169988b3ed82f784cee784b525cf2d43af313b013bb1f2607734d83b648fe6515ccdfb60ba77a233748f1b54d7bbebc42fd2b99f8984d88b
diff --git a/kde-plasma/kgamma/kgamma-5.9.4.ebuild b/kde-plasma/kgamma/kgamma-5.9.4.ebuild
new file mode 100644
index 000000000000..ab940b8940ff
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.9.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 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 4a57791486ba..f447990f1ecb 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,3 +1,4 @@
 DIST khotkeys-5.8.5.tar.xz 605632 SHA256 90fa906efd0a36b481d2651ed462596cc9527e72d3ea21f9b208a4e576fa00ba SHA512 6ec0a956f7c99ccdc5c5f6bb01d77d821a226fb94f16f5966f8609eaeb9c3eb7344855d6fe5e3c4feff36e6da36a9e35dbde1d0be583fe911a61ee5ef292db21 WHIRLPOOL 6b9fd522c69ecd450fd69d000d4f643d64d6c7045df873c10c439c9a65df64af527b803ecc069fbaca3a4f8c52b6d74a76f1ec1d8f1c8cadff434052019a6a90
 DIST khotkeys-5.8.6.tar.xz 605604 SHA256 b2533537aa9e8ec99a73929f76eee0371b9c1573ca1e8a3df88cddbf8b00df74 SHA512 0ccfb1b4f503996d517ab9823e37dd080ecf810ad96c7d4fafd124a715e1f7f4b11c5124a645e3eb18208f0ce1e13ed4c21389e155f56eca7369cfce0c042fae WHIRLPOOL 90086022c2b90261e4c932c0a73bf93cfd296a117a47b16a012727b64d48a49b0bdd7fce9583077e4fc952a663c73565bc2177e990cf15cefcbd5f6e73d728d4
 DIST khotkeys-5.9.3.tar.xz 605408 SHA256 8e5a3d408613c14fc6bb044bd8107e5460a1e76df6efe470099405d06f3e674b SHA512 95d04fc18f902a6746c175370049fa5cc8bb2d7e7ba726d2264303663ce538cfa4270f6c0ef361854ca69be0512443055cb063eb99fb3dde900dd98487f4a1a5 WHIRLPOOL ae02e0548909887839c8c73bad5f38b88b77c4ce00f094a8433bb4c4bc68cc5c2d568db434cb5f268ae681f9578c8ba40b8a5beff57f14e339e87faaa6dd355a
+DIST khotkeys-5.9.4.tar.xz 605380 SHA256 001359c841d4bb919c82cc0e9826586ebe4654a8aa037bb7e1b7eb9fed9e0f52 SHA512 19de46b0310f75a13701a081ed69f57214618169c1bcad29e7b97f3d1eee7106419371e56ca9a427fa10e18e0f4c071304be560019621271dbe70d776914b8e6 WHIRLPOOL 0a069e0406da2a87847b7cb604fb8bd069477f059e24fedc4c94735e5b56c943dc87990f75520167da159664684594aa92200dcab8e0b91a33fd33fd0632ceb7
diff --git a/kde-plasma/khotkeys/khotkeys-5.9.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.9.4.ebuild
new file mode 100644
index 000000000000..95b8eaf17fd0
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.9.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 8b8e0da9ac22..57d00adcaf74 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -2,3 +2,4 @@ DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb4
 DIST kinfocenter-5.8.5.tar.xz 1269580 SHA256 f7bd2b1389245f73d89dfe0f6229e3ecd9e04bf7a235e369ca992d3ad3b27aba SHA512 35c66179f9947cc5b323584ca74040622c39ed273c9609bba4c712b07965a0e97c65d0c1b4b0d29a458d1741d59f657ff5d3cbc8ec92fcb4ce6ac402bf113e92 WHIRLPOOL b0ab085af294f93b00e35fe52ae6b955b70c9b7cbd1446f5faa00ccf1a59202fed94a9c0879a5b7e278b9867ab201ff1f11a64c070793cdfdfbd75c01066d387
 DIST kinfocenter-5.8.6.tar.xz 1269552 SHA256 8bcc2438efb20106c9f0c8cae3a66ff202f71bf9acaaab940ffaf816002c10b5 SHA512 8eed4a548d782e0a29b9ce372b30ab250b619491dfa9efa73d3ec463cc43bb916a36702c949a4d6d25dfb7d4c350c84ebec08af7722a3a3ae5a37b2d9fca57cf WHIRLPOOL ffeeb1541e7eda54fc577d6c134fde491f8aef2d40e94615ad917d26705e72ca7a5b2a28771a823cbc273835f8c98ce45d93d58b8b57fa5dcdd47e3506eb2196
 DIST kinfocenter-5.9.3.tar.xz 1266432 SHA256 caf87ff53a91240d3739dfcf57f7e68db45d0e87e100565843009ce364c6ea93 SHA512 fb3a46478eed644c5128cb8f45aa5fe1aadbef7b443360c2c64dab1e6aff2cc74c8fe80bb3642baab310a0f401cf8b24e3b9e1ce7da1e6e05fdb8f14282a1602 WHIRLPOOL 6eaa62d173c40c27e776be0d440053e333a79f791608ccef144ddacf468b118f62a5e75a485007b66258f517e8313b6869b87b0ef021219c7d4520f90e4d45a9
+DIST kinfocenter-5.9.4.tar.xz 1266360 SHA256 9d30cd53d52df8cc83f950e501ae649651eb47e450abfe0453260750f4116e93 SHA512 2ba41d26fa63dbe983e0713a44e00016f83c253628b4acd42357cffd98e2998999047dab1510816a684e32e8059f80d063edbb6ae2fcb96a7f7f9b42b503f2b8 WHIRLPOOL 195a83d0feb98560bda3a21a3d9b520e15107814b1e0f262de27d41eeb92c646a9615edc98921cc18971dea2e79c7f2d38f88d83d60d557c7da149404bdcc4d9
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.9.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.9.4.ebuild
new file mode 100644
index 000000000000..511fefc267f0
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.9.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="gles2 ieee1394 +opengl +pci wayland"
+
+REQUIRED_USE="wayland? ( || ( 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[gles2?]
+		!gles2? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	wayland? (
+		$(add_frameworks_dep kwayland)
+		media-libs/mesa[egl]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep plasma)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-apps/kcontrol:4
+	!kde-misc/about-distro
+	!kde-plasma/kinfocenter:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(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 EGL)
+		$(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 a10876fff6bd..f39c09db2fbb 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,3 +1,4 @@
 DIST kmenuedit-5.8.5.tar.xz 653640 SHA256 75b8543bb7ef5575a6c98797c622dc9fb08e2942ab95f36d409296c3937105ef SHA512 7c9d5d8d1d16afee4173ae65bcc17e7c45a5a163753f52962090ac13384b5b38dc3fb455fa5b246e9131c5d7f87deea35fe7f1cbddb8158b0827202684d15f0a WHIRLPOOL 79708c70fc2901d0f3edec9ccd17f5a0a661cab8dfb0abc76697b0c8c8856c42bdf4c5bdb5164fd4fbe683d5dd561d299a8483b1607cbff5536f6eadc4c8287f
 DIST kmenuedit-5.8.6.tar.xz 653636 SHA256 3c586c8fd5772905dd0eb279d4e727633b1ff4311188623edf84bd571dcb717f SHA512 9c4e7ec692347fd9dc4c2236eeddff449928f868092aadaadb09840f6b60ce31ea1fd032f1802a6f690d876be61af7a192049f4d149d9b6698bb4f4bebea6d24 WHIRLPOOL daf1b0312183f396c2c4a6c94cce47b9757b92bfe969aa3e10466c2bf76d9a8be5b066857b209519eebaa8a524aaab8f3e7e2ceecb6c2b633bf22057c33bd223
 DIST kmenuedit-5.9.3.tar.xz 653268 SHA256 f31710fc14d046222a1008e7f8884cb651bd0fee5a92def40d0360697c54f6d4 SHA512 6067acc5d5643f1f3fa0b023e22cc96ad55c7dc4a9ead5ba793666ce9aa2071fcb5979268420ab7f6092800fc00c01b639f2b65065c983b166f848280e72fb80 WHIRLPOOL 3dafd9032fe396521adabc26f09b3329d9bdb0e0d5d65b95db88eca4c7c93e2b68c3c4dc281f4b1b009eb61ffdbc718ac608b494faedbda21f58cda4a5c996ca
+DIST kmenuedit-5.9.4.tar.xz 653256 SHA256 9d749d82e49e47e6301128b56412d9b7200ce108eb28ab25ea551d868f79a7d3 SHA512 2c3e09961c200c7625feeebfc9eeb5d75d10948beb3e91300ec3dd46c3d5c3d88e8e7fb17d0628eeafea0bda830e89960edd24994046e4d25338b53933268489 WHIRLPOOL b28e9a35e7096190a28c326c985748cacf1d93c52666f724b9f4098f5c8e1090389988364999bc31619a4bfd37107be0ceb929e135057f2dc38ac1a29771e1b0
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.9.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.9.4.ebuild
new file mode 100644
index 000000000000..4ea14f5758c2
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.9.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 c87c4df698b3..1b872c24e35d 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,3 +1,4 @@
 DIST kscreen-5.8.5.tar.xz 113516 SHA256 b006fb93d03bfeb3f6260b48d6356fcf6f09b34646397f32c23547ecf41e3d19 SHA512 490a4a8f831b3afdc03648bd70c76d065d7147a2f81ab7c6f5eabd52a445bab6e7e331e9b193947a47a41795096ed594a1ad19de96ccafae556736fcf9a1a23b WHIRLPOOL 4f42970f3a1020cda689a2f591b310ca51ae3c924ad786a9c05bf04cf4b66a1f3b9ab172e174d5c07b4d711fec485e86d149a1fe39da793998b69995128143f4
 DIST kscreen-5.8.6.tar.xz 113496 SHA256 99948bf562f6dbde5a4fc33a6c0aee3a47874cfce52cd2c7c29d7a3143bd6896 SHA512 c70699d39380870d34f32805f579c40e20cc42ad697eeeb600afcd3d06b50a54e91af2d4f110b3eae242c9600488d544aedbf3db920343782691c7ff361ae466 WHIRLPOOL c1c67efb185fdaaca84cd863380c81b963caae82ee330b4c5831d2cb67e441eaf8936bddcad3cfbaf87c157966839b9048fa2f6d52d600d03280c644928c7d19
 DIST kscreen-5.9.3.tar.xz 113272 SHA256 6b85e95756830cc39803c1e76773bf6e830c0c54a13ee2092c6f662c1f8c6cfc SHA512 b2ddfc7b1f8f63df7affc790f1fc89ec83b4678c396a3cca867d2e10cc50fb377106e133a9705dcc029fb92b6bff36ca23a16da5c6601f8ec52040531ffd1373 WHIRLPOOL 838e4312ed67ffacc828dea6eba089c9b4a45531db3d7bdd49f4b60069572ab2d363d0011a779d0a0ded8b6c83f650d95c5261e3346a806c6e876125396002e6
+DIST kscreen-5.9.4.tar.xz 113400 SHA256 bde7a7733310a7cbce68277586e80277a51434b893fb95d9c023da6a792691bc SHA512 17a8a728a9070a72b061d6b8475fbf51c323bc843601c40372ac055042f9e6cf248d3e3dded7a6f7222feb96dcc935c92197b90908dc668af5f45698fd234254 WHIRLPOOL e8ae16b3d632142b2e583f6653be30a5f24b4b78135879c8d118489e4f5a0a6f275dc00ebd6d62278a70b8576298534185a0a164f1729b972bde4e292e445a5f
diff --git a/kde-plasma/kscreen/kscreen-5.9.4.ebuild b/kde-plasma/kscreen/kscreen-5.9.4.ebuild
new file mode 100644
index 000000000000..e4365e8b8742
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.9.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep libkscreen)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_qt_dep qtgraphicaleffects)
+	!kde-plasma/kscreen:4
+"
+
+# bug #580440, last checked 5.6.3
+RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index b12e15fa4d3f..fea2f2b55822 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,3 +1,4 @@
 DIST kscreenlocker-5.8.5.tar.xz 108100 SHA256 72d64837393dd5c237d2985574b85a0f6507152ec3d5256751354c08d9d86285 SHA512 63d25d3e8c1477a7d1a52d49c32265fe344d7c7c1d5f9cb642d6e9ab524fc0a24c1de30e7134d3d92d3bf47a1d93d2a4713742aacb1405d35f8d5a04e66e0685 WHIRLPOOL 131cb22cf4830abc21bb1a1116ac11c6817fdd1e99441938e938a5bd44ba470b0f63bea073122bc093d016c3c72d733ca678688b1a311cc33d8c9b3127e65960
 DIST kscreenlocker-5.8.6.tar.xz 108416 SHA256 ed519a5c30bc350438d5b8418b484ae72513baf77645fe286f1ac14f302f14b3 SHA512 c2c7dd78abdcdfdbbdcffaa9395d8a8c0d84511f484bba2aeaefea05957279cd53253ce59f4bc279f811a369b0e65738ed92bd4f2a3006195bcace352707302b WHIRLPOOL 9b8cfd9dd35e07df847283195b7fa109788ed0809f30d8345290a6cb922bf3369cdc5ad69e35b8ed07b18d51307156603fba5e7c6adc4d9ee25194e1ee21d2ab
 DIST kscreenlocker-5.9.3.tar.xz 108104 SHA256 2af875ce9112ef554ced3cb386d3274cb19300a3126b9478f407fc17ae7b9731 SHA512 9727aaa5e7b37a39628aea5b8e2ff57d085d526944d43c0d78c77149640a293c4e9f2f5ddc599bfaf2c131e62dbf49bc05f7020c23af4f931ec2bcd4e7ca7db8 WHIRLPOOL a985f5e357dda98086c53d75a3ba06bf56a66c323a6260693073a7c9caf5327b25a42eaad04fbeaf82a27bd538288c6e26fba4ba50a59c28e80d20666f29e1f0
+DIST kscreenlocker-5.9.4.tar.xz 108844 SHA256 92e26758b1ff0af00e4416f2a463e8690e59010de8bdd3c37ef82c551749c132 SHA512 3f0187616b5e498843d01935cdddde5d69aa1b22001992cab2b75c874bb89f91ece37530ebb841c5415f77fe1ab1fb13811ad73e22c334a28d1b224b7783ad01 WHIRLPOOL 0fc4ab76d79a3ff3029f6e896e3f64408be5c2a28ea15ab0e20f5837e6354ee88f1202636f1d66bf1a84fa90e4d666a2421e913624aed9bf9001563a53e5a462
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.9.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.9.4.ebuild
new file mode 100644
index 000000000000..bb00b2e0b675
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.9.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+pam"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	dev-libs/wayland
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	pam? ( virtual/pam )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!<kde-plasma/kcheckpass-4.11.22-r1:4
+	!kde-plasma/kdebase-pam:0
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-5.9.1-deps.patch" )
+
+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 c5bca14306ac..bf8ea5e6c406 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,3 +1,4 @@
 DIST ksshaskpass-5.8.5.tar.xz 19456 SHA256 b0abeaba2a3eff16e233e047b41c20bf4065b4529e706929f4c0e6a9884324bf SHA512 0ab10f04fea8d97bb7e942cfd11563d22e065e19414aad2484e5b1661ed7b492d769da69b30eeed9e392ef75a3cc518e0a8005fe5afb84dfc6192ad9a4c0bc8b WHIRLPOOL 19c08e63ef15f0e5a38cc10d02f71e3bb616ec7d219f06cf1004af9789832a6e2a031548ef78790f67a46bf5e69b076dc2d7082ba25b6c39621eaa97a9113546
 DIST ksshaskpass-5.8.6.tar.xz 19460 SHA256 0f195e6344b17cacb8ee0499c36f911970edd968b6dbbc008ccff4b659132179 SHA512 7d2918b95f14f41dc1b348a66a39f2d739c01e8061136aa97f27612c18fe85f779dcff7df82c22450869f31c94f71e3f5eae743cb976c0e6e6d0692db2dc450d WHIRLPOOL 5237e9409904382cf79e8caae65c2b6d730141d04acd2e643c5ac7aac04d9707a0a459a343f1c485ccb10a7abf36a90f5bbbe47ab73d1796fd03fd5ffcc5dc33
 DIST ksshaskpass-5.9.3.tar.xz 20060 SHA256 1c0ab2d4550ba860a492f8b2930283a59d3261ac1797480795122b615799664a SHA512 9a6a9bb918a86fbd9c3e8ded0482d51c7ca81897d822cb9250a4e5cc322902d579c59b089dc9344a9d0727a25d619f6d67250589b2e56b47e8c91ff614e41dee WHIRLPOOL e38c3861ec487436e9f231dc099901581df8904e56108b6031deca502f9201bbcbef36ebaeb6b293e4454602e0872aec866e2c402213f801d875f2c4c569a028
+DIST ksshaskpass-5.9.4.tar.xz 20072 SHA256 6a5adce31ed348a2838b574774199102aeacec0c3ee2cfd8b5c3a588622935f0 SHA512 07e235d797bad7b3f5421f46a0688037f7b1ed6b41b94eefd1b22bc9ea4aefb9aee25f8b3cc130eeb8c0703bc6a90d24ab818a9a17dec01aed0de056c03ee4b3 WHIRLPOOL abd860c6953ac21ea2af465118df810cf81299548a205b15ccdfb627e2e60f7f946bd81b4a9a2c3170e8df1028ecb94058127c881fed72a408b957fc9c16019c
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.9.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.9.4.ebuild
new file mode 100644
index 000000000000..468b1b597c06
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.9.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 0bb1eb7058be..eae9bfd8fb55 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,3 +1,4 @@
 DIST ksysguard-5.8.5.tar.xz 490664 SHA256 c9bb8ff40d8a5092ef3c345b234a4d609fcff8ce6ec65bc32c3215a2840fa8bd SHA512 d3ad3e781e71fb1c179b9d07fbded060390f1c24836acf3f7e5027720e340d117445e04759ad79e46e8391db082d64eef62d52d5ad6572d688e83a86062d7b0a WHIRLPOOL d63a9b7dac8ea1d574f5b4e8505a9c2b315eb78b65d611c63278ebb5a77b939294defd8e9e0b4983eca75b9cfedbc151baf5767a35dd12fb6fafc79cbb6fd0fa
 DIST ksysguard-5.8.6.tar.xz 490768 SHA256 89806dacdd9e9c0de3626f96640dae504dd1c933a49bcc3ff6f14f50cbee0b30 SHA512 366f2284ab1bef4d68fb109f6d396609523131afafc0e3f7e464c69d5a4cfc26937af2d77de0b8da47ef215d8a2f730ccdc2d4e2c70ebdf561b9f7b589b0fc32 WHIRLPOOL 6a7b5ec77cef6e896ed8e16db8b239aa665125c1d2604b26fe5a4ce7762333a1ad2864fc395aec9d49dd7ca37626fac174078c2a8789dd3aa592debb025d3aa8
 DIST ksysguard-5.9.3.tar.xz 488120 SHA256 8a51eadd87124864fbb31ea400ba518740d72ae2f073579f173710a838bb5e5d SHA512 a30e2e8b7b9b5e867c5a9f351e1acc542460f21d7428189c7aa6ea6f7d8e206a44d0b50531176aa8b85985eebe452c3df2dcbb57f1918270712daa72ed89ffbb WHIRLPOOL 840933ac3d5aa9f4dea483e077086b1facbd3f8251caef8bfb8ac3db2d985935d5ce27aa1266ec2275c1f5dca129bfc20d2bbdd11437c0e55b6398457ecd1ebb
+DIST ksysguard-5.9.4.tar.xz 488132 SHA256 10340edffb467231f7187f97061da5f47d2934289e11f045507a0ba1ecc41f12 SHA512 11cad2752056d7084b738766ec581b8366a19a6494bf0a266ce3d3427a9acf6612c33afe1e53a6b49e771c08e54bfcced831d2741e43e444072624d954afd660 WHIRLPOOL d8b7c91c27cbbfee56d5ed60d1606149d723250112048496089e92928c9eabe776dd26d06f20ce9eb055f06ca96134558b55e7bf4ba80f462d24cfc9ba5b4bca
diff --git a/kde-plasma/ksysguard/ksysguard-5.9.4.ebuild b/kde-plasma/ksysguard/ksysguard-5.9.4.ebuild
new file mode 100644
index 000000000000..c9705935ea24
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.9.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 3c4ae6666232..d45beb802434 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,3 +1,4 @@
 DIST kwallet-pam-5.8.5.tar.xz 17752 SHA256 84d0e3b09c353ca81af52956842fbb6170d3990293ced7f81eb4bb7447de200c SHA512 749847751872b899a4675dc7e96d4f88e47f1ceb992d84b4c99140bf2916f981fcd8c26486459f492ef810d84fb1294007c073ce238bb11bba106f9d96640f62 WHIRLPOOL 4c0ab2bca3abf5dfce7b67ee0c9e3cf2cc84e938278529aa83347ef7f77411a53490de1b0b76753d558f916860600ead985f9b28f44edc4f2f16fc74b5496951
 DIST kwallet-pam-5.8.6.tar.xz 17760 SHA256 63bc9333a89d545465ab7cfb7d7a5cd61d8c098e454e06ea9a1b77c4cb0021c6 SHA512 279d7c663ee0802cd0d8939f1be0c4db0d8c416b2f118479b9c2eede59af7005cd3aa2f57817c0ef07f8e57ca63366b49a3d7d111d605c45f2887a04b330042c WHIRLPOOL 214ffc9d9ff033d4b5de4a9d8fc866b31bd765c38b9f714b16d250103e3c9a2da5e4f9502519050d1a3a5edf9852bdea0ae183e0c10cc3d001298623306b1c19
 DIST kwallet-pam-5.9.3.tar.xz 17836 SHA256 ca5ea6c5a76814be3e4234592281dd38ed11c8d767975f5e6623077bcd75bade SHA512 2ac102cb2515a8ccf7b72ee04a91021c621012aacbcca2df6eb490c7e5b6035ca058f001bc5cefd0bbf10aaf1cb287e565e115cefa8ef1e5f18064c044239d23 WHIRLPOOL 20f86404e6780272ad5f4f3b44717250272e8116a5d90e5c2e9e0887fa4fc9695d46b0631fa6e2b86ffb334cc07c893720d6dd3e28de54cd918a48884930db73
+DIST kwallet-pam-5.9.4.tar.xz 17832 SHA256 dcfaa53317537454871a819b6b0ebdc4a1faec2698e13c1d8b805671ab55cf50 SHA512 d0fda9317d31af66855ff134829e6aa08dfe232b6ad69ff6aeb3538adb2e14b5b5a33daec6948347f052539523ae50080464583fd6c69abc28d771f946d4be13 WHIRLPOOL 9f52dd676332e1ff39a0cd7938385c037331ca62a109fb22883d96706ad6385a0e9199cbb3b736c0fd74a5f8d75a4ce7ffef041c15248b8d429b11a439867fc8
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.9.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.9.4.ebuild
new file mode 100644
index 000000000000..04d60238def1
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.9.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+inherit kde5 multibuild multilib
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+oldwallet"
+
+COMMON_DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kwalletd-pam
+	net-misc/socat
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		)
+		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
+
+		kde5_src_configure
+	}
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
+
+pkg_postinst() {
+	check_dm() {
+		local good
+		if [[ -e "${ROOT}${2}" ]] ; then
+			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
+				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
+				good=true
+			fi
+			if use oldwallet ; then
+				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
+					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
+					good=false
+				fi
+			fi
+		fi
+		[[ "${good}" = true ]] && \
+			elog "    ${1} - ${2} ...GOOD" || \
+			ewarn "    ${1} - ${2} ...BAD"
+	}
+	elog
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
+	elog "List of things to make it work:"
+	elog "1.  Use standard blowfish encryption instead of GPG"
+	elog "2.  Use same password for login and kwallet"
+	elog "3.  A display manager with support for PAM"
+	elog "4.a Have the following lines in the display manager's pam.d file:"
+	elog "    -auth        optional        pam_kwallet5.so"
+	elog "    -session     optional        pam_kwallet5.so auto_start"
+	if use oldwallet ; then
+		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
+		elog "    -session     optional        pam_kwallet.so"
+	fi
+	elog "4.b Checking installed DMs..."
+	has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
+	has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
+	elog
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 5852993683b3..84e93646e8d7 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,3 +1,4 @@
 DIST kwayland-integration-5.8.5.tar.xz 18292 SHA256 91d2c7422aa0e286111e647b167ac9124d085e47d88415dbcd4b6776701dc685 SHA512 6d269bb1a7ac26d4adf87ddb9791f881d8d52291f4967ba852003897ef056eb723ecedf433f9e4c0aea64bb413ea92c18470af4f0d13302e87aa7075bad18eb6 WHIRLPOOL 6f0080198471c715f9568542edbd3f6cb7c346b0a1ab0d656fb7eebc7a4644d652f0ee644fa7f03b61ebb413755fe2a14af4d8b52ab77ae4739aaac3bb0f2abe
 DIST kwayland-integration-5.8.6.tar.xz 18292 SHA256 db14f5405dbee1231aaa08a8b0aa8a5650db9b34b3fa8cc1fc146b93b185a82d SHA512 d4e00d7db1fb0bc9150a40e04e9ad14fa0c88092ce95b6cf9618762372c5c27688a7ec683ecb6b07acc4da6df8e66ebcd9be7ea7dbc424d756887bc549c44f9e WHIRLPOOL b53b40322f82987b106f0d407e44a38355d9e7df89ff0c644c0f38abf5fc145ea609cc473e03e7e900e7315907a366b378874f96e8222250cae428667d99ad4b
 DIST kwayland-integration-5.9.3.tar.xz 18368 SHA256 67fdfa7248682184da01bc8d3b2a38a2c92427e141e09b6da07b5210b6cf6ce4 SHA512 4c5e37d2612b0540e5c22371da93b10e95a3ff25e1239def800b8ab5d582e19e74c5ba9ad139994ed6b740722e87f7b5fb7312bd566a1fd1663c5b4b141e550d WHIRLPOOL 457b3e6949bb9fceccb4fbe3ebd7aa96d7f9654525188685b771398ef40bee05c1bf3eb9ba06a41ce4da4cd82a1c66065e1c77b5aaf43796692cad0414402e7d
+DIST kwayland-integration-5.9.4.tar.xz 18368 SHA256 3d34ff505d9f9bef1132f5edd82be3fa4885b1eecfe62cfe65657f3592887887 SHA512 45eb5559e6c1ad9dc07027cb933bf1be7ea6e89128c67cc41bc2a74da61340f7ff878cbadc6eb086c025cdb2ccf84e025f683597a8df4fb5b4006594eb59c4db WHIRLPOOL 220796a8a445712352c2d22291f8e96a0139bb109aae8a1a8a5c67c5c3ad4325710f280f52ef87152803ea3096a151b3c7a650323821a45978ce5cd7d5fbf069
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.9.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.9.4.ebuild
new file mode 100644
index 000000000000..6edd40ee0dc2
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.9.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 137858cf46d7..9e4546aaa18a 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,3 +1,4 @@
 DIST kwin-5.8.5.tar.xz 3998948 SHA256 a703a0d1628e36d3a92dfe3e0a8df7ec733ec2f7a93f854b90a9294dda095fa0 SHA512 3393dc5a5cda0f9abaf71dda8867e312972c5893dd4d61eeee67f9230c5e0e3ca42e941e68c0a2f50ee11d6699e0a815a3e3556f69f9c805acb9c381f5baafe5 WHIRLPOOL bf16c5b3745ecd7bc0fd5b1a90707945769cd6d29a5685a3b78564d2b698be734f7a8affeec0b4f59465d6749c3e90385bab22468b32880c7d8683654951b359
 DIST kwin-5.8.6.tar.xz 3999644 SHA256 e549dd4e6ab3c8e4779209fe3583615e9e87d3f251a66edf0a0416d10c7c2ddd SHA512 bd1a4f0ce46902905690efa6d2b54d34cb03ef95c3e14c705219d258fb11fbf3d4be0dd0c368ef3eb94820191dc49cc8b320012117914928bea4f69d8f25e407 WHIRLPOOL 9c7432febd0f4c0f6cf08d230c9a3f154d3bf24a37b6b53c9df2cdc0d66ec4297e297ccb61dd0396613955d6c777ea245c56213cca0a1f5c413f896ba22e5bbc
 DIST kwin-5.9.3.tar.xz 4627712 SHA256 13f64ec29268dc1e167548d7943e943abb57905e97844d4ace5a972e0ef12c85 SHA512 520d574a24521304f2b25662d91c8a6a6fc7fe4fbf4e34ec495af851c8091cffceababea4d3abb7e4c02acf7f350a5420ffaeba36dc53f2d653166a291f5f087 WHIRLPOOL fa22ad26b8f8a4643b73e99ea6162d09853bfb08c6ef73cbf1303458cb8c315c4f2b0fbaf089b257f6425899e550a1954b877090b674c5214593adf52cb19a6a
+DIST kwin-5.9.4.tar.xz 4628228 SHA256 a136b0c46c2c8376611355598236d829f54da8192682c515e4358cb6cd849361 SHA512 0fc41384d448c5ae91461b26ab128a899d37fd7f5b4aa2431e7b0689f22ce16fe655926a1f9107cbc7bb88ef8c43a0374e3c1ca62c40560c7cd7b380f3a910b0 WHIRLPOOL 11841a366f3d4fb68e3a758adb0a6de6a8c22ef04615c1db510d0f054b9c6468a57efaf363010f9c3618564e7db847a65f67779c0abeb36e4eb786ab520b89f9
diff --git a/kde-plasma/kwin/kwin-5.9.4.ebuild b/kde-plasma/kwin/kwin-5.9.4.ebuild
new file mode 100644
index 000000000000..77c9c31ad8b8
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.9.4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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.5
+	>=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.7.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 d63260f85a25..b7e551312c52 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,3 +1,4 @@
 DIST kwrited-5.8.5.tar.xz 20324 SHA256 793a391d74ccabd107b323504b3a0c10482c6ec098019dc45c02fb68091159db SHA512 ea13dc1f50209c98d2a0377a985d5a2783773a583daa3a52fb657a19f9e4c2436d01dc5994fac5d1bd5de11d5bc1de715574440a67059ed1d9a04bd04c28a4e5 WHIRLPOOL 5089fee27309954a02e57a638671ef07832be37b7d1e61763fd6ce2743663d00f76d960424c9967c4fa30da1cad35b46b2495627de154f0f872b9876ce30d8ae
 DIST kwrited-5.8.6.tar.xz 20324 SHA256 a59de4adc45120d2bdff5dfc5681a9bb5fdf48a744803da22611e2effe5bd921 SHA512 b933f49073d0e5f5306f9ae7914e471258edab45e06336876a108d104cf71cf246ef8e97613c93ff0464533d21794bb4f829bbd06043769c1f438a82ff72ac5f WHIRLPOOL d3aad70e3d71c2805d82111009768d2b3754717b86af4c9dd46b17b6bb8fc6a668328437c5e6f00252576ca1589debceec38838a06d050d7f85941bd0313fb5b
 DIST kwrited-5.9.3.tar.xz 20212 SHA256 1825496d9af3dbeb921c04a1f2de62526fd7955daaa0bd11f1b49b4adad53852 SHA512 9992122f404884612105bde740a14792e2a5edb65a3291379c84b431a044786b8fd99ae2b68e7ca1b3a8003fe8ccbb82a09168a8d6e4f0583ebcf02b98b8cb0c WHIRLPOOL 91e294069f44ef1f58e37da907cbb36496dde78cb98986ccd525a5d429da9cfe8977644997e994ed3fa2d3d1ba2270a69481442b7cf02b5e989505068d3b7f6c
+DIST kwrited-5.9.4.tar.xz 20212 SHA256 67b5fd067951aa831eee14bf73fbabdd16e6fa4a63ff1d85e59e05651cb02bdf SHA512 53e0b209f9baeac58690cec286ce0ff0a889485d5fa899b49a6f604deaa6ceb817c3b5489ec74ddf03e80338bf8bf9d0e9ff775c0971eeac55bee87cc0d07805 WHIRLPOOL fb30c0e1051effcc5959798e464dbf7b13d729f1e84c22e29f422f0e151b8cd999776265b11baff1a3affc2b957d9ea5e90bbc10272a37f137a353a35924cf7e
diff --git a/kde-plasma/kwrited/kwrited-5.9.4.ebuild b/kde-plasma/kwrited/kwrited-5.9.4.ebuild
new file mode 100644
index 000000000000..6f31220af41d
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.9.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 197720f44182..2b933af53a92 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,3 +1,4 @@
 DIST libkscreen-5.8.5.tar.xz 93668 SHA256 c9afda7f80af8d07a659240de0ca70c96cf72dc124f338d42faf5a40fdb742fe SHA512 d907fbd1348c2e6094ec1cd51cc0131170a8e86d033da386ef7372ba08a5e8ddbbdbac3029a4e512ff3a9ba9d00b90de6fd294552966b1e85d787d25281cfe96 WHIRLPOOL 4b425d84c50c0867d769e002537fd37752a119e0cbc00ea72695bde6672b2ad462985799eb14cde0e3a239209d1f9983eb8d3f5945225ce50ce5718c53972808
 DIST libkscreen-5.8.6.tar.xz 93708 SHA256 aeb663412141c5869b56f44a53f477f4140b64526aae21b73e95a7a9b7a72008 SHA512 799e042039724355658a9dc84fccb074fcdece79d63ff06ef4ef836f23f03df2d33c28e11df1b8b096320de50b13c2308b69b3e6b7136f883f6b2ea07952e23d WHIRLPOOL 38a01f7354a026febb1c12d8de07fe493b9610481e3dc6c32b04f951677a7ebb819e09cab440de88f44d141100910f0b321c8688cbb4c3f220e58c6195ef3334
 DIST libkscreen-5.9.3.tar.xz 94056 SHA256 eb19e488e495391c557eaaadc4943cfb4ad683687bb855c8b9be4e906b5fb0db SHA512 9bde53e9be7aaf90734c36870a3052a0e82db4f07b56bb84e9ea50c3318528c930e59756f5f22c002b19572458be0484b844bdc0516f344b98ee11c10eed74d1 WHIRLPOOL ba3932daa7c2c4c79f59eb8cf5e5e8bfe0950e904d61e9d839a55cbab154c99f5b000b846fdd2e99f33f400bb638c71945110f6903e4ed065f5045b10a5929c5
+DIST libkscreen-5.9.4.tar.xz 94068 SHA256 fb0e1f278017276b69b7796042e3f04b350fc264024c974e683c159f414869c0 SHA512 33c7d6c3d6b39376005b1279532799190f74ddd652b857949bac09fec6108875ed2a3aee716436ab5216af07c3b4e6e5d7638a5fda57ec5fda08d3e670bf4e12 WHIRLPOOL 90c6196ba6604bf5f2b1652b4ead74096b20671b67de41581e7509d1197b9a57ea0fa2bf6e06b40a77ebf304268e9458ee128be64dd996adb75f893195e0ef0f
diff --git a/kde-plasma/libkscreen/libkscreen-5.9.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.9.4.ebuild
new file mode 100644
index 000000000000..faedcb062786
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.9.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 c481d1a9de6d..2f73e96d1f89 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,3 +1,4 @@
 DIST libksysguard-5.8.5.tar.xz 575840 SHA256 976f9506037b45570475ba71a7445810cfd57c6079589038d63742d9fe2497a9 SHA512 5f3f1b924589dbb50e7e7f133da5325817a6ce100915682d3b6bbf80124299d85e66f83cd7adc33771dfdc9ee49c226fcb8a47204873a21231c2fe2829685089 WHIRLPOOL 89e7b1ba622356d572b31fbabc471c2b54312c26361b16183ab9f278c0bf3d877be7f7df2e95156b5ef5df3be80c263e3c521b02cd16dd3e642117e23cb36745
 DIST libksysguard-5.8.6.tar.xz 575748 SHA256 a8ae640da5fedae7b59735a745d6da36eb4a3231afb116f2b453ff443f2c6244 SHA512 0f78ca2ef2b862da941cc58e8bb781a23c02e885a3545aeefae43b14b32b5b3cf03b4f6393141966e0d72490afab9f350a479ab319cfce15082f3ef38f761a20 WHIRLPOOL 1f70a97c17e904a01d2800e2579bd124fa5d6f397ac45be3be2a6979a4115fad0e82ea2a71eccbac9ff25ab5c0d8e810bbdd621210e1fc62ec29a38b06767444
 DIST libksysguard-5.9.3.tar.xz 574840 SHA256 2f9aedeeaeb616cdd6ea90156a85e2b4fb6981e01dd0da7c3c2f2bae98cf473a SHA512 5654dea4379696e948a1c14882ac476ad5fd47cc3876fa18d27ef6efaa21f3e0aa0613a6372fa2229f5f3fa530ef6c21c11fb48a144c4c9d7fca9c4f4db7faa4 WHIRLPOOL 980bc5881c80199ef08d210eeecd95b6688ecca6c3a2c91d069cfce42669d6451cce5df9306921c0f6cf36a8791aae91354bc5ce99cc31570a7647818e731507
+DIST libksysguard-5.9.4.tar.xz 574944 SHA256 15df1b40cedc28d4634d2ceb301401930d46897bb4cf963cdf26cd7c51c6eebe SHA512 d3757caa7c439c765467bef573dbe9caddb175025065465ab0260aeb80e162e949b6019636a99759ec5261a4ea858c8234682838b385d4adeb2f355eb91beec4 WHIRLPOOL 05045e81bb9a6bd4bc93e2a76f75f444da8c3524697f87c9308a4d8b120883438b5c2554932525565038ca1d01ce1ea7ade8df0d60cf9c215a645212dc9099d5
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.9.4-plasma-optional.patch b/kde-plasma/libksysguard/files/libksysguard-5.9.4-plasma-optional.patch
new file mode 100644
index 000000000000..107056e37c42
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.9.4-plasma-optional.patch
@@ -0,0 +1,88 @@
+From a0e69617442d720c76da5ebe3323e7a977929db4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=80lex=20Fiestas?= <afiestas@kde.org>
+Date: Wed, 22 Feb 2017 15:18:27 +0100
+Subject: Make Plasma optional in exchange of disabling signalplotter
+
+Plama is a solution with lots of dependencies which makes it really
+difficult to use libksysguard in third party applications. This patch
+makes it optional by disabling signalplotter when Plasma is not found.
+
+REVIEW: 129964
+---
+ CMakeLists.txt       | 14 ++++++++++++--
+ tests/CMakeLists.txt | 25 ++++++++++++++-----------
+ 2 files changed, 26 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9660cdb..61c41c6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,7 +18,15 @@ set_package_properties(Qt5WebKitWidgets PROPERTIES
+                        PURPOSE "Used by the HTML-based GUI ksysguard library"
+                       )
+ 
+-find_package(KF5 REQUIRED COMPONENTS CoreAddons Config I18n WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service Plasma)
++find_package(KF5 REQUIRED COMPONENTS CoreAddons Config I18n WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service)
++find_package(KF5 OPTIONAL_COMPONENTS Plasma)
++set_package_properties(KF5Plasma PROPERTIES
++                       URL "https://cgit.kde.org/plasma-framework.git/"
++                       DESCRIPTION "The library of the plasma project"
++                       TYPE OPTIONAL
++                       PURPOSE "Used by signalplotter to use Plasma themes"
++                      )
++
+ find_package(ZLIB REQUIRED)
+ set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed files and data streams"
+                        URL "http://www.zlib.net"
+@@ -66,7 +74,9 @@ configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysg
+ add_subdirectory( lsofui )
+ add_subdirectory( processcore )
+ add_subdirectory( processui )
+-add_subdirectory( signalplotter )
++if (KF5Plasma_FOUND)
++    add_subdirectory( signalplotter )
++endif()
+ add_subdirectory( ksgrd )
+ 
+ if(BUILD_TESTING)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 967b03f..7ae9fec 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -7,19 +7,22 @@ if(Qt5WebKitWidgets_FOUND)
+             LINK_LIBRARIES KF5::ProcessUi Qt5::Test)
+ endif()
+ 
+-ecm_add_test(signalplotterbenchmark.cpp ${libksysguard_SOURCE_DIR}/processcore/processcore_debug.cpp ../signalplotter/ksignalplotter.cpp
+-    TEST_NAME signalplotterbenchmark
+-    LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes)
++if (KF5Plasma_FOUND)
++    ecm_add_test(signalplotterbenchmark.cpp ${libksysguard_SOURCE_DIR}/processcore/processcore_debug.cpp ../signalplotter/ksignalplotter.cpp
++        TEST_NAME signalplotterbenchmark
++        LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes
++    )
+ 
+-ecm_add_test(graphicssignalplotterbenchmark.cpp ${libksysguard_SOURCE_DIR}/processcore/processcore_debug.cpp ../signalplotter/kgraphicssignalplotter.cpp
+-    TEST_NAME graphicssignalplotterbenchmark
+-    LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes KF5::Plasma
+-)
++    ecm_add_test(graphicssignalplotterbenchmark.cpp ${libksysguard_SOURCE_DIR}/processcore/processcore_debug.cpp ../signalplotter/kgraphicssignalplotter.cpp
++        TEST_NAME graphicssignalplotterbenchmark
++        LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes KF5::Plasma
++    )
+ 
+-ecm_add_test(signalplottertest.cpp ${libksysguard_SOURCE_DIR}/processcore/processcore_debug.cpp ../signalplotter/ksignalplotter.cpp
+-    TEST_NAME signalplottertest
+-    LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes
+-)
++    ecm_add_test(signalplottertest.cpp ${libksysguard_SOURCE_DIR}/processcore/processcore_debug.cpp ../signalplotter/ksignalplotter.cpp
++        TEST_NAME signalplottertest
++        LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes
++    )
++endif()
+ 
+ ecm_add_test(chronotest.cpp
+     TEST_NAME chronotest
+-- 
+cgit v0.11.2
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.9.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.9.4.ebuild
new file mode 100644
index 000000000000..476f4cbdce06
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.9.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 minimal 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)
+	!minimal? ( $(add_frameworks_dep plasma) )
+	X? ( x11-proto/xproto )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.9.4-plasma-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package !minimal KF5Plasma)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 8351475b3b09..9c4fa5bc94e1 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,3 +1,4 @@
 DIST milou-5.8.5.tar.xz 54536 SHA256 6dfced99ee3b1eb163dfc55c5546e06b6aee664b4333251e461a4f39c8624552 SHA512 05002a23c5214a891258f3b9a0be68f3beede42e32437f55a887ae7635a14d9c12acc327a2d3fb8bb5e753666aaccd2826abf7fd3154e8ea6aaad4b43610f6e6 WHIRLPOOL ac6ded45107ab6a54bd42e82876e054a43a3d81efa3ceeda271a1067be182c73ea1c4b4cef3d124eb43998fee5aadcd7c9fa72ff64816cd39b2d6174445acd5a
 DIST milou-5.8.6.tar.xz 54512 SHA256 7a6d224fd0fca331e3a696ad8bd03cfb4be2fcb31bb939fb3335a89bdc895b03 SHA512 ba6c5898c46091906843cf0de4645b7e087adf5d8e789a98f82f15116f818545790ea631ec1c31b2e96c5110cc9fde48f6a3a98dcbb449aae76452d12cabe260 WHIRLPOOL cf24f12f35fc277ea0f60c9cc30c984cbb735584d010a38eb9c13abf948081492ff640e8ff446be5e24989ad1f955cf380b19fcc7e524562355d9543e8809772
 DIST milou-5.9.3.tar.xz 55116 SHA256 c375e1170e872822f020eb87dd23e76721491b4ff49d3d2b7615fc5b3f4bb3de SHA512 828be9e274d5e9e3bc62ecfe402f9be58723126b140a5d7b011f4d67e7c66316a26301afba917cc62fd3547fa7b94ff490d26a00ae885011d744d2017ea2fb64 WHIRLPOOL 6795785754230906990696596fba5ef9a453b814915af8ef71e13263c6f0826f5bb08097c47674b7c65ac77c10d5ab2962cdfbe57cc61bda608ffd5dac82e128
+DIST milou-5.9.4.tar.xz 55136 SHA256 dcad590c3ad7f2ab8ead85cd9bec6bb037a399ce28dde4297dec195a53eabfa3 SHA512 1cc389346ad090374bec8f8038d16029a3ca83c48bba922c77849c8de3b6fe2810846a70da00f49963c700bc46e836ae809ae6542feccad5a08f5fc4e60b71c4 WHIRLPOOL 125569511b48a6d86abc66aa9e0e305e349db237afb31f19bb4a17ee67ebcc36c0b2dbb200316f9a7b94f0c287861900474590172c2c26cab30b0312feeb9f9b
diff --git a/kde-plasma/milou/milou-5.9.4.ebuild b/kde-plasma/milou/milou-5.9.4.ebuild
new file mode 100644
index 000000000000..36b2c7448b1e
--- /dev/null
+++ b/kde-plasma/milou/milou-5.9.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ccd5e248f7f8..6d32d10490a6 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,3 +1,4 @@
 DIST oxygen-5.8.5.tar.xz 4461696 SHA256 07d2740709c9979eac381d4e728a3bf6670015a02c2c3478ed30fa8f8d6532a5 SHA512 0c1f285977c3a6abf4c62b6edf389d15570ba1fefa1972e92acab406ecba92eb4559aa41206487988c96c4512256736ff42dd46c45e871a0fd803d7367d38a4b WHIRLPOOL 6e3b6d5ac914be3c1a1a787be68d0602a138fc6cd5b854dd678cb05793b734e76c1d389e00b6ecd825fdff40bdc6a87ac8926403ab77e3d53ff34c2307c5b7aa
 DIST oxygen-5.8.6.tar.xz 4465080 SHA256 15cc949a44b80f37d5af96c2fd31337ce16b3de04e8b4f97d9d6565fe5af57b7 SHA512 cceb2433c89301c3c60aa54df8231d022fbe80047ccac8107ab773badcdf4fa91beb4aaa01787b688c7a844c99690a5c4248252708b6f3a56203eba40b1c4e67 WHIRLPOOL 59d90fd0fa7d3d019d2aff56b5be6670325a14f3deef73641d445b5461c2123502815b750ffbf6c3314632f62c562cf89cfa4995cb07539c2af7cd57c90776d3
 DIST oxygen-5.9.3.tar.xz 4462204 SHA256 2a9697811a771c699da8ea34461c4173882cdc7f91eb8ec8fa30509a2e4fa2ec SHA512 2f16443d99e44736b72612abbaf28104af1d7cb730322bec52ef66ded1e4f16d76702b7b973edca96ef46d24bd84f78ae6553129757510fc781351fa38d29110 WHIRLPOOL 1ccebb4a2097528ed0b5b76bd9d5da29b1e68ca0b9539be05962d0221fba4daf75aa147c077674141e93d17a3d3a935c04954a7370a788037ef7c1ed6eb139e9
+DIST oxygen-5.9.4.tar.xz 4461932 SHA256 184cf85ac0c9e9614462a9aa17d870aac237647ef85c07cd87286c2007d6be3a SHA512 1ffceef017d66b08785723c776576667e28894430e6ff430193703ae35441ce86aa46531370c06f8c10d68db5031f52089f0fb0161d4ea7a7ad5a1b3e7ffeaf2 WHIRLPOOL 77c287736a21fc21a5ebe04589664a11d664a57c15d96eea53d2745ae269dcdc2db682cf6dcafb2cc128f2e6ecd80096ab8049b88eb6050433335b8d273a769a
diff --git a/kde-plasma/oxygen/oxygen-5.9.4.ebuild b/kde-plasma/oxygen/oxygen-5.9.4.ebuild
new file mode 100644
index 000000000000..9278b31d0487
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.9.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	qt4? (
+		kde-frameworks/kdelibs:4
+		x11-libs/libX11
+	)
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kservice)
+	qt4? (
+		dev-util/automoc:0
+		virtual/pkgconfig
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	qt4? (
+		!kde-plasma/kstyles:4
+		!kde-plasma/liboxygenstyle:4
+	)
+	!kde-plasma/kdebase-cursors:4
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			$(cmake-utils_use_find_package wayland KF5Wayland)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+			mycmakeargs+=( -DUSE_KDE4=true )
+		fi
+
+		kde5_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 80863b3ed049..56456c40e0cd 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,4 @@
 DIST plasma-desktop-5.8.5.tar.xz 6410960 SHA256 d95eeb976cc18a50cff141c509f9e67430b81efcf36269a283fc62b81d48a910 SHA512 d8ef41f5e2a041de04f353e04274062ca4be069ffe88b5cfb0c9a2e5b1395631a8adaf0fda50a784a61a2585c0a503d84730a8c2df844aba71e894bd1f17915e WHIRLPOOL 1ed15a97ab966d682b89a2e7b146220e55495acbba9707a057554044e4ba9f1198712a16dc56d9082457b73384683c7e97647a6ce845df3987d98202e9b8dace
 DIST plasma-desktop-5.8.6.tar.xz 6413204 SHA256 de5c0a2dc8bcf79cec95d660ba535d5d236f11bcee2c5a72e328f3734e0e1f83 SHA512 703dcc555da6c609f858185468694d2c204478d2c7c5822ebfc57a7153899e57e81ce7ab0b2533f30e3e1a3c20bb358f63c5ff26f833b0bf4ab3bc5dec283f7e WHIRLPOOL 4b3bcf398b115ba30c4d96171cdef6255b4bd835a5b90261278b65500b4bcdc72afe66c5b6d138a6946ea4eaa99f6a629cc0980084fa817dc9079c41cedbde47
 DIST plasma-desktop-5.9.3.tar.xz 6060304 SHA256 351eb8d4d1b78c5a18051d7c3f7443bfa8d46dc09714d62b19a8846683b00215 SHA512 2a63ecbb03fa7a46e281b6e11410cfc1bcfd9acca5dfbfd5b336b408d3f192c179052e75ea37568f44ef8c10dacc0270068ad8f0bcf0286982cab7a09fe65d56 WHIRLPOOL da416973f2528647bae1ef721805f89f0567113d13239b94ab93d23544478e4fec1699d86feabd0e59ab3bef5e5d53ffb3eb8170ee0c3be54f63454483b49a70
+DIST plasma-desktop-5.9.4.tar.xz 6065296 SHA256 8d193950391cfc3a50db862838cc71daf34292de4a7e720289da7e5773c171dc SHA512 07a5966d45d4d8ea791161958f04d8f69ae5c0545ec0df9175498d669966df6bd7597532411b5574ddd159757b34f0870d1c263704958459e7d60d69e0b8d7f1 WHIRLPOOL 3d43d056a04c486b666ec994cf0cd524852aac341519cdb154d112058f0a8c20d58c1e8ca7fb201985278d937e59c83b508ac8ebb7c6aac152905de9093e0c48
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.9.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.9.4.ebuild
new file mode 100644
index 000000000000..c2e7cd985ac7
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.9.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="appstream +fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics
+ibus legacy-systray 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
+	appstream? ( dev-libs/appstream[qt5] )
+	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 )
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		media-sound/pulseaudio
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep oxygen)
+	$(add_qt_dep qtgraphicaleffects)
+	sys-apps/accountsservice
+	x11-apps/setxkbmap
+	legacy-systray? (
+		gtk2? ( dev-libs/libappindicator:2 )
+		gtk3? ( dev-libs/libappindicator:3 )
+		qt4? ( dev-libs/sni-qt )
+	)
+	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
+	qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
+	!kde-apps/kcontrol
+	!kde-apps/knetattach[handbook]
+	!kde-base/plasma-desktop:4
+	!kde-plasma/plasma-workspace:4
+	!kde-plasma/solid-actions-kcm:4
+	!kde-plasma/systemsettings:4
+	!kde-misc/kcm_touchpad
+	!kde-misc/kcm-touchpad
+	!kde-plasma/kcm-touchpad
+	!<kde-plasma/kdeplasma-addons-5.5.50
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-proto/xproto
+	fontconfig? ( x11-libs/libXrender )
+	input_devices_evdev? ( x11-drivers/xf86-input-evdev )
+"
+
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
+
+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 appstream AppStreamQt)
+		$(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 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 3fb2d0653a14..3a96107dd61a 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,3 +1,4 @@
 DIST plasma-integration-5.8.5.tar.xz 50936 SHA256 cb4da56f940e87e1195a0ba19e07ea3384fed1dcd26ca91dee1d7dee8f00a7ea SHA512 5e894b334d0d012e6ace38b02f3ff9f8623f75182a0e585406fe5d904658e9ce631c467738a9a79767505028715eb6d27de5c35a4f9d50ad9a83a70e0951dd75 WHIRLPOOL ac28acc14138d95b1228482b4889c4678c12856a9b4a8b915043af3acf434b58121f165d20dcc8a8780d0be4b3548d3053b1d45e58e0bdd7bb5a01a5a9afe733
 DIST plasma-integration-5.8.6.tar.xz 51160 SHA256 ccb22bc771940ec9b6ef7a742af18b8b456ccc05b50b1d29b8b9ecde4b8a076c SHA512 8046549ebd6f0085779de0cd4d85c79d1c03109925b87a3e6466909c006321dca658f95f82cd573cff5403662d47e067765b976221dc2f6172ad2f163973553e WHIRLPOOL b9398ee52dc4c73d373bcabc270a821627594cb0d934b0b3803a9f32e22dc1e16dad53d56720fc026c8e6fabde9ee1a36023dec2822e1b9eff6d38081e971b32
 DIST plasma-integration-5.9.3.tar.xz 49800 SHA256 d47e5346d62635d95cc18e95511d600f9eb06d68ca5f2b8c1715588d358803fb SHA512 8b5e77ae49b24729d3d6bcd235cdeb8a4e0319f7ea453e617ef16126e4e1bff427f00f018a90f4279dd1ff80d63582287ffd5223ced7219dd1e052e85dd2faf9 WHIRLPOOL 5427183a8bd356693175a3ed807eda2da61d08fe7c4db8f44078d53a5490bae92e544c59dc40d1441657cc16fc94635214eabbad2ad76ed061fad1e12f73f30b
+DIST plasma-integration-5.9.4.tar.xz 49904 SHA256 1569754b78cb57451360680316f3ce33f6eee643333a8eb0a8040512c44d65d6 SHA512 a51c3409407562a058c802a7c9fdd1d1340a261f8a88603b86301a8cb147ce113f45842be22d8c6e68ebaad8ca555dd4970504b4a81b2cbc9e2070b7eda57584 WHIRLPOOL 0475bb00ed4e8046ab61d29dd4cfc08e3a45b76242fd50a4a89220d3c03e2e51dd7b064926798677afa7721d7a367baa352921286cadf4e8de7f82e4cfb9294f
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.9.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.9.4.ebuild
new file mode 100644
index 000000000000..e50dd6194fb0
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.9.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 'dbus' '' '5=')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.9.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.9.4.ebuild
new file mode 100644
index 000000000000..f1f950926888
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.9.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 dd2a25a4380f..c7f4618d27c0 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,3 +1,4 @@
 DIST plasma-nm-5.8.5.tar.xz 652716 SHA256 6c2fee26ed36ebc7929f8d8da42d29ed475fe8dd6ab3e8987f1a0a8fd8f73ebc SHA512 adc4a7bade44e16a8d47b7defb73db550347838251f2fcf9e7c879741934692cbfd97df8bec3c5c540f01d479138f0cefba96b1332f6690c1a08817d1365ccf2 WHIRLPOOL 475d90ade58b23ff70362a030d6505862b1ad94474e0b8a664cc480ffde482614ad7c43b400f12df4b4e7252a904cffdb797a46bc01a707f313d67f7f182d942
 DIST plasma-nm-5.8.6.tar.xz 653420 SHA256 e81819b2d7f19749d4b9046953b6ab7b4bbe103ca69b8e7809c4c52cb2294798 SHA512 e1b2bbe31bbe1b27eb64b461b537c9bddd911bc5dd7e001586367c1051e3a3dd0d319f6ed5e24a726688c7e1460d9bca2d01aa828a8d29a2c1392b597f378812 WHIRLPOOL 635fde323022a65096ac0745e905c244514b2b46f1364ef23830155db57cf38ce25a5ec3e9a66979c554772a5ff72cecc04b5eb0b59b926dc871264880ee85c0
 DIST plasma-nm-5.9.3.tar.xz 669372 SHA256 c6b8bcb0bf0562cc57430ab1d02489746a8c126f0cc465a05c8ccf1a9795adc4 SHA512 2bb277c4ce07ae87650d61a36076728610a9093485a301ea413f34e2d0588a16283a365107e2a6ce876c7957f4266f082fe41f1bf7be5a8c3815780326809588 WHIRLPOOL c4e8ad5bbb8b9ab7c9b458c64fdd90ea1a7c87ac8d9f49be9ceecec7ed5fa034a9955400ee5e258f024a7fe2c49481aa7ec9982c18d850fcdf014e89082dc0db
+DIST plasma-nm-5.9.4.tar.xz 670300 SHA256 3dc938132afc041a9a4a15fe6f201337cfa1c39607065f220dafbfd3a1f77b69 SHA512 71624c11b9171a23ff1df53270850f788b12d709e63b9c497c156d83739f8750aaf696c01f3af978ed3265621df3bd54ace46d404621ebd475513ad1b7fc28dc WHIRLPOOL 8f46e6413b58671cbe45f0f82c74c74d4c24baf1d4f9c69fb5e6a3706fe701b7f4a41d6a86494aaebb4a4f8faea3a9ab30960e0f2a3b379d40b0e418e9fb79fb
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.9.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.9.4.ebuild
new file mode 100644
index 000000000000..5783a52a471f
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.9.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-vpn/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 a34d3aff7af6..c6a1df3c3515 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,3 +1,4 @@
 DIST plasma-pa-5.8.5.tar.xz 69856 SHA256 2bbc3e6e12f743c633a5c2101efa6a19dd5f120b64da0ea0ff3da3e7ba6fe16d SHA512 87151c05d2f919c7b25274254d690eb7dd0c6e1068a230e6110092bf7622bcfa14c553e0b09253b529e9f4531ed13d484a874e29402dc13d8ec66315111abe5e WHIRLPOOL c2301cd34faddff497c230f4d0d4f0e66ebe2b506727e219b3b025dadb8e76e62e53e3d3246e190da3543d3259907083de507fae1320d7df24b6639713cf797a
 DIST plasma-pa-5.8.6.tar.xz 70040 SHA256 e8ca46cdbfefbf8a3067a5a6e153835a2bd44257f30eb94dba9a542bf4147c9c SHA512 6131057d00fd3d7338ce9bc6eb9e9233ee16e32fdcf43cdd9356c9c7bb6976ca2bc78ece649a7fbe7376aebb0d6566341ef7d8e6814effd41c1bffd32b8cbfe9 WHIRLPOOL 7ef43b69b5c9ef80814dcf16edfa6a4070ebb067f560613a75fdb7baae1b06a307e7117bf27c22be4c49d26cfdd2152162c4ae9a4cc571fa65a6afa6928938e4
 DIST plasma-pa-5.9.3.tar.xz 70484 SHA256 0158de76ef968a821431b18e3a325d7f316d289af74e0e09fff43c53ed1a282f SHA512 7af62853d7b20b9adf076ca764118f3431c0a18d9064a08f6c5e07dfd03ac58ab7090e23706857c9d9ec6c72ba3f2677d03998e4585931ecef930836e481fa80 WHIRLPOOL 18cae6894a7507e29850c7aebe29be1789dfe5532ebcb88896dce67f101d7b397649e67adfea755780dd70b3bc21ce5aecfe087ca684419a032b2dbfd8e8b57e
+DIST plasma-pa-5.9.4.tar.xz 70484 SHA256 288aa1cae1f70e881e113b4a7cfcc750297a442406735f07d723986eea633642 SHA512 f3b2090cad576f0f37661fa8454c2fd368080933fb7ec5c749c20623dc1bcf9ad1a2cc5b46907974b6ca1a5732e231d782e44a7a580e5abea5a000011a639071 WHIRLPOOL a47c8f4ea8736b3133af72acabba1c2d74abddd844e46e1addf4ed6c4f3a39e61833dcead32fe9ac2f0b96a07306f783a366f673eb59ad0a996b64ab02c02a11
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.9.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.9.4.ebuild
new file mode 100644
index 000000000000..fb5fb2344258
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.9.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 7b83c76026ae..e66e2cef901d 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,3 +1,4 @@
 DIST plasma-sdk-5.8.5.tar.xz 723240 SHA256 edeeb529e29307f5efedb0371706269ab0edcf0861b73dbd235821457a599e8e SHA512 e805b803b85baaa376069d6ca56f1df4db81252a1fade74629333a236e320835d3fd464fd64427177817ed22e8b3edc55a28bccab4360339ceb193fc9c4008ff WHIRLPOOL d658cdd8bfa8b39c1a31ec1ed7eea3d3f773b1a836458967622cd5de08f7dfe8b2bf5b523c8cc68766d057181d7f0c2823e9d227fbed373d799435f19f2c3e06
 DIST plasma-sdk-5.8.6.tar.xz 723612 SHA256 19716fff4b3519843d3e53113131c90429112a927f38e5577163e42136774ded SHA512 cf664b8932ba16f399408aab4c7c022a52732311beaa9542764eeaccf6c1284b32e9739349fae8b8dbda5ab850aa70cc0acef65c6e4ba0cb68d0e34e00f277b1 WHIRLPOOL b0c9da6dc41b1a5de79abe9772b5ca2af84308356f99411d8fab2b0866bb736410f4e29565a7c8e02c080e7045ddf5f18d126afa8ee0f934c6c4687e855f9ed5
 DIST plasma-sdk-5.9.3.tar.xz 722180 SHA256 2bff3ede9fcf7c6e96b7a8d845487cc28a02d096778dfbe9b35836c896879980 SHA512 aab720f3d979ed34100c831f50d050aeaddd9daa14ae6da808fcc0f5ed205ff95899f5640f28d59e6580eac5a966fed5a067717bd4c0c6b4295ca96e50fcc392 WHIRLPOOL d41bb35cbf8ae01a4b72f6cffa9b11b8ae4ec1eb37762e8dbd7d844e98dbaf57ca2912c86e6f35f277811d0cbf552581b147c3d940eb1bdfd664a0caf88a82b1
+DIST plasma-sdk-5.9.4.tar.xz 722964 SHA256 dcdd30e67a5c4a0664871f3cf1b636ea19bf61fe044284556d438cc3d54c845b SHA512 4e59f57297961ab0753aa5c3d1b5f986706993dd971fa67822e098dfe1e8b957652414ef6c6167e9ec55298cd655ef817ca1a65683f028d5fcf6f87ec8f13ade WHIRLPOOL 1cc6eee417609558737dba5142df27f6c030daba69634d85c2b1e1eff13482b65ef99da3627cec4d33ae10014477c6e1b29033777410b9c052cf8fa5b9776f4b
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.9.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.9.4.ebuild
new file mode 100644
index 000000000000..0e6e7fcda0fb
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.9.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Useful applications for Plasma development"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="plasmate"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/kirigami:1
+	plasmate? (
+		$(add_frameworks_dep kdelibs4support)
+		$(add_frameworks_dep knewstuff)
+		$(add_frameworks_dep kparts)
+		$(add_qt_dep qtwebkit)
+		dev-util/kdevplatform:5
+	)
+"
+RDEPEND="${DEPEND}
+	!dev-util/plasmate
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package plasmate KDevPlatform)
+		$(cmake-utils_use_find_package plasmate Qt5WebKit)
+		$(cmake-utils_use_find_package plasmate Qt5WebKitWidgets)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 54cb11b688f2..266d57361558 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,3 +1,4 @@
 DIST plasma-workspace-wallpapers-5.8.5.tar.xz 45911280 SHA256 dfdbef49a8b8feb27a0927bc28728fefed94943baebf97587f8b2284384eda84 SHA512 2772eea021db56de425e094783c88bbd8811484720be38816bbf9a525a244c2e9f07f4223bceec4045bee5008eb154d2cae3d532a7e35fca4544d68bdfde3f24 WHIRLPOOL c9aef7c817c96bce3f0f5a8d3f8055a3bed7a5bf82fe1743ea1c70895c964dfdf183249b1e2fa3455d529274313fbb58ab44826db50286fe9146bc0c788f1c67
 DIST plasma-workspace-wallpapers-5.8.6.tar.xz 45911424 SHA256 2d8e11063378a7569701195b3f2fe9102ac32785767bb0bc4327da7e06d34287 SHA512 9bc20852430214ba7b6bac0340a8e6e4dcf82c0a8b2cef40bf5b9ba8eada91fc276fda34c589a57b414c4f36eedbf305358eae02ecbdd2dbb429ac04d2d6d465 WHIRLPOOL 53044e54d0f7b812127053e44e43d8d62314a631de2988592202da847d78c0e7338bd4fa5fd2586ff70ec655858b24b3bb043b4a9ba8b912f117ae0fd4ec5a3e
 DIST plasma-workspace-wallpapers-5.9.3.tar.xz 45910756 SHA256 60f5dfd7a6c9cf4faa07182fbfd9e07742ae7ed4183afa464e16166b039172c6 SHA512 224121ad4752011cf7e61664d07c8fe868453ae85570445101d5832d18fd9787f4a76500776fba949d942f2031f063859fc979f59b7aa285c56f7a4e7a5915c2 WHIRLPOOL 98d97633eb49af6b4d2f36a6a100b6478c9f7df702445b6839a6685c4f9d7761c653e764fbd218b2e64a86322e08f67892da1965208faa2d926e6aeaf4f933fd
+DIST plasma-workspace-wallpapers-5.9.4.tar.xz 45910572 SHA256 01097a93eb0310883be9f6ab5d7e8506be47a243bcf978d04b207783d4a1cf4a SHA512 d84bcc9db8782a95bec8121bca0175d2f79bb5f4115e97e4161628143f31a9d31a91f6e6a11bb8f5c4e89f8f72c691ec583e3d6aeadb3cfeb1a8e424552c4d27 WHIRLPOOL 345801d58c437fce05a483b1e3e9a7c61753d492e8332809d120e971b7703d056c1eca5e03ab3f5a718fb4f9c720d89057f0b2d76e69ccdf16085f501cfe2cb8
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.9.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.9.4.ebuild
new file mode 100644
index 000000000000..a893dcfeb801
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.9.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 259c9dbe65c9..21cf0722b538 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,4 @@
 DIST plasma-workspace-5.8.5.tar.xz 6989928 SHA256 6d25077205436e3e721d7dfa4dffce7aea62a6e652ee7897952885e52b2f6ea1 SHA512 c4173bd4db3dc31c0435192b1569bdb44488f9f17b4cb5468b4af562b9dbb0934106caf92ea65e9e6b24f8dadcdda08cee07d64bee8b0f52398e07f39fbb97f6 WHIRLPOOL 1f42679ab9f9e1abd446474f03cb8b65c1d49875f2f1dc689311c1e62985d7e8b4276774fc1717ad8512b8e90b1f654f5f0a93aa7da06083e5a0e4b7c5251936
 DIST plasma-workspace-5.8.6.tar.xz 6992264 SHA256 51ab8b5f4c33c83fb64eb3f27561f3699b12b5e5c9fa7d38b73d93e57da50192 SHA512 fdc22db98942db8debe24a4364b2a8c5d02ee850691a8e7788f812b6ee9b3324a26b5cb71d248f49fa71eba0aca47f838ef671dd428e26fb60a5a5650d9d3144 WHIRLPOOL 9802e399f357ca5585e1cf2b838d601d330fb1c8d97fc012c5c7dd41a2742971e0539153a78ded8fa4196a8559a17074cf74523df5b8c4f1ebe902d6432311b5
 DIST plasma-workspace-5.9.3.tar.xz 6938372 SHA256 6f9ba698efeba4b66f6c0d2efa5b109030e8baf971fae2033fbff069b119cb52 SHA512 2b8f5281a683d5fac8bb8245997ff865054889cfbd467981530b6f329837b5e6f7b31cb506936a475bc640fb084fb11ec2eedc9a2189df238f6bee242ce782b6 WHIRLPOOL 2e6df09e14be7b844106b1d0424045f644dfbd5e6ec832d9420c79f49a0ebe9568b75587653cbe32dd05683101f14bb3814272685f8379037a65a13d7c0b3cea
+DIST plasma-workspace-5.9.4.tar.xz 6939508 SHA256 15af4769aee9ab35df133fcb4b366ead4cf3b495e7f6d1ece4851055887d5f5d SHA512 4f1d44e8983342b02aa21344abe8f488030f705803c0d8b7ebbbad977d39b2142c9a056cf9c6efe03e3de3306683e4db1dda9fed672119f5e358132311e18189 WHIRLPOOL 80bf64dcad55b152ad2eb6cb8f42d960e7c8594d53116eca77a7d253122182e45e1b31794641f397b6c9c2fbd5d051aff15679d68dbf508338a30591bda768b6
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.9.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.9.4.ebuild
new file mode 100644
index 000000000000..0ceac64cde58
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.9.4.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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)
+	media-libs/phonon[qt5]
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	calendar? ( $(add_kdeapps_dep kholidays) )
+	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+	gps? ( sci-geosciences/gpsd )
+	prison? ( $(add_frameworks_dep prison) )
+	qalculate? ( sci-libs/libqalculate:= )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_kdeapps_dep kio-extras)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep ksysguard)
+	$(add_plasma_dep milou)
+	$(add_plasma_dep plasma-integration)
+	$(add_qt_dep qdbus)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtpaths)
+	$(add_qt_dep qtquickcontrols 'widgets')
+	app-text/iso-codes
+	x11-apps/mkfontdir
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xset
+	x11-apps/xsetroot
+	!dev-libs/xembed-sni-proxy
+	!kde-plasma/freespacenotifier:4
+	!kde-plasma/libtaskmanager:4
+	!kde-plasma/kcminit:4
+	!kde-plasma/kdebase-startkde:4
+	!kde-plasma/klipper:4
+	!kde-plasma/krunner:4
+	!kde-plasma/ksmserver:4
+	!kde-plasma/ksplash:4
+	!kde-plasma/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+
+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 aa0936326b7a..a4382933c121 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,3 +1,4 @@
 DIST polkit-kde-agent-1-5.8.5.tar.xz 41136 SHA256 87eb786344042d361c1af1b40c0ac6e153692505101508e24a8d49ca114193b7 SHA512 8491fdacd849dffb76f1b47bb2c20ed3d924e37b698599003d3351dd3e4923d0ed7565030cbbd4065dc823d3d5960b7667f634c176781ccc2bc88eb163fcd614 WHIRLPOOL 7ff11dae2a0823104732f8a2ecaaad2f7b1075bfc1ffa89770f573987dc3b362397549b028d0ca4781b07c4e59bdea5f844324a3b5fe46a0c2dc030cf410f380
 DIST polkit-kde-agent-1-5.8.6.tar.xz 41140 SHA256 8227e8ccd12d799c7ec25940afa121d3df5fe4f66e1645a85ba96e7df2a26f81 SHA512 3950ddfdb91323ad5045d700403f6721598662e646775397242a022e22682514abbcdc447e35d02b96077883d3bdb97f6e7244ccc5ea30812c9541162d06e90e WHIRLPOOL 1690e3b7f05bbb64d4f62f5209b5cd0c6f3830a86632274721044e3633e39a9c8e4d734656ef6758c7cddc220798e8a067b71a0955e86fac2058f5311d486bd3
 DIST polkit-kde-agent-1-5.9.3.tar.xz 41016 SHA256 586c2eae15c1b6406da428595e01d2e404362b72c7b6a2941ae0e2359e72ca4d SHA512 0bff960c86c3fb718654ddb9d2e020ed7ac3585850660701a483e6bce5a69800d05e0c007e70b1aa51fe5bc57ab11fe30f006eba9a74f44bfc0a64b52efeba76 WHIRLPOOL 0b1ed6ac1a5f3694e0979acc0994a33f58a45051b29c2bd54ae32331879f87c2b85033e65f74664610cb6b51b33ce5c10bc70618da58b1fdc921ae360b5ed56e
+DIST polkit-kde-agent-1-5.9.4.tar.xz 41040 SHA256 4c3a890c1f09433c3a0b6afb0984a18cf6676405b818facbb6f5ef29dbdba383 SHA512 98a5ca5a1fe9fe89a885b6f2599f1da605be88332a0128fce5c498f1b929d2d0e08e79126bbdd66d1affcb2ff6f9c93015517a46970118cc327b65045a102a4b WHIRLPOOL e3c24b809b3f105aca9f7993f6e61c11460551e9c064352d7a44018a0f78d998943263611e4b7e13bdc550e848541bd0d7c5ece0ba7c7370d16addfafe50e4d6
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.9.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.9.4.ebuild
new file mode 100644
index 000000000000..127e07d8f11f
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.9.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 dd3d5019ce81..76c3aa66986f 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,3 +1,4 @@
 DIST powerdevil-5.8.5.tar.xz 357872 SHA256 041cb684b981ba1c618627b7b6a9fb58bb4b2e4106937e228f376a8715934752 SHA512 8b2653c4e73ff4bb8fe4fc794f803e5e5ca525bcec749a04f715f7e518b3f5dacba8b83afb002804af2db6cf276ae3262e5972ad6817683fe5e7bae86bc01f9e WHIRLPOOL 44282d5d12cdacfae8ed88d643e03402a321915f67f1ddb40685f01db8e73006b0147d30c07ba2fe124acf170cef8b3b4cb900a622511d73fc4a86ba2ce8f5ca
 DIST powerdevil-5.8.6.tar.xz 357808 SHA256 64db4d23c631397632cc84183008290e86fe1ffdf8df662fc627a47f8ce8be32 SHA512 90afa4e771e33e776d78fded893e90829553f4e4e60e0d4bce49c0fe12cbe97a3b8bd3cd8a6734f87edd4c19c85b8dc5bd890bbd26282e850391b465714df1e3 WHIRLPOOL 7cb04e359995e43c11fd7b2d4f7aeb82943e61d4d377eb5ced37e65d87a204381f9162c40c599657777c4407ccc3c88030191a6dd159b310c095f13b002aacea
 DIST powerdevil-5.9.3.tar.xz 358432 SHA256 b2abb0b6169b928878e64eb575f0784e809a8693b6240bba2edabac99eadf0ea SHA512 1bbf6bfd870104720b709564559f20ac4559e6c2776ff6c944eef694de72c35b850bf80d75511ec252f1c1dea1a3fbfd90869e7aca6eea4d8c8df58f282aca7a WHIRLPOOL dbb89204543953509ed1ecd4e06fb6f42e1d8bd69e76b4c69b6d07b3d7b063ac1e1e021c875889776e2db36e1c4e565e10cf2bd7bf8bd0d158f256a3e082199f
+DIST powerdevil-5.9.4.tar.xz 359316 SHA256 3b877429e6be898f114848964c1190f2fbd41ea97db820dea5a1f0989901f7ba SHA512 9ac5e580a0395db62339ebcfb72d6b405ebed10f2a6a93246bc218adaaa2ea9fbbd9093fd552b48dd3f962f0a43fb8ed13ae61726072258e8f3394b73bae6141 WHIRLPOOL 29f3eb027835d24f735ace64ececc95d7794c3ea94ccf22dff1320d4f452c39271d070376f48aecd5d24720526ce9900737cf6f7438b4c8c852a6855105f4de6
diff --git a/kde-plasma/powerdevil/metadata.xml b/kde-plasma/powerdevil/metadata.xml
index 8344ab76e5f8..a83a59e337ab 100644
--- a/kde-plasma/powerdevil/metadata.xml
+++ b/kde-plasma/powerdevil/metadata.xml
@@ -6,7 +6,8 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
+		<flag name="consolekit">Enable <pkg>sys-auth/consolekit</pkg> support</flag>
+		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
 		<flag name="wireless">Enable wireless energy saving actions via <pkg>kde-frameworks/bluez-qt</pkg> and <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/powerdevil/powerdevil-5.9.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.9.4.ebuild
new file mode 100644
index 000000000000..fabb7805ea8d
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.9.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="consolekit +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)
+	>=sys-power/upower-0.9.23
+	consolekit? (
+		>=sys-auth/consolekit-1.0.1
+		sys-auth/polkit-pkla-compat
+		sys-power/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 consolekit ; 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
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 1d270b9d73f3..ac0eb6c2734f 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,3 +1,4 @@
 DIST sddm-kcm-5.8.5.tar.xz 49008 SHA256 0c3b903ce09a6707453edd6a89da9676ce417dbf8c0dc360f9046336dc989b35 SHA512 12ab54496dcb07ae662eff7bfe0b3c4a12ae91b4c3b3de8186f310305e7a7bfe1060ccf2d6b0dadff1ea15cd6fb666385c71230e35b86de6383122cd88ae66b5 WHIRLPOOL f3e57d59f09ff1a11a6560eddf9da0195981482ae0140a51414f92e88627261b0ba64779f391d787edf6272dfb9b6bb7124f03a4dbab3969bedd1db6f1150c6f
 DIST sddm-kcm-5.8.6.tar.xz 48976 SHA256 8cc61258cbd4c2d2a23383bd3cdc663b28feff0eb66c1edd4e808075cf08a875 SHA512 eedd94c4ceb251c155fc4a6387480f834854e3a435723af5bf0e6fab31bf036a628eec3ed1fd836e5da0beae7c1e82595a18ffa87e3c701c2c29955adcacf785 WHIRLPOOL c21c5e63c054b58d1d14493cec543e0e460014147235baf254fdfb63aca3e409f028b62e79f18efa983933864396149bc260336f62cef253ccf33ef37c9be5c9
 DIST sddm-kcm-5.9.3.tar.xz 56380 SHA256 80fab96c3a3d5861ca7edb3b5f418860a709467f063b944e2a64976e99505690 SHA512 3153850de576e850495d389f4b741eca854acb67272dd42c7daa9f15dce0382cd9bf6e03799ef1a65c0fa7b5383f4b3d9a70fe916804527a354abdf5a84941e6 WHIRLPOOL 778a729543965ca9b3249980eaf164570b356f0a76e86ba0e8b722e11d86e8068495af471f0e45257c56590c030cb0ee2913546fb7d1ba1b32a408152491fc84
+DIST sddm-kcm-5.9.4.tar.xz 56404 SHA256 941a9155942d9c52bf9d93dc0c312b0b473dcc224f503f92de06e2fd37512dff SHA512 77786ae6012447c8a0f880893eaed16335a5663ae1dada5da118885d9f502b15813fb9e1f27be0a3d9c2f9ed75948c5bc266a9670dfb576c9aa0398e3d9c62bd WHIRLPOOL 4199399434330d7e413f5e228dcfe63a1e7c1c1379d4cc808b250496535cdb7ec1c2e8c51a4e3a53dd402e4c0038b875e0d3e926af1de064c1f1176d27254f7b
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.9.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.9.4.ebuild
new file mode 100644
index 000000000000..866d237ee6d5
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.9.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 karchive)
+	$(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_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(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 436595143c8a..d906fe6d1f42 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,3 +1,4 @@
 DIST systemsettings-5.8.5.tar.xz 158604 SHA256 eaf1295d0d681a33514a6e38375c13e448655f813b422122627ed127d7ab7c5e SHA512 6a9d1819f29d5bff4a30d28e9ae799b5584384a7b75ce0832756d5925b68ac09c0dc6d43e9b5113d93aa08ada3700d3193c9e571dc8e5762d210ca75ac75e07c WHIRLPOOL 938f099990d2a2da0b56e91a5b76d4ef41b3594d6e15ff7ea84af0ce94b0f8e277ccaa9fbfe758ea43a6bc994f0d4c6ad00548feee9f72006fdd64cf6c45cc19
 DIST systemsettings-5.8.6.tar.xz 158588 SHA256 3b1c4a59df96c1623d02bbac6731f52a8deaaac30b9a30de5f3d71b4ee19c0ff SHA512 b3cc27a44bef1a065d6b3cc5157ed17fd7f7866d209e6aa9b6231ab8e88458f4eb50a1f7a6847f2e3ea57125afeb4d0f35fe1a31ed27cd9d4b2c0b15b3302be6 WHIRLPOOL 68576bdb4107f7ce7f7e8afe0e9149ac7d2132fc11d981f41d5ca0c22199f5f6474fdcea01ab04519b4f5a8a26c76c6c50fdd570c2dafc16d826405158cdaf83
 DIST systemsettings-5.9.3.tar.xz 157840 SHA256 0c2f79e2bceb0efd7143da0e3abfc09fce18bfc70fb7f2c30fbf8574e7da3096 SHA512 88c225ab896248feb557e625e419d564e85ed92ed8cb460df940ed283b612e773817b7a1c36bf27a49951d2dcc6d09df9cd7ae14cf4fb7c904aabd9ccc27755c WHIRLPOOL c7c6858a596c5a34b9320f53d21504d74377551309e30a4ea357b54ea38391e26c5c42a140140cf4bd1e6c62d319752c03e0bb3060360d635b23db815810cbf1
+DIST systemsettings-5.9.4.tar.xz 157920 SHA256 c1b3187453d9a3f87178003c21f881366c0139a4d601b724c4e649f89e6a050e SHA512 38c41b34df93dbfa1e1f6798d0b6429dbbd19135040322162518758c80dd6a7cbf87d268ff17af5579cd4655f80a043c8753c98e1f60d91ab97c0182134140ce WHIRLPOOL 67c135bd8ca4c52843ea64793419a260c24ebeb8733996db358ac621c8f33804f0a09225910d157110eb16493d97f37f387cabb4e90be1729a6fb58673d468d1
diff --git a/kde-plasma/systemsettings/systemsettings-5.9.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.9.4.ebuild
new file mode 100644
index 000000000000..9235dcaf7fc7
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.9.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 bf14b994fcd6..8a7deb2f86aa 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,3 +1,4 @@
 DIST user-manager-5.8.5.tar.xz 542472 SHA256 bfd047cc2d01acd0139d29a88d31b4422f108186cdf1f8d67a580d0c0cea68b2 SHA512 dec55d0ecdf628637c3d80ff916109f24bf08f241756c15cbcbe4200082d7ae5bc066e15cebdfd8fbce478a37e040ce63fdc0fbd021814edc0409d74c3ca1e34 WHIRLPOOL dfcec7e46ba5ddf3634ca82e129cbecac665e5307f0f6305521d74fbe047126ccc91f5db10a330b55577997a854fc5fc3192a7597852fc56137cb14e04538787
 DIST user-manager-5.8.6.tar.xz 543260 SHA256 371edab0a7588236e17ec3694d46ed12196f70036fe7bdd68c3d17ba59910afc SHA512 317c595883005cf39e4d5552a676e48015fcb613e70118339d635c5fcddbcc4a335b5fafce36efd10a57ad7034f451ea8d8228e4fd92e5436fbedacf8a41a7c5 WHIRLPOOL 6224e4c729067cb4456c5d06f109f55a9d036894250a7b4cd6dfe71f3f4227d2e7e5d300ca327376c3db516d251bf427b8348c191fe86d79eec3669e5081eea1
 DIST user-manager-5.9.3.tar.xz 544052 SHA256 f681e5df558b50bf7f8273a0ed8a77119d2a24e6744697a0bf19b31ce0fb21e9 SHA512 2006c19263e0c74449a420959a35b8eb8eaeed785a8f0227fddb4d7a311ad7f3598d1e47a1d0e306f136cac891dcd4b1a20793f79c04c4dfb18980ced71f34d4 WHIRLPOOL e9e57fc8ac0ad0e7bfef1b296667665768dd6873898fe9b56d835a23c74af11d022709b4a5209ca19dd388ce0cc8cf8b303385a4a63cee215f5a91164f22bf86
+DIST user-manager-5.9.4.tar.xz 544120 SHA256 c4e44aa68038fd78b1aadc84b6f815abb5df55e0df7b06e7d2487e5c569f5cb2 SHA512 a083571d1b09adcc9c0e0a2e82b5afa44bbd3e5bf720f8628398483c5ab40761d37d16fe6581ef613f33bebbdf47a0607dd3777687fc6478d01740d1f17cdde3 WHIRLPOOL d2c496903ed21af9b7b8ab0e30a680c9bf5e74ab080c590f17f301e36e1bc7f8eaf16d7dac49736508397716c6914d7466d1bfb6bb62802eb802eb23ae75e97b
diff --git a/kde-plasma/user-manager/user-manager-5.9.4.ebuild b/kde-plasma/user-manager/user-manager-5.9.4.ebuild
new file mode 100644
index 000000000000..d8abf0b11cf5
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.9.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 kcmutils)
+	$(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 kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/libpwquality-1.3.0
+"
+RDEPEND="${DEPEND}"