kde-plasma: Remove KDE Plasma 5.6.5

Package-Manager: portage-2.3.2

96 files changed, 0 insertions, 4007 deletions

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 447dfa0272c0..210d15addc6b 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,4 +1,3 @@
-DIST bluedevil-5.6.5.tar.xz 172852 SHA256 1ddac54394a5eb94c1c0be03a2f04a9839676d354546f52f132f0d5005a8c97d SHA512 58472d49f8cbf67d4dbc4d2ba63e0f8a4e7c7e1432092b6f4d47a8f3a1a18e7ef192aa8c8c72f9ab713f58ef91921c6493f14f662cf26cdd12c4f81f44c24124 WHIRLPOOL 922ed9928323f42ed0e5b2b728834827045bfbdbfddc810747f96a9f82865f46ecbe12c364fb1339575473504d496180d39c30acc343d142d4904741a960752a
 DIST bluedevil-5.7.5.tar.xz 139004 SHA256 5d1ca0db68f73ceed3bc3add8b9b9327a136db9740f237e7604efdd982536dcf SHA512 b99ee8f7f2834b62a8b73a6b4434c9cc762a572085c95c442096733a75f9eadb34224585ca18539832580094f855b89bff79c3e94712e1010dcc846d63e9de51 WHIRLPOOL 1797f775c47e34828e6cdb9e56e29f0a80c86fbddadf39183e5778719e07d6f2019af5310eaa79384aeea3e0def272f3c8fed25fe14e90caaa80ba12704f5d82
 DIST bluedevil-5.8.0.tar.xz 141044 SHA256 a218440c232ffddd9852fbdf6bc37818b343509708f19107c53f4bc6c85aeae6 SHA512 9e410e1072432966a85656057ad81eb743ddf143369905e340cbe56fa11376bf748bfa7e9a37e4f063926c45d49503fb17a69da38899fc4517fac3bbc1d130e7 WHIRLPOOL 385d601339f4ffc2eafca438bea7e0fa300cf0553dc390403a8faee1fbfea2c9981772f67f4304cb2efefe63eb1147e835d03fa1d31ccb7a9b3c253cbc2c3a54
 DIST bluedevil-5.8.1.tar.xz 141088 SHA256 e1b224c366cdadb4490762511640c2be9efe56c6700d39820e94418645cf5548 SHA512 fa305ae2d1400a4f00e2e7c82c19a4a53c228b7e7472fde877807421adb84f903592e6fcc7b434b1ef2712c8262b0b7c9d076eea3366a0ff51a02027047aad75 WHIRLPOOL eed52905b5d4f211a238e084cd9df65cedee90317cdd9d7a06219390fc2012b68bc327184a22c90849757b0314d6f7f6f96bc0ae5e16e8ecf4b6e88097b4021a
diff --git a/kde-plasma/bluedevil/bluedevil-5.6.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.6.5.ebuild
deleted file mode 100644
index 87bff0a3b0b7..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.6.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep bluez-qt)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!app-mobilephone/obexd
-	!app-mobilephone/obex-data-server
-	!net-wireless/bluedevil
-	!net-wireless/kbluetooth
-"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 340f666ebd1c..6eb0790a93f8 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,4 +1,3 @@
-DIST breeze-grub-5.6.5.tar.xz 154092 SHA256 e824538a9a1018c5f90322bae2cb80d2e6c0c7fbfa5a0d4ac0129516f14219ce SHA512 af2bf02737083ecd9c8919778461ee585d957d7bc1616d790608e5eeca3f9bb1c5bb1e5b6b1dfb3336156e0840762fe821d52687d354d1c008e878ace5bbcf27 WHIRLPOOL 9c86c0f8d8d77a058b61c3a9f2e06a7e0e245d3774236651f0ab5089611d11f73d864931cf3b20d60eb3a2677ca76157f7e1cae6da695871ff70865172e11054
 DIST breeze-grub-5.7.5.tar.xz 153836 SHA256 7e4ba530a9c08f755d60757f2c85e21fade202d3038e50b32c9dcd775fef8f0f SHA512 8e7365f3306d508d041d59eb7ee3a29f93abe44edba5a253fb0a55a88791ce750e38749a46f19fa2fee26246799a6a9cc7f33603ea0ba8052f3b68f60e0d22df WHIRLPOOL 51df714aa432d81be88770187b4f261d4912c6ff38e81084ccd5c8f1512cab3184fb630856cdaeaa98b0b932382b30545450b1f9850c574b97dcf6179d7a569a
 DIST breeze-grub-5.8.0.tar.xz 3138604 SHA256 4ef792be56f37bb4325b2aa3947bf3cbc671af7a1e401a2eeaaa560b4d1d4afe SHA512 950e1968a54bff79df51ca9ea3f8ad48a7d56d3d928561498968da109fa83ea83e44d1e7aeb5e7151d1590202ac4af6c20442d2a1227926930cba2189d6dd6f4 WHIRLPOOL ede640e7e50e683c75f7c43608c568f00f95849a42a64f2f50efd1941f447f398e396679b70bdafdee3e6e25aa23390f12f5c8d77d6f572a6f9beb6bc80d89fb
 DIST breeze-grub-5.8.1.tar.xz 3142484 SHA256 ac929bf1dd620aac21128e0e7d675960f9f0974dffc2876d71023d2f249b7ab4 SHA512 91dc7f4959d2862bedbd638fa4775a9c69a423b893230a5c1d6c0869256558b4467242a4f589241327d2b45509538ce97ef0690bec0c9372d8d3401949d455cc WHIRLPOOL e93a7d0f463610d3a48805dccb5d41234ccab48c8826e0e0280c05908e2bfa5356561861403e02318a83c4a79b3ac800e0c1ef481734726d29b6ad673cc6c12d
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.6.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.6.5.ebuild
deleted file mode 100644
index 7d3ea6db6a24..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.6.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for GRUB"
-LICENSE="GPL-3+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/grub/themes
-	doins -r breeze
-}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index ab081fe09857..a16046a88669 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,4 +1,3 @@
-DIST breeze-gtk-5.6.5.tar.xz 257656 SHA256 7b313a31b1aac9dcbb6a0d73c76dd7eaea5c410a6eb267d6d52126c42508854c SHA512 39103a36d8bd0de9e8bd9a49248c8a3fbdb284ee44c5d437b1af212e4fb91b2d9bf25cd33c778f413591941adc506a3e19696e772d84d1ba3535614fe06d315b WHIRLPOOL 0fa1500daa273b11e4099e6e0fd38ef3cdee601a24a98b4c3ad0aa10dcd595672a39d3922e8e0996b19a8c5e03650ce93774456efb02f12ed1e137e0112fbaa2
 DIST breeze-gtk-5.7.5.tar.xz 211352 SHA256 ac7fcaa4eaa9c86ed459c3582d58da1220bfb55956a2674ba437fd94d202e66d SHA512 2b01a74be9e3d8eaa1e2362898eb3396cba592660c684eed7978bd111bf07c19a9cbab177b0d154cc472226ed600767e799dc65802cfeab1d7fa859c0e5da8c1 WHIRLPOOL 7f3a706eb8b96939635a60cde957bbeb45a7ce8abcf34448e7fafc34bb81504e12b05725809d1d4fea539af6ccf773b9898b9f37603c00beca74cf79b52ca457
 DIST breeze-gtk-5.8.0.tar.xz 211424 SHA256 c312832cc5a729af17ef017b4073318927de834db2fd6252bbacd09a1157f0d3 SHA512 047a95b134d5b6bc0d225cce87c2353d3b18d5b34c9a142badb650bb73b83a9ef6ef758adf295bab21e1e41ed216d58cbb574daf4516f119fe674dd4bceccaec WHIRLPOOL 35d02d5af879404c97605c3961a84ad780dfd4200dbbe415482dcdce779eb815782f1f6bcf0001d69d240895c930be58eae45896debba4dc185169c8bef8f575
 DIST breeze-gtk-5.8.1.tar.xz 211404 SHA256 5f63e047cc3ae280ff8fb2caf5f250c918ee1bdd7dc48cfd38b4e03d1334ae5a SHA512 a6e87d2334016d1456dc9720f2e07a1fbcbe5288e99d07bd7ab9ba0528f0b05196ba756e79d9e253fdef4853bc916527b17cfc6f77098e97a3facbc5c96e2220 WHIRLPOOL f4de33b3839fb2a0f8d39c9154c2a8b5542a5c35df2c433ae9d39061dbeaef559a328855317443b226fd48844ac940e9602079073c4a3e2cb018ac2ab13eb90e
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.6.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.6.5.ebuild
deleted file mode 100644
index df0abe0159f9..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.6.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Official GTK+ port of KDE's Breeze widget style"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 752985bd9447..ff233ee45338 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,4 +1,3 @@
-DIST breeze-plymouth-5.6.5.tar.xz 61560 SHA256 57328155ac14bb660ac0af2b676720635e4c9d5113cc81485272516fc4d85215 SHA512 d711a0cc211971f7191938c35b10d281d143fa191a29a0d2aa657b8e431e11c695366b5e253dfa0a5a3af5b7a28519e9019fe18d07e884478902452208f5e524 WHIRLPOOL 2cb548be6178b8f44375abe83dbf99c5c7fa1a89acb763e36a47bc8072c0ba089fdd765bd778c2c016481c32094cfba76a377c56e90849c9cb58f81f06be62ff
 DIST breeze-plymouth-5.7.5.tar.xz 56760 SHA256 ed7e02eafd44715e16067bc0194ad2526beb56d0fd9b7bfcc5e3ab2ba9d37d21 SHA512 f83f16e3036123a1e0e6adeb5f314356de35c9dd5d0e63d306d8e756d7e5b99e9aee3ed874f07961896a55fbda54b27ed662caa1574f9c4e0dd6733d4cb4ae3f WHIRLPOOL f9fbe5753b4ddb446297772285de0b5e7719460fa3d262361bfba8e78140a35ebc6cff2d9baf1396b1cb6bcade1faf1fca058726178a0312a0f0aaadb06d428e
 DIST breeze-plymouth-5.8.0.tar.xz 94960 SHA256 c83340a13c7a6ce3f9630ffc18b4215b3b083eca903c89424ac592e44e7a0d5c SHA512 37d1e1c67aa40ba2f2a597967be709e3c4f631664d2c30c9e3c55f1afc0b0705291225051a3a0f7bb77dbfb1469f741f2fa4e6d485207846bde0aa4975fb26bf WHIRLPOOL b02aa89b4d61e3c9c6d09016880b94ce1297ddee7a3e5ae7f92b4f90151486c25966a2dc02363fcc50fad6cb4edd302c0c40bc2ecb96021f27827015fae1d6ed
 DIST breeze-plymouth-5.8.1.tar.xz 94996 SHA256 9f6dddfb6032b7bd5ef73f11742b841c35cbfb2f203a7d2cd509a2a124712a91 SHA512 823e6596f40da1f0f2b735ef21904ca854feca1ca94bb192cd1ae4a345b3b0f79b80b30c474e7b26168ae53d0f270038df8f602351032c0e74385136eb07f5f1 WHIRLPOOL 730c7b3b11562da7a0fe42a662177610e87f498db311874153b43339646d17e20b9e392b1927eb2f5a2ad9884c1ef5bdeed6c798384b36d5dfd96b151d178df7
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.6.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.6.5.ebuild
deleted file mode 100644
index 0d8cb1e46163..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.6.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for Plymouth"
-LICENSE="GPL-2+ GPL-3+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="sys-boot/plymouth"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 13ad7da86ed6..1f2a8ae91d4e 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,4 +1,3 @@
-DIST breeze-5.6.5.tar.xz 19675588 SHA256 ed9fb6ea6b47b869216deda2f4ddfd0e0a81073c54538325581fc978618fff73 SHA512 a83f66cf4d8d3322a235402b04e2b5e04ccba1a32ee4516931f5c4db757c0b6f487df93f3f069081df1d26c099631d9691d5b0d886fb266114c1057c828b1095 WHIRLPOOL 8e4b2d03ac028fd1a89cea15c205f4f6e89eb4d2d01a4bdd3a115781fabae5b150cbafa523e3dd3a88eed614c592b5b543f5d37f7e077ff831e31c58399fc7e0
 DIST breeze-5.7.5.tar.xz 12516824 SHA256 820f60cd2b4b92fb6ebfb890ff539f06b57eb7935aa3a85c7975ac45de60bd2a SHA512 7c86d17d6372cebb369621d183a3235affbf44bd02b63fa816864ce39b3570b7e0cc25f8c4ffbc61f35d241c63363cd4752303b49b9d718be57e8668de2b8e7b WHIRLPOOL e610b4271f80e590961f0c6bcf5800d19d35c6b3482fa5cc3b0f4535c8379475095032cbd6449020cbec00e0ec37c9b927147b1f693ba8c15bb01734f98d3a74
 DIST breeze-5.8.0.tar.xz 33277480 SHA256 1630c6cacced9c48b697aa78a406d0d7c3aa46fc164150636dc07f760dde853c SHA512 8dcf3b2ad186c5a739372669aa13c24dd303889e05255135ff350c0d90e62a4bd26c5eb1d2c4c3878d71d8530872de627e6d8c98ce79322de8fa82b10ebc518f WHIRLPOOL 54c91ac1f237dfa7ecdf2d1d1c55def298f7bd636323fcba15ec0fd60ac8725ffc64bb287d7f6a541cc54374545981d589bf9c1831d610e159cd3fb64db2d8f6
 DIST breeze-5.8.1.tar.xz 33278764 SHA256 778c331931c9402ff06900b5c06616e85f027dc1549013b60f25e92f89443fe9 SHA512 afa2ddccedf28c45a52c85309f0c49b768820f350ca1877dce41afb4994c704f6a7fdf9880e994b1bcd446bb45b37ae8b202c8031db63dbef7d3e658a2dd5d4a WHIRLPOOL a319c1585dffd0d0b5e791352d279c91089def4da9480668a07a862fd8a18fb6212067b17b91c5cc10813ca4245cd4f7d82ddff1623aa5d9399a92353099183a
diff --git a/kde-plasma/breeze/breeze-5.6.5-r1.ebuild b/kde-plasma/breeze/breeze-5.6.5-r1.ebuild
deleted file mode 100644
index 8b6b72cc85a3..000000000000
--- a/kde-plasma/breeze/breeze-5.6.5-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5 multibuild
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
-KEYWORDS="amd64 ~arm x86"
-IUSE="qt4"
-
-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_frameworks_dep plasma)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	qt4? (
-		kde-base/kdelibs:4
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep breeze-icons)
-	$(add_plasma_dep kde-cli-tools)
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=()
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			mycmakeargs+=( -DUSE_KDE4=true )
-		fi
-
-		kde5_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index d530e4657de3..13f48c131dd1 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,4 +1,3 @@
-DIST kactivitymanagerd-5.6.5.tar.xz 84828 SHA256 7029b027c0ea2ee620cc254d8c69177b30e3c996b09add53e16b51750df411d0 SHA512 91e5af42a7d4470474fd89b10e9448865a1762e400af4c4b09edc5c20f093af375a50bceb21ffb47e1158fec511ad95bdcfb786a31174ebf6c1d1617ad57449b WHIRLPOOL f94f38a31c4141f64e90c1a266397f4c333c81a69d14e71eb05e91310d6e063f688ed257300175ddc88aceb279934ccc173a0f1ba77188a3c052155049ef72bc
 DIST kactivitymanagerd-5.7.5.tar.xz 80340 SHA256 d9300faedf6d27c0afca1d51fc9df669ab9bfb60b63e6154dcfb0826d239c5d3 SHA512 77fee918e36ba23e406a7b98027f162f6816f9f723004a75c038b734af4694f120741611aea1e2b5c2a64f530ead3e0e7a471474dfd5e2bc8ba7c19f83d2fe47 WHIRLPOOL cd8d8419f1f0849d8d1b4e00d1f10ca94df47f5e142ed88226ac84bda852bdb7c72151ebb5467053ad4f17201f717308b49498661f5e01a520081b9066578b55
 DIST kactivitymanagerd-5.8.0.tar.xz 82040 SHA256 9e773d25882e7d3bead8674130781222419a8a62dfd27c0046f43b930bf74ec2 SHA512 452fa4500b232f1e9df713de73717600ab3c4a11d794bb62393bb3db08dd0dc0a938a11a5eedc26b67762145b14bdff875154d5d5db04a87dc7ad169fb67eb97 WHIRLPOOL 7011c7a4c917c3b65cb3b542c554164b8c11c1296bcc965c2fe05680292ae15da57fc9fb17fc4c42dfa9b11b854dc705d099c52383246d9e1cd6198434e8c53f
 DIST kactivitymanagerd-5.8.1.tar.xz 82048 SHA256 9538a5c237ef54602a233c025eb38a4426b51195a12b6d153e5b988a5325b95d SHA512 de7bb0a809da1d76893798bf3cfdf16309a264cfaf1652c6f4a9e369cdcd0ac88a745494f4a6f51982dc15f129adcc76a964e8c1a54719bcc46450496e85960e WHIRLPOOL 3eb48f40c1d0285c4aebd8a350ba99a763e338549deae9739c8b11135f6dfa4f95395a379129077ba3e0b0a043a191af521347dcf5a49f8a5c985f6378c4852d
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.5.ebuild
deleted file mode 100644
index bdd367412968..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.54
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-base/kactivities-4.13.3-r2:4
-	!kde-plasma/kactivitymanagerd:4
-	!<kde-frameworks/kactivities-5.20.0
-	!<kde-plasma/plasma-desktop-5.6.1
-"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index b39ad08abfce..57c5d2618524 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,4 +1,3 @@
-DIST kde-cli-tools-5.6.5.tar.xz 505216 SHA256 73021303bb5a44573a539ba99a3e687dec68acc435190615b1020876e564b43a SHA512 345ada74d589585bd458ebf4346cf85c662bbc5903d52c4e6fa9f7ffba0706b6231305fe258f0f60dbbf29fa9aebcdd370e1609f529ee4b5a56fc4bc151fcbeb WHIRLPOOL 4498acc137806801f7a0e52db8b80c936f50c30d79944f68dec22edf60c7512442498f6ae354409191eb0d37cff7cf242c124a0b54bf46663776244a2d01207e
 DIST kde-cli-tools-5.7.5.tar.xz 489072 SHA256 baa03619271003e8127f270b1eb1e5e4150380f5ee4e5114da1b0f3b6bd9aa4a SHA512 1bcae220aa9a505b4c3c9bae71f3e08b7e5ab1d4f3de95e4d06927146d84d684754e7254e71754f3bfae62e7925d6843706ff978bcfcaf8bba44c95b7274ff5f WHIRLPOOL 3205a22ebf8f2a9d9f70959e18a59edaf90462ed3f7e38d263d8e8778d71dfe251e4e8c68cc0a85fec8815ffa9e30cd73c4c4694094e2decceef1ec0a96ffc83
 DIST kde-cli-tools-5.8.0.tar.xz 485448 SHA256 8561295ef8892d947a91b25cb4cddbb6c5cc40b39657a6cfc6fe4cfd98e728a6 SHA512 b9eae222a8ff0e2e0f067b8a53189ad16d52aac84ff26503edcf39042bdf345f7dd425cfa04071e1613de47cd3601bc2ecee78a5e47903509f34347e31efe58d WHIRLPOOL 1193c74eb7451adb669c2bd25dfa0fabf3d67dc94137d07f03f35b69d1d03484044cb98d60c00612225b46de43dbfa3dd5bee28e5dbe44360454870fd6635ebf
 DIST kde-cli-tools-5.8.1.tar.xz 486284 SHA256 01f81c351d939c71b81b903fdd6da26bfddce46d33c05433ae0cddc504cc71af SHA512 989d2f2952a2358eb98bf1a896f4f2e829ba96ad0ce064dfc624769849597ce1fa7fb151d7b932d63f28e5c644b6721365251ec6904dbd9f3d94e191b3044911 WHIRLPOOL 8767751eff1bdc4af687c575ab4cbb977c1416f76bf1fd6ffe582508b5ae35a3849970d7cbe3d37fe371da51221ae191ce012e3d6edcf3d6e0030a11e74bf83f
diff --git a/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.6.5-CVE-2016-7787.patch b/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.6.5-CVE-2016-7787.patch
deleted file mode 100644
index cce11d8b4f5c..000000000000
--- a/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.6.5-CVE-2016-7787.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5eda179a099ba68a20dc21dc0da63e85a565a171 Mon Sep 17 00:00:00 2001
-From: Martin Sandsmark <martin.sandsmark@kde.org>
-Date: Fri, 9 Sep 2016 09:05:57 +0200
-Subject: [PATCH] Make sure people are not trying to sneak invisible characters
- on the kdesu label
-
-i18n: Sorry for the new string
-
-CCMAIL: kde-i18n-doc@kde.org
----
- kdesu/kdesu.cpp | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/kdesu/kdesu.cpp b/kdesu/kdesu.cpp
-index b7a66a2..b0efbc7 100644
---- a/kdesu/kdesu.cpp
-+++ b/kdesu/kdesu.cpp
-@@ -162,6 +162,10 @@ int main(int argc, char *argv[])
-     {
-         KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command)));
-     }
-+    if (result == -2)
-+    {
-+        KMessageBox::sorry(0, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromLocal8Bit(command)));
-+    }
- 
-     return result;
- }
-@@ -387,6 +391,12 @@ static int startApp(QCommandLineParser& p)
-         qDebug() << "Don't need password!!\n";
-     }
- 
-+    for (const QChar character : QString::fromLocal8Bit(command)) {
-+        if (!character.isPrint() && character.category() != QChar::Other_Surrogate) {
-+            return -2;
-+        }
-+    }
-+
-     // Start the dialog
-     QString password;
-     if (needpw)
--- 
-2.7.3
-
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.6.5-r1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.6.5-r1.ebuild
deleted file mode 100644
index 7756631265a3..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.6.5-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+kdesu X"
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	kdesu? ( $(add_frameworks_dep kdesu) )
-	X? (
-		$(add_frameworks_dep kdelibs4support)
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	handbook? ( !kde-apps/kdesu[handbook] )
-"
-
-# requires running kde environment
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2016-7787.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kdesu KF5Su)
-		$(cmake-utils_use_find_package X KF5KDELibs4Support)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-	use kdesu && dosym /usr/$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
-}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 445f04568e73..698fc102adc3 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,4 +1,3 @@
-DIST kde-gtk-config-5.6.5.tar.xz 164772 SHA256 9dc2d144295eb0a1a890f135d39f18d9605daf94aeda0bf7689e47acc22fd31a SHA512 4c05e39f873bad2fbab3391fb56cfb07deb10b4ef5f53c570d15c74e00f65b028486ca7e6dceb057285eb4f61083aadb3df601226706c18ce09a498148a1ecae WHIRLPOOL 0793723e735498200342f938b5b9d074dd0bc71949acb38d6ee497e012bf4aa4fbeb7d6d7f4f2d628b5e263450e35ef73e37d9ab818bde959ce084ad1e17d500
 DIST kde-gtk-config-5.7.5.tar.xz 147732 SHA256 3603055a4821a0aa4250a42261004b4384b53c337ee201d03e494bb18e9602e5 SHA512 88635c51a41a5a47351fa77483ad76c27b3881be28124e53fe0e4fc571dff1596c41e61d22a3e842a81180e9e3f955d8206dfc332965f84be20e47295142ffcb WHIRLPOOL 28231cbc4ac576b8b3d059e9b17faef099b103784386c0f54a6c86a1ccecebc500183fb200a438383c36211a49171b48096b0ce0218598746aed7662d847009c
 DIST kde-gtk-config-5.8.0.tar.xz 149664 SHA256 4c21983bbd952781666cb04810bfc150be3774b387be5174b51c7a42a36576ac SHA512 42c8018251db93b6fd2e5779aa1521f159cc8ebdbd2f00a61b585361d3078502483d8a86cb6cd3e4f7bd228fd05a11997e522576f6717f91a3c2747100d549d5 WHIRLPOOL 56a0065ca24e7630f6c30eba4e182ee121beb56741b162746884fdb16d06e217c4166e059a977d4ec54846cf30b2fd46730f3e94648e4642b89d6d606bd27ff0
 DIST kde-gtk-config-5.8.1.tar.xz 149764 SHA256 6ee8108c8e8838f23fe3d4b9830e08cebd28f7d2acd9465847574b1ced52e9fb SHA512 656b1439ee4c4313b0bb2289792e2af494377397b57c647287c86c4e38907d05b79cd3fd673449942fae2f56a1b7c5f8b075312daaae35d506a45f16f9d5cbd1 WHIRLPOOL 4ed26cefa65cd7a9f50b2eda6d32c97c45bb131d9cf6d5c775895933c4126eb230a5c820fce7a9fbcfc098f8b020a5306a6bcdfabd8503fbbd5e40256854f005
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.6.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.6.5.ebuild
deleted file mode 100644
index 987abfa44a7f..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.6.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
-HOMEPAGE="https://projects.kde.org/kde-gtk-config"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+gtk3"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-libs/glib:2
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/gtk+:2
-	gtk3? ( x11-libs/gtk+:3 )
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-base/kde-gtk-config:4
-	!kde-misc/kde-gtk-config
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-		-DBUILD_gtk3proxies=$(usex gtk3)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	einfo
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-	einfo
-}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 5c97f9317327..08a7518f8d21 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,4 +1,3 @@
-DIST kdecoration-5.6.5.tar.xz 34840 SHA256 e1eab1c2c495a67ff2ffa4e170e061f333bdf6b22c1e489b4eae845e6e148a20 SHA512 acf0c40e97c7b3a2d07f1464c761d6237ea216056e7f86395fcb2a0d5033755816a5976af1f02025e0072f1edff140596d21878d7efef7510aef185f47a9f590 WHIRLPOOL d90991ccc75f694f2efcb3c3ee8ff8bafabd7c91c50c33763ffa3c2378e9d461432c58f183bff735d105258dc8792ef23f3bce6864af5780726c067fdcc928fb
 DIST kdecoration-5.7.5.tar.xz 34816 SHA256 aec3b7cbaf40a663fe4f39c5d100bd55efc1491cd0f87c99311395b9a3323024 SHA512 698eb0a403af497e51a34ca73f423cb5b4539d69f843e0683e1069805caf7c006f05e73cd4fca38ed53136a531ee536f13ca31d19c89683faca40fcc6c4d83f6 WHIRLPOOL 69e4a9548004647138f179ae3bd5833407425a57ba413e71574955b95256a2e8ee671d03c770605a0f181fe6f1fe0a645180c43c826484982c56a33e8f835bf2
 DIST kdecoration-5.8.0.tar.xz 34828 SHA256 f95e2b6a40629ec432f36b8d11f0e53220e9d7d604788e843125dcf22e1d4b3d SHA512 bb0bfcd0e8546619b6f6b97a194584655f9388b77cb4898fc67ab35c8cac73df8ffb2c45440d0ada8c0a11f16c03ef94969d7565bdd7e9f475fd66bca7cd475b WHIRLPOOL fe499ac570e82c031cf39ca41e48f1413ec10737fe90c1d7915a8e65fb614bb3a115d077d2bf9461103926eae3d5f1cf9955a1dd7629df3e580ed29d93dfa8a7
 DIST kdecoration-5.8.1.tar.xz 34832 SHA256 f205ab039ebb135a5b04f2325ea216c2c76749dbe95bde10d4706b09824ba525 SHA512 970b7988a9dc3b3454fb84fde795f5f154ef7f57f6ee56f21acc97e3f02aaf917dbaeb78979d4c507b9b88f66d70770ef9261fb247dee2a2c300f465fcc8dcbd WHIRLPOOL 3a931dadca31cbf77085734e0c1640645cff89f0db0b4deae677345bd32fc4e8ca62bdb95576cb34a1311ba84a23b587ff25eb80b6ed9e7f5f7b996d1e972459
diff --git a/kde-plasma/kdecoration/kdecoration-5.6.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.6.5.ebuild
deleted file mode 100644
index 6d15030ea1a1..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.6.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugin based library to create window decorations"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="$(add_qt_dep qtgui)"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 26f9f28a52ac..c2a226e1baaf 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,4 +1,3 @@
-DIST kdeplasma-addons-5.6.5.tar.xz 2077520 SHA256 7f9690b407e44c2fa1d7dbe7fbea6606ee9801a6e201da245bad38a1f2be32a6 SHA512 9ebe91519e5990c694d5008ffa74fdb3928036ff96f38ec8d8db4bfe4b17eac6e00e8b320c0ba019ea3513a1ec9eb7c46dd2f0c21121e40bfdf62641f9c191bc WHIRLPOOL 9a2b6a78b9eea0768f989a17d1670db48de6949755bf9058298a596ff12c716b8c1eb733a39155c7813286154b7c7fc1cf4c0fc1c5dfb028b0962e5c73cab8e2
 DIST kdeplasma-addons-5.7.5.tar.xz 2077476 SHA256 0066badd4c3a76d31946ea0824124c9efd5c05f073672e5123e70f9a155c1613 SHA512 3e3376a3ed19c0965a918ae939903cb99da89af9e18c0e6fa25518d4d6464f34ec84895d6aea3d78594c82b4978194fef8142166c5a788212ca8e8f801cf6b62 WHIRLPOOL 8841f86d20110b2e98220963b87c38a528969bd7c6f0a70d596d828a10e5c64159d8876607b0446941966cce79d7ee63484523d1614e355e1475da0af5413142
 DIST kdeplasma-addons-5.8.0.tar.xz 2072636 SHA256 6c6e72dc8cba0f3d37450fdcf28f6c243889aff6e78fe0e4e1e31de0d770c769 SHA512 72561ae1a35cbff447b8a0b50a3c6327f05d369026e6f4a2b86119721f2d15c558bdf2a26c80b1c564b534a1d37a85e0f15fcdd9f945488207399e8c52000435 WHIRLPOOL 032120e938d7f3b4ab2ad4fe95b733fdca21750a7697a4d8463818ea31b80be1627493649a36193c81aacf46d6a734af5e9f58b2dd59d56b11033522b75c8689
 DIST kdeplasma-addons-5.8.1.tar.xz 2072584 SHA256 7d51f414c203a20b5eb15a572a658de445ad0e257af1e18bbfdab73c5b9f8884 SHA512 2927bf076eac1e6b15599b07408e7a31e07d4d53f1de0cabd7c7f9b6e097b142890081bb4cdad74dfa43434895186b91ff052ba1fbd1bf636d1827aad4543f1c WHIRLPOOL 6e929bf5a564f4818fd602c05fdaabf40214346c92531246fd58fff2069a1b061ccef5362ca2340ffde51a1dad839f19c0c5ab4024e5cd5c55a5cd01a730daa3
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.6.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.6.5.ebuild
deleted file mode 100644
index ab9d8e0d961b..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.6.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Extra Plasma applets and engines"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 ~arm x86"
-IUSE="share"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	share? ( dev-libs/purpose:5 )
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	!kde-base/kdeplasma-addons:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 8af91fbedf1e..739b1fc33b60 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,4 +1,3 @@
-DIST kgamma5-5.6.5.tar.xz 72172 SHA256 dc06a855dc6b2916728fa8f5b86068b7b7b23aaa238eca547f86fe36a90a2c62 SHA512 e51403b287fdd0e9cc2845f1446dd6f054653e6b883610a6586148393cf0f577700d699c1d62049bdc715c97b18abf5106af70f44166c1a0af6bf51e0bf09f88 WHIRLPOOL 001a24d6b491ad1de488676243b5e43f4812dbc57ed3df9cd9972783181c248a01e32d4a704be8fea758dbd23809fb9601f2f8d8f4248ac609c7a7d6b1586b3c
 DIST kgamma5-5.7.5.tar.xz 60388 SHA256 53779db5bd9d92a817af9b59bca9965856ca89ecf3483ffb4f2b4fe38cb05bf4 SHA512 66e03850a4d30f499a839c839fcaeaae7199083e3c720f7e43fc0ebbc5607dfd7661665bfe38e4bafa7e8bf7cb72409f0d35f15f3c36ae8aa94e435d2ae4eb5b WHIRLPOOL 53e694ae64f00584bdf10afd841fe2147f454ee70cdfefa9bcb69bb1558e320a383839d0fa70607cdc6a8ce6ee49b0faaa3f9ee0c7f4c125dcf9fab35d7e155c
 DIST kgamma5-5.8.0.tar.xz 60416 SHA256 81282e4f3dff3b76d94a4a968809e01e79326e413e86bcfb13f1fb455269d290 SHA512 6a7213635e06e48d4ab3a106680616bf00558a4f372e527ecf8cb1439c7fe03e83500b5ae72ab18732717e5f82ed10a7d2ac7ed0b5656148ba8a74f89637db56 WHIRLPOOL a7f987274c5f89d02c00e2c5a54b3fe14415ba6fd14c1016f1638378798c6849f1e4ae8a4647fe8c4654ea1fcd885f53da0808d117e46e092405f09b29780cf6
 DIST kgamma5-5.8.1.tar.xz 60452 SHA256 af944cc5c51d6a63a042e431e2e46c6244f247f703246de315db94e6a80469ec SHA512 2d20357abfce1feb4dd22982c8723cf31efe0088a19fa2222bd6da5161b54b0c127834a308b1f616f8e0f1f5ac3744aa4ae5fc6bdeb619373742accf66e6d3f1 WHIRLPOOL 01931b84d56a6390e2b55c419a6dcdc48b4119fc3fced56d884d28f67b4ce18b42421d38b66a730d1e559376007fdf4d762e36e8a341d886332d94c7bbc8741b
diff --git a/kde-plasma/kgamma/kgamma-5.6.5.ebuild b/kde-plasma/kgamma/kgamma-5.6.5.ebuild
deleted file mode 100644
index 95b994cf8834..000000000000
--- a/kde-plasma/kgamma/kgamma-5.6.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="${PN}5"
-inherit kde5
-
-DESCRIPTION="Screen gamma values kcontrol module"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-	!<kde-apps/kde4-l10n-15.08.0
-	!kde-apps/kgamma:5
-"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 4331e567a547..0cf8fb7609ba 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,4 +1,3 @@
-DIST khotkeys-5.6.5.tar.xz 669560 SHA256 8adebc7dacf0c74d23eddd66a6ea8f16697d59020d09f9b6a9f68abd62bb4dff SHA512 9939f7598a792a37ad661bbb04ae62449025e7a67759522b711d6afb1b7b62b81f7ca5b5156ac8dea53f2273ea76311e749b985b24748eea30813fb026c0388f WHIRLPOOL ce853355c2250994848de2c9b029a7d23c7fc9ee25c59b4a23f617ee0c143db7be4c148bf750db66af29b9db6a30924d105aeda1fae768f1132c1b9ae1a27365
 DIST khotkeys-5.7.5.tar.xz 604704 SHA256 efca5ead90388e3ef8ad0612e7c035414340da5273dd486918af25b3e2fca430 SHA512 c6ce53a05277dc8ab579b75cd4b93758b789881e7918a18f44f8c9dbdfc4f8b242e6fd7f5c9e5751479e04858671adbbd50af5e4985eba242a9f8cab487ced6a WHIRLPOOL 09dc9022463eda08a2608325e282a70d9f685e5e138684e14f99bc35e8a8d48ca6829ae1ff274f4bfcfe1ca8f73b0c0aceb16e0214befe9dd6a33ecf3deeebeb
 DIST khotkeys-5.8.0.tar.xz 604704 SHA256 e13dfac7bbf795ddaf2137f55647a7e5bcc16f7f54a15a68298cd4d8903e4c1b SHA512 dc65816954a5418ae9044735a3ff99b99d0b3941db3c05ec4c54652acd893884002ceda19bbca12ec80afe1758e9155f678875dc4c95cd0977ece3c5a424931b WHIRLPOOL 1920a34a61eae0bf14c8df7488b69ee15f73266b32df7b228e35b2f85b570ee04b7584ec7c3ff38e7b619ab4c2dff9ef0f404a1d3ee7cbd1c5d0ad24bfba8343
 DIST khotkeys-5.8.1.tar.xz 604772 SHA256 b12a9e41d588856168ff24908c17d88c830686cc1075534a5228f62a766a78bc SHA512 dfcc73de4d792b0202f939c5735dfc96e33ff070e74c117e1ba48e2d6abeed6ae20e3efdb0886cf20e8cec5e85d00ffe3cee2ecf04c2105d52d91c7cf41bd1fc WHIRLPOOL 551df2b8cf02d5e0fb6d5504174531bb9c674c8c9477f5ac6cb8ef762f48299d0b4bb3965eb5ea3beb2f7a0729f6a8ce1d6bd3fe7d74413dacb7accf01cdf8cc
diff --git a/kde-plasma/khotkeys/khotkeys-5.6.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.6.5.ebuild
deleted file mode 100644
index fa0d56cae50a..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.6.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support X)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_plasma_dep kde-cli-tools)
-	!kde-base/khotkeys:4
-	!kde-base/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-proto/xproto
-"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 4a9670f5f302..4cc770effdb5 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,5 +1,4 @@
 DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb47dc3229505abbac0c6 SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 WHIRLPOOL e161bf40c5e16180fa65217cb49314fb230c45329f4c518d6014083bd71da82d4aa048811ee814fde7fa300105cef16c182688445164ae84d0d700e23641b342
-DIST kinfocenter-5.6.5.tar.xz 1409784 SHA256 9425fde6d1f92940a85449d01de6521c963c2ebf7b30b79f31c3f4b8e65629b2 SHA512 4b1692a6b2f1d3aba369463ad5aaa9910906178cf0d447e76366e9c0c4c50bc9de1a850bff149bc4bc52af14a67d68d26cafa5edd1de69e6cdb9995820bc91b8 WHIRLPOOL 340a2e3476a95c5499852f8654f285ca6e46f7d866fa91f62fb6cf7d2ebaea6580871377d81961bd0f11d6f37ebb588fc5b3d586c5e6b12ad7b660dd7ce96b7d
 DIST kinfocenter-5.7.5.tar.xz 1248860 SHA256 f9cdf5575d332c4bd7f46238d3cd957a27b534a0e163d58fc7844bbc65115238 SHA512 3e08f2782004b56440395a5643f42b56a4adf6380eab15711a2397d20539e9116724f846f93a0db8bea9526f76db8c656fbda750e9742f5c9e0e33c060f0de1d WHIRLPOOL 5444078909e720501042aafc5420f60a2611d95f7cf578eee638d3f9a1d048830fcc2b66b607afa2a1c098a7cee70ea32eacb7e7604ccd7654ec0aca0a871618
 DIST kinfocenter-5.8.0.tar.xz 1250340 SHA256 dfd8a237a2081e41a006f1978190ec9954be6b5545eaba2bf8daa17958d2590a SHA512 24c387e65666cf576990f80a19e10334010e029c23afe291ca77abb9d51cfa59fdc28cdb25d0c514a9411cfb66dec293366fdc2a50e1093687544c30da815bed WHIRLPOOL e095ca082e6ccc330b9a77ccdc65154e07677a91a92dc3701009da5ed08c6ce999244bc3391de5aa4062464c6eb07c9b31d6e835700c769c6adede2ab6883aa2
 DIST kinfocenter-5.8.1.tar.xz 1250684 SHA256 adf14bf48bb457ea82c4c61149630e648fe2449b512cad282d14e0cb4f825945 SHA512 8c39688edeb3c352bbe6b307a1e2449b997dd96be141b2da3972929328bfe9b149a95dc6ba5bc60c4d928ad6e3683742c690605aed793ebebbda1b23d0e95e41 WHIRLPOOL bc5126804f7bb519ee02df5343de2b4cf00e98b73faa35f1d03dab7b7052f81cd80ab61057a8026a51f05f57bca8cf5bf997ddc81fa541ad2db60c51e0bec105
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.6.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.6.5.ebuild
deleted file mode 100644
index a296925768d7..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.6.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="A utility that provides information about a computer system"
-HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-KEYWORDS="amd64 ~arm x86"
-IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland"
-
-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)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'opengl(+)')
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	gles? (
-		$(add_qt_dep qtgui '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_frameworks_dep kwayland) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep plasma)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-base/kcontrol:4
-	!kde-base/kinfocenter:4
-	!kde-misc/about-distro
-"
-
-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)
-	)
-
-	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/kinfocenter/metadata.xml b/kde-plasma/kinfocenter/metadata.xml
index 22f7297810ff..66b716bf045e 100644
--- a/kde-plasma/kinfocenter/metadata.xml
+++ b/kde-plasma/kinfocenter/metadata.xml
@@ -7,10 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="egl">Retrieve information about OpenGL via EGL</flag>
-		<flag name="gles">Show OpenGL ES information in kinfocenter</flag>
 		<flag name="gles2">Show OpenGL ES information in kinfocenter</flag>
-		<flag name="nfs">Show information about NFS mounts, shares and log entries</flag>
 		<flag name="pci">Show advanced PCI information</flag>
-		<flag name="samba">Show information about Samba mounts, shares and log entries</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index ea91e4c5bb4e..e13fef08912f 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,4 +1,3 @@
-DIST kmenuedit-5.6.5.tar.xz 706156 SHA256 0f2ebdde8182a5b4f3e32b993e67a3e9c0a8aea685ab3339b477417dc0aab6bb SHA512 e6a38088b4b15ab00fe7e4afabaa68eccee5e934c5e4bbbe5e2c927a11816f322de8ade61bc8bc7908096486e864e1c1afb2d6ae357fb67f3c2fc77d7acdbfeb WHIRLPOOL 7e57a6752490867d71a9b4454991ef81a7a30fd7ea3c1f2791e56f01888d23684bcf3d9f700608ac4fdb381a60cb24d51a412c9d69c037397f8e7afc8cb26894
 DIST kmenuedit-5.7.5.tar.xz 652176 SHA256 a12f6160ba7b115cc5a23ef1e1579d742622e92e307ecf3ad13fad0d6ef42dd6 SHA512 10cf27a3addd360170f0179cb4df4f43b3b9abb6161f46eed1d4b4674be137e0bf1299ad80c7ea4abe247eba671eafcf07110406a37704ce0bfdeaeae3fffc36 WHIRLPOOL cffa0d38eaa9065bd00358ac3c0cac3d5898d6016bf99f8e768bfc35b4aadd1f4e5bb1f8057bdffb2c21c1ad1fff331eab5e2681ed504e2ecedbe84fa011c220
 DIST kmenuedit-5.8.0.tar.xz 652280 SHA256 d6f1ce719fcf0238ead9ce460b57e2bbd7d146caeba29a6e2b7a3b2b63c50446 SHA512 c15dc2503605e86014a4f489006ca0f145c7767a397d23d51cabf616e5e888c002d7b39a43d8a311b694768503fdf6c74b3e4e7892d3fd7c180e14bd17ea7227 WHIRLPOOL 30764b59616f5a50a49607bdbd0981630323cad37e17f86c0858f17060dae708a8d9ba10228e7bcd287e9f9d1889a2ca343131b32989311669213dd9eb7ae7f7
 DIST kmenuedit-5.8.1.tar.xz 652412 SHA256 376fac8c45c2e0f8ac30c4ade66cf3de7cef4f1c431770d1196b66c3bbc50c89 SHA512 6cb7059b7743a2419594efff551a56d7b6058f266599d229e3815e7472affb37cccb48bb175b7f00c12948a010b6bf4636bab1fd5406f2faff022b6f06081a31 WHIRLPOOL 0a5faac4405233c19ad0cb0b82f6c081c055de7e2ae543631b1e8dc872e625c98b78bb26cbc59ba8affb32ea7aeb1a9a73d6583edfd0c2a260947d87c295adb0
diff --git a/kde-plasma/kmenuedit/files/kmenuedit-5.5.5-hotkeys.patch b/kde-plasma/kmenuedit/files/kmenuedit-5.5.5-hotkeys.patch
deleted file mode 100644
index 18e9f764b8c9..000000000000
--- a/kde-plasma/kmenuedit/files/kmenuedit-5.5.5-hotkeys.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From fe425d0fbfe32101a5bb232a65a19785e2ef687f Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Fri, 1 Apr 2016 05:17:40 +1100
-Subject: [PATCH] Fix build when KHotKeysDBusInterface is disabled/missing.
-
-Summary:
-By testing the variable itself (rather than its contents) we avoid a failure
-when KHotKeysDBusInterface is disabled or missing as KHotKeysDBusInterface_FOUND
-will not be defined.
-
-Reviewers: #plasma, graesslin
-
-Reviewed By: #plasma, graesslin
-
-Differential Revision: https://phabricator.kde.org/D1278
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c615d9f..a2e43ae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -43,7 +43,7 @@ set(kmenueditcommon_STAT_SRCS preferencesdlg.cpp klinespellchecking.cpp basictab
- ########### next target ###############
- qt5_add_dbus_adaptor( kmenueditcommon_STAT_SRCS org.kde.kmenuedit.xml kmenuedit.h KMenuEdit)
- 
--if(NOT WIN32 AND ${KHotKeysDBusInterface_FOUND})
-+if(NOT WIN32 AND KHotKeysDBusInterface_FOUND)
- qt5_add_dbus_interface(
-     kmenueditcommon_STAT_SRCS
-     ${KHOTKEYS_DBUS_INTERFACE}
-@@ -82,7 +82,7 @@ install(TARGETS kmenuedit ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
- install( PROGRAMS org.kde.kmenuedit.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
- install( FILES kmenueditui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/kmenuedit )
- 
--if(NOT WIN32 AND ${KHotKeysDBusInterface_FOUND})
-+if(NOT WIN32 AND KHotKeysDBusInterface_FOUND)
- add_dependencies(kdeinit_kmenuedit kded_khotkeys)
- endif()
- 
--- 
-2.7.3
-
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.6.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.6.5.ebuild
deleted file mode 100644
index bb20a581c1b2..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.6.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Plasma menu editor"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kmenuedit"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+hotkeys"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	hotkeys? ( $(add_plasma_dep khotkeys) )
-"
-RDEPEND="${DEPEND}
-	!kde-base/kmenuedit:4
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.5.5-hotkeys.patch" )
-
-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 8856823c2919..cf89e4bd185d 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,4 +1,3 @@
-DIST kscreen-5.6.5.tar.xz 122108 SHA256 f9f301bde43c1171b7064834fad144bdc5df9b5882133f5a94c7dc5d27709699 SHA512 bf809392999b43b8fa3957df39a5bbf1a8a6877f7faee8ab17e91b4b68e2f892e2caa617744e8a76aadf40172c87ebbb017d48456bc3ba4e8489d754085b0b6c WHIRLPOOL 38a3cdea1786531d7bb97d5b74790b95d68ec225d8c6e537f37928fffa143e6d352f25e0beb0802eaeff51ee0531b0b425068318396140d5acb1790f11536136
 DIST kscreen-5.7.5.tar.xz 109144 SHA256 8d1d8c28591b2369510440f99321b0d97468ea9aa5a6eefa2a3385671f5e56c2 SHA512 df057cb36b095385d0e634a149faabd6a7f9413256569e7a2dcb759387e80ed517ccc21b1e0a7f79950444579fb0f2e2a28ee597f1d14cd3ea9667c41517f43d WHIRLPOOL aea5c49a9b3d17d2393893097fc03902136aef15678d1139c7b6f7045d9598121b53f503dad18974e525cfe6e946415501ca20d67a6b19c6d39bd1e9b138530c
 DIST kscreen-5.8.0.tar.xz 112688 SHA256 fdfb6d8b98dc5c024809fc010db840f6f8f9a6a9e874c4396a30951cb1cbe1a6 SHA512 d9513f5dcedd21755bb28b705c78874d417430b34997b2558f341d48a01a3f56e1c9a17f762a182b4a41c664c043b607cda9f77a274c85e2f82414a3f0bda873 WHIRLPOOL 2bb6b64c128a2994558275becfb00ea771b5457b6ed1f85118ba96f418b7d7df10b1e2d2d4ad450eb9b7c47f8bdc0377c98392fdd6c3ecb2fc8515e84bcef2d7
 DIST kscreen-5.8.1.tar.xz 112728 SHA256 d16d16a7d58e5775e0392ebb26683486d790632d71a119ffdc68c44d6e6d2d55 SHA512 26f3024c6676c14110b2e236240433f19d7ad2d16714aa6dc87bba2f423d263871d1d262557291eb8d3f4d745e99592e50bfe442166c03d0e850b9487c7c774c WHIRLPOOL e89f6f24de3cd97cc607d1c0cbe49cb88f478da4ec47f62bc207143dbad31490699f6864ecab238cc5b642132d7151d314ff14dae0616aae0fb22cfeca95cfc1
diff --git a/kde-plasma/kscreen/files/kscreen-5.6.5-config-fix.patch b/kde-plasma/kscreen/files/kscreen-5.6.5-config-fix.patch
deleted file mode 100644
index 56474aaa147b..000000000000
--- a/kde-plasma/kscreen/files/kscreen-5.6.5-config-fix.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From: Sebastian Kügler <sebas@kde.org>
-Date: Wed, 01 Jun 2016 14:54:16 +0000
-Subject: address race condition around setoperation
-X-Git-Tag: v5.6.95
-X-Git-Url: http://quickgit.kde.org/?p=kscreen.git&a=commitdiff&h=17199d32f292f7c44eb8cdce5b35396d3bd19eb8
----
-address race condition around setoperation
-
-Summary:
-Use a timer to avoid catching configChanged signals after we set
-changes.
-
-The long version:
-
-TL;DR: We have a race condition when the kscreen daemon starts. It looks
-up a known config, then applies it and subsequently resaves the config.
-The same happens on config changes, it writes, then re-reads and then
-re-writes the config change.
-I've managed to prevent this from happening by adding a timer that does
-avoids saving the config as a direct reaction to our own config changes.
-
-So what happens on kded5 startup after loading the kscreen2 module:
-
-- the kscreen config is requested and received
-- the kscreen daemon (KD) looks into its config directory for a suitable
-config file
-(a config file is identified by a combined hash of all screen
-attached, so unique per connected set of outputs)
-- KD usually finds a config
-- KD ignores configChanged events before it starts ...
-- a KScreen::SetConfigOperation to apply the "known config"
-- SetConfigOperation returns after a while (say 100ms later)
-- we re-enable the change monitor
-- we receive a configChanged signal
-- we save the new config (usually to the existing config file)
-
-I don't think this behavior is desirable. I don't see a reason why the
-daemon should save its config right after applying it. I think this
-causes more problems than we want, since the startup may overwrite the
-user's config. This behavior seems to be desired by the code in KD, it's
-already blocking configChanged signals during the SetOperation (which,
-to be honest may result in nightmarish behavior in any way, so it might
-be a kludge which aims too short).
-
-From libkscreen perspective, SetConfigOperation::finished cannot
-guarantee that all configChanged signals are already fired and that it's
-safe to watch for new, independent changes now. At least on X11, we
-simply don't know, and what we can do is wait a bit and cross fingers
-that we're not catching our own noise. The changed signal *may* come
-from a re-request of the edid information, but this is a bit hard to
-track down, and not too useful, anyway, since changed Edid may affect a
-large number of a screen's properties.
-In the Wayland backend, that's a different story and we can prevent this
-behavior at an earlier stage, so this timer is "probably not needed" (I
-haven't tested that).
-
-This effectively prevents KD from catching reactions to its own changes
-and does not trigger saving the config file on every login. It still
-reacts to changes from libkscreen, but will avoid re-saving the config a
-few times. The timer may not be the neatest of solutions for this, but
-it does help narrowing down the problem and may be a last resort action.
-Most importantly, it avoids the re-writing of the config on startup and
-plugging/unplugging a monitor effectively.
-
-The timer value of 100ms is also used in kwin, which should make the
-behavior (which is no problem in kwin) more solid.
-
-CCBUG:346961
-CCBUG:358011
-
-Reviewers: graesslin
-
-Reviewed By: graesslin
-
-Subscribers: plasma-devel, #plasma
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D1730
----
-
-
---- a/kded/daemon.cpp
-+++ b/kded/daemon.cpp
-@@ -23,6 +23,7 @@
- #include "kscreenadaptor.h"
- #include "debug.h"
- 
-+#include <QElapsedTimer>
- #include <QTimer>
- #include <QAction>
- #include <QShortcut>
-@@ -52,6 +53,7 @@
-  , m_buttonTimer(new QTimer())
-  , m_saveTimer(new QTimer())
-  , m_lidClosedTimer(new QTimer())
-+ , m_changeBlockTimer(new QElapsedTimer())
-  
- {
-     QMetaObject::invokeMethod(this, "requestConfig", Qt::QueuedConnection);
-@@ -82,6 +84,7 @@
-     delete m_saveTimer;
-     delete m_buttonTimer;
-     delete m_lidClosedTimer;
-+    delete m_changeBlockTimer;
- 
-     Generator::destroy();
-     Device::destroy();
-@@ -112,7 +115,6 @@
-     m_lidClosedTimer->setInterval(1000);
-     m_lidClosedTimer->setSingleShot(true);
-     connect(m_lidClosedTimer, &QTimer::timeout, this, &KScreenDaemon::lidClosedTimeout);
--
- 
-     connect(Device::self(), &Device::lidClosedChanged, this, &KScreenDaemon::lidClosedChanged);
-     connect(Device::self(), &Device::resumingFromSuspend,
-@@ -145,6 +147,9 @@
-     connect(new KScreen::SetConfigOperation(config), &KScreen::SetConfigOperation::finished,
-             [&]() {
-                 qCDebug(KSCREEN_KDED) << "Config applied";
-+                // We enable monitoring already, but we will ignore the first signals that come
-+                // in the next 100ms, since these are likely our own changes still flushing out
-+                m_changeBlockTimer->start();
-                 setMonitorForChanges(true);
-             });
- }
-@@ -182,6 +187,12 @@
- 
- void KScreenDaemon::configChanged()
- {
-+    if (m_changeBlockTimer->isValid() && !m_changeBlockTimer->hasExpired(100)) {
-+        m_changeBlockTimer->start();
-+        qCDebug(KSCREEN_KDED) << "Change detected, but ignoring since it's our own noise";
-+        return;
-+    }
-+    m_changeBlockTimer->invalidate();
-     qCDebug(KSCREEN_KDED) << "Change detected";
-     // Reset timer, delay the writeback
-     m_saveTimer->start();
-
---- a/kded/daemon.h
-+++ b/kded/daemon.h
-@@ -27,6 +27,7 @@
- 
- #include "generator.h"
- 
-+class QElapsedTimer;
- class QTimer;
- 
- namespace KScreen
-@@ -79,6 +80,7 @@
-         QTimer* m_buttonTimer;
-         QTimer* m_saveTimer;
-         QTimer* m_lidClosedTimer;
-+        QElapsedTimer* m_changeBlockTimer;
- };
- 
- #endif /*KSCREN_DAEMON_H*/
-
diff --git a/kde-plasma/kscreen/kscreen-5.6.5-r1.ebuild b/kde-plasma/kscreen/kscreen-5.6.5-r1.ebuild
deleted file mode 100644
index 8a32d0801e0c..000000000000
--- a/kde-plasma/kscreen/kscreen-5.6.5-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
-
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkscreen)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtgraphicaleffects)
-	!kde-misc/kscreen
-"
-
-PATCHES=( "${FILESDIR}/${P}-config-fix.patch" )
-
-# bug #580440, last checked 5.6.3
-RESTRICT="test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 669f79884da7..5df3c2dc8921 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,4 +1,3 @@
-DIST kscreenlocker-5.6.5.tar.xz 104236 SHA256 c6f0befcd230ec58f2994cad8c2f322f223e7422cfe33e641c664938e7960b06 SHA512 70d53e51f03913a80dbb33aec155d0cd94801157fd5db1c7706d0ffe430efc82963811045326091e7e2166cb03552f698a247012394b3b20f2d299530bec1272 WHIRLPOOL cc6a8e7625db2f762cc103232e03a3a97baf704350a2bdc68c6967f37dbaf8ed2527a09e509733624da15875b6277b6384a69c5ab8dbbf6835649cd08c89db99
 DIST kscreenlocker-5.7.5.tar.xz 102996 SHA256 65ffe3c15f71a8fe2a57a67f1edd91c26ac4b4be1dc566a3cfa8e57cb5bb0de1 SHA512 8985e9f4aa3a390c991c85ffe6993708a491df79e71067b7764c80e59ce76a2329ba22f26d89e9b44e2c11d4cd7c563ae60c61052eb217b9032cc1583c34d8e4 WHIRLPOOL c7c686142b64378235341c1eec2d49b6f7fd42b715b7493db9420f7ca3832209a487760f3a7a4b4016229fb0995b5ee12cb73c78ff7080f406a0ca40ea0507b0
 DIST kscreenlocker-5.8.0.tar.xz 107948 SHA256 fc771a797939eb1b76a8dba6bb02b7b59f6c41803f49a2331b38c32f226620c3 SHA512 4ff48ccf1c1e919b6a5fcc32360e3398bed9506b7e7adb6969a14e65d6cdbf96a954a6a243dd23e3e162dcb222f35cc85ec8b4d1d3569bee4bd6440743d61859 WHIRLPOOL 738d921980271e207ca323d74dcc668fba099331e94559e821ca7b3a2bf81c93449433620bd17c7299f3abeee5584f2b1515735e5b3f4eedd2a5cd2db072c3e8
 DIST kscreenlocker-5.8.1.tar.xz 108068 SHA256 30d3fd72a400720a37877c2a3bf0ce8ef1f84cb8807ac6ca35b7076ec8b92b22 SHA512 c418988944e3c185964603699d2438da1b06408a23d6c0a31db6f94716fb185c2d82db95ab12cd887fc16d103bfc520a910d210b50c914a816270fde47907b98 WHIRLPOOL ec176b0c374a8e3fe20b5a695d798175ac70f76e6ad32d325c3ba2e4f36ddccabd87dffd766033e2f1b24c0bc409bd4bcea57c3b171178b522364b7e2fa7667b
diff --git a/kde-plasma/kscreenlocker/files/kscreenlocker-5.4.90-no-SUID-no-GUID.patch b/kde-plasma/kscreenlocker/files/kscreenlocker-5.4.90-no-SUID-no-GUID.patch
deleted file mode 100644
index dc26f5f8922a..000000000000
--- a/kde-plasma/kscreenlocker/files/kscreenlocker-5.4.90-no-SUID-no-GUID.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt
-index a63fa1403e897e70989dc2e1ba7eed4bc69cbb51..12d1bfb3c690eca1acf344045a92eb942669da83 100644
---- a/kcheckpass/CMakeLists.txt
-+++ b/kcheckpass/CMakeLists.txt
-@@ -22,10 +22,6 @@ endif ()
- 
- set_property(TARGET kcheckpass APPEND_STRING PROPERTY COMPILE_FLAGS " -U_REENTRANT")
- target_link_libraries(kcheckpass ${UNIXAUTH_LIBRARIES} ${SOCKET_LIBRARIES})
--install(TARGETS kcheckpass DESTINATION ${KDE_INSTALL_LIBEXECDIR})
--install(CODE "
--    set(KCP_PATH \"\$ENV{DESTDIR}${KDE_INSTALL_LIBEXECDIR}/kcheckpass\")
--    execute_process(COMMAND sh -c \"chown root '\${KCP_PATH}' && chmod +s '\${KCP_PATH}'\")
--")
-+install(TARGETS kcheckpass DESTINATION ${LIBEXEC_INSTALL_DIR})
- 
- #EXTRA_DIST = README
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.6.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.6.5.ebuild
deleted file mode 100644
index 36ba476f5462..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.6.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-KEYWORDS="amd64 ~arm x86"
-IUSE="pam"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( virtual/pam )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!<kde-base/kcheckpass-4.11.22-r1:4
-	!kde-base/kdebase-pam:0
-	!<kde-plasma/plasma-workspace-5.4.50
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-5.4.90-no-SUID-no-GUID.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	use test || sed -i \
-		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	kde5_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package pam PAM)
-	)
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	newpamd "${FILESDIR}/kde.pam" kde
-	newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	if ! use pam; then
-		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 7c61b6e80005..cd65e155570f 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,5 +1,4 @@
 DIST 50971-ksshaskpass-0.5.3.tar.gz 11010 SHA256 a3a47eba74a52ec3d9d8740ed9a29a5aa852d4e268b5d81154f85b90258a2124 SHA512 0274b58fb9dbb634688e5ee8b22a88012483907769796733c79f8e3c115463702a9cdd787d49d0b94a7942f5f88ed3465a6161d6e4516711b2bba5c47a91fa50 WHIRLPOOL d3e68640d3e0049bdd071fe72bf0bd9767bf349c94b2fbb42e7fafe6259d895ec2d5122ae9477e66073c53cbbda704ec0237328dd948b21207b2db2b39946450
-DIST ksshaskpass-5.6.5.tar.xz 24796 SHA256 6a135876351314b3de565ab6e4d0d5753749045b9789373ffb2c754fd55152e1 SHA512 015437cd478ef3252c93e39fa88179cd383f4d148df64f597f3df9031433f12f4d74bd84ed9df2af4b1e7e24e961fa5d4ecd55624dc9e19ac78f604f5815fae6 WHIRLPOOL e829edeb52dfa76b07f9e54e86d9e773c7646e02edab301c7c893ee04cbd8334f23766df2deadb26eb9f6494cddb815a8054decef515da7f0ad63499c71a54d9
 DIST ksshaskpass-5.7.5.tar.xz 19232 SHA256 967288a9ba7b007dfdc540db00b3b9ab44c4195630144f26b1fc5b780dd00939 SHA512 4ba4d865e51e8e8ec416b3b164bfb46f0e44423b7abdeb6360cfbd9b2f743dd76664f9844120e102f575d5b0babad20a36846b94e921db43ea414ecc08fe43ec WHIRLPOOL ca55d956678b73e803e0463c82740e8b10314c598ca6a394b8b436155f6d0b36a0ca79e72d9016f4e55639b8ef328362678567fab2adce3ef16ff9f573938697
 DIST ksshaskpass-5.8.0.tar.xz 19260 SHA256 4b1fdbd4edbbe65675e43556992982ee03d1c1c95fbd2c80f4003164558f74d2 SHA512 2b420b7e4af6db0f65036c84dd80b277e8705f7ad497adb16d326cc718b8365ba7363d867265609f9b78942fb521a377c3852c095249f1b5b54e46d342403358 WHIRLPOOL cdf762cadddc224d3d9d11e6f70633ec305c3d0c26e86fbdb1f293ab0f0c33f72b3d9df2c6c22509c0a989ebce18e222b2dc03c2c36960c799afeab63ac186ea
 DIST ksshaskpass-5.8.1.tar.xz 19252 SHA256 16d3ef59bee744453cd492916ae8418126cda5e4365b253fa03fa4dd1512aa7a SHA512 f789e1f1486bc809eb0ab8805820eced3bbf71bd2e7e27f52112e0089faa58f8ac9e627dc16bcfa8ff162e38e58e4950083e4ee14e3f254eb4835d14ba686096 WHIRLPOOL 968302cca35e09f8131fca96823583bac308dd862b9f5a506fbeb9e055674350f3c0f386eed75dedca8f2478921442789eb7ac149db95bd2a7db58c5c33e16b0
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.6.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.6.5.ebuild
deleted file mode 100644
index a8ec53863e42..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.6.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/ksshaskpass"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="
-	${DEPEND}
-	!kde-plasma/ksshaskpass:4
-"
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	elog ""
-	elog "In order to have ssh-agent start at kde startup,"
-	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
-	elog "the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
-	elog "properly kill the agent when the session ends."
-	elog
-	elog "${PN} has been installed as your default askpass application"
-	elog "for Plasma 5 sessions."
-	elog "If that's not desired, select the one you want to use in"
-	elog "/etc/plasma/startup/05-ksshaskpass.sh"
-	elog ""
-}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 204543948394..d8961101a3f6 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,4 +1,3 @@
-DIST ksysguard-5.6.5.tar.xz 615780 SHA256 589644d5a9ba6040c38bf21a942cfbcb5cfe1254d6e09563dea7bca225c2244a SHA512 cb4f084b1ae26bf80194528ca8909611dbb6dcd91cf66fba5f7fe68eb04e43f4a8be2989aac2d7ecfe550622417ec75d2d5e635fea8313d4f9c03623fd6f7eb2 WHIRLPOOL edf04b0d17cf46b64c5a0d353d0865e0a01814b948b4cb2f8b628d588d8de21bb6691be0cf63288c3eaa943a909b57ec93068210d3c401a8b82c0bcc653c52ee
 DIST ksysguard-5.7.5.tar.xz 487508 SHA256 4767872c282ffade3f113b9aeca95f0ec4d70fa7c3e8ef14e12ab341004a3e2d SHA512 b882d57d0fe5fc36d8d9d56819a3a9d002df1e60ec324e61ac9cc30f933b737658270a47c9482985724d8cac8c2c582ad494ac870df6e2c2ac9213966bf3ae21 WHIRLPOOL 3ae8b03e2666b69d6aea0043f5cc16dd7e90d1f7bcdb89e2c8ae42014630f80fd068d9271e6612e991cb4190ba9086fda7c1f9a0ab0d217e0d06576d709defe6
 DIST ksysguard-5.8.0.tar.xz 487556 SHA256 df91f210baea22b1e8c0ecce8c3ab2dace0b143c4a52d9f9b9d1c178797f06b3 SHA512 d2356c68572511b2474607f7c5b78fa6aff31f5530c5de4770ce19c0d12ae5f07adea69752fb7b63431bf7d1bbb3586ccb549d582a500490d3d558fd7d792f12 WHIRLPOOL 9be7be9b39e47093fc4e212813545c4da6901538a9e2a6c638d896f9ee1bcc8dc51533d0b11f6460eb528be53d1b5814fb64f26a833252f59a735f380d4448f9
 DIST ksysguard-5.8.1.tar.xz 487588 SHA256 c9b2d50e65ca6a2a5d52cc7ec0c7bc80e9b4e7c72d9bf8d0f1c1144b29ec59d7 SHA512 d16514d7f47f905aafbb48ca74ed71daff76f8a090fb3618c0032665ea1dc4cccaec1e42073af4d92c8816cc04c3bbac05e89db49451d429b751673f3340bcb3 WHIRLPOOL c084259651c350c41b587ecc603035844bd190c28af842b8e3d0bc44b72bf52dbc4a496aa3d78286909ec911cbe956f0bb9ae4ec1f8a0b85dc07d761ca9a1a5c
diff --git a/kde-plasma/ksysguard/ksysguard-5.6.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.6.5.ebuild
deleted file mode 100644
index b040be281cf8..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.6.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE="lm_sensors"
-
-DEPEND="
-	$(add_plasma_dep libksysguard)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep 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)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-RDEPEND="${DEPEND}
-	!kde-base/ksysguard:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-gui.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm_sensors Sensors)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index f4968a98ff85..57471d476de6 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,4 +1,3 @@
-DIST kwallet-pam-5.6.5.tar.xz 17576 SHA256 f58dbd266ac166164a137878c5e69c0cf8a8693ce17d45a7d94b29cb67c2a229 SHA512 39254288cba7204e5045668b4f0c5bf6b7b1294e704692f402d68afbfb9f0450508634a690fdef13b3c08651d09b36b00aea949bbcc7a99658ebdf72e1166c08 WHIRLPOOL 27b1ed01ff6eb7f2425cfe63337a9d43a74c73b3991a1df452d297b7665b9bb1a59783ab19abe32e11456fd80f44c3cf89b833d73a8cd800c291f41681944fa3
 DIST kwallet-pam-5.7.5.tar.xz 17648 SHA256 4a1bbb60eebae92469169826314607ce5592559a13027f0c4b6200c1d1755dd2 SHA512 ff8694ce9587b402a0ccc74ac6c293bcefbbd4ecc01817f958c28b5c18da28ca9f3a0ff8eb48ac8a55d54e2d68cfefe147112bde11395d5b1350819be26456de WHIRLPOOL 854d3263d0de34c96f7a49b7fe905a1d0d586634640b4fee8c7bb4577295db2d56c7a102b342b1314d6d0b7cc07a2adeedfd4d62203d8d1b57bc1969a3dfd1ca
 DIST kwallet-pam-5.8.0.tar.xz 17680 SHA256 b0f99629a58297ead5a839baa97e71e805ae2cff635f871b34d772b515763883 SHA512 8256742400e52ff8510e8000935ac133ba27df6cf70a518db1e9dd126fc73011c183589493bdc6c733df3e06b7dd6e24bbb94269d7fb8be4928c8c743f51116a WHIRLPOOL 62da92d7c6bfddccd3985d78f32b645cee5d158d54195b63cd476a987617d97e39ebe6ff19fcdd803bc485534b72dbd6b12eb731ac36ca177252e5a8825ca778
 DIST kwallet-pam-5.8.1.tar.xz 17676 SHA256 9e4d8acd454105b64593956e428ac4f9231c00edc53a4f6f83580b1dcea280da SHA512 313dd2ec02ef1c23b68b006d38baad1d6be893995af197bfd7c43106f95d5ce0202dbb9d7f0e2265f58c2c396edaef23ee65cb22d9c1a1d98956c377d997bfcd WHIRLPOOL 708355179808c982d131893236746e59188bb0f7603a9cece1ec9a4c3176487eba96916121ed5f75b012f2a249e2f76297b1ac4ec4874733582a97e16b78477c
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.6.5-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.6.5-r1.ebuild
deleted file mode 100644
index 81fc49b11248..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.6.5-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-inherit kde5 multibuild multilib
-
-DESCRIPTION="KWallet PAM module to not enter password again"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+oldwallet"
-
-COMMON_DEPEND="
-	dev-libs/libgcrypt:0=
-	virtual/pam
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kwalletd-pam
-	net-misc/socat
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev oldwallet) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		)
-		[[ ${MULTIBUILD_VARIANT} = oldwallet ]] && mycmakeargs+=( -DKWALLET4=1 )
-
-		kde5_src_configure
-	}
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
-
-pkg_postinst() {
-	check_dm() {
-		local good
-		if [[ -e "${ROOT}${2}" ]] ; then
-			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
-				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-				good=true
-			fi
-			if use oldwallet ; then
-				if ! grep -Eq "auth\s+optional\s+pam_kwallet.so" "${ROOT}${2}" || \
-					! grep -Eq "session\s+optional\s+pam_kwallet.so" "${ROOT}${2}" ; then
-					good=false
-				fi
-			fi
-		fi
-		[[ "${good}" = true ]] && \
-			elog "    ${1} - ${2} ...GOOD" || \
-			ewarn "    ${1} - ${2} ...BAD"
-	}
-	elog
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	use oldwallet && elog "You have also selected support for legacy kde-apps/kwalletd:4."
-	elog "List of things to make it work:"
-	elog "1.  Use standard blowfish encryption instead of GPG"
-	elog "2.  Use same password for login and kwallet"
-	elog "3.  A display manager with support for PAM"
-	elog "4.a Have the following lines in the display manager's pam.d file:"
-	elog "    -auth        optional        pam_kwallet5.so"
-	elog "    -session     optional        pam_kwallet5.so auto_start"
-	if use oldwallet ; then
-		elog "    -auth        optional        pam_kwallet.so kdehome=.kde4"
-		elog "    -session     optional        pam_kwallet.so"
-	fi
-	elog "4.b Checking installed DMs..."
-	has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
-	has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
-	has_version "kde-base/kdm" && check_dm "KDM" "/etc/pam.d/kde"
-	elog
-}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index b586eb5b85d2..ded00f9438b7 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,4 +1,3 @@
-DIST kwayland-integration-5.6.5.tar.xz 17164 SHA256 f054e10afe855e743b01eccdea90f6a33bbb549acf2eb20a0e296061406ac6e9 SHA512 388591a34914aaf1ce33461dfaf4b952e1d74ee4b6869f56d379f010155498d0020cf0fc87256d398096f50012a6e7ad9fec5b55d7ab7f1c7e2cfbb017c82768 WHIRLPOOL e991c4cfd9ddd85557a4cd46bd580312e2252c54177c1278a4daf88a2d13fce7b14e5d96856813701af47be9aedb442783d83b97b91e53cb5eef18e655628844
 DIST kwayland-integration-5.7.5.tar.xz 18076 SHA256 d487d994414747db0efe6a838b7696431ceda1392fd99e158d4b587b0cc648b5 SHA512 765c5dea8cf1c9cb2fb93982c438544c49943203d037468e605720cda8831ecd47a618b2bc32dd12832c560cc6d2b23eca1c546acf11bf539b548e824d30b2c0 WHIRLPOOL 3ff2f4d8db914811d17deb3ab92f542e2b64ea5a75a452441389b98a4b44cd6af2a4eea0be9bb3f60ff85d18b2a075a6a46ec4eb2218c63cb50231dd8aff159d
 DIST kwayland-integration-5.8.0.tar.xz 18108 SHA256 78237f27cf0c6ad394e53c40a9476399da5abce103df94f5238e6cf1f692d75f SHA512 9354ff87ad21f6ed37d81c3a84707ce14e5ee0aa9d0b230cda6366a789d474d6b247d4fc5976ba5c245e7c76dd7a01504a508141330ed4a96ddfe092fab72aac WHIRLPOOL 64466ed26eeb74695e6da5c5ef4dda045e396e6515aeb1bd35cf3a27ce7fe6e2a68dbf0abd2a585f98ab1ed686d7945a7cd3c2296b76e7eb6c74009e8b22539f
 DIST kwayland-integration-5.8.1.tar.xz 18108 SHA256 307688799889e4d6dbecdd811397a3167cab17b9d0d50de3fff96433cfa68de3 SHA512 750f351a929143abe35c84f3802d73d9ad117dd65b4f227aa615ef0a317c0bc70f608413be8acf0ef5f0be2db7c250881b6540607b862ef7029bbdabf1f47f8e WHIRLPOOL c58b92126050f3b7df140c0e88751a6549af027dfd684fd96e49aef90eab1d63433f11e8708860a0d28b664161084fe0f71f1ec170fcbb0796cbee4c5e551268
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.6.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.6.5.ebuild
deleted file mode 100644
index fcd4a003e6e1..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.6.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kwayland-integration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index c9eea60fd471..d45a54204320 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,4 +1,3 @@
-DIST kwin-5.6.5.tar.xz 3915556 SHA256 e4c358f828d9c30b7067f32a9efb515b99f6c8a9d16c116b13b1f271464d7884 SHA512 8aef16af5242b08c4e78f1712d295072434229f3500a7312bb731835ef24ac8b2ee8e3bba139b9fd404ed630dd691eee2f0f284d3679796a32882083ff6783eb WHIRLPOOL 4d6e3299c30fbc580331bb2a91e50a199e49c1b85d31691b5558182ac1d19b55ba5ff80963788d127dd7dfbeef3a4676af89deb257dd1186352532a4cbaed6c2
 DIST kwin-5.7.5.tar.xz 3936628 SHA256 ab1e98d3ff19699c89343a51861202dd93c913eb9d9215118c3fab86e99126d6 SHA512 6a7dbf9cf66006516179c5868e47038e0f967f3b2bbe6b431a707cd8ce03cc8dcea800f1dfd6a9482c30321e3b3b84593162bb050f045be4cffdadbc0090f9d7 WHIRLPOOL 75537ec4717e6a41280f97fb137ff28459d03789e79897a81da558c7fcae0ac08c64e9f034d6d9ef42e290d894173c96a1a3ab9dbaa9c6193b3d1272fedbaaf6
 DIST kwin-5.8.0.tar.xz 3970260 SHA256 0c9710a7959fde3c468e255c938c41d94f92458483a509e9c3cdfaca9d0b999e SHA512 bcc8fbc1dc0f9bf3bd975da3db629d3ecca1223f1cfd06c8b261f8d892603008b3861cddd3c8c01f18d9c85300f0688dd0139d2899293bf7f685951d3d441759 WHIRLPOOL 5e7f500b43de270dc0fb4f09e7a43b94d3891289bc432dab556ac4540cd612a9676efbbf184d7aa45ed819b5cda3063dd6bcf5c6e186f477ab02946dd8fe7ad1
 DIST kwin-5.8.1.tar.xz 3972880 SHA256 74a976769cdcaca0b8c52e83cc2895d0860870b0e9dba22418deb983fe36372c SHA512 a91a024ea7eb7c317d38fb62a600717732d56a064a31d3fc067559967f0c2457bd55b5b889f241a1c0c86eca8e72fc957c0fbf5a6d3668fb922790e04c96bbc9 WHIRLPOOL 5195bcc3aca753b799ead2072b97cad98439c596bd413887e285513355a4c6cdad2f6361de81c2008bad33970c7bd3fe2400f666442ad75b885e10560f2a128d
diff --git a/kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch b/kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch
deleted file mode 100644
index 06016e0320d9..000000000000
--- a/kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/logind.cpp b/logind.cpp
-index 22a86cdfceaac3138a186cb2f7ab3eae674a1c77..7be9366614c0b70808c6944161a5801773f34a24 100644
---- a/logind.cpp
-+++ b/logind.cpp
-@@ -28,6 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <QDBusUnixFileDescriptor>
- 
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <unistd.h>
- #include "utils.h"
- 
-diff --git a/virtual_terminal.cpp b/virtual_terminal.cpp
-index 40628315620e3d943b7ae0462c4415072fc256b8..8ceb74d3adaae610d99fa7e8349d93cea366d2e8 100644
---- a/virtual_terminal.cpp
-+++ b/virtual_terminal.cpp
-@@ -36,6 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <sys/ioctl.h>
- #include <sys/signalfd.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- 
- #define RELEASE_SIGNAL SIGUSR1
- #define ACQUISITION_SIGNAL SIGUSR2
diff --git a/kde-plasma/kwin/files/kwin-5.6.5-legacy-session-mgmt.patch b/kde-plasma/kwin/files/kwin-5.6.5-legacy-session-mgmt.patch
deleted file mode 100644
index 067124a55640..000000000000
--- a/kde-plasma/kwin/files/kwin-5.6.5-legacy-session-mgmt.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-commit 59740e7416bb2b3a9852212fa4b213e5ba76deb7
-Author: Andreas Hartmetz <ahartmetz@gmail.com>
-Date:   Thu Jun 23 19:40:40 2016 +0200
-
-    Revert "Remove saving and loading (and client matching by) WM_COMMAND."
-    
-    This reverts commit 2eac7634cc524bf5e425cf081a639a6b6407e380.
-    
-    CCBUG: 362671
-
-diff --git a/activities.cpp b/activities.cpp
-index 25eb1c1..42c5db8 100644
---- a/activities.cpp
-+++ b/activities.cpp
-@@ -169,7 +169,7 @@ void Activities::reallyStop(const QString &id)
-         const Client* c = (*it);
-         const QByteArray sessionId = c->sessionId();
-         if (sessionId.isEmpty()) {
--            continue;
-+            continue; //TODO support old wm_command apps too?
-         }
- 
-         //qDebug() << sessionId;
-diff --git a/sm.cpp b/sm.cpp
-index 08810a4..ca1edea 100644
---- a/sm.cpp
-+++ b/sm.cpp
-@@ -109,8 +109,12 @@ void Workspace::storeSession(KConfig* config, SMSavePhase phase)
-     for (ClientList::Iterator it = clients.begin(); it != clients.end(); ++it) {
-         Client* c = (*it);
-         QByteArray sessionId = c->sessionId();
-+        QByteArray wmCommand = c->wmCommand();
-         if (sessionId.isEmpty())
--            continue;
-+            // remember also applications that are not XSMP capable
-+            // and use the obsolete WM_COMMAND / WM_SAVE_YOURSELF
-+            if (wmCommand.isEmpty())
-+                continue;
-         count++;
-         if (c->isActive())
-             active_client = count;
-@@ -140,6 +144,7 @@ void Workspace::storeClient(KConfigGroup &cg, int num, Client *c)
-     QString n = QString::number(num);
-     cg.writeEntry(QLatin1String("sessionId") + n, c->sessionId().constData());
-     cg.writeEntry(QLatin1String("windowRole") + n, c->windowRole().constData());
-+    cg.writeEntry(QLatin1String("wmCommand") + n, c->wmCommand().constData());
-     cg.writeEntry(QLatin1String("resourceName") + n, c->resourceName().constData());
-     cg.writeEntry(QLatin1String("resourceClass") + n, c->resourceClass().constData());
-     cg.writeEntry(QLatin1String("geometry") + n, QRect(c->calculateGravitation(true), c->clientSize()));   // FRAME
-@@ -180,8 +185,12 @@ void Workspace::storeSubSession(const QString &name, QSet<QByteArray> sessionIds
-     for (ClientList::Iterator it = clients.begin(); it != clients.end(); ++it) {
-         Client* c = (*it);
-         QByteArray sessionId = c->sessionId();
-+        QByteArray wmCommand = c->wmCommand();
-         if (sessionId.isEmpty())
--            continue;
-+            // remember also applications that are not XSMP capable
-+            // and use the obsolete WM_COMMAND / WM_SAVE_YOURSELF
-+            if (wmCommand.isEmpty())
-+                continue;
-         if (!sessionIds.contains(sessionId))
-             continue;
- 
-@@ -221,6 +230,7 @@ void Workspace::addSessionInfo(KConfigGroup &cg)
-         session.append(info);
-         info->sessionId = cg.readEntry(QLatin1String("sessionId") + n, QString()).toLatin1();
-         info->windowRole = cg.readEntry(QLatin1String("windowRole") + n, QString()).toLatin1();
-+        info->wmCommand = cg.readEntry(QLatin1String("wmCommand") + n, QString()).toLatin1();
-         info->resourceName = cg.readEntry(QLatin1String("resourceName") + n, QString()).toLatin1();
-         info->resourceClass = cg.readEntry(QLatin1String("resourceClass") + n, QString()).toLower().toLatin1();
-         info->geometry = cg.readEntry(QLatin1String("geometry") + n, QRect());
-@@ -269,6 +279,7 @@ SessionInfo* Workspace::takeSessionInfo(Client* c)
-     SessionInfo *realInfo = 0;
-     QByteArray sessionId = c->sessionId();
-     QByteArray windowRole = c->windowRole();
-+    QByteArray wmCommand = c->wmCommand();
-     QByteArray resourceName = c->resourceName();
-     QByteArray resourceClass = c->resourceClass();
- 
-@@ -302,8 +313,10 @@ SessionInfo* Workspace::takeSessionInfo(Client* c)
-             if (info->resourceName == resourceName
-                     && info->resourceClass == resourceClass
-                     && sessionInfoWindowTypeMatch(c, info)) {
--                realInfo = info;
--                session.removeAll(info);
-+                if (wmCommand.isEmpty() || info->wmCommand == wmCommand) {
-+                    realInfo = info;
-+                    session.removeAll(info);
-+                }
-             }
-         }
-     }
-diff --git a/sm.h b/sm.h
-index 4c5fda6..529187d 100644
---- a/sm.h
-+++ b/sm.h
-@@ -41,6 +41,7 @@ class Client;
- struct SessionInfo {
-     QByteArray sessionId;
-     QByteArray windowRole;
-+    QByteArray wmCommand;
-     QByteArray wmClientMachine;
-     QByteArray resourceName;
-     QByteArray resourceClass;
-diff --git a/toplevel.cpp b/toplevel.cpp
-index af368b5..4a7ec6d 100644
---- a/toplevel.cpp
-+++ b/toplevel.cpp
-@@ -177,6 +177,19 @@ QByteArray Toplevel::sessionId() const
-     return result;
- }
- 
-+/*!
-+  Returns command property for this client,
-+  taken either from its window or from the leader window.
-+ */
-+QByteArray Toplevel::wmCommand()
-+{
-+    QByteArray result = Xcb::StringProperty(window(), XCB_ATOM_WM_COMMAND);
-+    if (result.isEmpty() && wmClientLeaderWin && wmClientLeaderWin != window())
-+        result = Xcb::StringProperty(wmClientLeaderWin, XCB_ATOM_WM_COMMAND);
-+    result.replace(0, ' ');
-+    return result;
-+}
-+
- void Toplevel::getWmClientMachine()
- {
-     m_clientMachine->resolve(window(), wmClientLeader());
-diff --git a/toplevel.h b/toplevel.h
-index 3133851..91eee5f 100644
---- a/toplevel.h
-+++ b/toplevel.h
-@@ -274,6 +274,7 @@ public:
-     QByteArray sessionId() const;
-     QByteArray resourceName() const;
-     QByteArray resourceClass() const;
-+    QByteArray wmCommand();
-     QByteArray wmClientMachine(bool use_localhost) const;
-     const ClientMachine *clientMachine() const;
-     Window wmClientLeader() const;
diff --git a/kde-plasma/kwin/kwin-5.6.5-r1.ebuild b/kde-plasma/kwin/kwin-5.6.5-r1.ebuild
deleted file mode 100644
index 3827863e2101..000000000000
--- a/kde-plasma/kwin/kwin-5.6.5-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE window manager"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gles2 multimedia"
-
-# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kscreenlocker)
-	$(add_qt_dep qtcore '' '' '5=')
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=,opengl(+)')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=dev-libs/libinput-0.10
-	>=dev-libs/wayland-1.2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,gles2?,wayland]
-	virtual/libudev:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.4.1
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	multimedia? (
-		|| (
-			$(add_qt_dep qtmultimedia 'gstreamer,qml')
-			$(add_qt_dep qtmultimedia 'gstreamer010,qml')
-		)
-	)
-	!<kde-apps/kdeartwork-meta-15.08.3-r1:4
-	!kde-base/kwin:4
-	!kde-base/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep designer)
-	$(add_qt_dep qtconcurrent)
-	x11-proto/xproto
-	test? (	x11-libs/xcb-util-wm )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.6.3-glibc-sysmacros.patch"
-	"${FILESDIR}/${PN}-5.6.5-legacy-session-mgmt.patch" # backport in 5.6 after release
-)
-
-src_prepare() {
-	kde5_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
-}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 180ef26db7d4..a15e38e9fba5 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,4 +1,3 @@
-DIST kwrited-5.6.5.tar.xz 20260 SHA256 394c810af70211f6205e462581409c5bb8e9e7cc5aafbe1318579191d7152aa7 SHA512 f7d074da8d7241e3d6bf2b0e793326f3b70986a1b6702276a9f5470005774c8bec8962ec7dc8c5d5141ebd1301e1c451c55c13f08d1e3bb7d9d271b0be13bb76 WHIRLPOOL 3780165282ee523a99165b7aedb8b0ed877b4088abe737ba525f7c54994b688f5276249c3e912729e22d56d733bc9ef2c50c69cf7295bceea71bbc9d5f7fcb1b
 DIST kwrited-5.7.5.tar.xz 20216 SHA256 3a63a54fa5c199463da526a05e755c5ffafd2b12ea4c7d1212a96991307e124f SHA512 a82c824791e2bffb08fcf39d37082bf6cd12aa98374297b470e545e5f89ef8ac643a29a6f0747ee89cc383a553851328bd296bf4c0cd6b0ec4357399d7547ec0 WHIRLPOOL c906d062ce4eb67eb86bb2cd051bad62f6bfa5a2cf641ff96303f0b4cf925a405bd6ac847d9897040d4b38797658e1c222fcebb6854f8fabb7a18596cd7bab31
 DIST kwrited-5.8.0.tar.xz 20420 SHA256 8ec5d9737f954751b20233a25b98595095a94c57c2dd4f82f03ae3a7c2722e82 SHA512 606efcbaba5fd1a5cdfcc63f6d7809c0c8ada1dffe8b19c0eceee76e9e5caf8c76398b871e2953e5a2e8975aa859f38ae3f024312345e43ffb37bf541704f134 WHIRLPOOL 777584d7ff25e0f46d84774e53f2a74b126bf9ff83e12154b9d524a1697a7f0ba4d909a555cfc8811c813926e986d15b02ac281af62d16e14fe83a31ea8f019e
 DIST kwrited-5.8.1.tar.xz 20396 SHA256 feadce4242b85f89d1851cf8e5b1cb9cac6f894afac6753a39011eca33a7676a SHA512 82da8bd52c2b157756fc8692fc3a1b232959b9314425e96878e2f36d766c44d4742f36a9111fb1d6ad944f9e7a86b396f4425d17ff70854f8e91aa7c091bd18a WHIRLPOOL f042857b1903d8897a4b8264717e8eb3dd6e69b8f1d92e7ef52c9d174077def46a72415eda65781af51fe5c85cd352ea873612883e105a89507073b2d0de731a
diff --git a/kde-plasma/kwrited/kwrited-5.6.5.ebuild b/kde-plasma/kwrited/kwrited-5.6.5.ebuild
deleted file mode 100644
index 4e7d5ffc1935..000000000000
--- a/kde-plasma/kwrited/kwrited-5.6.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE daemon listening for wall and write messages"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpty)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-base/kwrited:4
-"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 3fea72447be9..bf39f0111f09 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,4 +1,3 @@
-DIST libkscreen-5.6.5.tar.xz 83852 SHA256 199227873bae459176deb7ba515d533f6554f7c6c9126507e9a7df598b64a198 SHA512 6a10bf2180cbf5ed7ae86caa7191753245933d87261aca720fd927d195ca72114cab3685c9f8d08a23af2f9b42444cc587c642188eac86641c5e19109a1dd028 WHIRLPOOL eed1a239dd5f7626c3aad9f2cbdb756520aa0d8f40f348c1f897fb75ff5557797e199c28fb08cc11717e4b960984de0d6dd06c7c915f33c7281ed7c147cfadf7
 DIST libkscreen-5.7.5.tar.xz 90280 SHA256 e11894969cfb6d094f6cdcca1ab3a2d3b1238f17fb6645119629737c1e989c7c SHA512 a4880911b931251dc12d1d04f9157d5815e382b42b6337aa9ce1ea580cb379e748b2b5b8aeb1f06af63d28c6a9e7e7ec21703d87d7d7655b7522336138c350e4 WHIRLPOOL e73a9a4f81a0d2957e733a8e243ad19fe3365c42753ffb32421d2279ba3d96e17c21b1e45b7fd6c30b8aa53b5897c3c0f2434d6a9ab72af4fecdf6f46c323b98
 DIST libkscreen-5.8.0.tar.xz 92868 SHA256 a962ee148e811c1be125ad8dd27db99abd9bac4e0feb57ede13ff0151d6bf82f SHA512 6bbf132cd5dc647df97f816cd285c688192e083d2bf39e9d5f61934484e735a91c3d5d530f8fb060c280d887092b0fa27b275a73d90babe0973b684d6bea7e36 WHIRLPOOL b56d310343a2d04aeb49baebeea19d946b77f4cd518f49384a7621fa86d81837566949bca6e66aef65d10c9ae5b4974835a76df1bc1527694c73a9a9faa33084
 DIST libkscreen-5.8.1.tar.xz 92836 SHA256 84edcebe39f39a0a8e0080b7e6999bff30a90fd2796fbb71f3a9cbb713b1f7dd SHA512 e5d814cd8754b5bc5db8e740fceb523e09f08cd050057f49b9faf3c55e50d7d2d7bdaeb3e62eb82aacb18bf450c13b444fd185ec6c8936761feea0b9e6f899ae WHIRLPOOL a88b442383022b1e351f322c949976ad3608a8fc975542ad15af74256853e0b99787bc84b3c9616b68c4d4a1fa03b15b67099a6ffc62b37b129747c3ea12932b
diff --git a/kde-plasma/libkscreen/files/libkscreen-5.6.5-config-fix.patch b/kde-plasma/libkscreen/files/libkscreen-5.6.5-config-fix.patch
deleted file mode 100644
index 3455f6352ab9..000000000000
--- a/kde-plasma/libkscreen/files/libkscreen-5.6.5-config-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 3cd70aa1cef0b4aab8c13bba049e5b1ccd6ae1ab
-Author: Kai Uwe Broulik <kde@privat.broulik.de>
-Date:   Thu Jun 2 10:39:02 2016 +0200
-
-    [Backend Manager] emitBackendReady() only after fetching the config finishes
-    
-    Without a valid config in the BackendManager, KScreen::Config::canBeApplied always
-    returns false sometimes causing KScreen to ignore stored config on startup.
-    Wait until we have a config before telling that the backend is ready.
-    
-    REVIEW: 128074
-
-diff --git a/src/backendmanager.cpp b/src/backendmanager.cpp
-index 570f575..676bb5d 100644
---- a/src/backendmanager.cpp
-+++ b/src/backendmanager.cpp
-@@ -353,14 +353,13 @@ void BackendManager::onBackendRequestDone(QDBusPendingCallWatcher *watcher)
-     connect(new GetConfigOperation(GetConfigOperation::NoEDID), &GetConfigOperation::finished,
-             [&](ConfigOperation *op) {
-                 mConfig = qobject_cast<GetConfigOperation*>(op)->config();
-+                emitBackendReady();
-             });
-     // And listen for its change.
-     connect(mInterface, &org::kde::kscreen::Backend::configChanged,
-             [&](const QVariantMap &newConfig) {
-                 mConfig = KScreen::ConfigSerializer::deserializeConfig(newConfig);
-             });
--
--    emitBackendReady();
- }
- 
- void BackendManager::backendServiceUnregistered(const QString &serviceName)
diff --git a/kde-plasma/libkscreen/files/libkscreen-5.6.5-fix-crash.patch b/kde-plasma/libkscreen/files/libkscreen-5.6.5-fix-crash.patch
deleted file mode 100644
index 71dc5f3f236a..000000000000
--- a/kde-plasma/libkscreen/files/libkscreen-5.6.5-fix-crash.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-commit a0219e9d8292b70ac3ffa632a9c48cdcee44c9fb
-Author: Sebastian Kügler <sebas@kde.org>
-Date:   Tue Jun 7 14:35:11 2016 +0200
-
-    Fix crasher on application quit, bump Qt dep to 5.4
-    
-    Something changed inside QScreen, and now we get invalid objects during
-    teardown, where they previously were still accessible. Qt has "new" API
-    as of 5.4 so use that and prevent the crash from happening.
-    
-    REVIEWED-BY:Aleix Pol
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c834d9..1f6f890 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,7 +16,7 @@ include(ECMQtDeclareLoggingCategory)
- include(FeatureSummary)
- include(CheckCXXCompilerFlag)
- 
--set(REQUIRED_QT_VERSION 5.2.0)
-+set(REQUIRED_QT_VERSION 5.4.0)
- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Test X11Extras)
- 
- # Wayland backend
-diff --git a/backends/qscreen/qscreenconfig.cpp b/backends/qscreen/qscreenconfig.cpp
-index c3c69db..156d973 100644
---- a/backends/qscreen/qscreenconfig.cpp
-+++ b/backends/qscreen/qscreenconfig.cpp
-@@ -39,6 +39,7 @@ QScreenConfig::QScreenConfig(QObject *parent)
-     }
-     m_blockSignals = false;
-     connect(qApp, &QGuiApplication::screenAdded, this, &QScreenConfig::screenAdded);
-+    connect(qApp, &QGuiApplication::screenRemoved, this, &QScreenConfig::screenRemoved);
- }
- 
- QScreenConfig::~QScreenConfig()
-@@ -75,14 +76,12 @@ void QScreenConfig::screenAdded(const QScreen *qscreen)
-     qscreenoutput->setId(outputId(qscreen));
-     m_outputMap.insert(qscreenoutput->id(), qscreenoutput);
- 
--    connect(qscreen, &QObject::destroyed, this, &QScreenConfig::screenDestroyed);
--
-     if (!m_blockSignals) {
-         Q_EMIT configChanged(toKScreenConfig());
-     }
- }
- 
--void QScreenConfig::screenDestroyed(QObject *qscreen)
-+void QScreenConfig::screenRemoved(QScreen *qscreen)
- {
-     qCDebug(KSCREEN_QSCREEN) << "Screen removed" << qscreen << QGuiApplication::screens().count();
-     // Find output matching the QScreen object and remove it
-diff --git a/backends/qscreen/qscreenconfig.h b/backends/qscreen/qscreenconfig.h
-index 1dfcc95..2c80eed 100644
---- a/backends/qscreen/qscreenconfig.h
-+++ b/backends/qscreen/qscreenconfig.h
-@@ -45,7 +45,7 @@ public:
- 
- private Q_SLOTS:
-     void screenAdded(const QScreen *qscreen);
--    void screenDestroyed(QObject *qscreen = 0);
-+    void screenRemoved(QScreen *qscreen);
- 
- Q_SIGNALS:
-     void configChanged(const KScreen::ConfigPtr &config);
diff --git a/kde-plasma/libkscreen/libkscreen-5.6.5-r1.ebuild b/kde-plasma/libkscreen/libkscreen-5.6.5-r1.ebuild
deleted file mode 100644
index c05ae65eb041..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.6.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma screen management library"
-SLOT="5/7"
-KEYWORDS="amd64 ~arm x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kwayland)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	X? ( x11-libs/libxcb )
-"
-RDEPEND="${DEPEND}
-	!x11-libs/libkscreen:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-config-fix.patch"
-	"${FILESDIR}/${P}-fix-crash.patch"
-)
-
-# requires running session
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/libkscreen/libkscreen-5.6.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.6.5.ebuild
deleted file mode 100644
index 4345263d7eba..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.6.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma screen management library"
-SLOT="5/7"
-KEYWORDS="amd64 ~arm x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kwayland)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	X? ( x11-libs/libxcb )
-"
-RDEPEND="${DEPEND}
-	!x11-libs/libkscreen:5
-"
-
-# requires running session
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 9f4f4b4a737b..02e0facbee91 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,4 +1,3 @@
-DIST libksysguard-5.6.5.tar.xz 700144 SHA256 4c2647a63ab22c124ac2fd7fb341b73977dec5e1bf31c1c3e015b72675771011 SHA512 317e0013dae899efa7768632509a52807f157a1f1743060b75abd9eeefd8b3d6bcf08d4c688be00299d1f2510c440c9a59f53528abb12d64c296bfd1c61d016f WHIRLPOOL d5c6692e02f40d4cbfbf3b880770c34c32358adb85145cfe10d67563aaa12feac79a2419c5de972f66a6a68bd55b35f42718a5f925f852acf35c3479323a5998
 DIST libksysguard-5.7.5.tar.xz 571364 SHA256 8584e4ee30b7e260c82e2804710781b584c4f11eda5e3640d9e551715828da47 SHA512 1998d96183768fbcb78d088cd26bfc248ccffa5b7e3311ca67a985b731a49b8e135a0f4b3ddf14865075ae2de8b41950599411b9b03fc45df554ea80ccea64ff WHIRLPOOL 2a3fcf162d029e55f8a2acff090a8cc4500089b214440e40d2599a6f9ca5ace5442b49d0d8d0613af7d17d0ae32d7883fc46bb210582912fcefb5c85df424310
 DIST libksysguard-5.8.0.tar.xz 571384 SHA256 c63c06c0d680c7cb0831277d80815c07f366fded48ed805f4689d6866413d540 SHA512 02fb12f80b52128eebb46660b2f60fcc7e163867b881429304a7516d540e6cdee28ad758963e76317b4576c3cb68b91a86d181e9097476adc18d9197607e3c63 WHIRLPOOL 93c171215f2a6a6595b976a6f63dd8bf5d287c55c874eee2f12a024fdceb31ec6d2ffff10c7f2a5c3a71e6a715dc0e4dcc433e84aea23c216b73309c24c4a5f6
 DIST libksysguard-5.8.1.tar.xz 571496 SHA256 771c487cce44e64040fa976ff038972ee2099d1f9b39839f8d712ca373e42fd1 SHA512 c5a8b3b030c9df629e12f52a2153381ad6f79342aaefa591d6b77ae3180edf24f819baabdad1e68684b7deea98b365014fa7d5e5ad6bab8619a4bf1bb07470f4 WHIRLPOOL a90ae41b3f79a1f61d5cab0a1debd486d97a06d98b94a2a9a1eec5fe0ce5b062a1d56bba819f60ccee1da6825fd26c8784af894bf7766b53e198315aabc5a243
diff --git a/kde-plasma/libksysguard/libksysguard-5.6.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.6.5.ebuild
deleted file mode 100644
index 704758fa3512..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.6.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+detailedmemory X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	detailedmemory? ( $(add_qt_dep qtwebkit) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-base/ksysguard:4
-	!kde-base/libksysguard:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep plasma)
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index d21ae610f426..4849a6f865f4 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,4 +1,3 @@
-DIST milou-5.6.5.tar.xz 57340 SHA256 ae6f9e8f9576d08c31b6b1a525f1b4e11c8e589e6176d7718dd9162d6f3bd318 SHA512 ec16fe966c134194038d8aad034b2e87515a6341f2a4ace05cf5a3a9d98cbd055c674ee0a05b1aa60e8ba71a9ae612779333165358114f305e890dd130d9e1d6 WHIRLPOOL 66bc770e6cb729039ff70197de364b964acedafd397567ec5c2452b10dc6aebb615c63b2e4bcd10767ee5c5fb7d927b5b888e7b77a2bfeb587c4c91996da5418
 DIST milou-5.7.5.tar.xz 54128 SHA256 05fb2dfa8cf892a0bedbb3faf4138e58521a8618f28930bf3862e6236416df72 SHA512 1eae0deea3491b30e0a64c94542cd11517615ecd0786b5227db1aca8d28e12d487d8c31a5dd0da8946cdff8a846603fb247c9ecd9f6ec6e8175bdb9a552b5270 WHIRLPOOL ba405a92fbf324ad77c32a90dc80c953165aacb6218d7360ea34064a3c4752f04bb45fa87f67029f4c8faddd5788848440581e10a6f798b7f30aa38727b980f3
 DIST milou-5.8.0.tar.xz 54320 SHA256 9b700557933466f3d75c5d8973246b747197c2113589641024d7b6fa9160122a SHA512 ff4f5886b6984ac78e351230b160d1061e26cd07bd354e3ed5cbbdd6e906fc213fdd1fb478f1be15a2a724170b2a133546a8d0a53ff55bc4b3dd885519722ad4 WHIRLPOOL d22622c97e5d61a4d8cfab79fd075bd847ab09d7aaadfc603f521f9c327f6cd6f2cd12b9eac3af170da642049aee89c18f7bf814af55bdd5990fa9e84c9d40a0
 DIST milou-5.8.1.tar.xz 54332 SHA256 f5eb5e0a9decf0a98f226a2e4ee14ff8fa3ee5508cdd2584fff00d086a65dd7e SHA512 714aa38ec908fe4a0f1bc8f8bac562fd1a161ef351f6f594edd0d64f56e87a3b70989b3ab74d92f1e8fa7f4b135e9ac9082cd03784c59546ef87586c1c043398 WHIRLPOOL 2a7ec3c48251bac1bf63a8cd297eb974255588c8062dc17169d568d99215a0f67e5f75f39f10789fc5f93108bd4fde504382f5ed983fc369942d956c53820772
diff --git a/kde-plasma/milou/milou-5.6.5.ebuild b/kde-plasma/milou/milou-5.6.5.ebuild
deleted file mode 100644
index d5ad2e3730aa..000000000000
--- a/kde-plasma/milou/milou-5.6.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/milou"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/milou:4
-"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 61ae3c4a9df2..ae2b9fa75a43 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,4 +1,3 @@
-DIST oxygen-5.6.5.tar.xz 4481652 SHA256 2c281c6f1aa2f04e90f79f7985d8af90a10b4b35be19523f44b91bdf0f491f8b SHA512 9046dab2b1f8e3d3238464fe1b4aa2034465d27b2e63581c09c713df2a788a5cb7a3831ddbcc74f1cd93a7c70d067ab618cf8d24c5fef4a27f7f10d51cb556cf WHIRLPOOL 0a013a8bad4f9467c88d1410a6ce32cc309b583936666c0f3b797a4e2ce77834a3066c886363fd5f6af349d72b2a5f8bd1c079c8e3f2d339c23d43feadda4e79
 DIST oxygen-5.7.5.tar.xz 4457656 SHA256 69708bf9a0944720a1bccfb761f41ca964163ff1d2b836d3fc24e1233828da78 SHA512 42569d0aa342a951c85dc6987028c271aaac0269fc0b8a4e21d88285d629c07cce59a39c5b07a80d40091e3aa324d5bcfab19881cd90a086f94a0dff18aab07c WHIRLPOOL 0e9be5c76e95de4775e95c4ae5ffb13d6e890a45276a6a0fc214f23f2447510cc5c26622202821bb93a93f135a8671f42b8d1e12142b16d4c407ccbe79a54ad9
 DIST oxygen-5.8.0.tar.xz 4458228 SHA256 a0d607e999954cdf2f4855e6ccaf3a9b5fcda8894207d1bd082efc85e461dbea SHA512 87dae0add5bcf65f2df518056863fe3d95f4b3ac1faaaa1da3d3fae1a80c6709cb1cf578ca6ff1c5dc67951cc15cad20503844a2f461fe6694e54ae63c4305a2 WHIRLPOOL 2d92f5ad54224eb1ac205c0d4242218050ebfb94edbc9d3d649a7d7e49fdba46ea3cd133c193f5a58804b1f0a33cd324d22ac8657f6ff329ffee791eacdabd75
 DIST oxygen-5.8.1.tar.xz 4458556 SHA256 93972771e0388567ab6665fd8aeb94231d1b414073a878e8eca938128c497239 SHA512 25519544afbf290a8a21747c8955e75e80f17df7d0286f8227bc035c4752481a788e6d9cc3f00a25c683512262e464cf4e47385a293f0ce581474808888fc726 WHIRLPOOL 7d12e12d5bff08cd510799d4a51023ac0ddbbc53eaa548f34a0ac028913f11821ffe51c0470a5228dfc04c9eb0a3e33d2849c7bb8b4baa54d88be9876fce365a
diff --git a/kde-plasma/oxygen/oxygen-5.6.5.ebuild b/kde-plasma/oxygen/oxygen-5.6.5.ebuild
deleted file mode 100644
index 225735b225d8..000000000000
--- a/kde-plasma/oxygen/oxygen-5.6.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE window manager theme"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
-KEYWORDS="amd64 ~arm x86"
-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)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	!kde-base/kdebase-cursors:4
-	!kde-base/oxygen:4
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kservice)
-"
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index aa61bedd58fb..bfad9d42ad93 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,4 +1,3 @@
-DIST plasma-desktop-5.6.5.tar.xz 6315412 SHA256 66ba27aec488ca4f1bce30295af696439c32d9dc2512f30f6479ee18abb7bbd3 SHA512 f210055450bc1ea2529cba160838dd15ccf8ad5ba4881fd2ddcb858a551f6e6dc902e2a9fed0e1c530b34ec015e5503bb89c494f651496375d486d4904b3943f WHIRLPOOL 653d0da7a76babbf8cc0e70362939c5569c5b1b1f76b681952838414769682f8d246ea84bdfb540b2719dba621c0801a9fb05403343f43e262f673f9738438f4
 DIST plasma-desktop-5.7.5.tar.xz 6248276 SHA256 7ebc05cbcc2f8d3332aabfebb6aaff5646e748ca7bcf8417ff7301584dd6a613 SHA512 f56cc901e3f10464ddf6dced220af66acff5abd2b3d6105791735b1c67897c7b2be9400aeb04f1ae2f1ab083097f8e083920af337f19c071e3b80f12cc635fe3 WHIRLPOOL 48ec7c3dc9c2dbf2ab1c614d796919d714187c506eeb8160e5aa481102345c6708c50858957269fa0ea4b83e3fac141f79dfa8d6e6a3f85036aa5accc49c3835
 DIST plasma-desktop-5.8.0.tar.xz 7609048 SHA256 8b326b1eb16f5a464a85b0960e681ccfb642f2aca1c305d6742e5f11ea7a4bc7 SHA512 84640da7304bb793eeec5e7137c39e3a40d2e8708999efb7d2631aef9388ad3b49ecfed0fd2c91ab512bb8c64f12642effcfeb21a48716df96cb9e314b96d97c WHIRLPOOL a254a2024f7e2e5e1d9fbaae0427c9310203fcc4ac1af8286696f47421f33e670c895f7df11025c911ccafb8bfe7539d991eb3b0ab2bcad89c45ad7553217327
 DIST plasma-desktop-5.8.1.tar.xz 6371044 SHA256 997cfdfe282daf5d5e06f30428a5cc0b7d16f7f69615679c833ecf3b3c3349b5 SHA512 04ad9be71ca6d65d6e214ef36f93a420f27bbd67bcefc69ae136697126f30ef7f36295b180594fbf2e63d6a0556ea307ea070a37b3f9ff7dd71498c8493d70c9 WHIRLPOOL 2a60138622cc1ce2172ecb4e81a63c7a115054231770de22806d92844312cebf7dfbbd91f19e684688f59657cd6abacc9923ae822d390eb22bfed62130804eea
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.6.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.6.5.ebuild
deleted file mode 100644
index e7cf93c43622..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.6.5.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus
-legacy-systray packagekit pulseaudio +qt4 scim"
-
-COMMON_DEPEND="
-	$(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 kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		$(add_qt_dep qtx11extras)
-		app-i18n/ibus
-		dev-libs/glib:2
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
-	packagekit? ( app-admin/packagekit-qt[qt5] )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		media-sound/pulseaudio
-	)
-	scim? ( app-i18n/scim )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/accountsservice
-	x11-apps/setxkbmap
-	legacy-systray? (
-		gtk2? ( dev-libs/libappindicator:2 )
-		gtk3? ( dev-libs/libappindicator:3 )
-		qt4? ( dev-libs/sni-qt )
-	)
-	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	qt4? ( kde-base/qguiplatformplugin_kde )
-	!kde-apps/kcontrol
-	!kde-apps/kdepasswd
-	!kde-apps/knetattach[handbook]
-	!kde-base/plasma-desktop:4
-	!kde-base/plasma-workspace:4
-	!kde-base/solid-actions-kcm:4
-	!kde-base/systemsettings:4
-	!kde-misc/kcm_touchpad
-	!kde-misc/kcm-touchpad
-	!kde-plasma/kcm-touchpad
-	!<kde-plasma/kdeplasma-addons-5.5.50
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-proto/xproto
-	fontconfig? ( x11-libs/libXrender )
-	input_devices_evdev? ( x11-drivers/xf86-input-evdev )
-"
-
-REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
-
-pkg_setup() {
-	if has_version net-im/skype && use legacy-systray && use amd64; then
-		einfo
-		elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
-		einfo
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package input_devices_evdev Evdev)
-		$(cmake-utils_use_find_package input_devices_synaptics Synaptics)
-		$(cmake-utils_use_find_package packagekit PackageKitQt5)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-		$(cmake-utils_use_find_package scim SCIM)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index e6696722b1b9..b6c783e4d4db 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,4 +1,3 @@
-DIST plasma-integration-5.6.5.tar.xz 52552 SHA256 40e8716f3472d1a2b22bc44d51d76901c8ce0606e7587b549584cb7e9e1c87e8 SHA512 a8952f25ed2eacc96c7957c4f2d21397fe5a75a9dcfacca67e3b7111095be380128c4663276bba838cb30e877f02ded184867e29ad591fd62caed63114a79eed WHIRLPOOL 2af37abc93c7534642a93726c60fa5cd6e4095b65d8a7c0e192864c9529a04962ef84cf5ab0961711b6dc39bdd93a71367181ee2a2f415e8ba8d3614470e70d1
 DIST plasma-integration-5.7.5.tar.xz 49240 SHA256 d41abdc63832d3fa1489aaec93dd382bb66e056982e3c49824f808f917f3ce16 SHA512 67b6b33e24b5e87b80694c7edd7d4daab8838f54a04922913c4138d55d02501d2dfe43c2718cdee4220dd194c424e50c83b711be5ee259ed58660b6c29d9e97f WHIRLPOOL 60d16269ea3ad267050c09337064ee25d98038314a5d007747cbf5970571f7c6cc6baeb1383e675ac741268133ce48a404d9f399d0dbf343aa57148444658728
 DIST plasma-integration-5.8.0.tar.xz 50132 SHA256 c73fbcfc5f4784a0ad5bf26d16f95be3147a77b6f6b981043ba371f49737e7cc SHA512 dac735436a753c16a43151792b53ebe1e7eab2a89bd130401b24569f3b1317f9aa44d38a6d928daf7ac8c330c8ac46354cb0cfb5269da71354959ba9fd682fa4 WHIRLPOOL 7ed8188446c893aefad42230f91b818bd76161fdc466767599f7cd87d8910f9c3e0d9b007508b01d2d5ea608111ba35a2e517bfcb68b70b52dcb6d9f44496dcc
 DIST plasma-integration-5.8.1.tar.xz 50272 SHA256 c754aeed43dbf51c32094fe150d1243fcc4cd9817cc7e35765ccb157ac3dccf5 SHA512 ad507f158a07ff381b1c79f7bd6041f2d503860d944ae5f782363520dedf9598b63285d1ea69884a25ac31ae44e3a245f1861ec2ee471ebb3acd21fc0ff8ab8d WHIRLPOOL 2db455b52374fbde644b89cf18bb9f7842dd45071edfe166a8012c4fd7037667c559efde82dda4c11580fc85d43ff9d4a95c7fe37d239e5300b6ea375e2134e2
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.6.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.6.5.ebuild
deleted file mode 100644
index 857bcb111d2d..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.6.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '' '' '5=')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libXcursor
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep oxygen-fonts '' 5.4.3)
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT="test"
diff --git a/kde-plasma/plasma-mediacenter/Manifest b/kde-plasma/plasma-mediacenter/Manifest
index 5c0e4c5deabf..1bf84276b446 100644
--- a/kde-plasma/plasma-mediacenter/Manifest
+++ b/kde-plasma/plasma-mediacenter/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-mediacenter-5.6.5.tar.xz 174360 SHA256 8620f70e66455fbc404719bfd6d94d5f662584bde00102466986cd0d31fedc14 SHA512 98add893e4626cd1fb75962ea88669d9e7986c7f5574171c21c82d9de4951cb8c96f502dd459bfca45b22ca6380402ba6b7e4e09ec8aa540ffbbe7c4c6335045 WHIRLPOOL 8bdad8393e5cfc28afccef1f344fe7354864726667df408798d7245b639f9c9d8c6aa4826e4f6a123f1bf6c15fd796cef905e818565be45e584873a42fedaa5b
 DIST plasma-mediacenter-5.7.3.tar.xz 162060 SHA256 59aa14f24f213e720e5bcc6f861e3f553c28f6c21290a95fda2e0b4fc28db75c SHA512 c3dd5d87b340c93beba1b588b54ffae8cef804c0559dcabc49d72a8a8165337e410668622f9b8b6622e44723afebc70b92a9e7be534b19792cf40d0f85aeb118 WHIRLPOOL 980c5d1ec338381b04c1fdb89dafb58523fa698c64e2d7807fdc6b7b07f296efd13fdfd53cc58d46aec3db8314cc34330c675e2ce47a8afecf1c58cf8010aa88
 DIST plasma-mediacenter-5.7.5.tar.xz 162076 SHA256 dd0df7dbc3e51ec4e329a6365c25b2b2e3d6e4dd7fd8e0aa916f3f9559a863bf SHA512 47a5b015364a1ffd1fd1b1dd3720e5ae8ebc38e4aee03e55d042c6b9aeea2579e1b7a31f1b0fcef74c4c19c470c7a380694d9c93624a75337eb58080f5b8d09b WHIRLPOOL be95dbb31046495d1cfca4f21417b1766ccd622308b60653cc1e46b8e4d17a9474b0dd8fac523a3b4f2a821936314a202490edc29ad9883f4edd60c9a09fddfb
diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.6.5.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.6.5.ebuild
deleted file mode 100644
index 873ca8efd140..000000000000
--- a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.6.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Unified media experience for any device capable of running KDE Plasma"
-KEYWORDS="amd64 ~arm x86"
-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)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtxml)
-	media-libs/taglib
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtmultimedia '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.6.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.6.5.ebuild
deleted file mode 100644
index 23de8a6b69fe..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.6.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5-functions
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm x86"
-IUSE="bluetooth +display-manager grub gtk +handbook mediacenter networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
-
-RDEPEND="
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kactivitymanagerd)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kdeplasma-addons)
-	$(add_plasma_dep kgamma)
-	$(add_plasma_dep khotkeys)
-	$(add_plasma_dep kinfocenter)
-	$(add_plasma_dep kmenuedit)
-	$(add_plasma_dep kscreen)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep ksshaskpass)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep kwayland-integration)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep kwrited)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep oxygen)
-	$(add_plasma_dep plasma-desktop)
-	$(add_plasma_dep plasma-integration)
-	$(add_plasma_dep plasma-workspace)
-	$(add_plasma_dep polkit-kde-agent)
-	$(add_plasma_dep powerdevil)
-	$(add_plasma_dep systemsettings)
-	$(add_plasma_dep user-manager)
-	bluetooth? ( $(add_plasma_dep bluedevil) )
-	display-manager? (
-		sddm? ( x11-misc/sddm )
-		!sddm? ( x11-misc/lightdm )
-	)
-	grub? ( $(add_plasma_dep breeze-grub) )
-	gtk? (
-		$(add_plasma_dep breeze-gtk)
-		$(add_plasma_dep kde-gtk-config)
-	)
-	handbook? ( $(add_kdeapps_dep khelpcenter '' '5.6.2') )
-	mediacenter? ( $(add_plasma_dep plasma-mediacenter) )
-	networkmanager? ( $(add_plasma_dep plasma-nm) )
-	pam? ( $(add_plasma_dep kwallet-pam) )
-	plymouth? ( $(add_plasma_dep breeze-plymouth) )
-	pulseaudio? ( $(add_plasma_dep plasma-pa) )
-	sddm? ( $(add_plasma_dep sddm-kcm) )
-	sdk? ( $(add_plasma_dep plasma-sdk) )
-	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
-"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index d72f483bf0a2..00058247eeb4 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,4 +1,3 @@
-DIST plasma-nm-5.6.5.tar.xz 646768 SHA256 00a9a15ede8462d34926ae05040e570f7d37f31a4972db233ae456430d68b9b2 SHA512 2e3f5823232bc852aef8e54ee47c7f614bda06874290d521af9fb6a8c71cab8ee4a083c8d2bec3b4f0ee3bc40fc82490e5699e589e3c2c19a35b6f611e4d3aec WHIRLPOOL fb105bc27e99c8908a671fec11902e517272d55aea4741db23238ecb8d1756a40476f2dcb9007d8c869997b6f9d411d95f6d7ddba42cb5455c15d708585ad207
 DIST plasma-nm-5.7.5.tar.xz 638176 SHA256 eb74256c962703097bb6f20b10c8ef2f1646e92256772db4ec81ff4df71aedee SHA512 f806ee6b764fe7022ad82f55fb2ba28d4157a655722e02bc1b344d5e6c97ee1137938134a25ab842968174a03d72dffa20e7ab6eea4bcb5d44c5a609fa41817a WHIRLPOOL 36bbe87dfb6a783dba6d240c0f8a6361a1c4211c7f3892338288e479fd82fc22d79a018d400383e2b0085d7797a45adcecb55f5c3f54be959578e20127b96268
 DIST plasma-nm-5.8.0.tar.xz 643160 SHA256 f904d35dfb0c2fdbeb4bd02017d9b8efec8e2ca15541778691c619de4dc27fc3 SHA512 fda74f1a295d6e6611e8c12cf585b8d94aa67590025f3211db65ac653f88da033b301e8300aa0baf86dab425384d3449a214ca18c5eaebb4e2c14b4ae31f8559 WHIRLPOOL dc0130806fe1541128d5faa52beb504bd56426a470a88189763282780221209df596e58075c8630966ac1649f867f776f354c5e78c30a7e80dd406c7e308fd27
 DIST plasma-nm-5.8.1.tar.xz 643620 SHA256 e6b6d0a1dde044aca48c53fc134f1ed0fbcd0cef49f91147b4f11300d8b6646c SHA512 a5977775dfea66493e19c472d57d8a411c1d61aa72ea82a1374b1d42961da7f1f50a6a88fd02e28c51ba1fde37ad2f85a070fd3c2cf111cdb5abd379cf7426da WHIRLPOOL ef36857b33535d635304c9c3cdc66964a38c14930266c15243c9efd8cfa7feb54de8149444330971dc937c0804d57920370395ac831f7d9e288ca299430c0ad7
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.6.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.6.5.ebuild
deleted file mode 100644
index 68352dcee055..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.6.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep networkmanager-qt 'teamd=')
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/qca-2.1.1:2[qt5]
-	>=net-misc/networkmanager-0.9.10.0[teamd=]
-	modemmanager? (
-		$(add_frameworks_dep modemmanager-qt)
-		$(add_qt_dep qtxml)
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		$(add_qt_dep qtxml)
-		net-misc/networkmanager-openconnect
-		net-misc/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	!kde-misc/plasma-nm
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package modemmanager ModemManager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index c2baea2b5ead..7529d9e4ddb5 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,4 +1,3 @@
-DIST plasma-pa-5.6.5.tar.xz 61196 SHA256 000a43b6c4c39ff67a28ee21089ea3389b33ab788121a32e0f716f28791d64a5 SHA512 e9d8ac55fa085126cb40a4e78cb09263f1ece56216a5c74372153a1cfa346ddce7ae71db7a4a7b824d5dca195e4d09a4b5055e392899c6dcd5c9713dae26f721 WHIRLPOOL 319352b03535d8e493b7a725bfafcc0a8111b81c1bc256118aaee745c6f1366fb77cab9065ec279904cb846057e978585a15a4c1651b7e2ef76213dbeaf06c6b
 DIST plasma-pa-5.7.5.tar.xz 145348 SHA256 d1289d87192ef74184214f08dc00d03d32a81c4aa46d843ded738c7d9e7d8a27 SHA512 11f4242e2247010324088b9bbee717f2e28a18928076adff9b9e582d84d8b5abb2cc910721f7913e1a03088422539a128d445d465c77f3b35b12eaa1933b0c6a WHIRLPOOL 596b72ebe58f5c1870d22cfe5bc2aa0e00c7788b9b24dc8d0d0a4e49b11e2b1516e2246b475d5d69da5961bdf13f34c7bd69c98e6fb2b1c00076272e7c3de5ea
 DIST plasma-pa-5.8.0.tar.xz 69144 SHA256 5021ee7805699c351402e5ed31beacbac2936ba825e2a720c2d9d3dc7e53fa49 SHA512 ba3045f128f55ef4200fb175f26ed8d09c86e15579b0d45e599e6ac669fafbadfe139518a08c664fbd7346b03e55bded7947bcac4d31caa68432aa40224375a4 WHIRLPOOL df99e399e09f1dd5fcfb17428cedba83bd52f99312e599edeba4716ac3149fd9e6bf1bab18b29b5b03b1789b71db928483cff8d52568fc5fb7a1b2c8c872208f
 DIST plasma-pa-5.8.1.tar.xz 69260 SHA256 0b46318d109a8ab567ddaf30ef382b55ee67947cafa043242719c660b9a418b6 SHA512 ff946b90cb3068032fbe5c77eca625804395a7f9121ecf7d12678662ac26cf49254768a2f864bf623dea23eeeed7cd924762f4acde515e110d84f3362ad93084 WHIRLPOOL 54466c5fafb34e19376a6a3d6de32b7339e33f49e6f8d5410ec0bdec4cd1ce3a8a77bf3ed4949621ceccd4e862512eca2f3671dc1b5fbd1b1120a977da5ae7e2
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.6.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.6.5.ebuild
deleted file mode 100644
index dba70d8d8044..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.6.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-sound/pulseaudio
-"
-
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index edbb9f2a4352..721d2c1f4c25 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,4 +1,3 @@
-DIST plasma-sdk-5.6.5.tar.xz 705104 SHA256 c8fa4d107b43e9c64c65a20ff2f87ba4b3a0619c5821a46f9b1c10e70658226d SHA512 9dbcd27fcf4734def58bd8aba974bfd71e1a0d685f853e3b61b058872a3089478a3dce28992b8400f715c1d76c5026f32c2280c8b6d8f99eec23ca5f1506c851 WHIRLPOOL 120222ea4a2fddae7b79ea46e64ccd9daa44bef119bd45a493e1be2e2a932b4ea2034c6364b1b6e5b8a85741e8752d51223979e5b7749a45e174b18ed0e3547f
 DIST plasma-sdk-5.7.5.tar.xz 699380 SHA256 420bd69e91bc1ed3343ae8be5d088697f28c25a8371a76ea1aa997dab86fa11f SHA512 8c47a38658fbbaa5cb97725c6e96100158da361d829b4619f05163dfe1e88104368f7b3c718e2fc71429981ab34dd7284dabc9f9b4949119fbd6e311611a8b51 WHIRLPOOL 59700ba73f18718e264bae31e5cba685de5952c8e0aa71cc31507ffcafd0d438ac45bba9cc4a49e967b9975a593003e53c94c0147148773ff8bf737ca96696de
 DIST plasma-sdk-5.8.0.tar.xz 714704 SHA256 a51a34d20801f19507191a0eae6805a38ae7c4743c64136c69ca16cc504197d9 SHA512 06a6833a722ff76a4ad60544df25f17d15117df4546466117a8d288fec67860ac4c1812e4fd5cb9e481ab38948298a484eab8d770bb25a7cd24411b10ab4f65b WHIRLPOOL 29a31b76bea62c3643e5f9dc5429358be20f34ff014c290b01fc94f98d9a25696c53cb810b8952b8168bc7a55508df727401c66cda1bb0b98f031b2d7622b10f
 DIST plasma-sdk-5.8.1.tar.xz 715248 SHA256 552b8363ac7e45bb49b6c2d5b28cac12c9ea557c9e02429caf8976bbce325b3d SHA512 64a9145a410ff325b685ca063bf034820cbada9b5c335b66f10f9afd3b059a56d9ee9d9fdeb1cff46f4ef2dad804bc4855a7bb8d581a42ee4ae8b6259f492ed5 WHIRLPOOL 696a183472635ff7f8875ae1fa2ba4929fb8b602102fc090e4dac8de4bdc61a30d5f06ee78a47a8c39736fde5ee5bf094e6d0131e53d8737068e4af61f103260
diff --git a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch
deleted file mode 100644
index e585eefceef8..000000000000
--- a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 56676709a8a0ecf51429bc1ac508513f72d0a761
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sun Mar 13 14:43:50 2016 +0100
-
-    Make Qt5Test really optional, fix plasmate dependencies
-    
-    KF5NewStuff, KF5Parts are only required for plasmate.
-    Could not push KF5ItemModels down into plasmate without breaking
-    build. Is it a problem within KDevPlatform?
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b556de6..bc982ae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -74,7 +74,7 @@ endif()
- # Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs:
- find_package(KF5 REQUIRED COMPONENTS
-     Archive Completion Config ConfigWidgets CoreAddons DBusAddons Declarative I18n IconThemes ItemModels
--    KIO NewStuff Parts Plasma PlasmaQuick Service TextEditor WidgetsAddons XmlGui WindowSystem)
-+    KIO Plasma PlasmaQuick Service TextEditor WidgetsAddons XmlGui WindowSystem)
- 
- #########################################################################
- 
-diff --git a/cuttlefish/CMakeLists.txt b/cuttlefish/CMakeLists.txt
-index 6eaa78a..5b90fef 100644
---- a/cuttlefish/CMakeLists.txt
-+++ b/cuttlefish/CMakeLists.txt
-@@ -2,7 +2,9 @@ project(cuttlefish)
- add_definitions(-DTRANSLATION_DOMAIN=\"cuttlefish\")
- 
- add_subdirectory(src)
--add_subdirectory(autotests)
-+if(BUILD_TESTING)
-+    add_subdirectory(autotests)
-+endif()
- 
- 
- plasma_install_package(package org.kde.plasma.cuttlefish packages package)
-diff --git a/plasmate/CMakeLists.txt b/plasmate/CMakeLists.txt
-index 8f28ec4..4586102 100644
---- a/plasmate/CMakeLists.txt
-+++ b/plasmate/CMakeLists.txt
-@@ -13,6 +13,8 @@ add_feature_info(GIT_EXECUTABLE_FOUND "Git" "Distributed Revision Control System
- 
- find_package(KF5 REQUIRED COMPONENTS
-     KDELibs4Support
-+    NewStuff
-+    Parts
- )
- 
- #install( FILES previewer/windowswitcher/thumbnails/konqueror.png
diff --git a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch
deleted file mode 100644
index 7aa92ccbdb3c..000000000000
--- a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,18 @@
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
- 
--find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus Gui Qml Quick Svg WebKit WebKitWidgets Widgets Xml)
-+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus Gui Qml Quick Svg Widgets Xml)
-+
-+find_package(Qt5WebKit ${QT_MIN_VERSION} CONFIG)
-+set_package_properties(Qt5WebKit PROPERTIES
-+         PURPOSE "Required for plasmate"
-+         TYPE OPTIONAL
-+         )
-+find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} CONFIG)
-+set_package_properties(Qt5WebKitWidgets PROPERTIES
-+         PURPOSE "Required for plasmate"
-+         TYPE OPTIONAL
-+         )
- 
- find_package(Qt5Test ${QT_MIN_VERSION} CONFIG QUIET)
- set_package_properties(Qt5Test PROPERTIES
-@@ -78,7 +89,7 @@
- add_subdirectory(themeexplorer)
- #add_subdirectory(remote-widgets-browser)
- #add_subdirectory(wallpaperviewer)
--if (KDevPlatform_FOUND)
-+if (KDevPlatform_FOUND AND Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND)
-     add_subdirectory(plasmate)
- endif()
- 
-
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.6.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.6.5.ebuild
deleted file mode 100644
index d21573d57311..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.6.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="amd64 ~arm x86"
-IUSE="plasmate"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	plasmate? (
-		$(add_frameworks_dep kdelibs4support)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kparts)
-		$(add_qt_dep qtwebkit)
-		dev-util/kdevplatform:5
-	)
-"
-RDEPEND="${DEPEND}
-	!dev-util/plasmate
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.5.5-qtwebkit-optional.patch" # git master
-	"${FILESDIR}/${PN}-5.5.5-dependencies.patch" # RR pending
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package plasmate KDevPlatform)
-		$(cmake-utils_use_find_package plasmate Qt5WebKit)
-		$(cmake-utils_use_find_package plasmate Qt5WebKitWidgets)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 0ce087b7a255..fc3d92971af3 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,4 +1,3 @@
-DIST plasma-workspace-wallpapers-5.6.5.tar.xz 45917596 SHA256 5946ce0fe03f5fa84004b72d8d0b97ba8c00c44b8478857282082adc95c67ede SHA512 18c5871ea1fe5c75dc11956c06ea15f501ccaf18362cf9b1f998dd09e6bc86a815b65619570c19b6279fc10ecbe14ff954046dc2d3ca2f82202035e65a862459 WHIRLPOOL abf052a094ae0b550df96c2d067e8a982cb94b8a13af154a660e3a730967bb8d758da3b4901af689679e4ab56997366c3e78f1bfda7db2f225ef1b747055fe4f
 DIST plasma-workspace-wallpapers-5.7.5.tar.xz 45918248 SHA256 f1ae44fe8dceab64ac2cbe53dbaa5c3b86b82b6c3681f24e801cd902aaddc4fc SHA512 77817f7a41fef8f9da57804d20b3947a88b1f60d11eec54d371e68eb0c6bf93988f511795bff17a8727ee5ed7d4f64a2514c4d019c30211c2f1145f9335ef34c WHIRLPOOL 704641a7ba6100ebf31db11d6bfcb84b8056bb8236f4c6af0df9fd1b203bf0c58a5ccfc2bfc2c322380cdf884731a5fcb711a8fc493c4a240ca8d130de69c45f
 DIST plasma-workspace-wallpapers-5.8.0.tar.xz 45918268 SHA256 4f94aef530c7b3845c2128a13097d1968b460b88b57a00b522c14e75f97bc7d9 SHA512 45b9ab83f04f907a34614cf6e38c35ea0fa355f3a8cb5e6cd2453633bd3494bf9fb8a4116f690840fe73e104499e6c6e968ff49351fd964f5fecfcb78a6f051c WHIRLPOOL 88d10218eae8a5970c6647abf8c5fec5a2a3cbc11b1f231a625210ed1eb4cdd3d6ea1f6d302c856a87bbc04dbb4ece023f713764fbf42ae41936c4e0515a35e5
 DIST plasma-workspace-wallpapers-5.8.1.tar.xz 45917544 SHA256 3aa9154305eff97de123eb341021ce1e2fcb446d2bd8e3a5f5dfbfeb6e39bf9f SHA512 c71a0f2f65acc268b0f8c62ce9741ab1e739d4e68794bb9af1b7636b9b4f3c04852fa7e3b75e98a8b98d4e9b683a370ffb109aa6b897468939e07bb886879ac6 WHIRLPOOL 6812a5953ac30dcaa146f5ff26737d51a268de5696e00b6e818b64231b615e2920249e4bc73dafb6bc6c79dbeea6dac584e181adc966029d7cab48ac50d0d7f9
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.6.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.6.5.ebuild
deleted file mode 100644
index 8ad0f6012a2b..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.6.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Additional wallpapers for the Plasma workspace"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="!<kde-apps/kde-wallpapers-15.08.3-r2"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index c1b8c491c925..7bc23b708624 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,4 +1,3 @@
-DIST plasma-workspace-5.6.5.1.tar.xz 6941608 SHA256 459e7d361551437007620fd4d05cc7252cbc85e039fa824899832ebcb7ad1495 SHA512 86d2f9208d4c2c9de9d17acf2112a81dfcdedb061f2209ce6289f0c702c2687ed8720bb81d127916219c39f4e9e763f5bf8311ee6c36f62c1a9cca7103560780 WHIRLPOOL 1792b3df0ffaaf972d6c4988c52e64f6f2e9df3367e969f5b06e13ca4696379c81214a37767df9d0944247dbd8fc48b21a78e76ec02369caeddb7b0de83b6b09
 DIST plasma-workspace-5.7.5.tar.xz 6844616 SHA256 116d9af304c212d58163130f1b7d5478085523c967f96f0d9b4ba2c5a73eb9f5 SHA512 cd7c710565a39d88ad353ebb8fd28eaf002c54672257fa135c2914114af5f2f57a533733654317a5d1050026838cafd7916a82373171d543e733c617cfbb7610 WHIRLPOOL 93f151572885b41a58410c0d5c768edae49dd7ccac601d271c9e5908741d6bffa6bbf9bc67fccac4ccee4e67b42c122174c8755929d8eb5872ef146ec7b443e9
 DIST plasma-workspace-5.8.0.tar.xz 7411612 SHA256 365b152c69ee7863bd1abe0e339707e412384beeb10294aacbc07e3d9da2b319 SHA512 c9bbb67a8c6e2316289ca75de1384281f9b610a5c059b6b7285171cf286a80673dc4f257c1ceffd0021eb5e738374b97fc80b0b288e1f7876fcdfa28189c7b93 WHIRLPOOL 0bc11f17cef347384039cc91d1cb5421c558930612801db4db1655cc466e6554cf13bfd2f28dc172cf6fb59f78b26c0648a51dd49180ff0f15fbe3e4a9ab7b2b
 DIST plasma-workspace-5.8.1.tar.xz 7377128 SHA256 c05a38b94fb815957d6b572dfb43f1d8624654c3e23d9344751063118c4aed5c SHA512 fea4e9585331e11861b9ff22b612c9efb7bee6cbbd2596916c1d17000c526a2ccaa4116fdbc000138771b6c879b0be662dea56fd888687fdbfcdaf8f85021be4 WHIRLPOOL c60a89e7d54441ce0e0daa0d8d2f5241f5247381769901b263c2c400d4aada872608f73db68a375b11fd79124b017c7506d50f1022d107055ea1c92898f81e17
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch
deleted file mode 100644
index 464f2785f850..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 829fb30934c455de5fc8d92512561d237c58fb35
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Mon Nov 23 21:34:24 2015 +0100
-
-    [phonon] Do not set RPATH
-    
-    REVIEW: 126210
-
-diff --git a/phonon/platform_kde/CMakeLists.txt b/phonon/platform_kde/CMakeLists.txt
-index 281425f..20ec8f9 100644
---- a/phonon/platform_kde/CMakeLists.txt
-+++ b/phonon/platform_kde/CMakeLists.txt
-@@ -9,15 +9,6 @@ target_link_libraries(kde ${PHONON_LIBRARY} KF5::I18n KF5::KIOWidgets KF5::Notif
- 
- kcoreaddons_desktop_to_json(kde phononbackend.desktop)
- 
--if(NOT WIN32)
--   set_target_properties(kde PROPERTIES
--                             INSTALL_RPATH_USE_LINK_PATH TRUE
--                             SKIP_BUILD_RPATH TRUE
--                             BUILD_WITH_INSTALL_RPATH TRUE
--                             INSTALL_RPATH ${KDE_INSTALL_LIBDIR}
--   )
--endif()
--
- install(TARGETS kde DESTINATION ${KDE_INSTALL_PLUGINDIR}/phonon_platform)
- install(FILES phonon.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR})
- install(FILES phononbackend.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5-drop-kscreen-dep.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5-drop-kscreen-dep.patch
deleted file mode 100644
index 80a7bc9d1a66..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5-drop-kscreen-dep.patch
+++ /dev/null
@@ -1,562 +0,0 @@
-commit 816b8a0e17cc087b05ac0155757c5d4a1ee6673a
-Author: Aleix Pol <aleixpol@kde.org>
-Date:   Mon May 30 13:20:50 2016 +0200
-
-    Drop KScreen dependency from PlasmaShell
-    REVIEW: 125451
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,6 +26,4 @@ find_package(KF5XmlRpcClient REQUIRED)
- find_package(KF5 REQUIRED COMPONENTS PlasmaQuick)
- find_package(KF5 REQUIRED COMPONENTS SysGuard)
--# Require KScreen >= 5.0.93 due to large API change
--find_package(KF5 5.0.93 REQUIRED COMPONENTS Screen)
- find_package(KF5 REQUIRED COMPONENTS Package)
- # Baloo has a different version scheme than KF5 for now
---- a/shell/CMakeLists.txt
-+++ b/shell/CMakeLists.txt
-@@ -81,5 +81,4 @@ target_link_libraries(plasmashell
-  KF5::CoreAddons
-  KF5::DBusAddons
-- KF5::Screen
-  KF5::Declarative
-  KF5::QuickAddons
---- a/shell/panelview.cpp
-+++ b/shell/panelview.cpp
-@@ -37,8 +37,6 @@
- 
- #include <Plasma/Containment>
- #include <Plasma/Package>
--#include <KScreen/Config>
--#include <KScreen/Output>
- 
- #include <KWayland/Client/plasmashell.h>
- #include <KWayland/Client/surface.h>
-@@ -87,5 +85,6 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent
-     connect(&m_unhideTimer, &QTimer::timeout,
-             this, &PanelView::restoreAutoHide);
- 
-+    m_lastScreen = targetScreen;
-     connect(screen(), SIGNAL(geometryChanged(QRect)),
-             &m_positionPaneltimer, SLOT(start()));
-@@ -102,8 +101,5 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent
-     connect(&m_strutsTimer, &QTimer::timeout,
-             this, &PanelView::updateStruts);
- 
--    connect(m_corona->screensConfiguration()->screen().data(), &KScreen::Screen::currentSizeChanged,
--            this, &PanelView::updateStruts);
--
-     qmlRegisterType<QScreen>();
-     rootContext()->setContextProperty(QStringLiteral("panel"), this);
-@@ -682,19 +678,23 @@ void PanelView::showEvent(QShowEvent *event)
- {
-     PanelShadows::self()->addWindow(this);
-     PlasmaQuick::ContainmentView::showEvent(event);
--    integrateScreen();
- 
-     //When the screen is set, the screen is recreated internally, so we need to
-     //set anything that depends on the winId()
--    connect(this, &QWindow::screenChanged, this, [this](QScreen* screen) {
--        emit screenChangedProxy(screen);
-+    connect(this, &QWindow::screenChanged, this, &PanelView::moveScreen, Qt::UniqueConnection);
-+    integrateScreen();
-+}
- 
--        if (!screen)
--            return;
--        integrateScreen();
--        showTemporarily();
--        m_positionPaneltimer.start();
--    });
-+void PanelView::moveScreen(QScreen* screen)
-+{
-+    emit screenChangedProxy(screen);
-+    m_lastScreen = screen;
-+
-+    if (!screen)
-+        return;
-+    integrateScreen();
-+    showTemporarily();
-+    m_positionPaneltimer.start();
- }
- 
- bool PanelView::event(QEvent *e)
-@@ -904,5 +904,5 @@ void PanelView::updateStruts()
-         const QRect thisScreen = screen()->geometry();
-         // QScreen::virtualGeometry() is very unreliable (Qt 5.5)
--        const QRect wholeScreen = QRect(QPoint(0, 0), m_corona->screensConfiguration()->screen()->currentSize());
-+        const QRect wholeScreen = QRect(QPoint(0, 0), screen()->geometry().size());
- 
-         //Extended struts against a screen edge near to another screen are really harmful, so windows maximized under the panel is a lesser pain
---- a/shell/panelview.h
-+++ b/shell/panelview.h
-@@ -136,6 +136,8 @@ public:
-     /* Shared with script/panel.cpp */
-     static KConfigGroup panelConfig(ShellCorona *corona, Plasma::Containment *containment, QScreen *screen);
- 
-+    void updateStruts();
-+
- protected:
-     void resizeEvent(QResizeEvent *ev) override;
-     void showEvent(QShowEvent *event) override;
-@@ -162,7 +164,6 @@ protected Q_SLOTS:
-      * It will be called when the configuration is requested
-      */
-     void showConfigurationInterface(Plasma::Applet *applet) override;
--    void updateStruts();
- 
- private Q_SLOTS:
-     void themeChanged();
-@@ -176,5 +177,6 @@ private Q_SLOTS:
-     void screenDestroyed(QObject* screen);
- 
- private:
-+    void moveScreen(QScreen* screen);
-     void integrateScreen();
-     bool containmentContainsPosition(const QPointF &point) const;
-@@ -198,6 +200,7 @@ private:
-     //only for the mask, not to actually paint
-     Plasma::FrameSvg *m_background;
-     KWayland::Client::PlasmaShellSurface *m_shellSurface;
-+    QWeakPointer<QScreen> m_lastScreen;
- 
-     static const int STRUTSTIMERDELAY = 200;
- };
---- a/shell/shellcorona.cpp
-+++ b/shell/shellcorona.cpp
-@@ -44,11 +44,6 @@
- #include <kdeclarative/qmlobject.h>
- #include <KMessageBox>
- 
--#include <KScreen/Config>
--#include <KScreen/ConfigMonitor>
--#include <KScreen/GetConfigOperation>
--#include <KScreen/Output>
--
- #include <KPackage/PackageLoader>
- 
- #include <KWayland/Client/connection_thread.h>
-@@ -90,7 +85,6 @@ ShellCorona::ShellCorona(QObject *parent)
-       m_addPanelAction(nullptr),
-       m_addPanelsMenu(nullptr),
-       m_interactiveConsole(nullptr),
--      m_screenConfiguration(nullptr),
-       m_waylandPlasmaShell(nullptr)
- {
-     setupWaylandIntegration();
-@@ -305,14 +299,7 @@ void ShellCorona::setShell(const QString &shell)
- 
-     connect(m_activityConsumer, &KActivities::Consumer::serviceStatusChanged, this, &ShellCorona::load, Qt::UniqueConnection);
- 
--    connect(new KScreen::GetConfigOperation(KScreen::GetConfigOperation::NoEDID), &KScreen::GetConfigOperation::finished,
--                this, [this](KScreen::ConfigOperation *op) {
--                    if (op->hasError()) {
--                        qWarning() << "Error found while setting up ShellCorona's KScreen: " << op->errorString();
--                    }
--                    m_screenConfiguration = qobject_cast<KScreen::GetConfigOperation*>(op)->config();
--                    load();
--                });
-+    load();
- }
- 
- QString ShellCorona::shell() const
-@@ -320,17 +307,19 @@ QString ShellCorona::shell() const
-     return m_shell;
- }
- 
--bool outputLess(const KScreen::OutputPtr &a, const KScreen::OutputPtr &b)
-+bool outputLess(QScreen* a, QScreen* b)
- {
--    return ((a->isEnabled() && !b->isEnabled())
--         || (a->isEnabled() == b->isEnabled() && (a->isPrimary() && !b->isPrimary()))
--         || (a->isPrimary() == b->isPrimary() && (a->pos().x() < b->pos().x()
--         || (a->pos().x() == b->pos().x() && a->pos().y() < b->pos().y()))));
-+    const QPoint aPos = a->geometry().topLeft();
-+    const QPoint bPos = b->geometry().topLeft();
-+
-+    return (qGuiApp->primaryScreen() == a
-+         || (qGuiApp->primaryScreen() != b && (aPos.x() < bPos.x()
-+         || (aPos.x() == bPos.x() && aPos.y() < bPos.y()))));
- }
- 
--static QList<KScreen::OutputPtr> sortOutputs(const KScreen::OutputList &outputs)
-+static QList<QScreen*> sortOutputs(const QList<QScreen*> &outputs)
- {
--    QList<KScreen::OutputPtr> ret = outputs.values();
-+    QList<QScreen*> ret = outputs;
-     std::sort(ret.begin(), ret.end(), outputLess);
-     return ret;
- }
-@@ -338,8 +327,7 @@ static QList<KScreen::OutputPtr> sortOutputs(const KScreen::OutputList &outputs)
- void ShellCorona::load()
- {
-     if (m_shell.isEmpty() ||
--        m_activityConsumer->serviceStatus() == KActivities::Consumer::Unknown ||
--        !m_screenConfiguration) {
-+        m_activityConsumer->serviceStatus() == KActivities::Consumer::Unknown) {
-         return;
-     }
- 
-@@ -373,13 +361,11 @@ void ShellCorona::load()
-         }
-     }
- 
--    KScreen::ConfigMonitor::instance()->addConfig(m_screenConfiguration);
--    //we're not going through the connectedOutputs because we need to connect to all outputs
--    for (const KScreen::OutputPtr &output : sortOutputs(m_screenConfiguration->outputs())) {
--        addOutput(output);
-+    for (QScreen* screen : sortOutputs(qGuiApp->screens())) {
-+        addOutput(screen);
-     }
--    connect(m_screenConfiguration.data(), &KScreen::Config::outputAdded, this, &ShellCorona::addOutput);
--    connect(m_screenConfiguration.data(), &KScreen::Config::primaryOutputChanged, this, &ShellCorona::primaryOutputChanged);
-+    connect(qGuiApp, &QGuiApplication::screenAdded, this, &ShellCorona::addOutput);
-+    connect(qGuiApp, &QGuiApplication::primaryScreenChanged, this, &ShellCorona::primaryOutputChanged);
-     connect(qGuiApp, &QGuiApplication::screenRemoved, this, &ShellCorona::screenRemoved);
- 
-     if (!m_waitingPanels.isEmpty()) {
-@@ -401,13 +387,8 @@ void ShellCorona::primaryOutputChanged()
-         return;
-     }
- 
--    const KScreen::OutputPtr output = m_screenConfiguration->primaryOutput();
--    if (!output) {
--        return;
--    }
--
-     QScreen *oldPrimary = m_views[0]->screen();
--    QScreen *newPrimary = outputToScreen(output);
-+    QScreen *newPrimary = qGuiApp->primaryScreen();
-     if (!newPrimary || newPrimary == oldPrimary) {
-         return;
-     }
-@@ -433,7 +414,7 @@ void ShellCorona::primaryOutputChanged()
-             Q_ASSERT(oldPrimary != newPrimary);
-             Q_ASSERT(m_views[0]->screen() == oldPrimary);
-             Q_ASSERT(m_views[0]->screen() != newPrimary);
--            Q_ASSERT(m_views[0]->geometry() == oldPrimary->geometry());
-+//             Q_ASSERT(m_views[0]->geometry() == oldPrimary->geometry());
-             qDebug() << "adapting" << newPrimary->geometry() << oldPrimary->geometry();
- 
-             view->setScreen(oldPrimary);
-@@ -442,6 +423,7 @@ void ShellCorona::primaryOutputChanged()
-     }
- 
-     m_views[0]->setScreen(newPrimary);
-+    Q_ASSERT(m_views[0]->screen()==newPrimary);
- 
-     foreach (PanelView *panel, m_panelViews) {
-         if (panel->screen() == oldPrimary) {
-@@ -459,20 +441,15 @@ void ShellCorona::screenInvariants() const
- {
-     Q_ASSERT(m_views.count() <= QGuiApplication::screens().count());
-     QScreen *s = m_views.isEmpty() ? nullptr : m_views[0]->screen();
--    const KScreen::OutputPtr primaryOutput = m_screenConfiguration->primaryOutput();
--    if (!s) {
--        qWarning() << "error: couldn't find primary output" << primaryOutput;
--        return;
--    }
- 
--    QScreen* ks = outputToScreen(primaryOutput);
--    Q_ASSERT(!ks || ks == s || !primaryOutput->isEnabled() || m_redundantOutputs.contains(primaryOutput));
-+    QScreen* ks = qGuiApp->primaryScreen();
-+    Q_ASSERT(ks == s);
- 
-     QSet<QScreen*> screens;
-     int i = 0;
-     foreach (const DesktopView *view, m_views) {
-         QScreen *screen = view->screen();
-         Q_ASSERT(!screens.contains(screen));
--        Q_ASSERT(!m_redundantOutputs.contains(screenToOutput(screen)));
-+        Q_ASSERT(!m_redundantOutputs.contains(screen));
- //         commented out because a different part of the code-base is responsible for this
- //         and sometimes is not yet called here.
-@@ -492,7 +469,7 @@ void ShellCorona::screenInvariants() const
-         ++i;
-     }
- 
--    foreach (const KScreen::OutputPtr &out, m_redundantOutputs) {
-+    foreach (QScreen* out, m_redundantOutputs) {
-         Q_ASSERT(isOutputRedundant(out));
-     }
- 
-@@ -630,18 +607,14 @@ KActivities::Controller *ShellCorona::activityController()
- 
- int ShellCorona::numScreens() const
- {
--    //don't start loading screens until kscreen has finished initialising.
--    if (!m_screenConfiguration) {
--        return 0;
--    }
--    return m_screenConfiguration->connectedOutputs().count();
-+    return qGuiApp->screens().count();
- }
- 
- QRect ShellCorona::screenGeometry(int id) const
- {
-     if (id >= m_views.count() || id < 0) {
-         qWarning() << "requesting unexisting screen" << id;
--        QScreen *s = outputToScreen(m_screenConfiguration->primaryOutput());
-+        QScreen *s = qGuiApp->primaryScreen();
-         return s ? s->geometry() : QRect();
-     }
-     return m_views[id]->geometry();
-@@ -652,7 +625,7 @@ QRegion ShellCorona::availableScreenRegion(int id) const
-     if (id >= m_views.count() || id < 0) {
-         //each screen should have a view
-         qWarning() << "requesting unexisting screen" << id;
--        QScreen *s = outputToScreen(m_screenConfiguration->primaryOutput());
-+        QScreen *s = qGuiApp->primaryScreen();
-         return s ? s->availableGeometry() : QRegion();
-     }
-     DesktopView *view = m_views[id];
-@@ -673,7 +646,7 @@ QRect ShellCorona::availableScreenRect(int id) const
-     if (id >= m_views.count() || id < 0) {
-         //each screen should have a view
-         qWarning() << "requesting unexisting screen" << id;
--        QScreen *s = outputToScreen(m_screenConfiguration->primaryOutput());
-+        QScreen *s = qGuiApp->primaryScreen();
-         return s ? s->availableGeometry() : QRect();
-     }
- 
-@@ -793,24 +766,20 @@ void ShellCorona::screenRemoved(QScreen* screen)
- {
-     if (DesktopView* v = desktopForScreen(screen))
-         remove(v);
--//     addOutput(screenToOutput(screen));
--    m_reconsiderOutputsTimer.start();
--}
- 
--void ShellCorona::outputEnabledChanged()
--{
--    addOutput(KScreen::OutputPtr(qobject_cast<KScreen::Output *>(sender()), [](void*){}));
-+    m_reconsiderOutputsTimer.start();
-+    m_redundantOutputs.remove(screen);
- }
- 
--bool ShellCorona::isOutputRedundant(const KScreen::OutputPtr &screen) const
-+bool ShellCorona::isOutputRedundant(QScreen* screen) const
- {
--    Q_ASSERT(screen->currentMode());
-+    Q_ASSERT(screen);
-     const QRect geometry = screen->geometry();
- 
-     //FIXME: QScreen doesn't have any idea of "this qscreen is clone of this other one
-     //so this ultra inefficient heuristic has to stay until we have a slightly better api
--    foreach (const KScreen::OutputPtr &s, m_screenConfiguration->connectedOutputs()) {
--        if (screen == s || !s->isEnabled() || !s->currentMode()) {
-+    foreach (QScreen* s, qGuiApp->screens()) {
-+        if (screen == s) {
-             continue;
-         }
- 
-@@ -827,71 +796,47 @@ bool ShellCorona::isOutputRedundant(const KScreen::OutputPtr &screen) const
- 
- void ShellCorona::reconsiderOutputs()
- {
--    if (!m_screenConfiguration) {
--        return;
--    }
--    foreach (const KScreen::OutputPtr &out, m_screenConfiguration->connectedOutputs()) {
--        if (!out->isEnabled() || !out->currentMode()) {
--//             qDebug() << "skip screen" << out << desktopForScreen(outputToScreen(out));
--            continue;
--        }
--
--        if (m_redundantOutputs.contains(out)) {
--            if (!isOutputRedundant(out)) {
-+    foreach (QScreen* screen, qGuiApp->screens()) {
-+        if (m_redundantOutputs.contains(screen)) {
-+            if (!isOutputRedundant(screen)) {
- //                 qDebug() << "not redundant anymore" << out;
--                addOutput(out);
-+                addOutput(screen);
-             }
--        } else if (isOutputRedundant(out)) {
--//             qDebug() << "new redundant screen" << out;
-+        } else if (isOutputRedundant(screen)) {
-+            qDebug() << "new redundant screen" << screen;
- 
--            if (DesktopView* v = desktopForScreen(outputToScreen(out)))
-+            if (DesktopView* v = desktopForScreen(screen))
-                 remove(v);
- 
--            m_redundantOutputs.insert(out);
-+            m_redundantOutputs.insert(screen);
-         }
- //         else
- //             qDebug() << "fine screen" << out;
-     }
- 
-+    updateStruts();
-+
-     CHECK_SCREEN_INVARIANTS
- }
- 
--void ShellCorona::addOutput(const KScreen::OutputPtr &output)
-+void ShellCorona::addOutput(QScreen* screen)
- {
--    if (!output) {
--        return;
--    }
-+    Q_ASSERT(screen);
- 
--    connect(output.data(), &KScreen::Output::isEnabledChanged,
--            this, &ShellCorona::outputEnabledChanged,
--            Qt::UniqueConnection);
--    connect(output.data(), &KScreen::Output::posChanged,
--            &m_reconsiderOutputsTimer, static_cast<void (QTimer::*)()>(&QTimer::start),
--            Qt::UniqueConnection);
--    connect(output.data(), &KScreen::Output::currentModeIdChanged,
-+    connect(screen, &QScreen::geometryChanged,
-             &m_reconsiderOutputsTimer, static_cast<void (QTimer::*)()>(&QTimer::start),
-             Qt::UniqueConnection);
- 
--    if (!output->isEnabled()) {
--        m_redundantOutputs.remove(output);
--        m_reconsiderOutputsTimer.start();
--        return;
--    }
--
--    QScreen *screen = outputToScreen(output);
--    Q_ASSERT(screen);
--
--    if (isOutputRedundant(output)) {
--        m_redundantOutputs.insert(output);
-+    if (isOutputRedundant(screen)) {
-+        m_redundantOutputs.insert(screen);
-         return;
-     } else {
--        m_redundantOutputs.remove(output);
-+        m_redundantOutputs.remove(screen);
-     }
- 
-     int insertPosition = 0;
-     foreach (DesktopView *view, m_views) {
--        const KScreen::OutputPtr out = screenToOutput(view->screen());
--        if (outputLess(output, out)) {
-+        if (outputLess(screen, view->screen())) {
-             break;
-         }
- 
-@@ -930,32 +875,6 @@ void ShellCorona::addOutput(const KScreen::OutputPtr &output)
-     CHECK_SCREEN_INVARIANTS
- }
- 
--QScreen *ShellCorona::outputToScreen(const KScreen::OutputPtr &output) const
--{
--    if (!output) {
--        return nullptr;
--    }
--
--    foreach (QScreen *screen, QGuiApplication::screens()) {
--        if (screen->name() == output->name()) {
--            return screen;
--        }
--    }
--
--    return nullptr;
--}
--
--KScreen::OutputPtr ShellCorona::screenToOutput(QScreen *screen) const
--{
--    foreach (const KScreen::OutputPtr &output, m_screenConfiguration->connectedOutputs()) {
--        if (screen->name() == output->name()) {
--            return output;
--        }
--    }
--
--    return KScreen::OutputPtr();
--}
--
- QScreen* ShellCorona::insertScreen(QScreen *screen, int idx)
- {
-     if (idx == m_views.count()) {
-@@ -1579,5 +1498,5 @@ int ShellCorona::screenForContainment(const Plasma::Containment *containment) co
-     //won't be associated to a screen
- //     qDebug() << "ShellCorona screenForContainment: " << containment << " Last screen is " << containment->lastScreen();
--    for (int i = 0, count = m_screenConfiguration->outputs().count(); i<count; ++i) {
-+    for (int i = 0, count = qGuiApp->screens().count(); i<count; ++i) {
-         if (containment->lastScreen() == i &&
-             (containment->activity() == m_activityConsumer->currentActivity() ||
-@@ -1703,11 +1622,6 @@ void ShellCorona::desktopContainmentDestroyed(QObject *obj)
-     }
- }
- 
--KScreen::ConfigPtr ShellCorona::screensConfiguration() const
--{
--    return m_screenConfiguration;
--}
--
- void ShellCorona::showOpenGLNotCompatibleWarning()
- {
-     static bool s_multipleInvokations = false;
-@@ -1750,6 +1664,13 @@ KWayland::Client::PlasmaShell *ShellCorona::waylandPlasmaShellInterface() const
-     return m_waylandPlasmaShell;
- }
- 
-+void ShellCorona::updateStruts()
-+{
-+    foreach(PanelView* view, m_panelViews) {
-+        view->updateStruts();
-+    }
-+}
-+
- // Desktop corona handler
- 
- 
---- a/shell/shellcorona.h
-+++ b/shell/shellcorona.h
-@@ -30,8 +30,6 @@
- 
- #include <KPackage/Package>
- 
--#include <KScreen/Types>
--
- class Activity;
- class DesktopView;
- class PanelView;
-@@ -99,8 +97,6 @@ public:
- 
-     Plasma::Containment *setContainmentTypeForScreen(int screen, const QString &plugin);
- 
--    KScreen::ConfigPtr screensConfiguration() const;
--
-     QScreen *screenForId(int screenId) const;
-     void remove(DesktopView *desktopView);
- 
-@@ -182,8 +178,7 @@ private Q_SLOTS:
-     void addPanel(QAction *action);
-     void populateAddPanelsMenu();
- 
--    void outputEnabledChanged();
--    void addOutput(const KScreen::OutputPtr &output);
-+    void addOutput(QScreen* screen);
-     void primaryOutputChanged();
- 
-     void activityOpened();
-@@ -197,10 +192,9 @@ private Q_SLOTS:
-     void screenRemoved(QScreen* screen);
- 
- private:
--    QScreen *outputToScreen(const KScreen::OutputPtr &output) const;
--    KScreen::OutputPtr screenToOutput(QScreen *screen) const;
-+    void updateStruts();
-     QScreen *insertScreen(QScreen *screen, int idx);
-     void removeView(int idx);
--    bool isOutputRedundant(const KScreen::OutputPtr &output) const;
-+    bool isOutputRedundant(QScreen* screen) const;
-     void reconsiderOutputs();
-     QList<PanelView *> panelsForScreen(QScreen *screen) const;
-@@ -227,9 +221,8 @@ private:
-     QMenu *m_addPanelsMenu;
-     KPackage::Package m_lookAndFeelPackage;
--    QSet<KScreen::OutputPtr> m_redundantOutputs;
-+    QSet<QScreen*> m_redundantOutputs;
-     QList<KDeclarative::QmlObject *> m_alternativesObjects;
-     KDeclarative::QmlObject *m_interactiveConsole;
- 
--    KScreen::ConfigPtr m_screenConfiguration;
-     QTimer m_waitingPanelsTimer;
-     QTimer m_appConfigSyncTimer;
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-legacy-session-mgmt.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-legacy-session-mgmt.patch
deleted file mode 100644
index 94cc1dfd94e2..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-legacy-session-mgmt.patch
+++ /dev/null
@@ -1,558 +0,0 @@
-commit e4a76cd947759fd723935965ca30c00021601a45
-Author: Andreas Hartmetz <ahartmetz@gmail.com>
-Date:   Thu Jun 23 19:36:18 2016 +0200
-
-    Revert "Remove legacy session management support."
-    
-    This reverts commit 5f0ca1305db4a925dbdbf927f541497be334feff.
-    
-    Firefox and some GTK+ 2 applications still seem to use the old way.
-    For shame.
-    
-    BUG: 362671
-
---- a/ksmserver/CMakeLists.txt
-+++ b/ksmserver/CMakeLists.txt
-@@ -15,4 +15,5 @@ set(ksmserver_KDEINIT_SRCS
-     shutdowndlg.cpp
-     switchuserdialog.cpp
-+    legacy.cpp
-     startup.cpp
-     shutdown.cpp
---- /dev/null
-+++ b/ksmserver/legacy.cpp
-@@ -0,0 +1,419 @@
-+/*****************************************************************
-+ksmserver - the KDE session management server
-+
-+Copyright 2000 Matthias Ettrich <ettrich@kde.org>
-+Copyright 2005 Lubos Lunak <l.lunak@kde.org>
-+
-+relatively small extensions by Oswald Buddenhagen <ob6@inf.tu-dresden.de>
-+
-+some code taken from the dcopserver (part of the KDE libraries), which is
-+Copyright 1999 Matthias Ettrich <ettrich@kde.org>
-+Copyright 1999 Preston Brown <pbrown@kde.org>
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+******************************************************************/
-+
-+#include <QtX11Extras/QX11Info>
-+#include <QDebug>
-+
-+#include <config-workspace.h>
-+
-+#include <ksmserver_debug.h>
-+
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
-+
-+#include "server.h"
-+
-+#include <unistd.h>
-+
-+
-+#include <kconfig.h>
-+#include <kconfiggroup.h>
-+#include <KSharedConfig>
-+#include <kshell.h>
-+#include <kwindowsystem.h>
-+
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+#include <X11/Xatom.h>
-+
-+/*
-+* Legacy session management
-+*/
-+
-+#ifndef NO_LEGACY_SESSION_MANAGEMENT
-+static WindowMap* windowMapPtr = 0;
-+
-+static Atom wm_save_yourself = XNone;
-+static Atom wm_protocols = XNone;
-+static Atom wm_client_leader = XNone;
-+static Atom sm_client_id = XNone;
-+
-+static int winsErrorHandler(Display *, XErrorEvent *ev)
-+{
-+    if (windowMapPtr) {
-+        WindowMap::Iterator it = windowMapPtr->find(ev->resourceid);
-+        if (it != windowMapPtr->end())
-+            (*it).type = SM_ERROR;
-+    }
-+    return 0;
-+}
-+
-+void KSMServer::performLegacySessionSave()
-+{
-+    qCDebug(KSMSERVER) << "Saving legacy session apps";
-+    if (state == ClosingSubSession)
-+        return; //FIXME implement later
-+
-+    KSharedConfig::Ptr config = KSharedConfig::openConfig();
-+    config->reparseConfiguration(); // config may have changed in the KControl module
-+    KConfigGroup cg( config, "General" );
-+
-+    int wmSaveYourselfTimeout = cg.readEntry( "legacySaveTimeoutSecs", 4 ) * 1000;
-+
-+    // Setup error handler
-+    legacyWindows.clear();
-+    windowMapPtr = &legacyWindows;
-+    XErrorHandler oldHandler = XSetErrorHandler(winsErrorHandler);
-+    // Compute set of leader windows that need legacy session management
-+    // and determine which style (WM_COMMAND or WM_SAVE_YOURSELF)
-+    if( wm_save_yourself == (Atom)XNone ) {
-+        Atom atoms[ 4 ];
-+        const char* const names[]
-+            = { "WM_SAVE_YOURSELF", "WM_PROTOCOLS", "WM_CLIENT_LEADER", "SM_CLIENT_ID" };
-+        XInternAtoms( QX11Info::display(), const_cast< char** >( names ), 4,
-+            False, atoms );
-+        wm_save_yourself = atoms[ 0 ];
-+        wm_protocols = atoms[ 1 ];
-+        wm_client_leader = atoms[ 2 ];
-+        sm_client_id = atoms[ 3 ];
-+    }
-+    const QList<WId> windows = KWindowSystem::windows();
-+    for ( QList<WId>::ConstIterator it = windows.begin();
-+        it != windows.end(); ++it) {
-+        WId leader = windowWmClientLeader( *it );
-+        if (!legacyWindows.contains(leader) && windowSessionId( *it, leader ).isEmpty()) {
-+            SMType wtype = SM_WMCOMMAND;
-+            int nprotocols = 0;
-+            Atom *protocols = 0;
-+            if( XGetWMProtocols(QX11Info::display(), leader, &protocols, &nprotocols)) {
-+                for (int i=0; i<nprotocols; i++)
-+                    if (protocols[i] == wm_save_yourself) {
-+                        wtype = SM_WMSAVEYOURSELF;
-+                        break;
-+                    }
-+                XFree((void*) protocols);
-+            }
-+            SMData data;
-+            data.type = wtype;
-+            XClassHint classHint;
-+            if( XGetClassHint( QX11Info::display(), leader, &classHint ) ) {
-+                data.wmclass1 = QString::fromLocal8Bit( classHint.res_name );
-+                data.wmclass2 = QString::fromLocal8Bit( classHint.res_class );
-+                XFree( classHint.res_name );
-+                XFree( classHint.res_class );
-+            }
-+            legacyWindows.insert(leader, data);
-+        }
-+    }
-+    // Open fresh display for sending WM_SAVE_YOURSELF
-+    XSync(QX11Info::display(), False);
-+    Display *newdisplay = XOpenDisplay(DisplayString(QX11Info::display()));
-+    if (!newdisplay) {
-+        windowMapPtr = NULL;
-+        XSetErrorHandler(oldHandler);
-+        return;
-+    }
-+    WId root = DefaultRootWindow(newdisplay);
-+    XGrabKeyboard(newdisplay, root, False,
-+                GrabModeAsync, GrabModeAsync, CurrentTime);
-+    XGrabPointer(newdisplay, root, False, Button1Mask|Button2Mask|Button3Mask,
-+                GrabModeAsync, GrabModeAsync, XNone, XNone, CurrentTime);
-+    // Send WM_SAVE_YOURSELF messages
-+    XEvent ev;
-+    int awaiting_replies = 0;
-+    for (WindowMap::Iterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) {
-+        if ( (*it).type == SM_WMSAVEYOURSELF ) {
-+            WId w = it.key();
-+            awaiting_replies += 1;
-+            memset(&ev, 0, sizeof(ev));
-+            ev.xclient.type = ClientMessage;
-+            ev.xclient.window = w;
-+            ev.xclient.message_type = wm_protocols;
-+            ev.xclient.format = 32;
-+            ev.xclient.data.l[0] = wm_save_yourself;
-+            ev.xclient.data.l[1] = QX11Info::appTime();
-+            XSelectInput(newdisplay, w, PropertyChangeMask|StructureNotifyMask);
-+            XSendEvent(newdisplay, w, False, 0, &ev);
-+            qCDebug(KSMSERVER) << "sent >save yourself< to legacy app " << (*it).wmclass1 << (*it).wmclass2;
-+        }
-+    }
-+    // Wait for change in WM_COMMAND with timeout
-+    XFlush(newdisplay);
-+    QTime start = QTime::currentTime();
-+    while (awaiting_replies > 0) {
-+        if (XPending(newdisplay)) {
-+            /* Process pending event */
-+            XNextEvent(newdisplay, &ev);
-+            if ( ( ev.xany.type == UnmapNotify ) ||
-+                ( ev.xany.type == PropertyNotify && ev.xproperty.atom == XA_WM_COMMAND ) ) {
-+                WindowMap::Iterator it = legacyWindows.find( ev.xany.window );
-+                if ( it != legacyWindows.end() && (*it).type != SM_WMCOMMAND ) {
-+                    awaiting_replies -= 1;
-+                    if ( (*it).type != SM_ERROR )
-+                        (*it).type = SM_WMCOMMAND;
-+                }
-+            }
-+        } else {
-+            /* Check timeout */
-+            int msecs = start.elapsed();
-+            if (msecs >= wmSaveYourselfTimeout) {
-+                qCDebug(KSMSERVER) << "legacy timeout expired";
-+                break;
-+            }
-+            /* Wait for more events */
-+            fd_set fds;
-+            FD_ZERO(&fds);
-+            int fd = ConnectionNumber(newdisplay);
-+            FD_SET(fd, &fds);
-+            struct timeval tmwait;
-+            tmwait.tv_sec = (wmSaveYourselfTimeout - msecs) / 1000;
-+            tmwait.tv_usec = ((wmSaveYourselfTimeout - msecs) % 1000) * 1000;
-+            ::select(fd+1, &fds, NULL, &fds, &tmwait);
-+        }
-+    }
-+    // Terminate work in new display
-+    XAllowEvents(newdisplay, ReplayPointer, CurrentTime);
-+    XAllowEvents(newdisplay, ReplayKeyboard, CurrentTime);
-+    XSync(newdisplay, False);
-+    XCloseDisplay(newdisplay);
-+    // Restore old error handler
-+    XSync(QX11Info::display(), False);
-+    XSetErrorHandler(oldHandler);
-+    for (WindowMap::Iterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) {
-+        if ( (*it).type != SM_ERROR) {
-+            WId w = it.key();
-+            (*it).wmCommand = windowWmCommand(w);
-+            (*it).wmClientMachine = windowWmClientMachine(w);
-+        }
-+    }
-+    qCDebug(KSMSERVER) << "Done saving " << legacyWindows.count() << " legacy session apps";
-+}
-+
-+/*!
-+Stores legacy session management data
-+*/
-+void KSMServer::storeLegacySession( KConfig* config )
-+{
-+    if (state == ClosingSubSession)
-+        return; //FIXME implement later
-+    // Write LegacySession data
-+    config->deleteGroup( QStringLiteral( "Legacy" ) + sessionGroup );
-+    KConfigGroup group( config, QStringLiteral( "Legacy" ) + sessionGroup );
-+    int count = 0;
-+    for (WindowMap::ConstIterator it = legacyWindows.constBegin(); it != legacyWindows.constEnd(); ++it) {
-+        if ( (*it).type != SM_ERROR) {
-+            if( excludeApps.contains( (*it).wmclass1.toLower())
-+                || excludeApps.contains( (*it).wmclass2.toLower()))
-+                continue;
-+            if ( !(*it).wmCommand.isEmpty() && !(*it).wmClientMachine.isEmpty() ) {
-+                count++;
-+                QString n = QString::number(count);
-+                group.writeEntry( QStringLiteral("command")+n, (*it).wmCommand );
-+                group.writeEntry( QStringLiteral("clientMachine")+n, (*it).wmClientMachine );
-+            }
-+        }
-+    }
-+    group.writeEntry( "count", count );
-+}
-+
-+/*!
-+Restores legacy session management data (i.e. restart applications)
-+*/
-+void KSMServer::restoreLegacySession( KConfig* config )
-+{
-+    if( config->hasGroup( QStringLiteral( "Legacy" ) + sessionGroup )) {
-+        KConfigGroup group( config, QStringLiteral( "Legacy" ) + sessionGroup );
-+        restoreLegacySessionInternal( &group );
-+    } else if( wm == QStringLiteral( "kwin" ) ) { // backwards comp. - get it from kwinrc
-+        KConfigGroup group( config, sessionGroup );
-+        int count =  group.readEntry( "count", 0 );
-+        for ( int i = 1; i <= count; i++ ) {
-+            QString n = QString::number(i);
-+            if ( group.readEntry( QStringLiteral("program")+n, QString() ) != wm )
-+                continue;
-+            QStringList restartCommand =
-+                group.readEntry( QStringLiteral("restartCommand")+n, QStringList() );
-+            for( QStringList::ConstIterator it = restartCommand.constBegin();
-+                it != restartCommand.constEnd();
-+                ++it ) {
-+                if( (*it) == QStringLiteral( "-session" ) ) {
-+                    ++it;
-+                    if( it != restartCommand.constEnd()) {
-+                        KConfig cfg( QStringLiteral( "session/" ) + wm +
-+                                     QLatin1Char( '_' ) + (*it) );
-+                        KConfigGroup group(&cfg, "LegacySession");
-+                        restoreLegacySessionInternal( &group, ' ' );
-+                    }
-+                }
-+            }
-+        }
-+    }
-+}
-+
-+void KSMServer::restoreLegacySessionInternal( KConfigGroup* config, char sep )
-+{
-+    int count = config->readEntry( "count",0 );
-+    for ( int i = 1; i <= count; i++ ) {
-+        QString n = QString::number(i);
-+        QStringList wmCommand = (sep == ',') ?
-+                config->readEntry( QStringLiteral("command")+n, QStringList() ) :
-+                KShell::splitArgs( config->readEntry( QStringLiteral("command")+n, QString() ) ); // close enough(?)
-+        if( wmCommand.isEmpty())
-+            continue;
-+        if( isWM( wmCommand.first()))
-+            continue;
-+        startApplication( wmCommand,
-+                        config->readEntry( QStringLiteral("clientMachine")+n, QString() ),
-+                        config->readEntry( QStringLiteral("userId")+n, QString() ));
-+    }
-+}
-+
-+static QByteArray getQCStringProperty(WId w, Atom prop)
-+{
-+    Atom type;
-+    int format, status;
-+    unsigned long nitems = 0;
-+    unsigned long extra = 0;
-+    unsigned char *data = 0;
-+    QByteArray result = "";
-+    status = XGetWindowProperty( QX11Info::display(), w, prop, 0, 10000,
-+                                false, XA_STRING, &type, &format,
-+                                &nitems, &extra, &data );
-+    if ( status == Success) {
-+        if( data )
-+            result = (char*)data;
-+        XFree(data);
-+    }
-+    return result;
-+}
-+
-+static QStringList getQStringListProperty(WId w, Atom prop)
-+{
-+    Atom type;
-+    int format, status;
-+    unsigned long nitems = 0;
-+    unsigned long extra = 0;
-+    unsigned char *data = 0;
-+    QStringList result;
-+
-+    status = XGetWindowProperty( QX11Info::display(), w, prop, 0, 10000,
-+                                false, XA_STRING, &type, &format,
-+                                &nitems, &extra, &data );
-+    if ( status == Success) {
-+        if (!data)
-+            return result;
-+        for (int i=0; i<(int)nitems; i++) {
-+            result << QLatin1String( (const char*)data + i );
-+            while(data[i]) i++;
-+        }
-+        XFree(data);
-+    }
-+    return result;
-+}
-+
-+QStringList KSMServer::windowWmCommand(WId w)
-+{
-+    QStringList ret = getQStringListProperty(w, XA_WM_COMMAND);
-+    // hacks here
-+    if( ret.count() == 1 ) {
-+        QString command = ret.first();
-+        // Mozilla is launched using wrapper scripts, so it's launched using "mozilla",
-+        // but the actual binary is "mozilla-bin" or "<path>/mozilla-bin", and that's what
-+        // will be also in WM_COMMAND - using this "mozilla-bin" doesn't work at all though
-+        if( command.endsWith( QStringLiteral( "mozilla-bin" )))
-+            return QStringList() << QStringLiteral( "mozilla" );
-+        if( command.endsWith( QStringLiteral( "firefox-bin" )))
-+            return QStringList() << QStringLiteral( "firefox" );
-+        if( command.endsWith( QStringLiteral( "thunderbird-bin" )))
-+            return QStringList() << QStringLiteral( "thunderbird" );
-+        if( command.endsWith( QStringLiteral( "sunbird-bin" )))
-+            return QStringList() << QStringLiteral( "sunbird" );
-+        if( command.endsWith( QStringLiteral( "seamonkey-bin" )))
-+            return QStringList() << QStringLiteral( "seamonkey" );
-+    }
-+    return ret;
-+}
-+
-+QString KSMServer::windowWmClientMachine(WId w)
-+{
-+    QByteArray result = getQCStringProperty(w, XA_WM_CLIENT_MACHINE);
-+    if (result.isEmpty()) {
-+        result = "localhost";
-+    } else {
-+        // special name for the local machine (localhost)
-+        char hostnamebuf[80];
-+        if (gethostname (hostnamebuf, sizeof hostnamebuf) >= 0) {
-+            hostnamebuf[sizeof(hostnamebuf)-1] = 0;
-+            if (result == hostnamebuf)
-+                result = "localhost";
-+            if(char *dot = strchr(hostnamebuf, '.')) {
-+                *dot = '\0';
-+                if(result == hostnamebuf)
-+                    result = "localhost";
-+            }
-+        }
-+    }
-+    return QLatin1String(result);
-+}
-+
-+WId KSMServer::windowWmClientLeader(WId w)
-+{
-+    Atom type;
-+    int format, status;
-+    unsigned long nitems = 0;
-+    unsigned long extra = 0;
-+    unsigned char *data = 0;
-+    Window result = w;
-+    status = XGetWindowProperty( QX11Info::display(), w, wm_client_leader, 0, 10000,
-+                                false, XA_WINDOW, &type, &format,
-+                                &nitems, &extra, &data );
-+    if (status  == Success ) {
-+        if (data && nitems > 0)
-+            result = *((Window*) data);
-+        XFree(data);
-+    }
-+    return result;
-+}
-+
-+
-+/*
-+Returns sessionId for this client,
-+taken either from its window or from the leader window.
-+*/
-+QByteArray KSMServer::windowSessionId(WId w, WId leader)
-+{
-+    QByteArray result = getQCStringProperty(w, sm_client_id);
-+    if (result.isEmpty() && leader != (WId)None && leader != w)
-+        result = getQCStringProperty(leader, sm_client_id);
-+    return result;
-+}
-+#endif
-diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
---- a/ksmserver/server.cpp
-+++ b/ksmserver/server.cpp
-@@ -959,6 +959,7 @@ void KSMServer::storeSession()
-     KConfigGroup cg2( config, "General");
-     cg2.writeEntry( "screenCount", ScreenCount(QX11Info::display()));
- 
-+    storeLegacySession(config.data());
-     config->sync();
- }
- 
---- a/ksmserver/server.h
-+++ b/ksmserver/server.h
-@@ -49,5 +49,6 @@ extern "C" {
- #include <KConfigGroup>
- #include <QTimer>
-+#include <QTime>
- #include <QMap>
- 
- 
-@@ -63,6 +64,16 @@ class KSMClient;
- class OrgKdeKLauncherInterface;
- class QDBusInterface;
- 
-+enum SMType { SM_ERROR, SM_WMCOMMAND, SM_WMSAVEYOURSELF };
-+struct SMData
-+    {
-+    SMType type;
-+    QStringList wmCommand;
-+    QString wmClientMachine;
-+    QString wmclass1, wmclass2;
-+    };
-+typedef QMap<WId,SMData> WindowMap;
-+
- class KSMServer : public QObject
- {
- Q_OBJECT
-@@ -147,4 +158,5 @@ private:
-     void startKilling();
-     void startKillingSubSession();
-+    void performStandardKilling();
-     void completeKilling();
-     void completeKillingSubSession();
-@@ -177,4 +189,13 @@ private:
-     void setupXIOErrorHandler();
- 
-+    void performLegacySessionSave();
-+    void storeLegacySession( KConfig* config );
-+    void restoreLegacySession( KConfig* config );
-+    void restoreLegacySessionInternal( KConfigGroup* config, char sep = ',' );
-+    QStringList windowWmCommand(WId w);
-+    QString windowWmClientMachine(WId w);
-+    WId windowWmClientLeader(WId w);
-+    QByteArray windowSessionId(WId w, WId leader);
-+
-     bool checkStartupSuspend();
-     void finishStartup();
-@@ -184,6 +205,7 @@ private:
-     void runShutdownScripts();
- 
--    // public D-Bus interface
-- public Q_SLOTS:
-+    // public dcop interface
-+
-+ public Q_SLOTS: //public dcop interface
-     void logout( int, int, int );
-     bool canShutdown();
-@@ -256,4 +278,6 @@ private:
-     QStringList excludeApps;
- 
-+    WindowMap legacyWindows;
-+
-     OrgKdeKLauncherInterface* klauncherSignals;
-     QDBusInterface* kcminitSignals;
---- a/ksmserver/shutdown.cpp
-+++ b/ksmserver/shutdown.cpp
-@@ -192,5 +192,8 @@ void KSMServer::shutdown( KWorkSpace::ShutdownConfirm confirm,
-         state = Shutdown;
-         wmPhase1WaitingCount = 0;
--        saveType = saveSession ? SmSaveBoth : SmSaveGlobal;
-+        saveType = saveSession?SmSaveBoth:SmSaveGlobal;
-+#ifndef NO_LEGACY_SESSION_MANAGEMENT
-+        performLegacySessionSave();
-+#endif
-         startProtection();
-         foreach( KSMClient* c, clients ) {
-@@ -248,5 +251,8 @@ void KSMServer::saveCurrentSession()
-     saveType = SmSaveLocal;
-     saveSession = true;
-+#ifndef NO_LEGACY_SESSION_MANAGEMENT
-+    performLegacySessionSave();
-+#endif
-     foreach( KSMClient* c, clients ) {
-         c->resetState();
-         if( isWM( c ) )
-@@ -623,5 +629,9 @@ void KSMServer::saveSubSession(const QString &name, QStringList saveAndClose, QS
-     saveSession = true;
-     sessionGroup = QStringLiteral( "SubSession: " ) + name;
- 
-+#ifndef NO_LEGACY_SESSION_MANAGEMENT
-+    //performLegacySessionSave(); FIXME
-+#endif
-+
-     startProtection();
-     foreach( KSMClient* c, clients ) {
---- a/ksmserver/startup.cpp
-+++ b/ksmserver/startup.cpp
-@@ -446,5 +446,7 @@ void KSMServer::autoStart2()
-     } else {
-         QTimer::singleShot(0, this, &KSMServer::kcmPhase2Done);
-     }
-+    if( !defaultSession())
-+        restoreLegacySession(KSharedConfig::openConfig().data());
- 
-     qCDebug(KSMSERVER) << "Starting notification thread";
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-struts.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-struts.patch
deleted file mode 100644
index 4fc7bd202335..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-struts.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b866bbe75e04584f0a54980c2c21cba2eadc123b Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 13 Jun 2016 14:23:43 +0200
-Subject: [PATCH] use the whole geometry for the struts
-
-screen()->virtualSize() is the union of the sizes
-of all screens
-screen()->geometry().size() is the size of just the
-single screen
----
- shell/panelview.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/shell/panelview.cpp b/shell/panelview.cpp
-index fb965e8..b27c18b 100644
---- a/shell/panelview.cpp
-+++ b/shell/panelview.cpp
-@@ -856,7 +856,7 @@ void PanelView::updateStruts()
-     if (m_visibilityMode == NormalPanel) {
-         const QRect thisScreen = screen()->geometry();
-         // QScreen::virtualGeometry() is very unreliable (Qt 5.5)
--        const QRect wholeScreen = QRect(QPoint(0, 0), screen()->geometry().size());
-+        const QRect wholeScreen = QRect(QPoint(0, 0), screen()->virtualSize());
- 
-         //Extended struts against a screen edge near to another screen are really harmful, so windows maximized under the panel is a lesser pain
-         //TODO: force "windows can cover" in those cases?
--- 
-2.7.3
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-unused-dep.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-unused-dep.patch
deleted file mode 100644
index e288a97aea0e..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.5.1-unused-dep.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit a29bcad4fe0af53c0d8661cbd17eeb57b004342d
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Wed Aug 17 18:02:19 2016 +0200
-
-    libtaskmanager: Drop unused X11_Xcomposite
-
-diff --git a/libtaskmanager/CMakeLists.txt b/libtaskmanager/CMakeLists.txt
-index 4f81330..8333d61 100644
---- a/libtaskmanager/CMakeLists.txt
-+++ b/libtaskmanager/CMakeLists.txt
-@@ -65,9 +65,6 @@ if (X11_FOUND)
-     if (X11_Xrender_FOUND)
-     target_link_libraries(taskmanager PRIVATE ${X11_Xrender_LIB})
-     endif ()
--    if (X11_Xcomposite_FOUND)
--    target_link_libraries(taskmanager PRIVATE ${X11_Xcomposite_LIB})
--    endif ()
- endif()
- 
- set_target_properties(taskmanager PROPERTIES 
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r2.ebuild
deleted file mode 100644
index 94c93b7c5669..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.6.5.1-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 multilib qmake-utils
-
-DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+geolocation gps prison qalculate"
-
-COMMON_DEPEND="
-	$(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 kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui 'jpeg')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/libdbusmenu-qt[qt5]
-	media-libs/phonon[qt5]
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
-	gps? ( sci-geosciences/gpsd )
-	prison? ( media-libs/prison:5 )
-	qalculate? ( sci-libs/libqalculate )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_kdeapps_dep kio-extras)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep plasma-integration)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtpaths)
-	$(add_qt_dep qtquickcontrols 'widgets')
-	app-text/iso-codes
-	x11-apps/mkfontdir
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xset
-	x11-apps/xsetroot
-	!dev-libs/xembed-sni-proxy
-	!kde-base/freespacenotifier:4
-	!kde-base/libtaskmanager:4
-	!kde-base/kcminit:4
-	!kde-base/kdebase-startkde:4
-	!kde-base/klipper:4
-	!kde-base/krunner:4
-	!kde-base/ksmserver:4
-	!kde-base/ksplash:4
-	!kde-base/plasma-workspace:4
-"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
-	"${FILESDIR}/${PN}-5.6.0-rpath.patch"
-	"${FILESDIR}/${PN}-5.6.5-drop-kscreen-dep.patch"
-	"${FILESDIR}/${PN}-5.6.5.1-struts.patch"
-	"${FILESDIR}/${PN}-5.6.5.1-legacy-session-mgmt.patch" # backport in 5.6 after release
-	"${FILESDIR}/${PN}-5.6.5.1-unused-dep.patch"
-)
-
-RESTRICT="test"
-
-S=${WORKDIR}/${PN}-5.6.5
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package gps libgps)
-		$(cmake-utils_use_find_package prison KF5Prison)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/10-agent-startup.sh"
-
-	insinto /etc/plasma/shutdown
-	doins "${FILESDIR}/10-agent-shutdown.sh"
-}
-
-pkg_postinst () {
-	kde5_pkg_postinst
-
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
-	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-	echo
-}
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 6081a2694f70..741dc1fdf325 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,4 +1,3 @@
-DIST polkit-kde-agent-1-5.6.5.tar.xz 50444 SHA256 503532b52ef50c5ccfeecdd239218f2cecc8501fc5aceb18606a18925dfff5b8 SHA512 a22764bb50908a14445ba2f07b75d2c6dbd7e5eccf0eec5fc34cdd7f8fd407bc2f38478af5234d71bcc5b51d15b5d62dfbbea833819e3035c060663a70b0b7ef WHIRLPOOL 48e89882b86af1c9ac396f03a28d51484eb78c0bac46ece46bd2e60eda37a8b73f05b6b3985811651062ea50b3a5a59f9f59aa7cc3f3dd0e41381272873693db
 DIST polkit-kde-agent-1-5.7.5.tar.xz 40340 SHA256 4e2195a535dbad15f771df07b3b87ce74cb2a2c6b9d8e5559353730ee2a90ad6 SHA512 7e5e30b19170e780d934ac9bcce0eae556b37cb9cd4ea444d2a4263233e5ceef813c48d6631d04a5783c292c3a5bacf91f8c3c062ef39be491fd3bf39c21d2fc WHIRLPOOL 66e9596d895f2cb3ba02037911ebf47c6e2276a42772e01336e9741b2d1a0104a3e14e7a1b00f206d06d4165e4ff2f2b6f53f3b60fbee4b92de5ae784a40bc25
 DIST polkit-kde-agent-1-5.8.0.tar.xz 40844 SHA256 7d1e00b3ff75145a7fdd0b50bb1dce9a0090da21dbf4d738f942ca84d76bba74 SHA512 6796b623df4a5ab942435d544db5ab495a2aea5890236926fbdf404050a8e07e83597b3583a97583cb129276598a27b81313a5b32660a490ac08bce2ff8391dd WHIRLPOOL 73e68d750428ea2992da85d6ad7b491a8d3f76bc0f7f52a6b57de8eaccd6e94fe477d2c8b97baaa8a161694b82454eea15a0b9251230774f14a8562ace929e04
 DIST polkit-kde-agent-1-5.8.1.tar.xz 40876 SHA256 fbedcac5b754654a73bc8772d43d34e373875522203b807756d82b044676bce0 SHA512 ee5779994f316bd1d4440a3cd5fb3217c22e650256d0dfee2aca7f0ffd675043a7b2cf62b3c73f5a32047aaeefdaa7bffff03081ffabfdb630eb68bb10478849 WHIRLPOOL b5f917218206d36fa9ef2528f39fb536682ba38d9d152a1dec527f9a5b72ceda2892a307f20df0463106d0cf635ce87237aa316b10b101dc9e1b81246d0590dc
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.6.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.6.5.ebuild
deleted file mode 100644
index c28be0061d52..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.6.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KMNAME="${PN}-1"
-inherit kde5
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://www.kde.org"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	|| ( $(add_frameworks_dep polkit-qt) >=sys-auth/polkit-qt-0.112.0[qt5] )
-"
-RDEPEND="${DEPEND}
-	!sys-auth/polkit-kde-agent:4[-minimal(-)]
-	!sys-auth/polkit-kde-agent:5
-"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index d326f8ce5f4b..45af96a22c61 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,4 +1,3 @@
-DIST powerdevil-5.6.5.tar.xz 353788 SHA256 6761a3044e94f65ede54e14f0c548eb4b3ced9a4a9499935f33a2e1cc2b0a01f SHA512 4e2c32770758e56a3d2cca65c5603dd41d8703921ec899ac2baef69d0f26b73c0cf7207aa3a5447c77c9339cde3910c846510a099b9789c66eeb633d7d89cddc WHIRLPOOL e6f7c9f6ef182369a01b10e1ea63b648894efce295b3e9470519f0fdbc29be04514f7477e74032ac24c17906953292e9049178919b458c4a919b7564042abf29
 DIST powerdevil-5.7.5.tar.xz 359656 SHA256 53f90edf793bb055e397d1860930a653a7cc519635c9a775ef97b1d7b18f2ec9 SHA512 f9261c8758f6f44ae4232f7182a3cf4afac17b672700d6ec8f277bf20306ab4f739a790c7738e5e30afdb8c4c7cf1db1b7c3327a547f12ef4dbc5f07879c7102 WHIRLPOOL a4e64f01a19c6053ca9b521f690d89c3c01c5a350d92510d8fec8162bfa2be2f72af9c838338af1787daefaf923b14255f34b37b78b87209be047a718da63476
 DIST powerdevil-5.8.0.tar.xz 356072 SHA256 8187e7782a10dd8fba766ab05aa24154ce332fa76273dd09dcb003657a60810e SHA512 affbe01cfd7f849e5d27a87b61ae34d809076c96e779fae28322ace54dd05736d41da3f764f05dc38207ec4c426d8f20e787ce2a806202e60248e34fee632dd7 WHIRLPOOL 292a05d82e35570988da5d87e699aced743a43d6df0d1041b7faea7fab02a13593ad9bf7c1ac974ff9a036606386d316adf9cdebd503906d39363b36a2899557
 DIST powerdevil-5.8.1.tar.xz 356112 SHA256 5b6ad450bba8e9d63efa44853e4f472376de2fba44a8b443e3a0c631996d7562 SHA512 e3592c81e0c79e150699ea259a0d942344f471a322a858452aef04f0b139d77b8d088087c597aed9e596bb7c689ada7409dcf855f2412f07e306df1268b92024 WHIRLPOOL 8a214aa15f73940af4f20097087ddd2cde5c5496d4974313c9bf4ada4519f044ec39c72af0c6261cc4f02838990d6f33e7841c2d05cfff976fa964e1137328c7
diff --git a/kde-plasma/powerdevil/powerdevil-5.6.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.6.5.ebuild
deleted file mode 100644
index 02d77419ed95..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.6.5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
-KEYWORDS="amd64 ~arm x86"
-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 kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	virtual/libudev:=
-	x11-libs/libxcb
-"
-
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	systemd? ( >=sys-power/upower-0.9.23 )
-	!systemd? (
-		sys-auth/polkit-pkla-compat
-		|| (
-			(
-				>=sys-auth/consolekit-1.0.1
-				sys-power/pm-utils
-				>=sys-power/upower-0.9.23
-			)
-			sys-power/upower-pm-utils
-		)
-	)
-	!kde-base/powerdevil:4
-	!kde-base/systemsettings:4[handbook]
-"
-
-src_install() {
-	kde5_src_install
-
-	if ! use systemd ; then
-		insinto /etc/polkit-1/localauthority/10-vendor.d/
-		doins "${FILESDIR}"/10-org.freedesktop.upower.pkla
-		doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla
-		doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla
-		doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla
-	fi
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if has_version sys-power/upower-pm-utils && ! use systemd ; then
-		ewarn "You have sys-power/upower-pm-utils installed, which was recommended in the past to"
-		ewarn "enable suspend and hibernate support. This workaround is no longer required, and it"
-		ewarn "is now recommended to use a recent version of upower and consolekit instead:"
-		ewarn
-		ewarn "emerge --ask --update \">=sys-auth/consolekit-1.0.0\" sys-power/upower"
-	fi
-}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index b4b28f391936..2ec3b95ec108 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,4 +1,3 @@
-DIST sddm-kcm-5.6.5.tar.xz 57028 SHA256 7e7ede876c7ae1e0ebc8447d8dcd46ef69404e7d2ecb1d3a18c68f338006221f SHA512 ce2b8c75b8cec9cad52ce47c3d9fb60708bbfd23677963ff9ebe3d68e7a6092314ea10975992bcf90a775b7f9bb55b3369d21ce801ad3b854bbe4319f63c9599 WHIRLPOOL 7c8790c9f401fc85885ab94f7184aa84243df2d139b1ceb3458274c87b9530a833aa130b4c682e1f2b02a738876da342813146e093b95a73460e47a2350ad2e0
 DIST sddm-kcm-5.7.5.tar.xz 48572 SHA256 41c3bb2fc8ee291c337700938ec37d2ffd6588d744ea0e28955458576e9c12e9 SHA512 89e72a62503993a481b1e2cc7cbea3c43a0858febef0e4c4988efd752e8bde5986193756d1bab5768c4abb8b8e74949ede926be27b65a228480314998e816551 WHIRLPOOL 7d8b7f805dccb3bf1ee0c9341e21a5cddb8b09f21be50b8ce40bbca01155a7b318160f3886460e2f49f1a051b6f27498e71f44db49590ad28026db9502ed9b3f
 DIST sddm-kcm-5.8.0.tar.xz 48944 SHA256 6e2ed4618f7cbf2b835bebaa3f2eb4cb6c5878ffab9488b808760383e0d1c546 SHA512 0bd556106c0e54b94681bceaa0f0353fe482e312c6754f60d1b094fe0d2e98728152bec2e031efa038a9ef24ea1eae4ff1108a638292e996eb0519b25926c8c3 WHIRLPOOL 137e48f9d361321c69c3a451b9dbf3f6f7c7788395084f1b9d7fc1e1ae69aa39948b26c6bd9a4fe6ef78c29a15c1c77dc190f4c91be86f468537a2bf77665c59
 DIST sddm-kcm-5.8.1.tar.xz 48972 SHA256 27cc7848eace2791ab9668f3173defdd331412befa76ba425b2fe0815956d44d SHA512 2c4f6975f9647d8bff3973f8acbb92a26bde0e6a36dc975532ba5f131000fcb3b4b8402ee980f6d10f4f45a442e6ca8c766e32f04385cf034c80ef013b67e6e3 WHIRLPOOL c81f5c712fe8a75eb96b757e918e99efd8af7f619e4060f9fd12c2d2279855ba2899d540f4ac3140e7e223ecd379df37dec90c5a5433f1995140bb6645a42c79
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.6.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.6.5.ebuild
deleted file mode 100644
index b23cac4aec85..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.6.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://projects.kde.org/projects/kdereview/sddm-kcm"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXcursor
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXfixes
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	x11-misc/sddm
-	!kde-misc/sddm-kcm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index b634bfcc72b5..e074d2227499 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,4 +1,3 @@
-DIST systemsettings-5.6.5.tar.xz 181352 SHA256 35be1e8935451ed63f33c40bf14ff8fd1e402ccf8c47e7e959592d7433c2e307 SHA512 2850bb175fe8c6cace39e7807ef0a1af2ca9206cb3be38ed397230a23a6b95a12af84e099122a7e45ac187cd88e18812dd6c39c04dae18950c3f0bfd14d04b1c WHIRLPOOL c29a2f68d02eed3f747040e48e88e222f8037c72c2fe53f719cfdfbf38a352252fc75c1ef10e77cee94c961267c79b2c9a6ada16733996f3a06a62a30ba34f7f
 DIST systemsettings-5.7.5.tar.xz 158296 SHA256 960938de95c04dae98df3e6189529c1d0d8eb99dbfd7ebcf0b33bc24bf54209b SHA512 c3bbbe243c97905cd4c0cdfa06576a94efcd0274522d4f17f6f3eabf725b271375de53071b4102bf01488c4c77056c6779dfdd97f94ed72ae6bea50a711eaad4 WHIRLPOOL 411226593cfdb954d3ef4979565e9a0a97b244d8e57198b215cdacee9f15eeb6b0f8894ab566dc6796d8bbd8459ec42c7aea998200952e8cb109ba49c078141d
 DIST systemsettings-5.8.0.tar.xz 157940 SHA256 2cfc19caf04a93cd1360ce1c5f081e3b362ba4038969ca8ed05710796138c64d SHA512 f0859891e4fa1b4e9e6f98c0854500a1272137c324fe30d47731bd2dc40fe11b85a978504ee36ff688d1e1d36a836a80422a9f16df6258cf7fe8ade5283756d7 WHIRLPOOL 0dcd72f8070e93daad175ab74b6491d04e7029d3cf55ff4359c1b54cbab083a6f110d3f834a7df74979cd391a7d93f319c3f0d974ad51b090fca55fdf9e1d810
 DIST systemsettings-5.8.1.tar.xz 157984 SHA256 a87d1595d355adf9d376d58057539ed5581e304141598296a4deff831ff9c011 SHA512 9468bde48e93309678738cfae23df05e216ec994545dd402f3a31ef110c20855665369ffb23b406ebbef7d7218f703f8bd6c8e70e086b18622d57093fd79cbec WHIRLPOOL e801c1284e028dd071c15eadb01ddaf978207c99c769ddf3a45bcf7f41004746456f75fae60ecbb95657f6c28ada2aba1ce69ae7dc5ea0a256c9f274cd4f351e
diff --git a/kde-plasma/systemsettings/systemsettings-5.6.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.6.5.ebuild
deleted file mode 100644
index 65ecc2e9c2e3..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.6.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="System settings utility"
-KEYWORDS="amd64 ~arm x86"
-IUSE="classic gtk"
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	classic? ( $(add_frameworks_dep khtml) )
-"
-RDEPEND="${DEPEND}
-	gtk? ( $(add_plasma_dep kde-gtk-config) )
-	!kde-base/systemsettings:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package classic KF5KHtml)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 707fc9accc84..059884848584 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,4 +1,3 @@
-DIST user-manager-5.6.5.tar.xz 71780 SHA256 fe649fbed6f7a8df0f1706626e76567079ca973e1ac918fc5192673c0566eebb SHA512 188f6f163e31256a7c7c87d27dc4c37800421f1cd282f88b12e6f6d00768024307df7722cdce21d07b79d8d43658cdbcaf537b6917f593ee13baaab4cc17f315 WHIRLPOOL ff8cdde5f61e0a52a6c1677a055a59620b1f4049fc6f3b2724c5b321be087fdb8ee2cda325f5bc919326a77dcec0170335f96211950648424872b6d5fb6f8cf7
 DIST user-manager-5.7.5.tar.xz 280052 SHA256 da4c38be71f08c48d39b7f120a787a89d7b9292215477aca02aaa72237f22cff SHA512 0ae1129435977cedbd5314e0f385bd4869616a93e8b9b2501d025d5713a01bcf6951470d5c7b131cf2329091b4ca89267401ebbf062b4c8384297a40bfa42d52 WHIRLPOOL c1655c269be55871e062f4227f78e2155fa3f0c5d778ea27986e215fcd2198a50b754227215000e919e37ef9a601d4962f6417d0890b672a2d16447111b53801
 DIST user-manager-5.8.0.tar.xz 542040 SHA256 e64df8a6ba87d1527bd45e912183039f24b4151f929a7f019243f9175344cf7f SHA512 ad254bcb280aa1a60d9cb2a25769d2a13fb1973fdaa68098b114bf038e7d0fdd4417a0ba855e449c337eb63f658789c3d569378dff7459e28cedad3d15362acc WHIRLPOOL bb70240ef78d18026ebb567f4cc2f00fec1243aa6ceef5eb4f5967d6808ffac3da30c5271f076a8d692c7e8e750e0ff0f9722e2763bbf97fa46890f686b2d76c
 DIST user-manager-5.8.1.tar.xz 541924 SHA256 e7a9d7026e94c1b4c868ab5f3f836a1c564bd30abc2404eb7ca86c7bfd8a8cad SHA512 2fee85b50c4bd253b83ec09a03b7ab44126fd2cf5721965abb36c3b09cd4b5e63de21a3d99156646da91e5329fdc34c7f672f54a42a79bba1484d680ba185b6a WHIRLPOOL 29de70ab390b3053da53539766fd235fc8045cad1ba58517e181180c55eb7a3ff1ba905bac60230b77382895d1bd1fe6eb8f23e56366cc6126e0a2885d1df0df
diff --git a/kde-plasma/user-manager/user-manager-5.6.5.ebuild b/kde-plasma/user-manager/user-manager-5.6.5.ebuild
deleted file mode 100644
index 0f9ee8e30da6..000000000000
--- a/kde-plasma/user-manager/user-manager-5.6.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Simple system settings module to manage the users of your system"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}"