diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 60343b66eab6e..1ef84df6d7344 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,3 @@
 DIST bluedevil-5.8.6.tar.xz 144572 SHA256 927e05fa0ac6c3c0131cb325744fd787ce30d2397544a8431e5a9c9e79d9e963 SHA512 4dd48b667d23f2af741a4d3dd52149735f8cac67bf114fe1c9e41c4eff236f572698bca05461b865b33152829aea501767d64032a64952ebe01401f4add0faef WHIRLPOOL 536e3b012bc076b572a2a1b30208748f38f691ffdabf999c7c2c1646abf5f3e5a3de086a3651412a7adb3a32b27d3318bd15314c872b9cb9691ab041979790d0
 DIST bluedevil-5.9.4.tar.xz 143604 SHA256 acf5c2657294eedf2af6b0c33bd44aac1b93545131ca990e5f7f1e1f95de61a8 SHA512 67b8f0d919df52c409b7c1c0e5cc99149d0f37e9babde7f8fa1118f8013d80d4a402cb7609a5656b9051a8dcfa4f4abcffcc0ad17c510b169b28cc2007646ab1 WHIRLPOOL 0b20fcf7043e7e796bab45775333951c1d095582e3440f249ed00fec43e8e57466163c9de2354d42cf804fcff82a77b912d85a956d32558acfed3280f4c4f11f
+DIST bluedevil-5.9.5.tar.xz 143232 SHA256 7910135f285e35e7c3de6695c98559841dd7ededc61e2a0d963f31926a74ed6b SHA512 c480c43671a833783d175562758f7cee2357c37a5f663d894977265570b18d2019443f3b012722a59b9719ae78df1a1bbc569067474a7a8157cd3c2df5b7b4ab WHIRLPOOL fe21f8c7376702ce73ae2cc849c72669a56f72844f7bf129331208d89a721d618deaf8922b956d79ce9064866b489930c329471c510aecf6f718b327db3f6e0d
diff --git a/kde-plasma/bluedevil/bluedevil-5.9.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.9.5.ebuild
new file mode 100644
index 0000000000000..1b30c235b02b9
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.9.5.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 f0d9ac049dc46..1792ce68f0ce4 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-grub-5.8.6.tar.xz 3132920 SHA256 d505f9deef67bb27a9ef8be9b38612800e8cd66086759933f94889d1e26794fb SHA512 9c39d75599b5f1775c089498a041b7a774fd275caf26af966a5a0639fa509682d7a4917ba2b79d9d877e8d12a3142b882fd3919790ebef79be441c0ca2fca122 WHIRLPOOL d18c1788518c9d68d797e3f39013012bafc9df445f117a2b839b377d5e72f632c77ff0197242872b43eaa50897f2deb1a586c724b1f84d98b1a3c60cda493f0c
 DIST breeze-grub-5.9.4.tar.xz 3135884 SHA256 795ae0d5372864d106a1408735b852526a9451df8f5acd6839a524c2eb6bc766 SHA512 1d763d946129b9c585870a543cbadc39516ab0c87a89904444d5b35a5935f4bf3379be0f902568b76f0da632524570819ad4eebf287b8bef2dde56e19452cbac WHIRLPOOL a2772dc67a66b2a38b46dbb1c57fe718e29ae32866a7278f37cbb31e77783f8afe2e77094a96b4b0689fc07071f79d98c0cfd6d830f2f5f23964e87a52070879
+DIST breeze-grub-5.9.5.tar.xz 3156196 SHA256 440b40a42b334456f8f015c01b5cdd4d4613f958ccf31578dba4c6acc706b40a SHA512 3390484a52941cd0db78ed16046aed5a03b400f6ce6800e7dc13dfcbac9cdf4bb7ec78846456a3b75c70235ef0aae2b5cceff91a870d0ef26181d6a02554f3aa WHIRLPOOL 46af8b727e44adfa6bb62b229b76375b58211ff4c1d79b11f15abedd1cee22442651fdaf2dd53c58dda869e09a7fa0369e41c84a96cb87d19819bd43d6873f61
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.9.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.9.5.ebuild
new file mode 100644
index 0000000000000..70488d313e714
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.9.5.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 b7d3ab6a4ce97..0e14614f6eb3f 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-gtk-5.8.6.tar.xz 211568 SHA256 f4f6db0e9a8fc8dedb1aec1e7b61077a61cedbb21085dfea4c5b346490d3fdde SHA512 921312218f25156ef4e54359ffbf6c409957834f61125b41ecccf5aeef54e0ec1cf9c068f2037641099882edf79bb67beb5ed6d27564597a927322b9a5dc1a3d WHIRLPOOL 3a1c5bb7cefc4894174c68bba110dc9df723fd70e9d8ca12b5ad34dc417750dd4c8d593380815e6e1698660547627068308bf0a9618a23c6805896f1e79a1cc0
 DIST breeze-gtk-5.9.4.tar.xz 211612 SHA256 f47540d9df7a21cac778ec30d57afa215a14c0cbb2c14b352ead15cc4c8459f6 SHA512 8a51bf9ab1abd6ccb7fa98a960e5852024fd6f18a0360a71b8a9187991189795b1aae134d3ff4454082b1fa61753642332d42bd4fe5b202ff4d39e78ba8010f9 WHIRLPOOL b72a7033ef6b3b6610b062994a8948ca57a66736afdca0c7217d80a141b71036f25e123103312797d9d61e0d60136f2c2d76bf89d67bdf92b05ad82cfc14d867
+DIST breeze-gtk-5.9.5.tar.xz 211864 SHA256 32dfa87f0cdf713962c22415a0ed8b2e1eff89a6fd517407738056ff32064459 SHA512 b38f1b6d45de74e97ff3dccc5920553ef519e0c2b42f4e1360d246a3ea6cfe8d79ca8ba204f8d4ef8d04b1467f2e4da5f40dfb5fe19ac70bcd0fbb1abe1129d4 WHIRLPOOL 1713a6ffbde01ba1594f5c07727e2c1db585076f7664bcc3ed69b8b6648544e7ba660d80f3f8cd47061bb52d67b0111ebb47569bd292c85ed7cc2c11ff942080
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.9.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.9.5.ebuild
new file mode 100644
index 0000000000000..8ae0e21290283
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.9.5.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 b52b49285b22a..c9549d8a97d80 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-plymouth-5.8.6.tar.xz 94952 SHA256 689fe7709423af61ee3f6b735d87c5862966759d702c8e1a5dbf2c1233a0b931 SHA512 72095d48676ad5c33d595cd6b369986fc69f689abac4af5549e3f5c77beb876f902866feda034cff0ef3bfccda733f5d87cdf246a203b7ecd05e341041b0a3bb WHIRLPOOL 9cc38f78c4416ebec83fe1e9aa375382027947dbcfcce6266701d9fb26b56a44cd481c96fedb4581b49b5ee485723ecb092dc7913dddc0b3cf8d27aa16b5e1cd
 DIST breeze-plymouth-5.9.4.tar.xz 96864 SHA256 0f217d1600b83e34a6eb9a4ae7522f07d44873507bbe9b37fefd18a697dd94ef SHA512 e1a84b9d0dd940b521fe2b1a36014a7ebf709cf96ae3b7a0735bd49b45f800d0e86c9cf2c285db6ac7183701c3085f4f8010c6b80e7468cdf261895da7f0d1a5 WHIRLPOOL 8daebc43597f924a68ae5173d8b70b775a45b92aa555c8460b5ff7a2e3472f575b08e4a7a4308cc566067963c9cc305c15f20995cca48898a97ea6c9304c144d
+DIST breeze-plymouth-5.9.5.tar.xz 96976 SHA256 d30f665db09907d39b942177ed74a7e884a824162dcc979fe3ebe47b1cc1d8ba SHA512 4aa76cef21c550b8a3cea7b96d4420e7c9d1d8e57cd10d302ff97433cea8e59361bc756b0f76fefd9fee248703518407a8c45a312fefbe94f16d5fedf7a68df4 WHIRLPOOL d3729a1544472ef902ac6e281e8b5db6dd17e566788bdbe254c1fd1f9027e9a06200f53ea5f626d6742e6c5f56cd19048dcf8626bf22da13867db93164be2b29
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.9.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.9.5.ebuild
new file mode 100644
index 0000000000000..a87a824cc8c0e
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.9.5.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 2ac7e3b86d106..25ef88ccaf98b 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-5.8.6.tar.xz 33279132 SHA256 559f1b80daed76d45a6f7fc5c370ddce35299983487ea3ae9aa98c496dcd9d9b SHA512 175352b36e5915265a0a5e1f1d8bafa13e4a56e36a328abbe4a1936c6f45b4445f3b2adc703da9b388400f255e5f7cdc2b52370fb422cbf2e5af0f6ac6a379a4 WHIRLPOOL e3d51fd8b5ade5481122e081ea862662c5bc87da14e1bf8aec09a3a404531f3c89c005afe25e0db90e774b916f0aa12e9f5c9d70e951f754a6c3eca3e36b1e48
 DIST breeze-5.9.4.tar.xz 30677876 SHA256 f207bb1fe4ef988aa2c2f5fddb25c58346a8a6cdf37c21fa1632611fd31b211e SHA512 1b7638a0345285159cfa2b449b9029671a21016d46e6d6e4eda34ccaffa29cdb625a4f487df364e901acc8e4939e80da7e92b755cb656e8f1156343c93086e5c WHIRLPOOL 1c6b518b6cb552c2553ba05ecb08c03e67e656a0722703c44809238ed5a89a07451e335dc133888310d01c8beceacf5bc2ee19f56be959c5a97a1a5405af66b9
+DIST breeze-5.9.5.tar.xz 30680136 SHA256 83312b854282636bc6d10a1e579c5a13538394b76af5963f3e79b0d235053e3d SHA512 ea2f934f2ad15280a3e1472785fd6dfc3aac9155bb567c09ac34da43f279e7e811189c3172c2b6180457762455ec6962ea25bdcae826bda2be196f59e1190198 WHIRLPOOL e51ad4acc95322e9943b7835e77eba356bb95820ab2b39dc1fb1d7bc2a2cea42433089ce441d50f6d1a1fc1d3c46d2ddb8af0f9cc72cdfd5ffc1a70c294904fc
diff --git a/kde-plasma/breeze/breeze-5.9.5.ebuild b/kde-plasma/breeze/breeze-5.9.5.ebuild
new file mode 100644
index 0000000000000..37dd4fec2aaef
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.9.5.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 9778e857182d4..d2200caf33473 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,2 +1,3 @@
 DIST kactivitymanagerd-5.8.6.tar.xz 83312 SHA256 043efd8b9c0c9193b9d98bb40bb1cf206c3ebd5c3ed4474435570921d570b733 SHA512 969e33c195e4318fcb7b47fa0d33303e3bacb63826d2fcada8ddaac78b575e4047447260c5487d3a3b151fe7b2780980f7d3bd344632ecb295f47253d5b48bda WHIRLPOOL a8f6c3c8c0b788b561e93ae2b253788ba1f1b81d8090f659dc82edd5e34e5e49afa8db9fa4364695ecbd461db638903f532cb5fb528717e849d049a747c58eaf
 DIST kactivitymanagerd-5.9.4.tar.xz 83380 SHA256 32f48236fe6cbecbee874cee68c42e19f8391a46a812bcc7efa36bba56fd2412 SHA512 ef2fd3c24f7e601bd024961e99280f7401ecb40a5b8514ef3edb0854e7743af736f3565ac49473da02920206ef1469fa3e487fb406f57c620b794d9fb9a895d6 WHIRLPOOL 806bfa4fcc46e09a0e9d484ce70be74ba8dcf4dd02483b2d684b539ff14f07474f0728555a0732f5a31f46e93254103819c16d7d7ceca9447db9efbed9d57098
+DIST kactivitymanagerd-5.9.5.tar.xz 83364 SHA256 07b46fe7f5101f2cf5291c4b9a05c9d3a574d131bf1690a71b0b30ff789fc049 SHA512 70e4a1c94f20d7ec81adce3d25b908146a2c518154cab88b4bb061f24aec7bb80d5184d8991d487544a199c78b7dca81816e087713fed49f1671b68af41b03d0 WHIRLPOOL f38b7d9fe45239728f4eb3f2ee9bb7665ad04d557e6a4f8a1a7ca896804156820451801cc53174a3c767ebd683a3452389399b334dc02ebaf99fe3228be28577
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.9.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.9.5.ebuild
new file mode 100644
index 0000000000000..0f46deed0f5ef
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.9.5.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 af435353db5e8..cd89cb5f9e254 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1,3 @@
 DIST kde-cli-tools-5.8.6.tar.xz 489936 SHA256 9a815aca6919e79b77bd95df491a1fed49e737cea53a49236fb99267ecad4622 SHA512 b6bb780a229d0c1f09ad934ca4cd0500d35db730016317d6fe96e864ee3c586293b49007c9db50eb331dd50fd474aabb86e94d2a7e1469fe61b165631e7b43da WHIRLPOOL dfee2151be89eb0ccb517d6dc6a7a5c5e36af3fde70b430a98c7d6cc3bfdc235e498a1bc361e88e426a1ee379b38d2f7e2a1a39eba6eadbb16df2b588f9d482a
 DIST kde-cli-tools-5.9.4.tar.xz 501964 SHA256 a8fe385e2fd96a5d1a4f0a4005b2588993071e80d3a2062fff16c35bcfd65aa8 SHA512 5f63a3404d13216aa9e9c260d6363aecbb64adc78879944775db91aece58d6190d588cca42e7d647d1b80808208c22c4c7c8988d10bf669cde9c0afc8288c0ea WHIRLPOOL 92825ed3c860d5f45367a488bcc6f01b6b097fc7199682a07de51375b1094856417767e47a4024ff9fa196cc995435700b7f371b2143e463fc01963b812518ad
+DIST kde-cli-tools-5.9.5.tar.xz 501616 SHA256 56e4835deed5d81c37a69efbb399d5f59bb894da33077d251a2374ecf423d0a4 SHA512 dea956660c1ddd2e6b28cd8365f2e035c2fdbe5250878180a1f4195ba69f4ea8a4da5df751fab6223e9ca30676903ef5471a44d4e0d9d7d8757d39b7b2351f0b WHIRLPOOL 800c14440bf75495a7439b9a124a3cd93eec95397f2d45ffdd419924773a1445a5d2298fa8120c407be44e1231f2440d116b42a186c73c00cf8bc4bd5d1f35fc
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.9.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.9.5.ebuild
new file mode 100644
index 0000000000000..a571500c2d417
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.9.5.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 1513529247fb1..f4ba9474b6fa3 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1,3 @@
 DIST kde-gtk-config-5.8.6.tar.xz 150436 SHA256 4d54fa4b579c717e8c9792ce7f6b5ed1a728162df2faf50f79781ecb153a361e SHA512 fdf6929059c9c94a9ed9dbd410e4852922870fea77ab2985d003db027bb1b11e805ececc5dd87c03a8228a2b9008a65e6a143df59b513ac31083612f102a9641 WHIRLPOOL 578df193d8a654c4af876cf97aa717c24f9e61565ad9de8399ad8da8f9d2eaa8494cbd9aa1a0f54c30a9dd8cf1a65da68f19f86bb0a16824458e00f1914e3ce7
 DIST kde-gtk-config-5.9.4.tar.xz 151084 SHA256 0661ab7a75f433b9f4dbf89ba44ab09de9ec8f7ea82d7cfb26316539b2afe331 SHA512 83a35e7cc8e0aff8ee2f0f53c65153dad66a3cd1ecf3e0f5dfb10f49550507eb17ec6606dfa18d27346942df5d3e913c6678be042c063f3eb799f4c802ab11fe WHIRLPOOL f3d9cddd69b768a9bed26d322e795ca454f44d1fa2f26eda4ddca730d1c71d28d63f9b9bf707f6d9860224cb071273e92de073504e081b2caf3d7a2a01bb2b85
+DIST kde-gtk-config-5.9.5.tar.xz 151152 SHA256 9e1dd2a3e1d0396159dec24191793cc163fdbc7f2e6d30504f1fab9c7f624ea9 SHA512 1332d2409cdd17c96869a04fffc42d69f2ef5037e3bf351fa2d226624387c71bd63d5b83adc667875b198461b7811131ea04078dabb4da1d50697e8428c59698 WHIRLPOOL 93b4d8b0974c7c7cc105d953963b19ebb0e153c4699d955ee50fd0984611ceb1218a1dbcc6c744d37eb71125ad1fad59a9bb6fd16cfad71935b67d2a9aad1f64
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.9.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.9.5.ebuild
new file mode 100644
index 0000000000000..b133b2f20891f
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.9.5.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 46b15996ff75b..a0613cd1aa483 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1,3 @@
 DIST kdecoration-5.8.6.tar.xz 34780 SHA256 de729ef251a6abe5a6c4318a77c57c5f4d57ec1bd836156890857df7e0057059 SHA512 e6d85e31e8a4c45f0e62b9920bbca52d33b40559e491f0db4aea04180bff97aac0cbf4d9f14013b69c0e793f4b82c49fab93c2ee527b594e87cd8164ba77c0a5 WHIRLPOOL e381cdbbea48b3183a8f6a00136b5c228d3e8faf2b9d8420c0d5f621fb52266b2725165f0a3aaed76ff18cf6a7d77910dadcf06d7fa5e80dedb13b79bd6f88c9
 DIST kdecoration-5.9.4.tar.xz 35552 SHA256 e2a4a9de70aae0d554c251f836eb09219beeb3e7d5560fe57ade75b835b98e89 SHA512 be7deafdd3912db967cfdfa6bfc1c3be5d273a9d20e70bd086d5fea52887577a73c627f01d6272c56e3646822f01787877b925a178e40290dd6189f6229ede87 WHIRLPOOL 092a0c9961380bfd917461a98cc87ed29bc2c92fd11ff98f2a8aa2d945ccb7903b453a683d41117b2df1da1d2e2f9b2eadba2d4435bd0da9668d562c9ab2bf90
+DIST kdecoration-5.9.5.tar.xz 35540 SHA256 d4529161bfe989f4a6c3f7e5dbf0f727119a8f7abe4ae9565fe04504e54352ee SHA512 30e11e349da5bf74aea0fa4f66ac81213a05a39c432e45d411459fc9c1c6b86485f82b2b854bc25eb685aad3125b8fc6b9c9530e847dd20756d09bf2f47824e1 WHIRLPOOL d8188085536f5ad2d8d662ec8dfdcc1ffdfce6b51bfff70b60b82207d3ff1b4719d9a556935a45dfc17f2b28fb03ccd41d9187b8c7e0c53cb7ebec0f591d901e
diff --git a/kde-plasma/kdecoration/kdecoration-5.9.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.9.5.ebuild
new file mode 100644
index 0000000000000..f50d761b2e764
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.9.5.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 c325f919764fc..7aeb19c12e363 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,3 @@
 DIST kdeplasma-addons-5.8.6.tar.xz 2091160 SHA256 fd1a701e434b22a56ea05455a5d8a7dbcba4c01aaecdc2f077eb2a338e15707b SHA512 19adefd9857b31b976d6f7619e5e0d487e69036f2b246a9e7bdf9846cec011fab6f788ca234042cdf898c8f7a3c8728598a049c113077760ecaaa212b7ea1d88 WHIRLPOOL eb3c757181250dd14688428748a615f0adb8d2726b5b691eb92d67f1180339176999d67252769fb4914a9edf7f344a901f76f9dab121cb3b372afb306d5669a2
 DIST kdeplasma-addons-5.9.4.tar.xz 2048416 SHA256 d799e680206a251d20e34a43d1faa033497fdec95abdd70e352cf079471b2d05 SHA512 d9a115551401dff1a4441af0c0d6426d1c0022bc4eec29ed76c8fdf0e8d4ec270c6c6139677ef7d0a1ee7a5f300194fd358335c02888687030222646b16c3828 WHIRLPOOL adc46e6836757af96f54e97c96d7ba07beb85899565cada8cd5a6c5181cd89599ffcb65f960c19367b4b478ddde0b5de30173255d0fb0904c7d1cd5d17fdd4df
+DIST kdeplasma-addons-5.9.5.tar.xz 2041148 SHA256 94529ea504f98f10d238e96a4c8d02d1f3458bf062386123668451ddbf1ef280 SHA512 ea092103c3c3d8831b991ec01178c8cf684b7ca9dd50d5dbe4c1bc75511f0bc6a72d2dafedd8b76a91b206e997ffb7576d3dd11b1d9e6f3a1977d4a8cdfa5e87 WHIRLPOOL 01fddf11ab2ab342ee13baf8b0348a5bce8be5e8aa5e6e2f0472c14bfcab4434d518c2e3c7b65eaf07426a1b18a65ee60a0bee3fa92fccfdc3ff1580480b7c4e
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.9.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.9.5.ebuild
new file mode 100644
index 0000000000000..881f2a38fd29f
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.9.5.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 9adb8b6049176..f78e66b736019 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1,3 @@
 DIST kgamma5-5.8.6.tar.xz 60488 SHA256 3fee7212bb608f3a2b2b33d5fdab8c22310eda5ac1f55727a9ef59189f5f69ce SHA512 21ca15e8cf925e152412c8d1657848203aefc863dad46941fdf9ae54fa7cf10647de26d31df1f8be0bacf52157f4953cbfcebefbaa2cd1f7d26bbf2690f9530e WHIRLPOOL 7641acce81db1c4d54e4dc6dbc65681fd5ff56d856b7cb8520cdd2e10eaac840a0b771c719954cc1956349d3bc59eda8abb3dd2bb065c83af826d0122620ff90
 DIST kgamma5-5.9.4.tar.xz 60440 SHA256 5b0259ae1974d0b75eaffcd8ae596ba7751b4c339f4761246a88302773938f63 SHA512 f82c43db27c5563c15cf2d119e2a099f8c3db5af65c72deee6d6c8b024a72a116b0674c9031ae999c46ff8aa009810096b6618767aa118f9edbf17a88d27167f WHIRLPOOL 8ed8b31f9e51efc3169988b3ed82f784cee784b525cf2d43af313b013bb1f2607734d83b648fe6515ccdfb60ba77a233748f1b54d7bbebc42fd2b99f8984d88b
+DIST kgamma5-5.9.5.tar.xz 60536 SHA256 45b612d3b92f71322e6795104f3ee00a0ca355e51eeb99bea327407c528ff8cf SHA512 03020257d82924a9e1692c75fd803bd1c6514245330349037914208df4f6a13a8ad7a8ba7f950fc648a74977a1d640aaf9a4f9cb1d0a21f87932c5f81a010fc9 WHIRLPOOL 707e441908beb747222b8149868362b7f0ce1d9b9b707551f07f4fdc9d189896d796842031ebaebd0e4c367e4a89a9e80cdb808146f48efec6d9c20de43b4f30
diff --git a/kde-plasma/kgamma/kgamma-5.9.5.ebuild b/kde-plasma/kgamma/kgamma-5.9.5.ebuild
new file mode 100644
index 0000000000000..ab940b8940ff0
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.9.5.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 87000e2670cc4..06cc737beebe8 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,2 +1,3 @@
 DIST khotkeys-5.8.6.tar.xz 605604 SHA256 b2533537aa9e8ec99a73929f76eee0371b9c1573ca1e8a3df88cddbf8b00df74 SHA512 0ccfb1b4f503996d517ab9823e37dd080ecf810ad96c7d4fafd124a715e1f7f4b11c5124a645e3eb18208f0ce1e13ed4c21389e155f56eca7369cfce0c042fae WHIRLPOOL 90086022c2b90261e4c932c0a73bf93cfd296a117a47b16a012727b64d48a49b0bdd7fce9583077e4fc952a663c73565bc2177e990cf15cefcbd5f6e73d728d4
 DIST khotkeys-5.9.4.tar.xz 605380 SHA256 001359c841d4bb919c82cc0e9826586ebe4654a8aa037bb7e1b7eb9fed9e0f52 SHA512 19de46b0310f75a13701a081ed69f57214618169c1bcad29e7b97f3d1eee7106419371e56ca9a427fa10e18e0f4c071304be560019621271dbe70d776914b8e6 WHIRLPOOL 0a069e0406da2a87847b7cb604fb8bd069477f059e24fedc4c94735e5b56c943dc87990f75520167da159664684594aa92200dcab8e0b91a33fd33fd0632ceb7
+DIST khotkeys-5.9.5.tar.xz 606744 SHA256 a995c3b0a1a86c79c64342ae17a45fd664205592d3cd541bcd7453b5d89ac617 SHA512 5e0fb509cbd799af6dd720e03c691c23a056e944cd26166a14c45d033312eb46d2bf78ad7ab28658f8a866dfd7b45369c05f5572a72590b75da8da04bb337f5c WHIRLPOOL a456865fe783411a36e7ff0371f7e86db3f0e394211edec2f6277ad51e9b2e8804a90a3f2b813897a02fdd02859dd2e70bcfe7d89002b74cd77c5c1fd96ae044
diff --git a/kde-plasma/khotkeys/khotkeys-5.9.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.9.5.ebuild
new file mode 100644
index 0000000000000..95b8eaf17fd02
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.9.5.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 55a54238364ca..d85fd2b5a5dbc 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,3 +1,4 @@
 DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb47dc3229505abbac0c6 SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 WHIRLPOOL e161bf40c5e16180fa65217cb49314fb230c45329f4c518d6014083bd71da82d4aa048811ee814fde7fa300105cef16c182688445164ae84d0d700e23641b342
 DIST kinfocenter-5.8.6.tar.xz 1269552 SHA256 8bcc2438efb20106c9f0c8cae3a66ff202f71bf9acaaab940ffaf816002c10b5 SHA512 8eed4a548d782e0a29b9ce372b30ab250b619491dfa9efa73d3ec463cc43bb916a36702c949a4d6d25dfb7d4c350c84ebec08af7722a3a3ae5a37b2d9fca57cf WHIRLPOOL ffeeb1541e7eda54fc577d6c134fde491f8aef2d40e94615ad917d26705e72ca7a5b2a28771a823cbc273835f8c98ce45d93d58b8b57fa5dcdd47e3506eb2196
 DIST kinfocenter-5.9.4.tar.xz 1266360 SHA256 9d30cd53d52df8cc83f950e501ae649651eb47e450abfe0453260750f4116e93 SHA512 2ba41d26fa63dbe983e0713a44e00016f83c253628b4acd42357cffd98e2998999047dab1510816a684e32e8059f80d063edbb6ae2fcb96a7f7f9b42b503f2b8 WHIRLPOOL 195a83d0feb98560bda3a21a3d9b520e15107814b1e0f262de27d41eeb92c646a9615edc98921cc18971dea2e79c7f2d38f88d83d60d557c7da149404bdcc4d9
+DIST kinfocenter-5.9.5.tar.xz 1269960 SHA256 4f6f37b29e9f29850389fec2708dd7733051095e0ff9b842327d73bc151e7149 SHA512 ac8e6fcc159769c97f25ca2d6d741023256f597d564ec9b5d182a24a7f73bbe53e380834c696408d6201e5612d3568a145b9ecef2eaf6b0bd5a7ff319a5d5f44 WHIRLPOOL e7b76ae030c5d84df0aa97e39e40d3279515c8c9be7c690d975321016a7c186574c5ac86804fbbaad49fa32ce24aa6d49efe7e4bd4e1901cfe121b22974fd832
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.9.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.9.5.ebuild
new file mode 100644
index 0000000000000..511fefc267f0e
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.9.5.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 1716ffe0c2908..3831a23eeda26 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1,3 @@
 DIST kmenuedit-5.8.6.tar.xz 653636 SHA256 3c586c8fd5772905dd0eb279d4e727633b1ff4311188623edf84bd571dcb717f SHA512 9c4e7ec692347fd9dc4c2236eeddff449928f868092aadaadb09840f6b60ce31ea1fd032f1802a6f690d876be61af7a192049f4d149d9b6698bb4f4bebea6d24 WHIRLPOOL daf1b0312183f396c2c4a6c94cce47b9757b92bfe969aa3e10466c2bf76d9a8be5b066857b209519eebaa8a524aaab8f3e7e2ceecb6c2b633bf22057c33bd223
 DIST kmenuedit-5.9.4.tar.xz 653256 SHA256 9d749d82e49e47e6301128b56412d9b7200ce108eb28ab25ea551d868f79a7d3 SHA512 2c3e09961c200c7625feeebfc9eeb5d75d10948beb3e91300ec3dd46c3d5c3d88e8e7fb17d0628eeafea0bda830e89960edd24994046e4d25338b53933268489 WHIRLPOOL b28e9a35e7096190a28c326c985748cacf1d93c52666f724b9f4098f5c8e1090389988364999bc31619a4bfd37107be0ceb929e135057f2dc38ac1a29771e1b0
+DIST kmenuedit-5.9.5.tar.xz 653108 SHA256 12d8fc839d584c4824e7f61f98af2bacdc7b622257620401e983bb0fce0fded5 SHA512 6cbd57f83e5419b898da17de7c1b885962ad94815300d2d849a5fc87ce4541ab579c3d79cc37d316733ce9861d090ed124bb356d25e56e72f322d88965bca39c WHIRLPOOL e39604534ff20524460310019e04ab4aaf33e3e9b272cf1ecd00f16b4972210c0166b85b27731d5b7015a21cfe625868a68f78dedbb0763f6fe2af2f505e1c29
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.9.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.9.5.ebuild
new file mode 100644
index 0000000000000..4ea14f5758c29
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.9.5.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 f508f34fba053..b8e35b62ddb98 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1,3 @@
 DIST kscreen-5.8.6.tar.xz 113496 SHA256 99948bf562f6dbde5a4fc33a6c0aee3a47874cfce52cd2c7c29d7a3143bd6896 SHA512 c70699d39380870d34f32805f579c40e20cc42ad697eeeb600afcd3d06b50a54e91af2d4f110b3eae242c9600488d544aedbf3db920343782691c7ff361ae466 WHIRLPOOL c1c67efb185fdaaca84cd863380c81b963caae82ee330b4c5831d2cb67e441eaf8936bddcad3cfbaf87c157966839b9048fa2f6d52d600d03280c644928c7d19
 DIST kscreen-5.9.4.tar.xz 113400 SHA256 bde7a7733310a7cbce68277586e80277a51434b893fb95d9c023da6a792691bc SHA512 17a8a728a9070a72b061d6b8475fbf51c323bc843601c40372ac055042f9e6cf248d3e3dded7a6f7222feb96dcc935c92197b90908dc668af5f45698fd234254 WHIRLPOOL e8ae16b3d632142b2e583f6653be30a5f24b4b78135879c8d118489e4f5a0a6f275dc00ebd6d62278a70b8576298534185a0a164f1729b972bde4e292e445a5f
+DIST kscreen-5.9.5.tar.xz 113544 SHA256 d1f1fe291763fbe14ccdffaf48c2540ecd4dc1b9fa88da1930c02ca36580c0b5 SHA512 c31c6b86a6c4670be70dd41c96f4b8d5724f092b1b6fa23b272897ff02127543079aa0d654c6c12677e063d8c8bfb7a4c286c933d8fb17c15af7d1b2b9346311 WHIRLPOOL 53e4efcbf629239e758cd3cac9bec83363ba2324449c2387ef42d9dabbf24e21566a0202449fb5d06ad20bc45b8b3cdbe85b9dff97f568410673ad993ca0cc8b
diff --git a/kde-plasma/kscreen/kscreen-5.9.5.ebuild b/kde-plasma/kscreen/kscreen-5.9.5.ebuild
new file mode 100644
index 0000000000000..e4365e8b8742b
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.9.5.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 f8d8ecad40aac..9d39d600b0bab 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1,3 @@
 DIST kscreenlocker-5.8.6.tar.xz 108416 SHA256 ed519a5c30bc350438d5b8418b484ae72513baf77645fe286f1ac14f302f14b3 SHA512 c2c7dd78abdcdfdbbdcffaa9395d8a8c0d84511f484bba2aeaefea05957279cd53253ce59f4bc279f811a369b0e65738ed92bd4f2a3006195bcace352707302b WHIRLPOOL 9b8cfd9dd35e07df847283195b7fa109788ed0809f30d8345290a6cb922bf3369cdc5ad69e35b8ed07b18d51307156603fba5e7c6adc4d9ee25194e1ee21d2ab
 DIST kscreenlocker-5.9.4.tar.xz 108844 SHA256 92e26758b1ff0af00e4416f2a463e8690e59010de8bdd3c37ef82c551749c132 SHA512 3f0187616b5e498843d01935cdddde5d69aa1b22001992cab2b75c874bb89f91ece37530ebb841c5415f77fe1ab1fb13811ad73e22c334a28d1b224b7783ad01 WHIRLPOOL 0fc4ab76d79a3ff3029f6e896e3f64408be5c2a28ea15ab0e20f5837e6354ee88f1202636f1d66bf1a84fa90e4d666a2421e913624aed9bf9001563a53e5a462
+DIST kscreenlocker-5.9.5.tar.xz 108588 SHA256 718511aecad9928987e0dbe10906da6eb95b0d1f678ab9aa8dfbb4d7dcfbc0c1 SHA512 e8b989ebcebe0e424ea0065993d1487862ea27acb73202f70dbe5853d67f38c2acb5f620d22561d045c4c48e2185f8d78aee98f2f7ccbc7e4e8d066cbb36becf WHIRLPOOL 4de500d0b4bde1dfe58085a1b4761b9f7373a0a8519a4222e931c58b8b87c3c4d87adb4e3277e78af9e506f0ea4c42ee41caf85e177f932332fc797079cb9a93
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.9.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.9.5.ebuild
new file mode 100644
index 0000000000000..bb00b2e0b675e
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.9.5.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 9f595c1734f11..63f54f5e070d9 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1,3 @@
 DIST ksshaskpass-5.8.6.tar.xz 19460 SHA256 0f195e6344b17cacb8ee0499c36f911970edd968b6dbbc008ccff4b659132179 SHA512 7d2918b95f14f41dc1b348a66a39f2d739c01e8061136aa97f27612c18fe85f779dcff7df82c22450869f31c94f71e3f5eae743cb976c0e6e6d0692db2dc450d WHIRLPOOL 5237e9409904382cf79e8caae65c2b6d730141d04acd2e643c5ac7aac04d9707a0a459a343f1c485ccb10a7abf36a90f5bbbe47ab73d1796fd03fd5ffcc5dc33
 DIST ksshaskpass-5.9.4.tar.xz 20072 SHA256 6a5adce31ed348a2838b574774199102aeacec0c3ee2cfd8b5c3a588622935f0 SHA512 07e235d797bad7b3f5421f46a0688037f7b1ed6b41b94eefd1b22bc9ea4aefb9aee25f8b3cc130eeb8c0703bc6a90d24ab818a9a17dec01aed0de056c03ee4b3 WHIRLPOOL abd860c6953ac21ea2af465118df810cf81299548a205b15ccdfb627e2e60f7f946bd81b4a9a2c3170e8df1028ecb94058127c881fed72a408b957fc9c16019c
+DIST ksshaskpass-5.9.5.tar.xz 20152 SHA256 21bed81030113b5e2f4b6b363128bed7ca98b49880319c7b615e6862986b9ec6 SHA512 e851a2f852734976faaa5e8ec7fbf760ad493a8bb8effe8a0792ace51d59729823149cc4dc7bb79459a4e6e8e46372cf3b5a822f05ab87af4df2d544d77d88aa WHIRLPOOL d9b07a6e5db7b42a1c42100d93b4f1ad5937fcb064be8fdf87dabaae1bd4c2053c6bba61848791a9a94b5c4857fa2af83596f811359bb183f149f679dd8ad019
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.9.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.9.5.ebuild
new file mode 100644
index 0000000000000..468b1b597c06f
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.9.5.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 4f4b36246459c..ea2f37b589d06 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,2 +1,3 @@
 DIST ksysguard-5.8.6.tar.xz 490768 SHA256 89806dacdd9e9c0de3626f96640dae504dd1c933a49bcc3ff6f14f50cbee0b30 SHA512 366f2284ab1bef4d68fb109f6d396609523131afafc0e3f7e464c69d5a4cfc26937af2d77de0b8da47ef215d8a2f730ccdc2d4e2c70ebdf561b9f7b589b0fc32 WHIRLPOOL 6a7b5ec77cef6e896ed8e16db8b239aa665125c1d2604b26fe5a4ce7762333a1ad2864fc395aec9d49dd7ca37626fac174078c2a8789dd3aa592debb025d3aa8
 DIST ksysguard-5.9.4.tar.xz 488132 SHA256 10340edffb467231f7187f97061da5f47d2934289e11f045507a0ba1ecc41f12 SHA512 11cad2752056d7084b738766ec581b8366a19a6494bf0a266ce3d3427a9acf6612c33afe1e53a6b49e771c08e54bfcced831d2741e43e444072624d954afd660 WHIRLPOOL d8b7c91c27cbbfee56d5ed60d1606149d723250112048496089e92928c9eabe776dd26d06f20ce9eb055f06ca96134558b55e7bf4ba80f462d24cfc9ba5b4bca
+DIST ksysguard-5.9.5.tar.xz 490124 SHA256 0693e662ef70aa6cdee79bf1e5eeba37a29b88bb555550bd48342396479d1fb6 SHA512 bf1996d44c7ca12f62545fd8f35b53733d76c8dfc564adeed2d0fc4bcbd6f0d14545ebe51df3e4aacbaa6ac52a4ca1f975953b09a63864ba9acf87048c578223 WHIRLPOOL 5e5322c55c19a435647fc18172d966b72ab94ac650e6c707a6be6ad6e53692cabdca8107361540934e5362f3688058870b44a1ac2ca80ec3f36722c4cec6b144
diff --git a/kde-plasma/ksysguard/ksysguard-5.9.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.9.5.ebuild
new file mode 100644
index 0000000000000..214de345c431e
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.9.5.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 '-minimal(-)')
+	$(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 b8e3a3d012526..9baa1d36eb866 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1,3 @@
 DIST kwallet-pam-5.8.6.tar.xz 17760 SHA256 63bc9333a89d545465ab7cfb7d7a5cd61d8c098e454e06ea9a1b77c4cb0021c6 SHA512 279d7c663ee0802cd0d8939f1be0c4db0d8c416b2f118479b9c2eede59af7005cd3aa2f57817c0ef07f8e57ca63366b49a3d7d111d605c45f2887a04b330042c WHIRLPOOL 214ffc9d9ff033d4b5de4a9d8fc866b31bd765c38b9f714b16d250103e3c9a2da5e4f9502519050d1a3a5edf9852bdea0ae183e0c10cc3d001298623306b1c19
 DIST kwallet-pam-5.9.4.tar.xz 17832 SHA256 dcfaa53317537454871a819b6b0ebdc4a1faec2698e13c1d8b805671ab55cf50 SHA512 d0fda9317d31af66855ff134829e6aa08dfe232b6ad69ff6aeb3538adb2e14b5b5a33daec6948347f052539523ae50080464583fd6c69abc28d771f946d4be13 WHIRLPOOL 9f52dd676332e1ff39a0cd7938385c037331ca62a109fb22883d96706ad6385a0e9199cbb3b736c0fd74a5f8d75a4ce7ffef041c15248b8d429b11a439867fc8
+DIST kwallet-pam-5.9.5.tar.xz 17848 SHA256 361b2b53c8e1cf00b57ef17f9b15e6db9b3161e935f43abedec7775ff8ba9059 SHA512 120a2dd42faad9c71e0cea5a37fbc8112552a70df823215d7059ce8a2ba803508e91679e5f988d6a4e5357cb1c4046f528d84f7c9fff8b2305f8b16e616d5712 WHIRLPOOL a55d67260fa13b39cbc6ddf798a3bc37e498ace3b47672c44e761fc49817f2866647eb253b45b52bc239cc970c2c969fb81e3f99a0c020cba29df0a30b3d20ba
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.9.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.9.5.ebuild
new file mode 100644
index 0000000000000..04d60238def12
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.9.5.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 facbf2af99e70..e78b317a37538 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1,3 @@
 DIST kwayland-integration-5.8.6.tar.xz 18292 SHA256 db14f5405dbee1231aaa08a8b0aa8a5650db9b34b3fa8cc1fc146b93b185a82d SHA512 d4e00d7db1fb0bc9150a40e04e9ad14fa0c88092ce95b6cf9618762372c5c27688a7ec683ecb6b07acc4da6df8e66ebcd9be7ea7dbc424d756887bc549c44f9e WHIRLPOOL b53b40322f82987b106f0d407e44a38355d9e7df89ff0c644c0f38abf5fc145ea609cc473e03e7e900e7315907a366b378874f96e8222250cae428667d99ad4b
 DIST kwayland-integration-5.9.4.tar.xz 18368 SHA256 3d34ff505d9f9bef1132f5edd82be3fa4885b1eecfe62cfe65657f3592887887 SHA512 45eb5559e6c1ad9dc07027cb933bf1be7ea6e89128c67cc41bc2a74da61340f7ff878cbadc6eb086c025cdb2ccf84e025f683597a8df4fb5b4006594eb59c4db WHIRLPOOL 220796a8a445712352c2d22291f8e96a0139bb109aae8a1a8a5c67c5c3ad4325710f280f52ef87152803ea3096a151b3c7a650323821a45978ce5cd7d5fbf069
+DIST kwayland-integration-5.9.5.tar.xz 18384 SHA256 f9700c4f796b0c311c2eecd1354b5f32adc1028e5a4ccacc6edad7dd0c3e8a1e SHA512 c42cf013ff2d93833986c164bf0cd5ad9173a94f04566be726d9ecb99216daa563668026a854d95c6b5f5e85d2613bc2c54c231be892ef07211ce517115b6a29 WHIRLPOOL 29d7c9d533647e1194b5d6d494dc5f7b60b2647ba0998da86349bfb6eeba43b304fcfae300420a040915c887c92449a9015a47cee3155acb44dfab34cf094929
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.9.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.9.5.ebuild
new file mode 100644
index 0000000000000..6edd40ee0dc29
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.9.5.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 36771b3266ec3..13f5da8cf51d2 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1,3 @@
 DIST kwin-5.8.6.tar.xz 3999644 SHA256 e549dd4e6ab3c8e4779209fe3583615e9e87d3f251a66edf0a0416d10c7c2ddd SHA512 bd1a4f0ce46902905690efa6d2b54d34cb03ef95c3e14c705219d258fb11fbf3d4be0dd0c368ef3eb94820191dc49cc8b320012117914928bea4f69d8f25e407 WHIRLPOOL 9c7432febd0f4c0f6cf08d230c9a3f154d3bf24a37b6b53c9df2cdc0d66ec4297e297ccb61dd0396613955d6c777ea245c56213cca0a1f5c413f896ba22e5bbc
 DIST kwin-5.9.4.tar.xz 4628228 SHA256 a136b0c46c2c8376611355598236d829f54da8192682c515e4358cb6cd849361 SHA512 0fc41384d448c5ae91461b26ab128a899d37fd7f5b4aa2431e7b0689f22ce16fe655926a1f9107cbc7bb88ef8c43a0374e3c1ca62c40560c7cd7b380f3a910b0 WHIRLPOOL 11841a366f3d4fb68e3a758adb0a6de6a8c22ef04615c1db510d0f054b9c6468a57efaf363010f9c3618564e7db847a65f67779c0abeb36e4eb786ab520b89f9
+DIST kwin-5.9.5.tar.xz 4632432 SHA256 4d4e06e956cd8c180ffcbd7b49ce5da65ff5c13c33c78a5fedb753e46d6ec98d SHA512 01b4a082d7abb68fbf89a2a530407b683b2c2b9a23648d1a19d49dff276b347cd85933c820741460aa304de67ea95f17d2bbdc90e07f4a9f0790f850d407c824 WHIRLPOOL 2fa74b1fc75ed7ca74d402485cf81bd1f2d8913c8a181e1160bc4b9b9aac174f27afed03a90ee2eeae2e82188fdb84d47fe2bb21aaf4437af9c63452c217cd0d
diff --git a/kde-plasma/kwin/kwin-5.9.5.ebuild b/kde-plasma/kwin/kwin-5.9.5.ebuild
new file mode 100644
index 0000000000000..77c9c31ad8b82
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.9.5.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 5b6d86014cb4c..f1a8b814063f8 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,2 +1,3 @@
 DIST kwrited-5.8.6.tar.xz 20324 SHA256 a59de4adc45120d2bdff5dfc5681a9bb5fdf48a744803da22611e2effe5bd921 SHA512 b933f49073d0e5f5306f9ae7914e471258edab45e06336876a108d104cf71cf246ef8e97613c93ff0464533d21794bb4f829bbd06043769c1f438a82ff72ac5f WHIRLPOOL d3aad70e3d71c2805d82111009768d2b3754717b86af4c9dd46b17b6bb8fc6a668328437c5e6f00252576ca1589debceec38838a06d050d7f85941bd0313fb5b
 DIST kwrited-5.9.4.tar.xz 20212 SHA256 67b5fd067951aa831eee14bf73fbabdd16e6fa4a63ff1d85e59e05651cb02bdf SHA512 53e0b209f9baeac58690cec286ce0ff0a889485d5fa899b49a6f604deaa6ceb817c3b5489ec74ddf03e80338bf8bf9d0e9ff775c0971eeac55bee87cc0d07805 WHIRLPOOL fb30c0e1051effcc5959798e464dbf7b13d729f1e84c22e29f422f0e151b8cd999776265b11baff1a3affc2b957d9ea5e90bbc10272a37f137a353a35924cf7e
+DIST kwrited-5.9.5.tar.xz 20360 SHA256 aaad41bf140717f8bfa87381de9e1baad639afc30e06566a238f58767bd4ecea SHA512 caddf255e4e59d4c935c20812dc25c45a02af939ddb1b65d500334b1ba216f9a32f0bb09f97f540a9e4c3e13bdfcf1d116440061c69b634fa0dc3303e573ceee WHIRLPOOL 5d99e9acc44e9b3ca93b7b7ce469870a6af8fb3641ab9f35aeff62c25f4eb20f479d31d5237ec7d0a682eb1a996905763daa36ed55ec95d5ebfd34bf178ffbd0
diff --git a/kde-plasma/kwrited/kwrited-5.9.5.ebuild b/kde-plasma/kwrited/kwrited-5.9.5.ebuild
new file mode 100644
index 0000000000000..6f31220af41d4
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.9.5.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 096b7b8993f9e..63bba80abfd1c 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1,3 @@
 DIST libkscreen-5.8.6.tar.xz 93708 SHA256 aeb663412141c5869b56f44a53f477f4140b64526aae21b73e95a7a9b7a72008 SHA512 799e042039724355658a9dc84fccb074fcdece79d63ff06ef4ef836f23f03df2d33c28e11df1b8b096320de50b13c2308b69b3e6b7136f883f6b2ea07952e23d WHIRLPOOL 38a01f7354a026febb1c12d8de07fe493b9610481e3dc6c32b04f951677a7ebb819e09cab440de88f44d141100910f0b321c8688cbb4c3f220e58c6195ef3334
 DIST libkscreen-5.9.4.tar.xz 94068 SHA256 fb0e1f278017276b69b7796042e3f04b350fc264024c974e683c159f414869c0 SHA512 33c7d6c3d6b39376005b1279532799190f74ddd652b857949bac09fec6108875ed2a3aee716436ab5216af07c3b4e6e5d7638a5fda57ec5fda08d3e670bf4e12 WHIRLPOOL 90c6196ba6604bf5f2b1652b4ead74096b20671b67de41581e7509d1197b9a57ea0fa2bf6e06b40a77ebf304268e9458ee128be64dd996adb75f893195e0ef0f
+DIST libkscreen-5.9.5.tar.xz 93760 SHA256 040031f4fdcae638e92b8af32ad4cb8d2c96648ac31a6032d1e36f14333a00eb SHA512 747c899d5711a271795ed8dc1e1121114961217043d7266de3738ba1f3091b6a8411ba0052acc2e9e4185649b017f5c78772126a6e28e66c3447291e5bfd92fc WHIRLPOOL dfff05300e415cfbed94602ee8ec3760a3159f70b78740161a43324e4834b0bbd43da3716822be21262913fa403d46d741c8010a6a25a9e87edc0e4437d8521d
diff --git a/kde-plasma/libkscreen/libkscreen-5.9.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.9.5.ebuild
new file mode 100644
index 0000000000000..faedcb0627865
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.9.5.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 1aad9cc0663e0..8005eaad9d2db 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1,3 @@
 DIST libksysguard-5.8.6.tar.xz 575748 SHA256 a8ae640da5fedae7b59735a745d6da36eb4a3231afb116f2b453ff443f2c6244 SHA512 0f78ca2ef2b862da941cc58e8bb781a23c02e885a3545aeefae43b14b32b5b3cf03b4f6393141966e0d72490afab9f350a479ab319cfce15082f3ef38f761a20 WHIRLPOOL 1f70a97c17e904a01d2800e2579bd124fa5d6f397ac45be3be2a6979a4115fad0e82ea2a71eccbac9ff25ab5c0d8e810bbdd621210e1fc62ec29a38b06767444
 DIST libksysguard-5.9.4.tar.xz 574944 SHA256 15df1b40cedc28d4634d2ceb301401930d46897bb4cf963cdf26cd7c51c6eebe SHA512 d3757caa7c439c765467bef573dbe9caddb175025065465ab0260aeb80e162e949b6019636a99759ec5261a4ea858c8234682838b385d4adeb2f355eb91beec4 WHIRLPOOL 05045e81bb9a6bd4bc93e2a76f75f444da8c3524697f87c9308a4d8b120883438b5c2554932525565038ca1d01ce1ea7ade8df0d60cf9c215a645212dc9099d5
+DIST libksysguard-5.9.5.tar.xz 575140 SHA256 7c1ed82df3ac46f3fc2e9e0a3bc45cf7d783fae145299e57b7b2e9a2f5dd142c SHA512 f8e141b2071ab8ea7e2ae7228f3fa5f4710c7dee01c8c880fed9fb49e2e5e073014d482a8d03c6c115a5ece854b5e9d0379d7a870c08e6b377244565291ddadc WHIRLPOOL dc2a3df62525ab4e9f7471306c3cce1f61743df7a1909d3f99b1d956f3c514e39cd76c77c9735e91f37bd77e7284c5337f548fd23de97183c4aecbae941e432e
diff --git a/kde-plasma/libksysguard/libksysguard-5.9.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.9.5.ebuild
new file mode 100644
index 0000000000000..476f4cbdce068
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.9.5.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 1f27c86b58808..c97202c710d35 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,2 +1,3 @@
 DIST milou-5.8.6.tar.xz 54512 SHA256 7a6d224fd0fca331e3a696ad8bd03cfb4be2fcb31bb939fb3335a89bdc895b03 SHA512 ba6c5898c46091906843cf0de4645b7e087adf5d8e789a98f82f15116f818545790ea631ec1c31b2e96c5110cc9fde48f6a3a98dcbb449aae76452d12cabe260 WHIRLPOOL cf24f12f35fc277ea0f60c9cc30c984cbb735584d010a38eb9c13abf948081492ff640e8ff446be5e24989ad1f955cf380b19fcc7e524562355d9543e8809772
 DIST milou-5.9.4.tar.xz 55136 SHA256 dcad590c3ad7f2ab8ead85cd9bec6bb037a399ce28dde4297dec195a53eabfa3 SHA512 1cc389346ad090374bec8f8038d16029a3ca83c48bba922c77849c8de3b6fe2810846a70da00f49963c700bc46e836ae809ae6542feccad5a08f5fc4e60b71c4 WHIRLPOOL 125569511b48a6d86abc66aa9e0e305e349db237afb31f19bb4a17ee67ebcc36c0b2dbb200316f9a7b94f0c287861900474590172c2c26cab30b0312feeb9f9b
+DIST milou-5.9.5.tar.xz 55260 SHA256 fca5e8c2652f68b9f632a99f27bdbc32ba0e84d34ae62909c7f7bdae8d50f8e3 SHA512 6c9fd617a5a284b9b43bbb7047af9129af6ad5b2b53a6fea4374a4f40bf8667c4250231bc86b8a052895b1af3406e6ce7def5d08b42e00cc502039cb8cad4b27 WHIRLPOOL c00cf833f602e10bb0716d3228346420e9e8bf6f4bac3509c7d497d683151898aa9a25f045d69eaaf481c1a2ef5d7f5d0e31c3ade186c127544443b6678e44fd
diff --git a/kde-plasma/milou/milou-5.9.5.ebuild b/kde-plasma/milou/milou-5.9.5.ebuild
new file mode 100644
index 0000000000000..36b2c7448b1e0
--- /dev/null
+++ b/kde-plasma/milou/milou-5.9.5.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 611dee9a82ac2..e2b72fdef1935 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1,3 @@
 DIST oxygen-5.8.6.tar.xz 4465080 SHA256 15cc949a44b80f37d5af96c2fd31337ce16b3de04e8b4f97d9d6565fe5af57b7 SHA512 cceb2433c89301c3c60aa54df8231d022fbe80047ccac8107ab773badcdf4fa91beb4aaa01787b688c7a844c99690a5c4248252708b6f3a56203eba40b1c4e67 WHIRLPOOL 59d90fd0fa7d3d019d2aff56b5be6670325a14f3deef73641d445b5461c2123502815b750ffbf6c3314632f62c562cf89cfa4995cb07539c2af7cd57c90776d3
 DIST oxygen-5.9.4.tar.xz 4461932 SHA256 184cf85ac0c9e9614462a9aa17d870aac237647ef85c07cd87286c2007d6be3a SHA512 1ffceef017d66b08785723c776576667e28894430e6ff430193703ae35441ce86aa46531370c06f8c10d68db5031f52089f0fb0161d4ea7a7ad5a1b3e7ffeaf2 WHIRLPOOL 77c287736a21fc21a5ebe04589664a11d664a57c15d96eea53d2745ae269dcdc2db682cf6dcafb2cc128f2e6ecd80096ab8049b88eb6050433335b8d273a769a
+DIST oxygen-5.9.5.tar.xz 4466012 SHA256 e3930de3af907a58a72b15849fc205751f6acc904a3e147df0eb20f4bc6fe35c SHA512 54e70abad2d4f11e2c28d9aecda9404c61c05727148495263860380b577c8a7e514e3d6efbedbc3fadb757775b240d5b151c95cc9bb3f64af3a017c2362c01e1 WHIRLPOOL 13c521893e7a4f2e3a5e30e7fd21aa4909c2bbace35d581e45f0b7a7f5b4d52384ae5d6383ba3abe4e2c2b71f3112c76e2f492465e30780dc8585eee41b8aedb
diff --git a/kde-plasma/oxygen/oxygen-5.9.5.ebuild b/kde-plasma/oxygen/oxygen-5.9.5.ebuild
new file mode 100644
index 0000000000000..9278b31d04870
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.9.5.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 ed79fc3ccf63d..95b1bd883a506 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-desktop-5.8.6.tar.xz 6413204 SHA256 de5c0a2dc8bcf79cec95d660ba535d5d236f11bcee2c5a72e328f3734e0e1f83 SHA512 703dcc555da6c609f858185468694d2c204478d2c7c5822ebfc57a7153899e57e81ce7ab0b2533f30e3e1a3c20bb358f63c5ff26f833b0bf4ab3bc5dec283f7e WHIRLPOOL 4b3bcf398b115ba30c4d96171cdef6255b4bd835a5b90261278b65500b4bcdc72afe66c5b6d138a6946ea4eaa99f6a629cc0980084fa817dc9079c41cedbde47
 DIST plasma-desktop-5.9.4.tar.xz 6065296 SHA256 8d193950391cfc3a50db862838cc71daf34292de4a7e720289da7e5773c171dc SHA512 07a5966d45d4d8ea791161958f04d8f69ae5c0545ec0df9175498d669966df6bd7597532411b5574ddd159757b34f0870d1c263704958459e7d60d69e0b8d7f1 WHIRLPOOL 3d43d056a04c486b666ec994cf0cd524852aac341519cdb154d112058f0a8c20d58c1e8ca7fb201985278d937e59c83b508ac8ebb7c6aac152905de9093e0c48
+DIST plasma-desktop-5.9.5.tar.xz 6068080 SHA256 e1f437ac86e91e7f18a1e36dc93c3e8e57a0e183f343765f3772a902f0c135b9 SHA512 7fd97eb5379ee1a4fe1fec89a299110381fbffbc01880e36dcea67221a378e8d836e5dbe6cf6467a27745d37f2d5ca977cf180fe29e09a14edce047a5d4eb6f6 WHIRLPOOL 3c06086a5d036415bca0577b4009d365d0743981429af7a5cf8320b8ae1da8e9ae7bcddfa5c60ec10be36cc5b9b1850810c1d590c59523ea354da60412e2d6b7
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.9.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.9.5.ebuild
new file mode 100644
index 0000000000000..c2e7cd985ac7e
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.9.5.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 791f27194ec17..67812163e6dc0 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-integration-5.8.6.tar.xz 51160 SHA256 ccb22bc771940ec9b6ef7a742af18b8b456ccc05b50b1d29b8b9ecde4b8a076c SHA512 8046549ebd6f0085779de0cd4d85c79d1c03109925b87a3e6466909c006321dca658f95f82cd573cff5403662d47e067765b976221dc2f6172ad2f163973553e WHIRLPOOL b9398ee52dc4c73d373bcabc270a821627594cb0d934b0b3803a9f32e22dc1e16dad53d56720fc026c8e6fabde9ee1a36023dec2822e1b9eff6d38081e971b32
 DIST plasma-integration-5.9.4.tar.xz 49904 SHA256 1569754b78cb57451360680316f3ce33f6eee643333a8eb0a8040512c44d65d6 SHA512 a51c3409407562a058c802a7c9fdd1d1340a261f8a88603b86301a8cb147ce113f45842be22d8c6e68ebaad8ca555dd4970504b4a81b2cbc9e2070b7eda57584 WHIRLPOOL 0475bb00ed4e8046ab61d29dd4cfc08e3a45b76242fd50a4a89220d3c03e2e51dd7b064926798677afa7721d7a367baa352921286cadf4e8de7f82e4cfb9294f
+DIST plasma-integration-5.9.5.tar.xz 49688 SHA256 1c84fdf4bd2d285485d0703248d3ae502443737f0cbc9870171560e872ce1d17 SHA512 5e69fb375b83cdc28230b9f1ff4a09ae2cdae3614ba2b7ab971d3d1666616eb7444c68e0065be927e8616c08a773f0b36ed9913f61066094a7a65f65174a8988 WHIRLPOOL 3d3a705ca1f00de7ed152adc6aed9d100b175027d0c874a40e521bf97a78a4f13c8d779235c6b86796f8f13a3516a8c31f02bdcdb5609019f038f385528fcb69
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.9.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.9.5.ebuild
new file mode 100644
index 0000000000000..e50dd6194fb08
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.9.5.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.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.9.5.ebuild
new file mode 100644
index 0000000000000..f1f950926888c
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.9.5.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 7dc95ed907395..d5c9fd7259477 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-nm-5.8.6.tar.xz 653420 SHA256 e81819b2d7f19749d4b9046953b6ab7b4bbe103ca69b8e7809c4c52cb2294798 SHA512 e1b2bbe31bbe1b27eb64b461b537c9bddd911bc5dd7e001586367c1051e3a3dd0d319f6ed5e24a726688c7e1460d9bca2d01aa828a8d29a2c1392b597f378812 WHIRLPOOL 635fde323022a65096ac0745e905c244514b2b46f1364ef23830155db57cf38ce25a5ec3e9a66979c554772a5ff72cecc04b5eb0b59b926dc871264880ee85c0
 DIST plasma-nm-5.9.4.tar.xz 670300 SHA256 3dc938132afc041a9a4a15fe6f201337cfa1c39607065f220dafbfd3a1f77b69 SHA512 71624c11b9171a23ff1df53270850f788b12d709e63b9c497c156d83739f8750aaf696c01f3af978ed3265621df3bd54ace46d404621ebd475513ad1b7fc28dc WHIRLPOOL 8f46e6413b58671cbe45f0f82c74c74d4c24baf1d4f9c69fb5e6a3706fe701b7f4a41d6a86494aaebb4a4f8faea3a9ab30960e0f2a3b379d40b0e418e9fb79fb
+DIST plasma-nm-5.9.5.tar.xz 670460 SHA256 1c605e69b08b12439191e417c9ad43809c203f9a7541a2cfe5dfb9ee6c3dafad SHA512 bd10fd0a96eb2299beff15bc1b4a60a78f213582e2df28d979af0ab7e196518a6479682e65cfde4b025f3fa41bb3e6525ffa49d3ed51fcb54ac765eba7e50439 WHIRLPOOL 4243b551b70dd3446bef676fe73fde712b9bac6c7a0375b66c3376a90d072b13e30bed7bd06a79e5e759154f11032cbbe194b9ab157d944ebe35cf60da81a68a
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.9.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.9.5.ebuild
new file mode 100644
index 0000000000000..5783a52a471fc
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.9.5.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 a5bd9d988aa0b..a7b2257c025ba 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-pa-5.8.6.tar.xz 70040 SHA256 e8ca46cdbfefbf8a3067a5a6e153835a2bd44257f30eb94dba9a542bf4147c9c SHA512 6131057d00fd3d7338ce9bc6eb9e9233ee16e32fdcf43cdd9356c9c7bb6976ca2bc78ece649a7fbe7376aebb0d6566341ef7d8e6814effd41c1bffd32b8cbfe9 WHIRLPOOL 7ef43b69b5c9ef80814dcf16edfa6a4070ebb067f560613a75fdb7baae1b06a307e7117bf27c22be4c49d26cfdd2152162c4ae9a4cc571fa65a6afa6928938e4
 DIST plasma-pa-5.9.4.tar.xz 70484 SHA256 288aa1cae1f70e881e113b4a7cfcc750297a442406735f07d723986eea633642 SHA512 f3b2090cad576f0f37661fa8454c2fd368080933fb7ec5c749c20623dc1bcf9ad1a2cc5b46907974b6ca1a5732e231d782e44a7a580e5abea5a000011a639071 WHIRLPOOL a47c8f4ea8736b3133af72acabba1c2d74abddd844e46e1addf4ed6c4f3a39e61833dcead32fe9ac2f0b96a07306f783a366f673eb59ad0a996b64ab02c02a11
+DIST plasma-pa-5.9.5.tar.xz 70756 SHA256 3efbc5c46e4b67a8d153d7525502434c09108b4ffaff20c0b1bb9ad16c1e5575 SHA512 9010d95e3aa6b55615c05623157feeb4884bdb0c497af3eea4ccd66e27ee52618ae13db742f18b5f0ec821ac17dce9075ced26e59db78ca73d4c5419f3f54e56 WHIRLPOOL 91fbb9b0bcbac28ba9fb4d5b11a2ee5e0a080a4e77459b08d016a0dd60cc9d0690bc4f2dfcb2413063cc6fb3c8bd91f0f9e0b00ef1ae34a05f97a02b3ec3aba7
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.9.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.9.5.ebuild
new file mode 100644
index 0000000000000..fb5fb2344258c
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.9.5.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 931c633306cde..1657674adddf6 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-sdk-5.8.6.tar.xz 723612 SHA256 19716fff4b3519843d3e53113131c90429112a927f38e5577163e42136774ded SHA512 cf664b8932ba16f399408aab4c7c022a52732311beaa9542764eeaccf6c1284b32e9739349fae8b8dbda5ab850aa70cc0acef65c6e4ba0cb68d0e34e00f277b1 WHIRLPOOL b0c9da6dc41b1a5de79abe9772b5ca2af84308356f99411d8fab2b0866bb736410f4e29565a7c8e02c080e7045ddf5f18d126afa8ee0f934c6c4687e855f9ed5
 DIST plasma-sdk-5.9.4.tar.xz 722964 SHA256 dcdd30e67a5c4a0664871f3cf1b636ea19bf61fe044284556d438cc3d54c845b SHA512 4e59f57297961ab0753aa5c3d1b5f986706993dd971fa67822e098dfe1e8b957652414ef6c6167e9ec55298cd655ef817ca1a65683f028d5fcf6f87ec8f13ade WHIRLPOOL 1cc6eee417609558737dba5142df27f6c030daba69634d85c2b1e1eff13482b65ef99da3627cec4d33ae10014477c6e1b29033777410b9c052cf8fa5b9776f4b
+DIST plasma-sdk-5.9.5.tar.xz 722596 SHA256 bd8648e609947f58df6af1b8a7d514216ec02f6160c8e43e36c8de62d6e17d37 SHA512 d262fce719c92213fcfc4e5ae59ef283551f09d06ad45ec6d4717735bcb4558a7f6aa3b0ef81eb9255f630b63ead7913c63e07c7dbcfa4a317d9695346487af4 WHIRLPOOL 69191c6561dad5b3c85b5b78b3308168291f2a17efb7eb97b046f2ecad73e0babbb72d6b1cdbca9ae38aa2312d044151c6a292b39eddf9e5f750b51642b14827
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.9.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.9.5.ebuild
new file mode 100644
index 0000000000000..0e6e7fcda0fb9
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.9.5.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 0db96424701ed..f00ba302fe2cf 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-wallpapers-5.8.6.tar.xz 45911424 SHA256 2d8e11063378a7569701195b3f2fe9102ac32785767bb0bc4327da7e06d34287 SHA512 9bc20852430214ba7b6bac0340a8e6e4dcf82c0a8b2cef40bf5b9ba8eada91fc276fda34c589a57b414c4f36eedbf305358eae02ecbdd2dbb429ac04d2d6d465 WHIRLPOOL 53044e54d0f7b812127053e44e43d8d62314a631de2988592202da847d78c0e7338bd4fa5fd2586ff70ec655858b24b3bb043b4a9ba8b912f117ae0fd4ec5a3e
 DIST plasma-workspace-wallpapers-5.9.4.tar.xz 45910572 SHA256 01097a93eb0310883be9f6ab5d7e8506be47a243bcf978d04b207783d4a1cf4a SHA512 d84bcc9db8782a95bec8121bca0175d2f79bb5f4115e97e4161628143f31a9d31a91f6e6a11bb8f5c4e89f8f72c691ec583e3d6aeadb3cfeb1a8e424552c4d27 WHIRLPOOL 345801d58c437fce05a483b1e3e9a7c61753d492e8332809d120e971b7703d056c1eca5e03ab3f5a718fb4f9c720d89057f0b2d76e69ccdf16085f501cfe2cb8
+DIST plasma-workspace-wallpapers-5.9.5.tar.xz 45913328 SHA256 56d7461e1449a7e842080200429ba2743581e9e861ea9a7ee3007658f5366516 SHA512 568b60de516ea8be868e52706f7d7b3979d626d60c1bdcccf790224522725ede2a74fd619662fc236c4d322e612d4213b8119c82c56f078b9e97e679c30f579f WHIRLPOOL 56e0b26c812bf7109379adc6449abf5f9ca4a102a35e68e02fd89af63e00a015ca22c3e24c137c1274777f04ff3b79c278285daa95aec2e20642833792879a45
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.9.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.9.5.ebuild
new file mode 100644
index 0000000000000..a893dcfeb8019
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.9.5.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 875ccf00566bc..c83cad94b6bc3 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-5.8.6.tar.xz 6992264 SHA256 51ab8b5f4c33c83fb64eb3f27561f3699b12b5e5c9fa7d38b73d93e57da50192 SHA512 fdc22db98942db8debe24a4364b2a8c5d02ee850691a8e7788f812b6ee9b3324a26b5cb71d248f49fa71eba0aca47f838ef671dd428e26fb60a5a5650d9d3144 WHIRLPOOL 9802e399f357ca5585e1cf2b838d601d330fb1c8d97fc012c5c7dd41a2742971e0539153a78ded8fa4196a8559a17074cf74523df5b8c4f1ebe902d6432311b5
 DIST plasma-workspace-5.9.4.tar.xz 6939508 SHA256 15af4769aee9ab35df133fcb4b366ead4cf3b495e7f6d1ece4851055887d5f5d SHA512 4f1d44e8983342b02aa21344abe8f488030f705803c0d8b7ebbbad977d39b2142c9a056cf9c6efe03e3de3306683e4db1dda9fed672119f5e358132311e18189 WHIRLPOOL 80bf64dcad55b152ad2eb6cb8f42d960e7c8594d53116eca77a7d253122182e45e1b31794641f397b6c9c2fbd5d051aff15679d68dbf508338a30591bda768b6
+DIST plasma-workspace-5.9.5.tar.xz 6937764 SHA256 abe34e01d455b8367a58ea135be63af91122338d3129f14bc51d52887e6b6b55 SHA512 cf36b22ac9e12c76b1a427514516a82fe9e583070f114b51df6b5bb2bc2ffcdb86e3a9dcfff90a9384935ee4e106d1cf0e203ef9a0067390e8fa35b5f614a449 WHIRLPOOL 1a387528e21b05d4fd80a774a06c12e4240611c71d8c2331d0d3c8b2d5664d086c2744f75680e969ce224edf5cd49e39bbed58d0be7b52800edb1db1e8b53885
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.9.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.9.5.ebuild
new file mode 100644
index 0000000000000..0ceac64cde588
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.9.5.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 2d3edcf14b4f4..ae5440bd938a9 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,2 +1,3 @@
 DIST polkit-kde-agent-1-5.8.6.tar.xz 41140 SHA256 8227e8ccd12d799c7ec25940afa121d3df5fe4f66e1645a85ba96e7df2a26f81 SHA512 3950ddfdb91323ad5045d700403f6721598662e646775397242a022e22682514abbcdc447e35d02b96077883d3bdb97f6e7244ccc5ea30812c9541162d06e90e WHIRLPOOL 1690e3b7f05bbb64d4f62f5209b5cd0c6f3830a86632274721044e3633e39a9c8e4d734656ef6758c7cddc220798e8a067b71a0955e86fac2058f5311d486bd3
 DIST polkit-kde-agent-1-5.9.4.tar.xz 41040 SHA256 4c3a890c1f09433c3a0b6afb0984a18cf6676405b818facbb6f5ef29dbdba383 SHA512 98a5ca5a1fe9fe89a885b6f2599f1da605be88332a0128fce5c498f1b929d2d0e08e79126bbdd66d1affcb2ff6f9c93015517a46970118cc327b65045a102a4b WHIRLPOOL e3c24b809b3f105aca9f7993f6e61c11460551e9c064352d7a44018a0f78d998943263611e4b7e13bdc550e848541bd0d7c5ece0ba7c7370d16addfafe50e4d6
+DIST polkit-kde-agent-1-5.9.5.tar.xz 41060 SHA256 8278f862842af29eff4173aaf3bd5b4df97d0654d97b73054966f1f30ec01f17 SHA512 188984a0f37e96a742c18a4c8e53389c290ea70f2ef5b7fca67ee318c9214906c1ed96c34afbc07ec4538e466c86b1dd3ce71a30f132908450ee3df8a6b09c72 WHIRLPOOL ce920dd073069edf743496f807dd3b59b9340cecec4578329949f7f229c721525a02ceddbf7a26073e1b38abba44a865d2a28463e1adc5c070cade97de5952ba
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.9.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.9.5.ebuild
new file mode 100644
index 0000000000000..127e07d8f11ff
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.9.5.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 369082bbe67f4..5f473757ddbc9 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1,3 @@
 DIST powerdevil-5.8.6.tar.xz 357808 SHA256 64db4d23c631397632cc84183008290e86fe1ffdf8df662fc627a47f8ce8be32 SHA512 90afa4e771e33e776d78fded893e90829553f4e4e60e0d4bce49c0fe12cbe97a3b8bd3cd8a6734f87edd4c19c85b8dc5bd890bbd26282e850391b465714df1e3 WHIRLPOOL 7cb04e359995e43c11fd7b2d4f7aeb82943e61d4d377eb5ced37e65d87a204381f9162c40c599657777c4407ccc3c88030191a6dd159b310c095f13b002aacea
 DIST powerdevil-5.9.4.tar.xz 359316 SHA256 3b877429e6be898f114848964c1190f2fbd41ea97db820dea5a1f0989901f7ba SHA512 9ac5e580a0395db62339ebcfb72d6b405ebed10f2a6a93246bc218adaaa2ea9fbbd9093fd552b48dd3f962f0a43fb8ed13ae61726072258e8f3394b73bae6141 WHIRLPOOL 29f3eb027835d24f735ace64ececc95d7794c3ea94ccf22dff1320d4f452c39271d070376f48aecd5d24720526ce9900737cf6f7438b4c8c852a6855105f4de6
+DIST powerdevil-5.9.5.tar.xz 360176 SHA256 9fc15ea3894c83ad1be3b4a07f7b320ef729ab6e15931889b631d56653cc1945 SHA512 8f2988a6ce299cc034f98254886b37d089e74887faa20c20188f1cf4c4326fc95a09ea01e31674b851ea71edf833a818ad71f8465bfaee86dcd7bf89eee42835 WHIRLPOOL 81da9d8d96b94187e6db7f26545acf1b53b4158b651f87c84c43abd09e1d140b03edabb37380980b4218640129c0abe57947b554ff87dfedcf7559f72b3e4b86
diff --git a/kde-plasma/powerdevil/powerdevil-5.9.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.9.5.ebuild
new file mode 100644
index 0000000000000..fabb7805ea8db
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.9.5.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 1d963e464482e..45827140a8a66 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1,3 @@
 DIST sddm-kcm-5.8.6.tar.xz 48976 SHA256 8cc61258cbd4c2d2a23383bd3cdc663b28feff0eb66c1edd4e808075cf08a875 SHA512 eedd94c4ceb251c155fc4a6387480f834854e3a435723af5bf0e6fab31bf036a628eec3ed1fd836e5da0beae7c1e82595a18ffa87e3c701c2c29955adcacf785 WHIRLPOOL c21c5e63c054b58d1d14493cec543e0e460014147235baf254fdfb63aca3e409f028b62e79f18efa983933864396149bc260336f62cef253ccf33ef37c9be5c9
 DIST sddm-kcm-5.9.4.tar.xz 56404 SHA256 941a9155942d9c52bf9d93dc0c312b0b473dcc224f503f92de06e2fd37512dff SHA512 77786ae6012447c8a0f880893eaed16335a5663ae1dada5da118885d9f502b15813fb9e1f27be0a3d9c2f9ed75948c5bc266a9670dfb576c9aa0398e3d9c62bd WHIRLPOOL 4199399434330d7e413f5e228dcfe63a1e7c1c1379d4cc808b250496535cdb7ec1c2e8c51a4e3a53dd402e4c0038b875e0d3e926af1de064c1f1176d27254f7b
+DIST sddm-kcm-5.9.5.tar.xz 57044 SHA256 66ea289f60f6c871fd23532ddc9e118d5ee45ef54e3aabc9da79b534081b1860 SHA512 43fe9855ec3e04e2af6257662dc7518425f396744e9a832b6b33df10d78f10745534eeb4ee398fc68f7663dfa361e5e40edcd828802c74b25e815cb96f4d38e4 WHIRLPOOL a5b44d4b4ea9c3141627a7221625312850b8daa80f7bd9c2485f52514274da43b5b106c963ef6630768f9b0580ad44708a2f02f4f597e75801041f623e16f1e0
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.9.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.9.5.ebuild
new file mode 100644
index 0000000000000..866d237ee6d5f
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.9.5.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 c7bd022ce72c1..2562dc6fbdabd 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,2 +1,3 @@
 DIST systemsettings-5.8.6.tar.xz 158588 SHA256 3b1c4a59df96c1623d02bbac6731f52a8deaaac30b9a30de5f3d71b4ee19c0ff SHA512 b3cc27a44bef1a065d6b3cc5157ed17fd7f7866d209e6aa9b6231ab8e88458f4eb50a1f7a6847f2e3ea57125afeb4d0f35fe1a31ed27cd9d4b2c0b15b3302be6 WHIRLPOOL 68576bdb4107f7ce7f7e8afe0e9149ac7d2132fc11d981f41d5ca0c22199f5f6474fdcea01ab04519b4f5a8a26c76c6c50fdd570c2dafc16d826405158cdaf83
 DIST systemsettings-5.9.4.tar.xz 157920 SHA256 c1b3187453d9a3f87178003c21f881366c0139a4d601b724c4e649f89e6a050e SHA512 38c41b34df93dbfa1e1f6798d0b6429dbbd19135040322162518758c80dd6a7cbf87d268ff17af5579cd4655f80a043c8753c98e1f60d91ab97c0182134140ce WHIRLPOOL 67c135bd8ca4c52843ea64793419a260c24ebeb8733996db358ac621c8f33804f0a09225910d157110eb16493d97f37f387cabb4e90be1729a6fb58673d468d1
+DIST systemsettings-5.9.5.tar.xz 157916 SHA256 e93d5876a4bc6d9fc76d9e7f4db10d562693ba2f881aa8a95b62837a21f2e875 SHA512 4feffc25d8d5b3be305ce7d8f26e4e31f667990f7833ac15f9102e816e03e2db161067310c7a285c7427fa34fb7f65e22621a7648ba61de9fe7044ffa6af9ed3 WHIRLPOOL 8af688fcd0b3d8f290806f53f0740d13d769b260513b7f0f512946b6f8ecb6c5278cd123e9d75d7d91f4a070895cb5195082dd20b35668028fa81de2557b6f53
diff --git a/kde-plasma/systemsettings/systemsettings-5.9.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.9.5.ebuild
new file mode 100644
index 0000000000000..9235dcaf7fc7e
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.9.5.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 7f04586db5634..c68a7f3561536 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,2 +1,3 @@
 DIST user-manager-5.8.6.tar.xz 543260 SHA256 371edab0a7588236e17ec3694d46ed12196f70036fe7bdd68c3d17ba59910afc SHA512 317c595883005cf39e4d5552a676e48015fcb613e70118339d635c5fcddbcc4a335b5fafce36efd10a57ad7034f451ea8d8228e4fd92e5436fbedacf8a41a7c5 WHIRLPOOL 6224e4c729067cb4456c5d06f109f55a9d036894250a7b4cd6dfe71f3f4227d2e7e5d300ca327376c3db516d251bf427b8348c191fe86d79eec3669e5081eea1
 DIST user-manager-5.9.4.tar.xz 544120 SHA256 c4e44aa68038fd78b1aadc84b6f815abb5df55e0df7b06e7d2487e5c569f5cb2 SHA512 a083571d1b09adcc9c0e0a2e82b5afa44bbd3e5bf720f8628398483c5ab40761d37d16fe6581ef613f33bebbdf47a0607dd3777687fc6478d01740d1f17cdde3 WHIRLPOOL d2c496903ed21af9b7b8ab0e30a680c9bf5e74ab080c590f17f301e36e1bc7f8eaf16d7dac49736508397716c6914d7466d1bfb6bb62802eb802eb23ae75e97b
+DIST user-manager-5.9.5.tar.xz 544764 SHA256 b6779666a2adc0066e06c3fd894f215fb39163b3b9a58fa53e7a9b3d14b3d914 SHA512 aa3ed2d09cb8e43665095ed0aa6a491d4718f092b2077a83be76ff836b8e6c6991419aac8212d1088d7d01ce1915364785fc30e865cd94fb81b33c7e739da280 WHIRLPOOL dea362a45abd4e4558f8decba1d7b6b9621e709fccefc9e3c094e386ad9f6636363de40969c659322426b9a2ecb8bf2ef837cf87af7927a3f4d99fc7866aae27
diff --git a/kde-plasma/user-manager/user-manager-5.9.5.ebuild b/kde-plasma/user-manager/user-manager-5.9.5.ebuild
new file mode 100644
index 0000000000000..d8abf0b11cf56
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.9.5.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}"