From 54bf6af181e9d9f51a3ad2ab1f0a93cb04eb5059 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Manuel=20R=C3=BCger?= <mrueg@gentoo.org>
Date: Sat, 12 Sep 2015 18:22:12 +0200
Subject: [PATCH] kde-plasma: Version bump

Package-Manager: portage-2.2.20.1
---
 kde-plasma/bluedevil/Manifest                 |   1 +
 kde-plasma/bluedevil/bluedevil-5.4.1.ebuild   |  52 +++++
 kde-plasma/breeze/Manifest                    |   1 +
 kde-plasma/breeze/breeze-5.4.1.ebuild         |  65 +++++++
 kde-plasma/kde-cli-tools/Manifest             |   1 +
 .../kde-cli-tools/kde-cli-tools-5.4.1.ebuild  |  54 ++++++
 kde-plasma/kde-gtk-config/Manifest            |   1 +
 .../kde-gtk-config-5.4.1.ebuild               |  52 +++++
 kde-plasma/kdecoration/Manifest               |   1 +
 .../kdecoration/kdecoration-5.4.1.ebuild      |  15 ++
 kde-plasma/kdeplasma-addons/Manifest          |   1 +
 .../kdeplasma-addons-5.4.1.ebuild             |  60 ++++++
 kde-plasma/kgamma/Manifest                    |   1 +
 kde-plasma/kgamma/kgamma-5.4.1.ebuild         |  31 +++
 kde-plasma/khelpcenter/Manifest               |   1 +
 .../khelpcenter/khelpcenter-5.4.1.ebuild      |  42 ++++
 kde-plasma/khotkeys/Manifest                  |   1 +
 kde-plasma/khotkeys/khotkeys-5.4.1.ebuild     |  46 +++++
 kde-plasma/kinfocenter/Manifest               |   1 +
 .../kinfocenter/kinfocenter-5.4.1.ebuild      |  89 +++++++++
 kde-plasma/kmenuedit/Manifest                 |   1 +
 kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild   |  45 +++++
 kde-plasma/kscreen/Manifest                   |   1 +
 kde-plasma/kscreen/kscreen-5.4.1.ebuild       |  34 ++++
 kde-plasma/ksshaskpass/Manifest               |   1 +
 .../ksshaskpass/ksshaskpass-5.4.1.ebuild      |  24 +++
 kde-plasma/ksysguard/Manifest                 |   1 +
 kde-plasma/ksysguard/ksysguard-5.4.1.ebuild   |  48 +++++
 kde-plasma/kwallet-pam/Manifest               |   1 +
 .../kwallet-pam/kwallet-pam-5.4.1.ebuild      |  20 ++
 kde-plasma/kwayland-integration/Manifest      |   1 +
 .../kwayland-integration-5.4.1.ebuild         |  22 +++
 kde-plasma/kwayland/Manifest                  |   1 +
 kde-plasma/kwayland/kwayland-5.4.1.ebuild     |  27 +++
 kde-plasma/kwin/Manifest                      |   1 +
 .../kwin/files/kwin-gstreamer-optional.patch  |  15 ++
 kde-plasma/kwin/kwin-5.4.1.ebuild             |  93 +++++++++
 kde-plasma/kwrited/Manifest                   |   1 +
 kde-plasma/kwrited/kwrited-5.4.1.ebuild       |  24 +++
 kde-plasma/libkscreen/Manifest                |   1 +
 kde-plasma/libkscreen/libkscreen-5.4.1.ebuild |  24 +++
 kde-plasma/libksysguard/Manifest              |   1 +
 .../libksysguard/libksysguard-5.4.1.ebuild    |  54 ++++++
 kde-plasma/milou/Manifest                     |   1 +
 kde-plasma/milou/milou-5.4.1.ebuild           |  30 +++
 kde-plasma/oxygen-fonts/Manifest              |   1 +
 .../oxygen-fonts/oxygen-fonts-5.4.1.ebuild    |  37 ++++
 kde-plasma/oxygen/Manifest                    |   1 +
 kde-plasma/oxygen/oxygen-5.4.1.ebuild         |  36 ++++
 kde-plasma/plasma-desktop/Manifest            |   1 +
 .../plasma-desktop-5.4.1.ebuild               | 137 +++++++++++++
 kde-plasma/plasma-mediacenter/Manifest        |   1 +
 .../plasma-mediacenter-5.4.1.ebuild           |  48 +++++
 kde-plasma/plasma-meta/metadata.xml           |   2 +
 .../plasma-meta/plasma-meta-5.4.1.ebuild      |  60 ++++++
 kde-plasma/plasma-nm/Manifest                 |   1 +
 kde-plasma/plasma-nm/plasma-nm-5.4.1.ebuild   |  64 ++++++
 kde-plasma/plasma-pa/Manifest                 |   1 +
 kde-plasma/plasma-pa/plasma-pa-5.4.1.ebuild   |  27 +++
 kde-plasma/plasma-sdk/Manifest                |   1 +
 kde-plasma/plasma-sdk/plasma-sdk-5.4.1.ebuild |  40 ++++
 .../plasma-workspace-wallpapers/Manifest      |   1 +
 .../plasma-workspace-wallpapers-5.4.1.ebuild  |  21 ++
 kde-plasma/plasma-workspace/Manifest          |   1 +
 .../plasma-workspace-5.4.1.ebuild             | 183 ++++++++++++++++++
 kde-plasma/polkit-kde-agent/Manifest          |   1 +
 .../polkit-kde-agent-5.4.1.ebuild             |  32 +++
 kde-plasma/powerdevil/Manifest                |   1 +
 kde-plasma/powerdevil/powerdevil-5.4.1.ebuild |  70 +++++++
 kde-plasma/sddm-kcm/Manifest                  |   1 +
 kde-plasma/sddm-kcm/sddm-kcm-5.4.1.ebuild     |  39 ++++
 kde-plasma/systemsettings/Manifest            |   1 +
 .../systemsettings-5.4.1.ebuild               |  38 ++++
 kde-plasma/user-manager/Manifest              |   1 +
 .../user-manager/user-manager-5.4.1.ebuild    |  26 +++
 75 files changed, 1862 insertions(+)
 create mode 100644 kde-plasma/bluedevil/bluedevil-5.4.1.ebuild
 create mode 100644 kde-plasma/breeze/breeze-5.4.1.ebuild
 create mode 100644 kde-plasma/kde-cli-tools/kde-cli-tools-5.4.1.ebuild
 create mode 100644 kde-plasma/kde-gtk-config/kde-gtk-config-5.4.1.ebuild
 create mode 100644 kde-plasma/kdecoration/kdecoration-5.4.1.ebuild
 create mode 100644 kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.1.ebuild
 create mode 100644 kde-plasma/kgamma/kgamma-5.4.1.ebuild
 create mode 100644 kde-plasma/khelpcenter/khelpcenter-5.4.1.ebuild
 create mode 100644 kde-plasma/khotkeys/khotkeys-5.4.1.ebuild
 create mode 100644 kde-plasma/kinfocenter/kinfocenter-5.4.1.ebuild
 create mode 100644 kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild
 create mode 100644 kde-plasma/kscreen/kscreen-5.4.1.ebuild
 create mode 100644 kde-plasma/ksshaskpass/ksshaskpass-5.4.1.ebuild
 create mode 100644 kde-plasma/ksysguard/ksysguard-5.4.1.ebuild
 create mode 100644 kde-plasma/kwallet-pam/kwallet-pam-5.4.1.ebuild
 create mode 100644 kde-plasma/kwayland-integration/kwayland-integration-5.4.1.ebuild
 create mode 100644 kde-plasma/kwayland/kwayland-5.4.1.ebuild
 create mode 100644 kde-plasma/kwin/files/kwin-gstreamer-optional.patch
 create mode 100644 kde-plasma/kwin/kwin-5.4.1.ebuild
 create mode 100644 kde-plasma/kwrited/kwrited-5.4.1.ebuild
 create mode 100644 kde-plasma/libkscreen/libkscreen-5.4.1.ebuild
 create mode 100644 kde-plasma/libksysguard/libksysguard-5.4.1.ebuild
 create mode 100644 kde-plasma/milou/milou-5.4.1.ebuild
 create mode 100644 kde-plasma/oxygen-fonts/oxygen-fonts-5.4.1.ebuild
 create mode 100644 kde-plasma/oxygen/oxygen-5.4.1.ebuild
 create mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.4.1.ebuild
 create mode 100644 kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.1.ebuild
 create mode 100644 kde-plasma/plasma-meta/plasma-meta-5.4.1.ebuild
 create mode 100644 kde-plasma/plasma-nm/plasma-nm-5.4.1.ebuild
 create mode 100644 kde-plasma/plasma-pa/plasma-pa-5.4.1.ebuild
 create mode 100644 kde-plasma/plasma-sdk/plasma-sdk-5.4.1.ebuild
 create mode 100644 kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.1.ebuild
 create mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.4.1.ebuild
 create mode 100644 kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.1.ebuild
 create mode 100644 kde-plasma/powerdevil/powerdevil-5.4.1.ebuild
 create mode 100644 kde-plasma/sddm-kcm/sddm-kcm-5.4.1.ebuild
 create mode 100644 kde-plasma/systemsettings/systemsettings-5.4.1.ebuild
 create mode 100644 kde-plasma/user-manager/user-manager-5.4.1.ebuild

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index ce9e58574331..5ee507e31591 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1 +1,2 @@
 DIST bluedevil-5.4.0.tar.xz 126960 SHA256 cc5c10a76ac06732aa98e2beab1c0906d5afeffb3efb220d05b7b9d407f2cd4d SHA512 0086f8c4234860aa770e21e77484db65fe3c479e8a3061be4ada99d17d3108ad8acdb1eb273d378d64bce8835994f5ddd827f45e962f46db1098422e02d27f0c WHIRLPOOL 44b1756009539bf3184714bbfc7e4579e519b37a2b9263cf2bf701d07dc331c693cd9a677ff79f699f3f3b9b01af6f250d2f9aa3f99058a78667a64df34c674b
+DIST bluedevil-5.4.1.tar.xz 127920 SHA256 d8c945d9d9ca96323f26685c6d7ea55cceebd01b28b43ebcac8257815dd8c3eb SHA512 1b9e14d1f10ed840a3beb0a909ec891cc54ed01315bf0e1aaa86f4fe317e8b86d9304e7a8c5dd848e9ac73a6ce78797557f2621ed9b1563d7673b2a96db6f275 WHIRLPOOL dd84b91847f88e005d378399291181a63820b52678ecc52acfeb9cf6c7d5db5c9a5f767a1dda415365a45f28685080862906dff908f40c9023959dade8b29af9
diff --git a/kde-plasma/bluedevil/bluedevil-5.4.1.ebuild b/kde-plasma/bluedevil/bluedevil-5.4.1.ebuild
new file mode 100644
index 000000000000..8732f9323430
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.4.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime kde5
+
+DESCRIPTION="Bluetooth stack for KDE"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
+KEYWORDS="~amd64"
+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)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+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
+	!net-wireless/bluedevil
+	!net-wireless/kbluetooth
+"
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	kde5_pkg_postinst
+	fdo-mime_mime_database_update
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 5f4afc71dc30..8de7124f20cf 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1 +1,2 @@
 DIST breeze-5.4.0.tar.xz 36351532 SHA256 ad20ed013e789da2f434fa8c5d81e2d6775c9494b7a70b955deb5fff104aade2 SHA512 df87a1f3d8acf4ab58677e5c76d03f97697f8ca8599495a328c8dc69683ca1169e30ebad4355750144522b4d1a43fa836f6879f9dcd51782c4207d47cf8d72b0 WHIRLPOOL 48e9c0b2418201f283ecaa706c9037e92a737067c7e3d33c27c02ebc59bc7b1d84d05004d8b5d21bc41577171759f083132396317c07eddddfe0bcd31bd3fbc8
+DIST breeze-5.4.1.tar.xz 36349416 SHA256 d03f6443cdf3e49fd651f22c92ccc4b56e25cad63aecba3acca4fae123a82a37 SHA512 03a03d90d9d79145110e4a3a9e4df38c6e46d758b32db92224312a8ddb1566cbff7931effdd45adf6df6755bdc67bcb996bb87e0849be41084875128b45e9118 WHIRLPOOL 3f564187dc3de19ad77854c75c5cfb5dfc48dd54292d26881e0e1761466ec4fb49c1e316638e613b7a208eb67907c0228f305378bf0aeb9f13f3360932a91442
diff --git a/kde-plasma/breeze/breeze-5.4.1.ebuild b/kde-plasma/breeze/breeze-5.4.1.ebuild
new file mode 100644
index 000000000000..af8b5b21903b
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.4.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5 multibuild
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
+KEYWORDS="~amd64"
+IUSE="qt4"
+
+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)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+	qt4? (
+		kde-base/kdelibs:4
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/breeze
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=()
+
+		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_install() {
+	multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 7e5be6bf3e55..2671e8b8f890 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1 +1,2 @@
 DIST kde-cli-tools-5.4.0.tar.xz 484372 SHA256 f01bd52809e31b3239cb77e408d85bd8ad1b0544ddf0ff78fd9fac74e92a5d0b SHA512 ba5646c36df3da9b81586f4b95902d1df0f9eef49b434d23fc8e20f385808660ff7284b31c30a8174dfb4ff673115c20fe0f02e5c460c10784151762696dc0ef WHIRLPOOL ab2cec61135d71474bec965e7dc0d884093e5b480252e31eb5f7f1f3716905696685dfa061e9f45b712a53a7d9fcf6cf22a45fda0c7c77dba0729d240d47ad5e
+DIST kde-cli-tools-5.4.1.tar.xz 485124 SHA256 815d316c1f75ee0f84d7ca083e7552087a15bc567693251508ba80df21e26609 SHA512 82b4d2abd30070836e62fb9ddb644070d4d6d1c70d94fa9859996a6ab3af79e0903ee5f1b822ed5e4ece1b91bb90a02356a886301c5de65c050a7f88e49cf11c WHIRLPOOL a0d47e8a96583f9f8dcfe577c23b1e5fc61ffbfd42c1981ef38dc2b92cec3ccd340001a8796dfc2ce3d78dc01cf4957157ef4dad334e338ba5eecc31b4f23f34
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.1.ebuild
new file mode 100644
index 000000000000..97c65d957e81
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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"
+IUSE="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 kdelibs4support)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	handbook? ( !kde-apps/kdesu[handbook] )
+	!kde-base/kde-cli-tools
+"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index c2b0e68b705f..3cad5c8acb9a 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1 +1,2 @@
 DIST kde-gtk-config-5.4.0.tar.xz 143616 SHA256 7f7dbb8297bf94816d34ba7e8422788148b696f2332e9b8d850baec9d9a1e1e8 SHA512 bf413d8c8b4120ea8af18871bbc777e3cd25b6bc13f155aed5fc91f08ea0d5e915a19228e81a1b07798e103d3a5a156fd0e43ee60e1f6a2bae78a4fc306ef962 WHIRLPOOL 8e6b1ef5201b9e4b7443ade95817a3a8c1287d597974ad69c4c86494b497718baf2f4fc1514f33d52de69bfb0920f8dbcf0968ccf155ffa9a3ada44a7797df8a
+DIST kde-gtk-config-5.4.1.tar.xz 143912 SHA256 833191b74f130525f7b4e420acb9b7661b87ebb181bdc3d596ac527c8d8c063d SHA512 ff99bbfa03813e8f2674191208250600c68af55e3ebf2606adc048dd5d9ad23761d03995908eea534bc57b309e5753fb109784cffc33b5cabf26626fbdd0a437 WHIRLPOOL b086b05fdbda118fdec58c2d1629c6bcf3e68fa2335180115363a25523fec3fbf19d7b37bceca76c97c4b9186dde7c327f0c0af1c8a00d07ab6fd76a4ebbd368
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.1.ebuild
new file mode 100644
index 000000000000..4c2e88a3e25f
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://projects.kde.org/kde-gtk-config"
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+
+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)
+	dev-libs/glib:2
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/kde-gtk-config
+	!kde-misc/kde-gtk-config
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+	)
+
+	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 9fe8f39c466e..c599f8e072be 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1 +1,2 @@
 DIST kdecoration-5.4.0.tar.xz 33548 SHA256 924f61e6a1191902622141ada6548cf44922d62fdd1b9b8d5277db456cf3b153 SHA512 70526b6b482e7b6614882e5e4a093f56af9fdcb7597fa205903eec0323a7a441d7e68c35bc3314341812c286f7ccdab2fd4a65b938c90b55b71ddc94b4e679e5 WHIRLPOOL 001efdaa24d06a74d55d51db22f0d5bc34dbec0d607dc9633b2d4b87deca8e26a77c0fc8c562a3495341b15def8ac4a7dac85760bd936bdb631ad4dc0d466e77
+DIST kdecoration-5.4.1.tar.xz 33560 SHA256 db23b15a46356128fb68b8d44521c370e46cda17a71557348f1c96cec0025f12 SHA512 9722fc6606bc60a4c2b47df2a55774a977f4e0ae600eb9a4d03ac0fc514f4f10e7a456861939f3d37586f66471421e3fc9a47e5b83f56b44c22333eeda0feb6a WHIRLPOOL c18a7e4be19092e86ecb78288c3fd6b9d49a43c746d7c083328a0556e950c182af4e776970f4d86ffdae0ee89bec19a9e6f3f8ce17af90c765e62788fa63276f
diff --git a/kde-plasma/kdecoration/kdecoration-5.4.1.ebuild b/kde-plasma/kdecoration/kdecoration-5.4.1.ebuild
new file mode 100644
index 000000000000..2a41d59545d0
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.4.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Plugin based library to create window decorations"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:5"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index b58dfd835669..975094315cd7 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1 +1,2 @@
 DIST kdeplasma-addons-5.4.0.tar.xz 2073544 SHA256 46a8e31f4feb9b94ca5e4438369cc4cc4d86ef9535c55e9820b07e0f9f322fd7 SHA512 ba519ec69de811e7060c5a1145c85f9d7bce41a16502ee3895824737f2391d306c17f9e6d812542d0b6127820c5e21890ebdf6b83ca24087b5340ba678b4c94e WHIRLPOOL 5ce671ee1f2a5705a6c7de4dedca1d8e76ccf91ad75481dbb66c5691c64672dd3ff069de8defa050114b99506aca947f8ab124356d397ddd5eddb5b64d09caec
+DIST kdeplasma-addons-5.4.1.tar.xz 2074568 SHA256 e16de089c668d910acfc41a4449c529e1376b1e7600913df033469586ef8c53a SHA512 e9b1fa8bd4498aa814348deca57970617432e504c57bd2a1918473583dfda622dbd86d8a18fb1b0efab0533235e0641f5dd2d7dd3bbde3841aa244dcb0a3c5a0 WHIRLPOOL f6c840b16f257c2aaace3310f72468101cbb06ea7d60445464c22e02a8a628913d60d12d1f1f29f3530ea11731c7b420470ff05e8b7f9f919cc1881ae125085c
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.1.ebuild
new file mode 100644
index 000000000000..600440c6a40c
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64"
+IUSE="ibus scim"
+
+DEPEND="
+	$(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 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)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		dev-qt/qtx11extras:5
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	scim? ( app-i18n/scim )
+"
+RDEPEND="${DEPEND}
+	!kde-base/kdeplasma-addons
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package scim)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 1f81ded16f32..88dd9396864a 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1 +1,2 @@
 DIST kgamma5-5.4.0.tar.xz 58992 SHA256 1d937f86c4cb8d3ac7d2a47dbb7cf88d55743be1d172e6f5eeac907926aa50e3 SHA512 81949979092ac67c2766c902ac89eefc5ffb6a1935ee751f86024f86daea78ec77723a8346e6eea218ef89f1b7c07fda4367c680e51f6e58eada53c37e842e4a WHIRLPOOL 7f168b78348cc4392c9ad8eddbd38687d5c4400c3d71faf3ed5f0c092ce01f40595e0bc9e494b89d0fe5d7948e9dcf212912e50f52b7c7ade20c5d33292f975e
+DIST kgamma5-5.4.1.tar.xz 60332 SHA256 7be6dd9c99d4baca2bf85dbd881084b82334782a1d9a2f22fe54f644f9660290 SHA512 27d30c5adc6c4ed9b683262ea1f77fd6f0c77c5f1a9ea0cb5bcc3f08bfbae350226f79b12924363b75d255bfc296874544b0ea43cbcf820923add2c3b975cd66 WHIRLPOOL 489e65ce73c6214691f2504e21b5f575a64732a1ffcaab0a23dc1ae32f3160caf7508541ba6418fe1cbbb28e712e82e86e4d4b719dfaa21adce14f07c8d5c335
diff --git a/kde-plasma/kgamma/kgamma-5.4.1.ebuild b/kde-plasma/kgamma/kgamma-5.4.1.ebuild
new file mode 100644
index 000000000000..0407f4a714a7
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.4.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KMNAME="${PN}5"
+inherit kde5
+
+DESCRIPTION="Screen gamma values kcontrol module"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	!<kde-apps/kde4-l10n-15.08.0
+	!kde-apps/kgamma:5
+"
diff --git a/kde-plasma/khelpcenter/Manifest b/kde-plasma/khelpcenter/Manifest
index 98ec25614bab..fa79cd2624fd 100644
--- a/kde-plasma/khelpcenter/Manifest
+++ b/kde-plasma/khelpcenter/Manifest
@@ -1 +1,2 @@
 DIST khelpcenter-5.4.0.tar.xz 1800680 SHA256 8f4431198efe0ceded634b3b98ba744a6b315431a25be01b9e66d3fd84447e57 SHA512 b9a2cb216f329cece614d528bb791b164d5e2180cc4e05b3f5cb2fd8c44116b346f6c8318aa5a8e3a5c9d6fc0cf716d439d15742dfecabbf7ea75b95bf280a82 WHIRLPOOL 13a69ef11e6a1f4827eb84662e068d288ed54565dbe2145c257fc373b7d3c1403f3bc061abad155456eb97542a900de92abe0b556fccce9bbe26828fb22599c8
+DIST khelpcenter-5.4.1.tar.xz 1800432 SHA256 a9a78071574151a1edac0e0c89a97b55e7394cf2ab88ec7cbb92070585fd5a85 SHA512 034577eb132fa6306065ed78b58c5a2bb773036065e51f3f823c114aa5f5c35cad73a15e609010e9269410656792a5a7fda774e4e7d9a6107063ad220029f889 WHIRLPOOL bd5248e13c317f7d44b9ed053ec66d3fba743fb7b2d631e68e3977566b02afff5a1581d69a0decb5c9e98265f83018fea33adcea15bb647ae75d9a4e6139b2b8
diff --git a/kde-plasma/khelpcenter/khelpcenter-5.4.1.ebuild b/kde-plasma/khelpcenter/khelpcenter-5.4.1.ebuild
new file mode 100644
index 000000000000..ba58ac9dbdc3
--- /dev/null
+++ b/kde-plasma/khelpcenter/khelpcenter-5.4.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="The KDE Help Center"
+HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(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 kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/khelpcenter
+"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 2a63a9209c6f..068bcaa970c9 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1 +1,2 @@
 DIST khotkeys-5.4.0.tar.xz 607776 SHA256 e6a81b49b92189a01ce3204be1d5302abf676629dd7e8fb42f0ce5b9fead716e SHA512 73c5a7a1765bfd496bf2c247d4e370815af09c3de1b344468539309db98aa616ad9dec6cf093a945718b65cdab2885f88b106ccf56a7f4c482a2e27ac092d191 WHIRLPOOL 640e48cd7ae6f5ce2d6c4f48b623444f3eabfeeeacf75ed2487edaca8b53b39d540387b3816fe6394746d4d06f99546da0a0a89d9f4fd72252e58affbe72fc0f
+DIST khotkeys-5.4.1.tar.xz 606900 SHA256 a24ada4ad04c7b6ccbec5787c2a94bb7b938349fed74216c5388ac53c4719a1f SHA512 9a3091538496b1da5b3ad783b1d1ee86f1378e090956d2817dba1e4141efbdda1b25b73bb7d240a7a82d56f668a024b16a644724c7f0ca7d334c8900cece8d61 WHIRLPOOL 277c3330badec637347b225e3b02a7cb0d1fee2aa903d32ed379c114ebcbf76c98df6111d5bb4e9840f8e0a510c3eff2f14cc2f26b2c5c8f02af04fa26c92727
diff --git a/kde-plasma/khotkeys/khotkeys-5.4.1.ebuild b/kde-plasma/khotkeys/khotkeys-5.4.1.ebuild
new file mode 100644
index 000000000000..bbe764b59601
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE workspace hotkey module"
+KEYWORDS="~amd64"
+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)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_plasma_dep kde-cli-tools)
+	!kde-base/khotkeys
+	!kde-base/systemsettings
+"
+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 baa1c4d1b4ad..c31c7fac211b 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,2 +1,3 @@
 DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb47dc3229505abbac0c6 SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 WHIRLPOOL e161bf40c5e16180fa65217cb49314fb230c45329f4c518d6014083bd71da82d4aa048811ee814fde7fa300105cef16c182688445164ae84d0d700e23641b342
 DIST kinfocenter-5.4.0.tar.xz 1130700 SHA256 cb7af02fc44de84b0373b798bbfe7df983f6713d0a793653f72db8457413bb66 SHA512 b9f6c1f9a88ebe05b8157d9b6e7da31ee2843b83fae0bc9b3b88a732941211ae8eeefbef5c87de07881f3c289f29691b124b43f58e37e8a0eb71bc3f7ba3a2a6 WHIRLPOOL 401609e5edfe27c44f80ad1d687d84684ce991df4ea2fa6d126dead768d6ba439af9d22b89d2e9d9afec41de496f3b4eda7fcdf0b97096b10f8a3dc44bcef247
+DIST kinfocenter-5.4.1.tar.xz 1130900 SHA256 322f486586bc57b28aacc14db4bfd73aeeb484da0c1006d25964ab11f154479e SHA512 83f201c6fd94d2d9e7b17754c52bc03be75b192dbe3a01d580da8305558f00380e9106dfe7716c8a62a2688970c4236306d936a62889a2180679816cf9dcca7a WHIRLPOOL 4eee81d8b8c2aea88ae38953886694e5ec1d63325c044490cb8cc4a828551dd53bc7ef971c8a013d7b3f753c031addf7a3132c7a692d2bca71ac66efdc09802c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.4.1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.4.1.ebuild
new file mode 100644
index 000000000000..4ac9dea44ce9
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.4.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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"
+IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland X"
+
+REQUIRED_USE="egl? ( || ( gles 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)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5[opengl(+)]
+	dev-qt/qtwidgets:5
+	gles? (
+		dev-qt/qtgui:5[gles2]
+		|| (
+			media-libs/mesa[egl,gles1]
+			media-libs/mesa[egl,gles2]
+		)
+	)
+	ieee1394? ( sys-libs/libraw1394 )
+	nfs? ( net-fs/nfs-utils )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pci? ( sys-apps/pciutils )
+	samba? ( net-fs/samba[server(+)] )
+	wayland? ( $(add_plasma_dep kwayland) )
+	X? ( x11-libs/libX11 )
+	!kde-base/kcontrol
+	!kde-base/kinfocenter
+	!kde-misc/about-distro
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep plasma)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package gles OpenGLES)
+		$(cmake-utils_use_find_package ieee1394 RAW1394)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_find_package pci PCIUTILS)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	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
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index a9c5da60faa6..7e600607af09 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1 +1,2 @@
 DIST kmenuedit-5.4.0.tar.xz 441424 SHA256 d82263c69e9b7160d87fcf7ce598e1481a5b3b53ab8149fc82d933b131dd6e8e SHA512 7b81963425b691988688f03a28d01e895add289730b05df14811e17db7c29839b00a11ff1d30de2e17e591cf7e8942c70c29b69f080f7bec7e3abd6ecde6f0d4 WHIRLPOOL 0dbe04a4c91cc7bbd4bd872ca3168c6827f6f7bb0543126f1c023d53b9e0f0000fcae41ed84ab9f536096ddbf598cb2ebdf2b8c94337d1375cdd0b8c994ee903
+DIST kmenuedit-5.4.1.tar.xz 441332 SHA256 b5581bf720ac11d533504ce7c51766a9225e39efbeece111aa7e70a7a7d91fc0 SHA512 9d4cfb4e47d399a224798f46160224906ef94c67ad5ba44cc2991a03bef1d35673592a2773cdfbbde439b34d4ebe93158597eb2ddbab4dfd4d910f1e37671532 WHIRLPOOL 2d4a510deb73601c803e4399a98075335e4e0d0e201968be0fe25c5f238ca2fbaa004083ef89d00b93d5d8c365cbb41faf57293e39f0fa5ac38a22fa734f22b5
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild
new file mode 100644
index 000000000000..34792b5bff2d
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE menu editor"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kmenuedit"
+KEYWORDS="~amd64"
+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)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	hotkeys? ( $(add_plasma_dep khotkeys) )
+"
+RDEPEND="${DEPEND}
+	!kde-base/kmenuedit
+"
+
+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 4340810f7df2..201e6d20b82b 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1 +1,2 @@
 DIST kscreen-5.4.0.tar.xz 99464 SHA256 a587ef8c827f8b741f9d2414c8fe04ad3d5863aef36c5b0a6680f965341b5b0f SHA512 db4f2e6da9564db87581a97ed511de03b1a63363d4e4867e3496e0f94c6b4122c86e6f0308fca93f96543314f2d67c2a71020e8b38592721b80c9438da82ac9a WHIRLPOOL a8d2ddab94d8f9b5889816a7330a16f24d26fd5da40c87dd5b6d3f1ae3d6fa2f5a870a366e8d355b98d38a63fd0a93f7b44f5c57d68540cdd2c9f4d875ab226d
+DIST kscreen-5.4.1.tar.xz 99632 SHA256 9b49b754fadc5268529f2397f86b62484ad25cbd4e6e5df0a4130adcb20c6b02 SHA512 a24fd73c57adf61e5eb13328e6d96977e0981bc98b4b65b7a22c6447c4115f0c512525c7ad6bc0e98861bd8fcac44cca3f9fe742167ccb67ba77071d025277eb WHIRLPOOL d590ebe8b9fbca49a78d67cc6113f0aca8a81c7c11d83d41dce43c7e6a7bcdf593e6abd526988511964f62dfee2531dad2dd447fc58a35381cd5f05e3154d999
diff --git a/kde-plasma/kscreen/kscreen-5.4.1.ebuild b/kde-plasma/kscreen/kscreen-5.4.1.ebuild
new file mode 100644
index 000000000000..cb9921b686e5
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.4.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="KDE screen management"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
+
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_plasma_dep libkscreen)
+	$(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)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	dev-qt/qtgraphicaleffects:5
+	!kde-misc/kscreen
+"
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 1dcb568d8c6c..2ce87fdbba53 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1 +1,2 @@
 DIST ksshaskpass-5.4.0.tar.xz 18968 SHA256 5379415c581ec8cba356d1b18549b127096d30dfe685556389752f8fe2b802c8 SHA512 5a72539ebef21495c8d1be3d3093e232122a307c38ffa3d0b3357311fecfe5f8921c57faf6d6d8abd91604eb681f954b19fe51b8d09ea5a0f48fd24497d6b138 WHIRLPOOL 86246b18ff27b6563e4b994f80a998900c9281a574f55378bee38caaf532cc737a54da6ccdb799631da5541163eba6f3cb1aa21eca4eaeb2df3adb29ee5f2ebc
+DIST ksshaskpass-5.4.1.tar.xz 19168 SHA256 a24840cdb02464268cf81b341f2daa3f9c8c3c45aad9a256a349954c2e3a57fa SHA512 3d3f5cab66d745535462602d7e3b25c0f993a17b7ffb56feb01d77486d48ba5cc78fd3a19226679ca75fbd60a0f7e2d04bd31348c383fea58d5bd73cdb1acb87 WHIRLPOOL 00af6edd0a78e3c64e8b8511d4b83943e66628f9a99fe76383d4aee092231769354e1abaea4dd9e7e0a91d1c1cf584fcf6b2b654ca4958067b758fbc8666d459
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.4.1.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.4.1.ebuild
new file mode 100644
index 000000000000..62b2d542d333
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/ksshaskpass"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+	!net-misc/ksshaskpass
+"
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 25a9005bcfea..969ac34d2fa5 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1 +1,2 @@
 DIST ksysguard-5.4.0.tar.xz 481068 SHA256 ae380bd85d7677fb7ca31250e31d6b533c44341752377b72872ef5efb6e2009c SHA512 d0451334b34155d2f62816352e2c7542ea4dbec4a3360ef8017e41db722e95d397366596c3fdac816fdccc7577ce5d7d86c9b71c8769bf858d5fd3f7d584058a WHIRLPOOL 918c341f5a6aebd959393b36f810594a66bdf39859438e2c2e000f2ddd095c74ce2c14dae7d09958d8c9345dfdf967813338b11b1abdc911839dfa13b1e48c68
+DIST ksysguard-5.4.1.tar.xz 481028 SHA256 d25df668c256c84f466194e2ff5a75f656437d5bbc98d951b6dd44527a6b3ad9 SHA512 9c910d06d52a5ca3b508eef5f7d64dd372f5758be6e25f50cb99d91c0658a2127a05a03a8784dd0d1a5d1d5ccdc06a9a048b3726b57270a3b7cb17588278782b WHIRLPOOL cb01b34876753a8ad0285762cb1135c43f05b88a38a4081fa02d51c3c167840eb6600db3dbca34c6c30dc65cec47e77725ca9b62d8924fec11390f3479332367
diff --git a/kde-plasma/ksysguard/ksysguard-5.4.1.ebuild b/kde-plasma/ksysguard/ksysguard-5.4.1.ebuild
new file mode 100644
index 000000000000..8079db0a13da
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Network-enabled task manager and system monitor"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64"
+IUSE="lm_sensors"
+
+DEPEND="
+	$(add_plasma_dep libksysguard processui)
+	$(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 kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+RDEPEND="${DEPEND}
+	!kde-base/ksysguard
+"
+
+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 d977e054da8e..e34140f8fb82 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1 +1,2 @@
 DIST kwallet-pam-5.4.0.tar.xz 15548 SHA256 2c32c7e471f802ac959ad5f24279f2583f79e82944411ec18c26a08f1e94b1bc SHA512 16573a8b351cfab222b2326ac125738d367e7c750e6df20e80f151ef21fc7ffca91c52e4f5ab2b0c6de5bfdeb933a114d124a1c0e47524786c6709d41dc50537 WHIRLPOOL 55d79f444b0c49dfbf3abb21cd42d74c03ac24f3d39dd9fb918913008f9e7fc33a7caaadcb0bee52781e12ccae49d837e1f3c6d882960ac6ad93d18d27f8b6db
+DIST kwallet-pam-5.4.1.tar.xz 15544 SHA256 6c2664c04baa52b5e6141b9514ee3367b904e24c52b08f5b7c48d6cb48162b79 SHA512 b9e0d14c9bc5de926731cd4b4856b02fe26a84c0722242e4f9878d6c07e867925f6a18f0302241806a1df40a0a5693fa0f1d6a4a9664318c0e06321ac57db2bc WHIRLPOOL a41858fa2ccbfa5d574a3031cd8ced7998d325ff0b93b0543c9b875de444c8386c133a46bb870e015ffda51c58c7eb29008b05d08b5a4d6cf486a4c63bae1067
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.4.1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.4.1.ebuild
new file mode 100644
index 000000000000..6e1b4f05cf2a
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.4.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 3b806daee39c..8b196fa357d2 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1 +1,2 @@
 DIST kwayland-integration-5.4.0.tar.xz 13996 SHA256 86d400b4b0268ca6592f4eb0d0460d1dc47caea35fc6dcf74a2663ff9ff26d66 SHA512 ee44bb72d287a25ecbf53aa06c161b0011bed6fdd3b33d0fecf00a1ebfbc62fb0008d0fb2fa3bcd8259629b2d7e33feddf52dfde47b0e817b0b6954e3ab04f6a WHIRLPOOL 9a5aeed95d0160de08aeab574fb7a8050a4d201936032f45b7781f11a34780c59019a3e348facb9cef34cbd6b6ef49be440011615f5ebbef12a6018a7a014904
+DIST kwayland-integration-5.4.1.tar.xz 13996 SHA256 a7edfb16ea6363f5a3da8b7e3a448cb01eb9a984262b44e2caf9b0ffddb29bc1 SHA512 c72d19fe479dd374222c588d33cd1318a2a748761029773a7ea1b967c76d9c7c123e642ce22d74fadcf223fa4d845ce4237e034433735179b7994dcdd8df132e WHIRLPOOL 7c93a266303d403b4020076fbf9b4b172d8b647d5f54759caa68f0975dc98a8c27614b8f8e6fde0883b59f2e8c1bb2f5653e7df2c1a99092540cd21ff7703da5
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.4.1.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.4.1.ebuild
new file mode 100644
index 000000000000..c21a498bccc5
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.4.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kwayland)
+	dev-qt/qtgui:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland/Manifest b/kde-plasma/kwayland/Manifest
index 7acc1a1f4079..16722a711f2c 100644
--- a/kde-plasma/kwayland/Manifest
+++ b/kde-plasma/kwayland/Manifest
@@ -1 +1,2 @@
 DIST kwayland-5.4.0.tar.xz 111616 SHA256 7730e8f2bc77172a89987c4ec59de6e8bb454cb1524beac53a9b19ee7f09447b SHA512 3e2e37013ac0fce6fd0f23e86d9cbae4d9b8f14a9d8cc1d2cdc4fd6bc4894452137a3263eafc6e5785b23834d54f9cf5899fbf37b64437ce304d6b067b748739 WHIRLPOOL 3931b0b39e41a358e2f12d6c3bf82138a9ce6f4d37f19ba57b1c8f755fc4113cc00de985ad2dbf8d76d63764494c17bef345c1e90bb5a960731ed606d6ee1249
+DIST kwayland-5.4.1.tar.xz 111640 SHA256 cf29f72f4d6b0f7c71a10e8b2f70929f1b37321784508a95148cd89d18323c47 SHA512 3f0e54ae20f0676f4becedec3b747d588eef0935875c78085e9243465dcba196550b6261f5865eb73956e89133a532ffe589f56cb2d245dc57ca83024b6a5eec WHIRLPOOL 1f48a11c94cbdafed2778f57151aa3a9cf142a34e108275187b0421f550e5bad70ec169d7c8862eb0d9690b353d751e5f013a392a1b326f68fb771723e2eb225
diff --git a/kde-plasma/kwayland/kwayland-5.4.1.ebuild b/kde-plasma/kwayland/kwayland-5.4.1.ebuild
new file mode 100644
index 000000000000..2c261168e27d
--- /dev/null
+++ b/kde-plasma/kwayland/kwayland-5.4.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/wayland-1.3.0
+	dev-qt/qtgui:5
+	media-libs/mesa[egl]
+"
+RDEPEND="${DEPEND}
+	!kde-base/kwayland
+"
+
+# All failing, i guess we need a virtual wayland server
+RESTRICT="test"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index ad4c456bc617..6832730e08ea 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1 +1,2 @@
 DIST kwin-5.4.0.tar.xz 3782816 SHA256 81f0caced49288f38ef1b34f70d4f62f4f261bdf57f6875631ec1017cfd6c7d3 SHA512 877df9dccc57e7c09d526f42ba7e53c27787a7070fb20a3cc0fa31e533ccaa5f233de5469cd96f57cca3ff334e5e22cc6431129637f0b070be9d83e484a82ade WHIRLPOOL 8691f410e2e57711e37faca7c815351883104c5ea30591c1c62b19e51f5793fd5af90a01144c2eef8bfbd5191b9d003b6dbe10d1cf86131e7103204f7808ca34
+DIST kwin-5.4.1.tar.xz 3783308 SHA256 9cbeffd3dd2abf8ab05a65d71f7596f2d536b882914973eb77f3f44df92da957 SHA512 d2d0fbe4e8e1855e31ef7ce74a613e8a6e6ccc9dd3ba0f40c70c6c0a36110ab42c082c49c1fa8c3b6abb7093c916af966555e737d09d722d1745b530a11da55a WHIRLPOOL 021fcbbfc825119ebfbe7c2b42270cb0cb992ca0e23384c6f5cfa6c261200935826a6dd42cee316d1f5773cff30f7f31394977aee173449cd2c76644f0ab5fe9
diff --git a/kde-plasma/kwin/files/kwin-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-gstreamer-optional.patch
new file mode 100644
index 000000000000..d9ace476f956
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-gstreamer-optional.patch
@@ -0,0 +1,15 @@
+Disable the effect video button if gstreamer is missing.
+
+diff --git a/kcmkwin/kwincompositing/qml/Effect.qml b/kcmkwin/kwincompositing/qml/Effect.qml
+index fcd5e8a..2331da2 100644
+--- a/kcmkwin/kwincompositing/qml/Effect.qml
++++ b/kcmkwin/kwincompositing/qml/Effect.qml
+@@ -144,7 +144,7 @@ Rectangle {
+ 
+         Button {
+             id: videoButton
+-            visible: model.VideoRole.toString() !== ""
++            visible: false
+             iconName: "video"
+             onClicked: videoItem.showHide()
+         }
diff --git a/kde-plasma/kwin/kwin-5.4.1.ebuild b/kde-plasma/kwin/kwin-5.4.1.ebuild
new file mode 100644
index 000000000000..f22f22da5b06
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.4.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE window manager"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64"
+IUSE="gles2 gstreamer wayland"
+
+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 kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem X)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep kdecoration)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5[gles2=,opengl(+)]
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/libepoxy
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	wayland? (
+		$(add_plasma_dep kwayland)
+		dev-qt/qtwayland:5
+		>=dev-libs/libinput-0.10
+		>=dev-libs/wayland-1.2
+		virtual/libudev:=
+		>=x11-libs/libxkbcommon-0.4.1
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
+	!kde-base/kwin
+	!kde-base/systemsettings
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	media-libs/mesa[egl,gles2?,wayland?]
+	x11-proto/xproto
+	test? (	x11-libs/xcb-util-wm )
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wayland)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package wayland Libinput)
+		$(cmake-utils_use_find_package wayland UDev)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 6fd4d8023bb7..9872029785d0 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1 +1,2 @@
 DIST kwrited-5.4.0.tar.xz 19476 SHA256 7a2ccd8e2d2ba8625c3d25132027248536aaead3249c741d87ac9bbc3c098ff4 SHA512 5ceb2d7bfd61593cb1ec0101e1f96b89db78433fc3a841c7fb8b5d90be917a37b9a02fd2055c696ffe55d1ac85c5e1a419f7c639c32f08c078d2c88943ec149c WHIRLPOOL 15f72722a5811d42ac62d38f495dc0d6b9aafab3ba3bde1998bb87b8e4808d5685154b79bf1c5620ccf748cbe90f0b6c443dd819d32943100cc74da715ab5f8d
+DIST kwrited-5.4.1.tar.xz 19472 SHA256 3ab7a94c180bbe8e929cfc4b52202e48f7cb3a890c82ec7fade305e7357a2a78 SHA512 31dc15eefa8d1e24a67e3066330434deaab2e7287fafda586a95518131f288da5448436ede63e0ad425a04088d65d72e05232d09e69e07a0ed3173d1d0282326 WHIRLPOOL 8e07b3798e3ab419c747bd64976b3494b6c268a59f47f89145da1178d6a284e03f53a973bb51f4095df0f343aad8555c70c5c0237d80869be72e69301e92cc7b
diff --git a/kde-plasma/kwrited/kwrited-5.4.1.ebuild b/kde-plasma/kwrited/kwrited-5.4.1.ebuild
new file mode 100644
index 000000000000..c4cddd228233
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE daemon listening for wall and write messages"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpty)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	!kde-base/kwrited
+"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index e44b260b24f2..7eb39cbc31b6 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1 +1,2 @@
 DIST libkscreen-5.4.0.tar.xz 72224 SHA256 927af891cef0849f8a7a6012c017f2272fb715d87d3311605aacd3416d8d40e8 SHA512 9c01525c788e93cf2ac3ddb48099b1a61b09236e9738d17ea4786ba999d89c1c3ee617ee43f6e579477a554d1b19e8987019d3bc42b2fa61f8aee89c20a96aba WHIRLPOOL 72f54cead04f4d885807ef3d011b35db6165cbf932b17b09651aa9dab093dc236f07b24b43f783eb0b771385dd6e91b7c6dbee1113d915b476e6965a6bf2ea25
+DIST libkscreen-5.4.1.tar.xz 72268 SHA256 f96cd275da7cc6b9b4c2be6b8b0ab3cfd81fa0aec8784675030e4ac52620a31e SHA512 adb34aade27d648cbc9830e825898a628062e46e8dffdc43ca2c25304f111b987acb62673f4ca5efbcc22c03c2375e069900edb47354414119447bed29f9e23a WHIRLPOOL 4e7cfffe488bece1be5dc1b9dd331d9dd0015ac037789fa67aa718f3c6f5393dd35c15ef4730bb053f18123bf8c2c535fc01ded4d10fcb623256c8de01da2fa5
diff --git a/kde-plasma/libkscreen/libkscreen-5.4.1.ebuild b/kde-plasma/libkscreen/libkscreen-5.4.1.ebuild
new file mode 100644
index 000000000000..b7669aafa3cd
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE screen management library"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 458b2c40e6b1..1974ca71b39d 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1 +1,2 @@
 DIST libksysguard-5.4.0.tar.xz 561356 SHA256 08fe41edd2b918e0fc02cc455df30f31211d851c04954232b61fb2340c65efa7 SHA512 23397fe95ad81479417dd063d758613cdf3d02ac9c738b3ae3ef6e9b21a47948be08c3420ace7130a09d5113ff3366884f41cb721d777197c40b8b3140d5bdbb WHIRLPOOL 119faa26c588dd1df00f262690abdcdf21182f42c4f0319a1e825aa45affec46e44a99601e75f11f4b23be5080f03cb2ee33dbcae30a46af877910f3ecda1579
+DIST libksysguard-5.4.1.tar.xz 561368 SHA256 97879f5bd72e195c4a6c78c78a739d68d94d33a1379f5ab736a2db25ac766e0f SHA512 94b52566a9445102b9ab28b05ca841601868fa2e5ee7eb709f8ce3442a4afb4030fb2219af02ebec624b23ad84e415d97d7d4b24be2617e183400bb4053e3165 WHIRLPOOL d58152592a205fcf9cc1e3006a1661f6bb68d8b2c8e7d826ce8fe0b2804b7643b7185c48ad02256ed8a301326d5dad835b6af91f303a9a5a17fcd220fba9a3cf
diff --git a/kde-plasma/libksysguard/libksysguard-5.4.1.ebuild b/kde-plasma/libksysguard/libksysguard-5.4.1.ebuild
new file mode 100644
index 000000000000..2eb9ccd7bca7
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.4.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="+processui 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)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	processui? ( dev-qt/qtwebkit:5 )
+	X? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-base/ksysguard:4
+	!kde-base/libksysguard
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep plasma)
+	X? ( x11-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package processui Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 3d57437cc786..2c10324481e9 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1 +1,2 @@
 DIST milou-5.4.0.tar.xz 51172 SHA256 01df5524bf57eb6869f7fbb793fe29d9379ee30dc4300d168aaa1527bd7bf152 SHA512 369015fff8acacf1a7907fd91ce9aa2d19c1dbb96a774f129a8af783d8586fb53cdadb44366ad62d3d53a57e91ddd7b149a682e657a2a07041db1a916658c726 WHIRLPOOL e1d5e06e6a0f1363b24c73b75c60535f96b8197bdd8486e626b575c707c0a353a91e53263f601d5c5ae253c2402b48bfbed4f143f8ef0404525993d95f0a4b9e
+DIST milou-5.4.1.tar.xz 51152 SHA256 dd633ee2e71fd0afe9d173490f96b1cc8a928d518a8f441fa848fd891a494c58 SHA512 3f9ac15bb189a34c87e7681889d51aed57104bdf583c15f1b6dd6589a94759afe57169a756fd3094710e6b4cc0b9c8f155dd2e9cd32bd292b6b0a716bfd36c59 WHIRLPOOL b4b3dbb39f1724c75ef13900808223e0ed07e5a109f3d02b602b1ca29fe42da55ba138ec8b1f3e03d9088f175c376806f5ed2ef48f528aebe1c733389b065ca7
diff --git a/kde-plasma/milou/milou-5.4.1.ebuild b/kde-plasma/milou/milou-5.4.1.ebuild
new file mode 100644
index 000000000000..c1ce614ecced
--- /dev/null
+++ b/kde-plasma/milou/milou-5.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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"
+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)
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	!kde-base/milou
+"
diff --git a/kde-plasma/oxygen-fonts/Manifest b/kde-plasma/oxygen-fonts/Manifest
index e68c8baa9df6..cd38ff79232c 100644
--- a/kde-plasma/oxygen-fonts/Manifest
+++ b/kde-plasma/oxygen-fonts/Manifest
@@ -1 +1,2 @@
 DIST oxygen-fonts-5.4.0.tar.xz 161780 SHA256 00d808f9f5109d1ed81f45ae32f2cd2d56318e97edca730a32ce0281ec5c2f98 SHA512 90f45d8f392abf5f4a7b3910f381e51ca1636361b4cdfb026023f17269a209fd11ab3583da3da6cda6120204f5a60d19f103cd3c135d39b1f50c4c3dfd7c9f02 WHIRLPOOL 7eccb51fd7be2e173400b7aaddd8df993ded974bffeed4be1628fb5c7bd90a43610bc2424eabe3e32d58000451239b9b1ccc7c26b1730a8815ad601aaa871df0
+DIST oxygen-fonts-5.4.1.tar.xz 161696 SHA256 db6ccaa7ceaf7e93fe24986d3794a74dccf255aff93ea131ad67ecf3317fcb63 SHA512 772499803cba8cdfed6dea7f95afcd6c5bae0fffd6fcbb5907d1c8625ef9b98224bf1f87e0b0adc72478e5942f8577fccd75f011a6a045c901684a017b567200 WHIRLPOOL bebb163d50764306e7e7f43818a239cb9d7cfa216748a5a8ec64a0ceced4244058d2e50fba826af89dbd186435aac3fe35e0556bd3e387d74c7f0fe395b24ac1
diff --git a/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.1.ebuild b/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.1.ebuild
new file mode 100644
index 000000000000..fd95230a7414
--- /dev/null
+++ b/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5 font
+
+DESCRIPTION="Desktop/GUI font family for integrated use with the KDE desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen-fonts"
+
+LICENSE="OFL-1.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	media-gfx/fontforge
+"
+RDEPEND="!media-fonts/oxygen-fonts"
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DOXYGEN_FONT_INSTALL_DIR="${FONTDIR}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	font_src_install
+}
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 17d5aa37a1ae..bff4572fc7ae 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1 +1,2 @@
 DIST oxygen-5.4.0.tar.xz 4506232 SHA256 de5e0ee8491db19c4483936499d6130757336b8d82de2c929781cdc684853efa SHA512 c4ca11366f14c13426977327a2ff16955088ee2616065b1d5dd2d4c3a066f8daa4c91f74c08d46bcb84fd5b403265619f26f2fafffdf6d6a309c3cafe7de5de0 WHIRLPOOL 5c8dc0492846870e1d8852891f956cab99d8dc7ec6128a0fa6aa1a453e92c4e2ddfc5268596d37d7361fe1e9c8e21f03948288bfa06dfc57e637afba1c4ac822
+DIST oxygen-5.4.1.tar.xz 4506548 SHA256 374cafa11066095c41e6e76b7a84cd0f4f61b34e8d6f042e668bea88aa040829 SHA512 bacd383be997b381c1ea2b359370b52f9f6976ea7b13ffc06ac711c1fcf54b4968b420631be54ea9049fab3d522bb794b2d58d3818b0e2abdca3d87b62266f3c WHIRLPOOL 0272cbee52e7b4f7dd458bc040d66458b5136dceb8009d0d8e940a0ecad145f99016534bbed2b7941b4ccc52df1033c6b2cc7f25c60cd4a626e109e068f532d8
diff --git a/kde-plasma/oxygen/oxygen-5.4.1.ebuild b/kde-plasma/oxygen/oxygen-5.4.1.ebuild
new file mode 100644
index 000000000000..31323e430171
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE window manager theme"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	$(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)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+	!kde-base/kdebase-cursors
+	!kde-base/oxygen
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kservice)
+"
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index a36592b73c6e..f422529605b9 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1 +1,2 @@
 DIST plasma-desktop-5.4.0.tar.xz 6270020 SHA256 21e2f2651cf0e63ddebec38f3c490a38cf7606de9ef978ed9bad148c5c659160 SHA512 f4ac0f773fd110c004502f4b063816bd265f3de99ed39ce844baaebb50852e23ac1d36396f76f1c7b4552aa6ca83607d2a6f02827f05ce2f373f42ed93919b11 WHIRLPOOL 56bc4235dfb95049356df5a09df744352ad75f763168dfb7aaea19a66c8147943f54c4df0c4bfcbd5acf7f63fb6668082f8f359479fbafc9639d6e656f1a64e7
+DIST plasma-desktop-5.4.1.tar.xz 6271644 SHA256 58321f79538442e5786ae1884abc66929aebf69cfc3397dcad5a84e92ba572a8 SHA512 e2f6df6ac899ec5c10c106b3d7a7eac0cfa45896371cbe0a832e4891d2218745b14a9e19c8f398cba261d304a66471eb23cfca7602338cd7b96d104780ae6582 WHIRLPOOL 5507542b2969f8067a9546b2c112af857ffb7ee2e6a1aa6d6f02a53c49e84dd4034d7eda8bf59d2a7fbb028db993ecc9ca6c523617006b8c7656993895508350
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.4.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.4.1.ebuild
new file mode 100644
index 000000000000..cdfda18b5e13
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.4.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS="~amd64"
+IUSE="+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad"
+
+COMMON_DEPEND="
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep plasma-workspace)
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep baloo)
+	$(add_frameworks_dep kactivities)
+	$(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 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)
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/phonon[qt5]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		media-sound/pulseaudio
+	)
+	touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep oxygen)
+	sys-apps/accountsservice
+	x11-apps/setxkbmap
+	legacy-systray? (
+		gtk2? ( dev-libs/libappindicator:2 )
+		gtk3? ( dev-libs/libappindicator:3 )
+		qt4? ( dev-libs/sni-qt )
+	)
+	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
+	qt4? ( kde-base/qguiplatformplugin_kde )
+	!kde-apps/kcontrol
+	!kde-apps/kdepasswd
+	!kde-apps/knetattach[handbook]
+	!kde-base/plasma-desktop
+	!kde-base/plasma-workspace
+	!kde-base/solid-actions-kcm
+	!kde-base/systemsettings
+	!kde-misc/kcm_touchpad
+	!kde-misc/kcm-touchpad
+	!kde-plasma/kcm-touchpad
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-proto/xproto
+	evdev? ( x11-drivers/xf86-input-evdev )
+	fontconfig? ( x11-libs/libXrender )
+"
+
+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 evdev)
+		$(cmake-utils_use_find_package fontconfig Fontconfig)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake-utils_use_find_package touchpad Synaptics)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-mediacenter/Manifest b/kde-plasma/plasma-mediacenter/Manifest
index def987cbdbc2..65f4f3b81c9d 100644
--- a/kde-plasma/plasma-mediacenter/Manifest
+++ b/kde-plasma/plasma-mediacenter/Manifest
@@ -1 +1,2 @@
 DIST plasma-mediacenter-5.4.0.tar.xz 157864 SHA256 62dfd4de58c56629ffb00ef7dea173c482bc3263039d9ae46c1201427e1b5a8f SHA512 8e4b660d88e2a8c932098efc93aa1e396434d61067b6a1b566b42bfbf9d71fcb0e3937002384d1ab6955a8383c701275cfadb284a8382ef66880848ed115df23 WHIRLPOOL 2a3de94a14454ab60718998017601fe5685511efc6bb78c81249cd9f944ff3e13c10dab3a9a565d5dbcf028da05036226b6ff1ae802e1f7ed95ef8d223cc5b8a
+DIST plasma-mediacenter-5.4.1.tar.xz 157940 SHA256 fd2e54dc43fb436d6d823b8e171174397f0a9f20e02fdff5392c0e643d94d5e6 SHA512 cf481d06ff51ba6512c766955d4ada025c67081baceec9725f1cca02f39e76248ea1271e325592e2c0284b438be7abd6c91aa989859114874f5f32c3ac496b64 WHIRLPOOL 5bb68f8dab0dfeb0f35fc6f20e76d3cf29087cbf806a65ad460eae029d86fee55956d8a1ba2ec9edf420e567ae372a2e9c7032abe967c5c831dd2a39f38df751
diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.1.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.1.ebuild
new file mode 100644
index 000000000000..c6b677ca2c84
--- /dev/null
+++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Unified media experience for any device capable of running KDE"
+KEYWORDS="~amd64"
+IUSE="semantic-desktop"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
+	media-libs/taglib
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace)
+	dev-qt/qtmultimedia:5[qml]
+	!media-video/plasma-mediacenter
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetadata)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index c4338d3be475..ae0907f3a8de 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -4,7 +4,9 @@
 	<herd>kde</herd>
 	<use>
 		<flag name="display-manager">Pull in a graphical display manager</flag>
+		<flag name="mediacenter">Pull in <pkg>kde-plasma/plasma-mediacenter</pkg></flag>
 		<flag name="sddm">Pull in the <pkg>x11-misc/sddm</pkg> display manager and KCM</flag>
+		<flag name="sdk">Pull in <pkg>kde-plasma/plasma-sdk</pkg></flag>
 		<flag name="wallpapers">Install the KDE wallpapers</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.4.1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.4.1.ebuild
new file mode 100644
index 000000000000..1ce4ad27078a
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.4.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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"
+IUSE="bluetooth +display-manager gtk mediacenter networkmanager pulseaudio +sddm sdk +wallpapers"
+
+RDEPEND="
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep kdecoration)
+	$(add_plasma_dep kdeplasma-addons)
+	$(add_plasma_dep kgamma)
+	$(add_plasma_dep khelpcenter)
+	$(add_plasma_dep khotkeys)
+	$(add_plasma_dep kinfocenter)
+	$(add_plasma_dep kmenuedit)
+	$(add_plasma_dep kscreen)
+	$(add_plasma_dep ksshaskpass)
+	$(add_plasma_dep ksysguard)
+	$(add_plasma_dep kwallet-pam)
+	$(add_plasma_dep kwayland)
+	$(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 oxygen-fonts)
+	$(add_plasma_dep plasma-desktop)
+	$(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? ( x11-misc/sddm )
+		!sddm? ( x11-misc/lightdm )
+	)
+	gtk? ( $(add_plasma_dep kde-gtk-config) )
+	mediacenter? ( $(add_plasma_dep plasma-mediacenter) )
+	networkmanager? ( $(add_plasma_dep plasma-nm) )
+	pulseaudio? ( $(add_plasma_dep plasma-pa) )
+	sddm? ( $(add_plasma_dep sddm-kcm) )
+	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 15a2be4cf4c6..d6a7ce2316bf 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1 +1,2 @@
 DIST plasma-nm-5.4.0.tar.xz 547376 SHA256 127b4eb083f1ca65fdc35a1f3d5db0549a49c85cdc1a0b81375863956cdb8194 SHA512 a2659ee727b1ca29cda98c04e2c725c4434f6059c53d086f8bc3310fc6770c4207df8896ed7830e1e43dcb9099b719985e7c4a7af658698e6df90b9d4d78f012 WHIRLPOOL 045f1b40bb0948e36da88fc4cd1ce945a966058ae44ca13350a16295a76ea47018275ec98f04dec2717c3936582b8f54fc2c35a4a07679244f2055032f35f751
+DIST plasma-nm-5.4.1.tar.xz 547440 SHA256 91862c39285a8f149139229dfb0c717ff6d8eb48b35958a2c0d096e4dc303d0b SHA512 6f8105057a91e957c1b8ccb2ccfc072e9af0f8d706d49fb20bf2bb978ed04df7dcd1b3c6212a1e60893245f6c148f3ff150d580eaf54f2ac4a97844626a408e5 WHIRLPOOL 23cf17e30780e6cdff66425d898348f53a18417ac070b84c792aa19ac55774e234ce62793e4d309c406b5f604259542704cb4d62d0f06d8560a036348460a007
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.4.1.ebuild
new file mode 100644
index 000000000000..17d79f6a5760
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.4.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64"
+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)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	net-misc/mobile-broadband-provider-info
+	>=net-misc/networkmanager-0.9.10.0[teamd=]
+	modemmanager? (
+		$(add_frameworks_dep modemmanager-qt)
+		dev-qt/qtxml:5
+	)
+	openconnect? (
+		dev-qt/qtxml:5
+		net-misc/networkmanager-openconnect
+		net-misc/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-misc/plasma-nm
+"
+
+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 e1265acc4013..e4512ef981d1 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1 +1,2 @@
 DIST plasma-pa-5.4.0.tar.xz 35232 SHA256 6d2a74021cb914fbdb2206779bdc8c74406a40e5bf26c70f8c724e7e0dfe04d0 SHA512 058e7c13fcacc283b737b9445370878a8305a1a6b4f5ad355fb8b3100a81d661edd526c20490e7f04b68627214b7399021a8e7b63f17cdfb855a58dbd1e33d34 WHIRLPOOL 339b44abaa0deaac323dacd72bc5eab91585fa800e5cce591a94c51f1a22abc13c58273a1208907b62dd59f4857aced0eec8af181eb009873f57905c4a11399e
+DIST plasma-pa-5.4.1.tar.xz 42024 SHA256 d780bc24c498eed473bfc79167b8fb3755be8af601059bca086b5a8736fc1430 SHA512 a8ef4301ad0f23d53d4a063838202a1115db3d0b8e0793a8ca68426c27bc0516fcab1259c81810ac34102fb72d9f3a55c2bbe22136bb338a497ffe627e949b38 WHIRLPOOL d484e7653732f42e6ec63ad55c2d5df91e9b90ddd46faa2da9f1815d989955d4af5d1cb78f346a28b66666c54bb28778e48ab828a0e14abe1a3559d3e227ee85
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.4.1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.4.1.ebuild
new file mode 100644
index 000000000000..d35ed31e7946
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.4.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep plasma)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-sound/pulseaudio
+"
+
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index f84b033113a6..801e5901196f 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1 +1,2 @@
 DIST plasma-sdk-5.4.0.tar.xz 645684 SHA256 b24fe640b497adccfeb4d7b151b4bd6187ade62085638d8c9a9e1976c22eb2bf SHA512 6cdf9cec8261ef6f1db86777166d6c7a840d47495c29509d4167577d0feed619602c92ae3a2dd31a6cad304b02d096cf91435cf417c5b1bcc020b0571c8051b5 WHIRLPOOL 4846ef03d8f5affdbe1200375925c91134aadf5329fa15e13abab0663e6fc392c8cd5995b83ab2204f6f78cc6da0382cf101c70f143097f161fd37cb5eeea66a
+DIST plasma-sdk-5.4.1.tar.xz 645612 SHA256 fa681fe6ca671897cfab50ec250206663f67b1c6e3ece3f442b9f411f1fc0a0f SHA512 7ccd53c0804b2ca22ca7d564837bebcd9f51f77d8cf5ba56e5197dec85553ad6f96afe7c86eb32791d620fff40ca58893183779c11e4915fc7ec25fa0ab90120 WHIRLPOOL aa52eb8239ff26c415a7ffc0c652abd006c5c9bd4b999f40ec69e65c212fc4af8c2d36119f48b7749dc07e3fbb7c1d9a20e92f49bf0adf71a9a94578de060e94
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.4.1.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.4.1.ebuild
new file mode 100644
index 000000000000..eec065c125be
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.4.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Useful applications for Plasma development"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(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 kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep plasma)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}
+	!dev-util/plasmate
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.3.2-remove-qtwebkit.patch" )
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 169499ee36fe..1efba96a7229 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1 +1,2 @@
 DIST plasma-workspace-wallpapers-5.4.0.tar.xz 50572080 SHA256 71a67a759b670b46d3ba34d3d77df4fc30b635ca88121bd9935596364294120c SHA512 f63a0238e56466e7d07e85127d5b625eceb2d9bcb6c9a1ac4a2ede447b0ba9a67e193ff69125a5ba48b48a2860406bd3b01c908733d2e5f11af6b9d2f2de9a42 WHIRLPOOL 7165980ba3786a5e2e56ae97e6e1845f82bd2234391a79a195dd1c09d83f0961b53be17fd1c5693fe0210c9c00622fc1f82663ebc3b42c6684902a0e91a58870
+DIST plasma-workspace-wallpapers-5.4.1.tar.xz 50572108 SHA256 31f223834328bf242c63f443bc6f52ea1819314433bbc79795a8994adab8225d SHA512 50fafd592c0b8408d6355e60b22449ad3c9c78363511f34205ce7dda1c0ce1ea18438832bf96989515469526ce7cef48a29c23d9b6e9f05ac81e8b288b1fc642 WHIRLPOOL 65717ce2f42e1b77c60703a2a974da35ee85851094bad8dd3a15f4e0a8c4ffbf8b328007429b4cb9e967b07ce0836a2af02a4c30541c50b68b84292ab3e3d983
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.1.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.1.ebuild
new file mode 100644
index 000000000000..6a75300b958b
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_SCM="svn"
+inherit kde5
+
+DESCRIPTION="Additional wallpapers for the Plasma workspace"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	!kde-base/plasma-workspace-wallpapers
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep extra-cmake-modules)
+"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 86e61f6e1526..619838be4091 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1 +1,2 @@
 DIST plasma-workspace-5.4.0.tar.xz 6956048 SHA256 102e06f9d8c1f2be18aefe009c8d66fa99a1d986f392474490fe37d4d1f3993f SHA512 4cf40aacb9888bd5046ec455825d5b6f077a5123a27fef5cac6a9e8ca606a620321d3900aedcfa1e4c605b861fc83451b03606c89166e9ab8b43f729bac0defa WHIRLPOOL ae30bc151fd691be764cccc6b372cc537d8a4142fffe8258421df30c102da5ffc0c5d7e383f7c369b0eaa9168aa0532956019f52314bdc23915af20b16f5a821
+DIST plasma-workspace-5.4.1.tar.xz 6957164 SHA256 6084d5885d815301115dd18d65c739e8968c3feb854f5d052348b5062a381795 SHA512 83ecfa50a6508b76944f0bc334ac64ba88b80a83f543ee6308413259c1dac1a0e3617453c05057586a5ebdc1c80b67eb313edca3b6b33e843a773a197e64afaf WHIRLPOOL a7955bfb24c3e60ae78e6d13180c38c48420413c25a0620850d24e4924c3f4a2b2e99315e2518ee9a7b492f88755059266f2af032e4b8bf19021c024e63ac54a
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.1.ebuild
new file mode 100644
index 000000000000..eebcaa118696
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib pam
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64"
+IUSE="dbus +drkonqi gps prison qalculate +systemmonitor"
+
+COMMON_DEPEND="
+	$(add_plasma_dep kwayland)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep libksysguard)
+	$(add_frameworks_dep baloo)
+	$(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 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 kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_frameworks_dep networkmanager-qt)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	dev-libs/wayland
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5[jpeg]
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/phonon[qt5]
+	sys-libs/pam
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/xcb-util-keysyms
+	dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+	drkonqi? (
+		$(add_frameworks_dep kdewebkit)
+		dev-qt/qtwebkit:5
+	)
+	gps? ( sci-geosciences/gpsd )
+	prison? ( media-libs/prison:5 )
+	qalculate? ( sci-libs/libqalculate )
+	systemmonitor? (
+		$(add_plasma_dep libksysguard processui)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep milou)
+	dev-qt/qdbus:5
+	dev-qt/qtpaths:5
+	dev-qt/qtquickcontrols:5[widgets]
+	x11-apps/mkfontdir
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xset
+	x11-apps/xsetroot
+	!<kde-apps/kio-extras-5.4.0
+	!kde-base/freespacenotifier
+	!kde-base/libtaskmanager
+	!kde-base/kcminit
+	!kde-base/kdebase-startkde
+	!kde-base/klipper
+	!kde-base/krunner
+	!kde-base/ksmserver
+	!kde-base/ksplash
+	!kde-base/plasma-workspace
+	!kde-plasma/kio-extras
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.4-consolekit2.patch"
+)
+
+RESTRICT="test"
+
+src_prepare() {
+	# whole patch should be upstreamed, doesn't work in PATCHES
+	epatch "${FILESDIR}/${PN}-tests-optional.patch"
+
+	kde5_src_prepare
+
+	sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i startkde/startkde.cmake || die
+
+	if ! use drkonqi; then
+		comment_add_subdirectory drkonqi
+	fi
+
+	if ! use systemmonitor; then
+		comment_add_subdirectory systemmonitor
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package gps libgps)
+		$(cmake-utils_use_find_package prison)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	newpamd "${FILESDIR}/kde.pam" kde
+	newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+	# startup and shutdown scripts
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/agent-startup.sh"
+
+	insinto /etc/plasma/shutdown
+	doins "${FILESDIR}/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/agent-startup.sh and"
+	elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
+	echo
+}
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 2aaaffad70c9..eafde5a467d5 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1 +1,2 @@
 DIST polkit-kde-agent-1-5.4.0.tar.xz 39520 SHA256 829b1019f3adde20d62ada5e64d7d265064c36d37cd09b7938a70b3e661225a5 SHA512 7b3a53b08bee273d7849c154de0c490083f36fe7002e755ba495949e5efdfd9ba9d1047d2afb893230e229d28f307ca6756ce9abe6ab3f3e1d770ed6dab96537 WHIRLPOOL 562b51f70794413678bd7d2c9d819985fae6efc535e6c5d65e35a5d9986c983c10af63a63700b3b8a1249997262a20698f7df0906e3329348b1e3736fe47b4a6
+DIST polkit-kde-agent-1-5.4.1.tar.xz 39496 SHA256 5128354ea066140e10b228b27de22ecfad09c39187cba81eb10c4f9e769b21bc SHA512 92d98794db7c13594d2ac3b618304c0cf155e9965517dcc4939ea9e2cfe9a60ca1481d02f81d068800a5c1ace926a6b67b6f63059377bc0a8338723bd2f46586 WHIRLPOOL 8a288014bebd2de7f4023acff059472ca522a98d1bbfb5595687cee426d4cebd855a70e50d644ace25133c326a6454b65c0016c78159982c5cac249f190cc8cf
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.1.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.1.ebuild
new file mode 100644
index 000000000000..f40289948b20
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="${PN}-1"
+inherit kde5
+
+DESCRIPTION="PolKit agent module for KDE"
+HOMEPAGE="https://www.kde.org"
+KEYWORDS="~amd64"
+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 knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=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 8f08ba962a56..02739a8baa69 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1 +1,2 @@
 DIST powerdevil-5.4.0.tar.xz 346492 SHA256 81b8bbcee694c4e1cf54cd342cfec9086a8b7dbed9eafd616ef401344c24bb83 SHA512 dcdd9a0fc5994ca017c3d86a73647bc5ecfb48ea0f9fa3561c2d90882fec8b0e28d604e3d9b462d4791a8365d43b8a7823c8c7d0a11e82f954c10c6b4032c635 WHIRLPOOL ce1f1bdd71815f092e176fe7f63b9dfdbe07d7572ee5c3bd8be0f4ffaaa9ab8dce93e6fa6ce80a3227e975dfaf2e5714f892e57625727fc0cb37fd9a2b83a605
+DIST powerdevil-5.4.1.tar.xz 346588 SHA256 709b34fd63455a0f6699c0d10b6d9390b47ce5ed1be95a3658061e0b653c86d0 SHA512 1026b62ce8288ec6f19d082fbeec22dfbb7f6a132e39d5ef4c38cce872390130292ddc4094ec76ab2ef14f9f0127cd5db07dba4a8b285b75723ce4a136f637e5 WHIRLPOOL a0f5c5c3e4bc52610045ae163c52d9a8bf6e2d90fa06689fc9ee841af6c548d41627b62ad43f3157ce43bcadbc8f16feeab8f40dd48094989cabb722ac637147
diff --git a/kde-plasma/powerdevil/powerdevil-5.4.1.ebuild b/kde-plasma/powerdevil/powerdevil-5.4.1.ebuild
new file mode 100644
index 000000000000..870bc9b844f0
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.4.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+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 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 kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep plasma-workspace)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	virtual/libudev:=
+	x11-libs/libxcb
+"
+
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	|| ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )
+	!systemd? ( sys-auth/polkit-pkla-compat )
+	!kde-base/powerdevil
+	!kde-base/systemsettings[handbook]
+"
+
+src_install() {
+	kde5_src_install
+
+	if ! use systemd ; then
+		insinto /etc/polkit-1/localauthority/10-vendor.d/
+		doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
+		doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
+		doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
+	fi
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version sys-power/upower-pm-utils && ! use systemd ; then
+		ewarn "Suspend and hibernate will not be available as it requires sys-power/upower-pm-utils"
+		ewarn "on non-systemd systems. Please install it if you require this functionality."
+	fi
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 34c757e13f58..a2bd37a6bc1b 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1 +1,2 @@
 DIST sddm-kcm-5.4.0.tar.xz 47240 SHA256 9d13c94b5fff2d66c07ba0b9e4d904bbaa058c5d2fab347e68773d22a6700f27 SHA512 64af91217c483d5ef6f2d74adc4e6293891159d5d04274f378ae113ba79544397746f73e7ee79954f78616f742ec7afb745b9631ec954d85436ab2cd1df51193 WHIRLPOOL b2dc6bcbf0afd83e8f95e0af09f3094c37dfef79369efdaa90b1fdfd1c1f77b01c71b81b0aea80ddb9b4b70387aad9cae4126b01f5d91c65468e9f6311e77f9a
+DIST sddm-kcm-5.4.1.tar.xz 47212 SHA256 140d26d49a24a614a4891e79571f199c45ca59bb707bb147bfb87cb6fcb1fcee SHA512 8d832376c588344931ce15a59996c8b5f29c94d54da3473f938bb728d99f6bff22c845ab36f25ed3bfd3a6f5527eda14e5110895ec0a572839d7ad9d211964a5 WHIRLPOOL ff161c906f81374419fbea131a605f1534a3fd4cf60e1d9f478bea2fddb66e14afe1436f4baf37bd8d2a52fb29e7edc0db4edca69b46a3f653ab544dde0461d9
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.4.1.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.4.1.ebuild
new file mode 100644
index 000000000000..224cf3336acd
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE control module for SDDM"
+HOMEPAGE="https://projects.kde.org/projects/kdereview/sddm-kcm"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	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 d171c7dc1221..77edd00e569b 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1 +1,2 @@
 DIST systemsettings-5.4.0.tar.xz 157288 SHA256 b571b9eaba94333c36e71bcdf13139e5ea2f251f6fa1ce86ebd36b9158060313 SHA512 1455c1ba38e08d50f607940ab46aa3233c4a27c8ca4d1946e9fb26e7dc3368685363b59e34f5f98139e475fa1ad9d8ec336c6d10e82a8552fde876fd555ed25e WHIRLPOOL a0a9bab87e4079499a61e39f808ac5d77357e8ce75fa1c1382990e52cb0ffa6c4e883affe36ddd874a944ffde6a1035ececa7f2a3a5c0af9c94696a5e1c13eee
+DIST systemsettings-5.4.1.tar.xz 157260 SHA256 b4cc50c424e86d2d34a8215ba5ae2b81fe0218bc1b9e213afa8a8dad1fc14d59 SHA512 d37059dac12c72d7e6437acb5db3c4367834e74f94217b27b995b7cd9749ee89597e8a36af8c5c99bd413e1e945c1afe8a68884c1c3c1cc69c8c78bd3a46c093 WHIRLPOOL 447515b41b6f7dd749ed6ca12642b95ac436f6d5907444bf8ab6e960b32699df4d995b5997c452389d4077f74fd26ff2ab4d7b50f73455c9ccd8dec06e10549c
diff --git a/kde-plasma/systemsettings/systemsettings-5.4.1.ebuild b/kde-plasma/systemsettings/systemsettings-5.4.1.ebuild
new file mode 100644
index 000000000000..edbf31fd7eac
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="System settings utility"
+KEYWORDS="~amd64"
+IUSE="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 khtml)
+	$(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)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	gtk? ( $(add_plasma_dep kde-gtk-config) )
+	!kde-base/systemsettings
+"
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 6d80ce13ea3c..46b9e626bbc0 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1 +1,2 @@
 DIST user-manager-5.4.0.tar.xz 55108 SHA256 6e3222db51811209064232f978b7d9facf33b9e3cd86b1372f80bd1f4333119a SHA512 1ce25c4440cbc51b11a3659cae60a62eb1ea370b32e580878043e38f2ddf9a9672fb21afed222075dfc397cbcaab1e8f029e23611e5e9e8fccbe3b4894d1f0c0 WHIRLPOOL 24c1973a7e89871a5703eed2d557e024afea46fbe947a8c374fcfb251d92ecdd8e63623e32bb7b5e80e0f1107d92146020226179f36397a26a57aee8dfbfe518
+DIST user-manager-5.4.1.tar.xz 55080 SHA256 977d2df4262b81f7aa405dc306cadde7ad4039590b2f29f31bc904da5b5a59a7 SHA512 070a6e560b5e6a72efb2564ec135ba5f695869c0a7fbb31efdd3a4ae1e3c61bb1d23f0e6f6df320919069911636ab06b8a62560e30776a6333958cd1455df875 WHIRLPOOL d2e93af0cb3a511e61f7f5fb4cf000bb1e1bd70150d353cca541ed335a51f78701f81820c0b6c40b39b75551b3b23f7dea0e5ec1f1143166d342da49e6313097
diff --git a/kde-plasma/user-manager/user-manager-5.4.1.ebuild b/kde-plasma/user-manager/user-manager-5.4.1.ebuild
new file mode 100644
index 000000000000..6f604f5a680f
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.4.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Simple system settings module to manage the users of your system"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	dev-libs/libpwquality
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
-- 
2.26.2