gentoo resync : 22.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
commit: 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree: b9791a06ab3284e27b568412c59316c66240c682 /kde-plasma
parent: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
185 files changed, 1102 insertions, 3310 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 033d5743ed3f..a138abb599b6 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index e324d8bc932e..b63295c06c51 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,4 @@
-DIST bluedevil-5.22.5.tar.xz 162740 BLAKE2B 2561bc614083bb7548c752330588d46afe99c0a0e7c215c8079044b240dce6dda8894aecf67d9af6750a1dbef5259e4e508d672485fe9ede215259bdb41e9480 SHA512 bd92fb1bd55f29916a5e4818785e9be43f7eec01bb5ec9ac35ffe5a8e20ac11079261f46f96a7e60d2f6c5b9b1a06773de2bd525f796d4e0d651edc5056202ab
+AUX bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch 3219 BLAKE2B 0eb626feb23369b55b1fd0e81c5c1f069510cd1ec30d8359fe759300c0ea11a00e4f2a01897c06ff9fda77f6499bd298c6c97645bbef08b80deea091af5019ac SHA512 7a2f1c77e2cae0e2a54ce6c98328c7c158f337af6a762026f4a9a973591ee73a8d9ba1aab496e876b7e2ed62de0697cb10df9072f76263240f7c3da14ae6a9f7
 DIST bluedevil-5.23.4.tar.xz 171304 BLAKE2B 239dc03d078f38c371446e3a1d73ad667eed2f4aa9c7d434d41ff2c973b5abf6d9b3b8661c7d3907adc55cb588e5481a66039b258a9ba7f468ce331c1dc172dc SHA512 41564e1e7fc7ecf5225063180a69d04c36340bd5b7c4ed8540b1b46b232c43c684e9c3faaafa1ded037c08a4a1bc49a82b9a4660df97e00e5ae2711fceba9a6b
-EBUILD bluedevil-5.22.5.ebuild 1118 BLAKE2B af4d6e101a1f5cbc513d2d0155ce7a93a97bd509f7bf53827fed90dd98feaabdfdff2ea76ab0996caaaad958ec0a81c57c7f29d8e41c346304e2915ef46660b4 SHA512 25872950b76d750fc4f471b1efdfa70534010b538a504c5673d55910cddea9662e0f1b1ee76d6bc08086b44de5a18a11cda159913b42d1e50848c4afc3ab312b
-EBUILD bluedevil-5.23.4.ebuild 1121 BLAKE2B acbda1f0abf4912eb5b7da6bef58762d4796f1b557f67c5d936da99ce19106dbb7469ecc404aab99181089cd5edcaf38a2695f0db02f5ffb6960307ebfa5ac6c SHA512 a65f37ff96ea819771df1b869bf1855c4d258a4678ec1711fe9b7a05b31ac129eaea98154645fe3cbbb616f67265b1dfa44d18a8c34e9a681d1c1967b3ce924b
+EBUILD bluedevil-5.23.4-r1.ebuild 1208 BLAKE2B 432f72f84b031478a82b529592285eece80c9701f9f3f16b2216f49dd418bee2362d3c03135805b138a3819168b19ccfbb6604d84c1a428a29e519d670b4926c SHA512 976f404a8d68035ddf51084bd3149a65c4d1145d8cc65262ec049f2ba49b3ae494fdb4cb5e57c1411dad1dd4c331abec9c65cdea844bd13c792b4746a8dd87eb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/bluedevil/bluedevil-5.22.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.23.4-r1.ebuild
index c4ed728f052b..c50dffa5f1b3 100644
--- a/kde-plasma/bluedevil/bluedevil-5.22.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.23.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KFMIN=5.82.0
+KFMIN=5.86.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 inherit ecm kde.org
@@ -16,6 +16,10 @@ SLOT="5"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}"/${P}-save-bluetooth-status-on-teardown.patch # KDE-bug 445376
+)
+
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
diff --git a/kde-plasma/bluedevil/bluedevil-5.23.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.23.4.ebuild
deleted file mode 100644
index a5596eaace02..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.23.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.86.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv ~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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${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
-"
diff --git a/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch b/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch
new file mode 100644
index 000000000000..1a0a28e50ec9
--- /dev/null
+++ b/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch
@@ -0,0 +1,89 @@
+From daaa18920ae93b482585eb3df790a6d5a647b6db Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Fri, 19 Nov 2021 19:37:58 -0700
+Subject: [PATCH] Save bluetooth status on teardown
+
+Instead of watching for the shutdown and restart signals, just save
+status anytime kded quits, which automatically covers those use cases as
+well as when logging out. This is what the code was already halfway
+doing; let's go all the way.
+
+BUG: 445376
+FIXED-IN: 5.23.5
+(cherry picked from commit e57bb7580251f38e798bea21cdad43a3f90f2568)
+---
+ src/kded/devicemonitor.cpp | 29 +++--------------------------
+ src/kded/devicemonitor.h   |  1 -
+ 2 files changed, 3 insertions(+), 27 deletions(-)
+
+diff --git a/src/kded/devicemonitor.cpp b/src/kded/devicemonitor.cpp
+index 735747ee..5090a8be 100644
+--- a/src/kded/devicemonitor.cpp
++++ b/src/kded/devicemonitor.cpp
+@@ -46,15 +46,6 @@ DeviceMonitor::DeviceMonitor(BlueDevilDaemon *daemon)
+                                          this,
+                                          SLOT(login1PrepareForSleep(bool)));
+ 
+-    // Catch shutdown events so we can save status when shutting down and
+-    // optionally resume when starting up
+-    QDBusConnection::systemBus().connect(QStringLiteral("org.freedesktop.login1"),
+-                                         QStringLiteral("/org/freedesktop/login1"),
+-                                         QStringLiteral("org.freedesktop.login1.Manager"),
+-                                         QStringLiteral("PrepareForShutdown"),
+-                                         this,
+-                                         SLOT(login1PrepareForShutdown(bool)));
+-
+     // Set initial state
+     const KConfigGroup globalGroup = m_config->group("Global");
+     const QString launchState = globalGroup.readEntry("launchState", "remember");
+@@ -75,17 +66,11 @@ DeviceMonitor::DeviceMonitor(BlueDevilDaemon *daemon)
+     }
+ }
+ 
+-// Save state when tearing down to avoid getting out of sync if kded crashes
+-// or is manually restarted
+ DeviceMonitor::~DeviceMonitor()
+ {
+-    KConfigGroup globalGroup = m_config->group("Global");
+-
+-    if (m_manager->isBluetoothBlocked()) {
+-        globalGroup.writeEntry<bool>("bluetoothBlocked", true);
+-    } else {
+-        globalGroup.deleteEntry("bluetoothBlocked");
+-    }
++    // Save state when tearing down to avoid getting out of sync if kded crashes
++    // or is manually restarted
++    saveState();
+ }
+ 
+ KFilePlacesModel *DeviceMonitor::places()
+@@ -140,14 +125,6 @@ void DeviceMonitor::login1PrepareForSleep(bool active)
+     }
+ }
+ 
+-void DeviceMonitor::login1PrepareForShutdown(bool active)
+-{
+-    if (active) {
+-        qCDebug(BLUEDAEMON) << "About to shut down";
+-        saveState();
+-    }
+-}
+-
+ void DeviceMonitor::saveState()
+ {
+     KConfigGroup adaptersGroup = m_config->group("Adapters");
+diff --git a/src/kded/devicemonitor.h b/src/kded/devicemonitor.h
+index 6a35fed4..a7b38cab 100644
+--- a/src/kded/devicemonitor.h
++++ b/src/kded/devicemonitor.h
+@@ -35,7 +35,6 @@ private Q_SLOTS:
+ 
+     void deviceConnectedChanged(bool connected);
+     void login1PrepareForSleep(bool active);
+-    void login1PrepareForShutdown(bool active);
+ 
+ private:
+     void restoreState();
+-- 
+GitLab
+
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index bd9672339138..5c5873d6e71b 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-grub-5.22.5.tar.xz 3144508 BLAKE2B 6c26fd22a142d00c904396eb460a10dc39b4206c0937d83a5fcb1d617ea278e67fa6b8d6fc6a2d22c83061664dd1b842c68387a71c9c000ee8942431ec1d165e SHA512 09071d7256c0ce21c13e13803aadcf044af2ea54f69335c3d7cb773d2e45d71932de9e3d2f8e662b6d5ffead9a216e8c6f1a6c298fb99893d2a1ae27eccc74d2
 DIST breeze-grub-5.23.4.tar.xz 3150820 BLAKE2B 712e0e21e4a7f9e0f329e5e9cafe87fafbb7c142e5545b5895c97598930ba3efbad77e803f9b136f556012759ae3deb4147d699f4dc4519e9e4da5df48980965 SHA512 6ebc30ef4fff30bc626b9a5d3b9ba999cfab3b1492a7084df211e3eb15325d3e308ad72d2719cfef996b817593414a86fc2481469530425ded7dc3db5ca1ca78
-EBUILD breeze-grub-5.22.5.ebuild 401 BLAKE2B 9cde80ae6be6a89ce4f79d242593049449421a6a463d221f723281d37435e70cc7a4f5afa98d0ac58faa9d1f0b833e84e4a195bda0ef2ad2516d6a374d10bd95 SHA512 289c25ddacb017aae7407da80b6ba50a40e69fab568e7e5dd6fc40970fe52260c80fe8f666114bce7e561b77b274722474f6d927d6e3994145a914746d651fda
-EBUILD breeze-grub-5.23.4.ebuild 404 BLAKE2B f56fac7bd9f2f4af79a51d606d0d646d81551530c3af69e13a98928afc8c6b14dc3ceb6dae3c4be4a2fe37f61e24c4ddab88fde0bb934593b10f94a7e124fb95 SHA512 70c16c418794b8531a329d6ee3c1c67ad46fa0421aada4e4f944530b777d06737bc3c7c099c5b75d178d9ca6d55418f91304b23f21772d0dddf28d6e2d661ab9
+EBUILD breeze-grub-5.23.4.ebuild 401 BLAKE2B 9cde80ae6be6a89ce4f79d242593049449421a6a463d221f723281d37435e70cc7a4f5afa98d0ac58faa9d1f0b833e84e4a195bda0ef2ad2516d6a374d10bd95 SHA512 289c25ddacb017aae7407da80b6ba50a40e69fab568e7e5dd6fc40970fe52260c80fe8f666114bce7e561b77b274722474f6d927d6e3994145a914746d651fda
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.22.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.22.5.ebuild
deleted file mode 100644
index 4928f6df65ef..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.22.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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.23.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.23.4.ebuild
index e05a4cd33bed..4928f6df65ef 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.23.4.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.23.4.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 48d305c8f97f..9eea2f1e33e1 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-gtk-5.22.5.tar.xz 47424 BLAKE2B 0252cad49e10153c99bffdf6ee355057d023bd867b53b7ce9f67c72808a0425efe5a8ae845297f0c1f558d7e5c33299de417fac78589001a59f0b863669153a8 SHA512 91ae3512ce71f04a7694e439b763b99faf10ca43af1b68790ae6822b481e43a769254add15fab01d9b45a5306a50ea5d59493638df9d6ca526dd8c2d54126c9d
 DIST breeze-gtk-5.23.4.tar.xz 43560 BLAKE2B 5d7e89e7639b69b01595852d20aecb1714be0ec27b8732fac6507b326372716254ecd29373e2f6d2d890a10430bb298cf9d033aa5d7c8c7bb405b49721e4cdc2 SHA512 05b92b30a2cc25f930b2f8c54eb6068b1e74edab96ad5fd1c42ddf4eef81d5d333c59fb11747056b15da6cfe356666bb573d290055ab56fe3a2c940334d659ed
-EBUILD breeze-gtk-5.22.5.ebuild 797 BLAKE2B 993ac2356bd9337a5c9615df5a6b2f0aaa34a6dc0b3f98d62ec8f65219dc9a70b234fb470c8624bfe5b9c50ce6204712025c015d93935015cb0fc5bbdd5c4e06 SHA512 52a8b6727d4b485b6c66950912ffdb48a8455dc8cf2fed4f5d1c6cd53bad0ce7d01d355c401f5db48bc472d3298bcf2e542399a63807330aa41c112d96e82f0e
-EBUILD breeze-gtk-5.23.4.ebuild 800 BLAKE2B e68718ca68a5a8afeae3b0a4303981260120ae03a0210f4406875772922b11f8cdffbc51f55788a80a4344b21da1658b2035286992f9385f57e33e86c4b4be7a SHA512 c359e7b7e6fdf90cc9c92ea335d541a92fc4477339cdf0a70bb4e1a1b25e97a7f0cfdeecd0cf116b441404be8d9fa9a4bfabd8cde9d0f3945148ab5df950965f
+EBUILD breeze-gtk-5.23.4.ebuild 797 BLAKE2B 993ac2356bd9337a5c9615df5a6b2f0aaa34a6dc0b3f98d62ec8f65219dc9a70b234fb470c8624bfe5b9c50ce6204712025c015d93935015cb0fc5bbdd5c4e06 SHA512 52a8b6727d4b485b6c66950912ffdb48a8455dc8cf2fed4f5d1c6cd53bad0ce7d01d355c401f5db48bc472d3298bcf2e542399a63807330aa41c112d96e82f0e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.22.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.22.5.ebuild
deleted file mode 100644
index 706ef57ba239..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.22.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-3)
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~riscv x86"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/sassc
-	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
-	>=dev-util/cmake-3.16
-	>=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_configure() {
-	local mycmakeargs=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.23.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.23.4.ebuild
index 3a25f86673fe..706ef57ba239 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.23.4.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.23.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 6bdd66e2d65d..9b110660b2a3 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-plymouth-5.22.5.tar.xz 108704 BLAKE2B 278f87416c22b14fb9d770401ce2fba1dee963678a58c6127c42c8074eacf9191b9e35c3da6e63f6a5d1760ee2e68a25f54e3dd59b4c270b56a8fd43457bb9ea SHA512 be27a707952da3573562a04aa9fac4f31f7e125ad068aab9a216af51df7b53eea830fc3998113f9a9cebb7d9f915e00391c9012791e51d15482048d7eff3e016
 DIST breeze-plymouth-5.23.4.tar.xz 110552 BLAKE2B 5579ed55555e2dcbf41feb469d28ef208d1abe05ef832d00fd7436f11df0bed5489681bd1a2948369bc9e18815c5851abcdf2f981c83d6673de5d71dc654dbb0 SHA512 c4dcfbbe7b465f76a53ec99fb6a352a992c08fdb162568d7b533a67e7eacbb8607f24016e9f8acf6b0a7d68e220eef70c6602fdd4cc7cef5acd008253d074b90
-EBUILD breeze-plymouth-5.22.5.ebuild 515 BLAKE2B a63875fa117e71070166f67655220f021e2306ce138935b30dea7e69f4a136ad9296bfc4047cbd6b86c5260493c8a76e37fd492c01e1164eba3bd4bb49118cf7 SHA512 f4c47229926617b0f8bc9ea1a66c37160dde4a8911055712262de20d49c511408c1645938c39ca6460ad1a34516467df0f44ebda3c0a2b73bf1791eba7c3051a
-EBUILD breeze-plymouth-5.23.4.ebuild 518 BLAKE2B 691cc3516db545c478d863def31d82387fa8c718defdedab2e26c741b62ea7269326e293c0d6fe6da4668f341cf9ad5f0bafdb30cae4854dc892d5d966116c0b SHA512 64aa2c133bf1808f38d4ab385213608b821d8030185671628dafb19bf123c0d9d99d17bb5e47541a927ff8dba953da99192267b55867221e2db3476b8df91802
+EBUILD breeze-plymouth-5.23.4.ebuild 515 BLAKE2B 78c9e85bad01d28116932ddde13db67ad7b053b981cd244080c96db6985a843b5efdefbd6d200cd4997cad1032ef8145556d29aedadf2c64d2236cf6d53c480d SHA512 dd35e99c0dc2f26a98c6c748dfb2433c0069ffe8df150c5b523bc610c010212ae4023e61e2d05a65a543be911b5ccb5c50119bf9dba4c7e934b6f2bfa06affe0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.5.ebuild
deleted file mode 100644
index f5cd73b9ebd6..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.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.23.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.23.4.ebuild
index ec9a8ea4970a..9bae488c5c64 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.23.4.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.23.4.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 ef31774f5fc6..a254030fd62d 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,4 @@
-DIST breeze-5.22.5.tar.xz 34548108 BLAKE2B aa92a0ac1054043e3584bfa82d783d5798b54d29edbc953ed69731295b6e076cae31606f5262313f5dd9e2036c05f4609c43b1e064e8b2308e4e4d56ace21ee7 SHA512 b9cc95dfbc21097f289d5c463f788b51ecc9523e5361981241a08ee80028a5f72f9dba3fc019006ec934104323c9c0a4d80742ae60a12f3d00751f75cccac66d
+AUX breeze-5.23.4-fix-kstyle-crash.patch 1248 BLAKE2B 800d1e1015e6b3a1bb759d410e8982601ad0d582b912b76f5ed5280ee7a7550d61d921c3a46b11e177cef9004225c63a73e86ad2de342afc0342ac61d7cf7915 SHA512 d7355350ed98c648c150e300adc2bf8f0885bb3f64e3b91647f61f258703e0dbc41d2e046f31bac0384aa28c012eb381325e02df4a0992b4979f897ece714c2b
 DIST breeze-5.23.4.tar.xz 73813800 BLAKE2B 0821a0b484dac61c8c7a492248f9c9bc52abb347b0998a69567f931fd436df4c3f84fdfd7153453b15a7fb7015000012bd45c56d625edf8e952296748ebb5413 SHA512 5273100b059c58689028fbafbfc25f9d185f9b21abe011f8b7e8c9301c8b6d7f1846989c292709016b8c5c5edf627985f99968a809b779d46c23a7c7f773e913
-EBUILD breeze-5.22.5.ebuild 1272 BLAKE2B 16bc96592da6d84fbfe8b5ef73386aa7cefb10499c67282641f74a475628bea30fb3f8c1a1258e3795fcd2266b73f8a9271a82b3823c1a43a3d838e9f4bcf2ba SHA512 65d6702cc8efb303f69022de57ba4afd01937d91e4d03635443c642a88d140f540c393847fcb9d1086455e6dba89f0b334f75395c07b48b7c2538fb5b760cbed
-EBUILD breeze-5.23.4.ebuild 1275 BLAKE2B 23b8ec56440a3ce14de9d07baf95232297301e78e99b912c8298af1391e91cc81e383ba82d7432bbf1e7f389a610abad5fdf5c6b9bab3ee38868e5c23c26d8c2 SHA512 c2c1f9248c8c7a40754b9487f38334caed15ae05a48c58043b13cbab8dd2795552fe9a4851338c22fae40bc21c20a6105a7561039fafce9abacd0f02841828dd
+EBUILD breeze-5.23.4-r1.ebuild 1327 BLAKE2B 02c4640398300ee12ae1a704e5017ade484ea0ebb6eec911075a8d5256d4265697fb9accd7657147b1b3a8bb7de08559797cb423176fd6d8aaa7f11f44adf8bd SHA512 6391dcf4f3921a017798f8b9d861535e1113c0136a07e4e10569229fc515645afe95675dc493c35f5ec949fe36e7a57fa740a252076f5f6747340db253bc5bd2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze/breeze-5.22.5.ebuild b/kde-plasma/breeze/breeze-5.23.4-r1.ebuild
index afeb0d84c6cb..adf3225d6dbe 100644
--- a/kde-plasma/breeze/breeze-5.22.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.23.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KFMIN=5.82.0
+KFMIN=5.86.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 inherit ecm kde.org
@@ -43,6 +43,8 @@ PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}"/${P}-fix-kstyle-crash.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package X XCB)
diff --git a/kde-plasma/breeze/breeze-5.23.4.ebuild b/kde-plasma/breeze/breeze-5.23.4.ebuild
deleted file mode 100644
index 76a474649d74..000000000000
--- a/kde-plasma/breeze/breeze-5.23.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.86.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv ~x86"
-IUSE="X"
-
-RDEPEND="
-	>=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/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/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	X? ( 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 X XCB)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch b/kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch
new file mode 100644
index 000000000000..1d714c7aa6df
--- /dev/null
+++ b/kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch
@@ -0,0 +1,35 @@
+From 2aa08ed366917b7b207842844b78e5dadd5a06ed Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Sun, 5 Dec 2021 16:50:10 +0000
+Subject: [PATCH] [kstyle] Fix logic error in
+ drawIndicatorButtonDropDownPrimitive
+
+The current code checks for !complexOption, but then continues to
+de-reference it in the second clause of the statement leading to an
+inveitable crash.
+
+I assume it's meant to be an `or` for the latter part of the statement
+to make sense.
+
+
+(cherry picked from commit b09dbd9282f848e779e74840a5a3ef13c71fa82e)
+---
+ kstyle/breezestyle.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
+index ee06f41c..1337d26e 100644
+--- a/kstyle/breezestyle.cpp
++++ b/kstyle/breezestyle.cpp
+@@ -4024,7 +4024,7 @@ namespace Breeze
+ 
+         // cast option and check
+         const auto complexOption( qstyleoption_cast<const QStyleOptionComplex*>( option ) );
+-        if( !complexOption && !(complexOption->subControls & SC_ToolButtonMenu) ) return true;
++        if( !complexOption || !(complexOption->subControls & SC_ToolButtonMenu) ) return true;
+ 
+         // button state
+         bool enabled = option->state & QStyle::State_Enabled;
+-- 
+GitLab
+
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index d7acca858415..126b76ce28da 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,7 +1,4 @@
 AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d
-AUX discover-5.22.5-no-updates-kcm.patch 925 BLAKE2B d1f5c52c3d9b47ae108712aad1e55621ae5be9d1ad5e97e3d907d0003e6c59b5296abaf1a79a05865598e71156e1fedbc5eb843c1f8a4f9058dfe2d4fd81b29f SHA512 03d1899af2c61465f9d8da050c55b35620c1624bc1fa89970fd73a490aaaa5d1e957b38cf0678a914598ddecf76dd762c1aa614a21db5ced10c06e50c8f5dfd8
-DIST discover-5.22.5.tar.xz 8462332 BLAKE2B bf5cadfa928afd81fc8bbd5c1b7c7e3251874ca384fc28fa1e0bad7ea0feca996d1b0c2378e2e1561a0462bdb6e15b4764d3d9a43f44b808b7e5be9b43608465 SHA512 7c4e5c17897dfabe306cdf5a2a7fa02639658a59e06b3623fdc1cd0f6b394a0861511016318e8cf62606261d102e0555b240e0b708b1870f8cdae96553cef912
 DIST discover-5.23.4.tar.xz 8237056 BLAKE2B 734c7fd44cf01d958fb9f6a4eb64192b0e608c75c58d83f20f64407762ca69ce4f9c90f538c0a1447e06853fb99952ce860d8d0e4a94071a1f6aae2514449764 SHA512 a2f36b80d14b72c3fa79b0bf1a06f61e66d4363c2167edcf862be97ce7d607ab7c5fad021c4317eee7c339730898e4a87817abeef538b498e08a050edaedd2b4
-EBUILD discover-5.22.5.ebuild 2344 BLAKE2B 2cec026b1669b2509e18fa1c8800662254ab1dab756b9f42f2e7a25da58dc4e326bb013dea9dd2589ed23e9c041dd41ddcacc1b3360f9823939733f639675199 SHA512 b59194b3b5b28e4c88e0b301eafa80d31a55143d1f5f7f022a05de591a6112040860fe3937345c815e25b53e7d2ed95b335137e79d676e8dd8ad1045e955e405
-EBUILD discover-5.23.4.ebuild 2297 BLAKE2B 829364d324271168b4c04e27f933e5c594676412d6efb19c67b650b71dde25783dc251dc445040398938e5264d74aebdd9f8747ada252beab49146656fbd0481 SHA512 38dd90840ea9ebf724482e4596afe0f9b73c1b7216cc8693d9d21fc0939c385a8e1737e036315a8e0ebb5a0400726c19b3051e8db2ed93925c04d9464779f384
+EBUILD discover-5.23.4.ebuild 2294 BLAKE2B a12295383f1dd23634f157fc7b09bd62a9869775707830018f3bcffbe6cbbe76416c2daab567d90cb29dabad8f3748b39001608134fc595be4497f50048b1407 SHA512 2bb0699146605a1b62c7ba5a38ac5304157ab4739292da7eab8917b72e7177c545a80c4c8a3902047d1fce53ea56788e483c6012610f67330280e9e829db1c62
 MISC metadata.xml 537 BLAKE2B 3f8ef5cff5aba41680b677214f13254460b589b01380bb7c569f0f4cd011d046f76efaab48eb3f36bd0f13ace05845e670223e34b12519c3add4f0412443c792 SHA512 68b34b02c8f1b9a4c41f4aa5b2c2ced838bf65854b7cf15286ee426290f80fff4065ed8fe86db1aec62329778f425b0f9dc0e69c08db029910cd43136aca1d9b
diff --git a/kde-plasma/discover/discover-5.22.5.ebuild b/kde-plasma/discover/discover-5.22.5.ebuild
deleted file mode 100644
index 72f770eee56d..000000000000
--- a/kde-plasma/discover/discover-5.22.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.82.0
-QTMIN=5.15.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 ~riscv x86"
-IUSE="+firmware flatpak 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/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}: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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${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-1.5.0 )
-	flatpak? (
-		>=dev-libs/appstream-0.12.8:=
-		sys-apps/flatpak
-	)
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.21.90-tests-optional.patch"
-	"${FILESDIR}/${PN}-5.22.5-no-updates-kcm.patch"
-)
-
-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_Snapd=ON
-		-DWITH_KCM=OFF
-		-DBUILD_FlatpakBackend=$(usex flatpak)
-		$(cmake_use_find_package flatpak AppStreamQt)
-		-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.23.4.ebuild b/kde-plasma/discover/discover-5.23.4.ebuild
index ffb613b84536..8974e25183c2 100644
--- a/kde-plasma/discover/discover-5.23.4.ebuild
+++ b/kde-plasma/discover/discover-5.23.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="+firmware flatpak telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch b/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch
deleted file mode 100644
index e2c21ac1b997..000000000000
--- a/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 725ae1f2b9d4a8995881faafb323c541ff6d3c1b Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Thu, 1 Jul 2021 22:24:40 +0200
-Subject: [PATCH] Make building updates KCM optional
-
-Some distros (such as Arch) don't support offline updates or automatic updates, so the options in the KCM are misleading and can cause unexpected behavior.
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fa27fc77a..26387b2f0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,7 +53,11 @@ add_subdirectory(libdiscover)
- add_subdirectory(discover)
- add_subdirectory(exporter)
- add_subdirectory(update)
--add_subdirectory(kcm)
-+
-+option(WITH_KCM "Build and install the updates KCM" ON)
-+if(WITH_KCM)
-+    add_subdirectory(kcm)
-+endif()
- 
- option(WITH_NOTIFIER "Build and install the notifier plasmoid" ON)
- if(WITH_NOTIFIER)
--- 
-GitLab
-
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 8c8d45401889..09c8ee24355a 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,6 +1,3 @@
-AUX drkonqi-5.22.3-unused-dep.patch 954 BLAKE2B 8daf7abdd007f0c4ba8adc1173dc314c17bc0144aaa494076d1a031bb1de87ef33da9d9d322fd63582cd1b917383295479fdd3547ce1b1651a9f36b56ca5d0da SHA512 8b26d70986ef5cceb7abf83c36a12d3b17158d87fa3b16ac6814c17b0afbc6258dc4aebe9a630f6724ada6f41a9d3f5029cb558966b6dc01f833a91ce36ef7b4
-DIST drkonqi-5.22.5.tar.xz 780496 BLAKE2B 2c9e6dc22070027d8c7864e4b6e74540bbeb09affaab491c1effcf47000edd6cce0cc454ea00c2ff006a7f871ab975c88da1d2416705b6e6e73ca1c3c1e5c9cc SHA512 a37679bc7d365fe194ba80d1254631aba3cd5811c2a4b97c1327f7f5e91f2e095b83b326f1a4dd0a85976e98f7392ae78db03ee383cea10d37ab5a0a25a3cb48
 DIST drkonqi-5.23.4.tar.xz 793452 BLAKE2B 52c3f321d1995c8ee9707f8f448b788061c6656fb40a528247b7828223cd7d80d77cb08517c3217b7d7e1526c444c1be5320b1fd2abf75ca2b4376c009734040 SHA512 75d0238444bed2c2e105fc8202a6a8a2b5841baa9e397135dd2b37cee247c3e397bda0828fca6939abf1e2e8415a9aa22029fe98363e47edca5bf22cc7b7d828
-EBUILD drkonqi-5.22.5.ebuild 1392 BLAKE2B b44d8eeec0c026dbd6c16398c23968eed4caecea64434d4d0648118b92cea6a3c5244455a319f56c64bac14b415104db3750cd17b0d220dc6dee98dcfbbfd15a SHA512 24c37a397bf033cfa2f478a4da3d8cc3624d2a802de4478c0f351ac7c813a3a2dcd0794ef905851b8463ff71c1eb57693d3795c75dadf17dd3e5ceee4ebd3c0d
-EBUILD drkonqi-5.23.4.ebuild 1338 BLAKE2B ede2b772ac418d321edcbf50dbdb64bdf6dc40a0a811609232af158e872cc2287ceac1a7bb529efb760a07eec92d3c15b45726499ccecbad5fc81f7d92b54c5d SHA512 4e07c687ea050fe1081341e1ed96905b14245a9a8f32e853460f4e71a6331976b529ec351c65d00c04965e826c3ee82cadc96a944f25cfdaa30ba749601de26e
+EBUILD drkonqi-5.23.4.ebuild 1335 BLAKE2B 565b2b991ea4db1c41172542857f1f4175f6b0996f1263e6434f6fee90b29e46e28074647b8ae1935490dd8db9e58772ae3d7d15fc17f139a6f17ccb29bd5436 SHA512 986ff1f35356028087c1f8c18102db7315aad0998d8005579faef541b18c882238338ea99f0cd518130ad04998040335675d7bbfb3e7abff57ff7dcbfba02eeb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/drkonqi/drkonqi-5.22.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.22.5.ebuild
deleted file mode 100644
index 3fe7e2fb89d4..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.22.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE=""
-
-COMMON_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/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/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		sys-devel/gdb
-		dev-util/lldb
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.22.3-unused-dep.patch" )
-
-src_test() {
-	# needs network access, bug #698510
-	local myctestargs=(
-		-E "(connectiontest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.23.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.23.4.ebuild
index 8c03ecd357f4..a732021c8875 100644
--- a/kde-plasma/drkonqi/drkonqi-5.23.4.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch b/kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch
deleted file mode 100644
index d34638be71f5..000000000000
--- a/kde-plasma/drkonqi/files/drkonqi-5.22.3-unused-dep.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 59dceeb53196063c568201d0c567bea7887b1cc4 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sat, 3 Jul 2021 20:32:11 +0200
-Subject: [PATCH] Remove unused KService dep
-
----
- src/CMakeLists.txt     | 1 -
- src/statusnotifier.cpp | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1c176188..6ec2120e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -96,7 +96,6 @@ target_link_libraries(
-     DrKonqiInternal
-     KF5::I18n
-     KF5::CoreAddons
--    KF5::Service
-     KF5::ConfigWidgets
-     KF5::JobWidgets
-     KF5::KIOCore
-diff --git a/src/statusnotifier.cpp b/src/statusnotifier.cpp
-index 41271874..c5f795c0 100644
---- a/src/statusnotifier.cpp
-+++ b/src/statusnotifier.cpp
-@@ -17,7 +17,6 @@
- #include <KIdleTime>
- #include <KLocalizedString>
- #include <KNotification>
--#include <KService>
- #include <KStatusNotifierItem>
- 
- #include "crashedapplication.h"
--- 
-GitLab
-
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 3cc02d748a2f..5c4f91c55f78 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,3 @@
-DIST kactivitymanagerd-5.22.5.tar.xz 103668 BLAKE2B 5fb63f387dcbf45f3e7be7818932844639dca88120096dbccb3629dfc823556cae29f4fa1c0ae9795e233ea2e56edb921284dd54f2117275691bee735ff716ec SHA512 00f5a071fbfb7dc4bd2dfea3c811f359a416310385a2d1e107ba8b7bce8449676c39ebd6cd02f2cc22776fde3f2d0ff9d6ff635bd0a3c408a0ee17e31bfb02b0
 DIST kactivitymanagerd-5.23.4.tar.xz 104468 BLAKE2B 631e08b007c91d3b1ebaf1ef7b9741e362ea49a70161eb772d14761c56e9575729495328bcfae06259f0616b7fb971b8cce0e24fc2b4b7a74d4b8d1cbb34ef1a SHA512 fe1b475896fdd21b27cdb5c461df5d89f751faaeba4e7d5f91433dc54fe3de4bd14285c4575b288887fb5f6e49fe5df2d9069fbbfe32c94369de180b25eed3a5
-EBUILD kactivitymanagerd-5.22.5.ebuild 916 BLAKE2B 0f5d910e8cda5ef80ed9eeb966791ad686a1aed76708cec0d0bfe6a2ca97ab43ae91138288883033f026be90baeb9a9fd3b731a478a6c5bf13d3f4e864e87eff SHA512 f08ad2be616d0c649c5f34c5287d4dbc957d27bb30f5da8523687afe554ff122501c5ff7455727b4fa87e833771f68b34ada2d7ac0e2840184ab176b0ab86c8e
-EBUILD kactivitymanagerd-5.23.4.ebuild 919 BLAKE2B b151be1c39801e1a4b1aeed6d22f65a930236bce8d8830d4c2ef427a56dbfb717dc9d25cf4e44486cbfa78a5d074b32daba8927d6c6c9021d4dcd5519ad1ed87 SHA512 216843d196b9a4c932a413f1478c5261598822eead48c05c30568b8ff13ad12eb9a25bdddf67859d45279473a4693298c296e94bd0c8e9bf52d10d7c1640fef9
+EBUILD kactivitymanagerd-5.23.4.ebuild 916 BLAKE2B d44828107e9293589c4253a1060858c52734770e8e2cfd980addbcfc80d052f1416b98b7a538918319d6f072097ed265eb5d203d2a10ecd3ad585a96fc062618 SHA512 6620631425369bb4f90782cfcd746974db78e89d8b34aa4b00adbaee47bfcdbdf0d4dfe19fdb723d09f558275bf3ac279802f76ee8c0ff31c611c7065830ff1f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.5.ebuild
deleted file mode 100644
index ba0601edbc10..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv 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.23.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.4.ebuild
index ad18b9fd8faa..1de5aa1676c4 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.4.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 5764ee21ff7d..d8fc2408b16a 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,4 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
-DIST kde-cli-tools-5.22.5.tar.xz 626212 BLAKE2B 78bf7bcb14b101c6bc5d135b16e8a74c7d1fe5485b60b6977c102210840ae908cc9ef76e5d9d7f3278c8a3fa976013ba135cf47866bb05511de7dd53270876a4 SHA512 bbaca46ea389148f994ceef0ef0c55623ff739b3119fe6eaf967b315d3086a4e06c6c44aa065d44bfeaaf6768355774fc7b9398ea9f0ce4ec5d9fe386bc41fb9
 DIST kde-cli-tools-5.23.4.tar.xz 631892 BLAKE2B 18a1f5cab4b7e106fb1f4546faecf89ca25403c40d1878092e988dcd454462508e918464acc207f36d9236bfead061b8386c7887dc467e19f36ef5feb571ca9b SHA512 ff7fb345ed5506452417ad1273999e03280b4b630e5bf2af11ccb9722c71620003943e5764848e3a6b776e77943c100376015f4b7d3ff83273e7944d7e6c602c
-EBUILD kde-cli-tools-5.22.5.ebuild 1727 BLAKE2B 68c095a92071cfec56af22da4adb0e8a232bb864c005d87d0381dec6a8fc3873a822f0ab7ba767e9127585637ae32d6a10d4aea00888ea9f005408399a1c3a2c SHA512 e4abb4444b5c9fabe0111baa7a1fb6ae66dbee94dd755a8e7ba15063aa08d92a07aa45a9553df44fca75e824c2c32b88eeaf2601aa9af767af660b8062fd66fd
-EBUILD kde-cli-tools-5.23.4.ebuild 1730 BLAKE2B d2ca5a154822755348368094201d4826b903c2b95f5b366a8c0e576574e9ef2760c04c67cd502bed9e3fb5a66b686bcb89699bd10248da451c9e11ac508488ee SHA512 357c5ead191a76122d77cf37711d1a7f473796d7d4f64ef6a6f27082ec4c7f28c37096d1822b9087a0fa733ac6c469fe6a2deec97146934d1b13189426aeb4e8
+EBUILD kde-cli-tools-5.23.4.ebuild 1727 BLAKE2B b0c8d23c12098c85b9b112bbaeaf4c41a7d64c0fd208d02741b61727bcdadc7f28610374034ec17f0d70d73419d96a23268590772558bbaecd271d0596810d2a SHA512 7120d6798cc3bab4c35663a74e40645822a037430f8dbad8de256ba75d1fb13cabffbcfe45bc10fc53bca734f7af6d37d531ae8a21345dfcc73320a0f774e21b
 MISC metadata.xml 422 BLAKE2B 6c7e36778e4ecaafce86d11fa6e70a86c064c654de467a57f9b5d181d720bf0a90c02655131be794fc271f6664764fe79fb7e29df622cdad67cd69bf67c3d39c SHA512 41cfaa9753dba1b53c1a2fe0cba54c1bde6982180d96841c057f2a56ecbbe4000d702141ecef493ab3d1a80c53520363a28d0024ad2619b5642e740927c7e4f1
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.5.ebuild
deleted file mode 100644
index 0469158c261e..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE="kdesu X"
-
-REQUIRED_USE="kdesu? ( X )"
-# requires running kde environment
-RESTRICT="test"
-
-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" )
-
-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.23.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.23.4.ebuild
index 656d0a4e757a..8411409083d2 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.23.4.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv 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 fb4cc4f294ea..f58400afc371 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,6 +1,3 @@
-AUX kde-gtk-config-5.22.5-drop-gtk2-dep.patch 805 BLAKE2B 262b3d6e644b592d3323609e8958c189b217663a0e6653c82aad57ea85c266d068dd0d4166a2327c33a325fc251549a8eee2c26a45a8fd21800f14a0e2b05ef6 SHA512 8e418333f286f7eb74a6bea42d6c63794ff58520c17b51a0eb5436d753f8af727515db45e12d07bb393a2e0ea4b8562830f6e0708bd0eb2285c8f839e025591c
-DIST kde-gtk-config-5.22.5.tar.xz 71064 BLAKE2B ef1f1d40ae76c526af164b6113e6ff2aa09a52eaf7434a7660062c26a25a18461f83dc7e31d974ad7c46908d80144611df6f970b1fd9d2fa7e996f62b82f7d30 SHA512 76d2c3b56c29aa251087499e96f91b02b1190202d3e93d4895366d0a39abafac442dbba22b3afd79867c82d0eb35c05c8d2976f35762d9bf52c5a742a22c8490
 DIST kde-gtk-config-5.23.4.tar.xz 71084 BLAKE2B 36b77bb0ffdaff67594c7c3c0f216f0ec3c05f2456d8edfec501a99b9d441728fa80dc54a7e51a036ec21ee8c1222c4ee45914bd12d7d5dea9764588074dfd53 SHA512 de439e689292b2742858c326a9704bc7e39281c80fa4788d59c0ebe5f5a2772d1383b48f8b460c5a46aa105756fd2322c168ab40d7c0fc170c84af07e0ca135b
-EBUILD kde-gtk-config-5.22.5.ebuild 1341 BLAKE2B a9c51e830b7d0bfbcdf05d81c624c6e405f477562ddeb4d7987f1748995e635f16c664452e610219007ce3036bb3a58b8a28b0787d8aba1735227693b604a599 SHA512 f116deb44930d8db0aec3d667a86dec2d7934aff31c19baba87084531da6faa48e75dc5ac3b4ef2a71740d9c107f3fbc2cb7a801983140bce63ab16f0ccf7b63
-EBUILD kde-gtk-config-5.23.4.ebuild 1284 BLAKE2B 64c73ba8c29aee496bac4fe68de51518fbc109d79fb2e50133ebd6903e8711ec8a51a719790cfbebe49d3a12d9ed284d05e536c6d78a73464df80bf34a5154fe SHA512 6ed80095644a04078857a77e9cd9f363767ef08a8f99fb896fecb2cc6c3327f1548eea734c72841e12a2fee007c5ccc0a4cf70e8cc22a207975153af2191b4cb
+EBUILD kde-gtk-config-5.23.4.ebuild 1281 BLAKE2B 1359fb21d893dfafc493bbbb697512dc1f722c42af17aded27ddd027ebb453d965dab5f457239b2ae22c8bee0a5f2ae37cd74b034e51490bf2d74823f9a7af7a SHA512 ec2586d9864b63cf56f8aeb53f838693ce27c760fbb679e23e064958bd16ee665b02ffb1172848203a849de49ecbce0a948c303fa43fbe46642ade7524a45077
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch
deleted file mode 100644
index 77831e3ebb21..000000000000
--- a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 090cfb2db4bc9c032cd7a7c12cf2a317c248e3c6 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Mon, 2 Aug 2021 13:52:38 +0200
-Subject: [PATCH] Drop unused dependency on gtk+-2.0
-
-FWICT it's not actually used anywhere.
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 45d02ef..f102642 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,6 @@ find_package(Sass REQUIRED)
- find_package(XSettingsd)
- 
- pkg_check_modules(GTK+3 REQUIRED IMPORTED_TARGET gtk+-3.0)
--pkg_check_modules(GTK+2 REQUIRED IMPORTED_TARGET gtk+-2.0)
- pkg_check_modules(GLib2 REQUIRED IMPORTED_TARGET glib-2.0)
- pkg_check_modules(GObject REQUIRED IMPORTED_TARGET gobject-2.0)
- pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
--- 
-GitLab
-
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.5.ebuild
deleted file mode 100644
index 58aaf0fd540d..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Syncs KDE Plasma theme settings to GTK applications"
-HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-cpp/glibmm:2
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${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
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	x11-libs/gtk+:3
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	x11-misc/xsettingsd
-"
-BDEPEND="
-	dev-lang/sassc
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.22.5-drop-gtk2-dep.patch" )
-
-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.23.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.23.4.ebuild
index 8ebcf8b1fc84..8c9b2ee38654 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.23.4.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.23.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 46833d5120fa..a4554beff2af 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,3 @@
-DIST kdecoration-5.22.5.tar.xz 47256 BLAKE2B 20b173e3364e0d40cd864cc985ee1d5a27ce8103cec7d2006e25117c231eedd6e6c6f42cd1144df1674bb809d334ad3b90b71ac588ec6fd2bd6e4a2641681b84 SHA512 cbb707cda299d8f2938c63a382e1ea65853754a130711ac4df16300d16b7d215a1d7150faabae04c32ac8e79218739cb9493fc481921b65a0c188ae66ebd7beb
 DIST kdecoration-5.23.4.tar.xz 47400 BLAKE2B 8737415204324b62593a1004da9c3caac360201a7ace0c05e87662d5e1745ba1757cca9f121c7f9a42cae5f5491d093c1787726628ad43ddc48303599e8b4c19 SHA512 17ea89c7eb0cad35b46af401ef2e38243a711c5ee9f3c26b86bec65dab86b26ac19a8d29fe523c45e3f8ed7908f3fb3515e58a15466cd9f6e879a3c577667ce9
-EBUILD kdecoration-5.22.5.ebuild 486 BLAKE2B b609acd134352da7a52ae9a77d763e3c2fa351ab3a82af283360746598bbe3ec28c7e22982efec484a5e7b8ddec3839797b5064afe3b738ec065671fe7ee36bb SHA512 50f491d2e9ac866577b8f906a0e766ed8f91fe7c8e563bb06485c3b987dd63d7c6840d3c80138199ac1d0c28c008a310aecd37124f255db3504961cb3a562105
-EBUILD kdecoration-5.23.4.ebuild 489 BLAKE2B b8a1ca515c11f956d4a29562d2ee3964b55b9b251721b4fe657319c98f19ad42e7c517c601f182c1f1e36fcdb58829b01dffcdc4ce6c1ec07f6ab1c834452383 SHA512 d72f5df2b3ba93df37de2fb3d7b286af32c8bbee884b1d650fe42c5be546c12d412612ab48384bf55ee63a30c1e677f92553a7b9c8bf789cf5ca99163426635e
+EBUILD kdecoration-5.23.4.ebuild 486 BLAKE2B afe894ff8c32728e038c3f7b6eb7c9b46364349003f77394b69fecf3fdc9b5ccf9144cc69b2cc2346e100e016b0d562d9c25a9f82e1f09cc814b448ba42122ee SHA512 185c1ec66095b678a98e7c04b29ff2e83e301b5df0e54fc58456aa1c5f35b51d145e22637c3b856fb0311876fcbc93ef492685cbc94b1a37269c1fa74e905644
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kdecoration/kdecoration-5.22.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.22.5.ebuild
deleted file mode 100644
index 05ca73c822e3..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.22.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdecoration/kdecoration-5.23.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.23.4.ebuild
index be4395b9d913..0415eb552f9e 100644
--- a/kde-plasma/kdecoration/kdecoration-5.23.4.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 724d3752e449..9d4664082a70 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,6 +1,3 @@
-AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
-DIST kdeplasma-addons-5.22.5.tar.xz 633320 BLAKE2B 12cb41ebbbec6a6bbb65bbac55e856951cee7249acbc5e9228fddbf3d844066c6a674dfe45242d63b4e4b1321955c547c349ec735a966bc7c02ca38eb62c2f03 SHA512 7915d20808bcceea9451590723abd8f20fc2eb33c6b1346cf1b0971c69360eaf24ad72b141d15bc102090c1dc3f82f8c0e7398cfdd41b7452dbf57af2da87803
 DIST kdeplasma-addons-5.23.4.tar.xz 628708 BLAKE2B 687ee4f9b68e6521d2165d7b9d570facf786c4b8c9c9d9de98b20533d6b43d197e7b9682de645a09de80e6e28f87120f6b446a86b0408ea7c5ca865413311391 SHA512 03e2db5e8875832d2d430115ec34f5eb86467167f56e09795bcf1595742fc8dc45e61cb88663ab7b2ee65188d41ae81b08b692cd50291a336a0e9c297f028b80
-EBUILD kdeplasma-addons-5.22.5.ebuild 2084 BLAKE2B 29a9f5295f402b6c3220aa25e3fb249aa797bd509d31ab855082b1d0434619f6b9dfde61d06ed62ffc4d7402e0a6d6b8c9b6145929d3085dbfdba0f406a4dfe2 SHA512 7aa1e811550548f3d3a550bc1325c4c5ae2b9b7aaeee4b117c78701083380168faae27bc84fc4c83623ef59ad0d2bf8a9c4a0a225642268a31e5e669401fe2c7
-EBUILD kdeplasma-addons-5.23.4.ebuild 1912 BLAKE2B d8af3d1a19e434fdcaee6f10ac04d60ba612e7863f3fbc63817439ca8efc9715aca64e47041eaf580060150a42efb669763f21e40fa4716113acee4e7eef8f41 SHA512 d7c21dd3b6e8289a4ecea9503e587e0014b4b3e81cd43843a17cebe7b0451e0a3abf96c56fcd3156e3799af8a29eae1d6d512dc23a8404d560375d497aabfd74
-MISC metadata.xml 636 BLAKE2B c58a6f828b6e74e39343a6bb50c4563dac6615236d18ff1e81d6dc4de6a204e089886bd5ca8394242bb03860832edede323071721bdec55bd447247fe2c04f86 SHA512 af527fa0329ce0f9c61bd9f01d56389a455aa8ab72bcb32f8d8f6ef91dac27d91710d4347e92d2d8b414a91755c1015cf700849286f6ccbf8416ce00dcefea09
+EBUILD kdeplasma-addons-5.23.4.ebuild 1909 BLAKE2B 780aa46277a60db0798febe3bb046da0bcedf27d1474850f0f8f797326025f55b0a1c38a1b8898d3d33e33ab32eda01e5948169fdbeaa98c01821311892db40b SHA512 0f076e8953c32ac373fe9f69e06e71a865ea500cc27365c67dc0c2d85c54fe7e12853bf23ca9e090c1098714b021bb0a7142d0ef3732e0087e4cf40e2f4a90cd
+MISC metadata.xml 534 BLAKE2B 333ea162901ad4e28de1fd55b40d5080a4d3383fa9af09a46363835e312a8ead0fde01ab762b9ab6930263e61ffb56dad2d53ee6167568cf683da48eaf3ad0a2 SHA512 9eb20a5a87713c865d782c8a1e009098e6db4dddf2ac8cdafbce407da995ee258274645445901f1a5c883202faf46dfca0f1dde5edbe45bd89e7509b22bfa0f5
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch
deleted file mode 100644
index 485acd542a83..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From bbaaa3e2eac712887780c0849f955889e64ff358 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 7 Jul 2020 22:22:13 +0200
-Subject: [PATCH] Make KF5Kross optional, it is only used for comic applet
-
----
- CMakeLists.txt             | 7 ++++++-
- applets/CMakeLists.txt     | 4 +++-
- dataengines/CMakeLists.txt | 4 +++-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c4697a52..e5d14bc8c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,7 +48,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     IconThemes
-     KIO
-     KCMUtils
--    Kross
-     Notifications
-     Plasma
-     Runner
-@@ -59,6 +58,12 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     NewStuff
- )
- 
-+find_package(KF5Kross CONFIG QUIET)
-+set_package_properties(KF5Kross PROPERTIES
-+    PURPOSE "Needed for Comic applet"
-+    TYPE OPTIONAL
-+)
-+
- find_package(KF5Purpose CONFIG QUIET)
- set_package_properties(KF5Purpose PROPERTIES
-     DESCRIPTION "Framework for cross-application services and actions"
-diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt
-index 93b637b1b..6af5ffc67 100644
---- a/applets/CMakeLists.txt
-+++ b/applets/CMakeLists.txt
-@@ -6,7 +6,9 @@ plasma_install_package(keyboardindicator org.kde.plasma.keyboardindicator)
- add_subdirectory(binary-clock)
- add_subdirectory(calculator)
- add_subdirectory(colorpicker)
--add_subdirectory(comic)
-+if(KF5Kross_FOUND)
-+    add_subdirectory(comic)
-+endif()
- add_subdirectory(dict)
- if(NOT WIN32)
-     # uses the command line tool 'quota', does not make sense on Windows
-diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
-index 8d91dd84f..38f715b11 100644
---- a/dataengines/CMakeLists.txt
-+++ b/dataengines/CMakeLists.txt
-@@ -1,3 +1,5 @@
-- add_subdirectory(comic)
-+if(KF5Kross_FOUND)
-+    add_subdirectory(comic)
-+endif()
- add_subdirectory(potd)
- add_subdirectory(konsoleprofiles)
--- 
-2.27.0
-
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.5.ebuild
deleted file mode 100644
index b5c194d2234d..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Extra Plasma applets and engines"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv 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/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/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${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}/${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() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Disk quota applet" sys-fs/quota
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.4.ebuild
index 87182ab6828a..28a9864b5456 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.4.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="share webengine"
 
 RESTRICT="test" # bug 727846
diff --git a/kde-plasma/kdeplasma-addons/metadata.xml b/kde-plasma/kdeplasma-addons/metadata.xml
index d16f4073e6dc..8aace809aa2b 100644
--- a/kde-plasma/kdeplasma-addons/metadata.xml
+++ b/kde-plasma/kdeplasma-addons/metadata.xml
@@ -9,7 +9,6 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
 	<use>
-		<flag name="comic">Enable comic applet (requires deprecated <pkg>kde-frameworks/kross</pkg>)</flag>
 		<flag name="share">Enable applet for quickly sharing data to a variety of sources</flag>
 		<flag name="webengine">Enable dictionary and web browser applets using <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 1c2a35594818..a4d7c357bd37 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,3 @@
-DIST kgamma5-5.22.5.tar.xz 83124 BLAKE2B 0c90174ca3108c469ab1f2d349d533ea3592864731901d84426a3d1135497729e8fd7705fea4efcf4a160d9b2232073f6a8864256daefd01043c14448a22bc9f SHA512 c04e2c291cc0dd0c5edda07cc4b6c921ba1f297899cde95399e0d4039cea2a9c5bc2b2da319de227793e8a40bcabba496848f0559730a6105d215abfe8ee6069
 DIST kgamma5-5.23.4.tar.xz 83136 BLAKE2B acf93b0c21cfbd21fcc5113dd28a45bd041c30a18c0cc492e5913f8e2b06df4a3268b64fab75af2c6ef3136fb4f05723f6089ae18454246aea2497f25e3eb5c7 SHA512 bfc36ca07b39dd6af1bbf7c09f1648f18d09bcf43946b97ff1f6f8344a50bcb1c04b8440448d77a0b5c89abec675cd5fed4dce1adc71b92cb1ae76159ad59c07
-EBUILD kgamma-5.22.5.ebuild 684 BLAKE2B 4635ec9f686d2cedafa99e29fa17150df94cd00d61b9b356b6ad00e1b2b05c8ffc363398258d470a94d0ff4832b8d823c53cd0bd7b007958d988a83cb3b5d801 SHA512 ad14db94e63fab5a379a476935bacfb54f434d95982fe65acf8b6ff549aff4ea1e865558dbef7a69ff822777b1711ed8e27453b25babd1a69f0ca9edb78b4e22
-EBUILD kgamma-5.23.4.ebuild 687 BLAKE2B 10b298c90f672da962eb04c6f34742938db0652bbbe24d1e7f496dfe0d14f2ff19132c165f954e012a6c55d2eb45bd89ae28c9f1491aeff8e3ae891723490731 SHA512 3be1930d55c231fceed958bef6abcffb09ef8e5ec88c1177996045da184b4874f314234681b81715da0cdd8ff1b456f77121bd56b9d7b4d1ab00721d18688854
+EBUILD kgamma-5.23.4.ebuild 684 BLAKE2B d8bb8964d0fd4143e89fe09510f47ac40c32852bfa2e292ae68f06a451f50105896aa5a07f0a3fdb9b60d6723fe836bfd955e1b4735ce356f260ae6d8d316ecd SHA512 2de3ab545bc53556e24ddedc31589bcd8febab1e97b571af0fe24d947c2f79791d6f676c256d6e31089497f4886b9b3e21d7c20a86e7683647590d0cec177b8b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kgamma/kgamma-5.22.5.ebuild b/kde-plasma/kgamma/kgamma-5.22.5.ebuild
deleted file mode 100644
index e43ef2fee5b9..000000000000
--- a/kde-plasma/kgamma/kgamma-5.22.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_NAME="${PN}5"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Screen gamma values kcontrol module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv 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.23.4.ebuild b/kde-plasma/kgamma/kgamma-5.23.4.ebuild
index 9e840b337945..6f284e55c58c 100644
--- a/kde-plasma/kgamma/kgamma-5.23.4.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.23.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Screen gamma values kcontrol module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 1aa021bee4d9..0da0c66256da 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,3 @@
-DIST khotkeys-5.22.5.tar.xz 1859668 BLAKE2B a079df3082a6bc5147e8c3f9c63ebd155588c10bf752b27d22c3feac66aeb42229f194e47e33730643c10cc94132fb760061f6e5e6d035bd8c4f414951a63bb7 SHA512 de66cb92986c025ba0fd2b70eab65dcf25057e1a4afcd3616b7063047d0e41f2d80b780ab6a2d564e22be7bd4f9532e0c37c62c5e54bb6d9587ea95c363402d6
 DIST khotkeys-5.23.4.tar.xz 1851476 BLAKE2B 065fca99c6071a2537f1fc595063cbacfbbe5ade7d6db1a5c8f59f536e28d2311484d2e31bd7800c9ecb1fef41612fba84464c5bf21a9993f3bec52e7840b7f6 SHA512 34394d3d3c81b9018ddac2ceda5d354d82017d0ae6d6b56e19388a9dc698c1796a4490281008237584488522e153b1b33a5fe70cc4dc2423afdcc7d2e45c04a4
-EBUILD khotkeys-5.22.5.ebuild 1353 BLAKE2B 31ff0c5515ee7828310174c85c796ad99e568515de45a39a8669fd3b59df12d45744ea71618d6566ca6dafa6238adeabd7c2ac20413df8e5170197efbeff5d22 SHA512 b1875e9618b2dcfb3b182b4c1f0850a9f38b6d010a835dad44a91ec82ffd73e4a1df529a65d9e30b3f8b1ed09a662881aff56c38f57712241f1c3d4de9d37434
-EBUILD khotkeys-5.23.4.ebuild 1356 BLAKE2B 6cb4a8fa5f357542aa61912daab29f593d1ba0962d3423e29e08d93b1604b3a4edc60ba29a91d8db3efd36c2b7285a2eb2baed7e693f7b20e69965965fd9fa3c SHA512 3dd469944a0e56bf68619367403a7f8b936d0c3aa419a2cd6bedf00f94dde5f3cec6134a1b0856b81973a298a7859d1729d9a4c31ef1b9a38f4515483d5188fa
+EBUILD khotkeys-5.23.4.ebuild 1353 BLAKE2B 1ad390c9030d65595b9db157bddbdbed024e2f1de18db5a4acc5bbf8dd93937fef60aa3dbb51a722ad13eecc1a8d0eefb99990504ceaa76a9e3c3066d74beb44 SHA512 ed1bdac8372edd9fd42d7d4198f007ef368c0b1c54dd83daba9605f91714011114302d2ba08952d6996f545cb958290679bf857b630f53eec0a3928ce1376d07
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/khotkeys/khotkeys-5.22.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.22.5.ebuild
deleted file mode 100644
index 78eca7dae074..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.22.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv 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
-"
diff --git a/kde-plasma/khotkeys/khotkeys-5.23.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.23.4.ebuild
index 97b3c8d71f60..95f1414f8e4a 100644
--- a/kde-plasma/khotkeys/khotkeys-5.23.4.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.23.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma workspace hotkey module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index ee85464583bd..ce29198d5715 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,5 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-DIST kinfocenter-5.22.5.tar.xz 1170716 BLAKE2B 8e9cefdb426e9635928aa2b81359acc1e8b2113865b18109fa442efa7cd35684fdf911a39c3ce8a43c31afabced6820d6bac6ce31a5c00eb629f6a8462906a7b SHA512 7eaafde6f9a388e9d4cfe9a8f4057c462bf83f9fecdd39fdd96e05f4c5094c1a116bf66a781bba67721e63e8cfd5a8bfb32fb1906392c2acb70263afaa17c560
 DIST kinfocenter-5.23.4.tar.xz 1153160 BLAKE2B 8273d69e6e548f5b2b7bc95eca7d9fac204f6dcc1a3f26a1b496da926b241e11c20fa047f449255e3e6d31c61056d44e2b89301c0e6b9851312fb53bcda58962 SHA512 c3fb598ef27dc696d3763b5ca982b17d521999c5ebaa00484dfac120f1eeafaa41adc1694bc6f0cc96388eb56e83b015c80bc94a54af334d5e643730ad4485ae
-EBUILD kinfocenter-5.22.5.ebuild 2640 BLAKE2B 7c9240900fab2677818ef21f7ed7f467c1b39bc8db8c1fe777f88914f199a2e8609df176c17b2348e331ea8261ba7cc937c4ebb37fcc9ffa9e11750425cdf8cf SHA512 d2bf9570ffb7f759c96d4c42de3cf46ba6061854b9606740fe7c2be3596ddfc4a47e07a9fc0c7ef6964e945738d5413c1e2e7d07812e87ff0b043a51275ecb6a
-EBUILD kinfocenter-5.23.4.ebuild 2786 BLAKE2B c3179132642e7d8b73ed908161e92e37c1870d141e03b251f93f672a03abc39af004a021f00d45e0fd099d91d8a9a3eb06b6c03d3f0ba0e38d9bb56a29c9a4d4 SHA512 805ee119251c41ccd63cac8565094e734fb457c35d3d21df9031444c93e114927a2182737e378b55ba9276d039ef8da87ede0db56bc14cfc4edc99df963b28b4
+EBUILD kinfocenter-5.23.4.ebuild 2862 BLAKE2B 81c0d51c51324740e5bbe76ebfc4043ec076aefc98d602cd5fb0fd6a3d1fd489ac5a9bc452af14231a006e0a8a79f6d36d79c16ebb776b0d9ab5f0be54604dcd SHA512 6b72d7a8e13fb2a64b0b3945c1ac744adc96e9b1401ed87d1306ba58217bdd6606fbfd5457d48f9f6e86dfab57734ad267c602e14dd8ef4fc012f086e46dca51
 MISC metadata.xml 389 BLAKE2B 7775c88615433812927bd69023ba3943d13b1fadc77d1c8a84f286e0f7b3efdc34d3cd9b877cafcb3ae7ef9c0056c6a39d669baea5875707155d361a6024b1d0 SHA512 dfebb398a78818127260bc03d2e267c3feea4c54f2de6adec01868fceede532764a0f90559b070d4136cb6c1ad8e86cc98d832f340b3a0a687a41b0c354631b0
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.22.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.22.5.ebuild
deleted file mode 100644
index 1f8716c3d94a..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.22.5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-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 ~riscv x86"
-IUSE="gles2-only ieee1394 +opengl +pci usb wayland +X"
-
-REQUIRED_USE="opengl? ( X ) wayland? ( || ( opengl gles2-only ) )"
-
-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/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/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	gles2-only? ( media-libs/mesa[gles2] )
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		media-libs/libglvnd[X?]
-		!gles2-only? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	usb? ( virtual/libusb:1 )
-	wayland? (
-		>=kde-frameworks/kwayland-${KFMIN}:5
-		media-libs/mesa[egl(+)]
-	)
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/systemsettings-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package ieee1394 RAW1394)
-		$(cmake_use_find_package pci PCIUTILS)
-		$(cmake_use_find_package usb USB1)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X X11)
-	)
-
-	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() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "NFS information module" net-fs/nfs-utils
-		optfeature "Samba status information module" net-fs/samba
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild
index 8c0e917a1080..101c2ca7de15 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="gles2-only ieee1394 +opengl +pci usb wayland +X"
 
 REQUIRED_USE="opengl? ( X ) wayland? ( || ( opengl gles2-only ) )"
@@ -77,6 +77,13 @@ src_configure() {
 	ecm_src_configure
 }
 
+src_test() {
+	local myctestargs=(
+		-E "smbmountmodeltest"
+	)
+	ecm_src_test
+}
+
 src_install() {
 	ecm_src_install
 
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 805625ee5958..8a36e320c297 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,3 @@
-DIST kmenuedit-5.22.5.tar.xz 900120 BLAKE2B 7ee3f94e3b749a54f893913b08bebc4515f27422498cad0aa06a3f7e687c7da085db57d434a224c8cabf6e6d8da3dea8b1c35d262e8f3d4e1da3ef983e8b9c95 SHA512 f7516303c45e1f48a3b329ef3df23a33011ed5be57307811f8b9ef6d92c4cf82793bbb1fabd69db0ad8c2c7005f8c453391ae18dc27439fc3d4e1510e36b0049
 DIST kmenuedit-5.23.4.tar.xz 900584 BLAKE2B 7a41049a0f996db3d80172a874c2cb48c03db27cf5f88c5556e479d2e786d19368138b19eef02f45d05fd3300122998527a8c765863ef2f5afcc5136e366adb8 SHA512 a1b8ca7ae80a44b95f01765eab302d2afbcaf78e45417bfb3d5959030f9af2fde8f153d21dd9cfb6d67858767fe7e3ec7ddae757885ff32e13f5cf5067ef3c5f
-EBUILD kmenuedit-5.22.5.ebuild 1067 BLAKE2B 2328aa3684ce5e813b90b50de576109b429823b54bfba1a2f41cdd7d34f36ffdad5723669cf50942580775d90cae596d0aa935bc36002888a3b66096c0c8bd56 SHA512 3e14178cfdb6b0e0dffb1b3d5e811fc196b4982d846273dfcbbacfcf9f300998e8c4a4b5b63c4410f430979a42b34fc5bbf18ae84ee7214d143088e6f866c52f
-EBUILD kmenuedit-5.23.4.ebuild 1070 BLAKE2B b0c664cbbbb05bf4518fbca916299848b24d12422b58a0e24a81afb7742fb0835aa1185443eb015bd4fba495530d1b3b2089a8a28dfbbdbc351afab8786dc6f3 SHA512 00aca2766299e0f01ccabc76b39f3083ac15dcc19390e872484cc085417cbee2af3e5cfb9e13d6e79691982cb363bb2b9572a2bc9d969b99213144561ce99ca2
+EBUILD kmenuedit-5.23.4.ebuild 1067 BLAKE2B d307f2b4abee618232a05d085d137f71222a898bfbdcc79f28cc76aaa7704bf03ddd8ffa6888dbb535652e1e7c89fbfb925dedf6868132d4c0982b17736431fe SHA512 5eb165ecaa228153300afdbfdf37a4ec3689fb604e0022e6bddb22a743d2f85fd024cb7062c3e7312e34b52a53addf5d9733683461654bc31fca310941ea6d00
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.22.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.22.5.ebuild
deleted file mode 100644
index 43c18fca35a6..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.22.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.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 ~riscv 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}"
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.23.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.23.4.ebuild
index 87a9cfbbd331..d919dd508b3d 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.23.4.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.23.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index cb9d3e457564..068b46cb4e18 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,3 @@
-DIST kscreen-5.22.5.tar.xz 117916 BLAKE2B c965a4feee13aa2ae1af29feab9dcfc166a4d6ede547358902e5292d971909062095c3ece00ead0757ff1e50efb79e20cb2354c29ccf9b833be8ef81d1121a97 SHA512 c2be9546bdc00f83fe501a9cbd7b900b4201804edcda94d0632b8a09514821b52a57bf4c8db6111a6c1d54a6806a173d09d983b2e8d035cc98b57638a011920e
 DIST kscreen-5.23.4.tar.xz 134104 BLAKE2B 9de998665a825733fb3f17daeb1b0fd74a1703b384c0100c46779e1d0c074c79b01f512ae92eebbbcd8ef6ba258644108e2814fdeed74306e0221d850cdce0f6 SHA512 e7d8fe6caa394012fa876cf7dd41900617af6aa8efd48b2645483d1864e8a8c422a64f8d5d92b64a7bf6e851846ec728cb10b1c650098cffa6d93a772853b3b5
-EBUILD kscreen-5.22.5.ebuild 1230 BLAKE2B 3a48559a3b1ec7071c2af09f1b7677da852c32cd688d6e886f13fce59514686aa5a6618ab373d00adac9ae6d21f1c59d88e67ed9bbe82d444c16a938f70eeb87 SHA512 30cf35eb0bd7408c4edf2be138ebdd1ed36ecc2c7e3beefc681fad22141c4c36c255eb0c05e61abae48f1cc1118387912c69ade0c527d91ab2e0a6ec332737e4
-EBUILD kscreen-5.23.4.ebuild 1233 BLAKE2B 0ab3c034a013377588bb9ece116296b49f903d1795c27863ac0c97a34e897cf31b0326bd6227eaddaaf24d483c9aea62734df1e858155044ce7f4f6ef0bdb9f3 SHA512 a258f0f2266476375d4e910b63e4ee319114e1b265ad74ac5e305fe7aa0861d25b08f8b60136d051ec6a793d51a494d13c44b4e48c847ef1e181c3deee25c593
+EBUILD kscreen-5.23.4.ebuild 1230 BLAKE2B fb11dd34940739c67cfb97714bb5cb4a2d71e222a7547abad84075e94da39eac9d83845da69fb74e7c89fce39b5224725307068d3c61617aa09177df2e52a2cf SHA512 954fdad97ee694a9d16727a6d51c2d0870672a989c660d0865bb4d21d5e552966c1b353242ffed73d695f4a3294d176c5dcaae3191604db38a4be9f2973437d9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreen/kscreen-5.22.5.ebuild b/kde-plasma/kscreen/kscreen-5.22.5.ebuild
deleted file mode 100644
index c67cf6feae68..000000000000
--- a/kde-plasma/kscreen/kscreen-5.22.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE=""
-
-# bug #580440, last checked 5.6.3
-RESTRICT="test"
-
-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
-"
diff --git a/kde-plasma/kscreen/kscreen-5.23.4.ebuild b/kde-plasma/kscreen/kscreen-5.23.4.ebuild
index d90b37272cd1..0f5a369f667b 100644
--- a/kde-plasma/kscreen/kscreen-5.23.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.23.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # bug #580440, last checked 5.6.3
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 5f21453076aa..a07b633960a9 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,5 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-DIST kscreenlocker-5.22.5.tar.xz 116688 BLAKE2B 8e4bba6e78910f37e6abe18130c634afbbf9be7bba2a6eb1a694badd376890bd16e96bc2e575f1468dc9c4cc0a9bb057bd5c1dc0c4a75e2e8feb9dd26caad3b4 SHA512 e2b467743f36271cf3eac2c7b593ae5971dcc3ab917af42480dbf782bbe93eb2f24cb600d6fceae5efc2ccd8e5ab3d6a76b921f189cfcec62c661d7cc1f545f9
 DIST kscreenlocker-5.23.4.tar.xz 117720 BLAKE2B 9b4178915b9d2fa33ea308b49417e4a2a33495054dddc8a0e8a3eb7b6465b81a8ba1116323b3e9392f192b0449287e0ff37624ebdb3311cf3423fb649c46d462 SHA512 a043cca755d266548bac5a10cdc812f7c1476d1a95f4ae17c475a4d6b74a3d2b2f2e67373e4c3df3d5299c3013394abe7fc8e7d79353f1d14073a06f4f6794bd
-EBUILD kscreenlocker-5.22.5.ebuild 2263 BLAKE2B b61aab7b36993b2ad7fd0e02f58118a47f339f7be5fee412eff406c40b47bfc6cf2fb6b942f218962dbb3edc069f62b8deb74e964247dc34fd0d13343c855a0e SHA512 fdb4d5a984c7fb9ab3ae1730503ca3232239763d8608cd8d716440fb5d6c95b638c00d37594396ce9459f68d06ee135ff62d4cd5d1ae43366688c7bbb7345a41
-EBUILD kscreenlocker-5.23.4.ebuild 2266 BLAKE2B 8e992b572d848e3f4d3d8805b33f96e1dd579a7698752ca02ac7601161634aaa307fe83ca2e5087b9a1d211727d3a60febb2f50989aef29bf305cda0b6df619a SHA512 a0987917fc6d9ba233280eb2a1aa83b265763c660c31b29822323bf14e03843c3f2d38b7942902cad162bd5a2710a3c54256dbd3d73c942448facc2805d63983
+EBUILD kscreenlocker-5.23.4.ebuild 2263 BLAKE2B 170be03ab695034974424ca0d70fa4a8e69ce139a7cec5de4d1a637376bb6e2bdc419d7c93a43e6d4602590eedcdc163ed5e9c9a4784412fb8ef3eaad9a076a0 SHA512 9e02b8d9440327b57c9817a28ee2879e595c1da04126b3c903c9970eab344460b5d0f10f4216359dbe2208e74198172140f555f508d2614d4962ddbc1fbbe335
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.22.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.22.5.ebuild
deleted file mode 100644
index 1ae99c84f64e..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.22.5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE="+pam"
-
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	dev-libs/wayland
-	>=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/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/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/layer-shell-qt-${PVCUT}: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/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-BDEPEND="dev-util/wayland-scanner"
-
-src_prepare() {
-	ecm_src_prepare
-	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-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.23.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.23.4.ebuild
index 0f53f43e33ae..edc1dafc72f9 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.23.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="+pam"
 
 RESTRICT+=" test"
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 618d678b36c6..77324490bdd9 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,4 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
-DIST ksshaskpass-5.22.5.tar.xz 24076 BLAKE2B 2625d07b18b5e1ccd98f5b34e402a4ea201190f3be240ea596e8b4c70f0a15204e7d5ea559a0b17bc253247eca41a988f65bb2e29ee07c2e35600d8a1f761b34 SHA512 35f430882aa735f1b9d7a1874f83fa67074cfb720bbba377d0b38baab2f3eaeddc1598f6f7b9c79479b95d22fdc661d7dfd6835b98a78ea159c68d64abc81a67
 DIST ksshaskpass-5.23.4.tar.xz 24072 BLAKE2B 559b49d49b18968a09a52b94b0e894c9db794a305e11d6507dce0860d2dd1851ec4801d630a1a8389d206823931670305e35daad81fd9da69aad7d5a29db8893 SHA512 1fc973dbb2a385dc6471f6928cd61d33ce91bbd414f8e2ce65e2d6e149828963675a8c4140bd968adeebf8bdf449cb92c1415f4963869eb9db5b9cc0125edb88
-EBUILD ksshaskpass-5.22.5.ebuild 1440 BLAKE2B bd31463f01b5247c0b832fc75df87992c1ce72f9cc88b85b1cbc9add2bf8ba34489d2e0f30e03e0220a7bbdf8eb235ab79df8834f901f0514cbd7c9c2b7c8eff SHA512 8220f2d31c415d7abe82f0952ed98e0b248fbf3e5f8887b93aecd1efb2632ad6f7f5da547ff49cf681d44a63a26bb1dc7e40683c03b4113038d60b36dd2becb4
-EBUILD ksshaskpass-5.23.4.ebuild 1443 BLAKE2B 9cde742f021639b9556046bb2d871369b63ccbf688ed6c85250343aaa2687015ccb53e97d38eff2138a4d472a2a471f14333813f6f4b423df25e3a0a0d3da2f3 SHA512 744a1b76c1a7339b35c11f99a54c04ac1c1da9378384d30c2fb6a80b5c896499cddbc8fcd9433cb71cff7c38e36fcd09dd124142eb3967f9c9cfd14e524ffde7
+EBUILD ksshaskpass-5.23.4.ebuild 1440 BLAKE2B 760158b54e3e8fefeaa607900ad8172cfb65c4abadaca94218d93afd464466b801f57560c14287ddd2b9055d8f1fa07b93b3bccb4a7184903583e6011ff08d85 SHA512 236ebb4cd26815471a4805b915f9264671119dc309fe0e0bb227824cf24eccb7e3ef71c0ed85ab9e24c7474610456ca71ab5d30e63d29b229a36862c7db8fc13
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.22.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.22.5.ebuild
deleted file mode 100644
index f77c6f18f0bb..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.22.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
-HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv 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}"
-
-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 dirs
-	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
-}
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.23.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.23.4.ebuild
index 618cd3f1026f..e181be3cca85 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.23.4.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.23.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
index 4535c641d998..0be637d20f13 100644
--- a/kde-plasma/ksystemstats/Manifest
+++ b/kde-plasma/ksystemstats/Manifest
@@ -1,5 +1,3 @@
-DIST ksystemstats-5.22.5.tar.xz 86240 BLAKE2B 397ab260be6d49174613ca4cd0a1611605a127a72641e53ec8c1f5f743b6799dac1c82632dc5830075e790f1184a10d283e2e5556b3d8a84c3dc59b5f5c36867 SHA512 020e5b9ab2768c37563ee8db8b6ec812cc86423f72629dbb777168c74a9c7a417db8b32e745d100ad1141a4915328ea9649d1d6a2e6eaa79e238f29fd336d546
 DIST ksystemstats-5.23.4.tar.xz 90636 BLAKE2B f03214ad13f155795438f02e667dcffbb47ce5ec94955349c89a869bae56a3c0f30fc895cf192e98ecef88608bbef9916f7193dd1ee900f13c0be5bc1407ffe2 SHA512 8570c39053556a61489db8c4004a52902593be1dff41d56ecf86aae105f2591b5c5a6ec2f60526ef3f5df74eb98d0655d5a4e2f4adfe7439a9f4aca886a46a03
-EBUILD ksystemstats-5.22.5.ebuild 1119 BLAKE2B 349c0061be78373396718a4e4f4ecb480ef74f517e80bf85b9164745ba0e592fcabe9d0d310608c6722a83870efc6ab0390a6633ce173f543f7f54d0d0ec6888 SHA512 dcce49a1e3c005e61a74318750a5e21ddcf77e5a46fd7f4eecb8b465b044b19eaabfbfe431b63470fa1dd529128d04236dd7bbbf1990d6614da603328e0bd36d
-EBUILD ksystemstats-5.23.4.ebuild 1048 BLAKE2B 7c229d0d29900a4994daf081cf036f58ef8e415e9fd040e0161cfbee0d5d5cb7f441db4a24a50a66c45c611594ef28c1e9f923c8945097741b778683562669f2 SHA512 301715f2a834f874211f7309f492accaa28cff22d6ce4c5385ef3960593c6595c06abd91321f42e6bc2fc07446b603671b109f4ab1ffb5716be2440e44ba8fa7
+EBUILD ksystemstats-5.23.4.ebuild 1045 BLAKE2B 820c3cb29ffbcac45e63009b4fe7253ecf90a2be2e26200e106ba54c9a7eb259974545f6bc23f11dd92b59785b55ed44ff2703db3ce2823d2a663bfb2e2f5d26 SHA512 3ad18df97455cf14d7af9023cefc4eec1abf2112f58b0d3d7151d6e954a99fedcc80b293bc214106197284c315eb1f690228cdeada1e3970609694d85889c800
 MISC metadata.xml 467 BLAKE2B 61ac6047a4cb3d54d26f963b75c94022a501fd1b1b9ee227cce16023fb40b101ba40c6ff99e02c5913137b191bd9c516249387b0310f6558c9800b10f52e780a SHA512 0ad261d9d2e7a45d01b06a15270346bf169a3a8d827b409616e3801e4357910fe196813dd87ff4bea34e61cce3931443d9b617ef532230448f54048d1ed84f4a
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.22.5.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.22.5.ebuild
deleted file mode 100644
index 0513b52f0937..000000000000
--- a/kde-plasma/ksystemstats/ksystemstats-5.22.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plugin-based system monitoring daemon"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="lm-sensors networkmanager"
-
-DEPEND="
-	dev-libs/libnl:3
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	net-libs/libpcap
-	sys-libs/libcap
-	virtual/libudev:=
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	!<kde-plasma/ksysguard-5.21.90:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package lm-sensors Sensors)
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.23.4.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.23.4.ebuild
index 5c363a1d417c..c9fe385b900b 100644
--- a/kde-plasma/ksystemstats/ksystemstats-5.23.4.ebuild
+++ b/kde-plasma/ksystemstats/ksystemstats-5.23.4.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Plugin-based system monitoring daemon"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index c7b4dedf1bdd..fe1c102eae36 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,3 @@
-DIST kwallet-pam-5.22.5.tar.xz 19960 BLAKE2B 978860fc113e2a02bd2543aa5147832050fb3b53a1916939cc21772e98a7a2e4d47892d514427f15a3fbff70a6eadcb98fdd934fb8d731992ff3fc8252c32f6b SHA512 230135ee7aadbbc9f08695afa87fd7d8f0e3dca5da40f94bea92ad83a8a2ccc86efb7d593730079a0affc91f28383d089a08fd2b4db57961ba7c5b3a009a6038
 DIST kwallet-pam-5.23.4.tar.xz 20116 BLAKE2B a18c9b8de493c068ffae6310631c39b0bf8691c8ed8c923c51544d7ab72d9d8f3a917638b59f22953113cb6e4fb3a0687021ab25ff7484b33b2f837c076179d7 SHA512 256e33b63ffeab99b5d1758baec794abbc0d838b338341461b179a5ac80f8ee91a85987677cd33ad25f449a85b9959f92c7cc18dca46fd319577203659e2727f
-EBUILD kwallet-pam-5.22.5.ebuild 738 BLAKE2B 81da3c107bcdad60688be474718d174329f32bd92d3f61fbb63b8b385eb8a33b0a71496c1c8e7e8411b6891d45acce7b0fe0deb4537d2ac713809fd413a175d6 SHA512 97fce9429137a2cfb807397e34dc99fa23b879977285adb22ba046651acfd5cb140e1cf96f6fd0ee6caa75d350a854a23f633f255a6fa85acf9283818fe69258
-EBUILD kwallet-pam-5.23.4.ebuild 741 BLAKE2B 0194cd9dacc1fd1b848dd92cbaa2ff1a7187abbd76002d570f88c0ba4d67396416ee24957c6e530929f923126100d218b249f6cb8f7399bf857114d83c99af19 SHA512 71c3e2c6f6ed674ac7c0d6699959bdb600b6bf7f239261e31bd507ff7b14018d991c1f25498f89dbd58509103d3fddfdbb50a1eec8793a46bb44135b8b3939b3
+EBUILD kwallet-pam-5.23.4.ebuild 738 BLAKE2B 9e1ace995770bab66d2b72ce5158113f033bbcc8fac4525dbed7783e6d220be80862c09363fb3bb322993fc73fcda469b04174eed15094b71b88300f5894261f SHA512 5bfbf54e1b097ac8b696611a77da7e1afc6d100fa1129b4b5a43bd4a0aa191e1fb52d43b61c983b4bcad79f52b484c7b07b7bf5cd6167f04857f96d8c81b5cbd
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.22.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.22.5.ebuild
deleted file mode 100644
index 5d767137ee6b..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.22.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org
-
-DESCRIPTION="PAM module to not enter KWallet password again after login"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	sys-libs/pam
-"
-RDEPEND="${DEPEND}
-	net-misc/socat
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
-}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.23.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.23.4.ebuild
index bc2a2dd88454..da2cc6159515 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.23.4.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 17a8aa69c5f1..3c421402f0ec 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,3 @@
-DIST kwayland-integration-5.22.5.tar.xz 22708 BLAKE2B 61e084dd71721b556fc9bf0aafe92908c25070d1f8683ae53093ca413b0e81efb1c21a3fbb7c033c1e324b2032c8fe9946287eadd53607ee549944f06d081932 SHA512 456b745e493965781178e1cd2fe64b8833294800ea152f5f95d00e1e2c221f97c2a29b91498573bc25710e3ad42482e46a4f0f33d5a57ce8ed1454a65fba81a9
 DIST kwayland-integration-5.23.4.tar.xz 24184 BLAKE2B 2b6c6d525976daacb4df3970f0dde3754d8220b847f34a353e8a08f12457790d34357c4e62c19ed3919cbe14996b135273e262a4d129ab7f9dd90311fdee9eee SHA512 681724524831eb63c014c5eda79fd41aae4b9f66badc094d312948ba44aee82fd294042978c4475a1db30380fefb4c80b324e769b4bd26d81ba02944d54b104a
-EBUILD kwayland-integration-5.22.5-r1.ebuild 1017 BLAKE2B 57872a830383214d8cea2296305003fc41cd4f945c725a2beb290fce919a7fd22e96fd3005653c0439084548b36d68a5e3f08b11455b8d3139cebbdd85565cde SHA512 4beab3997fa640a39fa6d2a159145a5a1b6d49716317a7d77006a9801492c479ce1e80049801b97eb84d3bc967975135a101ba98ec0194bd0898b3b73b24b31b
-EBUILD kwayland-integration-5.23.4.ebuild 1156 BLAKE2B 08f55b1a7e6b11deb6c4763fc804e9e2c515de35eb185ef9a88d3c1c0fb20279f787368d3c535c31c1f77b3d8735cd818efabd6db328dbc7d7b1e98dfb7e9d78 SHA512 05056712acac2b68cf624252429a3b5d3e58895063a2c5114ad2f41eefe2fc98ad25372f8e7ffd136b95ee26f1a1fc8a7b4311adf5b543f40fe6d52b93815284
+EBUILD kwayland-integration-5.23.4.ebuild 1153 BLAKE2B 3a9da02be3ef14e340f9a21cc2d36da3070e4bfeeb5e6acebd5482cbad43ac097f7cf2eac7b47ced52e8134a0f359d3d17f897f41edf3149b4e2a8b6808a40b1 SHA512 022e013f07d94f7e34dff71e30748d49ff8214d2c4ece76e113fd01d138c313190c4a2db89066cb1f454d385468960637f1912e407f37983164776fdd58e4726
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.22.5-r1.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.22.5-r1.ebuild
deleted file mode 100644
index f9554eb12b38..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.22.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE=""
-
-RESTRICT="test" # bug 668872
-
-# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
-# slot ops:
-# dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff
-# kde-frameworks/kidletime: KIdleTime/private/abstractsystempoller.h
-# kde-frameworks/kwindowsystem: Various private headers
-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=
-	x11-libs/libxkbcommon
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.23.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.23.4.ebuild
index 9a1d55f7aa5c..95ad37074878 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.23.4.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.23.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test" # bug 668872
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 7126c81a9431..6369056c92ab 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,5 +1,3 @@
-DIST kwayland-server-5.22.5.tar.xz 218728 BLAKE2B dcc74e853b5d63709c72e44c34935829e4b14544bf8571578d08cbc3d8fcf52bff9f53cce82538be28f4c2fe2eddeb0042ac43081cab000816e8f3491076fa2e SHA512 2fbbd025622fe01b57099a418e2b42d567d1874ac7e04ee21b19f471ce7a89a9feb7ccd79269dfa2b55d043d234bf0454368fd304039d9a3e056602d1f6c0dd0
 DIST kwayland-server-5.23.4.tar.xz 217608 BLAKE2B 82a8b688a2e146314a667d6d75f835bce3d1b36e2e4fefb5d748da414c7a954e317c5a897166f764325c4f94ce60ff385961ad298d303afeca2bffdc160091c1 SHA512 37864c5943721b8e2fbf14824eab8f9eb8d4a3dc36db0837640ae7f07169f10c253b918481702c6a32b46191a8e27713ea9357bab513f3a711104d798ef5b3a0
-EBUILD kwayland-server-5.22.5.ebuild 822 BLAKE2B f68d08b7f81cc6153d2c0b86498e44393925787449ce2657ce105273bd3f4ba58f38d9585e86a9f9b859ae22d39a54fdbf142aaccbe8b39d0587a1c7168134cf SHA512 bf5e072d522be518a0360607b5ebc47f24b423ab02d498b46db98b7e21af9e24880e9456516be75ea988644316edd5c011cd7115fbf6566b138de4893709df95
-EBUILD kwayland-server-5.23.4.ebuild 825 BLAKE2B c6a2a8e061cf42e369036e7d9f91d124b1cf5319c1baca70a3e3db96eaea05a49e2f26fa6ad508aae57307ee78b634f412fa32da62885a1dc14877e9020f5a24 SHA512 4f1836a915e46afb42cef728972200d64d492459c3ce145a4dede54ca964c6b54ae7435575efd7f305909f2e66fc1d6e8ae04d18dea5e5cb037b0963fc0fddac
+EBUILD kwayland-server-5.23.4.ebuild 822 BLAKE2B af24dff42d544e44372e65c56f16290ff72f2dbbae79ce6f1ecb4b10aea83085e4d7eefb952afc25abade8017af3741852fde9a2754a93b964716e0a88addd7f SHA512 472082bcbe3ef14a84138be6860acd66c9a17cd89722a69cc9026ac2963a76097fc2d91aa51b506d8d78fad1264d5615d6c04f132c6ecfd46492b40e65758291
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.22.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.22.5.ebuild
deleted file mode 100644
index a8fe8319c53d..000000000000
--- a/kde-plasma/kwayland-server/kwayland-server-5.22.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.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 ~riscv x86"
-IUSE=""
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/wayland-1.19.0
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[egl]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	media-libs/libglvnd
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.3.0
-	>=dev-libs/wayland-protocols-1.18
-"
-BDEPEND="dev-util/wayland-scanner"
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.23.4.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.23.4.ebuild
index 6badc119f3d9..689db160e65a 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.23.4.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.23.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 1935bc3ba721..0b5572ddcb5a 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,10 @@
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
-AUX kwin-5.22.5-libglvnd-1.3.4.patch 2959 BLAKE2B 849912f1b614d8ece456c9bbf020cd146a4a07ec759b1a5f8f19d773c3081ce464e26dff64e84fa5f7df7df3e44e8e5fe607a136d9fa29e93530aa14f336b7e8 SHA512 982b50894427ed5275ab0d807f616e7b4e17370000558c434d9178c09ec7fa5447b3f9ad08c1945fcf6f2cbc17f2653ce6863027678ae74fd2dc653a5d587263
-DIST kwin-5.22.5.tar.xz 6459916 BLAKE2B caaec435be180fd4c359bea2d1f4a9a0e3e5854f73b91b83d62ad4e488e9d779a7f6bc5620dfb2ebcf5629b2f90c958d4a4a126df34c9734220c64262e751fba SHA512 4e466f3961279610c16d24c1dbc6368862308ee7bf677bf9f8ed1898465aa31263a34362b1beaad451b6c5e94068d908718c7bb37d12b814f2af9a1eccf417d2
+AUX kwin-5.23.4-drm-remove-dpms-filter-when-outputs-are-added.patch 1014 BLAKE2B 6395723747077a5d024b47b9cf4763bc52e2155a60b98ca2143b04a8b4682c1d1cd41779cc337dc4175279428fe05d16897ce2f5afd747692df5ecb17948d6f0 SHA512 0b15b757768fadb4cd7b960d20a9183aa7e9104e49203946e398ae76852c488bc4f55c1544409ad653b753266b8d9c519ba673f8cf6a1521f72a8c81de4f60f4
+AUX kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch 1756 BLAKE2B 6e24b6780cb756229aec301477c95880e381ae4a582e5de718528f1ebb2bf95ede8d0ace6ed0791443ceb85b5fa9eb87eaa11be8f12cbca4b39b4268e80f2130 SHA512 c4c8c6e265e8bdceb69310e6cd202fc7b38c1002a2eeaf422839e6689265a0ec9546ac100a28d851e333f27a618e2e370aeb62f372eeafd6a49cd928d4f41a7b
+AUX kwin-5.23.4-scripting-fix-KWinComponents-Workspace-type.patch 1450 BLAKE2B 689880b0a016d0d20bf792f7b88f3317910f1e3380c12dcd47855849018f7746b4f6b57724bce7964c80f0ef212052455bbb39ba1ea7211822a531fbcbbafd39 SHA512 e5b40ff15e53b6b11d60f824873602bfa2c5bac2aea8d739946efec80746904dd2ce61da716f1b01ce654c6ebd20826baa2881cc7bd0228555846b3aef55235b
+AUX kwin-5.23.4-wayland-resize-to-last-requested-client-size.patch 5272 BLAKE2B d5959c8c036a2e043bba35b4498e1ec876936ef345647c088d1afb628e108019d407c6b105e44ac8734bb646825272c757ae78c407932a33e9d084b1f52b9eb1 SHA512 2937ef87e839c6f043fd362bd97f3fa88c75b658afae1d137f16e500a5435f1882537e8f62947f59cb65e8b8eaf705cfa6f5ce84df37e8b84a0fde025e5aafa1
+AUX kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch 1241 BLAKE2B 9b34872dcb435bf4ed1e06d4c45ea7b80e9dd2cbb7ff1e1de6178c8edcac011a5e9c9acf35a649101a0e6aaf0c4c7e6c928861dcd6c90a4bad3887cc0b555ef7 SHA512 4e864baacf775409ce9ce06933f8674215809246eb41aba322beb0978e2e21c5131dd247c5b1dbaeb6947eb620ebc381bc26e720f0a25e3de461ed8cfae333e9
 DIST kwin-5.23.4.tar.xz 6341720 BLAKE2B 5dd984c0ff4c62f9d3e4915be5f5423477314a79c4e8fa9a0c306f99be968ca99e61ab9f23ee1b866e171c40c0ad173c96f6de49a28b2eea3a2c62bf5c9a20b3 SHA512 82da0883cf5e900c2278351e815453e25052edfb6534e4be015636dcc2c4051f154c6685eb2542e851d48bf8026bf2b359189864dda336b266208344dcfc851d
-EBUILD kwin-5.22.5.ebuild 4128 BLAKE2B 8b93294d20199942f6aa0b4ed480618dff5bb7d4cc391340741c5c56088b577c02c15cec0742e6df2a7c45293316011c0a74dfec892ed53c566e86bb295ef81c SHA512 8d7c7c74e886ea8fd4d7a2dd47f8483cc162dd489d13c1d82a76595255d0c321c4e38ec6d9bba3a945349045963db018b0e1fa3526464e07d962922528f778c9
-EBUILD kwin-5.23.4.ebuild 3897 BLAKE2B b16d2ce750ba7d8ea7e1c2e27691d94ab7760e94320b50c610b4020c4dd798bc95c2567e108a4a0ec3e47c99f85151d7fdd6999bd12682b3494a9baee6d220c1 SHA512 2bb2379af025bdd2aa6e0fcd0aeb1951ecf9cb51f6b4fe3853ed9205f8b96d3e3dff8f0a6f36a88bf5934d91b1075a53c23e5aceee3b0b048670dec0a3098393
+EBUILD kwin-5.23.4-r1.ebuild 4154 BLAKE2B 1fb74c0e6e99b135085de71e4c5d69d101b0c501ec86a30a11932099860dd0ec267e299c46af065dcb87eeac7aba5133d3b23825b971aa45671fac13685b7244 SHA512 9839876d52714eea2a662f79a8e3b10f5bfe2ac959f4bb3c77ffb96362f4f0dde049a1f49e2dad1a523239ff5ce93927b540cd901b71ad3a02ba96683c5a43b3
+EBUILD kwin-5.23.4-r2.ebuild 4326 BLAKE2B ff3c124a3c5deb911a29853f65c1485db608345a7c30202de1fe8ec3a9904ff103b94095589adfb0b0fbc29297c0d9300e2e8940f9e73f55a00fb7d5067ec660 SHA512 aec33fb84a2900e15f4bd4ff66d905c706ca4a6a357cd078528c9b0348b7eef7167beda0c2ca76ebede9ab10f7561176bf4ddaedc71518cbcd867272b9abe043
 MISC metadata.xml 512 BLAKE2B 3e81119dbc98181573e294885c52623e4799b55c238ca9513e33547e718ec0f1762371d6391a4291c54159f31cd510cd8d9c192aa16ef0fc16672a3d0ef25dbe SHA512 a9a28562cb0f25abf24cb89c48fea816bfaf701c889ee08e66b80b3afe434af68e5ddb0fa21d313d68418c81a1e73eefcabf75e8e3878f55a1292039dde6ecdb
diff --git a/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch b/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch
deleted file mode 100644
index d185d5e41fe6..000000000000
--- a/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 839710201c389b7f4ed248cb3818e755a37ce977 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Fri, 10 Sep 2021 13:36:04 +0300
-Subject: [PATCH] x11: Fix build with EGL_NO_PLATFORM_SPECIFIC_TYPES
-
-eglCreateWindowSurface() wants a Window (unsigned long), but with
-EGL_NO_PLATFORM_SPECIFIC_TYPES, EGLNativeWindowType is defined as an
-opaque pointer, i.e. void*.
-
-BUG: 440372
-
-* asturm 2021-09-21: Merged with upstream commits:
-38e24ecd6416a975db0989c21b70d6a4cc242f35 "Fix build with 32-bit"
-e26ea6bf2313c021db7e5ca5454cd8b1e2e2037f "Fix build on 32bit platforms"
-
-* asturm 2021-10-04: Merged with upstream commit:
-From df11acd46778e1e43183c2660bc9dcb1a8ad3282 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Tue, 21 Sep 2021 17:34:59 +0300
-Subject: [PATCH] x11: Cast Window to EGLNativeWindowType using a C cast
-
-reinterpret_cast<>() will fail if the types we cast from and to have
-mismatching sizes.
-
-Unfortunately, there are platforms that have Window and
-EGLNativeWindowType of different size. This results in compilation
-errors.
-
-In order to work around those problematic platforms, this change
-replaces reinterpret_cast cast with a c style cast.
----
- src/plugins/platforms/x11/common/eglonxbackend.cpp | 16 +++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff -u a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp
---- a/src/plugins/platforms/x11/common/eglonxbackend.cpp
-+++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp
-@@ -213,15 +213,19 @@
-         return EGL_NO_SURFACE;
-     }
- 
-+    // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits.
-+    Window nativeWindow = window;
-+
-     EGLSurface surface = EGL_NO_SURFACE;
-     if (havePlatformBase()) {
--        // Note: Window is 64 bits on a 64-bit architecture whereas xcb_window_t is
--        //       always 32 bits. eglCreatePlatformWindowSurfaceEXT() expects the
--        //       native_window parameter to be pointer to a Window, so this variable
--        //       cannot be an xcb_window_t.
--        surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &window, nullptr);
-+        // eglCreatePlatformWindowSurfaceEXT() expects a pointer to the Window.
-+        surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &nativeWindow, nullptr);
-     } else {
--        surface = eglCreateWindowSurface(eglDisplay(), config(), window, nullptr);
-+        // eglCreateWindowSurface() expects a Window, not a pointer to the Window. Use
-+        // a c style cast as there are (buggy) platforms where the size of the Window
-+        // type is not the same as the size of EGLNativeWindowType, reinterpret_cast<>()
-+        // may not compile.
-+        surface = eglCreateWindowSurface(eglDisplay(), config(), (EGLNativeWindowType) nativeWindow, nullptr);
-     }
- 
-     return surface;
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-drm-remove-dpms-filter-when-outputs-are-added.patch b/kde-plasma/kwin/files/kwin-5.23.4-drm-remove-dpms-filter-when-outputs-are-added.patch
new file mode 100644
index 000000000000..cc323e4540f6
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.23.4-drm-remove-dpms-filter-when-outputs-are-added.patch
@@ -0,0 +1,30 @@
+From 8a0036fdee0eaa7dc5808dfe2dfc516fc32dfd8e Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Thu, 9 Dec 2021 12:51:55 +0100
+Subject: [PATCH] platforms/drm: remove the dpms filter when outputs are added
+
+When the dpms filter is active and an output is hotunplugged, or
+is momentarily detected as hotunplugged, adding a new output should
+remove the dpms filter again.
+
+BUG: 446699
+FIXED-IN: 5.23.5
+---
+ src/plugins/platforms/drm/drm_backend.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/plugins/platforms/drm/drm_backend.cpp b/src/plugins/platforms/drm/drm_backend.cpp
+index a99b720177..d7908f6332 100644
+--- a/src/plugins/platforms/drm/drm_backend.cpp
++++ b/src/plugins/platforms/drm/drm_backend.cpp
+@@ -321,6 +321,7 @@ void DrmBackend::addOutput(DrmAbstractOutput *o)
+         primaryGpu()->removeVirtualOutput(m_placeHolderOutput);
+         m_placeHolderOutput = nullptr;
+     }
++    checkOutputsAreOn();
+ }
+ 
+ void DrmBackend::removeOutput(DrmAbstractOutput *o)
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch b/kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch
new file mode 100644
index 000000000000..5abcfa49969c
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.23.4-fix-memory-leak-caching-QSGTexture.patch
@@ -0,0 +1,50 @@
+From 8accc777a5b3ab1e53341f1838ed636652dc1221 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Mon, 13 Dec 2021 12:53:32 +0200
+Subject: [PATCH] Fix memory leak in some plasma components
+
+A few plasma components cache QSGTexture. Those components rely on
+texture references going away with QSGNode users. However, with the
+current tear down logic, OffscreenQuickView won't destroy any paint
+nodes.
+
+Destroy QQuickRenderControl before QQuickWindow to ensure that are no
+paint nodes left alive after OffscreenQuickView.
+
+BUG: 444429
+BUG: 444381
+BUG: 444077
+BUG: 444306
+(cherry picked from commit 64f2cdf9ed290a1fb7c2bf41753613078eb023c4)
+---
+ src/libkwineffects/kwineffectquickview.cpp | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/libkwineffects/kwineffectquickview.cpp b/src/libkwineffects/kwineffectquickview.cpp
+index ca5a025729..14be1e1b25 100644
+--- a/src/libkwineffects/kwineffectquickview.cpp
++++ b/src/libkwineffects/kwineffectquickview.cpp
+@@ -160,13 +160,15 @@ EffectQuickView::EffectQuickView(QObject *parent, QWindow *renderWindow, ExportM
+ EffectQuickView::~EffectQuickView()
+ {
+     if (d->m_glcontext) {
+-        d->m_glcontext->makeCurrent(d->m_offscreenSurface.data());
+         // close the view whilst we have an active GL context
+-        delete d->m_view;
+-        d->m_view = nullptr;
+-        d->m_renderControl->invalidate();
+-        d->m_glcontext->doneCurrent();
++        d->m_glcontext->makeCurrent(d->m_offscreenSurface.data());
+     }
++
++    delete d->m_renderControl; // Always delete render control first.
++    d->m_renderControl = nullptr;
++
++    delete d->m_view;
++    d->m_view = nullptr;
+ }
+ 
+ bool EffectQuickView::automaticRepaint() const
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-scripting-fix-KWinComponents-Workspace-type.patch b/kde-plasma/kwin/files/kwin-5.23.4-scripting-fix-KWinComponents-Workspace-type.patch
new file mode 100644
index 000000000000..6ec6a59cd59f
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.23.4-scripting-fix-KWinComponents-Workspace-type.patch
@@ -0,0 +1,34 @@
+From fd8d01d9892f12c48a82c6e2ab675396bf6ec113 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Sun, 5 Dec 2021 18:24:35 +0200
+Subject: [PATCH] scripting: Fix type of KWinComponents.Workspace
+
+Currently, the workspace.clients property doesn't work in declarative
+scripts because wrong workspace wrapper is used.
+
+
+(cherry picked from commit 29a85e830cdca5ae483b411e942e7a5bf85f6140)
+---
+ src/scripting/scripting.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/scripting/scripting.cpp b/src/scripting/scripting.cpp
+index b901db7455..929c94afab 100644
+--- a/src/scripting/scripting.cpp
++++ b/src/scripting/scripting.cpp
+@@ -650,10 +650,10 @@ void KWin::Scripting::init()
+     qmlRegisterType<ScriptingModels::V3::ClientModel>("org.kde.kwin", 3, 0, "ClientModel");
+     qmlRegisterType<ScriptingModels::V3::ClientFilterModel>("org.kde.kwin", 3, 0, "ClientFilterModel");
+ 
+-    qmlRegisterSingletonType<QtScriptWorkspaceWrapper>("org.kde.kwin", 3, 0, "Workspace", [](QQmlEngine *qmlEngine, QJSEngine *jsEngine) {
++    qmlRegisterSingletonType<DeclarativeScriptWorkspaceWrapper>("org.kde.kwin", 3, 0, "Workspace", [](QQmlEngine *qmlEngine, QJSEngine *jsEngine) {
+         Q_UNUSED(qmlEngine)
+         Q_UNUSED(jsEngine)
+-        return new QtScriptWorkspaceWrapper();
++        return new DeclarativeScriptWorkspaceWrapper();
+     });
+ 
+     qmlRegisterType<KWin::AbstractClient>();
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-wayland-resize-to-last-requested-client-size.patch b/kde-plasma/kwin/files/kwin-5.23.4-wayland-resize-to-last-requested-client-size.patch
new file mode 100644
index 000000000000..7846681ed528
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.23.4-wayland-resize-to-last-requested-client-size.patch
@@ -0,0 +1,100 @@
+From 6a84b9454c869a16c2fa5fd49a8fac4a9497f30f Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Tue, 7 Dec 2021 09:32:33 +0200
+Subject: [PATCH] wayland: Resize the client to last requested client size if
+ decoration is destroyed
+
+If the decoration is destroyed before the window is mapped, kwin can
+respond with a configure event that has 0x0 size. New tests check that
+problematic case.
+
+BUG: 444962
+(cherry picked from commit 9cc80d7468c92a2800daf98319e626e022ff1045)
+---
+ autotests/integration/xdgshellclient_test.cpp | 48 +++++++++++++++++++
+ src/abstract_client.cpp                       |  3 +-
+ 2 files changed, 50 insertions(+), 1 deletion(-)
+
+diff --git a/autotests/integration/xdgshellclient_test.cpp b/autotests/integration/xdgshellclient_test.cpp
+index c00e4ebb2d..eabed754dd 100644
+--- a/autotests/integration/xdgshellclient_test.cpp
++++ b/autotests/integration/xdgshellclient_test.cpp
+@@ -104,6 +104,8 @@ private Q_SLOTS:
+     void testPointerInputTransform();
+     void testReentrantSetFrameGeometry();
+     void testDoubleMaximize();
++    void testMaximizeAndChangeDecorationModeAfterInitialCommit();
++    void testFullScreenAndChangeDecorationModeAfterInitialCommit();
+ };
+ 
+ void TestXdgShellClient::testXdgWindowReactive()
+@@ -1839,5 +1841,51 @@ void TestXdgShellClient::testMaximizeFull()
+     QVERIFY(Test::waitForWindowDestroyed(client));
+ }
+ 
++void TestXdgShellClient::testMaximizeAndChangeDecorationModeAfterInitialCommit()
++{
++    // Ideally, the app would initialize the xdg-toplevel surface before the initial commit, but
++    // many don't do it. They initialize the surface after the first commit.
++    // This test verifies that the client will receive a configure event with correct size
++    // if an xdg-toplevel surface is set maximized and decoration mode changes after initial commit.
++
++    QScopedPointer<KWayland::Client::Surface> surface(Test::createSurface());
++    QScopedPointer<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.data())); // will wait for the first configure event
++    QScopedPointer<Test::XdgToplevelDecorationV1> decoration(Test::createXdgToplevelDecorationV1(shellSurface.data()));
++    QSignalSpy toplevelConfigureRequestedSpy(shellSurface.data(), &Test::XdgToplevel::configureRequested);
++    QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
++
++    // Request maximized mode and set decoration mode, i.e. perform late initialization.
++    shellSurface->set_maximized();
++    decoration->set_mode(Test::XdgToplevelDecorationV1::mode_client_side);
++
++    // The compositor will respond with a new configure event, which should contain maximized state.
++    QVERIFY(surfaceConfigureRequestedSpy.wait());
++    QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).value<QSize>(), QSize(1280, 1024));
++    QCOMPARE(toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>(), Test::XdgToplevel::State::Maximized);
++}
++
++void TestXdgShellClient::testFullScreenAndChangeDecorationModeAfterInitialCommit()
++{
++    // Ideally, the app would initialize the xdg-toplevel surface before the initial commit, but
++    // many don't do it. They initialize the surface after the first commit.
++    // This test verifies that the client will receive a configure event with correct size
++    // if an xdg-toplevel surface is set fullscreen and decoration mode changes after initial commit.
++
++    QScopedPointer<KWayland::Client::Surface> surface(Test::createSurface());
++    QScopedPointer<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.data())); // will wait for the first configure event
++    QScopedPointer<Test::XdgToplevelDecorationV1> decoration(Test::createXdgToplevelDecorationV1(shellSurface.data()));
++    QSignalSpy toplevelConfigureRequestedSpy(shellSurface.data(), &Test::XdgToplevel::configureRequested);
++    QSignalSpy surfaceConfigureRequestedSpy(shellSurface->xdgSurface(), &Test::XdgSurface::configureRequested);
++
++    // Request fullscreen mode and set decoration mode, i.e. perform late initialization.
++    shellSurface->set_fullscreen(nullptr);
++    decoration->set_mode(Test::XdgToplevelDecorationV1::mode_client_side);
++
++    // The compositor will respond with a new configure event, which should contain fullscreen state.
++    QVERIFY(surfaceConfigureRequestedSpy.wait());
++    QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).value<QSize>(), QSize(1280, 1024));
++    QCOMPARE(toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>(), Test::XdgToplevel::State::Fullscreen);
++}
++
+ WAYLANDTEST_MAIN(TestXdgShellClient)
+ #include "xdgshellclient_test.moc"
+diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp
+index 79c079109a..95576de0b1 100644
+--- a/src/abstract_client.cpp
++++ b/src/abstract_client.cpp
+@@ -2361,8 +2361,9 @@ void AbstractClient::createDecoration(const QRect &oldGeometry)
+ 
+ void AbstractClient::destroyDecoration()
+ {
++    const QSize clientSize = frameSizeToClientSize(moveResizeGeometry().size());
+     setDecoration(nullptr);
+-    resize(clientSizeToFrameSize(clientSize()));
++    resize(clientSize);
+ }
+ 
+ void AbstractClient::setDecoration(KDecoration2::Decoration *decoration)
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch b/kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch
new file mode 100644
index 000000000000..a80348be3562
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.23.4-xdgshell-protect-from-invalid-frameGeometry.patch
@@ -0,0 +1,36 @@
+From 77b678c522cce0e8e7b39087f74e2ac591cd28d0 Mon Sep 17 00:00:00 2001
+From: Ismael Asensio <isma.af@gmail.com>
+Date: Sun, 12 Dec 2021 15:16:28 +0100
+Subject: [PATCH] XDGShellClient: Protect from invalid frameGeometry on
+ updateDecoration
+
+When updating window decoration do not try to restore the previous frameGeometry
+if it was invalid.
+
+This fixes the case when applying a `noBorder=true` rule on a newly created
+client would set it to a minimal window size
+
+Targeted at 5.23 only, since this codepath is being reworked for 5.24
+
+BUG: 445140
+FIXED-IN: 5.23.5
+---
+ src/xdgshellclient.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xdgshellclient.cpp b/src/xdgshellclient.cpp
+index b4427b8cf7..75c4031498 100644
+--- a/src/xdgshellclient.cpp
++++ b/src/xdgshellclient.cpp
+@@ -637,7 +637,7 @@ void XdgToplevelClient::updateDecoration(bool check_workspace_pos, bool force)
+         scheduleConfigure();
+     }
+     updateShadow();
+-    if (check_workspace_pos) {
++    if (check_workspace_pos && oldFrameGeometry.isValid()) {
+         const QRect oldGeometryRestore = geometryRestore();
+         setGeometryRestore(frameGeometry());
+         checkWorkspacePosition(oldFrameGeometry, oldClientGeometry);
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.23.4.ebuild b/kde-plasma/kwin/kwin-5.23.4-r1.ebuild
index 14a366c19c33..024d953ad4b3 100644
--- a/kde-plasma/kwin/kwin-5.23.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.23.4-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
 RESTRICT="test"
@@ -97,6 +97,12 @@ DEPEND="${COMMON_DEPEND}
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-wayland-resize-to-last-requested-client-size.patch # KDE-bug 444962
+	"${FILESDIR}"/${P}-scripting-fix-KWinComponents-Workspace-type.patch
+	"${FILESDIR}"/${P}-drm-remove-dpms-filter-when-outputs-are-added.patch # KDE-bug 446699
+)
+
 src_prepare() {
 	ecm_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
diff --git a/kde-plasma/kwin/kwin-5.22.5.ebuild b/kde-plasma/kwin/kwin-5.23.4-r2.ebuild
index 43b14d49330f..8b40bded6cad 100644
--- a/kde-plasma/kwin/kwin-5.22.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.23.4-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="optional"
-KFMIN=5.82.0
+KFMIN=5.86.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
 RESTRICT="test"
@@ -41,7 +41,6 @@ COMMON_DEPEND="
 	>=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
@@ -49,7 +48,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-plasma/breeze-${PVCUT}:5
@@ -60,7 +59,7 @@ COMMON_DEPEND="
 	media-libs/freetype
 	media-libs/lcms:2
 	media-libs/libepoxy
-	media-libs/mesa[egl(+),gbm(+),wayland,X(+)]
+	>=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
 	virtual/libudev:=
 	x11-libs/libX11
 	x11-libs/libXi
@@ -77,17 +76,14 @@ COMMON_DEPEND="
 	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
 	screencast? ( >=media-video/pipewire-0.3:= )
 "
-# 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]
-	|| (
-		x11-base/xwayland
-		x11-base/xorg-server[wayland(-)]
-	)
+	sys-apps/hwdata
+	x11-base/xwayland
 	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
 "
 DEPEND="${COMMON_DEPEND}
@@ -99,12 +95,14 @@ DEPEND="${COMMON_DEPEND}
 		>=dev-qt/qtwayland-${QTMIN}:5
 	)
 "
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
 PATCHES=(
-	"${FILESDIR}/${P}-libglvnd-1.3.4.patch" # KDE-bug 440372, bugs 810511, 813228
+	"${FILESDIR}"/${P}-wayland-resize-to-last-requested-client-size.patch # KDE-bug 444962
+	"${FILESDIR}"/${P}-scripting-fix-KWinComponents-Workspace-type.patch
+	"${FILESDIR}"/${P}-drm-remove-dpms-filter-when-outputs-are-added.patch # KDE-bug 446699
+	"${FILESDIR}"/${P}-xdgshell-protect-from-invalid-frameGeometry.patch # KDE-bug 445140
+	"${FILESDIR}"/${P}-fix-memory-leak-caching-QSGTexture.patch # KDE-bug 444077 +more
 )
 
 src_prepare() {
@@ -113,8 +111,7 @@ src_prepare() {
 
 	# TODO: try to get a build switch upstreamed
 	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
-			-i CMakeLists.txt || die
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
 	fi
 }
 
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 030fff353df0..fc248ccfb3e9 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,3 @@
-DIST kwrited-5.22.5.tar.xz 20504 BLAKE2B 05e306020cfdeaa2273f2f9e782c19dd7ae319f6318c70498d4aa32d00d97add5abc5c19e69726b4269d9274a85377c3f1b1affdad911dba857ad6218880bd08 SHA512 2988b0cd5f287503367d48f43ac31e454d5545476bc6763360b111f945d6b3ebffc1a55f8746493c70e9443c6d04d1c41f25a0484932de2edb12a54ab54f117c
 DIST kwrited-5.23.4.tar.xz 20552 BLAKE2B 215688884db742bb53bd334120c2488479e74d7dab3ee5f5db0c8392d80ee98a55a143344c8be24909c0a653ab8c7eee69107422bea7d9d8a2ef61313b0c470a SHA512 d1e2561d0598a31fee8b68a271035727645bda964ad01ac5f7c037da726c34c2c6fa9cc8d6f7cd197ed0face59e9e3894727ba336428e325da944a736bda0b42
-EBUILD kwrited-5.22.5.ebuild 599 BLAKE2B 466e79dfdad4de784707f7b97f2c76ea06487d68e18d7cc9dd561b6aebe518ed7052d6a873356901d092db0d0f04de44cab3dd4681e6acdcf12079c88bf899be SHA512 3c4d91b14c990354325f6e2d50b0e05564f9e0ed8cde67ca2a1a5b0efb46e10573c17a260bf17c241bc60c15e65c8a46469e87b1392ab68786d86e2b9487f474
-EBUILD kwrited-5.23.4.ebuild 602 BLAKE2B c594ac61715c4ac0837b48ebce0230a6afd69d303561fed723d66f6f4cd3b3c3be35bf499522ca816bcf27b7e69599eba7740f4725b369b187cc4ac0cde5b13c SHA512 8ed0c3a91c14250df05a61f87a39769ee806693677a032844f4ed9a85a1de7e4066e5282f2235f2a68dd3b422b7583f15dc504ff9dff1e5badce49b1ffb87aae
+EBUILD kwrited-5.23.4.ebuild 599 BLAKE2B b1f8bcf191872bed14a50a4db8b8529da53de372eb7b543d17a305a685ceb2e03cfb4754c9e96ede35f3d195d15cd4c888743cd212ef2f69ea0582fd7e44aa23 SHA512 f7fb942b5c10fcd168cd54ce0156d6608cf390103baf4f1cf15cac55553f9f62ac5f002f2200252147cb07c3821525c0ca08fa8f2a7a7ba70caf0633145bdd7c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwrited/kwrited-5.22.5.ebuild b/kde-plasma/kwrited/kwrited-5.22.5.ebuild
deleted file mode 100644
index 96a819be2e28..000000000000
--- a/kde-plasma/kwrited/kwrited-5.22.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${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.23.4.ebuild b/kde-plasma/kwrited/kwrited-5.23.4.ebuild
index aa1c51796c7d..cbb84e809f75 100644
--- a/kde-plasma/kwrited/kwrited-5.23.4.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index 420cc8ad3940..0c716a0e8242 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,5 +1,3 @@
-DIST layer-shell-qt-5.22.5.tar.xz 17604 BLAKE2B 4079ffebddc52b3ec4422516daa4894531b2a99fd184135ce081de1cbd8cd14ab477be355ebe50bf41dc4ee323ced7a7cf00a629c8ee16a0072d97eb18dc1628 SHA512 5bb85f73d68eb47b9fcad18e5d52ce22bddb73a486710dc2b47e5eb5f3ffee9674969505e55bdedbae19669c9568f9b4276a739aa1cde326c7795a199e6776d2
 DIST layer-shell-qt-5.23.4.tar.xz 17764 BLAKE2B 3d5dc8041f5e464756afecfcf1aa81d5a4a3518c607111d4d6ee89b7ea1a065f7a81480be99895c0eb92a7486eb6559088ace2a0fb8b9a74d10a9f18ab6d23c6 SHA512 d605e057e578e5e756537b72bcea434d51c9e4d36952eb891580fb6ef8d132aa41d95ab7530893ca2d977b46172bb2d63febb7282d191c12e73455a69142b7b4
-EBUILD layer-shell-qt-5.22.5-r1.ebuild 774 BLAKE2B 0959c4261edacea210776903652df28cdf6fb105d89095aadc1eb89759544128072be05ee638e8354283e3bdb0f84f8947a8084f7012d79c21fab585cb61bb6a SHA512 372bf4dc5d97f108e8e75ebcce28f268833a87418af9ede707008feb51c8383c85657f1850dbc918443d5bcbbede2324a23e290e92e78228f22797b160b7bea4
-EBUILD layer-shell-qt-5.23.4.ebuild 777 BLAKE2B f0b518ab88b8599721c714c3bf8214be0fa7f88f2648c75f5c9df7ed7da99ee8d5d13493e8485957746c5ffac6db8b8a53241b2e3abd1417917dc63794ae2f49 SHA512 94724605e29b513ba3a0b1acdd5454c4b28de4402f3fc1128e1f4b26dd0b10a34e3b6960bd1babafbf01d1a15de780fb70a005481c1a8973420901f57c5b84b1
+EBUILD layer-shell-qt-5.23.4.ebuild 774 BLAKE2B c9d67cddba2af4a896065d3c3365fffed9f3527dd11ff41f046d50c242bfece07d26ffdf0f9ba03a7860ad64541036736a261f97036130794f4c0527a7584717 SHA512 21a45834a7e4fe97e0698d9286808fc6c5601939557a71a8f2176c4779bd4c39955c59ea01d717400f8d03dffe68b42913bb3664e9d769c52bababeae9b598da
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild
deleted file mode 100644
index a83e73a29d85..000000000000
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol"
-
-LICENSE="LGPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
-# slot op: various private QtWaylandClient headers
-RDEPEND="
-	>=dev-libs/wayland-1.15
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	|| (
-		>=dev-qt/qtgui-${QTMIN}:5[libinput]
-		>=dev-qt/qtgui-${QTMIN}:5[X]
-	)
-	>=dev-qt/qtwayland-${QTMIN}:5=
-	x11-libs/libxkbcommon
-"
-DEPEND="${RDEPEND}
-	dev-libs/wayland-protocols
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.4.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.4.ebuild
index 582e24874ff2..df2ecbc776a9 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.4.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-she
 
 LICENSE="LGPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index f8b7c1000592..57b425788a14 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,3 @@
-DIST libkscreen-5.22.5.tar.xz 95376 BLAKE2B e5182f2bbc3805e3aab90966ea2abb91c8651acdd6aa315bd58d9b52320cf56e53588fcd7b8cf97a6b69ad523b7abb886c53a7a72a512aa1d76652e86ec7166f SHA512 3b6ccc3ebc813345dec6955ce95bb8601879614a89fc8b319da2430d261dfa0d326c64a19d3e01fc9c3379f3b876c56fc3da4ade5709aaa0f31217dd04d9a226
 DIST libkscreen-5.23.4.tar.xz 97936 BLAKE2B 39cf833170ded9e7a94f16593d66a1dfa7865d3cfe23b3de3196664ec9c95a4a0bfd412a269e2007857c275486fda657f33772a9086f48f42c20367f5c789ed4 SHA512 78eb13063f3a26a6ab7cc87862f1f475cdd3b3e5f591ce55146688a11678c768aa2632388582a9137b9d203c57d542d29ad7e6b0f620050ce70156891def0436
-EBUILD libkscreen-5.22.5.ebuild 652 BLAKE2B adf64ade89ad9189df3cb429cefad5e86e6522898c22c75c56461393b05a10064f583d5964e159ee17abd6f5d909b9e661adfcfd59679e820f658ee1ed3401ad SHA512 6161c7319d3b0707380aa467775a294416f5075d857a028e513d2e8e01eb4dca8c9325c40ba93b2c4df846243ee2cfc60adad4ce5322973d90bc9b3439edd352
-EBUILD libkscreen-5.23.4.ebuild 655 BLAKE2B 9b085cbbcadd214d9f3dd2705973bddc0c31f862a5ebaf3c4f34ab38b179c843eaca0f7357de6662a72726a4a6fc2724cf91ff9b5d9f1f1a42a5711a07e9cb05 SHA512 460040c26869449e936dda73d629ecf6393fd8fadb94565619c7eccf19592af2533ea2357d829b0ba9d932d1d519f84f8683c7ec5a170cce7df53777092f4476
+EBUILD libkscreen-5.23.4.ebuild 652 BLAKE2B 7f98b7f967abd4a977447513f67ec907c27aef28533fa797a25c8aefa768702113ba4aeff5a2e5fd347903a4793f7788513b57a25c06e2c6ae317fd42ac6eebc SHA512 814e539d30c0cae66353c8764f1a82bfe1100b193de94134c8143f5dbfbb48c2ca96a89576fbc3a77394026550db691bd85513c2c1a483d8530c027d8cdce496
 MISC metadata.xml 406 BLAKE2B f47c4d7eab804ce88be47f9723f0610045c62b51883ad7877b00388cff9c2a6cd1e72afa24076c1c9affae154d6cc881f33eab04b862c4e40f708fde341a4883 SHA512 47370335bdf14118dacfa8189bcafd2089a2ec131c62d2c07a21ea4db32d837de1f5765be2907fd709b263f5fd3c3b2c5f12da1646ad5d9ff6d2b9ea9f99ebf7
diff --git a/kde-plasma/libkscreen/libkscreen-5.22.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.22.5.ebuild
deleted file mode 100644
index b545bcd9bc4a..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.22.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE=""
-
-# requires running session
-RESTRICT="test"
-
-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}"
diff --git a/kde-plasma/libkscreen/libkscreen-5.23.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.23.4.ebuild
index b240516c9862..985acbfc30fb 100644
--- a/kde-plasma/libkscreen/libkscreen-5.23.4.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.23.4.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Plasma screen management library"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # requires running session
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index a194047c9fb5..2be7e2a6ac18 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,7 +1,6 @@
-AUX libksysguard-5.22.5-no-detailed-mem-message.patch 1100 BLAKE2B ca0d79c17109b9a24258c48a59efc3a8f66b28bcfd15ec1168f6276ea9568530abbfe442db7fdd9bd524409fac5cad951de44778df382e48b731d3d33fd68479 SHA512 20fd323fd34c6f46d4d3116c85edbeb8feee048890c5c78d1862891937962d5b04ec2e1d1429826f4f3999d6413d09040307322ae16284fb8c8f31e301290e65
 AUX libksysguard-5.22.80-no-detailed-mem-message.patch 1091 BLAKE2B 1c15fbea7e0f46cb60f1423523eb53ed564b2d0d8d6ab0429851f1e73e1aef844cbdcb23cfa70c4b0aac125587caa924fed50da94c5cb8de49d5f215fd38c03a SHA512 281b047e7f7e4d3a8e8d5ca9247dd4aca538cb13d1ff3e35303c059187140586233cff1b7c50caf5f289f9e4f63a2f57421ff0389cbbb50ad3f408a2addb396b
-DIST libksysguard-5.22.5.tar.xz 736820 BLAKE2B fab0f51362bd973d1b5d1ed2e393614b12e334f002b1bdcd8d2c4d582e2dcf03dabad86cf325944bdc565fb9098a361b73ec5645a0b2887b585c57c0f0acff06 SHA512 e7f14519d35146dce9eea3903cfda25e63d819a6305b099786404f2eb44b0923cf2296cf576e33b9f642c0934e7baff6fd87ffc505cc2af9f5807082f3aefd80
+AUX libksysguard-5.23.4-fix-segfault.patch 2863 BLAKE2B f29737e9bea3c9ab75e3b7e349577eb368543c18e2f54a999f1cd67a9ae6d81e438dab5567635aa665f8c53087cd03e2a1345fbb0e58825ffd638c691ab26363 SHA512 681eb69991d14c063e070334bb8ea5b14e7efa1b4eef4e823581f575f19d121ee9a65b0d54e810b772c65d418410fc85093daf6fcc1c10a816ff19dad28de518
 DIST libksysguard-5.23.4.tar.xz 769308 BLAKE2B 05238556867dc054d4c9bd5eadf6c16db6ffdbb481c93a3efc4e83059da6eea73233723ba273a9e5702a2f00a669f8fd0ed54c4a44bdb8797bbc3bb453a71a84 SHA512 8a6c3f06e5f502e9d45fd3ff58fb1da41bd1581164c5054ce79cf2e34c2ece6df22c3b0ab6d33d74d37a97c36cfa076b3a2e459504ea3d3e48d12058aae48648
-EBUILD libksysguard-5.22.5.ebuild 1795 BLAKE2B b750fa9d5ed0e13f8f5959db8a36650ae94ab73a9f6b17640f74072481b9a7753bb16684508b17b74ad236639f66fad5e2e6636a464a872c84402c2903d61243 SHA512 5dba3b166d5e56bd0adea34f7407312abeab0d051e20aacd1cc0cdee7e5017d2133b5d7b3098dbb132b08d6b9fe793a4e1e78d1d53c6d8cfc9fb25a671179145
-EBUILD libksysguard-5.23.4.ebuild 1830 BLAKE2B 822bafb786ed86f9c829416e52924d1439b5bb105505f0a08cf35e2e1a51bdd0194246dede9b7f3d90298af09af8c8ca10a5945cd0c61c5fd205cd9f4801ede3 SHA512 04a9bfc170ad79dd428046cdb115bc4fee71cbf6cf45bd487dbeaef8f793dfa626d895fb06e0c6ff5457b9c845b0a33e51ec93c5b64c5023ff68acc27fc9e21c
+EBUILD libksysguard-5.23.4-r1.ebuild 1898 BLAKE2B e51a96e3588e4c63376d0d367c4a78fd21d04bc383705da95a50cef1a243c3e53e6f8c3562ec0d380312355c60e420216ee0fb447116f2d4c5badd5cb508f37a SHA512 17c84f9cd86554904f0923c0363a5f361294293608dd70fbb751f8da39d9c501c266892c33fd2e7698eab0c7cb57cdf1eb6197399daaac8a90c189f646d58d1f
+EBUILD libksysguard-5.23.4.ebuild 1827 BLAKE2B 1a742ce353de1c7a94c2ae52b8acccc41cfbbeb628619b167c4cd668c86a72d956875293722e61bbe00a79c00d80447c02a6f7b14f266a6046d16a6492b56c28 SHA512 190c474773b0b34d44a12081a3d95ef5681d868a42fa792eaa4f76427b401a67b5cb4df9949a5bfdc49b28d9aa711311044d334d152646b2e4157aa308e9fb9c
 MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch b/kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch
deleted file mode 100644
index 352cad76b765..000000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a81b823c8e169ee5a4212070a9cc77dad27aa7b6 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 7 Sep 2021 16:08:30 +0200
-Subject: [PATCH] Gentooify message about QtWebEngineWidgets
-
-Translations can not be provided for this.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- processui/scripting.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/processui/scripting.cpp b/processui/scripting.cpp
-index 2e95624..c69a123 100644
---- a/processui/scripting.cpp
-+++ b/processui/scripting.cpp
-@@ -243,7 +243,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) {
-     mScriptingHtmlDialog->webView()->load(fileName);
- #else
-     QMessageBox::critical(this, i18n("QtWebEngineWidgets not available"),
--            i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution."));
-+            QStringLiteral("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available."));
- #endif
- }
- #if WEBENGINE_SCRIPTING_ENABLED
--- 
-2.33.0
-
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch b/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch
new file mode 100644
index 000000000000..f37fbf60bf81
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch
@@ -0,0 +1,76 @@
+From 311faef0ef0e5f60eebed2a5a00c43f5cb60aab1 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 7 Dec 2021 22:23:17 +0100
+Subject: [PATCH] Handle process parent changes in ProcessDataModel
+
+When the PPID of a process changes, it moves around in the model, changing the
+layout. This needs to be announced properly, otherwise users of the model get
+confused, leading to weird behaviour and crashes.
+
+The added code is pretty much a direct copy from ProcessModel.
+
+BUG: 446534
+
+
+(cherry picked from commit a0d70929a1b5e38bd8bf61e1895321124acf03a7)
+---
+ processcore/process_data_model.cpp | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+diff --git a/processcore/process_data_model.cpp b/processcore/process_data_model.cpp
+index 172ce7f..f776372 100644
+--- a/processcore/process_data_model.cpp
++++ b/processcore/process_data_model.cpp
+@@ -24,6 +24,8 @@ public:
+     Private(ProcessDataModel *q);
+     void beginInsertRow(KSysGuard::Process *parent);
+     void endInsertRow();
++    void beginMoveProcess(KSysGuard::Process *process, KSysGuard::Process *new_parent);
++    void endMoveProcess();
+     void beginRemoveRow(KSysGuard::Process *process);
+     void endRemoveRow();
+ 
+@@ -65,6 +67,12 @@ ProcessDataModel::Private::Private(ProcessDataModel *_q)
+     connect(m_processes.get(), &KSysGuard::Processes::endAddProcess, q, [this]() {
+         endInsertRow();
+     });
++    connect(m_processes.get(), &KSysGuard::Processes::beginMoveProcess, q, [this](KSysGuard::Process *process, KSysGuard::Process *new_parent) {
++        beginMoveProcess(process, new_parent);
++    });
++    connect(m_processes.get(), &KSysGuard::Processes::endMoveProcess, q, [this]() {
++        endMoveProcess();
++    });
+     connect(m_processes.get(), &KSysGuard::Processes::beginRemoveProcess, q, [this](KSysGuard::Process *process) {
+         beginRemoveRow(process);
+     });
+@@ -335,6 +343,27 @@ void ProcessDataModel::Private::endRemoveRow()
+     q->endRemoveRows();
+ }
+ 
++void ProcessDataModel::Private::beginMoveProcess(KSysGuard::Process *process, KSysGuard::Process *new_parent)
++{
++    if (m_flatList)
++        return; // We don't need to move processes when in simple mode
++
++    int current_row = process->parent()->children().indexOf(process);
++    Q_ASSERT(current_row != -1);
++    int new_row = new_parent->children().count();
++    QModelIndex sourceParent = getQModelIndex(process->parent(), 0);
++    QModelIndex destinationParent = getQModelIndex(new_parent, 0);
++    q->beginMoveRows(sourceParent, current_row, current_row, destinationParent, new_row);
++}
++
++void ProcessDataModel::Private::endMoveProcess()
++{
++    if (m_flatList)
++        return; // We don't need to move processes when in simple mode
++
++    q->endMoveRows();
++}
++
+ void ProcessDataModel::Private::update()
+ {
+     Processes::UpdateFlags flags;
+-- 
+GitLab
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild
index 75b9c0ee7c19..86139aca748a 100644
--- a/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.23.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="true"
-KFMIN=5.82.0
+KFMIN=5.86.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -14,7 +14,7 @@ DESCRIPTION="Task management and system monitoring library"
 
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="webengine X"
 
 COMMON_DEPEND="
@@ -37,6 +37,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	net-libs/libpcap
+	sys-apps/lm-sensors:=
 	sys-libs/libcap
 	sys-libs/zlib
 	webengine? (
@@ -58,7 +59,10 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-plasma/plasma-workspace-5.18.80:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-no-detailed-mem-message.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" # downstream
+	"${FILESDIR}/${P}-fix-segfault.patch" # KDE-bug 446534
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild
index 1a8b55594efa..413701ff90e8 100644
--- a/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.23.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Task management and system monitoring library"
 
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="webengine X"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 5bd3fed3ff20..f1801f8be5d9 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,6 @@
 AUX libkworkspace-5.21.90-standalone.patch 4996 BLAKE2B 1f09de9fbd1426fc065066897b1b966cda3993f0b1b6ac2a490d4c3c71863b93212e58ccc87353dc836fd58d969cc22c0a3ab8e6c6aacf81ac35823624e693dd SHA512 8702b74cdefbfc793e9ec0a1ce6ed6cca9f92b6c2d8c60d1a40c1530336af9c212d460ebca31ba8d28e3bcb02c1e6ae99dbea39d3572f1658e8d3575d1d947ca
 AUX libkworkspace-5.22.80-standalone.patch 4984 BLAKE2B e0f5c36ab657600326d0cbd29fe51c5ac6cf264caa7ec4c04473a2c5bf88113d8496b45618db103dd2e078efc1350b9fc613b25aeaa58bf0957d22ca4d37e5a0 SHA512 20c790d4860aec20b415c5c236537a5d8caf5666432c513adda0782694548320dc918c0d093ee0b716943df1fdab56c03a56f18ec691b0fc517443c35d0335ff
-DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
+AUX libkworkspace-5.23.3-synchronous-dbus-calls.patch 1532 BLAKE2B ac54ae6e42b9e20633b33d3f42e00b184f0d65fa57ffffab7695a1463631b7f577a25722d8c3dcc51bfd55023cf30d22d1a73eb1f9c065a3800a81d6ecf27569 SHA512 927ab4b0641285094b6599384012a629b27ec596291c124b3dc01176dfb781b0b551b920d651738b518dba4f0b71426d671f8d977856c6c12221e3e6cb57f3d9
 DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
-EBUILD libkworkspace-5.22.5.ebuild 1323 BLAKE2B 9c12d79979232dd53793878411e837800219b0da9a762aae21abcb4c7b6a0d7c0dca0e18f464a7607f75f4a7145c01acef15720730dd6599acd1b02ea6e10fe8 SHA512 62a495d6647173f8845e549b749f64b0b93136f1535a7943417e55bff603d9c7fc3259ec32e2901018332ad00145e7b8708864ebc1f795bb35bc63846ffebe37
-EBUILD libkworkspace-5.23.4.ebuild 1326 BLAKE2B 030ab1b313e6c1e13dfe580fc864120fbe174c5c6464f0ab92dbbd9d1f3a27f76f58f62fb0c62e2148e27aae4d00475f3c1a3ec6f712c307df8e33ef8beb442d SHA512 5d9581a1ec9b6ef4116a67b54ff991e13e413b0282ba28db62e6793910f32e66fd7cddc783f52f31876d61875c9b7f87fd688ce132919dde6a83c8c67ee84ee3
+EBUILD libkworkspace-5.23.4-r1.ebuild 1487 BLAKE2B 3ef83e814198a034b2abe01575d478edbfa99273a4060324a9d87f5b913a7299ea929295b4c0795e8e9b726d27ed6590144f2f18d6d7b560bba6c345a0079b8f SHA512 d79f548ef37bd87f0a35be5ecec6dde502f885dfe61b77a109763bcc24163ad2f3f92c5bf30826ef6d785b9db882273a326e327d78a5ca144226fe8c80e9968c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
new file mode 100644
index 000000000000..411bebf70412
--- /dev/null
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
@@ -0,0 +1,48 @@
+From 9ecd45f28dc5c3a4b1716d09e0ba121ec5fb2a50 Mon Sep 17 00:00:00 2001
+From: Joe Breuer <kde@jmbreuer.net>
+Date: Mon, 1 Nov 2021 07:19:51 +0000
+Subject: [PATCH] Fix sleep/suspend sometimes not working ... from
+ ksmserver-logout-greeter, by making the DBus calls synchronous.
+
+---
+ libkworkspace/sessionmanagementbackend.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/sessionmanagementbackend.cpp b/sessionmanagementbackend.cpp
+index 83cd39395..a77a8a475 100644
+--- a/sessionmanagementbackend.cpp
++++ b/sessionmanagementbackend.cpp
+@@ -137,7 +137,6 @@ void LogindSessionBackend::shutdown()
+ {
+     // logind will confirm credentials with the caller, if the app quits after sending this
+     // this may fail
+-    // its not really needed for suspend tasks where the calling app won't be closing
+     m_login1->PowerOff(true).waitForFinished();
+ }
+ 
+@@ -148,17 +147,19 @@ void LogindSessionBackend::reboot()
+ 
+ void LogindSessionBackend::suspend()
+ {
+-    m_login1->Suspend(true);
++    // these need to be synchronous as well - ksmserver-logout-greeter specifically calls these
++    // and will quit immediately after
++    m_login1->Suspend(true).waitForFinished();
+ }
+ 
+ void LogindSessionBackend::hybridSuspend()
+ {
+-    m_login1->HybridSleep(true);
++    m_login1->HybridSleep(true).waitForFinished();
+ }
+ 
+ void LogindSessionBackend::hibernate()
+ {
+-    m_login1->Hibernate(true);
++    m_login1->Hibernate(true).waitForFinished();;
+ }
+ 
+ bool LogindSessionBackend::canShutdown() const
+-- 
+GitLab
+
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild
deleted file mode 100644
index fcf6591d2def..000000000000
--- a/kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-"
-
-S="${S}/${PN}"
-
-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
-
-	eapply "${FILESDIR}/${PN}-5.21.90-standalone.patch"
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die
-	cat >> CMakeLists.txt <<- _EOF_ || die
-		ki18n_install(po)
-	_EOF_
-
-	ecm_src_prepare
-}
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.4.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.4-r1.ebuild
index aacfb311c9ba..73ad0d49376d 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.23.4.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.23.4-r1.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
@@ -37,6 +37,11 @@ DEPEND="${RDEPEND}
 
 S="${S}/${PN}"
 
+PATCHES=(
+	# Pending: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164
+	"${FILESDIR}"/${PN}-5.23.3-synchronous-dbus-calls.patch # bug 818124
+)
+
 src_prepare() {
 	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
 	if [[ ${KDE_BUILD_TYPE} = release ]]; then
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 111915e602bc..49dc27cc28b3 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,3 @@
-DIST milou-5.22.5.tar.xz 52868 BLAKE2B 188d764cf5ce14db38368cf3b1bb8a1fb62796f8eaf2e3933d53714bcb94eee657c88dd3fb485ad1471a9f22fa19fcad4e0262ec953f366aa2cc4b88d0ae6a51 SHA512 9be952458c3e5c6b0cf99fde2c6dd810f109af5c6c1fecf0419b615ebeaf5c2794301ed7d96e234a4b111fb8e5d63e11e9848f7112bc16580fda7ef107b81d60
 DIST milou-5.23.4.tar.xz 47896 BLAKE2B 76a245f32a0fb8b1d8e6c737a7df594f73a7f420265f80abd6456b31722bb50518999bf7e1ab52ef6f0bea6474896095c7d86cccc07b5292ac86675478a12396 SHA512 84d814af00914acdd0738e331eb64200a40ed4474809bb995a08f0cf7aee57a1de74c887206bdec49e0059860fc07757b1d33f9d7f89c0c410171ad0bfe59a21
-EBUILD milou-5.22.5.ebuild 830 BLAKE2B 324e7db8cdd4d87bc1604daeacfed77107009f9838855b832792b3183256cefca6c62142047680e169fddc41f1cad617a601fa098c367d201af896925c69dcd0 SHA512 e835203dd8d8d215dca1faa0c6ba3d132a3e2db48c20347906160400e039d17390767284070ba3e9b80701595cb24c9d8b71d9e8db563c911913b475f2831762
-EBUILD milou-5.23.4.ebuild 833 BLAKE2B 4b615f068454fea67590730832bb06fb1904c578a4ce95b6dfe5bfceae9e6082ddd5543c7678ba0281f4032b37e491085f20d65a22117d74b15dd1d59ce4bb57 SHA512 7196394085e2ee49ec035cb8485736919186329ff069107a7144cbfaaac5afd9c37cc50a721f5b7252451bb925ec62020261a3edb08e8f41352f6b57848a243d
+EBUILD milou-5.23.4.ebuild 830 BLAKE2B 9953ffe00c7ca1ab0a95d74d0df0fa545a9d1bb44cc6d233d9820e399d950684e255e5357c918c769a5e3532d50b1ba4dd81ddeba0e1e8991efb1e183e858316 SHA512 9ede7c436eeb9d8adaf40541032c04b6fc54780c988a650c654167c4dec809a7cc47f2e0f887a29f4204ff006c6a7ac339b336ddd8cf135f1f29c4f4afbaad5c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/milou/milou-5.22.5.ebuild b/kde-plasma/milou/milou-5.22.5.ebuild
deleted file mode 100644
index ea3ec038c10b..000000000000
--- a/kde-plasma/milou/milou-5.22.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv 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}"
diff --git a/kde-plasma/milou/milou-5.23.4.ebuild b/kde-plasma/milou/milou-5.23.4.ebuild
index bfa5e8e64e63..e747b36bbb89 100644
--- a/kde-plasma/milou/milou-5.23.4.ebuild
+++ b/kde-plasma/milou/milou-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index b952a66c6959..b38288f541dc 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,3 @@
-DIST oxygen-5.22.5.tar.xz 4471020 BLAKE2B 3462d89fc6d151d9a746290374c174066eed0e95404b8a6fd4c1810b185ed3d74ef78e76c583750dafb2d29cc7fcb9ddfd6415db061fcad6040984e0145fd1f5 SHA512 5002d0260a5bf93ac98d9262330f4db8484c0a6ecbd217783321bf916ef4a8f27e5c94d301e6da95cf8f276ab210e14765439f8ff6be44220e8f526d7bb24fe1
 DIST oxygen-5.23.4.tar.xz 4610840 BLAKE2B 25851aafd7fb72169bf7d49b948d7f0bc28974e88dd0d93952c6fffe4a27f105a8050e7917119fa7502b2bf02d9d32e4e0910db56f61780f368656940c25f93b SHA512 2ddeb2c0770592508c5b7ad8b913790dfccb819450bd02a09bea4a1721cee9d4c2ebf8aba20a8db606e4bcaefc6fd24e05f4d7fb45a1e4571a3b5394a70b50b5
-EBUILD oxygen-5.22.5.ebuild 1370 BLAKE2B 657951f674910aec6346e3e42f09709e65adeb4e947c5a0e755a0eca3fb50148177db7812a7d6506b3eaf904fe71d00b773a2b8057ed3c81d8f0a1a50c2a41e3 SHA512 59a49e5933c8c1a3622163ca2295083efd38c89348fa4503ee78d8db005dad28ffd49c16d8a9a4aebcbd8f3f87c62832ebbe0df57362679e0a9d51b647e630f9
-EBUILD oxygen-5.23.4.ebuild 1373 BLAKE2B 943f67c8008c8ad3dd4ea9f9c274735d2a973ad265333f8fca40ac054a86de687f12cba7294828319ba836e4a64286458f3c5973c9ffebaf6aff0d2b8dfb73d0 SHA512 27b98fefdf1f655428b94c198fde0451a5d236ab01b507be9fc278fa5910262315893f8e1c8c258fbf9c4f697daaf5f69f7d73208a6c6a622a8285f7b6d0ed84
+EBUILD oxygen-5.23.4.ebuild 1370 BLAKE2B 06751345300f5a7f4a19ea82a0f39124535d3a245160fb7f64f0b45816a6f74d6de51208f72801f2c21c1fd34199f0d65dd704e3f54a015bf1d046f060897614 SHA512 4b73dc78e95ac3b8a58472ec1ad92f99a076fa66aeace3818a27f09235e2ef8baff3dba1c9e1264626241d1cd665081a49033ec14cbc34a0b032729220757179
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/oxygen/oxygen-5.22.5.ebuild b/kde-plasma/oxygen/oxygen-5.22.5.ebuild
deleted file mode 100644
index a43338ba6540..000000000000
--- a/kde-plasma/oxygen/oxygen-5.22.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv 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.23.4.ebuild b/kde-plasma/oxygen/oxygen-5.23.4.ebuild
index 3123e9e382a9..475d9fed008c 100644
--- a/kde-plasma/oxygen/oxygen-5.23.4.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.23.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 3657a36fa538..c9e1acfad94d 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-browser-integration-5.22.5.tar.xz 214448 BLAKE2B 114baa04ab7fad7a3450c199b405afc3d0ce6c4a7e7cf8828dc15e509417de003ffb6b73a002b52b5d8a46f566a63320d33d23fdb8a60484e65c0176afcfadd1 SHA512 8cc29cc51c6cce4dd31677cff8851d58eb0dded0d41c52e0fa488a6f5a803c46b0f29ae02642707a039a283e19ea49fe2dac36604202282f6a62cd0f8716940a
 DIST plasma-browser-integration-5.23.4.tar.xz 219640 BLAKE2B bb0659cfeeaa542d3ae054d1d3ca89cea1ecd3d88af076f198b5eaea95aba4aa6e42a511af05b2b4e2e107680fb624030d7ce7ef3b136de5326e0ee210bb74ee SHA512 cd5b4f47081956f1bdde5ea9d79efa8ad38bcb21417ebcd12191f47215dd21f406772502787091b0342c70e052a9fbd652b4ad026a7bba0c7b7675ca137b03ef
-EBUILD plasma-browser-integration-5.22.5.ebuild 1123 BLAKE2B 7506e1e1864f26192f29af82b8d058c8a0c59077692d5ecaa317761b73205ab83e498d6b46436a69f76714680a42a5c73cf637538e357318005d4f8c25d58f18 SHA512 6260299785df3d8ea1cc2d5c575849586d6ebc77f92f22c6692e1daa65aa5ae63afae1cceb5062dc6b410ec02634db98762cb7daedea906ea99182bcb7636bd5
-EBUILD plasma-browser-integration-5.23.4.ebuild 1126 BLAKE2B 001c0911ba75cc6015388bc96a1fd821ea9a90efdcdc7e12d860669d13fe739ec7fb2b3cf15c3c740a4c19a58424aed5eb3735a975262d7917b0b7abfc405d33 SHA512 d64296a3dc50b22c9863bbb3bd9d1b6d74138e5c17a59164b4e1f4b5bbb07b959cb7d889a8d8c1fd11959e74fdd54f2627123fda67ec94c73fdab1600215279e
+EBUILD plasma-browser-integration-5.23.4.ebuild 1123 BLAKE2B f2e57be0a377cc124ab5d2303cf26be7f8e99b513369ac2f4031b4c67e69e1aae22b520bbbcd2add2a5c84b417d767431b1bb4138a86a9d0c8d5fb4f1f15389f SHA512 a09443dec6d8683af535b959f455678dd2b8cd51d6aa807eb2a1979f6dbbf363233bd2b3e5698d5dce42317f467744b644d6a2dbef184f6d3bbb24638252d6d9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.5.ebuild
deleted file mode 100644
index 0ab817c24808..000000000000
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
-HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv 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/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}: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.23.4.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.4.ebuild
index 83cbeb103590..6c78bbdef127 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.4.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index b91141719374..8bfb9edb2833 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,6 +1,7 @@
-DIST plasma-desktop-5.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac
+AUX plasma-desktop-5.23.4-fix-panel-initial-sizing.patch 4777 BLAKE2B 9f085e07968f1ab8f61185b398e7b17dd155eaf00d3c03ce06593f47184277cee7beaca91635364b383af502fc88ebbfe3d460beae4ed8ee8fa5427a5ff7b014 SHA512 063486320416c80ef9df98a978ffa2caa2df45e77226a27d47586e7c25304e6aa89c3776e9954a8ee63a364065c5ce8f2208a5bc40bd9900c986eb8479ce9b8f
+AUX plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch 1763 BLAKE2B 914ca5adea4cff6edd2d2a8884c6de355b07a681957a9dbbb7c2208c82170befb0ddb52c0e65b070aef0ddf0149e380668dd179a5886fbafe8c0b0e45619a6e5 SHA512 3d90ba82ba8825c6cd91878e0d156838ee1e9a12a65a37ef0f4ce92b6ccc9cf2ffbd7f167b58389c3d6a3997078cfd4be02d6d3a478342970290be6b9eee0e3a
+AUX plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch 1131 BLAKE2B 708014048f1d08bb3913f6501c32e25350a579f59f6aea7588d351647083ce67ed4ee154eb0f6aa6ae1c238c2f84124a854745313a600521799241aed244e1cc SHA512 96ac54cbf027614095734282470252c16b0f96e214b692bff2565d836ac46dd48f83430b8acb915695a4bac32ed1eb7a8a2f56c0133e097318bf9c8583b2b36f
 DIST plasma-desktop-5.23.4.tar.xz 15796556 BLAKE2B 876d308272bfd395ba3006cf70aa3bd3fc4fead5000cddf49c6be0bdfc95bb171c4dcac23636341766318d0156c7d473b9a8f5f0e37a57ea4e73b4b224b85abc SHA512 afbf8d3f7ca755ec207cda5258329b4f77dc0b26cd735eeb67e266d0937e892dc63172822792ffc7053cd52b9a34253cd4dcd1d1f52b54dd8a80f4dfa31a9f08
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
-EBUILD plasma-desktop-5.22.5.ebuild 5429 BLAKE2B 979ca198a875cc14e82a5f1acc21f5c61b595febefae0ae63f107498f7267919dfb4c7d8821aeccf615c2d39ddacd2f17b0bce1bb5c1cc0fb3fdb0edbcc792b0 SHA512 cb2212107565b78a19b580178e4b9c7dfff84cc095d0ac6d291c9003de86d0adc7def98378e3a07a7d4106e5c83f62690baa5075592bbecae2b1d523f17dd98b
-EBUILD plasma-desktop-5.23.4.ebuild 5432 BLAKE2B 8e7005a94b9a7eba8e9e85ad94d234116d7d1ec1be685ecbe1f35a7ea8cc28532e6739a3284ca3b5fd230f3a4183d0d34d8606de91dd50d30f78305b4f9598cc SHA512 e7638797533bbeccf0a6f49ac64b31f34b0b241ee2f6e8c295b08e3f0b4d8c0450095e3191eef0a966c3abbe078e0d3eaa2c42282fa3e3c43d9f2ef70cfc1c35
+EBUILD plasma-desktop-5.23.4-r1.ebuild 5635 BLAKE2B 6230e3fe289231dab4e97408e3c49312b0d401c14fc1a2ffdb296203e9828a3b1300acaf8a344df2c6d180299521d5bb15f40fc4a01ce842c64d2518b88a5b9c SHA512 533a0a98e189457b08e960c0f7017c71595a376599cd4c03d7132a37a98b8dba3904c0defaa409910afa2f53e70c11613537694ee051aa0305b5bd71509ff3a0
 MISC metadata.xml 807 BLAKE2B 50ef818039bb95543085a7c18aa1b60bd4a9b235380e594ff1cbef8a30c571d93de5c8e82974b03de706818bf5b01657dc8f0db12ff36e665e4aecf4b922566a SHA512 f209621d214fdfd9c6bbf2c67b8453c45a3a7d645077d7b2827021648d74c4e449b8c64d1f5ebff100bc9141f341f4ca0aa5dfc884a4081001dec30ba1b2d724
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch
new file mode 100644
index 000000000000..d77187409738
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch
@@ -0,0 +1,126 @@
+From 9f19af95e9699420b057b6ff7e99968faf8948a3 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 3 Dec 2021 16:34:40 +0000
+Subject: [PATCH] containments/panel: Fix initial sizing
+
+Timers for anything that affect layouts are universally wrong.
+
+Ultimately this breaks layouts internal usage of QQmlParserStatus. For
+runtime changes layout internally most relayouting is buffered
+internally till the polish event which is once per frame.
+
+Removing this makes startup faster, less glitchy and more declarative.
+
+
+(cherry picked from commit b2fd1578a0063938a3eda8d8e41f14394b7635f7)
+---
+ containments/panel/contents/ui/main.qml | 34 ++++++-------------------
+ 1 file changed, 8 insertions(+), 26 deletions(-)
+
+diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
+index 0a5477476..9b5656acf 100644
+--- a/containments/panel/contents/ui/main.qml
++++ b/containments/panel/contents/ui/main.qml
+@@ -154,14 +154,12 @@ function checkLastSpacer() {
+ 
+ //BEGIN connections
+     Component.onCompleted: {
+-        currentLayout.isLayoutHorizontal = isHorizontal
+         LayoutManager.plasmoid = plasmoid;
+         LayoutManager.root = root;
+         LayoutManager.layout = currentLayout;
+         LayoutManager.lastSpacer = lastSpacer;
+         LayoutManager.marginHighlights = [];
+         LayoutManager.restore();
+-        containmentSizeSyncTimer.restart();
+ 
+         plasmoid.action("configure").visible = Qt.binding(function() {
+             return !plasmoid.immutable;
+@@ -200,7 +198,6 @@ function checkLastSpacer() {
+         event.accept(event.proposedAction);
+         root.fixedWidth = 0;
+         root.fixedHeight = 0;
+-        containmentSizeSyncTimer.restart();
+     }
+ 
+ 
+@@ -215,8 +212,6 @@ function checkLastSpacer() {
+     }
+ 
+     Plasmoid.onUserConfiguringChanged: {
+-        containmentSizeSyncTimer.restart();
+-
+         if (plasmoid.immutable) {
+             if (dragOverlay) {
+                 dragOverlay.destroy();
+@@ -245,11 +240,7 @@ function checkLastSpacer() {
+         }
+     }
+ 
+-    Plasmoid.onFormFactorChanged: containmentSizeSyncTimer.restart();
+-    Containment.onEditModeChanged: containmentSizeSyncTimer.restart();
+-
+     onToolBoxChanged: {
+-        containmentSizeSyncTimer.restart();
+         if (startupTimer.running) {
+             startupTimer.restart();
+         }
+@@ -478,10 +469,16 @@ function checkLastSpacer() {
+ 
+     GridLayout {
+         id: currentLayout
+-        property bool isLayoutHorizontal
++        readonly property bool isLayoutHorizontal: root.isHorizontal
+         rowSpacing: PlasmaCore.Units.smallSpacing
+         columnSpacing: PlasmaCore.Units.smallSpacing
+ 
++        x: (isLayoutHorizontal && root.toolBox && Qt.application.layoutDirection === Qt.RightToLeft && plasmoid.editMode) ? root.toolBox.width : 0;
++        y: 0
++
++        width: root.width - (isLayoutHorizontal && root.toolBox && plasmoid.editMode ? root.toolBox.width : 0)
++        height: root.height - (!isLayoutHorizontal && root.toolBox && plasmoid.editMode ? root.toolBox.height : 0)
++
+         Layout.preferredWidth: {
+             var width = 0;
+             for (var i = 0, length = currentLayout.children.length; i < length; ++i) {
+@@ -505,36 +502,21 @@ function checkLastSpacer() {
+         rows: 1
+         columns: 1
+         //when horizontal layout top-to-bottom, this way it will obey our limit of one row and actually lay out left to right
+-        flow: isHorizontal ? GridLayout.TopToBottom : GridLayout.LeftToRight
++        flow: isLayoutHorizontal ? GridLayout.TopToBottom : GridLayout.LeftToRight
+         layoutDirection: Qt.application.layoutDirection
+     }
+ 
+     onWidthChanged: {
+-        containmentSizeSyncTimer.restart()
+         if (startupTimer.running) {
+             startupTimer.restart();
+         }
+     }
+     onHeightChanged: {
+-        containmentSizeSyncTimer.restart()
+         if (startupTimer.running) {
+             startupTimer.restart();
+         }
+     }
+ 
+-    Timer {
+-        id: containmentSizeSyncTimer
+-        interval: 150
+-        onTriggered: {
+-            dndSpacer.parent = root;
+-            currentLayout.x = (isHorizontal && toolBox && Qt.application.layoutDirection === Qt.RightToLeft && plasmoid.editMode) ? toolBox.width : 0;
+-            currentLayout.y = 0
+-            currentLayout.width = root.width - (isHorizontal && toolBox && plasmoid.editMode ? toolBox.width : 0)
+-            currentLayout.height = root.height - (!isHorizontal && toolBox && plasmoid.editMode ? toolBox.height : 0)
+-            currentLayout.isLayoutHorizontal = isHorizontal
+-        }
+-    }
+-
+     //FIXME: I don't see other ways at the moment a way to see when the UI is REALLY ready
+     Timer {
+         id: startupTimer
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch
new file mode 100644
index 000000000000..1c9a2b79e31e
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch
@@ -0,0 +1,53 @@
+From 2131daa05195a2b55f593acf3d323cf4c2a89936 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 2 Dec 2021 20:13:46 -0700
+Subject: [PATCH] kcms/touchpad/applet: Make the popup close on click
+
+BUG: 445982
+FIXED-IN: 5.23.5
+(cherry picked from commit 4cb2de984ab79bc257af0135bf92ea7390d5617f)
+---
+ .../applet/qml/contents/ui/touchpad.qml       | 23 +++++++++++--------
+ 1 file changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
+index 3f5eb722f..106859c3a 100644
+--- a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
++++ b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
+@@ -56,20 +56,23 @@ Item {
+         connectedSources: dataSource.sources
+     }
+ 
+-    Plasmoid.compactRepresentation: PlasmaCore.ToolTipArea {
+-        id: toolTip
++    Plasmoid.compactRepresentation: PlasmaCore.IconItem {
++        implicitWidth: PlasmaCore.Units.iconSizes.small
++        implicitHeight: PlasmaCore.Units.iconSizes.small
+ 
+-        Layout.minimumWidth: PlasmaCore.Units.iconSizes.small
+-        Layout.minimumHeight: Layout.minimumWidth
++        source: plasmoid.icon
++        active: parent.containsMouse
+ 
+-        mainText: plasmoid.title
+-        subText: plasmoid.toolTipSubText
++        PlasmaCore.ToolTipArea {
++            mainText: plasmoid.title
++            subText: plasmoid.toolTipSubText
++        }
+ 
+-        PlasmaCore.IconItem {
++        MouseArea {
+             anchors.fill: parent
+-            source: plasmoid.icon
+-            active: parent.containsMouse
+-            enabled: root.hasTouchpad
++            onClicked: {
++                plasmoid.expanded = !plasmoid.expanded;
++            }
+         }
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch
new file mode 100644
index 000000000000..07d741424005
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch
@@ -0,0 +1,35 @@
+From aadab772fb81ff3d97c8b5342a8a018f51b2ef60 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Fri, 3 Dec 2021 09:36:47 -0700
+Subject: [PATCH] kcms/touchpad/applet: Fix mousearea lookup
+
+(cherry picked from commit f4060c48b264a5054c2ffa795c208910d42bfd42)
+---
+ kcms/touchpad/applet/qml/contents/ui/touchpad.qml | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
+index 106859c3a..aa1034e59 100644
+--- a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
++++ b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
+@@ -61,7 +61,7 @@ Item {
+         implicitHeight: PlasmaCore.Units.iconSizes.small
+ 
+         source: plasmoid.icon
+-        active: parent.containsMouse
++        active: mousearea.containsMouse
+ 
+         PlasmaCore.ToolTipArea {
+             mainText: plasmoid.title
+@@ -69,6 +69,8 @@ Item {
+         }
+ 
+         MouseArea {
++            id: mousearea
++
+             anchors.fill: parent
+             onClicked: {
+                 plasmoid.expanded = !plasmoid.expanded;
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.22.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.4-r1.ebuild
index 7987075be248..dcd98ea5397d 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.22.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.23.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.82.0
+KFMIN=5.86.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -123,6 +123,10 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+	# 5.23 branch
+	"${FILESDIR}"/${P}-fix-panel-initial-sizing.patch
+	"${FILESDIR}"/${P}-fix-touchpad-applet-popup-close-on-click.patch # KDE-bug 445982
+	"${FILESDIR}"/${P}-fix-touchpad-mousearea-lookup.patch
 )
 
 src_prepare() {
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.4.ebuild
deleted file mode 100644
index 1de5918b5983..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.86.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-1"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
-
-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/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/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/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/libkworkspace-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	virtual/libcrypt:=
-	x11-libs/libX11
-	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
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	kaccounts? (
-		kde-apps/kaccounts-integration:5
-		net-libs/accounts-qt
-	)
-	policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/user-manager
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	x11-misc/xdg-user-dirs
-	kaccounts? ( net-libs/signon-oauth2 )
-	policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use policykit; then
-		ecm_punt_bogus_dep KF5 Wallet
-		cmake_run_in kcms cmake_comment_add_subdirectory users
-	fi
-
-	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
-
-	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
-		cmake_comment_add_subdirectory emojier
-
-	# TODO: try to get a build switch upstreamed
-	if ! use scim; then
-		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
-		-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 kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-	if ! use emoji && ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=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
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "screen reader support" app-accessibility/orca
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index 5f86fc4badda..62f6bc44c531 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-disks-5.22.5.tar.xz 84464 BLAKE2B 983ed0d6a478b601f8183abdb4d971523b30cb50038799a045a4277cf494d18ba3143a119d1e9dfc303576f5f863811934a9592e01211f3b9f0d64cfb6775dda SHA512 a49644a696d00ff84e150e68297a574b5d33190f0ecf407dc741d60f3243fb02507133bcb2e3e7bd1fc860f466a48988ac861e2b518b5a60cad9bc9f51490a1a
 DIST plasma-disks-5.23.4.tar.xz 87056 BLAKE2B 45f9b9530c0b3502dae2cb5e3e3ae61bde8221d4e37a98ccce6fe5bd482a5a06857fdedf35b64e0c4068eefc2e8d8a4a0956d66c2887430e041d4d93245a964e SHA512 282576a339c82538087988fb2ee8c24a2260c55d11248c6f156cf9e2fcc0de01690139a058f89eef87fda2e0db32dd6293efb250810af603efbdbd6143046262
-EBUILD plasma-disks-5.22.5.ebuild 1037 BLAKE2B 3574937dac2667f741c5c91623b88ad653674de6961abdbb4f11d0faa426d4265d10e34da860c0ebca8681d39c94fd347e60299fa77fc9586cbdb662604688d0 SHA512 41da89c2dcf85f48a9c241f607e805bdb8958489e631ee1c31e0f5becbac7540904c69066c53900e7ac87e1030c7293432541c91cdeedfba2d565a0f17693b21
-EBUILD plasma-disks-5.23.4.ebuild 1040 BLAKE2B 3ca014da0abed7652d474b518afdee1cb70f6c74102c5eaec81c622683176a6ae70f9729ee9c209eda98d4feaac8ff861caaa88e90290e1bafa7d33bdddbdc52 SHA512 f1b1798c703ec78c09b2839a6895f5ca3cbc263f07413791a81173276b6b386a0851de6dab5d801e4c0e437975f6f0edf96a970664ecf571ed38d39746c460f6
+EBUILD plasma-disks-5.23.4.ebuild 1037 BLAKE2B 164ebaf66d9ffb629cc93cbb88bf6b26fcb1330f878bc0a0aeac7630856a4250dfec5e08d7436d2ae3eeb830a018063cbc7b964aa539f1d1c80d80c3d96a4f7a SHA512 4af923d64d5c9385cda913d9a3bff70577d6776db3fe6f5cef276306304b6c6d6ccfb44741ad4126605bc99cf8b6ee7ea3b7306f0179e229ab33e4b0a98d90eb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.22.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.22.5.ebuild
deleted file mode 100644
index 005f627e33eb..000000000000
--- a/kde-plasma/plasma-disks/plasma-disks-5.22.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="true"
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
-
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kauth-${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/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	sys-apps/smartmontools
-"
-RDEPEND="${DEPEND}
-	kde-plasma/kinfocenter:5
-"
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.23.4.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.23.4.ebuild
index 3311c0ee7beb..1d12faabf86e 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.23.4.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index dec220bef632..4d3c7a79a87b 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-firewall-5.22.5.tar.xz 339372 BLAKE2B 332a7fd2be63429c452f43371b2875f8838e05b107a6c3472974c5db123eef9e415ec70601cb830a743d77422639225e01611e52c07a2b3fe079572278e2f638 SHA512 cc81884550b5c73061f5a1df24c0b32e5fff234a51e56153e95a9e4b0e23c305a555c2deff69633b9cd21dff7bfbcf5d9fcbd5ab3605d4ffa87be57514a91901
 DIST plasma-firewall-5.23.4.tar.xz 344036 BLAKE2B f4ba093bb21680f76bbb7040b6bdb25c122d38574b1e117fb9966b860d8d68ca19725f2c8656bf187afdea609c1e302b03b876bb4f02d2fe3c8383eb5b626f35 SHA512 2628ce262138e5f7526556d788169e32bb143ca4f63b6dc2fee222ec1772835a6d311e24eb01de73c2fdff52319b74c857990acfe3e960f7025d2c05a3baeac5
-EBUILD plasma-firewall-5.22.5-r1.ebuild 1591 BLAKE2B 5a3ad21785167e8573b8d7cb9653529ee0587a7ab32cf2dd8f310fe683f93cb186fb31e006fadd06b869f3cdff571fcf54aa649386177cd0d3e2d9337ae66421 SHA512 6561cf3917cc7d98fd19a8372c02ca75812d530b10497a2f8d2f1476e4b53e1a2e670b376a4dc825aeefbce0f3a6484bb33adfc43b85c9c5505c377f7c3f6384
-EBUILD plasma-firewall-5.23.4.ebuild 1594 BLAKE2B 2268ee3f73ef09f5f127bb42b4c7c0c0c0533df5cdfb047f407f8d622b2ab5cb8b74935f59f3aa22fed2a1a64f0c08f3257c837421a461d42b67d95c519a9aef SHA512 dd20cf65aab27ae12d9081a8a7ac7df8c2c715e349071fad118f668c9e64114283c8274abbf3a99f3be43489eb30ac557981ed88b034be9f17d0b7ebdf4b93bf
+EBUILD plasma-firewall-5.23.4.ebuild 1591 BLAKE2B 07629ef380960625473cb90f961300f9ef17ec3e24cb8fd9a8ca8495d1d2d2e7632676a132c9fa2eb52c1707c8e9776b474ae3b73d623809218db94da68bc018 SHA512 4a13fef5d2a4daf31a09ce0185d280cd2f24a48f7e9928ae3962954ac86dde1dae5f8381f89db0aa8a0465e521cfbcc49811610790a127d51c8da6e56c2e932c
 MISC metadata.xml 481 BLAKE2B dccce364cb3100483c9d5932a250f05575badc6c66a0868a706817c3da4be16fabfdc584fea5d6fe45284da282b2123b1b7985e7813264d27a0338dcb76428ec SHA512 f3925caf241daf159b2b19ea70c4a177f023487ba3fef866e7fc529563b045664debaafb0a9978d05882b69457d9dada314c3109803eaf2e8bb244ac5f9b8f3d
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.22.5-r1.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.22.5-r1.ebuild
deleted file mode 100644
index 9fa4bdd860fa..000000000000
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.22.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Plasma frontend for Firewalld or UFW"
-HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="firewalld +ufw"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	firewalld? ( net-firewall/firewalld )
-	ufw? ( net-firewall/ufw )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# this kind of cmake magic doesn't work for us at all.
-	sed -e "1 s:^.*$:\#\!/usr/bin/env ${EPYTHON}:" \
-		-i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FIREWALLD_BACKEND=$(usex firewalld)
-		-DBUILD_UFW_BACKEND=$(usex ufw)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst () {
-	ecm_pkg_postinst
-
-	if ! has_version sys-apps/systemd; then
-		ewarn "${PN} is not functional without sys-apps/systemd at this point."
-		ewarn "See also: https://bugs.gentoo.org/778527"
-	fi
-}
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.23.4.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.23.4.ebuild
index dfd7cff04540..e3822b5cded5 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.23.4.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.23.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="firewalld +ufw"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index a15c83094ad7..2e05743c70b7 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-integration-5.22.5.tar.xz 65644 BLAKE2B 5a127c3f8ceb95177447fbbfd29e24ff65aba0dba4373c42ec358f2f0df941baf428962bcc90c25217d843df7c8f896ddf35d6001f575d4d226929a62c514136 SHA512 5da783bc3e32de5e68fb065f7dc014f92216821942b6f2c016fe494915fed1edaaaf88c26cd2a830fa306459e03d63d73dfbc805a845a0ac1f215128aa18df3c
 DIST plasma-integration-5.23.4.tar.xz 83040 BLAKE2B f557318d1668188bab80194a2f24d34fc15ad1a61febe9c95533e284fdc5b692f52bb05c092ce90a6b3531a92165d075343a634d1ff4ba955765106dfe4bf496 SHA512 cdeb6ba8263baf4af6296ac7717c42f634001bf1c1c57fbadc6b04f7ebd1b8de537f8b495c0fabdcba9a6c33f67596c38a3175ed977b04b262ad4e0e5f267927
-EBUILD plasma-integration-5.22.5.ebuild 1240 BLAKE2B dc987d263b7f78e5d71c3ead5c19726fae2c3c8d0c1e732c0f94837b91a881552367751e0d4eae280e4a5add38b0dae9240159b32cbc2eb4dc7e7efa6e094c07 SHA512 d5db967a46b6fe5b363949c8e93388f7aff6fda0f97351c8b3c889e5a5e417f97ce50f3738e82fbb14ca0f60365873577b461a3a60475671f5a80d73224d9592
-EBUILD plasma-integration-5.23.4.ebuild 1243 BLAKE2B 47a16bbeb4dcc249f6e251d55ed1c908aa58a2b130d65df44886bbc689fb11468497d888d0a5f3aa680435a2fa2675d3537d7530add3fd5b2f28de98f05f4da8 SHA512 d335f3692749183f9245c9d64cc1ae840881da11cb0047bdcf66594a91a7c29ffde0858d7dbe2d0cc8434afa82de6c1f051ab04588e10257446c70330ace1b80
+EBUILD plasma-integration-5.23.4.ebuild 1240 BLAKE2B f17253e5d17b90cb9d34a561fc0174c56752d9eca63de81d0c7d5f983babfdc088fe1dd04d77d2548c801c0186bb7ea65f378c2bfb634b592db75e3be034b0ae SHA512 a82f739846b248af5f6b2915f4b68f06ae5229b38712492116e9415b938577f9624eed431988ae75098b2dc6d82f7b4e77a97cc8bf9b16587c590626057e33af
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.22.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.22.5.ebuild
deleted file mode 100644
index 982f5b7d1b4b..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.22.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE=""
-
-# requires running kde environment
-RESTRICT="test"
-
-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
-"
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.23.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.23.4.ebuild
index 2873e4f7febe..aa8851b74590 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.23.4.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # requires running kde environment
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 55d27b78de04..0dda96e0f4fa 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD plasma-meta-5.22.5-r1.ebuild 4084 BLAKE2B b55305c70f54abd9721e1c4e22eb76d4a1fde99bc2c3cdee125163141f2e233a289d6cf0e7222cffd9b21eebad81d7877634b0c0279a53640871164e454c8b88 SHA512 b1a2f6939940663dc3ceb44fb1e3daafd58b350d5aafcee5ed9793490d5e817232a37abc01247bc9eba2c1d202f40e3a4e39accdc6d9c4c0ef899441b189d8f8
-EBUILD plasma-meta-5.23.4.ebuild 4039 BLAKE2B 3ef27b09de658732959776aad1263fa432bcc82ebf76196cbd528966eb5c888b84716f0c3cc6d1d3dc57a7084a58b3c19d945926a63ac2760f0a50836197d2d5 SHA512 49437dd2fb541d0d378ae013c54a9f0ccba09955babb97cda53e703d756c2990b2b3824dd647546696ca25bf1aa970dcfea7fe1a0f1192dd543944541f04c720
-MISC metadata.xml 2380 BLAKE2B a0326237bd12897117b80c6e173b8e5772d349bf370a383fca531bcfba0e25d29ea4444dca0ddb53b2348834209e4d5838e0f2a5a8f583beba8c7e2cb90226c2 SHA512 0a89ba5be15bf07ab83c6b59d4c277c00e0641227b60e490a0854598b1d2451b2a8f7733e9eff97709193d281995fe130adcdf6e75714eaee7195695a76834af
+EBUILD plasma-meta-5.23.4.ebuild 4036 BLAKE2B 7dff00ce40e74712f9018a368bc2e2bd363c80cd522c2c26a2597cd44a11b84f2a6594feead04c83dbd8ab8b2090f448487781955d9e7f399a690bf1c24dd1c4 SHA512 536b818bc3aecca9ac62e595d3752f9a6be4c7d0eb2d9870b8ab6b18635a63efe7af9e46ee5ab39b2df39e4c21853f1642f429acb2e9cdf94d0b7d20ee68c915
+MISC metadata.xml 2254 BLAKE2B 77d3bf75c22304a0b40847f1e7057d800ad92ddbfd5950f3c1fa5354b803d23c108333f07e2e5ffe552a951ae598d6d750e5060b0a05d9245b8518c7a0179f8d SHA512 fdcb3f598bd4cec4d67b9be27ae6cca4fb49ac9292eb3e74a0990654ec74f1aa180f83ae0682049bda231c1ffd4d62e8390f15cf33e78b24116e84237bce8932
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index de1664738aac..929b376cb8ad 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -23,7 +23,6 @@
 		<flag name="legacy-systray">Add support for legacy applications using <pkg>kde-plasma/xembed-sni-proxy</pkg></flag>
 		<flag name="plymouth">Pull in Breeze theme for <pkg>sys-boot/plymouth</pkg></flag>
 		<flag name="pulseaudio">Install Plasma applet for PulseAudio volume management</flag>
-		<flag name="qrcode">Enable support for easy WiFi network sharing using QR codes with <pkg>kde-plasma/plasma-nm</pkg></flag>
 		<flag name="sddm">Pull in the <pkg>x11-misc/sddm</pkg> display manager and system settings module</flag>
 		<flag name="sdk">Pull in <pkg>kde-plasma/plasma-sdk</pkg> for Plasma development</flag>
 		<flag name="smart">Pull in <pkg>kde-plasma/plasma-disks</pkg> for disk health monitoring</flag>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.22.5-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.22.5-r1.ebuild
deleted file mode 100644
index cfccabc1777e..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.22.5-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~riscv x86"
-IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
-+desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
-+kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk
-+smart systemd thunderbolt +wallpapers"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-
-RDEPEND="
-	>=kde-plasma/breeze-${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/ksystemstats-${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/layer-shell-qt-${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-systemmonitor-${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}
-	sys-apps/dbus[elogind?,systemd?]
-	sys-auth/polkit[systemd?]
-	sys-fs/udisks:2[elogind?,systemd?]
-	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
-	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
-	colord? ( x11-misc/colord )
-	crash-handler? ( >=kde-plasma/drkonqi-${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 )
-	)
-	elogind? ( sys-auth/elogind[pam] )
-	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} )
-	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
-	systemd? (
-		sys-apps/systemd[pam]
-		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
-	)
-	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
-	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
-"
-# Optional runtime deps: kde-plasma/plasma-desktop
-RDEPEND="${RDEPEND}
-	accessibility? ( app-accessibility/orca )
-"
-
-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.23.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.23.4.ebuild
index 86e058e3aa82..48918ec47f20 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.23.4.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.23.4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
 +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
 +kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 31a91d3a1152..b826b0a486fe 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-nm-5.22.5.tar.xz 898960 BLAKE2B 0285425f4ed474c38e3a72b8b6654ba17e957921db0372bc24a9ce4fe226186cb687e5ec91836f7bbb1cb2fb9f4da1287efca41cd7b11673e2086477024f4578 SHA512 802b908c61214e77162f09289d9e9c1d3c9d39b77799d71b3c4802245f2920c29065b793a83a483a9e9df004e113bcb06fa864c456b6950ba3a4d8eaf4ec4b94
 DIST plasma-nm-5.23.4.tar.xz 924192 BLAKE2B 1aff84f461877bbae09c12011c39620a66cbb0f246fc44fbcd6dafd83889a5e9a0804ba650d30feed6f1ab280ab4bdcc02dda796ad3fe3d4e7c60fb9c194c735 SHA512 3bb656ea8345172c90b7c300ebeff42eb2d252d7750ec0bcc00e2b09e1529fd30c69cfe0fcc4f5cb852098126e4c70769e8f8d1ee5efefd8467e6962d4821572
-EBUILD plasma-nm-5.22.5.ebuild 2286 BLAKE2B 17c6f20d72197b717aa6f7e05141d0557ece68320e239a4d38cd9a3ddf19c7b534b6a568d56c63735b201e0cb38071b33276542c867c368e2efe604028266c55 SHA512 bd8e74df71a77a42abf1b1860ead8327d70e487c6fe6ed2ee115ad51fbeb44ca7ae31c5974b7d50cab97098cfb14e8c43b33023e9dc3cdd81c34c72fea330286
-EBUILD plasma-nm-5.23.4.ebuild 2454 BLAKE2B 130564d171fda526200c9feb8be026e03bc2e71f51118ed358c3bf563b07a008c078951d52c2207c1c8dceed4b95ee7fcae0b6da684aac5b77f8d6d89cfb27aa SHA512 3df3ff0223619d7b3c5e6d8299375c986106fc3f28646b2dc106111560ea318bb6fa5205d7362d9442407b5ac2a7110c48a83a483c48f844d633572612bad4a3
+EBUILD plasma-nm-5.23.4.ebuild 2451 BLAKE2B 4a031da3a80f27659a35e5a8469d9db4f04dc2dd7ddb14b5ebd4f2775ad70fdfb5e1a1d1d0f9fd320ebd8a4bea85f0642be72f8b3709d6b1d59b4bb994815b0c SHA512 05feee75a85b0f09d58b46c8dfeaa0880ab1a5ca23e7918bd378069044912d974a2d2a10bba4ba21d6d5a84fb7541b6aac14d3a0d1cd2d617d0fd8736153cbff
 MISC metadata.xml 548 BLAKE2B 72ae60901cd45e2b312418553d64dbed59ed4b9d3fd8b71f0e6eaa1782dd997d08f28fd7fb2668303a6dfa290eee1cbde6397580091730b3c5f65c85c111435a SHA512 f4cd7aa6532a5816a111cc088db3a712462bce395aa792c0ba6869981d70bec7f56040038e3dce6a7b0496f423a5be8f0e0081ab45ee51451a384f3cd8c4ade5
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild
deleted file mode 100644
index 794a92fb3ec3..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv 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/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
-"
-
-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.23.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.23.4.ebuild
index 0ac6235da156..554f70c56423 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.23.4.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.23.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 4b8003a05817..30a3f4613494 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-pa-5.22.5.tar.xz 127092 BLAKE2B dd57129aec51056ac7f7020d0e479718c3c18b7da7c7e75e8b4dd2f052c3e198c6dfb350000b50230293e8e35281862a6ad503fe62d23af7083f15f650a13d38 SHA512 4082096d532ddeba6b9cd117a7588fb5b62739ce7265b70ad5834cbd30dab140ccb8b3146f9264dd01a664bfc72071bd42cdd23c24b08fd7f89919d939eb4ba9
 DIST plasma-pa-5.23.4.tar.xz 131064 BLAKE2B 227264fb10e6ec800fd584814e2b83b7b07792cb87ee18a7adf4d437ad80bacf5d0e69c85739656b16a474d8c9f60d0e60829118df17d9dfc02618dda66e218e SHA512 8a45734716435f573b326b00c28e6ba9a3d9d365b3e3366a387941feb1beeed210f9f25cb4c10608db09f11157fe8abcae70741738f1d6ccc80d3c3933e13572
-EBUILD plasma-pa-5.22.5.ebuild 845 BLAKE2B 3f5007ab05c0249afc87d2a751d73e223c796001eb8357e00215623e700e6fb1077aaebcfa22abd2c773f8ed7e2d4bcffba74fbccd2a0b15091ca0d5adc92a34 SHA512 7ddf853541bde1b4cf247b9d566f9a1ab3b3d8a3c5d21cd139242bb4b458d1dcdc5fa8d527e2b077d00ce73d26f44cd0e843f89fa099ad14b5a8e65d41eb7fe6
-EBUILD plasma-pa-5.23.4.ebuild 955 BLAKE2B 6ec4ad014a3ccd0b4c0d9084200f52080cdc753f3702d677e4b1d4447d56a50ece78a8955dd678ce3f0536952169f20bc5c3b94339df91277f2d08c19c42f535 SHA512 b5e6d2ad8a22e5c43854e182a230363978a254a782f5ddfcc2c0851fce5e0c103ed78ad137779e995c6816b5a94771daec2c6c51d780e63cd292c9e1c52508fe
+EBUILD plasma-pa-5.23.4.ebuild 952 BLAKE2B 8f814d388a21c715fd052e477aa63e14a6d04a9dde19233fab27ab8518cf653bed4f2382bb928186d2a5198a038ffced651bfba91b31c8be08ca2fc784a842d7 SHA512 c82499e4706bce28c178dd9698fb3f60376aa81d4a5e437e2e7a612767d3dc1a9b66e35d668d400806f27f8b0b0092185407de630b8e00f6daf6baf75f08d992
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.22.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.22.5.ebuild
deleted file mode 100644
index db7d0bd02fda..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.22.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.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
-	>=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.23.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.23.4.ebuild
index 86f3ca6599b8..15e9abfde55b 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.23.4.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 7a0b5a38a367..c9b7ab46755e 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-sdk-5.22.5.tar.xz 269688 BLAKE2B 90ed4b103b7b2ce3bfc3b84dcc0928d7e7b4ab88c7eeea9be0f2be8807b96271e9e5c0a00e04e252a3c099384f90f532084a03eae79ed5d88da97994bcbb715d SHA512 893bf785994537068efe5f8c854c2bd9a650849029822a5790b3874e2137eeac4f587185e571471494a47551c60e8b395520e125b8e2f511f36f6f483867671e
 DIST plasma-sdk-5.23.4.tar.xz 276360 BLAKE2B 9b876c5bae76893c076003b6ceb834d26a287b4f11cf0bd2a45f0b8366556164c361b00a36414b202a51b0d20fd87e3e194e657fe7f0b72a10e45afc7385bf7c SHA512 af9485111ea0ddde5840a62c6b8592936298692b75dd7de59d4f214973d02d2cb330a6f419eefef64338052b5ea59fdf066c9ff66086342e70d64268beb4a0b2
-EBUILD plasma-sdk-5.22.5.ebuild 1261 BLAKE2B 65c25097e4c6816cd77150dec90275da0bce6ff6e2d11e5e398e94a1ba0610ccb4807afd3bc53d1f457687efe1bb33c8e3ff8296c5d08e1f776be93a9a5aea89 SHA512 cd899ea77ff7d6b680688c6776a2dfe4eeea9e860c777bf0da662440236145fadc20b8edf0c476a0bd00ce187462570377d900fb2a5fe9c43838244734f878b5
-EBUILD plasma-sdk-5.23.4.ebuild 1264 BLAKE2B 214a84bb7a97a4b0796d8220a31a793bea5ce4e91de89111f3cabbc88c50477847f1e980db802be81fbbf32c3a7424e4a259fa0e10b73c7d5c0280032a3880b1 SHA512 c7249176e23f734103bc0b5cfb9ea0225815d2cba422d3c104cd9ede64bab61659ca9c2311b99a2970bdce9fdb30180648f8cb93dde0a8b63ee958a6a52bff1e
+EBUILD plasma-sdk-5.23.4.ebuild 1261 BLAKE2B 6e94a87c3849bcd4176cf7cbd767a2b20f25dbd0c7530711822c7ee3bc2917eb8f7c349e944f67a96b140179d7b21d4051faa4f637060cd9709edeebedb67ce8 SHA512 d069bf7282ea3f902322168640a4a833b8e6c80c04aa9715b051f6db055beb6d4caa84807589bb8ef55ccd0d448ebeb8b4c4b09227004943279de405fbd8a6c2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.22.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.22.5.ebuild
deleted file mode 100644
index 5ecc2fc17e22..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.22.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="optional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv 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.23.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.23.4.ebuild
index 9c5a5e9fa9b6..8c39ca97e09f 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.23.4.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.23.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Useful applications for Plasma development"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index d660ba0296a9..2a91f4f5a382 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-systemmonitor-5.22.5.tar.xz 134624 BLAKE2B 728ce4b89405445cbe385da504fb026d0c310eb06d41a3c4ab5557b8d66d1ed000ba30334363e5a9975e7515595e1cd3dac493a01f1f1bb235df4b9cb3f6ba38 SHA512 4116be820038318022efe6d7460d7deef2983940dac7ab1949aa0c8d18473b15d9de41f21241c63342656b5871c1a2291daa3ff0d576849fa27177425419013c
+AUX plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch 1410 BLAKE2B f34f4c40ca7f2a6ac54b17f0d3ba4c3eb7d770920507efcaf10fe6aaf173ebac5cc084bd590c49c7280738c2d9ee3ac4c603ad544f942773e81f7dca7cf3a0d2 SHA512 badf56b143f98a937019bae3d93dcf8b38fa244232ef6472bb00341b6f50dcc6ea8b1aeed8ef7af0fc4094bc6a0c8edd3569b093b83f2c1ad0bac6b3e47e58d0
+AUX plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch 3122 BLAKE2B 722dbd6f63be6ee2a07d73776fc7376e04c75c57529197eb86e056deb14be6f60a7e6eb4dbba931541cfdc83b5740b2cbca42fc1a0a51492968ca2c58b90219c SHA512 6769f767f0c932a710283218cd334da594fc2339c1ba2c2615ac0c886ff25591ca2a18414c39cf9f67126d3ace431dab4d6f456f2933b883110bd1a36cf2ca97
 DIST plasma-systemmonitor-5.23.4.tar.xz 144844 BLAKE2B fc0deda7053096218e28f734e27052439f3d1ad12e3e64b71848ad8711427c47c0c2126ab39cce75973a08ba6c43cc8e2266a1a662730e95d1244ac317c82d06 SHA512 45d90129628cca6d4b2837fee589b2ef93529983a35d6e0890058f9f106fc3abce3b7e9cf76ee8061ade0306885be308c083513208a55d047a92ee4687fd84e5
-EBUILD plasma-systemmonitor-5.22.5.ebuild 1196 BLAKE2B d94938f545224d0910db9102518e0b6b673ef370bcd58f188d97f63d5571e39b8cd6eaa0fc765f29c5e13a5c9d19466d1ce1aef2289e9011e6f611b922c55ca8 SHA512 96bcdcbfabe2618cce4069c36accc7caf18497ba5394d69f2bb263840ac55734ee96eebd6a78b07041954900b6172ac085e60b5f835cbcfc515da5831393cce6
-EBUILD plasma-systemmonitor-5.23.4.ebuild 1199 BLAKE2B a75ac2c72ef185a0fa20ca8c20304cc1094f5ca39d80eaf3dc00b3fd2e29be241b08601389f88333579de7244ef8362c15eaa719ffa2d575bb78b0f769286cfb SHA512 5e5cf5db489112912708da8a8eba570b88579c2b4f77fe2bb4a5af928f8a04e84fcdffdf1169c2d01e43742ecf151b0e5cf02461ecd384b5f068a69d30f4b252
+EBUILD plasma-systemmonitor-5.23.4-r1.ebuild 1387 BLAKE2B 2f77e654e2a5a0313bcdb1eb13a3043acfcfa623eab769d9cb3049b60862ae63d777b6bd0a4628d69ae1f0e8e5f76cf249d37d2039e27ea4f8eee9ee1326c4db SHA512 0100ebf82c75adcfd7474db0798e56fbe94def7931362dc46b9131cda01926cb5bd9216aac13ab7b7bb692007d28bf96389544f939c4d978f4c09ae357b6ef37
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch b/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch
new file mode 100644
index 000000000000..9257c8b4250f
--- /dev/null
+++ b/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-add-comma-separated-filtering.patch
@@ -0,0 +1,36 @@
+From b18f98fee76104d5be6b871dea330be32863ad27 Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Tue, 23 Nov 2021 10:52:11 +0100
+Subject: [PATCH] Add comma separated filtering to ApplicationsTableView
+
+Instead of using ProcessSortFilterModel we can implement in
+the callback of the KSortFilterProxyModel.
+
+
+(cherry picked from commit 364bada0ad5befd560758bad11190b1fd7043b34)
+---
+ .../contents/ui/ApplicationsTableView.qml                 | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml b/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
+index 3f3ed4f..1f2dd36 100644
+--- a/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
++++ b/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
+@@ -96,6 +96,14 @@ Table.BaseTableView {
+             }
+             return true
+         }
++        filterRowCallback: function(row, parent) {
++            if (filterString.length == 0) {
++                return true
++            }
++            const name = sourceModel.data(sourceModel.index(row, filterKeyColumn, parent), filterRole).toLowerCase()
++            const parts = filterString.toLowerCase().split(",").map(s => s.trim()).filter(s => s.length > 0)
++            return parts.some(part => name.includes(part))
++        }
+ 
+         sortRole: "Value"
+     }
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch b/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch
new file mode 100644
index 000000000000..17505ee73146
--- /dev/null
+++ b/kde-plasma/plasma-systemmonitor/files/plasma-systemmonitor-5.23.4-applications-remove-unneeded-ProcessSortFilterModel.patch
@@ -0,0 +1,73 @@
+From 50f6378144ed244b9c1cd3e325ecbe45dd7544d4 Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Mon, 22 Nov 2021 12:15:14 +0100
+Subject: [PATCH] ApplicationsTable: Remove unneeded ProcessSortFilterModel
+
+ProcessSortFilterModel handles filtering pids and to which user a process
+belongs over a normal QSortFilterProxyModel. In doing so it also
+sets the filterKeyColumn to nameColumn in findColumns(). Note that the name
+of the name columns of the process and application table is different
+("name" and "appName"), so the filterKeyColumn is also set by ApplicationTableView.
+However this is racey depending on when the binding is evaluated.
+Since we don't need the extra features of the ProcessSortFilterModel we can use
+the existing SortFilterProxyModel in charge of filtering columns (something that
+the ProcessSortFilterModel also did) to also handle the row filtering.
+BUG:445544
+FIXED-IN:5.23.4
+
+
+(cherry picked from commit a96bc99a3650c3bf2e48ab1287dc779dbba87c51)
+---
+ .../contents/ui/ApplicationsTableView.qml         | 15 ++++-----------
+ 1 file changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml b/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
+index 38915b3..3f3ed4f 100644
+--- a/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
++++ b/src/faces/applicationstable/contents/ui/ApplicationsTableView.qml
+@@ -32,7 +32,7 @@ Table.BaseTableView {
+     property alias columnDisplay: displayModel.columnDisplay
+     property alias sourceModel: appModel
+ 
+-    property alias filterString: filterProxy.filterString
++    property alias filterString: sortColumnFilter.filterString
+ 
+     property var selectedApplications: {
+         var result = []
+@@ -83,8 +83,9 @@ Table.BaseTableView {
+     model: KItemModels.KSortFilterProxyModel {
+         id: sortColumnFilter
+ 
+-        sourceModel: filterProxy
+-
++        sourceModel: cacheModel
++        filterKeyColumn: appModel.nameColumn
++        filterCaseSensitivity: Qt.CaseInsensitive
+         filterColumnCallback: function(column, parent) {
+             // Note: This assumes displayModel column == appModel column
+             // This may not always hold, but we get incorrect results if we try to
+@@ -99,13 +100,6 @@ Table.BaseTableView {
+         sortRole: "Value"
+     }
+ 
+-    Table.ProcessSortFilterModel {
+-        id: filterProxy
+-        sourceModel: cacheModel
+-        filterKeyColumn: appModel.nameColumn
+-        filterCaseSensitivity: Qt.CaseInsensitive
+-    }
+-
+     Table.ComponentCacheProxyModel {
+         id: cacheModel
+         sourceModel: displayModel
+@@ -184,7 +178,6 @@ Table.BaseTableView {
+             Table.FirstCellDelegate {
+                 iconName: {
+                     var index = sortColumnFilter.mapToSource(sortColumnFilter.index(model.row, 0));
+-                    index = filterProxy.mapToSource(filterProxy.index(index.row, 0));
+                     index = appModel.index(index.row, appModel.iconColumn)
+                     return appModel.data(index)
+                     return ""
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4-r1.ebuild
index daf638b076a2..12fa84166ae2 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.5.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.82.0
+KFMIN=5.86.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -40,3 +40,9 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kquickcharts-${KFMIN}:5
 	>=kde-plasma/ksystemstats-${PVCUT}:5
 "
+
+PATCHES=(
+	# 5.23 branch, KDE-bug 445544
+	"${FILESDIR}"/${P}-applications-remove-unneeded-ProcessSortFilterModel.patch
+	"${FILESDIR}"/${P}-applications-add-comma-separated-filtering.patch
+)
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4.ebuild
deleted file mode 100644
index 6960f0e9446b..000000000000
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.86.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Monitor system sensors, process information and other system resources"
-HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
-
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-plasma/ksystemstats-${PVCUT}:5
-"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index c50890a13b92..05f0c1c5561d 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-thunderbolt-5.22.5.tar.xz 64216 BLAKE2B 74914087256f7f0496c4f1f4bf2f82180b424bf357208b70d0c6416a9288b7f26d0dc385823a5ace087dca3aa388963b28be00d31f1335bd0ba1071ed382bab7 SHA512 abc492c6a69cd3a2efa82c798d9a5e178f08fac098cd68055308f5bb4459e16914210e119e50838dd5af8d2240ead47e1dcfb06cb49a9a8d4e4ee6c0ba386581
 DIST plasma-thunderbolt-5.23.4.tar.xz 65120 BLAKE2B ba143215208b8e0afd2111f74bfeb1e38085906ce36119490cb8b56df739e0a1495ac81b463e0d89df1b2946ef099da3f2da11908b5665dce9a0efa888ee51a7 SHA512 c0180e46cf47da996a2c054c3a860824b13231cabdb6dd14c9885ee9948f432a78ba61d438daba791b7d22010c84663699a5f106293d8484c78ba88add3b7ace
-EBUILD plasma-thunderbolt-5.22.5.ebuild 895 BLAKE2B b8d96af1c94dc9c480bd12eb4f81c2731cce5561ed8b8a42d8597d1815286761c665508f9ce1e255c71a44b32744d62df6549f5b0d054f9f14ea57eb428537e4 SHA512 7a3d0b02672d8e5f077e79ae7d4aef83d9e8a26645c9dbd6f8aa9abc318721393bb0c025daf6b83d69c1a75d47fabe706f56865be4951f39a5381288505cb9e1
-EBUILD plasma-thunderbolt-5.23.4.ebuild 897 BLAKE2B 7d09fd7c77cdde1055cbae14efdf0280d16908cf06e1a8993c246c051cd0161130c7d81d30a54e370724aa4d539d764e90b1960f27636ac34ea25d8acf006281 SHA512 169f1e02d4fd2990fe2609eb39c2a13e8229b37816c803bb44a9efa88b38ec4d6b16b2a861e8764ac1f8c2cb9eb7b099187ba8c0d09c75f0f989124356cfcfde
+EBUILD plasma-thunderbolt-5.23.4.ebuild 895 BLAKE2B 06e0093882630869ea041423717a4ae54222cae492a045dd6bb46f01403bbce3d2edf8557fc8d71382bb0fd0885ed48db8ee4126b188211e7c189c9505937704 SHA512 d89a394a573d4773b7dd31df9fcccbddcc60977c9a8ec825c4cd088f192d416ba53ee7d4c9c11d8e062b9209238ec1c083a7494c25946090253bc8974cef9ca4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.5.ebuild
deleted file mode 100644
index 9e532624beab..000000000000
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE=""
-
-# tests require DBus
-RESTRICT="test"
-
-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
-"
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.4.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.4.ebuild
index 98520e14669d..69f79eb27579 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.4.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
 
 LICENSE="|| ( GPL-2 GPL-3+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE=""
 
 # tests require DBus
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 9cc7b3f4334c..b6dc7495d2a3 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-vault-5.22.5.tar.xz 171012 BLAKE2B 44cc939d1fe03d4a042d3cd28b9ecc9457a1c667f5c7ee145db9d600ffaf49407108c019e91b475647bb5922b5fd9a25224dc00d3c6eb18e1adc67b0ee83cfbc SHA512 360bfe2ceab0f6318dff866af9a1445ea7f43bffc0471cee50d2283bc125062cbea5974a88db537384a5b5bfd28e679be3c50f95afe4b53c9f7c8a6ab6756cf0
 DIST plasma-vault-5.23.4.tar.xz 176244 BLAKE2B 5f6e62cf1cb291091448d70e97a68079ffc4b4203ad4b63b4fb272f3d58a7e1eeabf5b574f4ad16f00b328a2a011987dc8a58c022c7b8163333b1abe0be44ec4 SHA512 2d6eebe0e5a53fa741cc433ee8529fcffae1aedd2b91fbd8055dc093575e76c3aae85cd5f0f264a1aa26567b2511e8ec2c971511888341f00a8b4d0c7c79505d
-EBUILD plasma-vault-5.22.5.ebuild 1281 BLAKE2B f56640ca397d6a7e217cfdc7f223ca632004abd0dabca97814e83df55c4300da4a2798abebfbf917e14ac22d4eda702c2e10630e623985083b8a8d995b122352 SHA512 cefc525aa144647d9d72eadf80eec441fe3951e172b75a645bb2ef0a3db85d38647ef896979a224d62c8f722b72e2a207e8d1f5927f082e13b2b480412725a10
-EBUILD plasma-vault-5.23.4.ebuild 1284 BLAKE2B 6f76ce395d96b828630e262e68fc8550df07fa0bd9ddfdec149f6d6a1f9b19474b1cbeac1fee8e73609b715de4c6304e1d836ad50d093fab521ae32d134dec6b SHA512 cdb29c97431eda4171d47b4dc05b98c877156a10481f51554b8e1045657f8dfdff579d2f84f185bf74aa53e210b6b44cf583d7b28b3315147e3d3127afc2146f
+EBUILD plasma-vault-5.23.4.ebuild 1281 BLAKE2B 6025504dfbffcbe7e9db7b8c1e6148c1b74001f0950f2d1b9c24a83b5b3565766f446df36983329e5281b9a49f8539c72f677f00d91c7db8758ad06d9957d46b SHA512 932b8c6c3bdda821881d053d31101a644ac98d58e34aea152b1c94ebf724509f57ef6b6e2bf782171d029fe2660814177a8417f71c242ba1fbe5fa7bb4aba3c7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.22.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.22.5.ebuild
deleted file mode 100644
index cf869f9ad551..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.22.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~ppc64 ~riscv 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
-	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.23.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.23.4.ebuild
index 820c8cb2ccae..f723ef1f5db9 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.23.4.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 2d2fdbb90356..cd693f81b7fa 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-workspace-wallpapers-5.22.5.tar.xz 51347952 BLAKE2B 090a0a72357e3597e102f3164596cf8614dea88f06a30c07019085891c65278dfff6149588e3c0cdedabde3d8c76cd0030878870ce3106b27b0222577133a3a8 SHA512 851e81e901fb50fc1c65c0863570b4c13c41ab3b4eef0fa862e60813ea6c316daa629464184cbc7f76f4ab4fd7422abe5ee1931f46ec968b9176bfe7f72aef19
 DIST plasma-workspace-wallpapers-5.23.4.tar.xz 57049264 BLAKE2B 5f985c42100d04dad02d34885873085f4e3ea1432289362838f66b3bb277fdcadb6d625599158e63a83d5d53f791c26f380a6d783e61a893482221bd01d5e464 SHA512 15e7f3c8d74298c38a9af6e90f686bea4cdf62ab8e515f4b4feb98aaca6af072f4da9ed6c7113ffd1129ea4540a73871aaf4f9ad06d25ee8fcfd3aaff610d9e8
-EBUILD plasma-workspace-wallpapers-5.22.5.ebuild 355 BLAKE2B a9708760a7fdb6fa85da644f877c5cc3b8507500f55cce8f1b1e49fd53ecd2db6d4ca659b40bae823082f6c5471274793ff36f737b834c1ee597973f2ef34f94 SHA512 011e0d3ae30a65165287925bd4c21bc6313be51731810bc39acbd022bea4ab7a7a04319d6a7e34862bbe15b585b9458a2d9d2c56a9c684172f9e2057fb7b5eb6
-EBUILD plasma-workspace-wallpapers-5.23.4.ebuild 358 BLAKE2B 29af02f5b757245b3351633816c786120a7cbd7468c306c1f38de7de5e5f73befc67d3c85ac89e9e022bebea97064356f9f32e335fe535f9cbe2e054582b84fa SHA512 d26b6b8000b08c95c964e286ffd1f78aa3cb9885c10dbab0884296d4c05a6fcb4e691f05a9bc3f5a54c88b06aaa0a74e740b47b9e85275f3407d5f2f4b707510
+EBUILD plasma-workspace-wallpapers-5.23.4.ebuild 355 BLAKE2B a9708760a7fdb6fa85da644f877c5cc3b8507500f55cce8f1b1e49fd53ecd2db6d4ca659b40bae823082f6c5471274793ff36f737b834c1ee597973f2ef34f94 SHA512 011e0d3ae30a65165287925bd4c21bc6313be51731810bc39acbd022bea4ab7a7a04319d6a7e34862bbe15b585b9458a2d9d2c56a9c684172f9e2057fb7b5eb6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.5.ebuild
deleted file mode 100644
index d776660bca12..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~riscv 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.23.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.4.ebuild
index 505df2c2d303..d776660bca12 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.4.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 881d45d1fcef..92d666cca71a 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,12 +1,10 @@
 AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099cb1c242bdc73637b5b0f017da2355f9e135d9f40a6f47cf05e1c7910d2ff93ddc932e771794378cbb30390 SHA512 25a6f1ac242e4cbae8ab63c033af5cc320fc0f02cdc95000d5604ddfc8e2a3352055a9bbc629e5490011df2744cd0de59354c137bcb3766f0b0755773f2eb190
 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
 AUX plasma-workspace-5.21.5-split-libkworkspace.patch 1154 BLAKE2B d37f649971b95c3fd99c551ec7512054460d8ba04c265e56c2ee53d968c7885929724c81df2895eeae8609a5a0a4c28839461429579f56bcbde4dcaa5646e15b SHA512 c41d2c56170914a309c9765a58a6cccaf4a9afae937ce762387590f3b2ccf59969b5873f702986369c4c3118c74d314f8b68916bfabce5e7379b3cb27daebb50
-AUX plasma-workspace-5.22.5-fix-hotplug-notifications.patch 1186 BLAKE2B f660ac465e9dc6f63ef7446aa18801823399d885ebd5219128936bd0fc2e959c10cae655695df4451459c8d6c8e6eea08c054a5342564d520a6ed3a2bd542f32 SHA512 94b150ad3a6f5e91bc55ec7f6b3293128c8cd90a740d66f3f513a9eab09457f13371a54f3c9ec2c9b1e94d77e02b3b6298b80e5326784c26ddcfaf045c008c0d
-AUX plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch 1882 BLAKE2B 89c19b86f31c2d61f092242d6b31806b05b85e2d4a22b546c49933ced337872a3d61f4c33a3ed644ff169238534286f137a3810885e05db70e584b47691e05b4 SHA512 dcb2041cd5a3272b253ac5239d130453fdf13dd0820e413d38149e008c7d2ea0114e0fa4e0a6f33fd3f3d44250e27f7f2ec0fbe14cb6d3cc854526d27bfd0207
-AUX plasma-workspace-5.22.5-gpsd-3.23.1.patch 1107 BLAKE2B 5646510f32ed997ee0e91fc742569f6de6ea7793f9f2eb152e2ca8e058c94031271d33cc8df69255f6ad446bed40a8303b0dcfd212c62b66cac40076f86bf690 SHA512 1540ec69470d66adbcdc2ec108947f2ecd3ab8dfc12d57899765d15ed0288634e3d69ea19e7e9cd957b1246178492b38952657861352606e7e9452615c727fce
 AUX plasma-workspace-5.22.5-krunner-cwd-at-home.patch 804 BLAKE2B 4bb337ea04037f8992988b70a40896166a2e10b2b557fa5518e3c2bd7129a221fe2efe064465cbffcc3db4abebb13d354599f44884eaf8c1bc029646280921bb SHA512 e49635bbb42c1beeaa9eee6a803f8c96497bc6e768a72d93886281edec922cb641a373fc0a1a482cedb36bd1f400f77b0030247f621373ebc141760a97ef5bbd
-DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
+AUX plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch 1048 BLAKE2B 23649837c3d0c62bd4476b79856bf5f7c7770ada3b0286f2fd1e3aed576ea7de2ac23c7e0837876026be74b0405f24449bd9c1e00ec0d90c287e9fc79406032c SHA512 75a2f98f609eb37ee56d5c2afbf7ba3ce8ffc6480efd0af9c8f4197dbfab51a3b0a4af328ca28e42d866365949b75d130a8abb08a68544ed08a37d7f0a4d4e34
+AUX plasma-workspace-5.23.4-fix-klipper-use-full-text.patch 1039 BLAKE2B ed5a04d66a276c626cb976560f02af7da653b052ea10aa69ba7e6f5542e16abfeaacf930bc7a7761ff73c05ae8afbc6aa162a091923e4ec44abbc3464b31c584 SHA512 5c76b4c50053c2f570d9fa5b8d465432dcec61a8f9e85643c36c16c4bb24be940ea47968e5aa6347e240e8a91d884f37f3cc2f3d56700e5e4de51b5065772b5d
+AUX plasma-workspace-5.23.4-fix-systemsettings-crash.patch 1343 BLAKE2B 5c88d61f01447b7b3dcbf34f84817fd86a1bc0e3fb57618b6b98b6a6307d245b30878dec1297fc48e413e7d3e178a1e07137abd18388c03eba64a1ea46880906 SHA512 b959d01dcf51ac542336a888a7a81e30e5a22c6ed2612a56fbf6411705945d4d83cc51e09713a3c0b41979971cd4b95d520c6276412c32c8648e100f8c654d61
 DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
-EBUILD plasma-workspace-5.22.5-r3.ebuild 6408 BLAKE2B e52a48a6a3224d57301d0cb7b22c4da9cf57ad0e87487a3ba7e40a6215c0eff777e494ffd50a67267492ca63175bf78763955d38f22a536c4f6a41ad37969575 SHA512 0eaef6670279c97628fca83ca197e34557e123fe835e45cdeb7df68078ae0beb56b26ff385c3c3617df0bee5bfaec132869bb6bfe4abc0bc0edc9baaa3b9e32c
-EBUILD plasma-workspace-5.23.4.ebuild 6309 BLAKE2B dc6142ae8278282b5ac7b6d385020e9c404ab75bf93974e73b1ba2cf4e65d9d872c03574e4e6597cd10ec379337c7048c6db9b4e14b96f1a687e4a6376bd3b99 SHA512 d81e7210889e1192572f16ff4ebe354795c303571c4555957ed2d7538ac9e83b59dca05908fa3c7ba96fc4b54026895b7d62e05556b848b1ca3aad3ca911e727
+EBUILD plasma-workspace-5.23.4-r1.ebuild 6540 BLAKE2B b7c00eac76e94a2232b15ac791e92a6786e284830f780e1ef078b3a11798fbb8aff98c39520fbbdfb69b90dcb5555b10ec9ff081f116ee793ecda3f92e2a95a8 SHA512 702f20dcdf6be4b257c59a2694f41f2d23145786c7724bbf3e6dc87547117d29c481aeb8c8ebf4333d417a8a199e12428053f0f84b7dff4c1cb1c6ab04000743
 MISC metadata.xml 794 BLAKE2B 9347a321add3734ec04c45476253f76cb4bb0de8a91227733743c5a971a69e3bd9e6ecc8e0052a46c7a6955cc1da749332a5c009b3bfd424d66b130c076c0d9d SHA512 53a4f25ba06997c1dd082837b400e37fed6350ef60938cfddc4c89f4b9001f28c23e18ce68887c124149c998268867e23d35c0435118e429c1e77eaebb792829
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch
deleted file mode 100644
index e7cd0627a269..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 61e2ea2323ae63c5805c87353701ba6fb722205a Mon Sep 17 00:00:00 2001
-From: Fabio Bas <fabio.bas@officineinformatiche.net>
-Date: Fri, 3 Sep 2021 19:23:12 +0200
-Subject: [PATCH] Update solid connectedSources when a new source gets added by
- hotplug BUG: 438874
-
----
- applets/devicenotifier/package/contents/ui/devicenotifier.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/devicenotifier/package/contents/ui/devicenotifier.qml b/applets/devicenotifier/package/contents/ui/devicenotifier.qml
-index a1dc20b83..404ae95e6 100644
---- a/applets/devicenotifier/package/contents/ui/devicenotifier.qml
-+++ b/applets/devicenotifier/package/contents/ui/devicenotifier.qml
-@@ -75,6 +75,7 @@ Item {
-         onSourceAdded: {
-             disconnectSource(source);
-             connectSource(source);
-+            sdSource.connectedSources = sources
-         }
-         onSourceRemoved: {
-             disconnectSource(source);
-@@ -98,7 +99,6 @@ Item {
-     PlasmaCore.DataSource {
-         id: sdSource
-         engine: "soliddevice"
--        connectedSources: hpSource.sources
-         interval: 0
-         property string last
-         onSourceAdded: {
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch
deleted file mode 100644
index 13e4bf256d3e..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6379d1ec8d4a1fce141280eead930a6cdd9282d1 Mon Sep 17 00:00:00 2001
-From: Peifeng Yu <7437103@gmail.com>
-Date: Mon, 6 Sep 2021 05:24:15 +0000
-Subject: [PATCH] Call UnInhibit with correct signature in powermanagement
- dataengine
-
----
- dataengines/powermanagement/powermanagementjob.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dataengines/powermanagement/powermanagementjob.cpp b/dataengines/powermanagement/powermanagementjob.cpp
-index 90051cf33..dc7883d10 100644
---- a/dataengines/powermanagement/powermanagementjob.cpp
-+++ b/dataengines/powermanagement/powermanagementjob.cpp
-@@ -104,7 +104,7 @@ void PowerManagementJob::start()
-                                                           QStringLiteral("/org/freedesktop/PowerManagement/Inhibit"),
-                                                           QStringLiteral("org.freedesktop.PowerManagement.Inhibit"),
-                                                           QStringLiteral("UnInhibit"));
--        msg << parameters().value(QStringLiteral("cookie")).toInt();
-+        msg << parameters().value(QStringLiteral("cookie")).toUInt();
-         QDBusReply<void> reply = QDBusConnection::sessionBus().call(msg);
-         setResult(reply.isValid());
-         return;
-@@ -122,7 +122,7 @@ void PowerManagementJob::start()
-                                                           QStringLiteral("/ScreenSaver"),
-                                                           QStringLiteral("org.freedesktop.ScreenSaver"),
-                                                           QStringLiteral("UnInhibit"));
--        msg << parameters().value(QStringLiteral("cookie")).toInt();
-+        msg << parameters().value(QStringLiteral("cookie")).toUInt();
-         QDBusReply<uint> reply = QDBusConnection::sessionBus().call(msg);
-         setResult(reply.isValid());
-         return;
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch
deleted file mode 100644
index cb35751d446f..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-gpsd-3.23.1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e6cab5d96f7b51a5cf4be3d93a7e2d4fee1cddae Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Thu, 23 Sep 2021 19:29:05 +0300
-Subject: [PATCH] Fix build with gpsd 3.23.1
-
-STATUS_NO_FIX was renamed to STATUS_UNK.
-
-https://gitlab.com/gpsd/gpsd/-/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427
----
- dataengines/geolocation/location_gps.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/dataengines/geolocation/location_gps.cpp b/dataengines/geolocation/location_gps.cpp
-index 858059ada..ec9ec14ae 100644
---- a/dataengines/geolocation/location_gps.cpp
-+++ b/dataengines/geolocation/location_gps.cpp
-@@ -52,7 +52,9 @@ void Gpsd::run()
- #else
-             if (m_gpsdata->online) {
- #endif
--#if GPSD_API_MAJOR_VERSION >= 10
-+#if defined(STATUS_UNK) // STATUS_NO_FIX was renamed to STATUS_UNK without bumping API version
-+                if (m_gpsdata->fix.status != STATUS_UNK) {
-+#elif GPSD_API_MAJOR_VERSION >= 10
-                 if (m_gpsdata->fix.status != STATUS_NO_FIX) {
- #else
-                 if (m_gpsdata->status != STATUS_NO_FIX) {
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch
new file mode 100644
index 000000000000..1153c9f006f1
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch
@@ -0,0 +1,33 @@
+From beb34e3d9781c7728260d486a835c52be21a6d83 Mon Sep 17 00:00:00 2001
+From: ValdikSS ValdikSS <iam@valdikss.org.ru>
+Date: Sun, 5 Dec 2021 15:46:00 +0300
+Subject: [PATCH] Fix Klipper Actions content truncation
+
+Commit f9669af2 introduced a regression with Klipper Actions: it used
+truncated text as a source for the action, which resulted in truncated
+output.
+
+BUG: 444365
+
+
+(cherry picked from commit 49365857623f7e986013bee7d3160594d2272fe2)
+---
+ klipper/urlgrabber.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
+index fb7c0d0a2..185a6a5d6 100644
+--- a/klipper/urlgrabber.cpp
++++ b/klipper/urlgrabber.cpp
+@@ -245,7 +245,7 @@ void URLGrabber::execute(const ClipAction *action, int cmdIdx) const
+     ClipCommand command = action->command(cmdIdx);
+ 
+     if (command.isEnabled) {
+-        QString text(m_myClipItem->text());
++        QString text(m_myClipItem->mimeData()->text());
+         if (m_stripWhiteSpace) {
+             text = text.trimmed();
+         }
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch
new file mode 100644
index 000000000000..29640f8262e6
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch
@@ -0,0 +1,34 @@
+From c8b8c8dd389ae381831fdd23f354617f48f3edd4 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Sun, 5 Dec 2021 08:26:45 +0000
+Subject: [PATCH] [klipper] Use full text for DBus return values
+
+In a recent commit HistoryItem::text() became the visual representation
+of the mimedata; often a truncated string.
+
+mimeData()->text() always returns the full value.
+
+BUG: 446441
+
+
+(cherry picked from commit 2db375f6a71cb730e1e099f9ff17ef7092850d9d)
+---
+ klipper/klipper.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
+index b090a2409..3b12d1f95 100644
+--- a/klipper/klipper.cpp
++++ b/klipper/klipper.cpp
+@@ -838,7 +838,7 @@ QString Klipper::getClipboardHistoryItem(int i)
+     if (item) {
+         do {
+             if (i-- == 0) {
+-                return item->text();
++                return item->mimeData()->text();
+             }
+             item = history()->find(item->next_uuid());
+         } while (item != history()->first());
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch
new file mode 100644
index 000000000000..d46f33486785
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch
@@ -0,0 +1,31 @@
+From a8b613505e326dd047707e0a0e4d6f5ecc4a9baa Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Wed, 8 Dec 2021 18:25:36 +0100
+Subject: [PATCH] lookandfeel: Add missing check if list of files is empty
+
+BUG: 439797
+
+
+(cherry picked from commit d168d2a50366c528dab65415cd4f6e82afdfb645)
+---
+ kcms/lookandfeel/kcm.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp
+index 75ce19197..349761aad 100644
+--- a/kcms/lookandfeel/kcm.cpp
++++ b/kcms/lookandfeel/kcm.cpp
+@@ -123,7 +123,9 @@ void KCMLookandFeel::knsEntryChanged(KNSCore::EntryWrapper *wrapper)
+     if (entry.status() == KNS3::Entry::Deleted && !entry.uninstalledFiles().isEmpty()) {
+         removeItemFromModel();
+     } else if (entry.status() == KNS3::Entry::Installed && !entry.installedFiles().isEmpty()) {
+-        removeItemFromModel(); // In case we updated it we don't want to have it in twice
++        if (!entry.uninstalledFiles().isEmpty()) {
++            removeItemFromModel(); // In case we updated it we don't want to have it in twice
++        }
+         KPackage::Package pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
+         pkg.setPath(entry.installedFiles().constFirst());
+         addKPackageToModel(pkg);
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r3.ebuild
deleted file mode 100644
index 0848eaec5896..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r3.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
-+semantic-desktop telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/wayland-1.15
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwayland-${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/karchive-${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/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/kinit-${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/kunitconversion-${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/prison-${KFMIN}:5[qml]
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/layer-shell-qt-${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/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calculator? ( sci-libs/libqalculate:= )
-	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	fontconfig? (
-		>=dev-qt/qtprintsupport-${QTMIN}:5
-		media-libs/fontconfig
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-	gps? ( sci-geosciences/gpsd )
-	screencast? (
-		>=dev-qt/qtgui-${QTMIN}:5=[egl]
-		media-libs/libglvnd
-		>=media-video/pipewire-0.3:=
-		x11-libs/libdrm
-	)
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.1.1
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-util/wayland-scanner-1.19.0
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-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:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-plasma/milou-${PVCUT}:5
-	>=kde-plasma/plasma-integration-${PVCUT}:5
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	sys-apps/dbus
-	!<kde-plasma/plasma-desktop-5.21.90:5
-"
-BDEPEND="virtual/pkgconfig"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
-	"${FILESDIR}/${P}-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
-	"${FILESDIR}/${P}-fix-powermanagement-inhibition.patch" # KDE-bug 433675
-	"${FILESDIR}/${P}-fix-hotplug-notifications.patch" # KDE-bug 438874, bug 814284
-	"${FILESDIR}/${P}-gpsd-3.23.1.patch"
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	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
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
-	fi
-
-	# KDE-bug: 433730
-	use calculator ||
-		cmake_run_in runners cmake_comment_add_subdirectory calculator
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-		$(cmake_use_find_package appstream AppStreamQt)
-		$(cmake_use_find_package calendar KF5Holidays)
-		$(cmake_use_find_package fontconfig Fontconfig)
-		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
-		$(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 "${FILESDIR}"/10-agent-startup.sh
-
-	insinto /etc/xdg/plasma-workspace/shutdown
-	doins "${FILESDIR}"/10-agent-shutdown.sh
-	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
-	ecm_pkg_postinst
-
-	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.23.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild
index f26dcb7a8a8c..e2c646f9117d 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
 +semantic-desktop telemetry"
 
@@ -150,6 +150,10 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 PATCHES=(
 	"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
 	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+	# 5.23 branch
+	"${FILESDIR}"/${P}-fix-klipper-use-full-text.patch # KDE-bug 446441
+	"${FILESDIR}"/${P}-fix-klipper-actions-content-truncation.patch # KDE-bug 444365
+	"${FILESDIR}"/${P}-fix-systemsettings-crash.patch # KDE-bug 439797
 )
 
 src_prepare() {
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 7879eb57b318..91315db6ad6f 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST plymouth-kcm-5.22.5.tar.xz 38064 BLAKE2B d6177f953be19344eb949ff2a76da131cb18cb62e9917fe480b703585e57fa063b01783233376a8cbc51f7dc8b204e7bc42738685ee2cfa3838a95a2db9e3970 SHA512 eb18fa7d6c4c0df765679db000c82d95c72346a812005a743b83491ce476fdb790e302ce074568420041b3f9dc23c0fde21dcffa8dfaed02ce0725b831961ba3
 DIST plymouth-kcm-5.23.4.tar.xz 39328 BLAKE2B 3716e19fe0e25e07c723d65e5ec313c4b194720bd4de025f290fb11ed3778fff5372f51c3c8557b3442673fa56062d1aae89a831d376689cfe001a0b47c6aa99 SHA512 1cc3f59758b0adc380101ce6bb01b7daee810b2e00884eb89c8c1e10ecd8134cc5356101c3d0e039297cd10c9c824491e036d2c120e36c7303fa2c4b8c03e32d
-EBUILD plymouth-kcm-5.22.5.ebuild 927 BLAKE2B e58a4eb6fb3c62455f6de9024bc6c8498015721d36b3b825f374f618605f1f852558e639f2fa5aa60e5250934fb9352edf326a0189ddd0613421dfd0fe2c728b SHA512 4a7f600993c3712c27bf92a2bb942dfb33792e57ee72c1e442d6576ecc4d0bc3b4c13a68f20667513183604d25f2fad24ac49ad67b524e78b1659c37a5f8b926
-EBUILD plymouth-kcm-5.23.4.ebuild 930 BLAKE2B a66f10e95507e794d708199eedc02a1829d5e46cff805bd6090863b02d15b7eaf567f55ee355f25a30be67d738c18d64bec04abc5e171bbc80dacb88b5ecc1d5 SHA512 6fd787a0669ae526108285dfe74063f3ce6995a759bf846475aa6c0a29c2e9c261915704a0d329536418edd464e7319695b0779bc6a6485d75952233361b770b
+EBUILD plymouth-kcm-5.23.4.ebuild 927 BLAKE2B 1372791ea742d48884189d137a4641b27395962a7373a65ecddd7c07906acfda045b23ed3b3bc1796c6b69f8037dd50fdbc71dec7d126eacabc96c4010d5fcac SHA512 9e4361bdb9b9a700628845308253792d1a85a8952e430f8df1a2f3d946387713ddcc2f57599b3bb6a47ac2b2c9ba15641d7f8f94844e69fc70d51caf88db7c14
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.5.ebuild
deleted file mode 100644
index 181a0738422b..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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
-"
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.4.ebuild
index 57d4b2f388e2..9da6c6887b60 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.4.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.4.ebuild
@@ -13,7 +13,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 d6a0b857b2c2..0c8d131f1b50 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,3 @@
-DIST polkit-kde-agent-1-5.22.5.tar.xz 45652 BLAKE2B e95815b7760810743d54f1adb10992f1bf1cbf37870729c022aa8d34e518b41af2b81c9e3eb0f22dad0facbe97d1a70d26b31aa1aa8d8ba2ab99674fd0357814 SHA512 418bee7d6f32577a68e7a7a2f3db0bf54eb213bead9852356cd813c1a64ce64e9cd217f7b9b13c8872a797c4a629eaffa7d2f1ea4ff471b70567de1f6ac808fa
 DIST polkit-kde-agent-1-5.23.4.tar.xz 48124 BLAKE2B efbef00c5361880a45c665daa4ff657bb08242dc96c68dfc86fa52f33af3456c0a5d4f2d9de7e0ae9824ea8561cc39c4551f25b89d726dc3046dc60afc89dc1c SHA512 05f319b4f3a85216d6c29451816ae2e9ca4eb69fe817236a36b1cd482d39abed4a86493cff6c1437b31f862029b38db26015df9e1dd0ef86f23c4d4be8713969
-EBUILD polkit-kde-agent-5.22.5.ebuild 804 BLAKE2B 5c917914b8359b49f6b8982324150d3f7bcda785641c8991a74089805ad5f847c686acbfac71ee93f953bc250a8e7fa5a08bc14b749c25e32a7f609945bf5dda SHA512 8d1a4a442ed559a28f5c0d2bdbb708dd9e1035e1569121a5885b08d3d548877e9e334209877b72c48ff114e17fc65d5f522970238f084f93bb7638c8e2acafce
-EBUILD polkit-kde-agent-5.23.4.ebuild 807 BLAKE2B 35492e852f2f7ce760d81e96496b1c033b7c3ba8de285d67b733651cbab16a7cf85be8f760684dfbb715bd4276e0e19dc239812feb66903aa436fdd5d02427e2 SHA512 313f141403221007cd4fb5162197aa48a25a05acdb726f381f1adabe609152584567edb575d4da631860cdde2249964289012a04249a5533c885c0bfec0906f5
+EBUILD polkit-kde-agent-5.23.4.ebuild 804 BLAKE2B 7044740f713293691b82cf951f4e208374af462f87bd228c18459214bd7515ce635b20df3f4fb3ed2ff2a1718217fe9b4d75d78cdc5b22b5caf0e228591ad750 SHA512 bd1bdf586b78908252d7d75ee8dcdb81b94e3a195f158ab7a18825c3eb3fbaec2008fcdebd0278e13ebab38f13b8a7ca551b176eb7ad53661d22ce72f155c6a3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.5.ebuild
deleted file mode 100644
index 205823f616da..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-1"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv 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.23.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.4.ebuild
index 5dc5f3c9aa38..02fe5d2fae86 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.4.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 7235d21b075b..2c19811d1da8 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,3 @@
-DIST powerdevil-5.22.5.tar.xz 618576 BLAKE2B 5d4128adf99d0d3c355b28ca320c280b44f605a92adfb86582d9294752fce47a689023d38a0480dc5e91704c273774048fa8a38b62f9c3065bc5e9fe91a8c050 SHA512 9ecef0eec3673ac4560a0e50a3e31299718af9575d4a11e274d5e1d1516971362d93ca31e66b79b3593a68b1aebf93502066de7e4134761c5681dba84ab79318
 DIST powerdevil-5.23.4.tar.xz 629336 BLAKE2B 26f92a14012585ce15ff0f00f3c57c4e11cba986a1b467f210d77bf6488fd552138b3775774fb2b17d1d340e4bb5bad77fd155aeb9986fa190005204aa8416ea SHA512 a84cb7555716333e5d6ab9be114fb4072c315b244add05ad829bd476884c282a17f8166daf35d6a343bfea3407f1388374d8632e37ce6057d546b67f7deea256
-EBUILD powerdevil-5.22.5.ebuild 1951 BLAKE2B f7312ff7465b721137222fd0c02480c67f9eb5bded7cfc8a30c48cdead8e03383d559ff0928694febb18a012bfec2138088e7e8a52bedffcbc8105ec1f564aec SHA512 9d6e8d08ea83c88251bc9a078de4625a11912fb82143ab73d7c69c766e35575fc1a4815cb1a11e93334ac77fcff34e52550fdcaf35a9b82007cce7806a26bb94
-EBUILD powerdevil-5.23.4.ebuild 1954 BLAKE2B c2045e6029b9fe6fd376eddf923dd0c31440a2255bfc35f9078f98342b2584a5dada60279558cfa6bc357a6768c017e0f044d3310e349addd8cc6822d371ba93 SHA512 34e67ac88bf2b62bdce4e6fe757283b63e19979dc5e9b95a3b0e84387ee7d8710bdbfb552a20aa772758160e02a5035f9b6911a7e9d129c98e43fa24b7ea0e84
+EBUILD powerdevil-5.23.4.ebuild 1951 BLAKE2B 41c5624dcd8801e8d41dad9d9ee5b920d273a7d1ca211b670bd62cf2e4d3dff83ac4e4e7ed9d5a488aaa1ca2d99fa5d211f9d37a6125cfef8a83f8cb6d7c6332 SHA512 3a0acd635117d8577466dec37b7aee3a928151200d8dc143a6d44a1fb5c831b65786b2b42d9382fa12b5ea6bc4a84027cd647be0e41a366dfad495b970821c34
 MISC metadata.xml 597 BLAKE2B 4e436cb067ff3c936a6e497de75b03947f4ccd1103f45237a8a7fe738f67c5a718bf17bbb7aa0a9eff068ce18ce4f0b73bb8f737badc63971e3edabcdd09bff8 SHA512 f4652971683109791e796a57de30efaf603566ad5f9e3e1d16ca54b1212b4cd3ebe1d9a934959fcb51d2722aafe3d57af708f45722534f225ea4b2889a492dc6
diff --git a/kde-plasma/powerdevil/powerdevil-5.22.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.22.5.ebuild
deleted file mode 100644
index 5003cb8e547c..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.22.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE="brightness-control caps +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 )
-	caps? ( sys-libs/libcap )
-	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
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_DDCUTIL=$(usex brightness-control)
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package wireless KF5BluezQt)
-		$(cmake_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.23.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.23.4.ebuild
index 7b2e96d8b63a..fa6b1b4bd1b9 100644
--- a/kde-plasma/powerdevil/powerdevil-5.23.4.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.23.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="brightness-control caps +wireless"
 
 DEPEND="
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 38aa2e130168..008d01b85d08 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST sddm-kcm-5.22.5.tar.xz 64592 BLAKE2B a0980e9dcac2ea6d61e2493c64f338442dec55036598048c2feb1bdeddf7f8b7f71c1dd3759d1d7b2548ee1cb197497ae13bcc08eb776b6f19012e4b6abca11f SHA512 4026d5ae90ce6842541ef405c5859c35f7eb12fb16cfebb21a438ec33c73f7c741e1a2a1338caad9d97eb31bc8d74453c19a13434cbdf03a33fc12b1466f9cd3
 DIST sddm-kcm-5.23.4.tar.xz 77624 BLAKE2B c083efe3ea881a4d06c283ee757d5b5dbbe16cb59e4ff59fb88d0b3afaf96ef9d964d9cc27ee356e3a2509f9e9fa75a3c2d2305b67fd795e6b22ebb3674889c6 SHA512 00a047d08cf71a0793f43cbbe9c8b23678fc1de99250f1a1f4cbe647010761cb68109e2a7ef852e935eb00793af155bade5eecfad4729cad788f597625060b2c
-EBUILD sddm-kcm-5.22.5.ebuild 1079 BLAKE2B 7ff7ede17179d5e0695899acd5469e0759d21307c7029803cf5d257119b5df2c5fa0a846326a3cfed280ef2120fb3367127fa4cc1a3a1ed24928689c91937a06 SHA512 44995950d8bcdab94ba5bb3e578b2fcadf96bd1ecc2a81363d3913fa916485ead8d7fd9640fe4436b7d5832dc64561da007927dcf8e6820db335335fa2d1ec83
-EBUILD sddm-kcm-5.23.4.ebuild 1124 BLAKE2B c402a309342f7976461963e12d1a40a69e283ea84278cffbbdb5fbe95729e88d46da5c79febfcd4b5df1461332977a78f5450e63d744b1ca23178683974863b7 SHA512 3f0b121e0375f73f020cd4f80cb6696c9f7dea1605b6df53f0d4fe64c5292a1a0454ad9aa96ca27969254c8ba008ae0eca1548de8c88d3eeb5f78bc3d16ccd2f
+EBUILD sddm-kcm-5.23.4.ebuild 1121 BLAKE2B cc4cb583d8b9599f8bcb77e38e3c9cfba1322cc6910e16b99f0d6cbd9083a8a8be87d01c2cae03a9271ded945b6c9760c55c4ea658c32df40cfa66eb95505531 SHA512 ff87c527141775cae8e7cb673f7a67efd23a9d0b6ca7805b8d7997e782c8d720fe4f79c61fd4a4abab189041e19497db867f280eb3c4c3ffd47b9b8acdb2e767
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.22.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.22.5.ebuild
deleted file mode 100644
index 8389991bf709..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.22.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv 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/kcmutils-${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}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	x11-misc/sddm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.23.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.23.4.ebuild
index c0a6d49efe85..ae336a6d350e 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.23.4.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.23.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index aecfe88ca97a..4ef501c1d45f 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,3 @@
-DIST systemsettings-5.22.5.tar.xz 205224 BLAKE2B b9aed5a330f2497e7df172e83a0633e3ac1fbaeba58d4dfdc6f9ec5f1645c164ab426396d9e9fb8640c7567b61c17a172e5bc9574dd108e3d8da4a8d56f1e627 SHA512 d74aca46221dd8da152139a7cb0d5eb05d29d9d39e935b8d29f8f105bc7573af55808d7b77d8416deec1743ae1a9149b24a6c6082dedf7ada53d16d4cf09f22f
 DIST systemsettings-5.23.4.tar.xz 203520 BLAKE2B 966a416850e578e567093c3abac8238f2812a50cde2579b90b32437bb79eb2a6dd879bc2b809ef2e9aa925206bfae0a40d7b9542c2164ad894b815acfd9fb941 SHA512 fa4713acd9167285e96783fbd453ee647a99127e45a64b556fd10396b8a27ebacaceedd413b8cf0fb1a7c4f950666c127dc08eb475411b30358d07cf5e558ee5
-EBUILD systemsettings-5.22.5.ebuild 1678 BLAKE2B 31cb254fd0f29931bb0afbc0d7f021659a66d4440b5954aea05c6f341128c58e13097790d5c884f0965094d61752ac8261db2a3b3b6b2a5d27d615854a6e65df SHA512 a243ea3cf73fcbaa5be79618c27045e805e131f2eea9ce0e442b86d538ee596a5f0d3cb9ba63b4c8f6bff330c32bcff069b200b23a3418ad655ee782075baf96
-EBUILD systemsettings-5.23.4.ebuild 1757 BLAKE2B 7377e818b32feb088be59875829d62b506798434955a1ee0d5b13c9c185b58429096b0f99dad2d293c5a1fd5c1fd0d5d5c51c61d145732f2783f2142bc86fa09 SHA512 674097b35741a516f906dc14b84776acf88e33d6b1d43ddb6cd037b52092176a669ae3e515bbc8ef3e374e98fb0d427ba74cc538f233c03314e4652f35c5aa1a
+EBUILD systemsettings-5.23.4.ebuild 1754 BLAKE2B fd10f978ec857b7c619cdf8bd5aba0793e04e2f812063b15ed01e8126d38c0ce5860149e1bd2b6e9a908c2a8c0eef0010b3f661bb595083c877c50e2fdc050c0 SHA512 1dfbed2b160fa19be32c61371b132837a27ce15ff0bec15fd16a0f73733831335b146ba9098dc833f8b808eb49910cb8ad46a9a7951809bb276e342b8c9cf610
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/systemsettings/systemsettings-5.22.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.22.5.ebuild
deleted file mode 100644
index bb83024afd9a..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.22.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Control Center to configure KDE Plasma desktop"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv 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/kirigami-${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}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.23.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.23.4.ebuild
index 452b6efd42ca..f9f2df6ad964 100644
--- a/kde-plasma/systemsettings/systemsettings-5.23.4.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index b3a23b7968b3..14fd4193f95e 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,3 @@
-DIST xdg-desktop-portal-kde-5.22.5.tar.xz 87036 BLAKE2B 57bdcd7999587607a7e952ce52b4ab9a6fe948af4d2cc4929425618b372b3d20eeece60e8cf2baf11ca989e3c79d77c69469aaa4e6120bd069b82f977216017e SHA512 753adf3a4b7543ebbd220f85980e23f1bf98642c8aac408b41ba07bd7aa1ef9929518794e946d497b216eb781695b491c4eb35fce47c43a3a3463d6b9e62017f
 DIST xdg-desktop-portal-kde-5.23.4.tar.xz 89468 BLAKE2B 2bdee6d5bee56f61ed8e5592686f2087c9eade48a856d11cd102efaa4c61c4263f0a998c8a57ef74550e4a8b66c3cc04fd5467809b7fb742470ef25470eaf762 SHA512 9749eef9ae1b634e71660e9531eb05c6fffff68fd03eb69da8a7ae6471b6400c8b51795e15c841b2f744d6325fa70c74be5d4cbac5bfa05476e60a333302bb68
-EBUILD xdg-desktop-portal-kde-5.22.5.ebuild 1105 BLAKE2B 20df70250cd44f379c019c7a5f814da493fdc04e99c419233e53aa1e1ca9a6d802c47649fb172ddeee329e7ab798ad1293c7731aa3fc6ab16ed7df2c20561ae7 SHA512 c98508f0b6acd65c204607c5c91f713a4dcd96ffa578c41ba6e31a6c5de57e788f115a2f9325c45a93b5424281ed3cbf2c303009710f55b0dbd8467b93e83720
-EBUILD xdg-desktop-portal-kde-5.23.4.ebuild 1108 BLAKE2B a80d31fcfd2913f5607bafd5ee5672938573780289c44d2e43c1291ffe338adf5fe042b19b2e0426b0e649489661786ec7a758bec9b4e9c2a9a94fb72795e929 SHA512 d4332a8b4bd04f18782a736b0921ba58db9ab0e311c837fd1f84f871debbcc82ac06ae05bbab8299019d0ce974de280a37e3d8283768d50cae854b38be0691e4
+EBUILD xdg-desktop-portal-kde-5.23.4.ebuild 1105 BLAKE2B cc1af1379f6885bed065014bd0097120db96998ecc3f3fa4fb37c787df889d3c58076847610d6da1f0ffcfaecf09045bb77f8e56ccfd331f700212ad7381855f SHA512 b95c7011117b0e9a158c2f9067295783c1cadb20f85fd0bcb9df46b0cdb3402595d76d29a6b2792a68e63041efbcc384b33fc7b9ee4df23747d3966f3b198a66
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.5.ebuild
deleted file mode 100644
index c13ae9aa9405..000000000000
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/wayland-1.15
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=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
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.1.1
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/xdg-desktop-portal
-"
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.4.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.4.ebuild
index 741a7d0cb11f..c226021bc7cd 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.4.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 38750575c19a..1ca3671eb3ce 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,4 @@
 AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74c963e6af642c956b2907a2995335845d730b11ab09b81bf535edceecca2bbc7fa44552bc1659e5e59e95415470fe77a7bece759ba4a SHA512 8eb77b1a97715d549164cff12dd4d1b63af2d0f8bbcb447d47b4ec82f539e37dad5395e0a7f8fd5c700fc82e06569313a36cf1f7e6eca09ad6d18bb890dbb9fe
-DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
 DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
-EBUILD xembed-sni-proxy-5.22.5.ebuild 1015 BLAKE2B 11b057039b67982acca95b5c38035b99c7fb01cd580b0e9865911fcd3bbca6dc7b053cd5571e3edf1e8ec7247744d2466c8d78352e5e5b53cd76d05f725b63f3 SHA512 c0afe7eda4d58c6341535c6d7dd7a0c7f89b2095762ede6684822b4dfb55895bd63b287d363ab39e65971139c656fe0ef52095032acd61d72818fdc1a70a92ba
-EBUILD xembed-sni-proxy-5.23.4.ebuild 1018 BLAKE2B 07f711eeba0b50239446c898eb01556542166b08ffb9e685c1c53560b7a9c5647ddca2c73a2f126bcb76f0ab5950d4ae73c7507836656d842a3242f6423aab1c SHA512 28594e58bfa8c8101f201de9762004d2dd45b6e17a08f9b8d1f68852a070424485a783b49464a9281a7314ee69deb02cddcd13bcc76984635ad65d16659fd786
+EBUILD xembed-sni-proxy-5.23.4.ebuild 1015 BLAKE2B b3bc7fdbcf89d52f7105fdd6ff6ca4cef4a69d3b549a01b602d160dac5bce87312fea4104a54cbda8b1507ee6d2e9f2a2f25e64ca03b07677ccb817224bc5ba5 SHA512 f4cf2ac6a6d47c6203084aebc7074d2f8b5b112506a61fd145d9d18534e0ddb4b5adebbb95daa29a920f375ff25b20ee6bb58320c7f307fdba5a35dc523ae095
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.5.ebuild
deleted file mode 100644
index b517e964f3dd..000000000000
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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 ~riscv 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/xembed-sni-proxy:0
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.20.80-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.23.4.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.4.ebuild
index 7ebe3cfa45e1..f60d32c6774b 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.4.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
author	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
commit	93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree	b9791a06ab3284e27b568412c59316c66240c682 /kde-plasma
parent	2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)