gentoo resync : 15.06.2021

10 files changed, 29 insertions, 334 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 4fdcac4f3957..788643e9ea2f 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,19 +1,13 @@
 AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099cb1c242bdc73637b5b0f017da2355f9e135d9f40a6f47cf05e1c7910d2ff93ddc932e771794378cbb30390 SHA512 25a6f1ac242e4cbae8ab63c033af5cc320fc0f02cdc95000d5604ddfc8e2a3352055a9bbc629e5490011df2744cd0de59354c137bcb3766f0b0755773f2eb190
 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
-AUX plasma-workspace-5.20.5-avoid-render-invisible-contents.patch 1584 BLAKE2B a834e83b005575379f4ff3aec18b48bfa045c52ad5fb1483c41902c8dca6a9cadd855b8186128c0ebcbdf4ec63cbefdebe3f9e65b1a4ea9dfb94ad66702ac9db SHA512 4be1982217a33f9a90c929308e2ddfd8d92285d08a521f3039b1588bdfaa62b52dae1053aee19e25dda841e987698f286cf277d247a293868f087809747d0ebd
-AUX plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch 2326 BLAKE2B 97dd0c98b06bb37272e322ce6fda980d26213d4621f5bb82b91ac3293ea41f2c84c243d1f54a86f4f0a5848ecac03d7a39242e0bdf2de7648dec07f29cdf2320 SHA512 9c2ac24acb748975f0c7a5a5f1c3c6fb586151c01714e7dc35b46179ab7917ea2e47c9e5edaa324ea75346cd95d4ad625616c3971b7a078f5d903be7cefe3013
-AUX plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch 1493 BLAKE2B 2b81bd9371d72913b4cb13e305a968e6944984f606c5e4645ac34a3fd1002e2297133cc320c5b015a094ba62c18689a508ae785adc0b709c9bb256ae2bddb6e8 SHA512 0a65b90bb73b0a42233ea469be145f5ab1bb33d0da1264beaf1e1a665c8b77448d59372f076dba38d023f7eba3a502e965a53de198b9685d3a0b8b828fd5d4c7
-AUX plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch 2671 BLAKE2B 9dde17739f7c3bef298d0ec7b1d21a5a321e85356a8591d82f82c213e8adcf4cce807d45b79821d113068de7647f460d6439ec849fdc7e9ca8b71953f0193cdb SHA512 60b008f84049b59b41ed11cb7a2c0699767381b0a41303b23c2a41c6ae1cfb20f36778dc4055bd54821d323287f18bb9ca62fd1e144df99f81da40f93958412a
-AUX plasma-workspace-5.20.5-revert-activate-krunner.patch 2362 BLAKE2B 0f2d2220fe54b508899ae0f70ee8d266282418bf7e54be5b9c051f45dd540905dce55563f182d2ff7ecfe36c50f617b53368cb404e61e22843bb6a1cc263b04e SHA512 f027ff3c2fc200af8d26cb9307e0fa932f0c0a56cdb99740a8c84dd9eb41542ec661b54f18944cdf3856292f54184d351cdde126da82ac649ca4d95955c72452
-AUX plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch 1475 BLAKE2B 79b9ca4dff4f88c2343e294c9243a2221f20d14ebbda8dca87b371143eee618b7f9118ec1435c6168cc1be81a129ab9b6d21615c08f777355b0cdd6978b9847e SHA512 0a0c87db98be7fed51d0b193f683a60fe6119f7f47e82966bc01cc5c5afe6f74d7f3edd8939e709f2f72363741a5cbd7f464890fbe0bb88d25c4f5b235d3dfb2
 AUX plasma-workspace-5.21.5-dangerous-shortcuts.patch 2114 BLAKE2B 88cb2dc9bb202aa44ec75eb69ff806a2b48cf23d2aecf1db89b747269aa1f4689b6577cee5ef14399bd91839db366e2aae155e2bce2b6e8683aaacb63b267cc9 SHA512 42a3954e7d6a1c78e9f59a073be4dd671e1cce51b72d9ebb415d1e5bce1136c3a5fcbb8fc723ef7c82fd7a8ddda18a12935a375e7abd12d771a5911f3cc8e8c4
 AUX plasma-workspace-5.21.5-revert-activate-krunner.patch 2369 BLAKE2B e3b8b1ae433a8e212ac65dd7a20cc56ac190200afdad33bc0f24243d1bbbb5a7db40025f6fea033d3e7a9ca71f77650962af39c8c624d07cbc1a3fb1c939faf9 SHA512 2235fdd5624fa3a8d4727cf553801e35b074e22d1db78ccdf12b2e40448e8d3ef85c20e74936359cd84155a288a4fe1df1142370a61790325ce93c5163b78c60
 AUX plasma-workspace-5.21.5-split-libkworkspace.patch 1154 BLAKE2B d37f649971b95c3fd99c551ec7512054460d8ba04c265e56c2ee53d968c7885929724c81df2895eeae8609a5a0a4c28839461429579f56bcbde4dcaa5646e15b SHA512 c41d2c56170914a309c9765a58a6cccaf4a9afae937ce762387590f3b2ccf59969b5873f702986369c4c3118c74d314f8b68916bfabce5e7379b3cb27daebb50
 AUX plasma-workspace-5.21.5-transparency-panelConfig.patch 1174 BLAKE2B fa68999f0c9f4bed18d2b00b3129c271a3d63359f618b05eebb1cbb0dc759b8daec6019069ac64adfe10fb76acd833bd3fbdbf48b83d5859d4dbdacea37a4dd8 SHA512 19878656585d8ae980b9d3350506cbcb2f5841535bf042e66a6fbb2873680207730d7f6a06065aa94268264c4d252c02d434fa6f96358906ea7c01c16188f172
 AUX plasma-workspace-5.21.5-transparency.patch 14371 BLAKE2B 6ce2619103bbff528c31b89d1aec8064e79768b66513c9b5a66d4d994f3824e733473755f3b866729c7a0a92a43209dfd641e864ee66dd69875364a93d5d69cd SHA512 cf0a6140a3905ed58f3fec0ada1f8dad4faa59f2b12e3084f26832b4e93db0c5e9a0fd86667c40ba9ddc7bb5108c3ab7e5c7a39db274e2cb46f3605707b2ae7b
-DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
 DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
-EBUILD plasma-workspace-5.20.5-r4.ebuild 6402 BLAKE2B 9421322f197d94628fad7ea6fda583c2b86ca5858f83989d85003f141a5eb7e7fbe69761f71c653abd3d093ec7eae610e4db5769475c5aedc82da78e2b5cc2fe SHA512 f23ce6fa49a5dc0f8515b76c2a4c9425b4c41891ae4e1e06b211d86a2826df1bfd54bf26496f1bc53f9bac422a81151fe53e510f8c01287e7dfdfe10b1e5b06f
-EBUILD plasma-workspace-5.21.5.ebuild 6353 BLAKE2B 290903d9d22a174803c592752d697de2267ffffaff097b704efd760fc449597726c6e202481801b277c6ee45a274c1b63e002b901f0f3589048b2caecc480b64 SHA512 aaa4f90762f3cf8989dbb7bd2324217a46917b8738da7d6b4df691bcb64c84a44bd5fa2f3743432dcc564dd019981b09bab84b51a9706b993978f56abb5bda9b
-MISC metadata.xml 820 BLAKE2B 4b861592915543bb74f501d3b06bb2599d45232a016a7a6d89b62e56624b401ab6852ed471a4ccfbd2ee4a435ad18a3c25eb5df331b6d066378a3217755863de SHA512 c292e4c1476f1222269e26be998648b05c5ce0201193434e4b5b81f2a9d794bdf4a961a203edc77cf4d5b9a967454feb0c9514549170ab6f79218e6ed356cc72
+DIST plasma-workspace-5.22.0.tar.xz 8349176 BLAKE2B 61993be02589be83911c8eebcf1bb21dab7377b47bf011a9900791f6aaa5a3e59d545116ad0728afd6565763e6396d12c6e3992fc3ea55c8ab76cfb14e5b21c3 SHA512 fb57dde0ae5f774cb782ab305a526ce22404972197d531a2c5e6972eb6400d57b99a7ce397fd417c0c42c8de58f4c06d9e9771b64eb94f501987da910054f4af
+EBUILD plasma-workspace-5.21.5.ebuild 6350 BLAKE2B 4d126e250eedfff978e5c0d36d3f629bc03057347603ec470c4ed69656b2025ad4704883b086cd33eeb591a5dd8d259b4f58342c426b853ba86cfbc9fad3d066 SHA512 79e67ef32136f66256b044a60ed1780bf8814a826730402033c386bf538e4509807890403a5238cf6f95c483f668e7d7b4d823b9c15597e005f859ce960dc58e
+EBUILD plasma-workspace-5.22.0.ebuild 6134 BLAKE2B 09bd8e74ff5edef5184008c9e96ba863b0821fcf1b7002b13694af66b6c9f0c59a22a042a30516c1d3e1dd015e653e822fea68f0893d7759dc9ffd9588d0a068 SHA512 2a089ff02663f0b4a1b9a8551f8cef1740939364790749df62676eee88b26efc141c6a9802c93ffebd781690f99ec2e92c62232a1d092b602d8e976818b4f7bc
+MISC metadata.xml 725 BLAKE2B 9407d29ff0ca14ceb51e387202b0194021799a0bd35a9587b55e5e4966f19fd1cb2ef6d6f541c5ae3929f1d8c9c6b278d7772021552b7b928933dc217cd16a7d SHA512 c02209adea54e9275a81f3e301ad5491481499a918eced7d0d308bab6f638c1ae97e62604c5d931fb1ad3a7bf5393b6717ca40a9c080764eb4a12528d99a5d71
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-avoid-render-invisible-contents.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-avoid-render-invisible-contents.patch
deleted file mode 100644
index effea7fdc8e1..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-avoid-render-invisible-contents.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 45e0a722fb85bb5d1ab8bef92080e934254b13aa Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Thu, 7 Jan 2021 13:36:29 +0000
-Subject: [PATCH] [lookandfeel] Avoid rendering invisible contents
-
-An opacity of 0 but still visible still results in nodes in the
-scenegraph, which is wasteful.  This is shown in gammaray with some
-warnings.
-
-Enabled is also bound to visible as if a text field has focus it still
-animates the cursor icon even if inivisble, producing wakeups.
-
-BUG: 347772
-FIXED-IN: 5.21
----
- lookandfeel/contents/lockscreen/LockScreenUi.qml | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml
-index a2eba8e6d..83564fc0a 100644
---- a/lookandfeel/contents/lockscreen/LockScreenUi.qml
-+++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml
-@@ -228,6 +228,12 @@ PlasmaCore.ColorScope {
-             height: lockScreenRoot.height + units.gridUnit * 3
-             focus: true //StackView is an implicit focus scope, so we need to give this focus so the item inside will have it
- 
-+            // this isn't implicit, otherwise items still get processed for the scenegraph
-+            visible: opacity > 0
-+            // changing enabled will toggle if an item can have activeFocus, which otherwise
-+            //keeps the text cursor blinking even when invisble
-+            enabled: visible
-+
-             initialItem: MainBlock {
-                 id: mainBlock
-                 lockScreenUiVisible: lockScreenRoot.uiVisible
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch
deleted file mode 100644
index 58f3a50c4911..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From fa2bafea8f0cd9fac0864ac23f23c955d5f15b73 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Tue, 5 Jan 2021 23:57:19 +0000
-Subject: [PATCH] [panel] Fix crash on screen changes
-
-There is an error handling path when we fetch the relevant config()
-
-```
-KConfigGroup PanelView::panelConfig(...
-{
-    if (!containment || !screen) {
-        return KConfigGroup();
-    }
-```
-
-which we indiscrimiately call parent() on.
-
-This patch guards that case, which is presumably screen being
-temporarily null.
-
-This code is also Plasma 5.8 compatibility fallback, so arguably we
-could get rid of it.
-
-BUG: 425711
----
- shell/panelview.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/shell/panelview.cpp b/shell/panelview.cpp
-index 28e86d2d3..991364e97 100644
---- a/shell/panelview.cpp
-+++ b/shell/panelview.cpp
-@@ -561,7 +561,8 @@ void PanelView::resizePanel()
- 
- void PanelView::restore()
- {
--    if (!containment()) {
-+    KConfigGroup panelConfig = config();
-+    if (!panelConfig.isValid()) {
-         return;
-     }
- 
-@@ -572,7 +573,7 @@ void PanelView::restore()
-     //but if fails read it from the resolution dependent one as
-     //the place for this config key is changed in Plasma 5.9
-     //Do NOT use readConfigValueWithFallBack
--    setAlignment((Qt::Alignment)config().parent().readEntry<int>("alignment", config().readEntry<int>("alignment", m_alignment)));
-+    setAlignment((Qt::Alignment)panelConfig.parent().readEntry<int>("alignment", panelConfig.readEntry<int>("alignment", m_alignment)));
- 
-     // All the other values are read from screen independent values,
-     // but fallback on the screen independent section, as is the only place
-@@ -599,7 +600,7 @@ void PanelView::restore()
-     //but if fails read it from the resolution dependent one as
-     //the place for this config key is changed in Plasma 5.9
-     //Do NOT use readConfigValueWithFallBack
--    setVisibilityMode((VisibilityMode)config().parent().readEntry<int>("panelVisibility", config().readEntry<int>("panelVisibility", (int)NormalPanel)));
-+    setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry<int>("panelVisibility", panelConfig.readEntry<int>("panelVisibility", (int)NormalPanel)));
-     m_initCompleted = true;
-     resizePanel();
-     positionPanel();
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch
deleted file mode 100644
index a7580b44475a..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From aa5215a0b3f8febfe9eda2ab586d9bf8ba647c7c Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 11 Jan 2021 16:03:31 +0100
-Subject: [PATCH] [applets/digitalclock] Fix showing agenda view when enabling
- plugins
-
-The agenda view is only shown when at least one event source is active.
-When going from 0 to 1 active sources the view wasn't updated correctly.
-
-This was because the visibility of rightColumn was bound to the
-visibility of its child, but since the visibility of the parent affects
-the visibility of its childred (https://doc.qt.io/qt-5/qml-qtquick-item.html#visible-prop) that resulted in a broken binding.
-
-Bind to the source property directly to avoid this
-
-BUG: 431433
-(cherry picked from commit 56064d80ff2e798460967b28243c8117ee6ebaec)
----
- applets/digital-clock/package/contents/ui/CalendarView.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/applets/digital-clock/package/contents/ui/CalendarView.qml b/applets/digital-clock/package/contents/ui/CalendarView.qml
-index a7104100e..1541a3501 100644
---- a/applets/digital-clock/package/contents/ui/CalendarView.qml
-+++ b/applets/digital-clock/package/contents/ui/CalendarView.qml
-@@ -145,7 +145,7 @@ PlasmaComponents3.Page {
-         ColumnLayout {
-             id: rightColumn
- 
--            visible: agenda.visible || worldClocks.visible
-+            visible: calendar.showAgenda || calendar.showClocks
- 
-             Layout.minimumWidth: units.gridUnit * 14
- 
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch
deleted file mode 100644
index 8d2c0ddfbdb8..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 13057013d55ae19e76d29b9edc96510e52da2a7a Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 8 Jan 2021 12:40:07 +0000
-Subject: [PATCH] [lookandfeel] Fix wake existing screensaver mode with key
- presses
-
-In commit 45e0a722fb85bb5d1ab8bef92080e934254b13aa we changed the focus
-on the textfield with the intention of fixing the cusor blinking.
-
-This had the unfortunate side effect of breaking waking out of the
-screensaver mode with just the keyboard.
-
-That screensaver mode was bound to:
-```
-property bool blockUI: mainBlock.mainPasswordBox.text.length > 0
-```
-for that to change, we need to have focus.
-
-Instead this patches cursor blinking more explicity.
-
-Doing it only in the lock screen (as opposed to the toolkit) makes sense
-as this only happens due to somewhat unusual usage inside the
-lockscreen.
-
-BUG: 431286
-
-
-(cherry picked from commit 2cbd7e4c70d0592d16cdaf58ed43effe4a716aa4)
----
- lookandfeel/contents/lockscreen/LockScreenUi.qml | 3 ---
- lookandfeel/contents/lockscreen/MainBlock.qml    | 6 ++++++
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml
-index d2f8a2b7d..c4f9e8a45 100644
---- a/lookandfeel/contents/lockscreen/LockScreenUi.qml
-+++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml
-@@ -229,9 +229,6 @@ PlasmaCore.ColorScope {
- 
-             // this isn't implicit, otherwise items still get processed for the scenegraph
-             visible: opacity > 0
--            // changing enabled will toggle if an item can have activeFocus, which otherwise
--            //keeps the text cursor blinking even when invisble
--            enabled: visible
- 
-             initialItem: MainBlock {
-                 id: mainBlock
-diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/contents/lockscreen/MainBlock.qml
-index 4bd5df0e5..e8f5ced47 100644
---- a/lookandfeel/contents/lockscreen/MainBlock.qml
-+++ b/lookandfeel/contents/lockscreen/MainBlock.qml
-@@ -66,6 +66,12 @@ SessionManagementScreen {
-             enabled: !authenticator.graceLocked
-             revealPasswordButtonShown: true
- 
-+            // In Qt this is implicitly active based on focus rather than visibility
-+            // in any other application having a focussed invisible object would be weird
-+            // but here we are using to wake out of screensaver mode
-+            // We need to explicitly disable cursor flashing to avoid unnecessary renders
-+            cursorVisible: visible
-+
-             onAccepted: {
-                 if (lockScreenUiVisible) {
-                     startLogin();
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-revert-activate-krunner.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-revert-activate-krunner.patch
deleted file mode 100644
index 37f3ae7ece47..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-revert-activate-krunner.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From e350342bfc42f7803c58dafea0c0ad190507430b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 2 Feb 2021 13:28:06 +0100
-Subject: [PATCH] Revert "Activate KRunner instead of running the binary"
-
-Causes applications to be started with cwd "/".
-
-See also: https://bugs.gentoo.org/767478
-
-This reverts commit 0e575a20ef36532b5b40a40ea30f915976942477.
----
- krunner/CMakeLists.txt                             | 3 ++-
- krunner/{krunner.desktop => krunner.desktop.cmake} | 4 ++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
- rename krunner/{krunner.desktop => krunner.desktop.cmake} (94%)
-
-diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt
-index 59d50e464..02b2c5731 100644
---- a/krunner/CMakeLists.txt
-+++ b/krunner/CMakeLists.txt
-@@ -31,7 +31,8 @@ target_compile_definitions(krunner PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}
- install(TARGETS krunner ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
- 
--install(FILES krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel)
-+configure_file(krunner.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop @ONLY)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel)
- 
- set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KRunnerAppDBusInterface")
- configure_package_config_file(KRunnerAppDBusInterfaceConfig.cmake.in
-diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop.cmake
-similarity index 94%
-rename from krunner/krunner.desktop
-rename to krunner/krunner.desktop.cmake
-index 85c91dbad..457daaaa7 100644
---- a/krunner/krunner.desktop
-+++ b/krunner/krunner.desktop.cmake
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.display
-+Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
- Name=KRunner
- Name[ar]=مشغّل.ك
- Name[ast]=KRunner
-@@ -59,7 +59,7 @@ Actions=RunClipboard
- X-KDE-Wayland-Interfaces=org_kde_plasma_window_management
- 
- [Desktop Action RunClipboard]
--Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.displayWithClipboardContents
-+Exec=krunner -c
- Name=Run command on clipboard contents
- Name[az]=Əmri, mübadilə buferindən başlatmaq
- Name[ca]=Executa una ordre al contingut del porta-retalls
--- 
-2.30.0
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch
deleted file mode 100644
index 3018b73cefa0..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2a6718ff53aa70d3a6c0d9a78a7aaa491907b130 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Mon, 18 Jan 2021 12:56:00 +0000
-Subject: [PATCH] startplasma-wayland: Fix XKB variable setup
-
-When this was ported to C++, it missed the actual variable assignments.
-
-
-(cherry picked from commit 76088e21ea2ec09d13bd462d61c4b8ffc7bc4729)
----
- startkde/startplasma-wayland.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp
-index 500435853..38e325843 100644
---- a/startkde/startplasma-wayland.cpp
-+++ b/startkde/startplasma-wayland.cpp
-@@ -61,10 +61,10 @@ int main(int argc, char** argv)
-                     qputenv(var, r.toUtf8());
-             };
- 
--            queryAndSet("X11MODEL", QStringLiteral("X11Model"));
--            queryAndSet("X11LAYOUT", QStringLiteral("X11Layout"));
--            queryAndSet("X11VARIANT", QStringLiteral("X11Variant"));
--            queryAndSet("X11OPTIONS", QStringLiteral("X11Options"));
-+            queryAndSet("XKB_DEFAULT_MODEL", QStringLiteral("X11Model"));
-+            queryAndSet("XKB_DEFAULT_LAYOUT", QStringLiteral("X11Layout"));
-+            queryAndSet("XKB_DEFAULT_VARIANT", QStringLiteral("X11Variant"));
-+            queryAndSet("XKB_DEFAULT_OPTIONS", QStringLiteral("X11Options"));
-         } else {
-             qWarning() << "not a reply org.freedesktop.locale1" << resultMessage;
-         }
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index c5f5b9be610c..2bd7fc185ce0 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="appstream">Enable AppStream software metadata support</flag>
 		<flag name="calculator">Enable calculator runner using <pkg>sci-libs/libqalculate</pkg></flag>
 		<flag name="geolocation">Enables dataengine providing location information</flag>
-		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
 		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
 		<flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag>
 	</use>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
index 6e92371027f8..f23f675a0389 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
 +semantic-desktop systemd telemetry"
 
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.0.ebuild
index a56b5b45abb8..f3b2afd529ab 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.0.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,18 +15,18 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
++semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
 RESTRICT+=" test"
 
-BDEPEND="virtual/pkgconfig"
 COMMON_DEPEND="
 	>=dev-libs/wayland-1.15
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5=[jpeg]
+	>=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
@@ -36,6 +36,7 @@ COMMON_DEPEND="
 	>=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
@@ -46,12 +47,12 @@ COMMON_DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
 	>=kde-frameworks/kglobalaccel-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kitemmodels-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
@@ -65,6 +66,7 @@ COMMON_DEPEND="
 	>=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
@@ -76,6 +78,7 @@ COMMON_DEPEND="
 	>=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
@@ -93,16 +96,16 @@ COMMON_DEPEND="
 	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
-		media-libs/freetype
 		x11-libs/libXft
 		x11-libs/xcb-util-image
 	)
 	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
 	gps? ( sci-geosciences/gpsd )
-	qalculate? ( sci-libs/libqalculate:= )
 	screencast? (
 		>=media-video/pipewire-0.3:=
 		x11-libs/libdrm
@@ -127,7 +130,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kdesu-${KFMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-plasma/ksysguard-${PVCUT}:5
 	>=kde-plasma/milou-${PVCUT}:5
 	>=kde-plasma/plasma-integration-${PVCUT}:5
 	x11-apps/xmessage
@@ -136,21 +138,17 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xsetroot
 	systemd? ( sys-apps/dbus[user-session] )
 	!systemd? ( sys-apps/dbus )
-	!<kde-plasma/plasma-desktop-5.19.80:5
+	!<kde-plasma/plasma-desktop-5.21.90:5
+"
+BDEPEND="
+	>=dev-util/cmake-3.14
+	virtual/pkgconfig
 "
 PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
-	"${FILESDIR}/${P}-avoid-render-invisible-contents.patch" # KDE-Bug 347772
-	"${FILESDIR}/${P}-fix-wake-screensaver-mode-w-keypress.patch" # KDE-Bug 431286
-	"${FILESDIR}/${P}-fix-crash-on-screen-changes.patch" # KDE-Bug 425711
-	"${FILESDIR}/${P}-fix-digitalclock-agenda-view.patch" # KDE-Bug 431433
-	"${FILESDIR}/${P}-wayland-fix-XKB-variable-setup.patch"
-	"${FILESDIR}/${P}-revert-activate-krunner.patch" # bug 767478
-)
+PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
 
 src_prepare() {
 	ecm_src_prepare
@@ -163,19 +161,22 @@ 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
+
+	# 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 qalculate Qalculate)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
 		$(cmake_use_find_package telemetry KUserFeedback)
 	)
@@ -200,9 +201,6 @@ src_install() {
 pkg_postinst () {
 	ecm_pkg_postinst
 
-	# Clean up pre-5.17.4 dirs
-	rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null
-
 	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
 	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
 	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"