kde-plasma: Remove KDE Plasma 5.8.3

Package-Manager: Portage-2.3.3, Repoman-2.3.1

82 files changed, 0 insertions, 2448 deletions

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 9e3fd3d262fb..8160b017fdfe 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,3 +1,2 @@
 DIST bluedevil-2.1.1.tar.xz 162060 SHA256 f18dc3848363dd7f7cce61475f336426c17b83224260cff705a96a535d0b9de5 SHA512 c5908db65dc2b3971af01b8555cb244257ed80592fe85417f2778cf3d236e34da402e8bf9bb4beba796b6d1401a1dcb1b4a651db1f57422314e3d030199e8bc4 WHIRLPOOL 858c29b76ac36af75d47c894f5da1e088d821801aaae695df619c95f8fab97ff22247d0451d3a9e7ec2253db836b4a7c1bf54a5f1b218e75030ba80189a6a193
-DIST bluedevil-5.8.3.tar.xz 141004 SHA256 46d1138a7eb180eaffa01543af243affac251f85b905a8694dfaa81ffc5f05b4 SHA512 662e56df85d56e144fe01fb2861cff34f97212913dfba603bc3f51990d1f1ed516b4d9a861dc8c7380ae24f5a08066052b5b892157a931dc6c2da113addaa2ae WHIRLPOOL 7f3352b022a661729587efb0134d6eceb382d8c0902f02fc5756c696512faec104aa63a5ba49d79212c01fe29cbfb0eea9d20069dba115e241ac6811010fab81
 DIST bluedevil-5.8.5.tar.xz 144572 SHA256 fb7dac6c2cf5dc31162ca4e6a800d4821a6f9d6ecd93da81356266e04a1df21d SHA512 3b39da119843c5774d4d606e2deef59cb0f80e603937eec3cbfdec14641f5e4098a0ff195aab6e8c6dc2eaf2fa8e3539655b08bd4e4ac6b6c3850cf6a7a3ac39 WHIRLPOOL 12b7a79a5caf76e2121b7c5ddc0de14a6803c1420edbb5d0510855c8903eaa72bb8ba90582ecdf9d85ba0fe35a96b52b02c334dced952071f683bd5a4f01c1d7
diff --git a/kde-plasma/bluedevil/bluedevil-5.8.3.ebuild b/kde-plasma/bluedevil/bluedevil-5.8.3.ebuild
deleted file mode 100644
index 0e5e4bf4beb8..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.8.3.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
-
-inherit kde5
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep bluez-qt)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!app-mobilephone/obexd
-	!app-mobilephone/obex-data-server
-	!kde-plasma/bluedevil:4
-"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index a6922a6a789e..d2d446fd297a 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1 @@
-DIST breeze-grub-5.8.3.tar.xz 3146576 SHA256 1351be467a2e45d62fc045107992622282e60a31e9e95c52ec75e6ce1887de07 SHA512 e0f3a2a34a3b1a2473f59862e79d4f1b4ffeead6327e54ca19fced84cb8ac50be4f6d9ded5042034a0e144ef45477ffed665426f87257bcaeeac6267f9ea1e96 WHIRLPOOL 1dd766ddb60bd6756888e879129432bae65ecba6fbcff538ac26a3dae629e1b09b2e0807278fb390de2c0da54ecbb4fc61a405ad8a4cdb69d76cad6cce329ad8
 DIST breeze-grub-5.8.5.tar.xz 3138572 SHA256 0e173ad1819b95afe7896f639501cf7ff6e1f8862efbb4f9825765e65acfd68b SHA512 031d6d60976b03093b1e7fd278b850c4bb177d6ba843b33a78c0f26c6e1eb7c24602d4bbc0517eeb404324ebeda59a8c6086751c41a99f6c35f0d7ec615054df WHIRLPOOL 14fed6ed2b72cd627e41c52a1b7658381e39d057358338bfc24149a2cfedb14921b0baa083a1c6155c13d39b99a9b3d0d117d3ed3c9dbbf0e9e9326f1d29146b
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.8.3.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.8.3.ebuild
deleted file mode 100644
index 7d3ea6db6a24..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.8.3.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 6cd9b9439344..7b94a05f1738 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1 @@
-DIST breeze-gtk-5.8.3.tar.xz 211372 SHA256 0f207067a4ab66e45de89f6c661f3be6b15d3df5faab61f99899a5ad1cd9a8f2 SHA512 d3eb49571594160f6c6299c0e807c716bb00c7ba15f59a88eea9c07dc836e0e309277bd2c46780fb16422442efaedd012611dc96405658ea3fe658db9a80d642 WHIRLPOOL 34773c8333161f5000618e12f4dd568fd441fb7f0621d1548f51f2a1db10171c2112a9cee17571c0c4528cdcd663391ccbc52b777db8cf1cb6495d89e2be2d2e
 DIST breeze-gtk-5.8.5.tar.xz 211572 SHA256 edddef80f31d58edff43100a921b980c1e68385ff36d30a056d1259e282cbd95 SHA512 a00f0fab1f2f38e4139f77475d89a16fb0848304f132eda7394fcc8ba9726c6cd83d80d23ade8039fff661cf0cee39eb0bd2ac1cf05b38ef4c5f15b7fc1ba7cd WHIRLPOOL 7c2463a11944796d30d406590ed5b4e057d48fe3d9af05b867336ab1b1868467ee01fb97b358b7d8b38fe9048c923576aadf6185418d905cf490bff58e5ff3cd
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.8.3.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.8.3.ebuild
deleted file mode 100644
index 3890b9fa5026..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.8.3.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="Official GTK+ port of KDE's Breeze widget style"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-src_install() {
-	kde5_src_install
-
-	insinto /usr/share/themes/Breeze/gtk-3.20
-	doins Breeze-gtk/gtk-3.20/gtk.css
-
-	insinto /usr/share/themes/Breeze-Dark/gtk-3.20
-	doins Breeze-dark-gtk/gtk-3.20/gtk.css
-}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 12617882ad8c..2bb4f343a0ef 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1 @@
-DIST breeze-plymouth-5.8.3.tar.xz 94948 SHA256 c3bd14099d65fa7a72fdd7233f0dfbff1509c2c1cec69615dbd975390730b43d SHA512 4464b32557ed46bfcc661f6ca2284bc7afb81a010fc86e60f712146ec00c3c6354e46fd7b3e42b2ba217944b3c488381a16bb2aeb594b6f409557a8e811ed2a5 WHIRLPOOL 199300a4236abbea38f26bf31ca47acd77e8397486ab2e535e1d83a93209c7be9a6ad718aef8d999f594a9bcb98ac383d4c64bf6d0695742378fdad7dc9f4e99
 DIST breeze-plymouth-5.8.5.tar.xz 94964 SHA256 01c74f5422382dd6b1ad8777a971dc58b43122980592174fbc7f01feb314cbe7 SHA512 0dc6db741fdcb689a92ac83e7b4af32a5bf8b72047613d23801843e8c6c507a1f2b97289e33e3220dd2800724171d90887d6f7262d95c8140d5a8b29ae40319c WHIRLPOOL f34ea196de0dd4dbab2b4375ee0912d5c5acd14001ccc0368f7a2c996ae174d457b7517eb28c5615119cd508ee162fead983a039d4543d4cee0f122d108bdb9e
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.3.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.3.ebuild
deleted file mode 100644
index f0bb1bb18d43..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.3.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_AUTODEPS="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for Plymouth"
-LICENSE="GPL-2+ GPL-3+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="sys-boot/plymouth"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISTRO_NAME="Gentoo Linux"
-		-DDISTRO_VERSION=
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 6f65a985c36f..c791a37b1d3c 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1 @@
-DIST breeze-5.8.3.tar.xz 33277616 SHA256 97375eb29d91c05b8fa6a4eb3673e58c64c74751b9b8b0fac46baee857a8f12a SHA512 6181f8b02d3c8a40afb01aeb52a847d9f6248262fe71af273a094775f6bdc974ab0b7c7d614e16cc3242257773462ac3f574fad0f10c0421555c366e29d1d1e5 WHIRLPOOL 02cb24a1745d5a75852d593a439a5897d092b121e7caffcfbacbeb9083a9c75ac108979fb76e3b92536af2c4e24b3ce2ced6ba3699862235fa1adfab0d7d25c3
 DIST breeze-5.8.5.tar.xz 33279848 SHA256 c1dc453ac2461bb6edf2d115741afb2f1933d9476e1b0e5470451d1c01d096bd SHA512 dfe5640883b05b5622e3d5d74e479ff6027d5f55f0c318c11c7eaa39b05fe30c5392a951d1efd8efde5b150bb47a514a2bb3620006e55fa64650c5c19b78df7e WHIRLPOOL 4881bbaef5e16f116d8ae5ed499163fe2d27be8b4f013ce408ef9e14de7d2c1fd14a9faaf72c4653a4ff6e5269bd888a7cdc1cc58c60c4045a212a8173a40694
diff --git a/kde-plasma/breeze/breeze-5.8.3.ebuild b/kde-plasma/breeze/breeze-5.8.3.ebuild
deleted file mode 100644
index 2f6a2f0c7dae..000000000000
--- a/kde-plasma/breeze/breeze-5.8.3.ebuild
+++ /dev/null
@@ -1,75 +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 wayland"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	qt4? (
-		kde-frameworks/kdelibs:4
-		x11-libs/libX11
-	)
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kpackage)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep breeze-icons)
-	$(add_plasma_dep kde-cli-tools)
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			$(cmake-utils_use_find_package wayland KF5Wayland)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			mycmakeargs+=( -DUSE_KDE4=true )
-		fi
-
-		kde5_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index bb862af4f22c..53e900fc0180 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,2 +1 @@
-DIST kactivitymanagerd-5.8.3.tar.xz 82788 SHA256 d2492a54f6525a06ac59ed2d0b14302df3f26e6594a13a9398defe138979d3a2 SHA512 24c134603f924c4189f00bf0bd851411dd9b55ce79262814e6abc28e5a160893e195bacaab7470af18c58b432d1969b4b08095bb5e6778c302586213310179d2 WHIRLPOOL 09bd6f3d9fac1f2767b84b7625c86df607bd0b19f690743bd5bae3e7b1e7060b2b1ae5a061c889cfb94e101c051658b56a97657e08c65a333158c3ee2a73210e
 DIST kactivitymanagerd-5.8.5.tar.xz 83284 SHA256 90bf07e74aa2923550a5188c75c7d2031ea80a442d7a9cf7f1bc58fbfdb2981d SHA512 7835baced0ee962133adeb4df91e7d9388ed02cdfa269060da73821f234c94de629964f65e9afe1b743c7b65c651d1076a1211cd3548d845c126fb58b76fb41c WHIRLPOOL 97f906a7b15a2f0c2e41678f2f7ab6ecb5d0a3e44161c09cf5ca3e3b5bca1035f60bcb6913e2c99e7299d81f307c620ed5c6d6226c04d02c9c4a67a2230b03e9
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.3.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.3.ebuild
deleted file mode 100644
index 0282725a38f3..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.3.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 'sqlite')
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.54
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-frameworks/kactivities-4.13.3-r2:4
-	!<kde-frameworks/kactivities-5.20.0:5
-	!kde-plasma/kactivitymanagerd:4
-	!<kde-plasma/plasma-desktop-5.6.1
-"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index bc5894465ea6..1e6d4a64d32d 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1 @@
-DIST kde-cli-tools-5.8.3.tar.xz 486136 SHA256 2bf139886a0df86e0ce932b4ff8be1798fe96e4d4e314e88f66e995e0d254a0b SHA512 a5b5e8ece7afab60ade0d988251ace7d48312cea25ff7b8a930c942172ee4d1770ad1c72004c677920b572eeaf9ff9f6c85643dab540a7202f0d18b03c00408d WHIRLPOOL 40e1e5afa94f41a135b5dee61a49b4d11280307322f13f27d079e906655762311ce22a8843e0118196e83a691a0c29bba0a40a0c31df5cc4c14a4da5a1ea51fb
 DIST kde-cli-tools-5.8.5.tar.xz 489952 SHA256 e7fa88cc67eae200fab34d1e32e63da76ae263bc72bef763d2f1cf9e60e9e9c5 SHA512 24132abc7852d325a5a9fb9e0131460554f3a1b58eb863ee7c406332a703eb5dcf6e640f7241bee39ede3d35fc2de96775c223a005ff6f696b6848649a4c9c8d WHIRLPOOL 57c1c1db1efd8de9821b1e1f2d1b795df9fe1b05105ff7224791a693625b5af7f2ecab9e32e4736b2c9d3eeee20683b80e4ac0e7cdf2d90a5066212cd0317a26
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.8.3.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.8.3.ebuild
deleted file mode 100644
index 60f29b1eda19..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.8.3.ebuild
+++ /dev/null
@@ -1,60 +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"
-
-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 3267783522b8..10310ed291c8 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,3 +1,2 @@
 DIST kde-gtk-config-2.2.1.tar.xz 86472 SHA256 9c890d7e39ab6ebfad13c5453051f0759cb61beac9f7fc2df7e331c9a4415c85 SHA512 24623b5f668cb7d5dd46b96bcd0ee1ba4f2c9068995716f6658c2bdf8a41a81d76848cf63c1749d3ff365ece0399d4a54e98be4d03f992d49a04616e26f1baeb WHIRLPOOL 49f0186c6a265eef8aa8972a77502b34bc130fd2df04faab4145c6b181ab80fdefc2b9ca7d2d7979c89a5b57e36b8d0787c986e584bd6f332915316d73c07802
-DIST kde-gtk-config-5.8.3.tar.xz 149984 SHA256 6d548f2143c0f7f2624aa857cb54c79a40cdb868942f68ab487eac86fef47d78 SHA512 247b8a07f077adc767b727b58406dff1148e9e21b695e98d63ef34c0590444933f0120a035a9e9df9e74570132f72f317396c7b7c6a68765733c5e1600286720 WHIRLPOOL 593998e11325e3cde9a9c6bfffbf11fd55ef877c6e24f27d5c6edbb7553cd844f0002d013e20598c98e832e0450327588ea59f306a17d85e1cca144c2ee6db82
 DIST kde-gtk-config-5.8.5.tar.xz 150384 SHA256 399464281ae04425a1881f4fc26a40c0e2079a6246dfab2e52a361d86afd15c8 SHA512 1cd73040eeb7709920c6d534fcb6aaa69de76d96926e7d2030b07f109ac9fd8b96c4f1d0d40d7449f39b87f9e795364283541fdbd7868ffd8679cd5bc6979bed WHIRLPOOL 5b5181dd90f3927033b9eec07d5f1ca257f371e842a98f4d06aaaa00f28f2e94e2f7d662cf8f72322a1c07399c1f06852bd6fd0bc9cf64eb9ef4e8c9736c6dae
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.3.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.3.ebuild
deleted file mode 100644
index 74308ffb6d89..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.8.3.ebuild
+++ /dev/null
@@ -1,58 +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)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libXcursor
-	gtk3? ( x11-libs/gtk+:3 )
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-base/kde-gtk-config:4
-	!kde-plasma/kde-gtk-config:4
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-		-DBUILD_gtk3proxies=$(usex gtk3)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	einfo
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-	einfo
-}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 6d9b29c644a1..1a0f398410ab 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1 @@
-DIST kdecoration-5.8.3.tar.xz 34820 SHA256 8a4914d99082981920fa49525ac606ddaf0a8fa783627718cf3aefa1ab09f834 SHA512 3bb736ad2e1c00fee2580b282264161aab391519a6e5dfed74f2afea648b78807b8799aa2551d7006972153fdb7e5c0c047e4b9fad2651df9b71ffadedb4dca3 WHIRLPOOL a131598307480c7da9539ff2f6d1e1f2c98b1d575969d8fae9e0f71e7e54e3c5a9cf8a4bcaf93ac336c03728c1ae3bfb1da6bdb96785113cf2cf29976d485d58
 DIST kdecoration-5.8.5.tar.xz 34760 SHA256 383a7bd701a3d80a79c47a8770e32a6fee6763c564e6982211a2c424ef291cee SHA512 443fe6413b09f729e2f6c828993530f9b98438702268f5fdc6fd15e945f85e081f601fb9b242bb1cbd1fb186574a55ff4fa02f8a35f80bf7cd7ca2227fe14db8 WHIRLPOOL c18e796800068d9e1e45aff133203e4e97be91021d57815eadff1bd16ffaf33e2e2005170ecfba70aa6641fa215c50a40054cabe501731ff8c2ad1204c37920b
diff --git a/kde-plasma/kdecoration/kdecoration-5.8.3.ebuild b/kde-plasma/kdecoration/kdecoration-5.8.3.ebuild
deleted file mode 100644
index 1ef8ed8b52de..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.8.3.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_GCC_MINIMAL="4.8"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugin based library to create window decorations"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="$(add_qt_dep qtgui)"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 351243a1adca..5d5650793906 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,3 +1,2 @@
 DIST kdeplasma-addons-4.14.3.tar.xz 1791328 SHA256 12d58e30362729473db208c0650676dac0fdae8b3f223ce92e8df41e3e928f24 SHA512 e4382aa1aab27ddcdecdd53ca0d931b9d53d27dfe4b53736642e1e030ac940ee6909029d7ddb865ee13567facb4e380d3c23601b9ea985151fccba8860077925 WHIRLPOOL 13b3a9f6706bbdda6ab4010aedbb1da4f677de771e3bd5f7c6dc2074db413860ea26bbeae919b7927e31116f535f51ef67ada1d2aa3b368ca4df23f4146a4165
-DIST kdeplasma-addons-5.8.3.tar.xz 2073968 SHA256 63220c0b7301eb44ef3e96d4f1a7085b340a0bd49884d26b52237eb7333853eb SHA512 7a2f8cb3995b8e0499fed35cea5a1b8fbbb745e3695fedd57e719014adf1b75a785cb1287e386f6f9a38731d816079117839c5a6c8f9e938b9a466305f74bb26 WHIRLPOOL 4eccb2e7cdbf5c310210afc94111c0d8e7c10ecf94a800163a4ce8f3bb71fcd822f966d4b1c5c10ead8812b44779a55904e6e50412914e985bfa57dfb3627040
 DIST kdeplasma-addons-5.8.5.tar.xz 2091012 SHA256 2dfdcc0be58550f4018c4f2d05fd2652d4b326a73a9d39d551892e4bd65333a0 SHA512 45de4a7243124a1099fe1f7ae66ccb15df0d45c36ffc89b5e6b94c4e7979a35d2d79bd58997737dd9db99acd31e4f43ad189fe180d7b5cd16e48b9550868e73f WHIRLPOOL cbe7360b3f28369d895bf92baae27ff9347f9d011aa3a4829868ceb1d67b7182a17fc52a535c2acfeb9bf18969ed01c788dbd0f16571486381bee3e6fd76558e
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.3.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.3.ebuild
deleted file mode 100644
index 22a44a349717..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.8.3.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-plasma/kdeplasma-addons:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index c28038994d6f..3699d3e36763 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1 @@
-DIST kgamma5-5.8.3.tar.xz 60420 SHA256 c500a511d8812db620bccbba7070f5b01bce0c2cb92b67745974776a6a1b110d SHA512 d6964b019236443b3ae18ea5d161e2e4d4c707a3b72d9fc9c007a08b1a9e21135220637d5a4c87599a3c0fcaa6811357083465ae27c3011dd70ebb52f06df5c9 WHIRLPOOL 8f42bf97cfae9d54ee3e4497099e9c8889e1f0f22a4ef57163c63be63b77e1711bf38e933addc83cdcdfb0130766f3d2c0f001ec93d8665a088c513f0712cf67
 DIST kgamma5-5.8.5.tar.xz 60484 SHA256 22b2ff2ae14a8db4ddb9fc27980c601fda531ae2803ad61fc69a431109277f1c SHA512 eed9684bb1175165edaa921b0b0b50cca921705b61361d3b683446e453d6a38bbf34ab6cf9ed4aacdb5e3ffd556afac9c907b9b8ae90cb37c2b46d04f002998b WHIRLPOOL 7086ba90ce461571acf4fb3db388397a0a2cfd723eca9d5f1e92bcbcdff3c05c26daaf5a266f76c735331ffbcaa4bba1c1aecd64323b0eebbf5f26e34cbeb485
diff --git a/kde-plasma/kgamma/kgamma-5.8.3.ebuild b/kde-plasma/kgamma/kgamma-5.8.3.ebuild
deleted file mode 100644
index 3e3550c45a35..000000000000
--- a/kde-plasma/kgamma/kgamma-5.8.3.ebuild
+++ /dev/null
@@ -1,28 +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
-"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index e3b3b8ae7e71..ed77c918c83a 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,3 +1,2 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
-DIST khotkeys-5.8.3.tar.xz 604784 SHA256 c97f533f64d500ed3eb3b0a2bd88f6c681d3f9a8e3b5a7d3f910a39157d31c53 SHA512 492d2157741ce0d51a49f79f3c3efe5c748f3c0405d19332f24f9e6757b17e29915e0c2e5f3019fe52d4511d7f3588c5b32e9bf8026eba6ed61ad772025f6038 WHIRLPOOL fc9a16f71db33e13734028070740ae46f9619e8c7e9e1a600d0e3f17a52beed11c9f8c75c38d87573783468d45a68aa59485bbf657909ed3593f4039726b145c
 DIST khotkeys-5.8.5.tar.xz 605632 SHA256 90fa906efd0a36b481d2651ed462596cc9527e72d3ea21f9b208a4e576fa00ba SHA512 6ec0a956f7c99ccdc5c5f6bb01d77d821a226fb94f16f5966f8609eaeb9c3eb7344855d6fe5e3c4feff36e6da36a9e35dbde1d0be583fe911a61ee5ef292db21 WHIRLPOOL 6b9fd522c69ecd450fd69d000d4f643d64d6c7045df873c10c439c9a65df64af527b803ecc069fbaca3a4f8c52b6d74a76f1ec1d8f1c8cadff434052019a6a90
diff --git a/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild b/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild
deleted file mode 100644
index abf6876d802c..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.8.3.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 workspace hotkey module"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support X)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/khotkeys:4
-	!kde-plasma/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-proto/xproto
-"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index f54864c6673e..ce8bf4491cab 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,4 +1,3 @@
 DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb47dc3229505abbac0c6 SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 WHIRLPOOL e161bf40c5e16180fa65217cb49314fb230c45329f4c518d6014083bd71da82d4aa048811ee814fde7fa300105cef16c182688445164ae84d0d700e23641b342
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
-DIST kinfocenter-5.8.3.tar.xz 1250572 SHA256 fb06f1eb28aab68a4659b999a6b991ea28165cc25c1ca2321515c25cc2f349c3 SHA512 849f7ae522ff5b195e4f983c1f3b7c9ba980522dc1836a1a80755ddd93dca441552c53a088019d3725ec44bbf07c94269d7be1a466528e8fb268ff93bb6a714b WHIRLPOOL 44ee4424d4fe107cd1c62fa91463c88b720ffb489785d99ade7108e921b579c5f252050fab9eb215f14bd37df537d54f0797b10a570ceffb5e2c8ae66e6909ef
 DIST kinfocenter-5.8.5.tar.xz 1269580 SHA256 f7bd2b1389245f73d89dfe0f6229e3ecd9e04bf7a235e369ca992d3ad3b27aba SHA512 35c66179f9947cc5b323584ca74040622c39ed273c9609bba4c712b07965a0e97c65d0c1b4b0d29a458d1741d59f657ff5d3cbc8ec92fcb4ce6ac402bf113e92 WHIRLPOOL b0ab085af294f93b00e35fe52ae6b955b70c9b7cbd1446f5faa00ccf1a59202fed94a9c0879a5b7e278b9867ab201ff1f11a64c070793cdfdfbd75c01066d387
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.8.3.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.8.3.ebuild
deleted file mode 100644
index d53aa2607e5b..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.8.3.ebuild
+++ /dev/null
@@ -1,89 +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 gles2 ieee1394 +opengl +pci wayland"
-
-REQUIRED_USE="egl? ( || ( gles2 opengl ) )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		$(add_qt_dep qtgui 'gles2=')
-		media-libs/mesa[egl?,gles2?]
-		!gles2? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	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-plasma/kinfocenter:4
-	!kde-misc/about-distro
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package gles2 OpenGLES)
-		$(cmake-utils_use_find_package ieee1394 RAW1394)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package pci PCIUTILS)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	if ! has_version "net-fs/nfs-utils"; then
-		einfo "Installing net-fs/nfs-utils will enable the NFS information module."
-	fi
-	if ! has_version "net-fs/samba" || ! has_version "net-fs/samba[server]"; then
-		einfo "Installing net-fs/samba[server(+)] will enable the Samba status information module."
-	fi
-}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index ec4d0c6e4b4c..62253df0216e 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,3 +1,2 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
-DIST kmenuedit-5.8.3.tar.xz 652360 SHA256 8759bcd45ba0e4a8698ae33e975bc38a247c1a29b01fa49a45a1211e4589f21b SHA512 605495b5e85641eb2615443866d570d8ddc7361caa5e9068a8f08f89a4dabebf09c716d1345eb1e54ea30a3a8384617f0c20819a489a34370e9c5641a4e6f5d6 WHIRLPOOL ba87d26439da47bac4ada480ead7ff5534c896adff70469a879be291cc886f88d60353b4b2b294214e8c5a5668b1809cd6c49518308caa9e76a7ba330bb6f522
 DIST kmenuedit-5.8.5.tar.xz 653640 SHA256 75b8543bb7ef5575a6c98797c622dc9fb08e2942ab95f36d409296c3937105ef SHA512 7c9d5d8d1d16afee4173ae65bcc17e7c45a5a163753f52962090ac13384b5b38dc3fb455fa5b246e9131c5d7f87deea35fe7f1cbddb8158b0827202684d15f0a WHIRLPOOL 79708c70fc2901d0f3edec9ccd17f5a0a661cab8dfb0abc76697b0c8c8856c42bdf4c5bdb5164fd4fbe683d5dd561d299a8483b1607cbff5536f6eadc4c8287f
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.8.3.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.8.3.ebuild
deleted file mode 100644
index 7f6ff0a7d89b..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.8.3.ebuild
+++ /dev/null
@@ -1,45 +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-plasma/kmenuedit:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index e9611e303552..217630eb9f85 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,3 +1,2 @@
 DIST kscreen-1.0.71_p20150824.tar.xz 93080 SHA256 ae0a1830d2d7dbb350e217188c77bd30a10decbd56f056f7e2fd0964071d95d4 SHA512 ac1f71219918363d298ee30022a9207da912c4293c6056d8875425b80c70010d7476591ca366eae5af97a298511c0e41ca748ba0c570d632f490eb5c3eae3c84 WHIRLPOOL 77721dc3a03a0a5eee543418379480da2c182497ab58a1aed7e513b228d406588187307ad848ddc3f6e6566e4a2039acec5428d04bcf597816c10b2d018a2f55
-DIST kscreen-5.8.3.tar.xz 112844 SHA256 de06798fa6d73b9dafcf25c90ff1739bdea0d78082a2aa9e453e28db7b6fb41e SHA512 74de567da96e9b086b8da45f289e842c93e00069c291d3e6420528ef91cb5aa79d9413b8458c6f6653ae5646875a08322fe1da5fbdcf735fce26803445c4585d WHIRLPOOL 9b3b4286ed039c5c9f4a999b93b23e1e666e4e82b4522f839e8a9440dcee9a615281606583c41ab71edef2b54b2dd6ded0c0aa3c0e11e1f27cdb20b47075d3c0
 DIST kscreen-5.8.5.tar.xz 113516 SHA256 b006fb93d03bfeb3f6260b48d6356fcf6f09b34646397f32c23547ecf41e3d19 SHA512 490a4a8f831b3afdc03648bd70c76d065d7147a2f81ab7c6f5eabd52a445bab6e7e331e9b193947a47a41795096ed594a1ad19de96ccafae556736fcf9a1a23b WHIRLPOOL 4f42970f3a1020cda689a2f591b310ca51ae3c924ad786a9c05bf04cf4b66a1f3b9ab172e174d5c07b4d711fec485e86d149a1fe39da793998b69995128143f4
diff --git a/kde-plasma/kscreen/kscreen-5.8.3.ebuild b/kde-plasma/kscreen/kscreen-5.8.3.ebuild
deleted file mode 100644
index 61bd8c3fbe84..000000000000
--- a/kde-plasma/kscreen/kscreen-5.8.3.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
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
-
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkscreen)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtgraphicaleffects)
-	!kde-plasma/kscreen:4
-"
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index a7c2c8462fca..fbf04248ec26 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1 @@
-DIST kscreenlocker-5.8.3.tar.xz 108092 SHA256 fb11eca8c68ee60342433d0f8e2ca564d3afd4abbfd86daacb6f3c445800310d SHA512 91bcdef2b71a94ae6591d55ead9456a001a291d30f83978544aaff83e148fd446d8c2d5165e628056d8459711861a48d1234fa7689fb7d84a7e7ebdf6e0ea0b2 WHIRLPOOL f1e24732a7e67ae6fbf73bd2fe6ae8d6d9d5ba2cf997e6f8bc2ed8fdb790011676f803a7d3c2c16693db761b7be4d087ca69340ffe482359c386bc3ead1895d0
 DIST kscreenlocker-5.8.5.tar.xz 108100 SHA256 72d64837393dd5c237d2985574b85a0f6507152ec3d5256751354c08d9d86285 SHA512 63d25d3e8c1477a7d1a52d49c32265fe344d7c7c1d5f9cb642d6e9ab524fc0a24c1de30e7134d3d92d3bf47a1d93d2a4713742aacb1405d35f8d5a04e66e0685 WHIRLPOOL 131cb22cf4830abc21bb1a1116ac11c6817fdd1e99441938e938a5bd44ba470b0f63bea073122bc093d016c3c72d733ca678688b1a311cc33d8c9b3127e65960
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.8.3.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.8.3.ebuild
deleted file mode 100644
index 5d85bd0ff5cc..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.8.3.ebuild
+++ /dev/null
@@ -1,89 +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 ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( virtual/pam )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!<kde-plasma/kcheckpass-4.11.22-r1:4
-	!kde-plasma/kdebase-pam:0
-	!<kde-plasma/plasma-workspace-5.4.50
-"
-
-RESTRICT+=" test"
-
-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 88d546d736df..3e31bd770ec6 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,3 +1,2 @@
 DIST 50971-ksshaskpass-0.5.3.tar.gz 11010 SHA256 a3a47eba74a52ec3d9d8740ed9a29a5aa852d4e268b5d81154f85b90258a2124 SHA512 0274b58fb9dbb634688e5ee8b22a88012483907769796733c79f8e3c115463702a9cdd787d49d0b94a7942f5f88ed3465a6161d6e4516711b2bba5c47a91fa50 WHIRLPOOL d3e68640d3e0049bdd071fe72bf0bd9767bf349c94b2fbb42e7fafe6259d895ec2d5122ae9477e66073c53cbbda704ec0237328dd948b21207b2db2b39946450
-DIST ksshaskpass-5.8.3.tar.xz 19252 SHA256 72de4eb6adaadef5e4d30f10c22bd0aef1d5197070589f54d03b7983d7b76e4f SHA512 21d4650e841333bfb6093c4614c80c3e848be1da8f1cdaf0ba3525ac72ea75f31c10043daa1bda250203fa42726928e7103b8a5082d53aa02032fdb314d7b9f3 WHIRLPOOL 9c0ae0fdd09fae5a6aa8118253994fcd72b91efa5fc42a47f1c9ce4c4c68219ffdfaeb912dc835a8504c0a613b8b66da0bb14ffac091559c1081c880d8466e07
 DIST ksshaskpass-5.8.5.tar.xz 19456 SHA256 b0abeaba2a3eff16e233e047b41c20bf4065b4529e706929f4c0e6a9884324bf SHA512 0ab10f04fea8d97bb7e942cfd11563d22e065e19414aad2484e5b1661ed7b492d769da69b30eeed9e392ef75a3cc518e0a8005fe5afb84dfc6192ad9a4c0bc8b WHIRLPOOL 19c08e63ef15f0e5a38cc10d02f71e3bb616ec7d219f06cf1004af9789832a6e2a031548ef78790f67a46bf5e69b076dc2d7082ba25b6c39621eaa97a9113546
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.8.3.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.8.3.ebuild
deleted file mode 100644
index a8ec53863e42..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.8.3.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 dd527e021ca5..e26c806410ea 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,3 +1,2 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
-DIST ksysguard-5.8.3.tar.xz 487732 SHA256 ed9bccff28f62aadf201ab6c88f35eda997bd1ccc2d4c3d259216af740753528 SHA512 2fa7251c1be8bc1dcd77530d4cdcba32227116bbdcda05e61c0e911a9a82ae2d73eb8316cc80fc9fb5f0015fde1f5c997ba2f7676d765e2750e95bb14bb89682 WHIRLPOOL 391b4b2d7665f4d3e358fe7754e3d68c24c145fb24e644c9490c53c2a68ebb13ef769e07f11b1a519c737707bc7028c8266878aa98b6f0cf41baf7313e424f86
 DIST ksysguard-5.8.5.tar.xz 490664 SHA256 c9bb8ff40d8a5092ef3c345b234a4d609fcff8ce6ec65bc32c3215a2840fa8bd SHA512 d3ad3e781e71fb1c179b9d07fbded060390f1c24836acf3f7e5027720e340d117445e04759ad79e46e8391db082d64eef62d52d5ad6572d688e83a86062d7b0a WHIRLPOOL d63a9b7dac8ea1d574f5b4e8505a9c2b315eb78b65d611c63278ebb5a77b939294defd8e9e0b4983eca75b9cfedbc151baf5767a35dd12fb6fafc79cbb6fd0fa
diff --git a/kde-plasma/ksysguard/ksysguard-5.8.3.ebuild b/kde-plasma/ksysguard/ksysguard-5.8.3.ebuild
deleted file mode 100644
index 3c55e8cec57b..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.8.3.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_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE="lm_sensors"
-
-DEPEND="
-	$(add_plasma_dep libksysguard)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/ksysguard:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm_sensors Sensors)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index b7c6df0187c0..63c2512077b6 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1 @@
-DIST kwallet-pam-5.8.3.tar.xz 17668 SHA256 ed624dbd26ce447128d85ffea988a9b58a7537e0b936f008bfe2d67841fc75d1 SHA512 fcee6e1c3c3f8d92c461df5a28400147787b5e7e08a0ba2ce1f408d9bb6dc8a0be06cb8850475518fedeb7527bbbbe0b85241779ceef3de91e2ec07e0c75722b WHIRLPOOL ac2e45fa5299fff60aafd403ebf7e432a39eae50072e26d5ada1cadbffa65413abd94b537b659046dd6f1e16f68a1475081891a29511f31ac79a91d0921edeeb
 DIST kwallet-pam-5.8.5.tar.xz 17752 SHA256 84d0e3b09c353ca81af52956842fbb6170d3990293ced7f81eb4bb7447de200c SHA512 749847751872b899a4675dc7e96d4f88e47f1ceb992d84b4c99140bf2916f981fcd8c26486459f492ef810d84fb1294007c073ce238bb11bba106f9d96640f62 WHIRLPOOL 4c0ab2bca3abf5dfce7b67ee0c9e3cf2cc84e938278529aa83347ef7f77411a53490de1b0b76753d558f916860600ead985f9b28f44edc4f2f16fc74b5496951
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild
deleted file mode 100644
index 719d587b46a6..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.8.3.ebuild
+++ /dev/null
@@ -1,94 +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"
-	elog
-}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index a6922e826685..c8d5d8805590 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1 @@
-DIST kwayland-integration-5.8.3.tar.xz 18108 SHA256 842a8eea9623a5e335ac585f9ca0453518c93606d0d37ce576f6ee188039e1f0 SHA512 54d16fc90da994994d63393fc272688c322c6024336f3216016759b3f215f68718ded5c23545b78ce75d30fe433b236805b6e30518f285429bbabf222d80cd30 WHIRLPOOL 6bee19a28e35b45f290ba07593cb4672cc579a5c95b6112757d2084f9650fd1708bff07d187dd72e656769696862aa07d3fff29f181f792814a5509048bbb8d1
 DIST kwayland-integration-5.8.5.tar.xz 18292 SHA256 91d2c7422aa0e286111e647b167ac9124d085e47d88415dbcd4b6776701dc685 SHA512 6d269bb1a7ac26d4adf87ddb9791f881d8d52291f4967ba852003897ef056eb723ecedf433f9e4c0aea64bb413ea92c18470af4f0d13302e87aa7075bad18eb6 WHIRLPOOL 6f0080198471c715f9568542edbd3f6cb7c346b0a1ab0d656fb7eebc7a4644d652f0ee644fa7f03b61ebb413755fe2a14af4d8b52ab77ae4739aaac3bb0f2abe
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.8.3.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.8.3.ebuild
deleted file mode 100644
index fcd4a003e6e1..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.8.3.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 a81740036bdd..368d505afd85 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,3 +1,2 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
-DIST kwin-5.8.3.tar.xz 3976096 SHA256 3ce0be9e6908b8658df2bcde203b71f4c1132e0bd273a2d7d5dea81adc097f28 SHA512 a4f8b45411bef9a4cef9a0899a5cc9b2133af9783fd40e5b4cd0b11f8e426eb57bfd40cc97c055d6a9766b3e938fcba166efca9ce206ed6746f938234bbf724c WHIRLPOOL 13258fb4c3dcba82c5a5db70fd54f7ee9d3a4e45703cebed925ea1968f8d8bc0a8b2344639b8496efc64c06bd870fb6acbb3a4233bded264126a01745521c153
 DIST kwin-5.8.5.tar.xz 3998948 SHA256 a703a0d1628e36d3a92dfe3e0a8df7ec733ec2f7a93f854b90a9294dda095fa0 SHA512 3393dc5a5cda0f9abaf71dda8867e312972c5893dd4d61eeee67f9230c5e0e3ca42e941e68c0a2f50ee11d6699e0a815a3e3556f69f9c805acb9c381f5baafe5 WHIRLPOOL bf16c5b3745ecd7bc0fd5b1a90707945769cd6d29a5685a3b78564d2b698be734f7a8affeec0b4f59465d6749c3e90385bab22468b32880c7d8683654951b359
diff --git a/kde-plasma/kwin/kwin-5.8.3.ebuild b/kde-plasma/kwin/kwin-5.8.3.ebuild
deleted file mode 100644
index 9a650bdd9f24..000000000000
--- a/kde-plasma/kwin/kwin-5.8.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_GCC_MINIMAL="4.8"
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE window manager"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gles2 multimedia"
-
-# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kscreenlocker)
-	$(add_qt_dep qtcore '' '' '5=')
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=dev-libs/libinput-1.2
-	>=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.5.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	multimedia? (
-		|| (
-			$(add_qt_dep qtmultimedia 'gstreamer,qml')
-			$(add_qt_dep qtmultimedia 'gstreamer010,qml')
-		)
-	)
-	!<kde-apps/kdeartwork-meta-15.08.3-r1:4
-	!kde-plasma/kwin:4
-	!kde-plasma/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep designer)
-	$(add_qt_dep qtconcurrent)
-	x11-proto/xproto
-	test? (	x11-libs/xcb-util-wm )
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
-}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index e33fdd854f13..c460c93f116a 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,3 +1,2 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
-DIST kwrited-5.8.3.tar.xz 20396 SHA256 893131e4720f2d861a9a5decdf7deaf0ab0fdc2f6dee95e325c674c37dd74e68 SHA512 7564e5eed2191d743939fa39e443d1ba27520afc6e3cf1d58267fd191ead53c719ded02a6f394dd003a020a83c23febec8bd128ec8df7b7b636d4a60821d6eab WHIRLPOOL 1f2a8cce2b826582d7544e05049e3fb0f4803f1f10e0e2b045bfe5bef2c4d29a4cdb91cf4ff13cbb511e65918da7190c99ee02772cafa66803bb0586f59ed5e9
 DIST kwrited-5.8.5.tar.xz 20324 SHA256 793a391d74ccabd107b323504b3a0c10482c6ec098019dc45c02fb68091159db SHA512 ea13dc1f50209c98d2a0377a985d5a2783773a583daa3a52fb657a19f9e4c2436d01dc5994fac5d1bd5de11d5bc1de715574440a67059ed1d9a04bd04c28a4e5 WHIRLPOOL 5089fee27309954a02e57a638671ef07832be37b7d1e61763fd6ce2743663d00f76d960424c9967c4fa30da1cad35b46b2495627de154f0f872b9876ce30d8ae
diff --git a/kde-plasma/kwrited/kwrited-5.8.3.ebuild b/kde-plasma/kwrited/kwrited-5.8.3.ebuild
deleted file mode 100644
index dc0b3bf477ad..000000000000
--- a/kde-plasma/kwrited/kwrited-5.8.3.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 Plasma daemon listening for wall and write messages"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpty)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/kwrited:4
-"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index d8f77c111c22..58485817a5e3 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,3 +1,2 @@
 DIST libkscreen-1.0.5_p20150822.tar.bz2 38419 SHA256 25cf4117dc99c3278a8abf315fa31ea3a3a1e065a2b28c37a26b2da508bee4f6 SHA512 2a35b63f65d4440205ff11fe35cf1b87cb656e0647eb7d2c7bada7dd6b71cb86d32ffb20a3b63e57d6444f17d3cb0758fc015e95bec62747189fba5a50fab48a WHIRLPOOL 8ccdd2ff43fcb186ab31653ac47e8b8f86be4a5cfdb9231b2e4f57bb335be578658716fa490141ccc91ac636982f28ec0ebc724d69058242d3deacd3e8c00383
-DIST libkscreen-5.8.3.tar.xz 92896 SHA256 a76f976494ac98b742969830c350b89b354b11a854c1d884dbe0daecc79c4a26 SHA512 781610f438189dfe0afb057a97c3aae9b134faafb7b7badfc625c514838eb42fda4f591e19573ad33ffdf479648e67f915b0e7d23bf7142ec3972219eace2d9e WHIRLPOOL ad163590618b3dea408151e36f91d17eea718aaa747c335700f88dbd5bc15cdc55c34f5042213e95005eac94d8a20e662b2ff25489d9567e1198ce63b53b2403
 DIST libkscreen-5.8.5.tar.xz 93668 SHA256 c9afda7f80af8d07a659240de0ca70c96cf72dc124f338d42faf5a40fdb742fe SHA512 d907fbd1348c2e6094ec1cd51cc0131170a8e86d033da386ef7372ba08a5e8ddbbdbac3029a4e512ff3a9ba9d00b90de6fd294552966b1e85d787d25281cfe96 WHIRLPOOL 4b425d84c50c0867d769e002537fd37752a119e0cbc00ea72695bde6672b2ad462985799eb14cde0e3a239209d1f9983eb8d3f5945225ce50ce5718c53972808
diff --git a/kde-plasma/libkscreen/libkscreen-5.8.3.ebuild b/kde-plasma/libkscreen/libkscreen-5.8.3.ebuild
deleted file mode 100644
index e103a5c34474..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.8.3.ebuild
+++ /dev/null
@@ -1,28 +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=""
-
-DEPEND="
-	$(add_frameworks_dep kwayland)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	!x11-libs/libkscreen:5
-"
-
-# requires running session
-RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 4f61f04a21b4..1b3f0ed305e5 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1 @@
-DIST libksysguard-5.8.3.tar.xz 571500 SHA256 9e290e62e21864de32d248dda75d6adf9b87ce119d45c1f306959a9a290cc084 SHA512 2f1fd3c35f10e05ac89a193ebcb86ad968abd4e2dc3c1b8bc929128866c6152671b8d5305a9decf66c777895bc4fbec61ac31fb2d0117d306581d85252cef8ac WHIRLPOOL d33e7545c86b2926404de511a4e55456d4d62f83e136b829c62419f31eb15207b44080ec13829f32c5badeb4775b87f3f3d8a3784f0e688bec02cb014cbc637a
 DIST libksysguard-5.8.5.tar.xz 575840 SHA256 976f9506037b45570475ba71a7445810cfd57c6079589038d63742d9fe2497a9 SHA512 5f3f1b924589dbb50e7e7f133da5325817a6ce100915682d3b6bbf80124299d85e66f83cd7adc33771dfdc9ee49c226fcb8a47204873a21231c2fe2829685089 WHIRLPOOL 89e7b1ba622356d572b31fbabc471c2b54312c26361b16183ab9f278c0bf3d877be7f7df2e95156b5ef5df3be80c263e3c521b02cd16dd3e642117e23cb36745
diff --git a/kde-plasma/libksysguard/libksysguard-5.8.3.ebuild b/kde-plasma/libksysguard/libksysguard-5.8.3.ebuild
deleted file mode 100644
index ad0b1c44142e..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.8.3.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-plasma/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 b9fe7154b196..1b85578a6925 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,3 +1,2 @@
 DIST milou-0.1.tar.xz 53196 SHA256 cd79e5a95310146269ba2d0da4aa9dbde300ead8d54747b8edecfa863d9fdfe4 SHA512 0de077d12237e1cefcccb498b80238a02fdf2788931f835858551097337b71c5c3bf80d7e4c70d9db9fc2940b2127e0c68511130cccc7a72fd7cd67e4d7b0e1e WHIRLPOOL 31901e729d4468927e546b46e7ead5082ae7e0470315d3835fe55f3b0b6fedbaadddb296fbc29055e28401dd5e1fdab4480e92ef975578e055af46c9d1384046
-DIST milou-5.8.3.tar.xz 54356 SHA256 543b6b5e876b8499fb5865ee0117e430bcb208a61c02fc42085391909b45790f SHA512 96a43caf2294df088069d5d11f72e660632c9abd28278f34f9c2f473ab6688938ef669e8b1401976632eaad24668c3e3de5f74d2f57a3cfa236de5d141444985 WHIRLPOOL cae4534bf49b015b394cb207bb7a1565ec76b45a615ec654b547f05e0ef93208cb054a7afe69539691a26feb68b2e8e892157cb48f31a13441b372de7c3df4c4
 DIST milou-5.8.5.tar.xz 54536 SHA256 6dfced99ee3b1eb163dfc55c5546e06b6aee664b4333251e461a4f39c8624552 SHA512 05002a23c5214a891258f3b9a0be68f3beede42e32437f55a887ae7635a14d9c12acc327a2d3fb8bb5e753666aaccd2826abf7fd3154e8ea6aaad4b43610f6e6 WHIRLPOOL ac6ded45107ab6a54bd42e82876e054a43a3d81efa3ceeda271a1067be182c73ea1c4b4cef3d124eb43998fee5aadcd7c9fa72ff64816cd39b2d6174445acd5a
diff --git a/kde-plasma/milou/milou-5.8.3.ebuild b/kde-plasma/milou/milou-5.8.3.ebuild
deleted file mode 100644
index cca13df273d0..000000000000
--- a/kde-plasma/milou/milou-5.8.3.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-plasma/milou:4
-"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index f6a69f236f75..7f8233464aac 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1 @@
-DIST oxygen-5.8.3.tar.xz 4457872 SHA256 4f0e48a205352a63fe80fa7a24a052154d1ca7bfc7f7af5ebcf5c159366a2c47 SHA512 7ea53857a1083f98805e5f90ffa809f883de38cd7f2900197e9155965ee64bcaba4e6e0e7e5087f8dfc4ff50189b9f7ab0734318cd7e0721e9be524b89ed0f5d WHIRLPOOL 5abdf39d693d5f6f2fe09bc425e0abd95efc3bd04ba9995402633939d7e16778d52827ed6c4221c545260153745fda95be3f3d8d173956ad91f86ca3a234a532
 DIST oxygen-5.8.5.tar.xz 4461696 SHA256 07d2740709c9979eac381d4e728a3bf6670015a02c2c3478ed30fa8f8d6532a5 SHA512 0c1f285977c3a6abf4c62b6edf389d15570ba1fefa1972e92acab406ecba92eb4559aa41206487988c96c4512256736ff42dd46c45e871a0fd803d7367d38a4b WHIRLPOOL 6e3b6d5ac914be3c1a1a787be68d0602a138fc6cd5b854dd678cb05793b734e76c1d389e00b6ecd825fdff40bdc6a87ac8926403ab77e3d53ff34c2307c5b7aa
diff --git a/kde-plasma/oxygen/oxygen-5.8.3.ebuild b/kde-plasma/oxygen/oxygen-5.8.3.ebuild
deleted file mode 100644
index 701b200fd296..000000000000
--- a/kde-plasma/oxygen/oxygen-5.8.3.ebuild
+++ /dev/null
@@ -1,81 +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="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
-KEYWORDS="amd64 ~arm x86"
-IUSE="qt4 wayland"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	qt4? (
-		kde-frameworks/kdelibs:4
-		x11-libs/libX11
-	)
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kservice)
-	qt4? ( virtual/pkgconfig )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	qt4? (
-		!kde-plasma/kstyles:4
-		!kde-plasma/liboxygenstyle:4
-	)
-	!kde-plasma/kdebase-cursors:4
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			$(cmake-utils_use_find_package wayland KF5Wayland)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			mycmakeargs+=( -DUSE_KDE4=true )
-		fi
-
-		kde5_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 52f2c42d7235..9cc44598bb50 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,2 +1 @@
-DIST plasma-desktop-5.8.3.tar.xz 6373808 SHA256 e77d1ea55ba521b6f281077685db9956269ad8b694153adb00c2c687399c725e SHA512 98f4c9a7b3ebf0e8cc889e458ec622bebcd09856ded9c887354f9336111f91caae2dc4819492357c7694e2effada6b00ec5b70f9eb8d8354de0b397a4abb9aad WHIRLPOOL 53cdc3b2c16021dc8eebcaaf559d3a649e099bbb6178e59c6e1e2a7b65c589874e568a4d758fcf9c169782d04840ddde0c019c285d6e74b78d91cb01fcc7456c
 DIST plasma-desktop-5.8.5.tar.xz 6410960 SHA256 d95eeb976cc18a50cff141c509f9e67430b81efcf36269a283fc62b81d48a910 SHA512 d8ef41f5e2a041de04f353e04274062ca4be069ffe88b5cfb0c9a2e5b1395631a8adaf0fda50a784a61a2585c0a503d84730a8c2df844aba71e894bd1f17915e WHIRLPOOL 1ed15a97ab966d682b89a2e7b146220e55495acbba9707a057554044e4ba9f1198712a16dc56d9082457b73384683c7e97647a6ce845df3987d98202e9b8dace
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
deleted file mode 100644
index fedfddb785fa..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
+++ /dev/null
@@ -1,158 +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 +semantic-desktop"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	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-0.9.6 )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		media-sound/pulseaudio
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/accountsservice
-	x11-apps/setxkbmap
-	legacy-systray? (
-		gtk2? ( dev-libs/libappindicator:2 )
-		gtk3? ( dev-libs/libappindicator:3 )
-		qt4? ( dev-libs/sni-qt )
-	)
-	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
-	!kde-apps/kcontrol
-	!kde-apps/kdepasswd:4
-	!kde-apps/knetattach[handbook]
-	!kde-base/plasma-desktop:4
-	!kde-plasma/plasma-workspace:4
-	!kde-plasma/solid-actions-kcm:4
-	!kde-plasma/systemsettings:4
-	!kde-misc/kcm_touchpad
-	!kde-misc/kcm-touchpad
-	!kde-plasma/kcm-touchpad
-	!<kde-plasma/kdeplasma-addons-5.5.50
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-proto/xproto
-	fontconfig? ( x11-libs/libXrender )
-	input_devices_evdev? ( x11-drivers/xf86-input-evdev )
-"
-
-REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
-
-PATCHES=( "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch" )
-
-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)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 954a061f968d..93acc9d764f0 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,2 +1 @@
-DIST plasma-integration-5.8.3.tar.xz 50640 SHA256 437cfef7c1a7de3b422e7003850025355a759d50514cfcb6cab2e5e5aaefcfa4 SHA512 25fe61c4d9884025f3c366072d5092bd57b8faba64bbe7045c8ef8f52e07375f1d88e2ae6598c48372ec455c14dd9b42ed3392e7427b41bd38e3f05a19753da8 WHIRLPOOL 69f1ca042518240f96172e0e363b329d55ef9e04d7aaba648ff54763521ab3b9b642791abd78b97b81991617a337e88923cf494fa2bc7afd1d28c107e0214175
 DIST plasma-integration-5.8.5.tar.xz 50936 SHA256 cb4da56f940e87e1195a0ba19e07ea3384fed1dcd26ca91dee1d7dee8f00a7ea SHA512 5e894b334d0d012e6ace38b02f3ff9f8623f75182a0e585406fe5d904658e9ce631c467738a9a79767505028715eb6d27de5c35a4f9d50ad9a83a70e0951dd75 WHIRLPOOL ac28acc14138d95b1228482b4889c4678c12856a9b4a8b915043af3acf434b58121f165d20dcc8a8780d0be4b3548d3053b1d45e58e0bdd7bb5a01a5a9afe733
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.8.3.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.8.3.ebuild
deleted file mode 100644
index fac9ab9dfdd6..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.8.3.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep breeze)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '' '' '5=')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libXcursor
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.8.3.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.8.3.ebuild
deleted file mode 100644
index a0760d2cb432..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.8.3.ebuild
+++ /dev/null
@@ -1,65 +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 networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers"
-
-RDEPEND="
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kactivitymanagerd)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kdeplasma-addons)
-	$(add_plasma_dep kgamma)
-	$(add_plasma_dep khotkeys)
-	$(add_plasma_dep kinfocenter)
-	$(add_plasma_dep kmenuedit)
-	$(add_plasma_dep kscreen)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep ksshaskpass)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep kwayland-integration)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep kwrited)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep oxygen)
-	$(add_plasma_dep plasma-desktop)
-	$(add_plasma_dep plasma-integration)
-	$(add_plasma_dep plasma-workspace)
-	$(add_plasma_dep polkit-kde-agent)
-	$(add_plasma_dep powerdevil)
-	$(add_plasma_dep systemsettings)
-	$(add_plasma_dep user-manager)
-	bluetooth? ( $(add_plasma_dep bluedevil) )
-	display-manager? (
-		sddm? (
-			$(add_plasma_dep sddm-kcm)
-			x11-misc/sddm
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	grub? ( $(add_plasma_dep breeze-grub) )
-	gtk? (
-		$(add_plasma_dep breeze-gtk)
-		$(add_plasma_dep kde-gtk-config)
-	)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
-	networkmanager? ( $(add_plasma_dep plasma-nm) )
-	pam? ( $(add_plasma_dep kwallet-pam) )
-	plymouth? ( $(add_plasma_dep breeze-plymouth) )
-	pulseaudio? ( $(add_plasma_dep plasma-pa) )
-	sdk? ( $(add_plasma_dep plasma-sdk) )
-	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
-"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index be16d778a30a..95ad126446f6 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,3 +1,2 @@
 DIST plasma-nm-0.9.3.6.tar.xz 551320 SHA256 56b5c8221761fac30808117c7f8fa11a9e3cdb4b2d16a733d33996bc7136b64b SHA512 50f3e5020f4437d710709a301b981f888898c293a71dff3aee809255207a0f97caf5d3811b453da2338df93238ef33a79e85cb3598ee38d8a41255d8a572e256 WHIRLPOOL 2486304f8c5c169105e2ea0527e7fb291cc9c9f9fee36a2cdc9d5aff7f5a72cb8bdda692ac54f621c63a84b2e48ba2c429e20a4bbe7efa91ecb48a393286dc7c
-DIST plasma-nm-5.8.3.tar.xz 644172 SHA256 674d56f479304d4d06b60e68bbdb3ea62bdaf78dc1843ba73fead39be80352e7 SHA512 fa2091f028dc92556234345cb79ca365b3137a14cc7bda2961d3dc91ba9279bcc122fcc1ff13e29ad580c47b681403334f054f302f8383374973781e3dc9b6ec WHIRLPOOL d944174a8cfdc24665209aceab972b6224844246c293f1895868c1cb3af96b2e261c80f417e01edf0be30b24e8e1e7f05d8b19f578ebb5fe1ab3a0ab88b7d666
 DIST plasma-nm-5.8.5.tar.xz 652716 SHA256 6c2fee26ed36ebc7929f8d8da42d29ed475fe8dd6ab3e8987f1a0a8fd8f73ebc SHA512 adc4a7bade44e16a8d47b7defb73db550347838251f2fcf9e7c879741934692cbfd97df8bec3c5c540f01d479138f0cefba96b1332f6690c1a08817d1365ccf2 WHIRLPOOL 475d90ade58b23ff70362a030d6505862b1ad94474e0b8a664cc480ffde482614ad7c43b400f12df4b4e7252a904cffdb797a46bc01a707f313d67f7f182d942
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.8.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.8.3.ebuild
deleted file mode 100644
index 06f95db6440f..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.8.3.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-plasma/plasma-nm:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package modemmanager ModemManager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index a6826d344b09..6286100b6716 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1 @@
-DIST plasma-pa-5.8.3.tar.xz 69468 SHA256 04574c84ada093be461b95f6d9c32c7fc28ebcd11943bfffaaf5ca3d336b7dd0 SHA512 1f86d9bb88620fa0b7c9584e27354b5bc10179ce0f7a80513d1900e661e3843f68513f25c542b63098d2d9f185c71dfcc9349f385c6079c0d1667e641ac68da6 WHIRLPOOL 1dca63d521f0a96da7afcbccf799ba8a7f518406560b5cff2d98ed896ab79bc01cbf29f3fab273e9268c6f2e4d188b8034e200a8c77379098cd82fd1a552e120
 DIST plasma-pa-5.8.5.tar.xz 69856 SHA256 2bbc3e6e12f743c633a5c2101efa6a19dd5f120b64da0ea0ff3da3e7ba6fe16d SHA512 87151c05d2f919c7b25274254d690eb7dd0c6e1068a230e6110092bf7622bcfa14c553e0b09253b529e9f4531ed13d484a874e29402dc13d8ec66315111abe5e WHIRLPOOL c2301cd34faddff497c230f4d0d4f0e66ebe2b506727e219b3b025dadb8e76e62e53e3d3246e190da3543d3259907083de507fae1320d7df24b6639713cf797a
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.8.3.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.8.3.ebuild
deleted file mode 100644
index 0fe9a9c5643b..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.8.3.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"
-inherit kde5
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	gnome-base/gconf:2
-	media-libs/libcanberra
-	media-sound/pulseaudio[gnome]
-"
-
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 9852deced28f..a64d8b43d541 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1 @@
-DIST plasma-sdk-5.8.3.tar.xz 716796 SHA256 a7666c9b9356e64fd653f6ef9d6fbdde143553166fe5cb9241a2a77a9c37fbc9 SHA512 7b36949e49097a317a553a262e7a425d4c4d35d2f26f6ddf0787ed4bd7e0dcb2c47ed8333fec481e6f7497821f67db7e2d9d8d855ba8a6cc5b94d609779e87ed WHIRLPOOL dad9b758c79d00e971516b2ffbcb2de17d6b5c4b735ab2003fbc2edff5d072494a8d1c0915fc627fedc85a838f1e15211f977819f225f48f64869c1c615bc957
 DIST plasma-sdk-5.8.5.tar.xz 723240 SHA256 edeeb529e29307f5efedb0371706269ab0edcf0861b73dbd235821457a599e8e SHA512 e805b803b85baaa376069d6ca56f1df4db81252a1fade74629333a236e320835d3fd464fd64427177817ed22e8b3edc55a28bccab4360339ceb193fc9c4008ff WHIRLPOOL d658cdd8bfa8b39c1a31ec1ed7eea3d3f773b1a836458967622cd5de08f7dfe8b2bf5b523c8cc68766d057181d7f0c2823e9d227fbed373d799435f19f2c3e06
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.8.3.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.8.3.ebuild
deleted file mode 100644
index 87b7e73f9efe..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.8.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 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)
-	dev-libs/kirigami:1
-	plasmate? (
-		$(add_frameworks_dep kdelibs4support)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kparts)
-		$(add_qt_dep qtwebkit)
-		dev-util/kdevplatform:5
-	)
-"
-RDEPEND="${DEPEND}
-	!dev-util/plasmate
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package plasmate KDevPlatform)
-		$(cmake-utils_use_find_package plasmate Qt5WebKit)
-		$(cmake-utils_use_find_package plasmate Qt5WebKitWidgets)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 5e8a7ccd2bb1..815095d664a4 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1 @@
-DIST plasma-workspace-wallpapers-5.8.3.tar.xz 45917560 SHA256 e2698f8292f8f1e8e714e9c3512418d9389c2bd4d8ec35c3297571d280e1c337 SHA512 16c8a93dcc0e667f20eedfde9caa5c7c12d0e680f8c26c5fc5b58badfff1ea707edc0a4a37a9898a76a909907a89a7a14d332f3d5a8f1e8671089f9b71394b78 WHIRLPOOL cb9d027922b48e243a0bf977c53893fa9cab16d8e876d381595e6b24852d33cd4acfa5c73706fde5267f44427bd3dcd75921b539497a94cb4342e77611bdf92f
 DIST plasma-workspace-wallpapers-5.8.5.tar.xz 45911280 SHA256 dfdbef49a8b8feb27a0927bc28728fefed94943baebf97587f8b2284384eda84 SHA512 2772eea021db56de425e094783c88bbd8811484720be38816bbf9a525a244c2e9f07f4223bceec4045bee5008eb154d2cae3d532a7e35fca4544d68bdfde3f24 WHIRLPOOL c9aef7c817c96bce3f0f5a8d3f8055a3bed7a5bf82fe1743ea1c70895c964dfdf183249b1e2fa3455d529274313fbb58ab44826db50286fe9146bc0c788f1c67
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.8.3.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.8.3.ebuild
deleted file mode 100644
index 8ad0f6012a2b..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.8.3.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 4a7094c8b65c..ef563582f717 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
-DIST plasma-workspace-5.8.3.tar.xz 6955700 SHA256 8b2f455bdf355d7d771bd6fb4e19510ec4b131c093b23268cb9c1a321c75059a SHA512 7ed6887dfd7b10c98bfba128a7d0bc6b534f067f519495fb389023308bec178043154bbe755158df6dc65623987f390389b9fde1b9d1780a87fd4450e41bdbeb WHIRLPOOL 3afa4bba6148c4e14cd17e83b71c744288a802161a711179c12b3190dc27c746d97476c8148130fd0cb39505697da1c4044af613dd4ba8ebc3a7682f4022227e
 DIST plasma-workspace-5.8.5.tar.xz 6989928 SHA256 6d25077205436e3e721d7dfa4dffce7aea62a6e652ee7897952885e52b2f6ea1 SHA512 c4173bd4db3dc31c0435192b1569bdb44488f9f17b4cb5468b4af562b9dbb0934106caf92ea65e9e6b24f8dadcdda08cee07d64bee8b0f52398e07f39fbb97f6 WHIRLPOOL 1f42679ab9f9e1abd446474f03cb8b65c1d49875f2f1dc689311c1e62985d7e8b4276774fc1717ad8512b8e90b1f654f5f0a93aa7da06083e5a0e4b7c5251936
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-all-outputs-known.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-all-outputs-known.patch
deleted file mode 100644
index 8e5b0f3fed8d..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-all-outputs-known.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Marco Martin <notmart@gmail.com>
-Date: Wed, 09 Nov 2016 14:54:42 +0000
-Subject: make sure all outputs are known
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=b8d3e09b3687082037a6d280d2032617121ae5e5
----
-make sure all outputs are known
-
-at startup, if a screen id is missing from the screenpool mapping
-containment::screen() will return -1 for a moment in the startup
-phase even if it has a valid lastScreen
-
-populate mappings of eventual missing stuff at screenpool ctor
-
-make sure destroyed containments don't get assigned a view
-
-reviewed-by: David Edmundson
-
-CCBUG:372099
-CCBUG:371858
-CCBUG:371991
-CCBUG:371819
-CCBUG:371734
----
-
-
---- a/shell/screenpool.cpp
-+++ b/shell/screenpool.cpp
-@@ -49,6 +49,17 @@
-             m_idForConnector[connector] = key.toInt();
-         } else if (m_idForConnector.value(connector) != key.toInt()) {
-             m_configGroup.deleteEntry(key);
-+        }
-+    }
-+
-+    // if there are already connected unknown screens, map those
-+    // all needs to be populated as soon as possible, otherwise
-+    // containment->screen() will return an incorrect -1
-+    // at startup, if it' asked before corona::addOutput()
-+    // is performed, driving to the creation of a new containment
-+    for (QScreen* screen : qGuiApp->screens()) {
-+        if (!m_idForConnector.contains(screen->name())) {
-+            insertScreenMapping(firstAvailableId(), screen->name());
-         }
-     }
- }
-
---- a/shell/shellcorona.cpp
-+++ b/shell/shellcorona.cpp
-@@ -1178,7 +1178,12 @@
- {
-     if (m_desktopContainments.contains(activity)) {
-         for (Plasma::Containment *cont : m_desktopContainments.value(activity)) {
--            if (cont->screen() == screenNum && cont->activity() == activity) {
-+            //in the case of a corrupt config file
-+            //with multiple containments with same lastScreen
-+            //it can happen two insertContainment happen for
-+            //the same screen, leading to the old containment 
-+            //to be destroyed
-+            if (!cont->destroyed() && cont->screen() == screenNum && cont->activity() == activity) {
-                 return cont;
-             }
-         }
-@@ -1832,6 +1837,7 @@
- //     qDebug() << "ShellCorona screenForContainment: " << containment << " Last screen is " << containment->lastScreen();
- 
-     for (auto screen : qGuiApp->screens()) {
-+        // containment->lastScreen() == m_screenPool->id(screen->name()) to check if the lastScreen refers to a screen that exists/it's known
-         if (containment->lastScreen() == m_screenPool->id(screen->name()) &&
-             (containment->activity() == m_activityController->currentActivity() ||
-             containment->containmentType() == Plasma::Types::PanelContainment || containment->containmentType() == Plasma::Types::CustomPanelContainment)) {
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-dont-connect-twice.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-dont-connect-twice.patch
deleted file mode 100644
index 81365ebb4927..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-dont-connect-twice.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit 8a472f17ce11f3b79d740cdc21096d82b8683f3d
-Author: David Edmundson <kde@davidedmundson.co.uk>
-Date:   Thu Nov 10 10:28:16 2016 +0000
-
-    Avoid connecting to screen changed signals twice
-    
-    Summary:
-    load() can be called multiple times; either from setShell or
-    loadLookAndFeelDefaultLayout. We still only want addOutput once when a
-    screen is added
-    
-    Reviewers: #plasma, apol
-    
-    Reviewed By: apol
-    
-    Subscribers: plasma-devel
-    
-    Tags: #plasma
-    
-    Differential Revision: https://phabricator.kde.org/D3320
-    
-    CCBUG:372099
-    CCBUG:371858
-    CBUG:371991
-    CCBUG:371819
-    CCBUG:371734
-
-diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
-index af2f555..0007f0b 100644
---- a/shell/shellcorona.cpp
-+++ b/shell/shellcorona.cpp
-@@ -675,9 +675,9 @@ void ShellCorona::load()
-             addOutput(screen);
-         }
-     }
--    connect(qGuiApp, &QGuiApplication::screenAdded, this, &ShellCorona::addOutput);
--    connect(qGuiApp, &QGuiApplication::primaryScreenChanged, this, &ShellCorona::primaryOutputChanged);
--    connect(qGuiApp, &QGuiApplication::screenRemoved, this, &ShellCorona::screenRemoved);
-+    connect(qGuiApp, &QGuiApplication::screenAdded, this, &ShellCorona::addOutput, Qt::UniqueConnection);
-+    connect(qGuiApp, &QGuiApplication::primaryScreenChanged, this, &ShellCorona::primaryOutputChanged, Qt::UniqueConnection);
-+    connect(qGuiApp, &QGuiApplication::screenRemoved, this, &ShellCorona::screenRemoved, Qt::UniqueConnection);
- 
-     if (!m_waitingPanels.isEmpty()) {
-         m_waitingPanelsTimer.start();
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch
deleted file mode 100644
index 2d4f7eca0b32..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 238ec3ee671bcf6716348122bebefb20c25d1101
-Author: David Edmundson <kde@davidedmundson.co.uk>
-Date:   Thu, 17 Nov 2016 10:53:48 +0000
-
-    [Windowed Widgets Runner] Don't access invalid KPluginInfo
-    
-    BUG: 372017
-    FIXED-IN: 5.8.4
-    
-diff --git a/runners/windowedwidgets/windowedwidgetsrunner.cpp b/runners/windowedwidgets/windowedwidgetsrunner.cpp
-index 5ccbd27..f86159a 100644
---- a/runners/windowedwidgets/windowedwidgetsrunner.cpp
-+++ b/runners/windowedwidgets/windowedwidgetsrunner.cpp
-@@ -60,6 +60,9 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
- 
-     foreach (const KPluginInfo &info, Plasma::PluginLoader::self()->listAppletInfo(QString())) {
-         KService::Ptr service = info.service();
-+        if (!service || !service->isValid()) {
-+            continue;
-+        }
- 
-         if (((service->name().contains(term, Qt::CaseInsensitive) ||
-              service->genericName().contains(term, Qt::CaseInsensitive) ||
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-screenpool-screenchange.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-screenpool-screenchange.patch
deleted file mode 100644
index bd668743c5fc..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-screenpool-screenchange.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-commit 7154fb681adc73c482e862febc7ad008f77058dd
-Author: David Edmundson <kde@davidedmundson.co.uk>
-Date:   Thu Nov 10 10:29:27 2016 +0000
-
-    Load screenpool at the same time as we connect to screenchanged signals
-    
-    Summary:
-    Otherwise we have a gap during load (waiting querying kactivities))
-    between screen pool being created and us connecting to the screen
-    changed signals, which in turn are used to update screen pool.
-    
-    In particular the primary screen can get out of sync between the current
-    state and the screen pool.
-    
-    Test Plan: Based on Christopher Feck's research and initial patch
-    
-    Reviewers: #plasma
-    
-    Subscribers: mart, rwooninck, fvogt, cfeck, plasma-devel
-    
-    Tags: #plasma
-    
-    Differential Revision: https://phabricator.kde.org/D3319
-    
-        CCBUG:372099
-        CCBUG:371858
-        CBUG:371991
-        CCBUG:371819
-        CCBUG:371734
-
-diff --git a/shell/autotests/screenpooltest.cpp b/shell/autotests/screenpooltest.cpp
-index 5d0522f..5fc844a 100644
---- a/shell/autotests/screenpooltest.cpp
-+++ b/shell/autotests/screenpooltest.cpp
-@@ -51,6 +51,7 @@ void ScreenPoolTest::initTestCase()
-     cg.deleteGroup();
-     cg.sync();
-     m_screenPool = new ScreenPool(KSharedConfig::openConfig(), this);
-+    m_screenPool->load();
- }
- 
- void ScreenPoolTest::cleanupTestCase()
-diff --git a/shell/screenpool.cpp b/shell/screenpool.cpp
-index 011300d..b60cca1 100644
---- a/shell/screenpool.cpp
-+++ b/shell/screenpool.cpp
-@@ -30,6 +30,14 @@ ScreenPool::ScreenPool(KSharedConfig::Ptr config, QObject *parent)
-     connect(&m_configSaveTimer, &QTimer::timeout, this, [this](){
-         m_configGroup.sync();
-     });
-+}
-+
-+void ScreenPool::load()
-+{
-+    m_primaryConnector = QString();
-+    m_connectorForId.clear();
-+    m_idForConnector.clear();
-+
-     QScreen *primary = qGuiApp->primaryScreen();
-     if (primary) {
-         m_primaryConnector = primary->name();
-diff --git a/shell/screenpool.h b/shell/screenpool.h
-index 046d18b..9b3a9af 100644
---- a/shell/screenpool.h
-+++ b/shell/screenpool.h
-@@ -33,6 +33,7 @@ class ScreenPool : public QObject {
- 
- public:
-     ScreenPool(KSharedConfig::Ptr config, QObject *parent = nullptr);
-+    void load();
-     ~ScreenPool() override;
- 
-     QString primaryConnector() const;
-diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
-index 0007f0b..1475374 100644
---- a/shell/shellcorona.cpp
-+++ b/shell/shellcorona.cpp
-@@ -627,6 +627,8 @@ void ShellCorona::load()
- 
-     disconnect(m_activityController, &KActivities::Controller::serviceStatusChanged, this, &ShellCorona::load);
- 
-+    m_screenPool->load();
-+
-     //TODO: a kconf_update script is needed
-     QString configFileName(QStringLiteral("plasma-") + m_shell + QStringLiteral("-appletsrc"));
- 
-@@ -1184,7 +1186,7 @@ Plasma::Containment *ShellCorona::createContainmentForActivity(const QString& ac
-             //in the case of a corrupt config file
-             //with multiple containments with same lastScreen
-             //it can happen two insertContainment happen for
--            //the same screen, leading to the old containment 
-+            //the same screen, leading to the old containment
-             //to be destroyed
-             if (!cont->destroyed() && cont->screen() == screenNum && cont->activity() == activity) {
-                 return cont;
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-sync-app-w-applets-config.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-sync-app-w-applets-config.patch
deleted file mode 100644
index 44ec35fe6ba9..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-sync-app-w-applets-config.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed, 09 Nov 2016 15:11:52 +0000
-Subject: Sync app config in sync with applets config
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=329f00dc90f6645ff6e531542212ea73fb8ef274
----
-Sync app config in sync with applets config
----
-
-
---- a/shell/shellcorona.cpp
-+++ b/shell/shellcorona.cpp
-@@ -114,6 +114,9 @@
-     m_appConfigSyncTimer.setSingleShot(true);
-     m_appConfigSyncTimer.setInterval(s_configSyncDelay);
-     connect(&m_appConfigSyncTimer, &QTimer::timeout, this, &ShellCorona::syncAppConfig);
-+    //we want our application config with screen mapping to always be in sync with the applets one, so a crash at any time will still
-+    //leave containments pointing to the correct screens
-+    connect(this, &Corona::configSynced, this, &ShellCorona::syncAppConfig);
- 
-     m_waitingPanelsTimer.setSingleShot(true);
-     m_waitingPanelsTimer.setInterval(250);
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
deleted file mode 100644
index c8e4c3ad43c0..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
+++ /dev/null
@@ -1,177 +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="+calendar geolocation gps prison qalculate +semantic-desktop"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kjsembed)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui 'jpeg')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/libdbusmenu-qt[qt5]
-	|| ( >=kde-frameworks/kpackage-5.28.0-r1 <kde-frameworks/kpackage-5.28.0 )
-	media-libs/phonon[qt5]
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	calendar? ( $(add_kdeapps_dep kholidays) )
-	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
-	gps? ( sci-geosciences/gpsd )
-	prison? ( $(add_frameworks_dep prison) )
-	qalculate? ( sci-libs/libqalculate )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_kdeapps_dep kio-extras)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep plasma-integration)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtpaths)
-	$(add_qt_dep qtquickcontrols 'widgets')
-	app-text/iso-codes
-	x11-apps/mkfontdir
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xset
-	x11-apps/xsetroot
-	!dev-libs/xembed-sni-proxy
-	!kde-plasma/freespacenotifier:4
-	!kde-plasma/libtaskmanager:4
-	!kde-plasma/kcminit:4
-	!kde-plasma/kdebase-startkde:4
-	!kde-plasma/klipper:4
-	!kde-plasma/krunner:4
-	!kde-plasma/ksmserver:4
-	!kde-plasma/ksplash:4
-	!kde-plasma/plasma-workspace:4
-"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
-	# stable branch
-	"${FILESDIR}/${PN}-5.8.3-all-outputs-known.patch"
-	"${FILESDIR}/${PN}-5.8.3-sync-app-w-applets-config.patch"
-	"${FILESDIR}/${PN}-5.8.3-dont-connect-twice.patch"
-	"${FILESDIR}/${PN}-5.8.3-screenpool-screenchange.patch"
-	"${FILESDIR}/${PN}-5.8.3-krunner-crash.patch"
-	# master
-	"${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
-	"${FILESDIR}/${PN}-5.8.3-systray-cpuload.patch"
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package calendar KF5Holidays)
-		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package gps libgps)
-		$(cmake-utils_use_find_package prison KF5Prison)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/10-agent-startup.sh"
-
-	insinto /etc/plasma/shutdown
-	doins "${FILESDIR}/10-agent-shutdown.sh"
-}
-
-pkg_postinst () {
-	kde5_pkg_postinst
-
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
-	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-	echo
-}
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 3f0eb8ab6368..0c6fefd919d4 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,2 +1 @@
-DIST polkit-kde-agent-1-5.8.3.tar.xz 40856 SHA256 1ff01a737c22063a095e4b79c29d7c8ea3bbe7621c362e1d637f7e39a5cf9412 SHA512 cc5158b930ced58290403d84e7c0a751186e7c25e669231a63291ce9a73568f9ba8f862f31515fdbbb8c0d44ffd2d6abb95009e6355817ef690100ebed2b91a8 WHIRLPOOL 7076aa6630ce0675d83431b162cee5e8e57ea59873a888258b94c6fb5ac6bf219da038116e2fcc86bef208cc5e72b70a642f7731e7c740c986b98a7e99ed3b5f
 DIST polkit-kde-agent-1-5.8.5.tar.xz 41136 SHA256 87eb786344042d361c1af1b40c0ac6e153692505101508e24a8d49ca114193b7 SHA512 8491fdacd849dffb76f1b47bb2c20ed3d924e37b698599003d3351dd3e4923d0ed7565030cbbd4065dc823d3d5960b7667f634c176781ccc2bc88eb163fcd614 WHIRLPOOL 7ff11dae2a0823104732f8a2ecaaad2f7b1075bfc1ffa89770f573987dc3b362397549b028d0ca4781b07c4e59bdea5f844324a3b5fe46a0c2dc030cf410f380
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.8.3.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.8.3.ebuild
deleted file mode 100644
index c28be0061d52..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.8.3.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 9cc8961906f8..492fff2da0a2 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,3 +1,2 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
-DIST powerdevil-5.8.3.tar.xz 356356 SHA256 415f345af1efb94ea9d64942e149aa7686e769ebeec74f2fbd6c30b27ed7a9c6 SHA512 a250d7f93d268b4edd1b82fd28412dd7eb427485c805d319fc3806780a776112d576f3a6958c8826008889f13c6ba9e7d203512ee009046aa084e7024b4f7828 WHIRLPOOL 72ea1fbeac08df5c5ae9d30c5e85443fdb456b8b15227deee0b221825af6b37e1e7c29581c1d8684d2682aa929e97e5646644e001a7511dfab048f10c60b13c4
 DIST powerdevil-5.8.5.tar.xz 357872 SHA256 041cb684b981ba1c618627b7b6a9fb58bb4b2e4106937e228f376a8715934752 SHA512 8b2653c4e73ff4bb8fe4fc794f803e5e5ca525bcec749a04f715f7e518b3f5dacba8b83afb002804af2db6cf276ae3262e5972ad6817683fe5e7bae86bc01f9e WHIRLPOOL 44282d5d12cdacfae8ed88d643e03402a321915f67f1ddb40685f01db8e73006b0147d30c07ba2fe124acf170cef8b3b4cb900a622511d73fc4a86ba2ce8f5ca
diff --git a/kde-plasma/powerdevil/powerdevil-5.8.3.ebuild b/kde-plasma/powerdevil/powerdevil-5.8.3.ebuild
deleted file mode 100644
index 37a2ae30d124..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.8.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_GCC_MINIMAL="4.8"
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
-KEYWORDS="amd64 ~arm x86"
-IUSE="systemd +wireless"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth policykit)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	virtual/libudev:=
-	x11-libs/libxcb
-	wireless? (
-		$(add_frameworks_dep bluez-qt)
-		$(add_frameworks_dep networkmanager-qt)
-	)
-"
-
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	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-plasma/powerdevil:4
-	!kde-plasma/systemsettings:4[handbook]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wireless KF5BluezQt)
-		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	if ! use 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
-		doins "${FILESDIR}"/50-org.freedesktop.consolekit.system.hibernate-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 9ab6fbf1b468..f31978ab19a1 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1 @@
-DIST sddm-kcm-5.8.3.tar.xz 48968 SHA256 0d41f5d7017616ea17e4e4c37bb9dbf8ff2efcefd242c7b101ffa722564e42b3 SHA512 7b5f1b60b278cf2021e0738ca7f3a65c4c2bc669feee2e905b08c799646cb4a66b4c5f7ee690dac086618af7e8e9f648f08ccf1aa6db85a546ab98c9ef8abf9e WHIRLPOOL 0f8b9fd872e4ae7ecbc3bbb847a0474a720030431cce4cdaea1154901d41e2d14e2365c2d0ff91820118c2d124d8d0bb0b32d56e2089cbea177715418f2f094d
 DIST sddm-kcm-5.8.5.tar.xz 49008 SHA256 0c3b903ce09a6707453edd6a89da9676ce417dbf8c0dc360f9046336dc989b35 SHA512 12ab54496dcb07ae662eff7bfe0b3c4a12ae91b4c3b3de8186f310305e7a7bfe1060ccf2d6b0dadff1ea15cd6fb666385c71230e35b86de6383122cd88ae66b5 WHIRLPOOL f3e57d59f09ff1a11a6560eddf9da0195981482ae0140a51414f92e88627261b0ba64779f391d787edf6272dfb9b6bb7124f03a4dbab3969bedd1db6f1150c6f
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.8.3.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.8.3.ebuild
deleted file mode 100644
index f21968571613..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.8.3.ebuild
+++ /dev/null
@@ -1,44 +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 )
-
-src_prepare() {
-	kde5_src_prepare
-	punt_bogus_dep Qt5 Designer # bug 603794
-}
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 3bd1b95c4309..6d42e29c78a0 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,3 +1,2 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
-DIST systemsettings-5.8.3.tar.xz 157968 SHA256 b50ec8fb4402d332d9fb6c1aa00cd7431ac3299da3003cc54522c1544c610a6a SHA512 d1a81880057bf648527a42cf2a93f51bca8a10bceb4bd04ed3ec47fb57195840b6d4369425b3605ca791ebd5f612071e8dc0a154720088541a00093b0ddb03f3 WHIRLPOOL 595a298541cb39da14752431fb034d02bb3380246337e450b51bc8c962782b614aa4ce1416a7d1f51e5aa85e72e15be75724da40f1cda9ddfb84a2a26850306d
 DIST systemsettings-5.8.5.tar.xz 158604 SHA256 eaf1295d0d681a33514a6e38375c13e448655f813b422122627ed127d7ab7c5e SHA512 6a9d1819f29d5bff4a30d28e9ae799b5584384a7b75ce0832756d5925b68ac09c0dc6d43e9b5113d93aa08ada3700d3193c9e571dc8e5762d210ca75ac75e07c WHIRLPOOL 938f099990d2a2da0b56e91a5b76d4ef41b3594d6e15ff7ea84af0ce94b0f8e277ccaa9fbfe758ea43a6bc994f0d4c6ad00548feee9f72006fdd64cf6c45cc19
diff --git a/kde-plasma/systemsettings/systemsettings-5.8.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.8.3.ebuild
deleted file mode 100644
index 63c77882d35d..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.8.3.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-plasma/systemsettings:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package classic KF5KHtml)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 23d4f7d51cdd..5a71443a7759 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,2 +1 @@
-DIST user-manager-5.8.3.tar.xz 542076 SHA256 1be1ed786e8762bf35b9ad56455f6441ec14ae622439dffe5430bb2cb29d094e SHA512 ffe798bb982c98601b36924a32e7f4206a96c2a3c56afa90d13f01978c1384fcf0cc705c0ca79e166ad9a2e8a1ca4ad93f1670da79db9ba75bc02e3e33e451ea WHIRLPOOL 798a3cedc89e1606315b51e471969513d469996e80202285b306e580a257518666030130b32ebb80e46a15ae6b19a6bf1febc13898c17c364722e316d20e1379
 DIST user-manager-5.8.5.tar.xz 542472 SHA256 bfd047cc2d01acd0139d29a88d31b4422f108186cdf1f8d67a580d0c0cea68b2 SHA512 dec55d0ecdf628637c3d80ff916109f24bf08f241756c15cbcbe4200082d7ae5bc066e15cebdfd8fbce478a37e040ce63fdc0fbd021814edc0409d74c3ca1e34 WHIRLPOOL dfcec7e46ba5ddf3634ca82e129cbecac665e5307f0f6305521d74fbe047126ccc91f5db10a330b55577997a854fc5fc3192a7597852fc56137cb14e04538787
diff --git a/kde-plasma/user-manager/user-manager-5.8.3.ebuild b/kde-plasma/user-manager/user-manager-5.8.3.ebuild
deleted file mode 100644
index 0f9ee8e30da6..000000000000
--- a/kde-plasma/user-manager/user-manager-5.8.3.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}"