Updating liguros repov21.1.3

168 files changed, 478 insertions, 3639 deletions

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 8c62acd69cd1..e6dc24e983be 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1 @@
-DIST bluedevil-5.19.5.tar.xz 168480 BLAKE2B 2fd4447dde007540e3cbfc0994cc257cf777088582c27bb3af123df3085138496f33ce4cf9c403944de1f012cfbae6e7d72058d9536c00ef735c071da7d20fe6 SHA512 152702f37e46b3b359ff23705dcf347588691d87e1a0cbce940ef557f29e92fd9e129724ab37158b4daa00fdd38d31ad5197318dc09b33d7c834e562b6aff5dd
 DIST bluedevil-5.20.5.tar.xz 158768 BLAKE2B 8204f1c34e64839ef9671e2c285c394c5a3408d0d4e1d11a8f69f0b51cbffaebf7fa3a7aec7f3a5182ab2754e376762ca0cf90ec84e0c146b2c7696d2db372f5 SHA512 768100b8f34e9a4d2cf1f64910ff490f15be04a2aecc241d64e72c4b57954cf1f48be93c640f93f8c455ef69548f26e659f7a4bec88228490b85130ba042328a
diff --git a/kde-plasma/bluedevil/bluedevil-5.19.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.19.5.ebuild
deleted file mode 100644
index 956170632240..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.19.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/bluez-qt-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
-)
diff --git a/kde-plasma/bluedevil/bluedevil-5.20.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.20.5.ebuild
index 8bb20a2305ce..b3f2504f783c 100644
--- a/kde-plasma/bluedevil/bluedevil-5.20.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.20.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 6c1e70395f66..22a6d18f59c8 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1 @@
-DIST breeze-grub-5.19.5.tar.xz 3145156 BLAKE2B 5d18ed9699fe1fd5e0d3a94263c25692f4f933066de9b43098f70051dddb11fbead60032c9d28b3fb5960b7f05dc1a2d4aaf6ffe80fb203394d568f09d421772 SHA512 db589b3f8daf4518b517b74110b925319b610251e002c3e28fdd2e0a88d99c2d3108dbbe02257a60bb4b6a3e4b594febf26f7d2448ec1caeaf341d95cd02c0e3
 DIST breeze-grub-5.20.5.tar.xz 3153036 BLAKE2B 05a09e03e8ddb608566e6c9b1d28f117ee3b17e814baa2125b3636a872230733759ef76ab3030e288cced36d0380ad357983c1a2735600a0c98ac4eaba852251 SHA512 22524d3031689e8dca73833932bd1661fc7e85aedaeb136fc43cb9b72324efeca4c35f08fbd6d28d6c1b8333589b939ea162655173e54568c0ee4e4f1ee5d1c9
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild
deleted file mode 100644
index 4c4e78b0a1a6..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-inherit kde.org
-
-DESCRIPTION="Breeze theme for GRUB"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 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-grub/breeze-grub-5.20.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.20.5.ebuild
index e7e9654ba6a5..3b3d0d9f2e84 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.20.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.20.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for GRUB"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index ce50d86a1f80..34ddf7890ae8 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1 @@
-DIST breeze-gtk-5.19.5.tar.xz 42576 BLAKE2B 8874a468666d17318a2fc06ab6dad66e4a6e648bc46479b019e7ead84b29185f8dd334801231b2890c6aec3821172871ce4d9859daf6fd6e83bde23fc7ebc4df SHA512 cb201730ba20745cdf04e8889830e1a5f6ac530435783ca1c01c52d456c650a88f459c871fb6e6b4ef36bc771dbaa4e2d03d7ad08906c910b7b9849678bf9f2f
 DIST breeze-gtk-5.20.5.tar.xz 43068 BLAKE2B 09263f81c2a20970b6a3e0655292fef30cc3cc8a0ba4e458dbf046e306a9ea706c405fa022b670950ed8aecc762663a1e1548331f1e3f62b56fadfbd9ff3acf0 SHA512 4c159f28d6d5163cfbf6add00d1a5edd8caf4b6530e4d8b8744ad99ab6193dec3d774c267ab3a45d8eb8aeee0b3d7e3b4848ef6a21d589bef33763392a1fd6d1
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild
deleted file mode 100644
index d7f637c8b138..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org python-any-r1
-
-DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
-HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/sassc
-	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
-	>=kde-plasma/breeze-${PVCUT}:5
-"
-
-python_check_deps() {
-	has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	if has_version "<dev-util/cmake-3.16_rc1"; then
-		eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	if has_version "<dev-util/cmake-3.16_rc1"; then
-		mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-	fi
-	ecm_src_configure
-}
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.20.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.20.5.ebuild
index 1da63ad968d1..52dbec62e884 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.20.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.20.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch b/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch
deleted file mode 100644
index cbf8693731ec..000000000000
--- a/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>
-
---- a/cmake/FindPythonCairo.cmake
-+++ b/cmake/FindPythonCairo.cmake
-@@ -1,10 +1,4 @@
--if(CMAKE_VERSION VERSION_LESS 3.12.0)
--    find_package(PythonInterp 3 REQUIRED)
--    # PythonInterp sets PYTHON_EXECUTABLE
--else()
--    find_package(Python3 COMPONENTS Interpreter REQUIRED)
--    set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
--endif()
-+find_package(PythonInterp 3 REQUIRED)
- 
- # Check for python cairo
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import cairo"
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 7d009142fc8b..71d884c5079d 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1 @@
-DIST breeze-plymouth-5.19.5.tar.xz 105732 BLAKE2B a9d0cb4e34f3d5f9bb7229c3b29074765fadcf54424562d7c91b4f56233d130efebfbd263e65b4013da2a3da1b59b7da6d77e728661d1ea5d965c413cb558e10 SHA512 8f0739379c2ddb62b612acf65c41bee57e36d98a120289a1db3245467d118e18f3c0fe67905d990c586dfbe333c47f8671893726ad5ee9c28883d938e309963d
 DIST breeze-plymouth-5.20.5.tar.xz 108832 BLAKE2B c0205874e22c60697e30f84cdda0d344248d772d7308fa9d3e4cbed54abc8aad56614de83b4f40daae52386110b46c6d9cef356a936738e9dbf91270eaecd578 SHA512 0c2526c14069f36b86fb4fd4a2b0ca7e283ed44f3a2a80f9b6de9efccefa5cede0d9214cd0c2a6adf43a78f72291d06d3dd00b01a10d36e517f67b1a432836b3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild
deleted file mode 100644
index 5484406c9070..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-inherit cmake kde.org
-
-DESCRIPTION="Breeze theme for Plymouth"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
-DEPEND="sys-boot/plymouth"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISTRO_NAME="Gentoo Linux"
-		-DDISTRO_VERSION=
-	)
-
-	cmake_src_configure
-}
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.5.ebuild
index 755905766bac..d751dc43126b 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Breeze theme for Plymouth"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index f6aec0ef23f8..115da1438e4c 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1 @@
-DIST breeze-5.19.5.tar.xz 22761136 BLAKE2B 379a26d103acc718281f7ccdc6d66539c78d77ca9bcbbb0d3c9d86625a4d053f1772b49584a179d38d1c00e14441695b717405898ca6ed9ce0c6e947e93ac172 SHA512 6b67b147c34e3b143e0c4c400eb3133ab15b826f9046ad2e701114f3ceaa1e2d085d864f04c28f2bdc37464a2313c6d8b5983fab5ca9f22ccae90ef1528eb8c4
 DIST breeze-5.20.5.tar.xz 15695388 BLAKE2B f8ff7df9449106815c3c356d96321118a388ef84530dd69f570fcfcb96ab9c20ddda3343a58535ad86232a34bf00ca6091c60350002e04c4bab8018e12a8b673 SHA512 1be4d2c52b683b042a4b094fec75ce069b011f547f8c9f58a04a17cc933537bb018dcab826525827a09b607426a65fbaa40b66ad3232267b34d4214be0a8e13d
diff --git a/kde-plasma/breeze/breeze-5.19.5-r1.ebuild b/kde-plasma/breeze/breeze-5.19.5-r1.ebuild
deleted file mode 100644
index 89b650b1f4f1..000000000000
--- a/kde-plasma/breeze/breeze-5.19.5-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/breeze"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="wayland X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kpackage-${KFMIN}:5
-"
-PDEPEND="
-	>=kde-frameworks/breeze-icons-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X XCB)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/breeze/breeze-5.20.5.ebuild b/kde-plasma/breeze/breeze-5.20.5.ebuild
index 532cd4dc6c19..cb9d539a46ca 100644
--- a/kde-plasma/breeze/breeze-5.20.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.20.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index b8c3d32087f5..2da4964a64f9 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,2 +1 @@
-DIST discover-5.19.5.tar.xz 10296324 BLAKE2B d19662ea90f8be4e090e62587ae79b19c072dfac28d90c2bc1476ff4e375498e938e0b76d02487e8cdc64e297193dc62bce34484f81122d827ae0fcc5070fc3f SHA512 524fc45331631a305620f05fe67f780aee2dba7714978f32d9baa0d488185da801ee7a4d11592f2e07dfe395726b0c34d4ae7dfe3abf2b0e7632bdea27a714fd
 DIST discover-5.20.5.tar.xz 10305280 BLAKE2B fe47718014d420947c1509577e28ec642ccdc975d2b9fa6d2000bfd190880aff4fa1f2ca4597a77980995209847647cc5fb5963bb1c0a88a8010fc1b198c49b7 SHA512 e33f1027a09c8c7733c0b9da81ee82f0c90237c736435ad93cfdb127d79e0ddee0d4d8214774032c81a4078613d278688f0fddbf287aa03a5192cfcdb1eeffa7
diff --git a/kde-plasma/discover/discover-5.19.5.ebuild b/kde-plasma/discover/discover-5.19.5.ebuild
deleted file mode 100644
index 48dfafd990e1..000000000000
--- a/kde-plasma/discover/discover-5.19.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma resources management GUI"
-HOMEPAGE="https://userbase.kde.org/Discover"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+firmware telemetry"
-
-# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	firmware? ( sys-apps/fwupd )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# we don't need it with PackageKitBackend off
-	ecm_punt_bogus_dep KF5 Archive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
-		-DBUILD_FlatpakBackend=OFF
-		-DBUILD_FwupdBackend=$(usex firmware)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 686392: needs network connection
-	local myctestargs=(
-		-E "(knsbackendtest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/discover/discover-5.20.5.ebuild b/kde-plasma/discover/discover-5.20.5.ebuild
index 3d3b7e0d0e01..6acdfc13dd6a 100644
--- a/kde-plasma/discover/discover-5.20.5.ebuild
+++ b/kde-plasma/discover/discover-5.20.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+firmware flatpak telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 71c2be84ff5e..b24c02f76935 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,2 +1 @@
-DIST drkonqi-5.19.5.tar.xz 744412 BLAKE2B 54840e9fab41f09c6184eb29e3e7bfb17d08a76966b7bb9776f1f044671c61073bd38ca4b8f96c6c3eb4a534871550363941cf2fd94a177f770caccec9a3339f SHA512 0dcfcb5018f1024ad751c234f7e67b865f06c8e8bf5a1a95a160df2af97730ca111f4cc8614da646c8dbe042a206d3d4be214790abcf617ca454582161f0aa24
 DIST drkonqi-5.20.5.tar.xz 755736 BLAKE2B 00dfcabeee2a7deae7cd4705d981000935c8ae9010cd0357b21b4245d4870a73b2d08539dc394d18db22112a77acd7be75d4c5c37cc3da738c71d22a5f21b6cd SHA512 b47c70a3fd2e9f2e7afe663e1dbdb93cbd69e3c864edcd68ca5a3af72abd554647b069d1f92a38c2a67e4a7abcc351003eee185ea751b32f26bdb164d0a0c3b4
diff --git a/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
deleted file mode 100644
index dad96335a28e..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# needs network access, bug #698510
-	local myctestargs=(
-		-E "(connectiontest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.20.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.20.5.ebuild
index deca811039bc..bde3cce6c04a 100644
--- a/kde-plasma/drkonqi/drkonqi-5.20.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.20.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index f3c7ef179119..089ffe9771b8 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,2 +1 @@
-DIST kactivitymanagerd-5.19.5.tar.xz 84996 BLAKE2B c5dd47d35fc1bcb5a1f64ed0a60d96f85398372d481927511269abe98512ba38c1128fde760dacbdf044dfca1b52eda68aa3558cab2b9238a0c957bb0edac009 SHA512 884f839c68b94da264042262b730baf81ca4b65320daa2b4de2ecba0698728600f25de77feeb6ef69bc9d98b06e827d8ce467fb9d7b54807442d7d9cf2b9b9a7
 DIST kactivitymanagerd-5.20.5.tar.xz 95236 BLAKE2B 1fb4803309cce1207226fb330759c2235672265d2232c8faf9e3d8505243ff2fce4cc955a6a46a83b1d5ab3719fe39c998d4cb06737145a57b4122818945a0bf SHA512 eade394ce5e10f1dffe60784142a797ec9180cf339557e6f06f235b00127fcb910ea42bf0260990fd1197cf958bdb2bb607d9c7e0cd4a5ad075fa6d46c21bbf4
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild
deleted file mode 100644
index c925697828a2..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.5.ebuild
index 8c6933fbcf6a..d16635c7b0c4 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="System service to manage user's activities, track the usage pattern
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index c1cef83e1978..6fa7aae7919d 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1 @@
-DIST kde-cli-tools-5.19.5.tar.xz 600580 BLAKE2B bfe77d7d5d9528b3b7d089341afa1cf48bd05d2b82c596a85eddaa197ec9ddce4c83f223e6698979b10e764f4468b3a5bfc94777400d8aa927227cbd0508c975 SHA512 9e8de408643caad7c0de52cd348c35678c92b478587a2e7fd6b0cfd1d93dd578d9060c58b1dacf4b0143840d61860b51f41b53b7c2349112b855c9bad3c9b897
 DIST kde-cli-tools-5.20.5.tar.xz 602472 BLAKE2B b42d9e8f89cec058c2d98d37b77310737807ef63d4adc408f5b8150ecfbce5fc8076e3f44dd5a67fb1125a419202529309c04f08295bdc34ed6599153b873179 SHA512 60507745d0df94361cc506d00f82b361656e02b7a35d79f77136536b6916d7f4b5e379986fb1f20bc8401140451e90dc8d08891031b1d7c31c74658f6fb20662
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild
deleted file mode 100644
index 231d15c17e77..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="kdesu X"
-
-REQUIRED_USE="kdesu? ( X )"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	kdesu? ( sys-apps/dbus[X] )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kdesu KF5Su)
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.5.ebuild
index b5182ef746a4..2bf3da87f29c 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index a954c843ca0d..5ee66697971b 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1 @@
-DIST kde-gtk-config-5.19.5.tar.xz 26224 BLAKE2B c55e69d3447179817b0a152b837843f97eb3fdf7e337b1cdabcce4089532a23609777fb57aab1615aad70369d5a22b2707c5eaa10783500e3ae33d57cd868e2f SHA512 d9875fc1af767b7f318520f386a62404779c33312eb5bad1eebc924a36ca05d822cf219b56548cd050e0965b0dfd581b5fee533a77fb5d745e51f63b350ff79c
 DIST kde-gtk-config-5.20.5.tar.xz 68208 BLAKE2B 89d52f60f0a3cd9d1407a8a537f2893107cc7ba37a5763aba532b665dc0b6c529c6bb9d5873de961e86e3be3cf386de907307bbdde119bdc6fb15b8e958f4881 SHA512 066fff2d3fee4468eb0b5cb27da857bb7d27f2d88f0ac5dd31b1eea928c051c47b3c6d7b5d7de08415cc498d7a6773af37035ede35e315aadd32893a3b0ab846
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild
deleted file mode 100644
index 84d17cd8b3f4..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma"
-HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-cpp/glibmm:2
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	gnome-base/gsettings-desktop-schemas
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	x11-misc/xsettingsd
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	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."
-}
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.5.ebuild
index 02fe49c352b0..dbc19dda8502 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 016433257ef3..e636000bbff8 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1 @@
-DIST kdecoration-5.19.5.tar.xz 43832 BLAKE2B 7d72c6014e6893f194c3c1faa2cab0cde122ed51e39006c95eda2bff247601e54d973cb2ad7ce6a92bc410db288396e279efb5b15c911d7008d47d566e9b504d SHA512 74ce5ed6a071ebc484103a2efbfbf3f2f624852dc00e141ced85813571bffb351f832dd6162c1c672274006c7bf2c7b64d59e5224f5eca6d17cd3e3a2e35151b
 DIST kdecoration-5.20.5.tar.xz 45524 BLAKE2B 3ba5a83c51664ce45b21055ca839cd390feb206d98c8b4380895ccc81f861b741a1a01d70f0417f36020322e5e94aa58ba41e75300a2d987dd3a27f65907b5fb SHA512 020130695a865a98acc3b8ec783650877addec8beb6ee96b87bf74f7bedd63aa2d06629d3f8f59a1b76ded72b4a6c85d462d61ed6c9a37876fd2f8123af8fdfe
diff --git a/kde-plasma/kdecoration/kdecoration-5.19.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.19.5.ebuild
deleted file mode 100644
index 329199112f30..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.19.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plugin based library to create window decorations"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdecoration/kdecoration-5.20.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.20.5.ebuild
index 5f661f90b28b..19dd80902673 100644
--- a/kde-plasma/kdecoration/kdecoration-5.20.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.20.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Plugin based library to create window decorations"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 9465a9b1a256..2f7450f2a27b 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1 @@
-DIST kdeplasma-addons-5.19.5.tar.xz 629136 BLAKE2B 992df5d362aca213531cb96b8d01a3c2792ed91562d4f6a7f71e8b50ba6ee28cbd6501b75c7c91923b6afcb13fdf1b385189f718d8cebb482d1cedd040f67d94 SHA512 93de717c623605ceb9fdcedecdf656030b6e9bc360ce834ea918403f64f250029e9a2406bddc0b324e4738006d4ca155bc509f4a7d40c073a2aefb2017db9731
 DIST kdeplasma-addons-5.20.5.tar.xz 644352 BLAKE2B 2579fafc102210006a8cdb4b303c865ec3aabe149c0d0acfa47640c272e4327fa84934f33e14f6c2fad20656fbe145793d375c81fa4028251cf623e37b243aaa SHA512 3a4f0715ac1dbc9edbb62f253b48520f9b011c29f87ef0a7ba25ea14dc24dcc698405e7d8e83593b51bab2976b274b0ac869cab8b17a50ba34902bd8121ee421
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch
deleted file mode 100644
index 8cc7f7fb91a0..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From d5f9e6af9f9cda210b15d5c10b370006c86bd7ad Mon Sep 17 00:00:00 2001
-From: Guo Yunhe <i@guoyunhe.me>
-Date: Thu, 23 Apr 2020 22:36:34 +0300
-Subject: [PATCH] Fix POTD in lock screen
-
-Summary:
-2. Flickr and APOD(NASA) providers cannot cache pictures in `PNG` but
-`JPEG` works. So I simply changed the cache format to `JPEG`. Most POTD
-are photos. JPEG saves more spaces.
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29140
-
-Merge Request: https://invent.kde.org/plasma/kdeplasma-addons/-/merge_requests/3
-
-BUG: 389962
-
-FIXED-IN: 5.20
-
-* asturm 2020-09-04: Backported to 5.19.5, including merged commits e7c51a04 and
-* e6472153, shortened summary to relevant bits, dropped unrelated hunks.
----
- dataengines/potd/PoTD-list.txt      |  1 +
- dataengines/potd/cachedprovider.cpp | 14 +++----
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/dataengines/potd/PoTD-list.txt b/dataengines/potd/PoTD-list.txt
-index 53b0fe02a..c74316614 100644
---- a/dataengines/potd/PoTD-list.txt
-+++ b/dataengines/potd/PoTD-list.txt
-@@ -5,6 +5,7 @@ LIST OF POSSIBLE PROVIDERS
- http://antwrp.gsfc.nasa.gov/apod/astropix.html
- Each day can be reached via the URL http://antwrp.gsfc.nasa.gov/apod/apYYMMDD.html
- where YY is the 2 digits year, MM is the 2 digits month and DD is the 2 digits day.
-+Note: sometimes, the webpage shows a YouTube video and picture cannot be fetched.
- 
- * Flickr Interestingness  ----------------------------  DONE
- http://www.flickr.com/explore/interesting/
-diff --git a/dataengines/potd/cachedprovider.cpp b/dataengines/potd/cachedprovider.cpp
-index 476a7c253..d6fb63fe9 100644
---- a/dataengines/potd/cachedprovider.cpp
-+++ b/dataengines/potd/cachedprovider.cpp
-@@ -51,13 +51,13 @@ SaveImageThread::SaveImageThread(const QString &identifier, const QImage &image)
- void SaveImageThread::run()
- {
-     const QString path = CachedProvider::identifierToPath( m_identifier );
--    m_image.save(path, "PNG");
-+    m_image.save(path, "JPEG");
-     emit done( m_identifier, path, m_image );
- }
- 
- QString CachedProvider::identifierToPath( const QString &identifier )
- {
--    const QString dataDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1String("/plasma_engine_potd/");
-+    const QString dataDir = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1String("/plasma_engine_potd/");
-     QDir d;
-     d.mkpath(dataDir);
-     return dataDir + identifier;
--- 
-GitLab
-
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
deleted file mode 100644
index 5fe105d32ea5..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Extra Plasma applets and engines"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+comic share webengine"
-
-RESTRICT+=" test" # bug 727846
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	comic? ( >=kde-frameworks/kross-${KFMIN}:5 )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-potd.patch" # in Plasma/5.20
-	"${FILESDIR}/${PN}-5.19.3-kross-optional.patch" # downstream patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package comic KF5Kross)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version sys-fs/quota || \
-			elog "For using disk quota applet, install sys-fs/quota."
-	fi
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild
index 23c7da93792f..00bc4b8a63fd 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="comic share webengine"
 
 RESTRICT+=" test" # bug 727846
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index c673374b3e49..6201bfc09426 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1 @@
-DIST kgamma5-5.19.5.tar.xz 80752 BLAKE2B 33280fb2b7856d7b6029e7c05323897a393ca2a1d86f8951327e237cdd29b22f07b64a46ffcaa78093866036c09324605b485fcc103e144b5aa9ee4116e1a338 SHA512 bb758ac5a4ed21563bcdad3eca07a822a8bdebe5d5cf4862f92f2b38dc9a8fc4b15b8cf0e96d6a329b969eb36064c8723ec432a044cecf1c25fe43853cb8f567
 DIST kgamma5-5.20.5.tar.xz 81560 BLAKE2B b27cce9651fc78d28758f252cecbe36af52de0e76145b3a08abd0d741be015231fa1501201c115f29fc4f324bd05a3a327866cb594f5c72f34666e7c3978e67e SHA512 ea92e80a3c16e8ab357e9185d8bfaa157cb75edbb6f3d64b0c4d6f2951ee2335d52cda4c26913e160449c7dfad35114e8819acf95ebb12e011a3e7e8d4f0e654
diff --git a/kde-plasma/kgamma/kgamma-5.19.5.ebuild b/kde-plasma/kgamma/kgamma-5.19.5.ebuild
deleted file mode 100644
index 3d850099431c..000000000000
--- a/kde-plasma/kgamma/kgamma-5.19.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_NAME="${PN}5"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Screen gamma values kcontrol module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/kde-plasma/kgamma/kgamma-5.20.5.ebuild b/kde-plasma/kgamma/kgamma-5.20.5.ebuild
index a2da05e4168c..6b23d08d5792 100644
--- a/kde-plasma/kgamma/kgamma-5.20.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.20.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Screen gamma values kcontrol module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 7d052c9efa4f..491d84bed6f4 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,2 +1 @@
-DIST khotkeys-5.19.5.tar.xz 1855968 BLAKE2B 464797fce42a50313c187743a7213b870af805aea2f75e0e3564e81fec49c334f9574515b267a1acd57dae1f7e8b6e62849ce6e554db52bd452bcac05374660b SHA512 c7832ea7cb2890cbdf9d160b1658a393e105903e54b87cd10cf00f5bffa1b240e70685a201e2b4d580b4083e903770a2b26fd65f68f05302798320e7f20103be
 DIST khotkeys-5.20.5.tar.xz 1856468 BLAKE2B a29c2c6dd9d34dbf2919ab4020bc6b3ec16d25f0462485ed1940598a238f99b8066176462e6ce24ec2784150601d574eabd469b1fa9760f2afb630392c4a7d4e SHA512 7a18896c40749611b333b3a7cd5c064e61449579b141856f2d75f02fe0db12924fc8e6ccada00c6cca29a57aac5877f0c791d7231dc047b8b32c168ac507e110
diff --git a/kde-plasma/khotkeys/khotkeys-5.19.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.19.5.ebuild
deleted file mode 100644
index 3a4fd854f704..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.19.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5[X]
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep KF5 Plasma # TODO: upstream
-}
diff --git a/kde-plasma/khotkeys/khotkeys-5.20.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.20.5.ebuild
index 55078d319703..be70e0fb1def 100644
--- a/kde-plasma/khotkeys/khotkeys-5.20.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.20.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma workspace hotkey module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 97b75e195bbc..2a45a490730f 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,3 +1,2 @@
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-DIST kinfocenter-5.19.5.tar.xz 1265760 BLAKE2B 3af323d32e07d310aa224f47c292ae03748aacea0d7cf56770e5a301f9698d1767159f97e0d43733d9a09d6cfe56c41a4a44f988e3000a1dfc06f271accef0f4 SHA512 732d6111f59e099fb032966667b6d7907e607939884714a95f0a2e48903f8a0d7e2331a87611ee058a4bc18bcb012c92040415812243fab4d618a07f2e7dccaa
 DIST kinfocenter-5.20.5.tar.xz 1286404 BLAKE2B 3420e9d73e5cf73c91733fb3c72a4315db577ef5248e11036c4a6bdb1e897deb5983276ef903c25664ceba549cbad12bff2b6e6951abc90fbca0cc97e42c60ae SHA512 c7d2eb7307682f7bdc8ac22d1905dcc8bab0e258ee5f3458c4f40e43fee4d14ecd6b423f4357b338e05924db93d7c9914d3c36756620aac9fc6d0897ea4e5a90
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
deleted file mode 100644
index 8efe0163f1dc..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Utility providing information about the computer hardware"
-HOMEPAGE="https://userbase.kde.org/KInfoCenter"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="gles2-only ieee1394 +opengl +pci wayland"
-
-REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
-
-BDEPEND=">=dev-util/cmake-3.14.3"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	x11-libs/libX11
-	gles2-only? ( media-libs/mesa[gles2] )
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		media-libs/mesa[X(+)]
-		!gles2-only? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	wayland? (
-		>=kde-frameworks/kwayland-${KFMIN}:5
-		media-libs/mesa[egl]
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package ieee1394 RAW1394)
-		$(cmake_use_find_package pci PCIUTILS)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-
-	if has_version "dev-qt/qtgui[gles2-only]"; then
-		mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
-	else
-		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
-	fi
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# TODO: Make this fully obsolete by /etc/os-release
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "net-fs/nfs-utils" || \
-			elog "Installing net-fs/nfs-utils will enable the NFS information module."
-
-		has_version "net-fs/samba" || \
-			elog "Installing net-fs/samba will enable the Samba status information module."
-	fi
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.20.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.20.5.ebuild
index e489a79ed931..55ed3f7536e1 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.20.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.20.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="gles2-only ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 2ce69e09eafe..6719bd266430 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1 @@
-DIST kmenuedit-5.19.5.tar.xz 896836 BLAKE2B 35e921a58856a3ed63f5ef912b06d3db1670e6e7e278d2120aaad69964a2fa60f536634d3b0dc3781a6b487df5aa948eec4ff943a7413f88dc1f9f40010a36d3 SHA512 332fa310a8a4d0c792e05db5427d16b3290998f0da5c7184d674d8104e8079bff51065575a98f61b83899df6cdd7f4be6daf0a5dc014f30bf1ced49c896e1241
 DIST kmenuedit-5.20.5.tar.xz 893840 BLAKE2B 5fe62cd5c297a21dd4fcb5298dad813bc4607aad90884e3f465f914b49c3d509af4d15cb1797ed179d7a912ff4b82fb4c802abe6fa142e31fb008600bc3ef842 SHA512 c42ae1351ba6eaed7996078aa31864a64fe6551fd688ab84146459f30d195aaa8d412ee526a011df8c21c1e60f8cb5541a5b0fbea85f4702b2249e2571c27a15
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild
deleted file mode 100644
index b92ffa235734..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.71.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma menu editor"
-HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kinit-${KFMIN}:5
-"
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.20.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.20.5.ebuild
index 387fde8b5628..985b50d236f5 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.20.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.20.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index c63c38abfdce..df17b1fabcbe 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1 @@
-DIST kscreen-5.19.5.tar.xz 113748 BLAKE2B 91dda071d5b70706f8a5735905c22333eb68c8bab32fe138e77e12764bbfc8d19481b285548caefafea91f666b2c98e5b058f15f481862903fb1cc109be96d3a SHA512 ce47e5b0e16f985811d0e71d4c97d2d25d2a4258732c5b7b8706cdfd176c4883c431ea946833abcbc87fdd81ed6d546da6e23640b4586b8013591ee5917c20f0
 DIST kscreen-5.20.5.tar.xz 114932 BLAKE2B c703e4dd605fedf26dea0f04829d9ee900f8c007915123cb6e68c68bbeba8655bfb833bc180c2258c48e9e8c672d3b057bf2b3380fb7f687bbf0d4202a1217ed SHA512 c1a618605afe4861f9ea563472df104e0cd6f015b2ba1a0621ee6d18bd653598a6de0f800901dc07e8142969633d302e68d66f3b0b9650cbc4b6cd0eeca14dd1
diff --git a/kde-plasma/kscreen/kscreen-5.19.5.ebuild b/kde-plasma/kscreen/kscreen-5.19.5.ebuild
deleted file mode 100644
index a338848cb431..000000000000
--- a/kde-plasma/kscreen/kscreen-5.19.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://invent.kde.org/plasma/kscreen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreen/kscreen-5.20.5.ebuild b/kde-plasma/kscreen/kscreen-5.20.5.ebuild
index 2da44a0a111e..6bf3ae99a3e5 100644
--- a/kde-plasma/kscreen/kscreen-5.20.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.20.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index f8377abfe92c..ec1f4f0c933d 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1 @@
-DIST kscreenlocker-5.19.5.tar.xz 126420 BLAKE2B bef083f6ffaa7930446a234c35d628ffe81c187718be48ee3158b50d5eaf7b5989abda1d3f23a275cff5b949d101cc43e4819bc44b300674681b4233bcbf1f1b SHA512 aa112b28374e2ccfa257d161d47de96ba8a884dbf6cdc59be9dac3624e49472aad7ee0f413e63c9a001969b7e0413d2571e19f39e232e46cefe112fb7f880eda
 DIST kscreenlocker-5.20.5.tar.xz 115988 BLAKE2B 7a051bea3952da85c272e32bb0c04c94bd0eb5fa52e01e90d9ce7d2902b3e3fca97ae7a6ee2c0994fa775309e62c7b7f0ba8b6634f04188370809cef7142835b SHA512 0993013374b91a34fd9ff204012f83f63a4ffcde9c6562ae0f7544fce78f5d526ad0104154ad5a104742df77d77b2267290c451cf90b1931ad1b36254e2b7ec6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
deleted file mode 100644
index 209457e8c183..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+pam"
-
-COMMON_DEPEND="
-	dev-libs/wayland
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( sys-libs/pam )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Seccomp=ON
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	ecm_src_test
-}
-
-src_install() {
-	ecm_src_install
-
-	if use pam; then
-		newpamd "${FILESDIR}/kde.pam" kde
-		newpamd "${FILESDIR}/kde-np.pam" kde-np
-	else
-		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.20.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.20.5.ebuild
index a44e2ff21cbb..730f3e940151 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.20.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.20.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+pam"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 072cdc1e05e2..ff7058ed3680 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1 @@
-DIST ksshaskpass-5.19.5.tar.xz 23572 BLAKE2B c399be04e33a51968c7c3d962039f7aaff176c7a14bb5d8d2da36e999908aba1f3fa07337412390470cab1342a70bd37b2241b750e7bf852980c77810f311873 SHA512 7bd70985cb4a133e49d58b27c9266222913097154b78f60fc55b7ea3e684723b3ae55cdd0b44f58dd7c2cb54cc2f6046907b7881355b437689d9e470c2aafdd4
 DIST ksshaskpass-5.20.5.tar.xz 23516 BLAKE2B 328adfbf6ca7adcc9d9fbdb22d86e0e44b4056b4d7b3c3af13ebede5002ed587aa2102c6a90c27691f102f2c15ce08d2876e1dea6cd0c20833a21800b0b3fd21 SHA512 2dbe7b59b3469ae4ab20b896d11f354c6e335e5178a8647f1e71a311389b29c16cbba7fc925053ade3076063af9fd0497af3b8e060e554e68ba40b8fef47de55
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild
deleted file mode 100644
index 92cb90f82a19..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://invent.kde.org/plasma/ksshaskpass"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	ecm_pkg_setup
-
-	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
-	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
-	if [[ -f "${EROOT}"${srcfile} ]]; then
-		local md5=$(md5sum "${EROOT}"${srcfile})
-		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
-			elog "Existing modified "${EPREFIX}"${srcfile} detected."
-			elog "Copying to "${EPREFIX}"${newfile}..."
-			cp -v "${EROOT}"${srcfile} "${T}"/ || die
-		fi
-	fi
-}
-
-src_prepare() {
-	ecm_src_prepare
-	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
-		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
-	fi
-}
-
-src_install() {
-	ecm_src_install
-
-	insinto /etc/xdg/plasma-workspace/env/
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	elog "In order to have ssh-agent start with Plasma 5,"
-	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and uncomment the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-	elog "to 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/xdg/plasma-workspace/env/05-ksshaskpass.sh"
-
-	# Clean up pre-5.17.4 script
-	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
-	fi
-	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
-}
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.20.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.20.5.ebuild
index 4a4c8ddd91da..8cc4dbbecfe7 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.20.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.20.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 8010772027c4..a4f5dd68cfa1 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,2 +1 @@
-DIST ksysguard-5.19.5.tar.xz 542628 BLAKE2B 3aeacb401c79723aa46e9eb5df32785e314d7a52704d983e5c6b48dd841e908ec84c5b28c609accec990d6011d5355ba3363329973a68149f03b0b20d5d59265 SHA512 5dd3503e3792c247fa2dab274347ae00ac3ddd0090b8b5115abc90c84630e0f7376ce2ec43a853e2a9cfdadb31b142ea70190b54b65c7a45b5839b1dde5a1feb
 DIST ksysguard-5.20.5.tar.xz 564408 BLAKE2B c22fcc8280aea81007ec2366ac3f64ea7f66f1740a30ea49ffc4317c85d8e68cb5cd29ad4afd34dcb3a37ad6362bfbfdcb59b29e427d58c6de179ba107360a26 SHA512 17c96a3e19e428f90f729b813443199a5ab75608c0f46321127b1d4e2fc68a6a55df9ac8e3f194ae97ad533d3d22006c230f34ee328984e32205046e91487b08
diff --git a/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
deleted file mode 100644
index 0d99bed5a51b..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="lm-sensors pcap"
-
-RESTRICT+=" test" # bug 727848
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	pcap? (
-		net-libs/libpcap
-		sys-libs/libcap
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package lm-sensors Sensors)
-		$(cmake_use_find_package pcap libpcap)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild
index 4e11e85be9a4..9a4b8c7cbb0a 100644
--- a/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Network-enabled task manager and system monitor"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="lm-sensors +network networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/ksysguard/metadata.xml b/kde-plasma/ksysguard/metadata.xml
index 4595739c16cc..f1084e47bd2c 100644
--- a/kde-plasma/ksysguard/metadata.xml
+++ b/kde-plasma/ksysguard/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="pcap">Enable per-process network statistic collection using <pkg>net-libs/libpcap</pkg></flag>
 		<flag name="network">Enable per-process network statistic collection using <pkg>dev-libs/libnl</pkg></flag>
 		<flag name="networkmanager">Enable improved backend for Network statistics using <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
 	</use>
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 021d3b538082..57e812501d64 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1 @@
-DIST kwallet-pam-5.19.5.tar.xz 19932 BLAKE2B 28d8419f500c163ba15a79cc994af70b723dff24fa8c32e899bd856766290f20d09e3ee98e164d55596d1b97137e92096f9c2c3cf2386bb700aa0b7bcfed1c39 SHA512 3fe30f979f6ee838b073b7afdb406068f90529fbbac3513d65145f6a46ab8ba0b61ba11a3e9192c60b1ddd50e9af448c1298725fc01dca483b40a8030053095d
 DIST kwallet-pam-5.20.5.tar.xz 19812 BLAKE2B d0ad931e47a35b5589e9c34bce924f697446460bcfbfcceb4e3f0564182bbac822f13488dddc592f7b6a119d774b6176b86df8ddca55fb0c9423d0c7634fa9cc SHA512 5f728c2fbbcbfa7a2b50a2d9b60e557360b48d6a5958ce290ace3e2ae8c253b56f64178942f958d38e7e62e0baf1cad0ddb2aa28e11d145f3b507d58900dcb03
diff --git a/kde-plasma/kwallet-pam/files/kwallet-pam-5.20.5-socket-listening-error.patch b/kde-plasma/kwallet-pam/files/kwallet-pam-5.20.5-socket-listening-error.patch
new file mode 100644
index 000000000000..790a644003d8
--- /dev/null
+++ b/kde-plasma/kwallet-pam/files/kwallet-pam-5.20.5-socket-listening-error.patch
@@ -0,0 +1,44 @@
+From 06cd94634feb70dfa7e2f8695b97317cb2ebe44c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefano=20Alo=C3=A9?= <stefano.aloe2@gmail.com>
+Date: Sun, 17 Jan 2021 23:16:57 +0100
+Subject: [PATCH] Avoid socket listening error
+
+Closing all file descriptor above 3 is causing problem to socket() and listen(). Setting FD_CLOEXEC on them solves the problem and should have exactly the same behavior.
+
+BUG: 400929
+(cherry picked from commit 8f899902e6a3be8ad4948eb1ebdf679186aa20a7)
+---
+ pam_kwallet.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/pam_kwallet.c b/pam_kwallet.c
+index 2585a68..a099872 100644
+--- a/pam_kwallet.c
++++ b/pam_kwallet.c
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <signal.h>
+ #include <unistd.h>
++#include <fcntl.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+@@ -355,12 +356,13 @@ static int drop_privileges(struct passwd *userInfo)
+ static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toWalletPipe[2], char *fullSocket)
+ {
+     //In the child pam_syslog does not work, using syslog directly
++
+     //keep stderr open so socket doesn't returns us that fd
+     int x = 3;
+-    //Close fd that are not of interest of kwallet
++    //Set FD_CLOEXEC on fd that are not of interest of kwallet
+     for (; x < 64; ++x) {
+         if (x != toWalletPipe[0]) {
+-            close (x);
++            fcntl(x, F_SETFD, FD_CLOEXEC);
+         }
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.19.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild
index fc43479c7a8c..2dd76daad167 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.19.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.71.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
 inherit ecm kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -23,6 +23,8 @@ RDEPEND="${DEPEND}
 	net-misc/socat
 "
 
+PATCHES=( "${FILESDIR}/${P}-socket-listening-error.patch" ) # bug 717606
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.20.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.20.5.ebuild
index b2183fe5aa93..da9b0111cab7 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.20.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.20.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 981b63b3c12c..3bcab046daa5 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1 @@
-DIST kwayland-integration-5.19.5.tar.xz 21276 BLAKE2B 0d2a243b665efa9a1be2464dc04a4d01e71be65cff143fddd60e49c4d4d1377ae4982087711b1c5706a1c95434aa8e751e2ea35c2e50e3a0de8ff3a36abbab5b SHA512 db5f05ac9d942650b0933d723ba7138d35d262757b229f5f79b07a621543fdd87679da28d9fa059dc48064db39b69ce34f5296decdfc126442ac3f9f4bbbb2b6
 DIST kwayland-integration-5.20.5.tar.xz 21372 BLAKE2B 31fdacff1225d61332c8b9ffa7365a191d55dc1d698f3b0f0386adff0fc9dc2a31e7de8f182de96bdd6def85927cc02b8ab9819e3f82fddc499897785f55e562 SHA512 46b8b799082c02c045155f3cdea3defbcd2684b1f39ee851d46075cea89c78e55172a7f5c5584d6e50c0af75640c120a6d35b3d4be6feead86df17efb30d581d
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild
deleted file mode 100644
index 225a89330e9f..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.20.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.20.5.ebuild
index 33d692a5cc72..8873c34f8c0a 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.20.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.20.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 36ed6f7af2d5..729836e7225d 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,2 +1 @@
-DIST kwayland-server-5.19.5.tar.xz 229752 BLAKE2B 8730fc1e14512756478870a1446310db7a0130afffc29ad42d4a2efa18bdd0991c89c508072c4741ff6a67a28f8cb534b4f097762444ac42b3d2189d753dfa65 SHA512 5e039e38f290daed747a4c5d0fb37c828ad7ff1e05b735abb30bfaa69d67e812ea89b78921ec0877622ed9127a92aa76b5c6468126004c0f53ddf909a45f391b
 DIST kwayland-server-5.20.5.tar.xz 220976 BLAKE2B f3f3fd6b6ef18c014457d550e0551e07a3a7d6dc0664ec661f8e1756f4b07b83dd45f0aad58a427d21ac1335e88a7486bd3cf70f7e4edb62a5ea7e3984ab8a55 SHA512 fb3ef80061541998b110b5edb20d84541704cb82c5f087bcfc6f937ab4bf44e54d37b1a4576875e46082e0425f2a4f69e63e55e043861a89f447d887232cacb5
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild
deleted file mode 100644
index feb358f16c17..000000000000
--- a/kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Wayland Server Components built on KDE Frameworks"
-HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/wayland-1.15.0
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[egl]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	media-libs/mesa[egl]
-"
-DEPEND="${RDEPEND}
-	dev-libs/plasma-wayland-protocols
-	>=dev-libs/wayland-protocols-1.15
-"
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.20.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.20.5.ebuild
index 7cda60e25015..3d82baba68c5 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.20.5.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.20.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index dfb8a77cebcf..96bce4ecebf4 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1 @@
-DIST kwin-5.19.5.tar.xz 6260188 BLAKE2B bcf3c8afc00af0df8cddeb49396bd23df6178e379ac4c3ba3c547a2c602d309202a72136b69b83f729434fc5691ba24699cf3f44d47b2c033623bca5d551bdb1 SHA512 97ad0096066d99b4bba3089416a6d3744b6f83d82a004caa8762b420cad34cac4221b3535678d4c6f1bcb43c4d97db56be5ac68c4ac501dc168f4472a6c0dad5
 DIST kwin-5.20.5.tar.xz 6329444 BLAKE2B e80890c1a353b3b8a15659ea3f88e08b84f29ee863aa41ed99758e93008def940450abc2ad66bc2f5d4c9cd391a3d6ddb21eb2ab79d3696b7373f8ae0fdb6d89 SHA512 e9186dc71e3e9b913314a83fe9413b956d61d633f0e8418fd47d82178c6f50eb75b03299c00495af351b0951df23057500ef28123123583c291a0c29ea3414f1
diff --git a/kde-plasma/kwin/files/kwin-5.19.5-safe-removal-of-X11-event-filters.patch b/kde-plasma/kwin/files/kwin-5.19.5-safe-removal-of-X11-event-filters.patch
deleted file mode 100644
index 7eeccf6e8c5f..000000000000
--- a/kde-plasma/kwin/files/kwin-5.19.5-safe-removal-of-X11-event-filters.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From c5880833d94330d022c4b6fc84c175aadeaf9632 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Tue, 22 Sep 2020 08:53:17 +0000
-Subject: [PATCH] x11: Make removal of X11 event filters safe
-
-If an X11 event filter has been activated and it unregisters another X11
-event filter, then the window manager may crash because the foreach macro
-in Workspace::workspaceEvent() makes a copy of m_genericEventFilters or
-m_eventFilters and we can call the event() method for an already defunct
-filter.
-
-With this change, X11 event filters can be safely removed and installed
-at any particular moment.
-
-BUG: 423319
-
-
-(cherry picked from commit a433fb08a3a9255802405a17dd4c8270c68fcb25)
----
- events.cpp    | 52 +++++++++++++++++++++++++++++++++++++++++----------
- workspace.cpp | 10 ++++++++++
- workspace.h   | 17 +++++++++++++++--
- 3 files changed, 67 insertions(+), 12 deletions(-)
-
-diff --git a/events.cpp b/events.cpp
-index eb3572d13..2e8885d76 100644
---- a/events.cpp
-+++ b/events.cpp
-@@ -165,18 +165,34 @@ QVector<QByteArray> s_xcbEerrors({
- 
- void Workspace::registerEventFilter(X11EventFilter *filter)
- {
--    if (filter->isGenericEvent())
--        m_genericEventFilters.append(filter);
--    else
--        m_eventFilters.append(filter);
-+    if (filter->isGenericEvent()) {
-+        m_genericEventFilters.append(new X11EventFilterContainer(filter));
-+    } else {
-+        m_eventFilters.append(new X11EventFilterContainer(filter));
-+    }
-+}
-+
-+static X11EventFilterContainer *takeEventFilter(X11EventFilter *eventFilter,
-+                                                QList<QPointer<X11EventFilterContainer>> &list)
-+{
-+    for (int i = 0; i < list.count(); ++i) {
-+        X11EventFilterContainer *container = list.at(i);
-+        if (container->filter() == eventFilter) {
-+            return list.takeAt(i);
-+        }
-+    }
-+    return nullptr;
- }
- 
- void Workspace::unregisterEventFilter(X11EventFilter *filter)
- {
--    if (filter->isGenericEvent())
--        m_genericEventFilters.removeOne(filter);
--    else
--        m_eventFilters.removeOne(filter);
-+    X11EventFilterContainer *container = nullptr;
-+    if (filter->isGenericEvent()) {
-+        container = takeEventFilter(filter, m_genericEventFilters);
-+    } else {
-+        container = takeEventFilter(filter, m_eventFilters);
-+    }
-+    delete container;
- }
- 
- 
-@@ -219,13 +235,29 @@ bool Workspace::workspaceEvent(xcb_generic_event_t *e)
-     if (eventType == XCB_GE_GENERIC) {
-         xcb_ge_generic_event_t *ge = reinterpret_cast<xcb_ge_generic_event_t *>(e);
- 
--        foreach (X11EventFilter *filter, m_genericEventFilters) {
-+        // We need to make a shadow copy of the event filter list because an activated event
-+        // filter may mutate it by removing or installing another event filter.
-+        const auto eventFilters = m_genericEventFilters;
-+
-+        for (X11EventFilterContainer *container : eventFilters) {
-+            if (!container) {
-+                continue;
-+            }
-+            X11EventFilter *filter = container->filter();
-             if (filter->extension() == ge->extension && filter->genericEventTypes().contains(ge->event_type) && filter->event(e)) {
-                 return true;
-             }
-         }
-     } else {
--        foreach (X11EventFilter *filter, m_eventFilters) {
-+        // We need to make a shadow copy of the event filter list because an activated event
-+        // filter may mutate it by removing or installing another event filter.
-+        const auto eventFilters = m_eventFilters;
-+
-+        for (X11EventFilterContainer *container : eventFilters) {
-+            if (!container) {
-+                continue;
-+            }
-+            X11EventFilter *filter = container->filter();
-             if (filter->eventTypes().contains(eventType) && filter->event(e)) {
-                 return true;
-             }
-diff --git a/workspace.cpp b/workspace.cpp
-index a87a622e9..fd3634b16 100644
---- a/workspace.cpp
-+++ b/workspace.cpp
-@@ -66,6 +66,16 @@ namespace KWin
- extern int screen_number;
- extern bool is_multihead;
- 
-+X11EventFilterContainer::X11EventFilterContainer(X11EventFilter *filter)
-+    : m_filter(filter)
-+{
-+}
-+
-+X11EventFilter *X11EventFilterContainer::filter() const
-+{
-+    return m_filter;
-+}
-+
- ColorMapper::ColorMapper(QObject *parent)
-     : QObject(parent)
-     , m_default(kwinApp()->x11DefaultScreen()->default_colormap)
-diff --git a/workspace.h b/workspace.h
-index 489d7bae4..61fb215a8 100644
---- a/workspace.h
-+++ b/workspace.h
-@@ -55,6 +55,19 @@ class X11Client;
- class X11EventFilter;
- enum class Predicate;
- 
-+class X11EventFilterContainer : public QObject
-+{
-+    Q_OBJECT
-+
-+public:
-+    explicit X11EventFilterContainer(X11EventFilter *filter);
-+
-+    X11EventFilter *filter() const;
-+
-+private:
-+    X11EventFilter *m_filter;
-+};
-+
- class KWIN_EXPORT Workspace : public QObject
- {
-     Q_OBJECT
-@@ -654,8 +667,8 @@ private:
- 
-     QScopedPointer<KillWindow> m_windowKiller;
- 
--    QList<X11EventFilter *> m_eventFilters;
--    QList<X11EventFilter *> m_genericEventFilters;
-+    QList<QPointer<X11EventFilterContainer>> m_eventFilters;
-+    QList<QPointer<X11EventFilterContainer>> m_genericEventFilters;
-     QScopedPointer<X11EventFilter> m_movingClientFilter;
-     QScopedPointer<X11EventFilter> m_syncAlarmFilter;
- 
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch b/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch
new file mode 100644
index 000000000000..9677fc76488e
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch
@@ -0,0 +1,154 @@
+From b3e9c819537cf292d9b1c4d19c5ce7adde00158e Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Tue, 20 Oct 2020 14:15:46 -0600
+Subject: [PATCH] [focuschain/task switcher] Add hidden option to govern
+ repositioning minimized windows
+
+Since some people apparently liked the old behavior of moving minimized
+windows to the end of the focus chain, let's let them have it if they
+set a hidden config option:
+
+`MoveMinimizedWindowsToEndOfTabBoxFocusChain=true` in the `[TabBox]` group
+of the kwinrc file.
+
+We can add a UI for it later if needed.
+
+BUG: 427840
+FIXED-IN: 5.21
+---
+ abstract_client.cpp |  6 +++++-
+ focuschain.cpp      | 16 ++++++++++------
+ kwin.kcfg           |  3 +++
+ options.cpp         | 11 +++++++++++
+ options.h           |  6 ++++++
+ 5 files changed, 35 insertions(+), 7 deletions(-)
+
+diff --git a/abstract_client.cpp b/abstract_client.cpp
+index e44da4725..01f3081f8 100644
+--- a/abstract_client.cpp
++++ b/abstract_client.cpp
+@@ -703,7 +703,11 @@ void AbstractClient::minimize(bool avoid_animation)
+     doMinimize();
+ 
+     updateWindowRules(Rules::Minimize);
+-    FocusChain::self()->update(this, FocusChain::MakeFirstMinimized);
++
++    if (options->moveMinimizedWindowsToEndOfTabBoxFocusChain()) {
++        FocusChain::self()->update(this, FocusChain::MakeFirstMinimized);
++    }
++
+     // TODO: merge signal with s_minimized
+     addWorkspaceRepaint(visibleRect());
+     emit clientMinimized(this, !avoid_animation);
+diff --git a/focuschain.cpp b/focuschain.cpp
+index a68e6d3c6..347df3066 100644
+--- a/focuschain.cpp
++++ b/focuschain.cpp
+@@ -227,14 +227,18 @@ AbstractClient *FocusChain::nextForDesktop(AbstractClient *reference, uint deskt
+ void FocusChain::makeFirstInChain(AbstractClient *client, Chain &chain)
+ {
+     chain.removeAll(client);
+-    if (client->isMinimized()) { // add it before the first minimized ...
+-        for (int i = chain.count()-1; i >= 0; --i) {
+-            if (chain.at(i)->isMinimized()) {
+-                chain.insert(i+1, client);
+-                return;
++    if (options->moveMinimizedWindowsToEndOfTabBoxFocusChain()) {
++        if (client->isMinimized()) { // add it before the first minimized ...
++            for (int i = chain.count()-1; i >= 0; --i) {
++                if (chain.at(i)->isMinimized()) {
++                    chain.insert(i+1, client);
++                    return;
++                }
+             }
++            chain.prepend(client); // ... or at end of chain
++        } else {
++            chain.append(client);
+         }
+-        chain.prepend(client); // ... or at end of chain
+     } else {
+         chain.append(client);
+     }
+diff --git a/kwin.kcfg b/kwin.kcfg
+index 0b59606e3..2b06efe52 100644
+--- a/kwin.kcfg
++++ b/kwin.kcfg
+@@ -295,6 +295,9 @@
+         <entry name="LayoutName" type="String">
+             <default>thumbnails</default>
+         </entry>
++        <entry name="MoveMinimizedWindowsToEndOfTabBoxFocusChain" type="Bool">
++            <default>false</default>
++        </entry>
+     </group>
+     <group name="KDE">
+         <entry name="AnimationDurationFactor" type="Double">
+diff --git a/options.cpp b/options.cpp
+index 4bce7ee39..8014f8b78 100644
+--- a/options.cpp
++++ b/options.cpp
+@@ -111,6 +111,7 @@ Options::Options(QObject *parent)
+     , m_glPreferBufferSwap(Options::defaultGlPreferBufferSwap())
+     , m_glPlatformInterface(Options::defaultGlPlatformInterface())
+     , m_windowsBlockCompositing(true)
++    , m_MoveMinimizedWindowsToEndOfTabBoxFocusChain(false)
+     , OpTitlebarDblClick(Options::defaultOperationTitlebarDblClick())
+     , CmdActiveTitlebar1(Options::defaultCommandActiveTitlebar1())
+     , CmdActiveTitlebar2(Options::defaultCommandActiveTitlebar2())
+@@ -679,6 +680,15 @@ void Options::setWindowsBlockCompositing(bool value)
+     emit windowsBlockCompositingChanged();
+ }
+ 
++void Options::setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool value)
++{
++    if (m_MoveMinimizedWindowsToEndOfTabBoxFocusChain == value) {
++        return;
++    }
++    m_MoveMinimizedWindowsToEndOfTabBoxFocusChain = value;
++
++}
++
+ void Options::setGlPreferBufferSwap(char glPreferBufferSwap)
+ {
+     if (glPreferBufferSwap == 'a') {
+@@ -849,6 +859,7 @@ void Options::syncFromKcfgc()
+     setElectricBorderTiling(m_settings->electricBorderTiling());
+     setElectricBorderCornerRatio(m_settings->electricBorderCornerRatio());
+     setWindowsBlockCompositing(m_settings->windowsBlockCompositing());
++    setMoveMinimizedWindowsToEndOfTabBoxFocusChain(m_settings->moveMinimizedWindowsToEndOfTabBoxFocusChain());
+ 
+ }
+ 
+diff --git a/options.h b/options.h
+index 6d72017d3..0834f314e 100644
+--- a/options.h
++++ b/options.h
+@@ -590,6 +590,10 @@ public:
+         return m_windowsBlockCompositing;
+     }
+ 
++    bool moveMinimizedWindowsToEndOfTabBoxFocusChain() const {
++        return m_MoveMinimizedWindowsToEndOfTabBoxFocusChain;
++    }
++
+     QStringList modifierOnlyDBusShortcut(Qt::KeyboardModifier mod) const;
+ 
+     // setters
+@@ -651,6 +655,7 @@ public:
+     void setGlPreferBufferSwap(char glPreferBufferSwap);
+     void setGlPlatformInterface(OpenGLPlatformInterface interface);
+     void setWindowsBlockCompositing(bool set);
++    void setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool set);
+ 
+     // default values
+     static WindowOperation defaultOperationTitlebarDblClick() {
+@@ -881,6 +886,7 @@ private:
+     GlSwapStrategy m_glPreferBufferSwap;
+     OpenGLPlatformInterface m_glPlatformInterface;
+     bool m_windowsBlockCompositing;
++    bool m_MoveMinimizedWindowsToEndOfTabBoxFocusChain;
+ 
+     WindowOperation OpTitlebarDblClick;
+     WindowOperation opMaxButtonRightClick = defaultOperationMaxButtonRightClick();
+-- 
+GitLab
diff --git a/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch b/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch
new file mode 100644
index 000000000000..7de71bf959c0
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch
@@ -0,0 +1,65 @@
+From 75fded6f11ed645b0e25bf42b05fa57b8a675197 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Tue, 20 Oct 2020 14:05:33 -0600
+Subject: [PATCH] Revert "[focuschain/task switcher] Remove special handling
+ for minimized windows"
+
+This reverts commit cc862fa674d3407f516a89b8543acea04aa8b37d.
+
+It turns out that some people like this behavior and we've received
+various user complaints about it.
+---
+ abstract_client.cpp |  1 +
+ focuschain.cpp      | 12 +++++++++++-
+ focuschain.h        |  3 ++-
+ 3 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/abstract_client.cpp b/abstract_client.cpp
+index 35b7fcb61..e44da4725 100644
+--- a/abstract_client.cpp
++++ b/abstract_client.cpp
+@@ -703,6 +703,7 @@ void AbstractClient::minimize(bool avoid_animation)
+     doMinimize();
+ 
+     updateWindowRules(Rules::Minimize);
++    FocusChain::self()->update(this, FocusChain::MakeFirstMinimized);
+     // TODO: merge signal with s_minimized
+     addWorkspaceRepaint(visibleRect());
+     emit clientMinimized(this, !avoid_animation);
+diff --git a/focuschain.cpp b/focuschain.cpp
+index 66d209709..a68e6d3c6 100644
+--- a/focuschain.cpp
++++ b/focuschain.cpp
+@@ -227,7 +227,17 @@ AbstractClient *FocusChain::nextForDesktop(AbstractClient *reference, uint deskt
+ void FocusChain::makeFirstInChain(AbstractClient *client, Chain &chain)
+ {
+     chain.removeAll(client);
+-    chain.append(client);
++    if (client->isMinimized()) { // add it before the first minimized ...
++        for (int i = chain.count()-1; i >= 0; --i) {
++            if (chain.at(i)->isMinimized()) {
++                chain.insert(i+1, client);
++                return;
++            }
++        }
++        chain.prepend(client); // ... or at end of chain
++    } else {
++        chain.append(client);
++    }
+ }
+ 
+ void FocusChain::makeLastInChain(AbstractClient *client, Chain &chain)
+diff --git a/focuschain.h b/focuschain.h
+index 8baf3ea32..9a7c7e25d 100644
+--- a/focuschain.h
++++ b/focuschain.h
+@@ -41,7 +41,8 @@ class FocusChain : public QObject
+     enum Change {
+         MakeFirst,
+         MakeLast,
+-        Update
++        Update,
++        MakeFirstMinimized = MakeFirst
+     };
+     ~FocusChain() override;
+     /**
diff --git a/kde-plasma/kwin/kwin-5.19.5-r1.ebuild b/kde-plasma/kwin/kwin-5.19.5-r1.ebuild
deleted file mode 100644
index fc1182510000..000000000000
--- a/kde-plasma/kwin/kwin-5.19.5-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="caps gles2-only multimedia"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.14
-	>=dev-libs/wayland-1.2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwayland-server-${PVCUT}:5
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,wayland,X(+)]
-	virtual/libudev:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	caps? ( sys-libs/libcap )
-	gles2-only? ( media-libs/mesa[gles2] )
-"
-# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-safe-removal-of-X11-event-filters.patch # KDE-Bug 423319
-)
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package caps Libcap)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/kwin/kwin-5.20.5.ebuild b/kde-plasma/kwin/kwin-5.20.5-r1.ebuild
index 559fadb2fe62..eb5a94484cca 100644
--- a/kde-plasma/kwin/kwin-5.20.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.20.5-r1.ebuild
@@ -15,9 +15,11 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="accessibility caps gles2-only multimedia screencast"
 
+RESTRICT+=" test"
+
 COMMON_DEPEND="
 	>=dev-libs/libinput-1.14
 	>=dev-libs/wayland-1.2
@@ -95,7 +97,10 @@ PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-RESTRICT+=" test"
+PATCHES=(
+	"${FILESDIR}/${P}-revert-new-focuschain-w-minimised.patch" # KDE-Bug 427840
+	"${FILESDIR}/${P}-keep-focuschain-behavior-w-minimised.patch" # Plasma/5.21
+)
 
 src_prepare() {
 	ecm_src_prepare
@@ -116,3 +121,14 @@ src_configure() {
 
 	ecm_src_configure
 }
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
+	elog "windows to the end of the list was changed so that it remains in the"
+	elog "original order. To revert to the well established behavior:"
+	elog
+	elog " - Edit ~/.config/kwinrc"
+	elog " - Find [TabBox] section"
+	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index ad5421a85959..6016aeb60ad0 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,2 +1 @@
-DIST kwrited-5.19.5.tar.xz 20208 BLAKE2B 76a5ddb2c9e4e3e47f1deb65c077634715dd1853a879573ce6be259d5cfcfb9ce7bd68b5967fa006e84f34dafdaf82ee18c9154ab28bcf49d152edc6816e7b10 SHA512 c5beb32da7ea08d944d603db9f5af6356b7742be9408f8d5e540d2e782c54d0642f93a784420a931ce807f980fc6aed0135d54e8cb03f88831ac7c0404dc7136
 DIST kwrited-5.20.5.tar.xz 20508 BLAKE2B 8555ec109bcffe731428bd379aa78498b89685a03db22f19949b7db6d609bdfd9d94aae0de9d84c8b56620a432e35fbf20c834f9f46ba13955e724a9c4fdf580 SHA512 77b2b3be3b3c3fc7689d9e8907a4c76bcfc012ca862a02d77273f6e373407e72ccf9e68d1e3a1b8eab99bfb390d472591074108a5233f48e7c97221d87f4838a
diff --git a/kde-plasma/kwrited/kwrited-5.19.5.ebuild b/kde-plasma/kwrited/kwrited-5.19.5.ebuild
deleted file mode 100644
index b324563b7fdc..000000000000
--- a/kde-plasma/kwrited/kwrited-5.19.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwrited/kwrited-5.20.5.ebuild b/kde-plasma/kwrited/kwrited-5.20.5.ebuild
index 0d79069aba4d..6d28e631c91c 100644
--- a/kde-plasma/kwrited/kwrited-5.20.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.20.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index a54a76a3e29c..b949b7ae4517 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1 @@
-DIST libkscreen-5.19.5.tar.xz 85468 BLAKE2B be5d055092395e53e252e879d4bfb5177e45e1b5df96cd53bff81a0cf88b10f84dd1a0b7445bc1073357c98040afc62334aa433e20d5afe3f21f73b3e3ea5cae SHA512 5bc462ee9e322bbdbd375003b962b868a6c6dfff6344e61d39e04644fbb7f409a337116df1c274a664f633b176dfd69af992d3e0e290fa85dbe529cbe1a1e87f
 DIST libkscreen-5.20.5.tar.xz 85368 BLAKE2B 886156489308315c3366d7b6efa994d715ecb7729ad51a5b36285de2265ca49eee23f712a56301388398099336e7a07dca869fe23e1e70c876d070392b207a32 SHA512 4fd9e5a2f215f2da752929a2688022d78ec16a70342613efbf5649a1b6be09f0b4e60cc780ccc985c1b725ce1b38f42c7f8b7bd92eb2cd1612aa2c5a005fbbdb
diff --git a/kde-plasma/libkscreen/libkscreen-5.19.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.19.5.ebuild
deleted file mode 100644
index f1338d76cf04..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.19.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma screen management library"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/7"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}"
-
-# requires running session
-RESTRICT+=" test"
diff --git a/kde-plasma/libkscreen/libkscreen-5.20.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.20.5.ebuild
index 80fea9f7c2c3..c6b0ae7b331b 100644
--- a/kde-plasma/libkscreen/libkscreen-5.20.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.20.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Plasma screen management library"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index b1ee03e5be46..93e6d525eadc 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1 @@
-DIST libksysguard-5.19.5.tar.xz 674900 BLAKE2B 88408494360921bff732ba535a932b2a17d8faba9a0cd231754dda6116ce52d8cb6ed32f89f05e16091b54a378d3d50e5e46feff1e27b46260f3803ca78b9855 SHA512 8e723eff1e50195005a91dd558df0ddce956c33478c00e177f1eae4d9997ea8332d86bb8fae1eb2d18bfe3bdceefa31fe4211dfcf4bb1c463d347ced33e75348
 DIST libksysguard-5.20.5.tar.xz 699156 BLAKE2B 749cbe4b73e8377bb3dc026000492d6dd0cea34dd13aafd32754aa84636ccf416e60fc97ca17c1810ea0b2458f6ec09471a383210b1a6b025a745fded3a1c734 SHA512 56fa61e1149f8a97f1884755bbc0475a1f9a458eb785d29416b4646e9a9edb1f2bf85e56dcf49226ab1509b4a63bf4334c1ad9853026ccd0eaf68dffa79864b0
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch b/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch
deleted file mode 100644
index 903b7b8bcf27..000000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From fa06754147850ba06659f21e57cd7a724ecf8c49 Mon Sep 17 00:00:00 2001
-From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
-Date: Sat, 23 May 2020 18:26:12 +0200
-Subject: [PATCH] remove unnecessary dependency
-
----
- CMakeLists.txt                   | 13 +------------
- signalplotter/CMakeLists.txt     |  1 -
- signalplotter/ksignalplotter.cpp |  2 +-
- signalplotter/ksignalplotter_p.h |  2 ++
- 4 files changed, 4 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b12ead7..063cb05 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,14 +46,6 @@ set_package_properties(Qt5WebChannel PROPERTIES
- 
- find_package(KF5 REQUIRED COMPONENTS CoreAddons Config I18n JobWidgets WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service GlobalAccel KIO Package Declarative NewStuff)
- 
--find_package(KF5 OPTIONAL_COMPONENTS Plasma)
--set_package_properties(KF5Plasma PROPERTIES
--                       URL "https://cgit.kde.org/plasma-framework.git/"
--                       DESCRIPTION "The library of the plasma project"
--                       TYPE OPTIONAL
--                       PURPOSE "Used by signalplotter to use Plasma themes"
--                      )
--
- find_package(ZLIB REQUIRED)
- set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed files and data streams"
-                        URL "http://www.zlib.net"
-@@ -113,10 +105,7 @@ add_subdirectory( processcore )
- add_subdirectory( processui )
- add_subdirectory( sensors )
- add_subdirectory( faces )
--
--if (KF5Plasma_FOUND)
--    add_subdirectory( signalplotter )
--endif()
-+add_subdirectory( signalplotter )
- add_subdirectory( ksgrd )
- 
- if(BUILD_TESTING)
-diff --git a/signalplotter/CMakeLists.txt b/signalplotter/CMakeLists.txt
-index fd11f01..231fcf7 100644
---- a/signalplotter/CMakeLists.txt
-+++ b/signalplotter/CMakeLists.txt
-@@ -16,7 +16,6 @@ target_link_libraries(ksignalplotter
-         KF5::IconThemes
-     PRIVATE
-         KSysGuard::ProcessCore
--        KF5::Plasma
- )
- 
- set_target_properties(ksignalplotter
-diff --git a/signalplotter/ksignalplotter.cpp b/signalplotter/ksignalplotter.cpp
-index 4e6c278..df7c705 100644
---- a/signalplotter/ksignalplotter.cpp
-+++ b/signalplotter/ksignalplotter.cpp
-@@ -42,7 +42,6 @@
- #ifdef GRAPHICS_SIGNAL_PLOTTER
- #include <QGraphicsSceneResizeEvent>
- #include <QStyleOptionGraphicsItem>
--#include <Plasma/Theme>
- #endif
- 
- #include <klocalizedstring.h>
-@@ -52,6 +51,7 @@
- 
- #ifdef SVG_SUPPORT
- #include <Plasma/Svg>
-+#include <Plasma/Theme>
- #endif
- 
- 
-diff --git a/signalplotter/ksignalplotter_p.h b/signalplotter/ksignalplotter_p.h
-index 81912f5..082f97c 100644
---- a/signalplotter/ksignalplotter_p.h
-+++ b/signalplotter/ksignalplotter_p.h
-@@ -24,7 +24,9 @@
- //#define USE_QIMAGE
- 
- // SVG support causes it to crash at the moment :(
-+// (when re-enabling this remember to also link against plasma-framework)
- //#define SVG_SUPPORT
-+
- // Use a separate child widget to draw the graph in
- #ifndef KSYSGUARD_KSIGNALPLOTTER_P_H
- #define KSYSGUARD_KSIGNALPLOTTER_P_H
--- 
-2.26.2
-
diff --git a/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
deleted file mode 100644
index cf0bfe42b844..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-SLOT="5/9"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="webengine X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	sys-libs/zlib
-	webengine? (
-		>=dev-qt/qtwebchannel-${QTMIN}:5
-		>=dev-qt/qtwebengine-${QTMIN}:5
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-DEPEND="${RDEPEND}
-	!<kde-plasma/plasma-workspace-5.18.80:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch"
-	"${FILESDIR}/${PN}-5.18.90-unused-dep.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package webengine Qt5WebChannel)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	LC_NUMERIC="C" ecm_src_test # bug 695514
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.20.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.20.5.ebuild
index b0a8b5d57403..7ee8bd1bfd68 100644
--- a/kde-plasma/libksysguard/libksysguard-5.20.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.20.5.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="webengine X"
 
 RDEPEND="
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index b318c4b031ad..9d60abe75ce1 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,2 +1 @@
-DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch
deleted file mode 100644
index 8f0523ab8e84..000000000000
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 85564b5264546866be56b9bc546689fbab20506d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 13 Mar 2020 00:14:31 +0100
-Subject: [PATCH] libkworkspace: Allow standalone build
-
----
- CMakeLists.txt | 71 ++++++++++++++++++++++++++++++++++--
- 1 file changed, 67 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 85cbb5e6c..de17e9287 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,56 @@
-+project(libkworkspace)
-+
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+    set(PROJECT_VERSION "GENTOO_PV")
-+    set(PROJECT_VERSION_MAJOR 5)
-+
-+    cmake_minimum_required(VERSION 3.0)
-+
-+    set(QT_MIN_VERSION "5.12.0")
-+    set(KF5_MIN_VERSION "5.58.0")
-+    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
-+    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
-+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-+
-+    include(KDEInstallDirs)
-+    include(KDECMakeSettings)
-+    include(KDECompilerSettings NO_POLICY_SCOPE)
-+    include(ECMMarkNonGuiExecutable)
-+    include(CMakePackageConfigHelpers)
-+    include(WriteBasicConfigVersionFile)
-+    include(CheckIncludeFiles)
-+    include(FeatureSummary)
-+    include(ECMQtDeclareLoggingCategory)
-+    include(KDEPackageAppTemplates)
-+    include(ECMMarkAsTest)
-+    include(GenerateExportHeader)
-+
-+    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Init Plasma WindowSystem)
-+
-+    find_package(KWinDBusInterface CONFIG REQUIRED)
-+    find_package(KScreenLocker 5.13.80 REQUIRED)
-+    find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
-+
-+    find_package(X11)
-+    set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-+                URL "http://www.x.org"
-+                TYPE OPTIONAL
-+                PURPOSE "Required for X11 support")
-+
-+    if(X11_FOUND)
-+        find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
-+        set(HAVE_X11 1)
-+    endif()
-+
-+    if(BUILD_TESTING)
-+        find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+    endif()
-+
-+    check_include_files(unistd.h HAVE_UNISTD_H)
-+
-+    configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
-+    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
-+endif()
- 
- set(kworkspace_LIB_SRCS kdisplaymanager.cpp
-                         kworkspace.cpp
-@@ -16,9 +69,18 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface )
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface)
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
-+set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
-+else()
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
-+set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
-+set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
-+endif()
- 
- set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
-                             "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
-@@ -34,11 +96,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
- qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface)
- 
--set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
- qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
--
--set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
--
- qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
- 
- 
-@@ -105,3 +163,8 @@ if(BUILD_TESTING)
-     add_subdirectory(autotests)
-     add_subdirectory(tests)
- endif()
-+
-+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-+    install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel )
-+    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-+endif()
--- 
-2.25.1
-
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild
deleted file mode 100644
index ccb11d117c2b..000000000000
--- a/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Workspace library to interact with the Plasma session manager"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-plasma/kwin-${PVCUT}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-workspace-5.14.2:5
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.18.80-standalone.patch" )
-
-src_prepare() {
-	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
-		rm -rf po/*/docs || die
-		cp -a ../po ./ || die
-	fi
-	ecm_src_prepare
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		cat >> CMakeLists.txt <<- _EOF_ || die
-			ki18n_install(po)
-		_EOF_
-	fi
-
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.20.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.20.5.ebuild
index add8dc1d58f3..23228e860975 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.20.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.20.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 958931cd5d94..27464b5022ad 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,2 +1 @@
-DIST milou-5.19.5.tar.xz 64612 BLAKE2B 588e5b98d5a1aa061dfe09d9566c68904c882a7a4120e3fadaed60fa1f372013d966511693ee44bb67d6b554e44d287374784ed02b25c04a0b7b06fd34240fa1 SHA512 c480d22ec7f6be8031af13b23914add05d331b017c1d4d2a193a47f31cad1ede0bfa833a9368d0ba9c35cf5b0f97e23d15307ae45569d8bd9d7fde305d17b913
 DIST milou-5.20.5.tar.xz 55388 BLAKE2B 5d2e977c884753a315c0c424d30ff5fb2ebc04e660b0243d2c352fb105811fde54f9c57f4e96a7abf2cc043ae6ca9b348ca4d84deefcef550814ae2dcbdd7822 SHA512 a67d939dc832b77ce957cc2e1b9a9e56412618d94217e0bb958db62fa41c5ba2e6e4311e0300a79800ef1845e425ca0e275fea10ece9d9a60bdf7bf690b71b32
diff --git a/kde-plasma/milou/milou-5.19.5.ebuild b/kde-plasma/milou/milou-5.19.5.ebuild
deleted file mode 100644
index 724be14a7ba4..000000000000
--- a/kde-plasma/milou/milou-5.19.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://invent.kde.org/plasma/milou"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.19.80-disable-manual-tests.patch" ) # bug 732584
diff --git a/kde-plasma/milou/milou-5.20.5.ebuild b/kde-plasma/milou/milou-5.20.5.ebuild
index a4644760986d..c5f8a7ee3457 100644
--- a/kde-plasma/milou/milou-5.20.5.ebuild
+++ b/kde-plasma/milou/milou-5.20.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 30db528243d2..67c808021c75 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1 @@
-DIST oxygen-5.19.5.tar.xz 4462408 BLAKE2B 94a284ed12f6f1d2b04518c9dd6e891ee78c3959c39a82a339e58dddfde442e9bf2ad0a1296dea2f511a3e099fe61deea570f0f0a9b01ccff50e3ff8cd2d45be SHA512 53eec62c875dfb94d6b757e2b37b0ac23756d16ad4841cc6d7d9992cd2feaf8d7fba35987cd75f265563783dac013df509f7261033d169b8dca5e545e0eb03f4
 DIST oxygen-5.20.5.tar.xz 4471660 BLAKE2B 9ff9c4479d34020dc92aa6d68f44d80c6a5620d8f22449a67a1d02df0f6d68313b3f88c7e41e292fdafe2316f6b50145b7a5d4ce128e0961782e7cb71d18bf86 SHA512 c3dcfeca4264c460adec8a6f08a616d3647c8e7f4265a23b994ca1106d1c0a3aefd7732377f5e6a38dcecec4728eca2bd54a7290b2d52ab81a66b7b971503282
diff --git a/kde-plasma/oxygen/oxygen-5.19.5.ebuild b/kde-plasma/oxygen/oxygen-5.19.5.ebuild
deleted file mode 100644
index f856859339e9..000000000000
--- a/kde-plasma/oxygen/oxygen-5.19.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/oxygen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="wayland"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	x11-libs/libxcb
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kservice-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-desktop-5.16.80
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/oxygen/oxygen-5.20.5.ebuild b/kde-plasma/oxygen/oxygen-5.20.5.ebuild
index 0def9bcf7106..a92f813c2d10 100644
--- a/kde-plasma/oxygen/oxygen-5.20.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.20.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 1d0140624ba9..c978b3ed45d8 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,2 +1 @@
-DIST plasma-browser-integration-5.19.5.tar.xz 176780 BLAKE2B f46d8434a957d52ecf3b475c08b106705df2c4486b85b7365b7ddf7144d2cae993787c53397ed0e91c0cd3210f9f746a22d61df08a5bd4d1d5eb58605572b452 SHA512 c7334c4ab4ab3e0e1e93715257995fa7b16103a61eb40877b3e859f75b781e27456f96d5fef409284d0f584335f723b30a5a0bee0a06ffb9cea9012cb158b9e1
 DIST plasma-browser-integration-5.20.5.tar.xz 193684 BLAKE2B 9144233b0a36e913328e930a59973432ad9e83066e7bdd602a672f354e991fb6a971598c788e658ab55615ed6e2e0731d9749d1f6d471f928375b4af0852a2be SHA512 d6017397dc86c5e835b914748fe9fe4c3f2b499174dfd3a0a9575446a831478deb692663b6c0b6d6ac37aa309a5a0168a5db5d56babd8e802b419022ce88f152
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild
deleted file mode 100644
index 91ada7c65102..000000000000
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.5.ebuild
index 1fd4d578d7e5..d7ac87616513 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensi
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 3d9fca5c94d9..14522e5d1769 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-desktop-5.19.5.tar.xz 9430088 BLAKE2B 02894dfdc8c0d4535782629059b7d69e7722c63ef47c44077d5b49ac489b53af8440ba361a31a327783fe7a2b56d1812d59c8f6f0797c8fcc81aa90c1fac96c4 SHA512 d7c7b26dc5a7d4804a780833f8d22797312b845962ed4f9218c448fcb3c720c032eca1e79bec5f9c084f1825f0b6f26c34ffe032320396c9092e04a5b05c3d12
 DIST plasma-desktop-5.20.5.tar.xz 15899532 BLAKE2B 1ed7d6c1bbc8b368ed98c4f35bcfd10f8436909a8f66fbfdf2e4e5eb8b8dcd36903600a934512dac7a07d54ef830ed2604e1ee39df6e40156ef7cec1e96dd041 SHA512 a1af8d04dbf16e94777e018ff0f289b69928ccefeb31e6dc73a2425d6170a0a5a3fdc324d192b41664cd118eea9b15cb6e7bd3f49ee03095ede16a3fa53a6f2b
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch
deleted file mode 100644
index 69f33cb402e8..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e7cb58f156a240c70c085be38a12e2a01dc5ede6 Mon Sep 17 00:00:00 2001
-From: Guo Yunhe <i@guoyunhe.me>
-Date: Sun, 20 Sep 2020 21:12:08 +0300
-Subject: [PATCH] Force Emojier using color emoji font
-
----
- applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml b/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml
-index 858cbd935..e7198156b 100644
---- a/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml
-+++ b/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml
-@@ -113,6 +113,7 @@ Kirigami.ScrollablePage
-         delegate: MouseArea {
-             QQC2.Label {
-                 font.pointSize: 25
-+                font.family: 'emoji' // Avoid monochrome fonts like DejaVu Sans
-                 fontSizeMode: model.display.length > 5 ? Text.Fit : Text.FixedSize
-                 minimumPointSize: 10
-                 text: model.display
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
deleted file mode 100644
index c3f9e924568f..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-0"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="emoji +fontconfig ibus scim +semantic-desktop"
-
-COMMON_DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-	emoji? (
-		app-i18n/ibus[emoji]
-		dev-libs/glib:2
-		media-fonts/noto-emoji
-	)
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	!<kde-plasma/kdeplasma-addons-5.15.80
-"
-
-PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-	"${FILESDIR}/${P}-force-emojier-use-color-emoji-font.patch"
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use ibus; then
-		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package fontconfig Fontconfig)
-		-DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package scim SCIM)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-	)
-	if ! use emoji && ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
-	fi
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.20.5.ebuild
index 75e857f3288e..025fd6bdfccb 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.20.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.20.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.20.5.ebuild
index b62ba6c0a1e6..3959d887a406 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.20.5.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.20.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 7d7c14e860c8..574dfc2c6a67 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,2 +1 @@
-DIST plasma-integration-5.19.5.tar.xz 57464 BLAKE2B ef5ec9f849087ae738a1ff1de14a77994b4486f89b632777caa8e0aad67cad8553bdf1d0553893361ab4c11ddba0caf32464cb49f08047cf2d40375f789c166e SHA512 9e17e1720e5d5c1d3cada3f1eb891d27fd189eb65378c2e0be6547c79d93d5df2f785a3c67d35a4a374d320b118ad3b7d3fb7d968a7f5b629e505d21c83cfe36
 DIST plasma-integration-5.20.5.tar.xz 59740 BLAKE2B 8c6e054db3047093556ac9549ebe28e6270001838f28eea92138f4acc02c79235f6c0ab8d82de764dae16efa81cc7ff7519736935bd77153612ee035f7abf337 SHA512 fa0806c756d394ab6f419252396f9d0a18652ed652adcb016dd2885f5238df843814f4661c63b193805834dcd43cb346f69ce33339520229c215d2ff45a24604
diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch
deleted file mode 100644
index 7405dace6be1..000000000000
--- a/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 15c7926377065da0fea111be303816dca91d087a Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Tue, 15 Sep 2020 13:31:48 -0600
-Subject: [PATCH] Use KDE shortcuts for "move to trash" action coming from
- QStandardKey
-
-QKeySequence::Delete is the Qt "Move to trash" action, which, by
-default, includes Ctrl+D as a shortcut. This is something we don't want
-in KDE software, so we need to intercept this action in our integration
-plugin and give it the standard KDE shortcuts instead, as we do for
-other actions.
-
-BUG: 426573
-FIXED-IN: 5.20
----
- src/platformtheme/kdeplatformtheme.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/platformtheme/kdeplatformtheme.cpp b/src/platformtheme/kdeplatformtheme.cpp
-index 24ac7e7..18b3f6f 100644
---- a/src/platformtheme/kdeplatformtheme.cpp
-+++ b/src/platformtheme/kdeplatformtheme.cpp
-@@ -257,6 +257,8 @@ QList<QKeySequence> KdePlatformTheme::keyBindings(QKeySequence::StandardKey key)
-         return KStandardShortcut::shortcut(KStandardShortcut::TabNext);
-     case QKeySequence::PreviousChild:
-         return KStandardShortcut::shortcut(KStandardShortcut::TabPrev);
-+    case QKeySequence::Delete:
-+        return KStandardShortcut::shortcut(KStandardShortcut::MoveToTrash);
-     default:
-         return QPlatformTheme::keyBindings(key);
-     }
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
deleted file mode 100644
index ad56b885e448..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${P}-use-standard-kde-shortcut-for-move-to-trash.patch )
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.20.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.20.5.ebuild
index ec30933363c9..cce645201cf3 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.20.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.20.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
deleted file mode 100644
index 18a7aeba6379..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://kde.org/plasma-desktop"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="bluetooth +browser-integration crypt +desktop-portal discover
-+display-manager +elogind grub gtk +handbook +kwallet +legacy-systray
-+networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-
-RDEPEND="
-	>=kde-plasma/breeze-${PV}:${SLOT}
-	>=kde-plasma/drkonqi-${PV}:${SLOT}
-	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
-	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
-	>=kde-plasma/kdecoration-${PV}:${SLOT}
-	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
-	>=kde-plasma/kgamma-${PV}:${SLOT}
-	>=kde-plasma/khotkeys-${PV}:${SLOT}
-	>=kde-plasma/kinfocenter-${PV}:${SLOT}
-	>=kde-plasma/kmenuedit-${PV}:${SLOT}
-	>=kde-plasma/kscreen-${PV}:${SLOT}
-	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
-	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
-	>=kde-plasma/ksysguard-${PV}:${SLOT}
-	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
-	>=kde-plasma/kwayland-server-${PV}:${SLOT}
-	>=kde-plasma/kwin-${PV}:${SLOT}
-	>=kde-plasma/kwrited-${PV}:${SLOT}
-	>=kde-plasma/libkscreen-${PV}:${SLOT}
-	>=kde-plasma/libksysguard-${PV}:${SLOT}
-	>=kde-plasma/milou-${PV}:${SLOT}
-	>=kde-plasma/oxygen-${PV}:${SLOT}
-	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
-	>=kde-plasma/plasma-integration-${PV}:${SLOT}
-	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
-	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
-	>=kde-plasma/powerdevil-${PV}:${SLOT}
-	>=kde-plasma/systemsettings-${PV}:${SLOT}
-	>=kde-plasma/user-manager-${PV}:${SLOT}
-	sys-apps/dbus[elogind?,systemd?]
-	sys-auth/polkit[elogind?,systemd?]
-	sys-fs/udisks:2[elogind?,systemd?]
-	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
-	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
-	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
-	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
-	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
-	display-manager? (
-		sddm? (
-			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
-			x11-misc/sddm[elogind?,systemd?]
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
-	gtk? (
-		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
-		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
-		x11-misc/appmenu-gtk-module
-	)
-	handbook? ( kde-apps/khelpcenter:5 )
-	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
-	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
-	networkmanager? (
-		>=kde-plasma/plasma-nm-${PV}:${SLOT}
-		net-misc/networkmanager[elogind?,systemd?]
-		qrcode? ( kde-frameworks/prison[qml] )
-	)
-	plymouth? (
-		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
-		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
-	)
-	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
-	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
-	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
-	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
-"
-
-pkg_postinst() {
-	has_version sys-auth/consolekit || return
-	ewarn "An existing installation of sys-auth/consolekit was detected even though"
-	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
-	ewarn "There can only be one session manager at runtime, otherwise random issues"
-	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
-	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
-	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
-}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.20.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.20.5.ebuild
index 4fe49701a8cc..1d16c73d033f 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.20.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.20.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="bluetooth +browser-integration crypt +desktop-portal discover +display-manager
 +elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager
 plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index e1ff6df8e9e9..7c6ab681de5d 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,2 +1 @@
-DIST plasma-nm-5.19.5.tar.xz 855504 BLAKE2B a2437794d9de5a0fda6328dd0e352fad956710cef06f9bc2d6590dbde7f2eb469d051db6fc4ce647fe59bf95e48e6e6c9ff68e512a2992abe183ab309112f94d SHA512 2fdd42e7c9bba0b069e0ca39f8ef996b36a807a4065172a816023c32d5d24869bf92c577c9cc5a08bb9e8b13c628b7cbd8346d17dc1e6814c931f7f7ec9439a7
 DIST plasma-nm-5.20.5.tar.xz 865364 BLAKE2B 3a316674e9c9bbe7df09c34610f117bbacfa60515e93077103a7956aa1999cc8bef7e4e5add53d3ccb847557c7fadf17ab23d82e392e1b2822cecb9dc33598bb SHA512 6413dcbc6b8723384ecc6897331947343f399bedba6aff9148bc34485b54c5fd6a91b77d63390b0c398c8bcad8151de3f1746c71f3cfae9476632e2386ab6ff7
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch
deleted file mode 100644
index 170e20ea2256..000000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.19.2-fix-inline-password-field.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 271332cfc19ede398854113d037abfb35503179f Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Thu, 18 Jun 2020 15:34:40 +0000
-Subject: [PATCH] [WIP] [applet] Fix inline password field component not
- working properly
-
-BUG: 423093
-FIXED-IN: 5.20
----
- applet/contents/ui/ConnectionItem.qml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/applet/contents/ui/ConnectionItem.qml b/applet/contents/ui/ConnectionItem.qml
-index 98240928..06c7ab25 100644
---- a/applet/contents/ui/ConnectionItem.qml
-+++ b/applet/contents/ui/ConnectionItem.qml
-@@ -231,8 +231,8 @@ PlasmaExtras.ExpandableListItem {
-                 if (!predictableWirelessPassword && !Uuid) {
-                     handler.addAndActivateConnection(DevicePath, SpecificPath)
-                 } else if (connectionItem.customExpandedViewContent == passwordDialogComponent) {
--                    if (passwordDialogComponent.password != "") {
--                        handler.addAndActivateConnection(DevicePath, SpecificPath, passwordDialogComponent.password)
-+                    if (connectionItem.customExpandedViewContentItem.password != "") {
-+                        handler.addAndActivateConnection(DevicePath, SpecificPath, connectionItem.customExpandedViewContentItem.password)
-                         connectionItem.customExpandedViewContent = detailsComponent
-                         connectionItem.collapse()
-                     } else {
--- 
-2.27.0
-
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild
deleted file mode 100644
index 69089da378c5..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	>=app-crypt/qca-2.3.0:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-misc/networkmanager[teamd=]
-	modemmanager? (
-		>=dev-qt/qtxml-${QTMIN}:5
-		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		>=dev-qt/qtxml-${QTMIN}:5
-		net-vpn/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.19.2-fix-inline-password-field.patch # KDE-bug #423093
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake_use_find_package openconnect OpenConnect)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-plasma/plasma-workspace:5"; then
-		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
-		elog "However, the networkmanagement KCM can be called from either systemsettings"
-		elog "or manually: $ kcmshell5 kcm_networkmanagement"
-	fi
-}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.20.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.20.5.ebuild
index 833fde052421..856dae591577 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.20.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.20.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 0d5359421f15..5e0dd2b6f882 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1 @@
-DIST plasma-pa-5.19.5.tar.xz 108156 BLAKE2B cbbb50c102d77b4eddb865daddb432e4ec1e7b27d033ecbd87c0bb8d64b565eebc206d4c13b197ea4f5bff4693e4ef9c9e3570e21fc177adc58f478683269603 SHA512 90d9faf8ab2f4fc7ecdc3e4fa84276ef6c7fc3abc2b2b7a0407e9f001c10330aa98a89ee68602c5378e4e46eec89a88c55e1e01dc2d755e613e4f584234331b6
 DIST plasma-pa-5.20.5.tar.xz 114276 BLAKE2B c41d5093af494ab0eb17452098e47dc53b56256c98181a4f034df8662aafe51b3138fbb41ae7ba0b9d31e6595bf8871d93b6838f69cec30c0981690c4df85233 SHA512 8d01c79fd75e494f816049400a10929f427bf09d79ebddd73a125d4795722fea44319450c5f4d7d8627a03fca4a8f11405e267a87ca5e85016038fedc8131bda
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild
deleted file mode 100644
index 224c7bd36a81..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	media-libs/libcanberra
-	media-sound/pulseaudio
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	x11-themes/sound-theme-freedesktop
-"
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.20.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.20.5.ebuild
index 5666fc801a2d..f9d149a2ea29 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.20.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.20.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 94a5ffba502e..ea4f45f9b4b0 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1 @@
-DIST plasma-sdk-5.19.5.tar.xz 263576 BLAKE2B 4752ba4423930bac21893140f397595dc1b5fe9238b054043a7b961756d762a11bd50d806c779e59dd512c2ca304c38bb72ebc1d811d89bb46746cc7f0528dc4 SHA512 66ca604bd27a7c48f8127f04e43c0093c098820e099c944cf7e4715ee0703175761ce6e4be270ffd78b0b1a87fbb2a8e7f670010df0032c4148bcf4275fc32f6
 DIST plasma-sdk-5.20.5.tar.xz 266680 BLAKE2B e6ba310a3d089ee36a9098d9a58276cb8491a0c3016990e7643036ee905624c5f974b0d2e470047b59e5cc114a80e7426dbf1d0561bdf4fd26a218e47ade8ca8 SHA512 d10a5413835ab9ac4f1c521839f56b12862d87eed25c13d7ea70398bb892da7ab558bfc62fd2fe8451fc11ab9023d2e9a6e78c677bfa3e104c15f8e87ae1db77
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild
deleted file mode 100644
index 9aa04126da84..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="optional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Useful applications for Plasma development"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.20.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.20.5.ebuild
index 64070c932b58..dc70503d57f6 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.20.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.20.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Useful applications for Plasma development"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0-r1.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0-r1.ebuild
index 74a974a91fb2..c82a81c04b85 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0-r1.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-systemmonitor"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 fi
 
 LICENSE="|| ( GPL-3 GPL-2 )"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 3edead115363..b52217ed8ec9 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,2 +1 @@
-DIST plasma-thunderbolt-5.19.5.tar.xz 51300 BLAKE2B c0a9b3665d58ac57c4e4fc71670edaf402d69e8477e0b74875df2d4d666ea8f1c1ce2d0b950f5f20950a431837d651a545f8df19412b60332e0b5d3b08beaa5b SHA512 34c0cb7495b03eaf4f84426fbb6ab2a8b3b336fa1a7f32014231f302c3f1a0e061462e32ded86dab713aa2b602ba5311da3a45e0352f63f59d6e503c1eb7905e
 DIST plasma-thunderbolt-5.20.5.tar.xz 56824 BLAKE2B eb3289a0e9959cf291d1eed2d52597d9ffdc8993096ec0b1ba850720c726fe412ac43bfcf8f7b4c721d6a982ce1f127e323b420ec57da33dcd206438d9602ba7 SHA512 ce07bfd0733f6dda4429b77afbe699edb85e46cc31656ccb7a6cbf366fdba2720b4d92e4327edfdb164867873bbe7d21dd2da5e8764bb36e8b3c154ab8f3088e
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.5.ebuild
deleted file mode 100644
index 5a8370f3b0db..000000000000
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
-
-LICENSE="|| ( GPL-2 GPL-3+ )"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	sys-apps/bolt
-"
-
-# tests require DBus
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.5.ebuild
index 69da5b0cc09a..22fd773a72e7 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.5.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
 
 LICENSE="|| ( GPL-2 GPL-3+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 339effad3bf6..91ee6bd3c2ed 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,2 +1 @@
-DIST plasma-vault-5.19.5.tar.xz 145448 BLAKE2B 3b9dff74ab3c7120d9fe1c40007333d514d6773602941987bed55b977c46f7e2b8a27c125c258030a5da638c30e83186d0097ca553e437c2efc13e390b7471db SHA512 d2c00601dae41b924ffb174a7fca9b508ff6e6ae052dd72fa2d9b6767718b4d40a25a7b7c9131f197d25e113c23d74df36829634ce8d83d4a76355aa66ce5771
 DIST plasma-vault-5.20.5.tar.xz 159080 BLAKE2B 2aa427337eb69b016eef9d5849c465cc8f55a900cd35739a88c51f622ce01d5b4a8676442ba78fc0b555e09de7a31b3ed6499c85968f5178d3613b88a6d114fc SHA512 2e3d6b221fdf363763b732f2e0d82afc63aaa727bae8755940c6e53eecb9ad6526071162202a24c93065a3e80598b3c25a71255a2fe032c71a771e611bc80c9d
diff --git a/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
deleted file mode 100644
index 9e5785d9d527..000000000000
--- a/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f8f7179824f5540ee64900d20af39dfc9bacd490 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Sun, 14 Jun 2020 09:09:48 -0600
-Subject: [PATCH] Port applet to use PlasmaExtras.PlaceholderMessage
-
-The Kirigami version uses QQC2 elements which don't respect the plasma
-theme and color scheme, leading to thing slooking out of place
-especially when using a dark color theme or scheme.
-
-Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
----
- CMakeLists.txt                      | 6 ------
- plasma/package/contents/ui/main.qml | 4 +---
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e7aa0df..bc7c260 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -66,12 +66,6 @@ if (KF5NetworkManagerQt_FOUND)
- endif()
- find_package (KSysGuard REQUIRED)
- 
--find_package(KF5Kirigami2 ${KF5_DEP_VERSION} CONFIG)
--set_package_properties(KF5Kirigami2 PROPERTIES
--    DESCRIPTION "A QtQuick based components set"
--    TYPE RUNTIME
--)
--
- include_directories (
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/common
-diff --git a/plasma/package/contents/ui/main.qml b/plasma/package/contents/ui/main.qml
-index 22c7428..bfac7a9 100644
---- a/plasma/package/contents/ui/main.qml
-+++ b/plasma/package/contents/ui/main.qml
-@@ -26,8 +26,6 @@ import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.components 2.0 as PlasmaComponents
- import org.kde.plasma.extras 2.0 as PlasmaExtras
- 
--import org.kde.kirigami 2.12 as Kirigami
--
- Item {
-     property var vaultsModel: plasmoid.nativeInterface.vaultsModel
-     property var vaultsModelActions: plasmoid.nativeInterface.vaultsModel.actionsModel()
-@@ -77,7 +75,7 @@ Item {
- 
-             interactive: false
- 
--            Kirigami.PlaceholderMessage {
-+            PlasmaExtras.PlaceholderMessage {
-                 id: noVaultsMessage
- 
-                 anchors.centerIn: parent
--- 
-2.27.0
-
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild
deleted file mode 100644
index 8d48bdb0e505..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet and services for creating encrypted vaults"
-HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
-
-LICENSE="LGPL-3"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="networkmanager"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild
index ef58729d83bf..3504bc63378c 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index e8b74ba587af..8aeda255c6ac 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1 @@
-DIST plasma-workspace-wallpapers-5.19.5.tar.xz 41824532 BLAKE2B 08b90cd0869e5935320a00fe7687c6a15a3978bcf3288e8e37f48dcef53baaf84921f573949f8dbeeaac2f5861151a4625520fd6a89de264e150918955d39da9 SHA512 79723d50f47412d4904effddbb641d75675a66f517e70164bf55f89e31cbb8246ea1617f90e4cd8e1c5ec169332187586443ead7bc2721b0df85a693ada9287f
 DIST plasma-workspace-wallpapers-5.20.5.tar.xz 45932988 BLAKE2B f97004b26d967acf8dc4e24b9d5efeb99c56d69f640d03662162ecf9782c9e0343d99c5ba2813ebab9d9811a03ca37c6ad73ed420f0bb88a393a49e1dce69a76 SHA512 60719b4d963b8e8e4306c2ced7433aa8a009029de7f5fe5e1d4a1743a2554bbf5a64d572a839c2210a474a51e849c7a5bae74dd121f06ca80f076d85bc8eb8b0
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild
deleted file mode 100644
index 56aeacaf1b52..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-inherit cmake kde.org
-
-DESCRIPTION="Wallpapers for the Plasma workspace"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/qtcore:5
-	kde-frameworks/extra-cmake-modules:5
-"
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.5.ebuild
index d290aa752bae..c46c7d6c1304 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index b318c4b031ad..9d60abe75ce1 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1 @@
-DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
deleted file mode 100644
index 527e199cc66d..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From faef126255222f727219bf69ac2b89857dc61ab2 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Sun, 14 Jun 2020 09:08:21 -0600
-Subject: [PATCH] Port applets to use PlasmaExtras.PlaceholderMessage
-
-The Kirigami version uses QQC2 elements which don't respect the plasma
-theme and color scheme, leading to thing slooking out of place
-especially when using a dark color theme or scheme.
-
-Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
----
- applets/clipboard/contents/ui/Menu.qml                          | 2 +-
- .../notifications/package/contents/ui/FullRepresentation.qml    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/applets/clipboard/contents/ui/Menu.qml b/applets/clipboard/contents/ui/Menu.qml
-index 0bd6064a5..cac8380db 100644
---- a/applets/clipboard/contents/ui/Menu.qml
-+++ b/applets/clipboard/contents/ui/Menu.qml
-@@ -55,7 +55,7 @@ PlasmaExtras.ScrollArea {
-             onAction: menu.action(uuid)
-         }
- 
--        Kirigami.PlaceholderMessage {
-+        PlasmaExtras.PlaceholderMessage {
-             id: emptyHint
- 
-             anchors.centerIn: parent
-diff --git a/applets/notifications/package/contents/ui/FullRepresentation.qml b/applets/notifications/package/contents/ui/FullRepresentation.qml
-index b34dee7af..989cb4341 100644
---- a/applets/notifications/package/contents/ui/FullRepresentation.qml
-+++ b/applets/notifications/package/contents/ui/FullRepresentation.qml
-@@ -585,7 +585,7 @@ PlasmaComponents3.Page {
-                     }
-                 }
- 
--                Kirigami.PlaceholderMessage {
-+                PlasmaExtras.PlaceholderMessage {
-                     anchors.centerIn: parent
-                     width: parent.width - (units.largeSpacing * 4)
- 
--- 
-2.27.0
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch
deleted file mode 100644
index 64c5e106e10f..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-gpsd-3.21.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e3134289f522edb140797818fffd60d641b86cd8 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Wed, 5 Aug 2020 14:07:24 +0200
-Subject: [PATCH] Fix build with gpsd 3.21
-
-Adapt to API changes
----
- dataengines/geolocation/location_gps.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
-index 021c29ac5..476117ca3 100644
---- a/dataengines/geolocation/location_gps.cpp
-+++ b/dataengines/geolocation/location_gps.cpp
-@@ -65,7 +65,11 @@ void Gpsd::run()
-             if (m_gpsdata->online) {
- #endif
-                 //qDebug() << "online";
-+#if GPSD_API_MAJOR_VERSION >= 10
-+                if (m_gpsdata->fix.status != STATUS_NO_FIX) {
-+#else
-                 if (m_gpsdata->status != STATUS_NO_FIX) {
-+#endif
-                     //qDebug() << "fix";
-                     d["accuracy"] = 30;
-                     d["latitude"] = QString::number(m_gpsdata->fix.latitude);
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch
deleted file mode 100644
index 21e335315907..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 5cb38daedbfa5ef26a47d82d197c96230a004b0f Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed, 30 Sep 2020 08:56:16 +0000
-Subject: [PATCH] [containmentactions] Guard against having no virtual desktops
-
-It can apparently happen that virtual desktops is empty at a given point
-in time. Potentially due to other bugs on the system.
-
-Calls to desktopIds.at(N) will fail.
-
-BUG: 427106
-
-
-(cherry picked from commit 2441c82a2a92535ccc0a9643715427eb362c98e8)
----
- containmentactions/switchdesktop/desktop.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/containmentactions/switchdesktop/desktop.cpp b/containmentactions/switchdesktop/desktop.cpp
-index 809543a49..dda78c584 100644
---- a/containmentactions/switchdesktop/desktop.cpp
-+++ b/containmentactions/switchdesktop/desktop.cpp
-@@ -85,6 +85,10 @@ void SwitchDesktop::switchTo()
- void SwitchDesktop::performNextAction()
- {
-     const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds();
-+    if (desktopIds.isEmpty()) {
-+        return;
-+    }
-+
-     const QVariant &currentDesktop = m_virtualDesktopInfo->currentDesktop();
-     const int currentDesktopIndex = desktopIds.indexOf(currentDesktop);
- 
-@@ -100,6 +104,9 @@ void SwitchDesktop::performNextAction()
- void SwitchDesktop::performPreviousAction()
- {
-     const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds();
-+    if (desktopIds.isEmpty()) {
-+        return;
-+    }
-     const QVariant &currentDesktop = m_virtualDesktopInfo->currentDesktop();
-     const int currentDesktopIndex = desktopIds.indexOf(currentDesktop);
- 
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch
deleted file mode 100644
index aa30a4d2cf2a..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-login-button-size.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9a8fc811282e303ec2f93c978228a85961dae263 Mon Sep 17 00:00:00 2001
-From: Noah Davis <noahadvs@gmail.com>
-Date: Mon, 14 Sep 2020 10:18:57 -0400
-Subject: [PATCH] [sddm-theme/lockscreen] Fix login button size
-
-Some users reported this button becoming too small after KF5.74 was released, but I could not reproduce it myself. However, this code did look suspicious. Hopefully this fixes the issue.
----
- lookandfeel/contents/lockscreen/MainBlock.qml | 4 ++--
- sddm-theme/Login.qml                          | 5 ++---
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
---- a/lookandfeel/contents/lockscreen/MainBlock.qml
-+++ b/lookandfeel/contents/lockscreen/MainBlock.qml
-@@ -97,7 +97,8 @@
-         PlasmaComponents.Button {
-             id: loginButton
-             Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Unlock")
--            implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field
-+            Layout.preferredHeight: passwordBox.implicitHeight
-+            Layout.preferredWidth: loginButton.Layout.preferredHeight
- 
-             PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off
-                     anchors.fill: parent
---- a/sddm-theme/Login.qml
-+++ b/sddm-theme/Login.qml
-@@ -112,8 +112,8 @@
-         PlasmaComponents.Button {
-             id: loginButton
-             Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log In")
--            implicitHeight: passwordBox.height - units.smallSpacing * 0.5 // otherwise it comes out taller than the password field
--            Layout.rightMargin: 1 // prevents it from extending beyond the username field
-+            Layout.preferredHeight: passwordBox.implicitHeight
-+            Layout.preferredWidth: loginButton.Layout.preferredHeight
- 
-             PlasmaCore.IconItem { // no iconSource because if you take away half a unit (implicitHeight), "go-next" gets cut off
-                 anchors.fill: parent
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch
new file mode 100644
index 000000000000..a7580b44475a
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch
@@ -0,0 +1,37 @@
+From aa5215a0b3f8febfe9eda2ab586d9bf8ba647c7c Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 11 Jan 2021 16:03:31 +0100
+Subject: [PATCH] [applets/digitalclock] Fix showing agenda view when enabling
+ plugins
+
+The agenda view is only shown when at least one event source is active.
+When going from 0 to 1 active sources the view wasn't updated correctly.
+
+This was because the visibility of rightColumn was bound to the
+visibility of its child, but since the visibility of the parent affects
+the visibility of its childred (https://doc.qt.io/qt-5/qml-qtquick-item.html#visible-prop) that resulted in a broken binding.
+
+Bind to the source property directly to avoid this
+
+BUG: 431433
+(cherry picked from commit 56064d80ff2e798460967b28243c8117ee6ebaec)
+---
+ applets/digital-clock/package/contents/ui/CalendarView.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applets/digital-clock/package/contents/ui/CalendarView.qml b/applets/digital-clock/package/contents/ui/CalendarView.qml
+index a7104100e..1541a3501 100644
+--- a/applets/digital-clock/package/contents/ui/CalendarView.qml
++++ b/applets/digital-clock/package/contents/ui/CalendarView.qml
+@@ -145,7 +145,7 @@ PlasmaComponents3.Page {
+         ColumnLayout {
+             id: rightColumn
+ 
+-            visible: agenda.visible || worldClocks.visible
++            visible: calendar.showAgenda || calendar.showClocks
+ 
+             Layout.minimumWidth: units.gridUnit * 14
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch
new file mode 100644
index 000000000000..8d2c0ddfbdb8
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch
@@ -0,0 +1,67 @@
+From 13057013d55ae19e76d29b9edc96510e52da2a7a Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 8 Jan 2021 12:40:07 +0000
+Subject: [PATCH] [lookandfeel] Fix wake existing screensaver mode with key
+ presses
+
+In commit 45e0a722fb85bb5d1ab8bef92080e934254b13aa we changed the focus
+on the textfield with the intention of fixing the cusor blinking.
+
+This had the unfortunate side effect of breaking waking out of the
+screensaver mode with just the keyboard.
+
+That screensaver mode was bound to:
+```
+property bool blockUI: mainBlock.mainPasswordBox.text.length > 0
+```
+for that to change, we need to have focus.
+
+Instead this patches cursor blinking more explicity.
+
+Doing it only in the lock screen (as opposed to the toolkit) makes sense
+as this only happens due to somewhat unusual usage inside the
+lockscreen.
+
+BUG: 431286
+
+
+(cherry picked from commit 2cbd7e4c70d0592d16cdaf58ed43effe4a716aa4)
+---
+ lookandfeel/contents/lockscreen/LockScreenUi.qml | 3 ---
+ lookandfeel/contents/lockscreen/MainBlock.qml    | 6 ++++++
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml
+index d2f8a2b7d..c4f9e8a45 100644
+--- a/lookandfeel/contents/lockscreen/LockScreenUi.qml
++++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml
+@@ -229,9 +229,6 @@ PlasmaCore.ColorScope {
+ 
+             // this isn't implicit, otherwise items still get processed for the scenegraph
+             visible: opacity > 0
+-            // changing enabled will toggle if an item can have activeFocus, which otherwise
+-            //keeps the text cursor blinking even when invisble
+-            enabled: visible
+ 
+             initialItem: MainBlock {
+                 id: mainBlock
+diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/contents/lockscreen/MainBlock.qml
+index 4bd5df0e5..e8f5ced47 100644
+--- a/lookandfeel/contents/lockscreen/MainBlock.qml
++++ b/lookandfeel/contents/lockscreen/MainBlock.qml
+@@ -66,6 +66,12 @@ SessionManagementScreen {
+             enabled: !authenticator.graceLocked
+             revealPasswordButtonShown: true
+ 
++            // In Qt this is implicitly active based on focus rather than visibility
++            // in any other application having a focussed invisible object would be weird
++            // but here we are using to wake out of screensaver mode
++            // We need to explicitly disable cursor flashing to avoid unnecessary renders
++            cursorVisible: visible
++
+             onAccepted: {
+                 if (lockScreenUiVisible) {
+                     startLogin();
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch
new file mode 100644
index 000000000000..3018b73cefa0
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch
@@ -0,0 +1,35 @@
+From 2a6718ff53aa70d3a6c0d9a78a7aaa491907b130 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Mon, 18 Jan 2021 12:56:00 +0000
+Subject: [PATCH] startplasma-wayland: Fix XKB variable setup
+
+When this was ported to C++, it missed the actual variable assignments.
+
+
+(cherry picked from commit 76088e21ea2ec09d13bd462d61c4b8ffc7bc4729)
+---
+ startkde/startplasma-wayland.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp
+index 500435853..38e325843 100644
+--- a/startkde/startplasma-wayland.cpp
++++ b/startkde/startplasma-wayland.cpp
+@@ -61,10 +61,10 @@ int main(int argc, char** argv)
+                     qputenv(var, r.toUtf8());
+             };
+ 
+-            queryAndSet("X11MODEL", QStringLiteral("X11Model"));
+-            queryAndSet("X11LAYOUT", QStringLiteral("X11Layout"));
+-            queryAndSet("X11VARIANT", QStringLiteral("X11Variant"));
+-            queryAndSet("X11OPTIONS", QStringLiteral("X11Options"));
++            queryAndSet("XKB_DEFAULT_MODEL", QStringLiteral("X11Model"));
++            queryAndSet("XKB_DEFAULT_LAYOUT", QStringLiteral("X11Layout"));
++            queryAndSet("XKB_DEFAULT_VARIANT", QStringLiteral("X11Variant"));
++            queryAndSet("XKB_DEFAULT_OPTIONS", QStringLiteral("X11Options"));
+         } else {
+             qWarning() << "not a reply org.freedesktop.locale1" << resultMessage;
+         }
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index aca777015f87..9a2c9dcdfddc 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="appstream">Enable AppStream software metadata support</flag>
 		<flag name="geolocation">Enables dataengine providing location information</flag>
 		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
-		<flag name="qrcode">Enable support for creating QR codes from clipboard data using <pkg>kde-frameworks/prison</pkg></flag>
 		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
 		<flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag>
 	</use>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
deleted file mode 100644
index 472f6c66c2de..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5[jpeg]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	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/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-	gps? ( sci-geosciences/gpsd )
-	qalculate? ( sci-libs/libqalculate:= )
-	qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtpaths-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-apps/kio-extras-19.04.3:5
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/ksysguard-${PVCUT}:5
-	>=kde-plasma/milou-${PVCUT}:5
-	>=kde-plasma/plasma-integration-${PVCUT}:5
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!<kde-plasma/plasma-desktop-5.16.80:5
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
-	"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
-	"${FILESDIR}/${P}-gpsd-3.21.patch" # bug 742392
-	"${FILESDIR}/${P}-login-button-size.patch"
-	"${FILESDIR}/${P}-guard-against-no-virtual-desktops.patch" # KDE-Bug #427106
-)
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	ecm_pkg_setup
-
-	local md5
-	local srcfile=/etc/plasma/XX/10-agent-XX.sh
-	local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
-
-	if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
-		md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
-		if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
-			elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
-			elog "Copying to ${newdir}/env/10-agent-startup.sh..."
-			cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
-		fi
-	fi
-
-	if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
-		md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
-		if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
-			elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
-			elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
-			cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
-		fi
-	fi
-}
-
-src_prepare() {
-	ecm_src_prepare
-
-	if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
-		cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
-	fi
-	if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
-		cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
-	fi
-
-	cmake_comment_add_subdirectory libkworkspace
-	# delete colliding libkworkspace translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		$(cmake_use_find_package appstream AppStreamQt)
-		$(cmake_use_find_package calendar KF5Holidays)
-		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake_use_find_package qalculate Qalculate)
-		$(cmake_use_find_package qrcode KF5Prison)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# default startup and shutdown scripts
-	insinto /etc/xdg/plasma-workspace/env
-	doins "${T}"/10-agent-startup.sh
-
-	insinto /etc/xdg/plasma-workspace/shutdown
-	doins "${T}"/10-agent-shutdown.sh
-	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
-	ecm_pkg_postinst
-
-	# Clean up pre-5.17.4 scripts
-	if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
-	fi
-	if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
-		rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-	fi
-	rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null
-
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r3.ebuild
index 765312b060b8..5bb5619001c4 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r3.ebuild
@@ -15,10 +15,11 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
+RESTRICT+=" test"
 
 BDEPEND="virtual/pkgconfig"
 COMMON_DEPEND="
@@ -144,11 +145,12 @@ PDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
 	"${FILESDIR}/${P}-avoid-render-invisible-contents.patch" # KDE-Bug 347772
+	"${FILESDIR}/${P}-fix-wake-screensaver-mode-w-keypress.patch" # KDE-Bug 431286
 	"${FILESDIR}/${P}-fix-crash-on-screen-changes.patch" # KDE-Bug 425711
+	"${FILESDIR}/${P}-fix-digitalclock-agenda-view.patch" # KDE-Bug 431433
+	"${FILESDIR}/${P}-wayland-fix-XKB-variable-setup.patch"
 )
 
-RESTRICT+=" test"
-
 src_prepare() {
 	ecm_src_prepare
 
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 92237d2970e6..6267568ad09f 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,2 +1 @@
-DIST plymouth-kcm-5.19.5.tar.xz 41680 BLAKE2B d9a7a0c5d512322d0a9074e810fd8ebbdc2308985f471280c9c862f71aef77270fc39c9a6a4b4b2e8691c78501496fb101cd288b4b39b638cfc2f8f518ca50b5 SHA512 fbcebcec7ee4c69491b6425c5cac09801a26310ff15bc252bb66bdf8e322734c0d1551b97a4eb3e725e08e70010a0a4949560e2c5a58f61d1aa004620c8ac6cc
 DIST plymouth-kcm-5.20.5.tar.xz 43024 BLAKE2B d7a2a6a347484f27d73ade549da7cd338ca23f2e69543c8f2724222e3585fe0f49067ea94c1a70e8fdead16634e408fbf742aa798c5b594e0040b96eb54263ad SHA512 a150c77aad5cc663dd8f2d718ddf06472563782ff5d831bc3ade5b790cb8eb4a15890181c7587e5c74d73db0b2f05185b705ff1288c43b3940461aecc87b5e78
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild
deleted file mode 100644
index 01b5e879921a..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BOGUS=1
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	sys-boot/plymouth
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.5.ebuild
index fcf8a743f993..7fe46dfc20fe 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 8a8e5e4cc965..06eeed00e8f3 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,2 +1 @@
-DIST polkit-kde-agent-1-5.19.5.tar.xz 44824 BLAKE2B 117b1ccd5ec5ec38ec45edd45c33671b30fbea7bf53a444e9e172cad4d88d0165c60e59d9664348422f11930ddb089f574af03eea743c10e85b036702dc7ed3d SHA512 f0e27056af864535c533a2bedbe2445f9e1648789150eac16031a1486f6676f8a4c929fee5f8cfbd7e48a904045f6c2d283083b33bbb823a2da27549d42090a5
 DIST polkit-kde-agent-1-5.20.5.tar.xz 44792 BLAKE2B 41adcf417e8ce207b3f2a28f8c5a9b2e7c4da155290c55742529101319cf8ead12de22d59b4fe8bf7e67b6e6b48fc7b8afbf9655d58903d5fed3447e85bf7d2e SHA512 fcc06391ec8d8bb8a01d86ef1f8bdc45cb0ee5fef23429b5488a62497036ac6001a928d1920e92306b3ec77669ea73ab2f1071652cde12786e497fa48adf8328
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild
deleted file mode 100644
index d46955297ea3..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="${PN}-1"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=sys-auth/polkit-qt-0.113.0
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.5.ebuild
index 9744b506af35..1026cdfd32b4 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 76c3585ada6f..8b74a422e5d4 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1 @@
-DIST powerdevil-5.19.5.tar.xz 600388 BLAKE2B 0b99c229b576d8a033187dd81a0f6f199ff991f9c1eb4c6856a77a7ddd269ddf1ce50a76ea71821487be11593f5740a7d66a2af3e6b6c1f983a5e87bfc008b9b SHA512 5f1b1e8fdcd996769024a4f008527960fc91af32862047fdd13674ddb6925fd7b1a024a5c45182d14be32aa0bb8ba1bc694476061e480bcdfb3bdcb65d60cb16
 DIST powerdevil-5.20.5.tar.xz 610300 BLAKE2B 9d392db560a7685a3cef29bf61ae553a8bc8e3d6e30e22ccc5316117d78d7087c35060e777912962ff421cb0f23481fa558cda59237254c7ce201da97031d89c SHA512 c862314d5ad446fb48c08f3e6cbcc72bad0f1825756954ae0d2bd1ceac55e3324124698d3d0803103ff35561bf4fcddaa00831b7b4cb93763d17876a348a3c6f
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch b/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
deleted file mode 100644
index 3a1c4c381557..000000000000
--- a/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fcb26be2fb279e6ad3b7b814d26a5921d16201eb Mon Sep 17 00:00:00 2001
-From: Johannes Jordan <kde@lanrules.de>
-Date: Mon, 29 Jun 2020 10:51:40 +0000
-Subject: [PATCH] Fix compilation with ddcutil 0.9.9
-
----
- daemon/backends/upower/ddcutilbrightness.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/daemon/backends/upower/ddcutilbrightness.cpp b/daemon/backends/upower/ddcutilbrightness.cpp
-index e712c05a..a75aac5c 100644
---- a/daemon/backends/upower/ddcutilbrightness.cpp
-+++ b/daemon/backends/upower/ddcutilbrightness.cpp
-@@ -56,7 +56,6 @@ void DDCutilBrightness::detect()
-         
-         DDCA_Feature_List vcpList;
-         ddca_get_feature_list_by_dref(DDCA_SUBSET_COLOR, dh, false, &vcpList);
--        qCDebug(POWERDEVIL) << "ddca_feature_list: "<< ddca_feature_list_string(&vcpList, "0x", ",");
-         QVector<uint16_t> tmpVcpList;
-         for (int iVcp = 0; iVcp < m_usedVcp.count(); ++iVcp) {
-             DDCA_Non_Table_Vcp_Value returnValue;
--- 
-GitLab
-
diff --git a/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
deleted file mode 100644
index e2c03a38d2cc..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="brightness-control +wireless"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	virtual/libudev:=
-	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
-	wireless? (
-		>=kde-frameworks/bluez-qt-${KFMIN}:5
-		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=sys-power/upower-0.9.23
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.19.4-ddcutil-0.9.9.patch" ) # bug 734918
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_DDCUTIL=$(usex brightness-control)
-		$(cmake_use_find_package wireless KF5BluezQt)
-		$(cmake_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.20.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.20.5.ebuild
index cf8d01bcbaf4..052d374512d5 100644
--- a/kde-plasma/powerdevil/powerdevil-5.20.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.20.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="brightness-control caps +wireless"
 
 DEPEND="
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 26921509ce83..e5fa148510de 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1 @@
-DIST sddm-kcm-5.19.5.tar.xz 62468 BLAKE2B e02a9c839cfaeb8d90a9bb317a6025be9d65399963a4ffbff562572bcf722d499cd20e007f13614f609ffce75322ee6b834b0cc760dd59d35952bbde22d85ecc SHA512 5eb79696addcb08e8c6eb95960a43cfd7ec5013a7948d67b025430fd09ad20917a71e903b5a2b0b0f1d47e7dbce7473cfa69dd143b9c6b2f4fbb8828cdd86704
 DIST sddm-kcm-5.20.5.tar.xz 64796 BLAKE2B dc2365a08f64ebf0709ceda56599e7a183c0fd2c7ba33a05efb5132438c2e92c9c8b7d5e775c305e5739d04e633dd15119939e352e5842572d06930d7ffe9ec3 SHA512 96511d979046bd97da1513be559312f851e63b3e319ee2f78ac83b275cf748e30ded430d3f6b9736da21e7710802dfed31ae23187888d367537e3642aed1769f
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild
deleted file mode 100644
index c5aa154aac7d..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	x11-misc/sddm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.20.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.20.5.ebuild
index 0d4d23a846d0..a9ac0a53cc13 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.20.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.20.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 7d8dc90ca6f6..ba32b49943c5 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,2 +1 @@
-DIST systemsettings-5.19.5.tar.xz 183360 BLAKE2B dc8eb9b466f2f86405175e29e7abf54a243e64022222f5e8a370d17bedcf44a5b35e760b0f2f9a7da67a5845d68a77049d7d2ba405f2574b4676a42fea0b0676 SHA512 381aa73e5bc195f2c05cf4df904a031f8415fffb99eaf33414604bdb623e8618c66ffa2e5b108b7838f5d9cb83cec578cefa4e414d9d7fa3fe258c864e1568fb
 DIST systemsettings-5.20.5.tar.xz 193844 BLAKE2B ec81542b9bc06931eff60204f87e2d6aec8de57f97d57d4e057a8805bb4c1b02278c9fb12a9545bdb632d0896a6ec30833ef024e5b4232fe41baafce5af517dd SHA512 c68669f5a5d08ce52a9b0034d319f691a9419cb035ecd04895313e7c853cf6c01e72c8ee1fa15f92f7f22a9734d45b2373d9a4807d576783dfd7f5b5de14c994
diff --git a/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
deleted file mode 100644
index f14cde3ad190..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Control Center to configure KDE Plasma desktop"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	!kde-misc/systemd-kcm
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version kde-plasma/kde-gtk-config || \
-			elog "Install kde-plasma/kde-gtk-config to configure looks for GTK+."
-	fi
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.20.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.20.5.ebuild
index b45637af6ddd..63530989c240 100644
--- a/kde-plasma/systemsettings/systemsettings-5.20.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.20.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 3c25de61cbe6..10abd29750f0 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,2 +1 @@
-DIST xdg-desktop-portal-kde-5.19.5.tar.xz 76348 BLAKE2B d3205542ec76bd6c9fa4ae5076d0716c1f201f8c90aeeb61dfcaf9010ada0b21a3e80cff70089077646059d56d19033f8ae887b34c9f30c54b8190d559df0a09 SHA512 5d82e5a1553e9fcb471895e356a23915cbad1215ae1fff5fa6fac6f1673af4c406171131222a88a13eee847dc0d99f8bab00dac1849dfa6844b1672ae7545bb7
 DIST xdg-desktop-portal-kde-5.20.5.tar.xz 81876 BLAKE2B 9a0a8052a7a7d9d0200723440176bef37ae6e29417ccea67b222096f0b65e3c371ad83071d93ab05ec6d7de377383e61c126da3775f31189ff1bdd3c4a947933 SHA512 618abd6182e561664b10bd751792622dd88f05932c88505e141ee143e475b228727d2daa509bf113906a97ffc507cbd11f51e15b729f2e55210d9c0000f742a1
diff --git a/kde-plasma/xdg-desktop-portal-kde/metadata.xml b/kde-plasma/xdg-desktop-portal-kde/metadata.xml
index a053f2874ebc..9c604ba4a6dc 100644
--- a/kde-plasma/xdg-desktop-portal-kde/metadata.xml
+++ b/kde-plasma/xdg-desktop-portal-kde/metadata.xml
@@ -5,8 +5,5 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
-	</use>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
deleted file mode 100644
index ccd6c0f879a8..000000000000
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="screencast"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	screencast? (
-		media-libs/libepoxy
-		media-libs/mesa[gbm]
-		media-video/pipewire:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/xdg-desktop-portal[screencast?]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PIPEWIRE=$(usex screencast)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.5.ebuild
index 5b8e46268ca4..826ade43e358 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index b318c4b031ad..9d60abe75ce1 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,2 +1 @@
-DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild
deleted file mode 100644
index 22ed031a9156..000000000000
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-inherit cmake kde.org
-
-DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}
-	!<kde-plasma/plasma-workspace-5.14.2:5
-	!kde-plasma/xembed-sni-proxy:0
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.5.ebuild
index 6ae3a3276559..4c36c2b98841 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sn
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5