kde-plasma: version bump 5.4.0

Package-Manager: portage-2.2.20.1

81 files changed, 2092 insertions, 0 deletions

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 8af508696b7d..ab3c848a16e1 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1 +1,2 @@
 DIST bluedevil-5.3.2.tar.xz 124584 SHA256 c8721922777f8de95880ebe1935bf2e69315e91ddb2f2b4ac32a5e92af23b55d SHA512 caf996d72068f59b1bd87d40d6e9a56f6be0f4311d916536121dfcfaa6de5b9891717bbb90c60a196e9036e2cac63dbde4b989fca61de67b320e503fba555c80 WHIRLPOOL 230f9215ddfea8081795cc0d589a7c7aefc16fcca754d11cd33c71f4b665eef681439fca86c42bcd7aa1c379668e34d9289341bc963115babdc42792247840cb
+DIST bluedevil-5.4.0.tar.xz 126960 SHA256 cc5c10a76ac06732aa98e2beab1c0906d5afeffb3efb220d05b7b9d407f2cd4d SHA512 0086f8c4234860aa770e21e77484db65fe3c479e8a3061be4ada99d17d3108ad8acdb1eb273d378d64bce8835994f5ddd827f45e962f46db1098422e02d27f0c WHIRLPOOL 44b1756009539bf3184714bbfc7e4579e519b37a2b9263cf2bf701d07dc331c693cd9a677ff79f699f3f3b9b01af6f250d2f9aa3f99058a78667a64df34c674b
diff --git a/kde-plasma/bluedevil/bluedevil-5.4.0.ebuild b/kde-plasma/bluedevil/bluedevil-5.4.0.ebuild
new file mode 100644
index 000000000000..be926c31c1b5
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.4.0.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="http://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 359dceb53073..24ab537f7682 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1 +1,2 @@
 DIST breeze-5.3.2.tar.xz 29060332 SHA256 3e12fcd285c92466405efa053c27ed6266ba40e65c746349672d9b4f172bdc66 SHA512 21aa0d043b39cbcf89b806f80c337e73f3a3bdc7ffe0adf4adc7014dfe1a327bf70bd90f61558e278abef4f9fca6c8891a512a73fd7f9766f3ba77adcd7d563b WHIRLPOOL 788ead359b9a26d06524a8692773ab69a3d22f8bb4ba66c2ed1e917f50e8d43e21a6d71f3eb9bd8da6e616d4f9325bbf0a6eea5269aa6e7befa341463474a6ac
+DIST breeze-5.4.0.tar.xz 36351532 SHA256 ad20ed013e789da2f434fa8c5d81e2d6775c9494b7a70b955deb5fff104aade2 SHA512 df87a1f3d8acf4ab58677e5c76d03f97697f8ca8599495a328c8dc69683ca1169e30ebad4355750144522b4d1a43fa836f6879f9dcd51782c4207d47cf8d72b0 WHIRLPOOL 48e9c0b2418201f283ecaa706c9037e92a737067c7e3d33c27c02ebc59bc7b1d84d05004d8b5d21bc41577171759f083132396317c07eddddfe0bcd31bd3fbc8
diff --git a/kde-plasma/breeze/breeze-5.4.0.ebuild b/kde-plasma/breeze/breeze-5.4.0.ebuild
new file mode 100644
index 000000000000..be1823bc03a3
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.4.0.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 27cedf8826a5..dd5bf91ebe16 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1 +1,2 @@
 DIST kde-cli-tools-5.3.2.tar.xz 484504 SHA256 7dacbe8d90c5d2a966de80c42eb3370f08e9090d125732d9f70571e7603683a9 SHA512 c4e23b8bc2241e2c840705785b5e05f1ac9823ecd18a0fba4832962dda7bb01662effca7756c0e0be97b40965bebbed5089511c9ffa076199c0751473b4645f5 WHIRLPOOL 9fad35ef91080d54b4f78807204dc8af639ddb7d321fd1ffa0b314173e88cbcc0811703fc1e0076a6561ed5e9299966ab0a5353be1b093733f50b1983251f3e3
+DIST kde-cli-tools-5.4.0.tar.xz 484372 SHA256 f01bd52809e31b3239cb77e408d85bd8ad1b0544ddf0ff78fd9fac74e92a5d0b SHA512 ba5646c36df3da9b81586f4b95902d1df0f9eef49b434d23fc8e20f385808660ff7284b31c30a8174dfb4ff673115c20fe0f02e5c460c10784151762696dc0ef WHIRLPOOL ab2cec61135d71474bec965e7dc0d884093e5b480252e31eb5f7f1f3716905696685dfa061e9f45b712a53a7d9fcf6cf22a45fda0c7c77dba0729d240d47ad5e
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.0.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.0.ebuild
new file mode 100644
index 000000000000..8c10b9749428
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.4.0.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 ea277b8f3cdc..839b0eff065d 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1 +1,2 @@
 DIST kde-gtk-config-5.3.2.tar.xz 143520 SHA256 55bc964dda26620bfe64731435f72a87dedd530d486d7c0dd856aeadd1f68467 SHA512 007ffe8f6ba7675eb827a82dd2cb7e501d6833fb83e636ed120d2c32248c3a7fdc35807e6dcd5adc7476506814e2c02e6cbb6e7d7123c1158780be39504e7236 WHIRLPOOL cfd3dcc652b1bc07bcbe8d090b73e7c266d03e6d2707debea02b0223b9858081b6a053503df440f05355d3cb32478aaa617db555b21ff3601fc1282ced765ba2
+DIST kde-gtk-config-5.4.0.tar.xz 143616 SHA256 7f7dbb8297bf94816d34ba7e8422788148b696f2332e9b8d850baec9d9a1e1e8 SHA512 bf413d8c8b4120ea8af18871bbc777e3cd25b6bc13f155aed5fc91f08ea0d5e915a19228e81a1b07798e103d3a5a156fd0e43ee60e1f6a2bae78a4fc306ef962 WHIRLPOOL 8e6b1ef5201b9e4b7443ade95817a3a8c1287d597974ad69c4c86494b497718baf2f4fc1514f33d52de69bfb0920f8dbcf0968ccf155ffa9a3ada44a7797df8a
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.0.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.0.ebuild
new file mode 100644
index 000000000000..06939a91b706
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.0.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="http://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 df28a26a98bb..7cc17fa0a38c 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1 +1,2 @@
 DIST kdecoration-5.3.2.tar.xz 33540 SHA256 fb3099994c907cbc863a92d7d5c9b3fb1723dedacc211fb91c2d138da4b351a4 SHA512 4b68d5b608c3b01f45a61cc3be6db6c855b71021a531332eab2eae8d1c279e2de32a92d9b6b7de957fa5ddf8166116a0e42b722229fcaa7aff05fc24ed6911fe WHIRLPOOL 6fe640b6527f28617e16ade81b3e94c635cbcd1e166a81445989babf520709ecddff259688813f6c197ba2a2521db0f35c48afb617853bfa5d661db31d05e28e
+DIST kdecoration-5.4.0.tar.xz 33548 SHA256 924f61e6a1191902622141ada6548cf44922d62fdd1b9b8d5277db456cf3b153 SHA512 70526b6b482e7b6614882e5e4a093f56af9fdcb7597fa205903eec0323a7a441d7e68c35bc3314341812c286f7ccdab2fd4a65b938c90b55b71ddc94b4e679e5 WHIRLPOOL 001efdaa24d06a74d55d51db22f0d5bc34dbec0d607dc9633b2d4b87deca8e26a77c0fc8c562a3495341b15def8ac4a7dac85760bd936bdb631ad4dc0d466e77
diff --git a/kde-plasma/kdecoration/kdecoration-5.4.0.ebuild b/kde-plasma/kdecoration/kdecoration-5.4.0.ebuild
new file mode 100644
index 000000000000..4d2567877a5a
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.4.0.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 aa101a394629..8eba96ac66dc 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1 +1,2 @@
 DIST kdeplasma-addons-5.3.2.tar.xz 2065372 SHA256 c46e0c6962a6fe055d160c177cf2843c50515c5bc60d7f460e2447adcd386322 SHA512 5dc03d5e258e5844ef9c85f23e451c1315c3ededa97543344e233a87956132f467a91fc92577ce2528e0e94f9ba80135cdb6b483a087b91469ebdd337a29631e WHIRLPOOL dfcadec857ea437c955ccc6c35a67730c21aa2add42fbdfd1389b8fff2b1d7eb507bfc9d780a4dbec3a08cf530357b7713fc088f8aeeff73409fedbcc577d595
+DIST kdeplasma-addons-5.4.0.tar.xz 2073544 SHA256 46a8e31f4feb9b94ca5e4438369cc4cc4d86ef9535c55e9820b07e0f9f322fd7 SHA512 ba519ec69de811e7060c5a1145c85f9d7bce41a16502ee3895824737f2391d306c17f9e6d812542d0b6127820c5e21890ebdf6b83ca24087b5340ba678b4c94e WHIRLPOOL 5ce671ee1f2a5705a6c7de4dedca1d8e76ccf91ad75481dbb66c5691c64672dd3ff069de8defa050114b99506aca947f8ab124356d397ddd5eddb5b64d09caec
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.0.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.0.ebuild
new file mode 100644
index 000000000000..b90e65789a31
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.4.0.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
new file mode 100644
index 000000000000..1f81ded16f32
--- /dev/null
+++ b/kde-plasma/kgamma/Manifest
@@ -0,0 +1 @@
+DIST kgamma5-5.4.0.tar.xz 58992 SHA256 1d937f86c4cb8d3ac7d2a47dbb7cf88d55743be1d172e6f5eeac907926aa50e3 SHA512 81949979092ac67c2766c902ac89eefc5ffb6a1935ee751f86024f86daea78ec77723a8346e6eea218ef89f1b7c07fda4367c680e51f6e58eada53c37e842e4a WHIRLPOOL 7f168b78348cc4392c9ad8eddbd38687d5c4400c3d71faf3ed5f0c092ce01f40595e0bc9e494b89d0fe5d7948e9dcf212912e50f52b7c7ade20c5d33292f975e
diff --git a/kde-plasma/kgamma/kgamma-5.4.0.ebuild b/kde-plasma/kgamma/kgamma-5.4.0.ebuild
new file mode 100644
index 000000000000..7232a2eb45bf
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.4.0.ebuild
@@ -0,0 +1,30 @@
+# 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/kgamma:5
+"
diff --git a/kde-plasma/kgamma/metadata.xml b/kde-plasma/kgamma/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/kde-plasma/kgamma/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-plasma/khelpcenter/Manifest b/kde-plasma/khelpcenter/Manifest
index 8e45f0fb5d02..1cdaf9548cd7 100644
--- a/kde-plasma/khelpcenter/Manifest
+++ b/kde-plasma/khelpcenter/Manifest
@@ -1 +1,2 @@
 DIST khelpcenter-5.3.2.tar.xz 1732004 SHA256 63f1c405d2aaf1e29339cb015e54ac49989e05e7357b239ba34170f8899ca4d9 SHA512 adbf7f5180ed8562769994a59d496c5bc3f8ed280117959c486f38ed543e634f1d5b9c73182a31fc707b573a1388948746ce8e4726add39c43fc00be44819517 WHIRLPOOL 096299a9eaad32f3ccb72c697aa088c99632d4b982aaee3da64c71e182d80d6a50103a4f20a05a562acd3b8a5ed2bb929017d29a68990b94f236786fce0ee36c
+DIST khelpcenter-5.4.0.tar.xz 1800680 SHA256 8f4431198efe0ceded634b3b98ba744a6b315431a25be01b9e66d3fd84447e57 SHA512 b9a2cb216f329cece614d528bb791b164d5e2180cc4e05b3f5cb2fd8c44116b346f6c8318aa5a8e3a5c9d6fc0cf716d439d15742dfecabbf7ea75b95bf280a82 WHIRLPOOL 13a69ef11e6a1f4827eb84662e068d288ed54565dbe2145c257fc373b7d3c1403f3bc061abad155456eb97542a900de92abe0b556fccce9bbe26828fb22599c8
diff --git a/kde-plasma/khelpcenter/khelpcenter-5.4.0.ebuild b/kde-plasma/khelpcenter/khelpcenter-5.4.0.ebuild
new file mode 100644
index 000000000000..5e718ddaf726
--- /dev/null
+++ b/kde-plasma/khelpcenter/khelpcenter-5.4.0.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+=" http://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 c6d6117c30cc..db14ea0865ef 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1 +1,2 @@
 DIST khotkeys-5.3.2.tar.xz 608756 SHA256 6a06e3fc62a4fdc349736a481873e5f205b86bb0dd3fbcf792a4c43af936ff38 SHA512 477a78d56745f9021aef6d0b508f5ebb5fc9759a4139714557278a3cb3952e22ec346d4cba36ed6528f9c59238160c54887e60300d649297c31864d329034574 WHIRLPOOL d20d48113d9f1b23a06054dbad28d42584c4bc8b79c0bbf973b825c5ca72e4840071e560f19809e8d2e3dffb03210035fd161b0984c5e066fe594d3e344d301a
+DIST khotkeys-5.4.0.tar.xz 607776 SHA256 e6a81b49b92189a01ce3204be1d5302abf676629dd7e8fb42f0ce5b9fead716e SHA512 73c5a7a1765bfd496bf2c247d4e370815af09c3de1b344468539309db98aa616ad9dec6cf093a945718b65cdab2885f88b106ccf56a7f4c482a2e27ac092d191 WHIRLPOOL 640e48cd7ae6f5ce2d6c4f48b623444f3eabfeeeacf75ed2487edaca8b53b39d540387b3816fe6394746d4d06f99546da0a0a89d9f4fd72252e58affbe72fc0f
diff --git a/kde-plasma/khotkeys/khotkeys-5.4.0.ebuild b/kde-plasma/khotkeys/khotkeys-5.4.0.ebuild
new file mode 100644
index 000000000000..70575aa43bcd
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.4.0.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 a298d8db3dc6..fb856c8f49e2 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.3.2.tar.xz 1073160 SHA256 79c6ac792c330142f66b1ab01f32e010aa44303bf4d8e3ba422fd02c704f18f1 SHA512 b415e810081f474045ed951e2d20ba9fb75279adfb60a83e0525404449542c707a58f403bbdc37e890957662a3a5e5001b226532bbf4e2f34136819e3df265cc WHIRLPOOL 4d31741943f789803a3c1d401c96a83fc219bcadd1e6c6f86376df2854697f3f2fa273dd7ae277f27ec8954b3434be1bba33a922efcfb0c45142f95661bfb729
+DIST kinfocenter-5.4.0.tar.xz 1130700 SHA256 cb7af02fc44de84b0373b798bbfe7df983f6713d0a793653f72db8457413bb66 SHA512 b9f6c1f9a88ebe05b8157d9b6e7da31ee2843b83fae0bc9b3b88a732941211ae8eeefbef5c87de07881f3c289f29691b124b43f58e37e8a0eb71bc3f7ba3a2a6 WHIRLPOOL 401609e5edfe27c44f80ad1d687d84684ce991df4ea2fa6d126dead768d6ba439af9d22b89d2e9d9afec41de496f3b4eda7fcdf0b97096b10f8a3dc44bcef247
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.4.0.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.4.0.ebuild
new file mode 100644
index 000000000000..b8ec1b7d6f80
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.4.0.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="http://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 3c8e29b1e294..b5fe2fcae56f 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1 +1,2 @@
 DIST kmenuedit-5.3.2.tar.xz 441832 SHA256 b199a0c8214bac0b6833ab2c0018daaecf49a1881fe5b34c540940940c94da8e SHA512 b050a938ae1ae72eb62192f41a905120b94fc2b3f42345c6934849f5b2dd2faacdd6424b0b9877812350d036ff433727ecce1109c536b7bbe3d439d51c610221 WHIRLPOOL 0cfe1f07cecd359e07c5e9a655e576f9074a6716eab56912ecd028bf1e65ac58ca51f6ef485cb8dcb57081bfb450c63ad9f9dfa6c7b53a278040c6946fad5fca
+DIST kmenuedit-5.4.0.tar.xz 441424 SHA256 d82263c69e9b7160d87fcf7ce598e1481a5b3b53ab8149fc82d933b131dd6e8e SHA512 7b81963425b691988688f03a28d01e895add289730b05df14811e17db7c29839b00a11ff1d30de2e17e591cf7e8942c70c29b69f080f7bec7e3abd6ecde6f0d4 WHIRLPOOL 0dbe04a4c91cc7bbd4bd872ca3168c6827f6f7bb0543126f1c023d53b9e0f0000fcae41ed84ab9f536096ddbf598cb2ebdf2b8c94337d1375cdd0b8c994ee903
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.4.0.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.4.0.ebuild
new file mode 100644
index 000000000000..7e35aa669bb3
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.4.0.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 341f4aa8b444..846c3926334f 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1 +1,2 @@
 DIST kscreen-5.3.2.tar.xz 94444 SHA256 8d43e503b983f9b3dd4dc21662ad8f92f092ac81435a843ecbc5eab195cab695 SHA512 35cb11d7def3f043ccc1780f6b8a260bd61ae483e80ef96563ebc0f30f6e70fcd778f8a3c410c516b324e8c08fa7b7e115ebfe49ef2bacaba5f737acc6239dd0 WHIRLPOOL dfbb1b5abdff4b7f7e7aea18d637a06729c0ca81aa5ecfb17a3626e8b47edd3e6726f720db42bf534ec1034846ec3cf008d5240d72910e97d68159009a9c7f56
+DIST kscreen-5.4.0.tar.xz 99464 SHA256 a587ef8c827f8b741f9d2414c8fe04ad3d5863aef36c5b0a6680f965341b5b0f SHA512 db4f2e6da9564db87581a97ed511de03b1a63363d4e4867e3496e0f94c6b4122c86e6f0308fca93f96543314f2d67c2a71020e8b38592721b80c9438da82ac9a WHIRLPOOL a8d2ddab94d8f9b5889816a7330a16f24d26fd5da40c87dd5b6d3f1ae3d6fa2f5a870a366e8d355b98d38a63fd0a93f7b44f5c57d68540cdd2c9f4d875ab226d
diff --git a/kde-plasma/kscreen/kscreen-5.4.0.ebuild b/kde-plasma/kscreen/kscreen-5.4.0.ebuild
new file mode 100644
index 000000000000..04790921cad2
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.4.0.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 b2906edb3a5f..65708c4ae400 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1 +1,2 @@
 DIST ksshaskpass-5.3.2.tar.xz 18664 SHA256 e78d5d0540f9a206d2da03b62f62ceb3a0511c3d0ed6eefceca7dd40820097ec SHA512 570fc945ce869bc880207887af2025ff6f87613d5a50ce882715a2307938ee6993f4e6bc095a9d4c5aacbf5ea0c08fc8b103265aeb204c190abc269ea0602dd1 WHIRLPOOL e229e79bfdfdbbd8bb03181c990bc7595a52086b8e0286721bb9d9240f32ab9ce9c65ad51e322def3b55e564760cc85063eff6a588c756415fdda573c2aca5ee
+DIST ksshaskpass-5.4.0.tar.xz 18968 SHA256 5379415c581ec8cba356d1b18549b127096d30dfe685556389752f8fe2b802c8 SHA512 5a72539ebef21495c8d1be3d3093e232122a307c38ffa3d0b3357311fecfe5f8921c57faf6d6d8abd91604eb681f954b19fe51b8d09ea5a0f48fd24497d6b138 WHIRLPOOL 86246b18ff27b6563e4b994f80a998900c9281a574f55378bee38caaf532cc737a54da6ccdb799631da5541163eba6f3cb1aa21eca4eaeb2df3adb29ee5f2ebc
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.4.0.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.4.0.ebuild
new file mode 100644
index 000000000000..5133dd3138f3
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.4.0.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 6da4b961a253..f615dcfdc0ff 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1 +1,2 @@
 DIST ksysguard-5.3.2.tar.xz 481076 SHA256 073f431a035658935c82c831a13057fd615f5c7ab7b6f226cdd2ed0c637bc2ed SHA512 0be2254d8a2413c37a6eb58d01570e7aef70709dc197a1e6af77598b65b126dbe6b1227901b85a66f2f9efacb1be35cc48f660b87845a1110c933d0751328e02 WHIRLPOOL 359dda314e9cab8fd73805a221ea865c577e5dc4ca25d7a72c4baa21148685971f703f6d5eda12f4267101f1412bad7f00e9bce6ae23431471e294d5f835b3c6
+DIST ksysguard-5.4.0.tar.xz 481068 SHA256 ae380bd85d7677fb7ca31250e31d6b533c44341752377b72872ef5efb6e2009c SHA512 d0451334b34155d2f62816352e2c7542ea4dbec4a3360ef8017e41db722e95d397366596c3fdac816fdccc7577ce5d7d86c9b71c8769bf858d5fd3f7d584058a WHIRLPOOL 918c341f5a6aebd959393b36f810594a66bdf39859438e2c2e000f2ddd095c74ce2c14dae7d09958d8c9345dfdf967813338b11b1abdc911839dfa13b1e48c68
diff --git a/kde-plasma/ksysguard/ksysguard-5.4.0.ebuild b/kde-plasma/ksysguard/ksysguard-5.4.0.ebuild
new file mode 100644
index 000000000000..4c775d1e3d9d
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.4.0.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
new file mode 100644
index 000000000000..d977e054da8e
--- /dev/null
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -0,0 +1 @@
+DIST kwallet-pam-5.4.0.tar.xz 15548 SHA256 2c32c7e471f802ac959ad5f24279f2583f79e82944411ec18c26a08f1e94b1bc SHA512 16573a8b351cfab222b2326ac125738d367e7c750e6df20e80f151ef21fc7ffca91c52e4f5ab2b0c6de5bfdeb933a114d124a1c0e47524786c6709d41dc50537 WHIRLPOOL 55d79f444b0c49dfbf3abb21cd42d74c03ac24f3d39dd9fb918913008f9e7fc33a7caaadcb0bee52781e12ccae49d837e1f3c6d882960ac6ad93d18d27f8b6db
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.4.0.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.4.0.ebuild
new file mode 100644
index 000000000000..6e1b4f05cf2a
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.4.0.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/kwallet-pam/metadata.xml b/kde-plasma/kwallet-pam/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/kde-plasma/kwallet-pam/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
new file mode 100644
index 000000000000..3b806daee39c
--- /dev/null
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -0,0 +1 @@
+DIST kwayland-integration-5.4.0.tar.xz 13996 SHA256 86d400b4b0268ca6592f4eb0d0460d1dc47caea35fc6dcf74a2663ff9ff26d66 SHA512 ee44bb72d287a25ecbf53aa06c161b0011bed6fdd3b33d0fecf00a1ebfbc62fb0008d0fb2fa3bcd8259629b2d7e33feddf52dfde47b0e817b0b6954e3ab04f6a WHIRLPOOL 9a5aeed95d0160de08aeab574fb7a8050a4d201936032f45b7781f11a34780c59019a3e348facb9cef34cbd6b6ef49be440011615f5ebbef12a6018a7a014904
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.4.0.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.4.0.ebuild
new file mode 100644
index 000000000000..c21a498bccc5
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.4.0.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-integration/metadata.xml b/kde-plasma/kwayland-integration/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/kde-plasma/kwayland-integration/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-plasma/kwayland/Manifest b/kde-plasma/kwayland/Manifest
index be94daa9f737..88f7a89d765b 100644
--- a/kde-plasma/kwayland/Manifest
+++ b/kde-plasma/kwayland/Manifest
@@ -1 +1,2 @@
 DIST kwayland-5.3.2.tar.xz 92452 SHA256 916d1be1ba46ecff321b0dcb3031032955bef1fb538928955ab6ba95e11e13fd SHA512 1869deb3f72e89aed1bf5c91e7350f28607a17e224799d3534909c042baadd7c1aaf4b318d76c0ff8ff358ace2da9d57be64f3dcddd2f6701f8510e85d7f8c18 WHIRLPOOL ede23d29d9957975a62c7617495aba11ea5ee805373db5726b2df5d215e9a7c8337ec6e4c4929ccfc22729ab53d0661e7155f25e2fbfeb9a4f02834cb0c939e9
+DIST kwayland-5.4.0.tar.xz 111616 SHA256 7730e8f2bc77172a89987c4ec59de6e8bb454cb1524beac53a9b19ee7f09447b SHA512 3e2e37013ac0fce6fd0f23e86d9cbae4d9b8f14a9d8cc1d2cdc4fd6bc4894452137a3263eafc6e5785b23834d54f9cf5899fbf37b64437ce304d6b067b748739 WHIRLPOOL 3931b0b39e41a358e2f12d6c3bf82138a9ce6f4d37f19ba57b1c8f755fc4113cc00de985ad2dbf8d76d63764494c17bef345c1e90bb5a960731ed606d6ee1249
diff --git a/kde-plasma/kwayland/kwayland-5.4.0.ebuild b/kde-plasma/kwayland/kwayland-5.4.0.ebuild
new file mode 100644
index 000000000000..95b27b1a05fa
--- /dev/null
+++ b/kde-plasma/kwayland/kwayland-5.4.0.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 18077e929554..e214851887cd 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1 +1,2 @@
 DIST kwin-5.3.2.tar.xz 3828548 SHA256 7f77420455a1bb5887f586aa2a31eaeab919240757f47b1ca1c0ff849571575c SHA512 e347de68a47c78e691e0f17afe079a64f05854c1b7539483a7d5bf91de4c08d7851096df6a9252fbaa771231a7b824d4feb38a111cd355cd80c926c2972ff5b4 WHIRLPOOL 002d669907976120ee19a4d4eaeccd9e58fcb4e5b9ce6c101294bf2d39b49d6026363d37764650feba80478c674fa0ff3221a05ccf79d5cf8e924235a00e480c
+DIST kwin-5.4.0.tar.xz 3782816 SHA256 81f0caced49288f38ef1b34f70d4f62f4f261bdf57f6875631ec1017cfd6c7d3 SHA512 877df9dccc57e7c09d526f42ba7e53c27787a7070fb20a3cc0fa31e533ccaa5f233de5469cd96f57cca3ff334e5e22cc6431129637f0b070be9d83e484a82ade WHIRLPOOL 8691f410e2e57711e37faca7c815351883104c5ea30591c1c62b19e51f5793fd5af90a01144c2eef8bfbd5191b9d003b6dbe10d1cf86131e7103204f7808ca34
diff --git a/kde-plasma/kwin/kwin-5.4.0.ebuild b/kde-plasma/kwin/kwin-5.4.0.ebuild
new file mode 100644
index 000000000000..7c25a0db02f7
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.4.0.ebuild
@@ -0,0 +1,87 @@
+# 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 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/qtmultimedia:5[gstreamer,qml]
+	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)
+	!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_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 3433044aa13b..e83d65d746bd 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1 +1,2 @@
 DIST kwrited-5.3.2.tar.xz 19460 SHA256 41bdcbf600d8d3ec4c769c2f82bb2a6f05db0f11a15e35e32e5acb736f4e89c0 SHA512 c9db074bff355ba66d31d310f0dc2905617772f3ff01f5e25164b4f9526f942303f673b37333eccb457e903ce699582f6cea85be9e5426d60d276929896a7eca WHIRLPOOL bfffd904779dd3533baac8b33513d47ac60f044e994801c5007be4605d3b0a38d79f854573af11509f3d19be700aac77b91754b171624af31efe2f3a151490c4
+DIST kwrited-5.4.0.tar.xz 19476 SHA256 7a2ccd8e2d2ba8625c3d25132027248536aaead3249c741d87ac9bbc3c098ff4 SHA512 5ceb2d7bfd61593cb1ec0101e1f96b89db78433fc3a841c7fb8b5d90be917a37b9a02fd2055c696ffe55d1ac85c5e1a419f7c639c32f08c078d2c88943ec149c WHIRLPOOL 15f72722a5811d42ac62d38f495dc0d6b9aafab3ba3bde1998bb87b8e4808d5685154b79bf1c5620ccf748cbe90f0b6c443dd819d32943100cc74da715ab5f8d
diff --git a/kde-plasma/kwrited/kwrited-5.4.0.ebuild b/kde-plasma/kwrited/kwrited-5.4.0.ebuild
new file mode 100644
index 000000000000..1c5fbf00d85e
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.4.0.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 96eb0e6847ae..c51f520d6f49 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1 +1,2 @@
 DIST libkscreen-5.3.2.tar.xz 71644 SHA256 c2b9c8219d1743cdb28fbf571a16fcc6b608b6800ac4e6f993a205e2bb25d2cc SHA512 f5cc9fc1a392963c0799ff7aa678eb7228e6cd450e02a2a9d433b182644d13bdc41019d3935ba7fd7792ec686a732a939475a2fda7caacf3121f18f557fb18c5 WHIRLPOOL 6c901b89a38daefb14b889f17e2e2d15efb08238745edcc1c97e44d5a03aa94da8dd0fef224604271b65cf245b14cc9cf9675ceadfdbc26f61d739d683f231f4
+DIST libkscreen-5.4.0.tar.xz 72224 SHA256 927af891cef0849f8a7a6012c017f2272fb715d87d3311605aacd3416d8d40e8 SHA512 9c01525c788e93cf2ac3ddb48099b1a61b09236e9738d17ea4786ba999d89c1c3ee617ee43f6e579477a554d1b19e8987019d3bc42b2fa61f8aee89c20a96aba WHIRLPOOL 72f54cead04f4d885807ef3d011b35db6165cbf932b17b09651aa9dab093dc236f07b24b43f783eb0b771385dd6e91b7c6dbee1113d915b476e6965a6bf2ea25
diff --git a/kde-plasma/libkscreen/libkscreen-5.4.0.ebuild b/kde-plasma/libkscreen/libkscreen-5.4.0.ebuild
new file mode 100644
index 000000000000..5121874e8e9c
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.4.0.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 516670f9d1d3..719169e40304 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1 +1,2 @@
 DIST libksysguard-5.3.2.tar.xz 561288 SHA256 17a59b5b7d99ae940e1b0cdf4c64cc713482216b340bed4e6d540d4ceec9ed8c SHA512 6302bb433b4a3d246a7b17a399201f4077f02b243e47444ad8a6428944672281f16bcad7bcdac29c82f96d382b4abf3d5de41d20ea90aec21ae6cdad4d574507 WHIRLPOOL 36f67a8eb938f401d67b04f33773879bf1c49e7c19a8e87d1ac5d2eefeff00047fba0ba50baa2f3bfb9fa3d7f1fd740a71af305baa2a8ddcc58553a802e3535a
+DIST libksysguard-5.4.0.tar.xz 561356 SHA256 08fe41edd2b918e0fc02cc455df30f31211d851c04954232b61fb2340c65efa7 SHA512 23397fe95ad81479417dd063d758613cdf3d02ac9c738b3ae3ef6e9b21a47948be08c3420ace7130a09d5113ff3366884f41cb721d777197c40b8b3140d5bdbb WHIRLPOOL 119faa26c588dd1df00f262690abdcdf21182f42c4f0319a1e825aa45affec46e44a99601e75f11f4b23be5080f03cb2ee33dbcae30a46af877910f3ecda1579
diff --git a/kde-plasma/libksysguard/libksysguard-5.4.0.ebuild b/kde-plasma/libksysguard/libksysguard-5.4.0.ebuild
new file mode 100644
index 000000000000..da2daf1049b9
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.4.0.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 69ee9b8ad910..e6e1dabfcd48 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1 +1,2 @@
 DIST milou-5.3.2.tar.xz 51096 SHA256 7c9604ef843f8507f6c56f872891064bb0b631d2180422f9797d1f788b8e96f2 SHA512 b99dfa6cb0600f941bbca34619b0dfebbfa9c1e0a332ae41fbc6e805ac6d11ef31e8e40c0266d7fcb80a45a5d352d9adb4154f471c79ff9b0fea8ef00d4e6806 WHIRLPOOL 999d09c7ea2b191c223cbc6bc82fb66bce72fbf19c92e585328aa08aa61dba81e90ff814ed9fc2a87218cbf2fb23a9b3c29c345e763976896bbae6397a7e07c1
+DIST milou-5.4.0.tar.xz 51172 SHA256 01df5524bf57eb6869f7fbb793fe29d9379ee30dc4300d168aaa1527bd7bf152 SHA512 369015fff8acacf1a7907fd91ce9aa2d19c1dbb96a774f129a8af783d8586fb53cdadb44366ad62d3d53a57e91ddd7b149a682e657a2a07041db1a916658c726 WHIRLPOOL e1d5e06e6a0f1363b24c73b75c60535f96b8197bdd8486e626b575c707c0a353a91e53263f601d5c5ae253c2402b48bfbed4f143f8ef0404525993d95f0a4b9e
diff --git a/kde-plasma/milou/milou-5.4.0.ebuild b/kde-plasma/milou/milou-5.4.0.ebuild
new file mode 100644
index 000000000000..ba9dafb9edf1
--- /dev/null
+++ b/kde-plasma/milou/milou-5.4.0.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 f2ff665988bb..570a80039f08 100644
--- a/kde-plasma/oxygen-fonts/Manifest
+++ b/kde-plasma/oxygen-fonts/Manifest
@@ -1 +1,2 @@
 DIST oxygen-fonts-5.3.2.tar.xz 161704 SHA256 ca179061374a0d37f2ae445bd58b339be47dcdf11d349169d71a354ce972e874 SHA512 2a5261b9e3c608a7873155e82a6f7fb80c06859ee6a1153b45eacfbbc4bdcf25767b65a1a77b0dd82ebe729fd9a1a310e837777636d8d02f2a6f82b72710d7a0 WHIRLPOOL fb82daaedb7e597f36505de6d4ebbdf3bac51acbea9353c24fa266a138080b4f5a20977d741715625470873051a5a51ce07a0fc9485e30224ac9bfccfe30d739
+DIST oxygen-fonts-5.4.0.tar.xz 161780 SHA256 00d808f9f5109d1ed81f45ae32f2cd2d56318e97edca730a32ce0281ec5c2f98 SHA512 90f45d8f392abf5f4a7b3910f381e51ca1636361b4cdfb026023f17269a209fd11ab3583da3da6cda6120204f5a60d19f103cd3c135d39b1f50c4c3dfd7c9f02 WHIRLPOOL 7eccb51fd7be2e173400b7aaddd8df993ded974bffeed4be1628fb5c7bd90a43610bc2424eabe3e32d58000451239b9b1ccc7c26b1730a8815ad601aaa871df0
diff --git a/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.0.ebuild b/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.0.ebuild
new file mode 100644
index 000000000000..1c1a1acd57d9
--- /dev/null
+++ b/kde-plasma/oxygen-fonts/oxygen-fonts-5.4.0.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 873aef6fafdd..feda821379f0 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1 +1,2 @@
 DIST oxygen-5.3.2.tar.xz 4466424 SHA256 80e74901854d903feee8a2a43f1a0901763e8e06dc6ede4236c120fc8f45e1a7 SHA512 ebdc15578bfd10ef6b4b87674c36311d8ca7a8b66aafd9ba7175ef595d0fef5254186d8bf29bb903d47f1ea2598758e00e977db7b41488882db286cf6be82192 WHIRLPOOL 6ef3cf41260754d86fc3d7f4de88d65583acdfb9d740297933e21a0b66725990f103fc5c6c1724214571bb1ba15f08f3dc7bf21cee0510030d6b14600f26c0d3
+DIST oxygen-5.4.0.tar.xz 4506232 SHA256 de5e0ee8491db19c4483936499d6130757336b8d82de2c929781cdc684853efa SHA512 c4ca11366f14c13426977327a2ff16955088ee2616065b1d5dd2d4c3a066f8daa4c91f74c08d46bcb84fd5b403265619f26f2fafffdf6d6a309c3cafe7de5de0 WHIRLPOOL 5c8dc0492846870e1d8852891f956cab99d8dc7ec6128a0fa6aa1a453e92c4e2ddfc5268596d37d7361fe1e9c8e21f03948288bfa06dfc57e637afba1c4ac822
diff --git a/kde-plasma/oxygen/oxygen-5.4.0.ebuild b/kde-plasma/oxygen/oxygen-5.4.0.ebuild
new file mode 100644
index 000000000000..6ade0f5b0282
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.4.0.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 cbeb5794565e..c802cdb9f7c8 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1 +1,2 @@
 DIST plasma-desktop-5.3.2.tar.xz 5888840 SHA256 e16f878bd07cdbe46205eff6294f1b19cdebd021e1fa6d0720409d54ab050fa4 SHA512 3429983ec39eff68d14dd9216a71d368edfddc0fc048ed47b302ca7a4808d6b6f75b16b6294e9e69a19e58d4c3a1f14d9876da1719411a354aa3a03e614b1d4c WHIRLPOOL 1e828b3a0a585e6f08a928c5eb32a2e697ea34c5f94aede77d15df95bf5cabed8b28b0fc3a8f28573e864dfe9dacfce31aad849074441685c01b8429c3533c8a
+DIST plasma-desktop-5.4.0.tar.xz 6270020 SHA256 21e2f2651cf0e63ddebec38f3c490a38cf7606de9ef978ed9bad148c5c659160 SHA512 f4ac0f773fd110c004502f4b063816bd265f3de99ed39ce844baaebb50852e23ac1d36396f76f1c7b4552aa6ca83607d2a6f02827f05ce2f373f42ed93919b11 WHIRLPOOL 56bc4235dfb95049356df5a09df744352ad75f763168dfb7aaea19a66c8147943f54c4df0c4bfcbd5acf7f63fb6668082f8f359479fbafc9639d6e656f1a64e7
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index c047284e8941..fc5d9f185a52 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>kde</herd>
 	<use>
+		<flag name="evdev">Enable configuration module for desktop input devices.</flag>
 		<flag name="gtk2">Add support for gtk+2-based applications using legacy xembed systray icons via libappindicator.</flag>
 		<flag name="gtk3">Add support for gtk+3-based applications using legacy xembed systray icons via libappindicator.</flag>
 		<flag name="legacy-systray">Add support for applications using legacy xembed systray icons.</flag>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.4.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.4.0.ebuild
new file mode 100644
index 000000000000..b380d582a558
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.4.0.ebuild
@@ -0,0 +1,138 @@
+# 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/attica
+	!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 44d7597a6b2d..1ddab1ff56a7 100644
--- a/kde-plasma/plasma-mediacenter/Manifest
+++ b/kde-plasma/plasma-mediacenter/Manifest
@@ -1 +1,2 @@
 DIST plasma-mediacenter-5.3.2.tar.xz 156644 SHA256 e69991e5a9770d799ef4a530d5792d212415246d10c0634a16f3a0e83cfc935a SHA512 c06f201753f31e3dc9b1fde903ff6552c0b42458200c327698dab5e6addd4e6d0b09d0de0d7cc3c95a940a7db5413d3bf410517a1c5a63975b2db9ff2f3b20b4 WHIRLPOOL 917690fb0b6f67d40acca1c392f42a10a6ade9dfafde36f2acdd13069a324be33af7d300cbf2e1e8c8cf1bd153b363df3ef4ccb9c77262391a724c259f14ae9c
+DIST plasma-mediacenter-5.4.0.tar.xz 157864 SHA256 62dfd4de58c56629ffb00ef7dea173c482bc3263039d9ae46c1201427e1b5a8f SHA512 8e4b660d88e2a8c932098efc93aa1e396434d61067b6a1b566b42bfbf9d71fcb0e3937002384d1ab6955a8383c701275cfadb284a8382ef66880848ed115df23 WHIRLPOOL 2a3de94a14454ab60718998017601fe5685511efc6bb78c81249cd9f944ff3e13c10dab3a9a565d5dbcf028da05036226b6ff1ae802e1f7ed95ef8d223cc5b8a
diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.0.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.0.ebuild
new file mode 100644
index 000000000000..f2a22114b8ac
--- /dev/null
+++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.4.0.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/plasma-meta-5.4.0.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.4.0.ebuild
new file mode 100644
index 000000000000..df4e1578b95d
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.4.0.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="http://www.kde.org/workspaces/plasmadesktop/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS=" ~amd64"
+IUSE="bluetooth +display-manager gtk +sddm networkmanager pulseaudio +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-mediacenter)
+	$(add_plasma_dep plasma-sdk)
+	$(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) )
+	networkmanager? ( $(add_plasma_dep plasma-nm) )
+	pulseaudio? ( $(add_plasma_dep plasma-pa) )
+	sddm? ( $(add_plasma_dep sddm-kcm) )
+	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
+"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index d4747fd9c4f8..dfa2d0205d88 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1 +1,2 @@
 DIST plasma-nm-5.3.2.tar.xz 525640 SHA256 4f15c2284ba5d5642e45273beb9416b772d91ffb30e293f577641e9b8dd16c70 SHA512 90336e8be9170510fe5945bf4e631bc61815a3f994f2101d99c2438b19b5a99bad0bc343f5f6c6478ba0d1198334094ee4b8ee61d7786f52d6d55c923221cad0 WHIRLPOOL 9474dee4f8bad8e10570b1eef1f402af518920ce06976d8aa778a3198f98e8c4133df53d4bf7369cb93f77e4d494c9675af93992d11a6fe2e637fbc00909648b
+DIST plasma-nm-5.4.0.tar.xz 547376 SHA256 127b4eb083f1ca65fdc35a1f3d5db0549a49c85cdc1a0b81375863956cdb8194 SHA512 a2659ee727b1ca29cda98c04e2c725c4434f6059c53d086f8bc3310fc6770c4207df8896ed7830e1e43dcb9099b719985e7c4a7af658698e6df90b9d4d78f012 WHIRLPOOL 045f1b40bb0948e36da88fc4cd1ce945a966058ae44ca13350a16295a76ea47018275ec98f04dec2717c3936582b8f54fc2c35a4a07679244f2055032f35f751
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
new file mode 100644
index 000000000000..258e56826934
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.4.0.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-base/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
new file mode 100644
index 000000000000..e1265acc4013
--- /dev/null
+++ b/kde-plasma/plasma-pa/Manifest
@@ -0,0 +1 @@
+DIST plasma-pa-5.4.0.tar.xz 35232 SHA256 6d2a74021cb914fbdb2206779bdc8c74406a40e5bf26c70f8c724e7e0dfe04d0 SHA512 058e7c13fcacc283b737b9445370878a8305a1a6b4f5ad355fb8b3100a81d661edd526c20490e7f04b68627214b7399021a8e7b63f17cdfb855a58dbd1e33d34 WHIRLPOOL 339b44abaa0deaac323dacd72bc5eab91585fa800e5cce591a94c51f1a22abc13c58273a1208907b62dd59f4857aced0eec8af181eb009873f57905c4a11399e
diff --git a/kde-plasma/plasma-pa/metadata.xml b/kde-plasma/plasma-pa/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/kde-plasma/plasma-pa/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.4.0.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.4.0.ebuild
new file mode 100644
index 000000000000..d35ed31e7946
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.4.0.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 7c44169a9f45..f832b37af915 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1 +1,2 @@
 DIST plasma-sdk-5.3.2.tar.xz 642108 SHA256 5f68cf38adf0c8d03478b0e467c6a144a632d9d519101afa22f2bdeed5ea738f SHA512 689ece9f2c3f03ec0311d70b108f547296bb24534bb349848eeb3e5e0a049e749ff75bf5ccdc0c762788d1778ac7f025e30344f76d73c3c6b1d44007527e6266 WHIRLPOOL 4c44a78121e84bc7e13491906c87da49eaf67e43955e8af96cdbdce73f8564a143e081acdff9367b320cf21bb0b9443b5a86691081d02f4ddcc3635c4245a5b4
+DIST plasma-sdk-5.4.0.tar.xz 645684 SHA256 b24fe640b497adccfeb4d7b151b4bd6187ade62085638d8c9a9e1976c22eb2bf SHA512 6cdf9cec8261ef6f1db86777166d6c7a840d47495c29509d4167577d0feed619602c92ae3a2dd31a6cad304b02d096cf91435cf417c5b1bcc020b0571c8051b5 WHIRLPOOL 4846ef03d8f5affdbe1200375925c91134aadf5329fa15e13abab0663e6fc392c8cd5995b83ab2204f6f78cc6da0382cf101c70f143097f161fd37cb5eeea66a
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.4.0.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.4.0.ebuild
new file mode 100644
index 000000000000..b58da4af17f6
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.4.0.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 cca7d6eb7612..ab63894ab92c 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1 +1,2 @@
 DIST plasma-workspace-wallpapers-5.3.2.tar.xz 50572260 SHA256 4a21809c01fe7a7c3e537b37ac6aedbd2cda1a3551ef44cd97de97dd88407cc0 SHA512 4a989ceb71a4f4236133814e0522c9a719a8823ec9ca4147fb21f1ec8d08c21e77ccee1693a4d0d6b95f1d5eb2076648ce1d9322812a43d0a0f5011132547f5e WHIRLPOOL a1424cd99cfab1d239b7eb65091c833fa829d3315199bf192c05931f4b137d3080f41a52c9a62594ed6803d47d4ed036ffd02b4acccf64e3d010b737040d19bb
+DIST plasma-workspace-wallpapers-5.4.0.tar.xz 50572080 SHA256 71a67a759b670b46d3ba34d3d77df4fc30b635ca88121bd9935596364294120c SHA512 f63a0238e56466e7d07e85127d5b625eceb2d9bcb6c9a1ac4a2ede447b0ba9a67e193ff69125a5ba48b48a2860406bd3b01c908733d2e5f11af6b9d2f2de9a42 WHIRLPOOL 7165980ba3786a5e2e56ae97e6e1845f82bd2234391a79a195dd1c09d83f0961b53be17fd1c5693fe0210c9c00622fc1f82663ebc3b42c6684902a0e91a58870
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.0.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.0.ebuild
new file mode 100644
index 000000000000..e5046c0ca0d8
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.4.0.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 72b94b25efbf..b25209057f71 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1 +1,2 @@
 DIST plasma-workspace-5.3.2.tar.xz 6860364 SHA256 4165a547efc59dd42a15d24f21f722d88e4acfb6fb6d6a4db3c3d0ce54fa54c4 SHA512 9d93993c897b1c7ccc5fb4871ab7e1061dc61fa10d65ec516f5eb9b8f75ddc6188a6688c74425195fcab33a36cc72bd89787b1e3a8ada4244e7cfbbb1b9367b6 WHIRLPOOL 969cb23c0c9cba2c85d3609f201aeb4aeb0b3f3d6751caa3b89c75bb5e4c2ddcb85386c7454a4897ec4f53c49e3f9c2512e0d794825c97ece3ab7480f1190487
+DIST plasma-workspace-5.4.0.tar.xz 6956048 SHA256 102e06f9d8c1f2be18aefe009c8d66fa99a1d986f392474490fe37d4d1f3993f SHA512 4cf40aacb9888bd5046ec455825d5b6f077a5123a27fef5cac6a9e8ca606a620321d3900aedcfa1e4c605b861fc83451b03606c89166e9ab8b43f729bac0defa WHIRLPOOL ae30bc151fd691be764cccc6b372cc537d8a4142fffe8258421df30c102da5ffc0c5d7e383f7c369b0eaa9168aa0532956019f52314bdc23915af20b16f5a821
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-consolekit2.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-consolekit2.patch
new file mode 100644
index 000000000000..6131c90bc204
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-consolekit2.patch
@@ -0,0 +1,189 @@
+From: Eric Koegel <eric.koegel@gmail.com>
+Date: Wed, 12 Aug 2015 08:33:39 +0000
+Subject: ConsoleKit2 support for screenlocker
+X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=72578284a1fda5f012cafcaccad6069fadbf9a25
+---
+ConsoleKit2 support for screenlocker
+
+ConsoleKit2 has the same API as systemd-logind for Lock, Unlock,
+PrepareForSleep, and Inhibit. This patch adds the functionality
+for ConsoleKit2 while attempting to minimize code duplication.
+
+REVIEW: 124469
+---
+
+
+--- a/ksmserver/screenlocker/logind.cpp
++++ b/ksmserver/screenlocker/logind.cpp
+@@ -25,13 +25,17 @@
+ #include <QDebug>
+ #include <QDBusConnection>
+ #include <QDBusConnectionInterface>
+-#include <QDBusPendingCallWatcher>
+ #include <QDBusServiceWatcher>
+ 
+ const static QString s_login1Service = QStringLiteral("org.freedesktop.login1");
+ const static QString s_login1Path = QStringLiteral("/org/freedesktop/login1");
+ const static QString s_login1ManagerInterface = QStringLiteral("org.freedesktop.login1.Manager");
+ const static QString s_login1SessionInterface = QStringLiteral("org.freedesktop.login1.Session");
++
++const static QString s_consolekitService = QStringLiteral("org.freedesktop.ConsoleKit");
++const static QString s_consolekitPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
++const static QString s_consolekitManagerInterface = QStringLiteral("org.freedesktop.ConsoleKit.Manager");
++const static QString s_consolekitSessionInterface = QStringLiteral("org.freedesktop.ConsoleKit.Session");
+ 
+ LogindIntegration::LogindIntegration(const QDBusConnection &connection, QObject *parent)
+     : QObject(parent)
+@@ -42,6 +46,10 @@
+                                                      this))
+     , m_connected(false)
+     , m_inhibitFileDescriptor()
++    , m_service(nullptr)
++    , m_path(nullptr)
++    , m_managerInterface(nullptr)
++    , m_sessionInterface(nullptr)
+ {
+     connect(m_logindServiceWatcher, &QDBusServiceWatcher::serviceRegistered, this, &LogindIntegration::logindServiceRegistered);
+     connect(m_logindServiceWatcher, &QDBusServiceWatcher::serviceUnregistered, this,
+@@ -67,6 +75,11 @@
+             }
+             if (reply.value().contains(s_login1Service)) {
+                 logindServiceRegistered();
++                // Don't register ck if we have logind
++                return;
++            }
++            if (reply.value().contains(s_consolekitService)) {
++                consolekitServiceRegistered();
+             }
+         }
+     );
+@@ -89,6 +102,40 @@
+     message.setArguments(QVariantList() << (quint32) QCoreApplication::applicationPid());
+     QDBusPendingReply<QDBusObjectPath> session = m_bus.asyncCall(message);
+     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(session, this);
++
++    m_service = &s_login1Service;
++    m_path = &s_login1Path;
++    m_managerInterface = &s_login1ManagerInterface;
++    m_sessionInterface = &s_login1SessionInterface;
++
++    commonServiceRegistered(watcher);
++}
++
++void LogindIntegration::consolekitServiceRegistered()
++{
++    // Don't try to register with ck if we have logind
++    if (m_connected) {
++        return;
++    }
++
++    // get the current session
++    QDBusMessage message = QDBusMessage::createMethodCall(s_consolekitService,
++                                                          s_consolekitPath,
++                                                          s_consolekitManagerInterface,
++                                                          QStringLiteral("GetCurrentSession"));
++    QDBusPendingReply<QDBusObjectPath> session = m_bus.asyncCall(message);
++    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(session, this);
++
++    m_service = &s_consolekitService;
++    m_path = &s_consolekitPath;
++    m_managerInterface = &s_consolekitManagerInterface;
++    m_sessionInterface = &s_consolekitSessionInterface;
++
++    commonServiceRegistered(watcher);
++}
++
++void LogindIntegration::commonServiceRegistered(QDBusPendingCallWatcher *watcher)
++{
+     connect(watcher, &QDBusPendingCallWatcher::finished, this,
+         [this](QDBusPendingCallWatcher *self) {
+             QDBusPendingReply<QDBusObjectPath> reply = *self;
+@@ -97,7 +144,7 @@
+                 return;
+             }
+             if (!reply.isValid()) {
+-                qDebug() << "The session is not registered with logind" << reply.error().message();
++                qDebug() << "The session is not registered: " << reply.error().message();
+                 return;
+             }
+             const QString sessionPath = reply.value().path();
+@@ -105,15 +152,15 @@
+ 
+             // connections need to be done this way as the object exposes both method and signal
+             // with name "Lock"/"Unlock". Qt is not able to automatically handle this.
+-            m_bus.connect(s_login1Service,
++            m_bus.connect(*m_service,
+                           sessionPath,
+-                          s_login1SessionInterface,
++                          *m_sessionInterface,
+                           QStringLiteral("Lock"),
+                           this,
+                           SIGNAL(requestLock()));
+-            m_bus.connect(s_login1Service,
++            m_bus.connect(*m_service,
+                           sessionPath,
+-                          s_login1SessionInterface,
++                          *m_sessionInterface,
+                           QStringLiteral("Unlock"),
+                           this,
+                           SIGNAL(requestUnlock()));
+@@ -123,9 +170,9 @@
+     );
+ 
+     // connect to manager object's signals we need
+-    m_bus.connect(s_login1Service,
+-                  s_login1Path,
+-                  s_login1ManagerInterface,
++    m_bus.connect(*m_service,
++                  *m_path,
++                  *m_managerInterface,
+                   QStringLiteral("PrepareForSleep"),
+                   this,
+                   SIGNAL(prepareForSleep(bool)));
+@@ -136,9 +183,14 @@
+     if (m_inhibitFileDescriptor.isValid()) {
+         return;
+     }
+-    QDBusMessage message = QDBusMessage::createMethodCall(s_login1Service,
+-                                                          s_login1Path,
+-                                                          s_login1ManagerInterface,
++
++    if (!m_connected) {
++        return;
++    }
++
++    QDBusMessage message = QDBusMessage::createMethodCall(*m_service,
++                                                          *m_path,
++                                                          *m_managerInterface,
+                                                           QStringLiteral("Inhibit"));
+     message.setArguments(QVariantList({QStringLiteral("sleep"),
+                                        i18n("Screen Locker"),
+
+--- a/ksmserver/screenlocker/logind.h
++++ b/ksmserver/screenlocker/logind.h
+@@ -23,6 +23,7 @@
+ #include <QDBusConnection>
+ #include <QDBusUnixFileDescriptor>
+ #include <QObject>
++#include <QDBusPendingCallWatcher>
+ 
+ class QDBusServiceWatcher;
+ 
+@@ -59,10 +60,16 @@
+      **/
+     explicit LogindIntegration(const QDBusConnection &connection, QObject *parent = nullptr);
+     void logindServiceRegistered();
++    void consolekitServiceRegistered();
++    void commonServiceRegistered(QDBusPendingCallWatcher *watcher);
+     QDBusConnection m_bus;
+     QDBusServiceWatcher *m_logindServiceWatcher;
+     bool m_connected;
+     QDBusUnixFileDescriptor m_inhibitFileDescriptor;
++    const QString *m_service;
++    const QString *m_path;
++    const QString *m_managerInterface;
++    const QString *m_sessionInterface;
+ };
+ 
+ #endif
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch
new file mode 100644
index 000000000000..1630080ca2c7
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch
@@ -0,0 +1,40 @@
+From bf569560bf195ac4e79d65d4103a7161a6a2f2ac Mon Sep 17 00:00:00 2001
+From: Elias Probst <mail@eliasprobst.eu>
+Date: Sat, 4 Jul 2015 11:33:01 +0200
+Subject: [PATCH] [startkde] Gentoo FHS script support
+
+---
+ startkde/startkde.cmake | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index 2585600..9350158 100644
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
+@@ -210,6 +210,11 @@ for prefix in `echo $scriptpath`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ # Activate the kde font directories.
+ #
+ # There are 4 directories that may be used for supplying fonts for KDE.
+@@ -417,6 +422,11 @@ for prefix in `echo "$scriptpath"`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ unset KDE_FULL_SESSION
+ xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-- 
+2.3.6
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.0.ebuild
new file mode 100644
index 000000000000..8d7df9f51fe9
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.0.ebuild
@@ -0,0 +1,182 @@
+# 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-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 29dbeaca1fe9..58c0b411b851 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1 +1,2 @@
 DIST polkit-kde-agent-1-5.3.2.tar.xz 40180 SHA256 d655ec153a8db423b62ab4a96e7c62c3a1ea6bc49d656100ed62013dda9b0b4e SHA512 fb2c2cdfdf7720b8b8f3940233bfbde0f42676fae5deca215d86e89b3c7432e58f8000ee6c4bc02a2ea073e3b48fd5b7ba2ee9c0d6ab05d33ff40790ca1338a9 WHIRLPOOL 1691c34d23f57bba2ef42de88f962298b970fbf89b59e3e6a260ad3cc6bd7f511ad8c6a1854522b5415e26938174d2ebacafda8edd693be8b6bf939d7cd11db9
+DIST polkit-kde-agent-1-5.4.0.tar.xz 39520 SHA256 829b1019f3adde20d62ada5e64d7d265064c36d37cd09b7938a70b3e661225a5 SHA512 7b3a53b08bee273d7849c154de0c490083f36fe7002e755ba495949e5efdfd9ba9d1047d2afb893230e229d28f307ca6756ce9abe6ab3f3e1d770ed6dab96537 WHIRLPOOL 562b51f70794413678bd7d2c9d819985fae6efc535e6c5d65e35a5d9986c983c10af63a63700b3b8a1249997262a20698f7df0906e3329348b1e3736fe47b4a6
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.0.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.0.ebuild
new file mode 100644
index 000000000000..359a74b3cc23
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.4.0.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="http://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 8bfc0c9a1a04..b4efc7014189 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1 +1,2 @@
 DIST powerdevil-5.3.2.tar.xz 352352 SHA256 f34d92f343e7b0738af509d6d7f0bb0455df038d1c850838142adf8b53c4ceff SHA512 48ef5facb858128bd71a5235ad188e7901623f86620c159c855c54b346b7fc727a5606fcfe9f97696411a71f82fef850d7ed06884bab5f75b087b2dae052c1ee WHIRLPOOL 47b46d0027922d7280bebc10260e575f726c607fab203f04080bd6d14d062e7cfa41275f2b47478a724616eaa35d367906bc42b2ad35169920e1e7d7d6f0c3c4
+DIST powerdevil-5.4.0.tar.xz 346492 SHA256 81b8bbcee694c4e1cf54cd342cfec9086a8b7dbed9eafd616ef401344c24bb83 SHA512 dcdd9a0fc5994ca017c3d86a73647bc5ecfb48ea0f9fa3561c2d90882fec8b0e28d604e3d9b462d4791a8365d43b8a7823c8c7d0a11e82f954c10c6b4032c635 WHIRLPOOL ce1f1bdd71815f092e176fe7f63b9dfdbe07d7572ee5c3bd8be0f4ffaaa9ab8dce93e6fa6ce80a3227e975dfaf2e5714f892e57625727fc0cb37fd9a2b83a605
diff --git a/kde-plasma/powerdevil/powerdevil-5.4.0.ebuild b/kde-plasma/powerdevil/powerdevil-5.4.0.ebuild
new file mode 100644
index 000000000000..2ff6c67033c2
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.4.0.ebuild
@@ -0,0 +1,69 @@
+# 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
+"
+
+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 7b2c5a50a612..d3c3bb3618a6 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1 +1,2 @@
 DIST sddm-kcm-5.3.2.tar.xz 47072 SHA256 cd46c8c9b7c638eeb36adcfb2a10304c4f71ed3bfa916882950f818c7b49f39e SHA512 bcc854655c0619fb36b42394009425418d56ec837a265b15b4c66cf9353ae958a3b589a74f3bf27a60e231723939a8d3909df5a1d2c21e86dbafc9e0622e1db8 WHIRLPOOL 2e9c1cfb9583bd8f5892b58fd31903f5c890d5c5bf1d6fef66190b7508efb8c8aede5e93d372581e500271dd0e706205b52d4cea5e96466e6f234850786b3596
+DIST sddm-kcm-5.4.0.tar.xz 47240 SHA256 9d13c94b5fff2d66c07ba0b9e4d904bbaa058c5d2fab347e68773d22a6700f27 SHA512 64af91217c483d5ef6f2d74adc4e6293891159d5d04274f378ae113ba79544397746f73e7ee79954f78616f742ec7afb745b9631ec954d85436ab2cd1df51193 WHIRLPOOL b2dc6bcbf0afd83e8f95e0af09f3094c37dfef79369efdaa90b1fdfd1c1f77b01c71b81b0aea80ddb9b4b70387aad9cae4126b01f5d91c65468e9f6311e77f9a
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.4.0.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.4.0.ebuild
new file mode 100644
index 000000000000..4fb2b0829def
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.4.0.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 dd53750a0512..670b0aa2199c 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1 +1,2 @@
 DIST systemsettings-5.3.2.tar.xz 156792 SHA256 adabe7383d49249af0564319f83395a88d7fda2a19f9dcc21eca8eec6009f451 SHA512 c72ded95e9e8078f652feb9e2abccb363b0b89ebcaa385da80ddc9ff6ed616514504a767ac45618b588deddea38563e4726101aadece4d64f1d02275f707e560 WHIRLPOOL 01a7253c68b397bbc685e500eced5df5218e9b539cfce1629107bbdd29efa25bb8d8c45f6359bcd3ed3fda01f96406119c4eb34cd18fd43ed926551ace411650
+DIST systemsettings-5.4.0.tar.xz 157288 SHA256 b571b9eaba94333c36e71bcdf13139e5ea2f251f6fa1ce86ebd36b9158060313 SHA512 1455c1ba38e08d50f607940ab46aa3233c4a27c8ca4d1946e9fb26e7dc3368685363b59e34f5f98139e475fa1ad9d8ec336c6d10e82a8552fde876fd555ed25e WHIRLPOOL a0a9bab87e4079499a61e39f808ac5d77357e8ce75fa1c1382990e52cb0ffa6c4e883affe36ddd874a944ffde6a1035ececa7f2a3a5c0af9c94696a5e1c13eee
diff --git a/kde-plasma/systemsettings/systemsettings-5.4.0.ebuild b/kde-plasma/systemsettings/systemsettings-5.4.0.ebuild
new file mode 100644
index 000000000000..24082fa032d0
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.4.0.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
new file mode 100644
index 000000000000..6d80ce13ea3c
--- /dev/null
+++ b/kde-plasma/user-manager/Manifest
@@ -0,0 +1 @@
+DIST user-manager-5.4.0.tar.xz 55108 SHA256 6e3222db51811209064232f978b7d9facf33b9e3cd86b1372f80bd1f4333119a SHA512 1ce25c4440cbc51b11a3659cae60a62eb1ea370b32e580878043e38f2ddf9a9672fb21afed222075dfc397cbcaab1e8f029e23611e5e9e8fccbe3b4894d1f0c0 WHIRLPOOL 24c1973a7e89871a5703eed2d557e024afea46fbe947a8c374fcfb251d92ecdd8e63623e32bb7b5e80e0f1107d92146020226179f36397a26a57aee8dfbfe518
diff --git a/kde-plasma/user-manager/metadata.xml b/kde-plasma/user-manager/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/kde-plasma/user-manager/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-plasma/user-manager/user-manager-5.4.0.ebuild b/kde-plasma/user-manager/user-manager-5.4.0.ebuild
new file mode 100644
index 000000000000..6f604f5a680f
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.4.0.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}"