gentoo resync : 22.12.2021

9 files changed, 107 insertions, 315 deletions

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() {