gentoo resync : 25.09.2021

11 files changed, 286 insertions, 37 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index fddcedfbc601..baba983efc91 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index b9568b132595..8c03189566ea 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,6 +1,5 @@
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
-AUX kwin-5.22.5-32bit.patch 1080 BLAKE2B f92c94d83bae7e00240d4717cab0df9068ed2eb7ebcdf27d30030df72a70945017a182db55697564e1768d9d82358fd2232ec47274b3af0a69e91516ae446b24 SHA512 67b46e401256557bd0b1e35b9a1285cb180cf9b175d26089c537f805c54e9ae60222227443c3631fda5b5ebd299d5983beb537a41ead78dcf9b9cfda73608156
-AUX kwin-5.22.5-libglvnd-1.3.4.patch 2072 BLAKE2B bd49a10f8de69b315cd6f1a754c3f20c356cbd6b6cb37fea891dbac77f171c2eacdcdb9b2972ed9f03beab113d6bea6be10d12b612f99d96e87d3fbecccced9e SHA512 ee504d237cd7acf76e3b6e2bbed7b747938462e1350927d3c9655f341890613137e70aee12fbaa7003cf2ba0868852082343e24e32da03874a546d0b50b23c4a
+AUX kwin-5.22.5-libglvnd-1.3.4.patch 2254 BLAKE2B 3a907856afa816dee53b50e17e2c3ba923c22fae8c9cb644a0b402d350bf9f2701c774daf8dbc45d9d9dac4afdd6e96f6a06ac401be890c3981cff976c61fcb1 SHA512 a71d7480b34503813724a358d01a8e0e8c85ad14e4d1cb3b7c0afb9ff2543552b8e8e49562e8ec81ff1fdeb87ca406fdb4a33e18815e2664143c23a69838831e
 DIST kwin-5.22.5.tar.xz 6459916 BLAKE2B caaec435be180fd4c359bea2d1f4a9a0e3e5854f73b91b83d62ad4e488e9d779a7f6bc5620dfb2ebcf5629b2f90c958d4a4a126df34c9734220c64262e751fba SHA512 4e466f3961279610c16d24c1dbc6368862308ee7bf677bf9f8ed1898465aa31263a34362b1beaad451b6c5e94068d908718c7bb37d12b814f2af9a1eccf417d2
-EBUILD kwin-5.22.5.ebuild 4164 BLAKE2B 4e027110c148d146114e0631cfd0bf2751ef16184ab44102f95f739887a2d8eabd72bd5949fd8d4cf80f30d12a42055565b68694eb98aff967ccad4e5666c33f SHA512 ab67f8105ad307536f7a7825f89ce0d036bd4d0a29e3c6756e64b30e5623f5ae973e8a2d320bbdd9bac3eed16f721694782014074b6ce2da8bc9ffc89e0acf7c
+EBUILD kwin-5.22.5.ebuild 4128 BLAKE2B 8b93294d20199942f6aa0b4ed480618dff5bb7d4cc391340741c5c56088b577c02c15cec0742e6df2a7c45293316011c0a74dfec892ed53c566e86bb295ef81c SHA512 8d7c7c74e886ea8fd4d7a2dd47f8483cc162dd489d13c1d82a76595255d0c321c4e38ec6d9bba3a945349045963db018b0e1fa3526464e07d962922528f778c9
 MISC metadata.xml 512 BLAKE2B 3e81119dbc98181573e294885c52623e4799b55c238ca9513e33547e718ec0f1762371d6391a4291c54159f31cd510cd8d9c192aa16ef0fc16672a3d0ef25dbe SHA512 a9a28562cb0f25abf24cb89c48fea816bfaf701c889ee08e66b80b3afe434af68e5ddb0fa21d313d68418c81a1e73eefcabf75e8e3878f55a1292039dde6ecdb
diff --git a/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch b/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch
deleted file mode 100644
index 7c40b207ca86..000000000000
--- a/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 38e24ecd6416a975db0989c21b70d6a4cc242f35 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 15 Sep 2021 19:06:23 +0200
-Subject: [PATCH] Fix build with 32-bit
-
-Follow-up to 839710201c389b7f4ed248cb3818e755a37ce977
-
-Tested-by: David Flogeras <dflogeras2@gmail.com>
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/plugins/platforms/x11/common/eglonxbackend.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp
-index d2900c7c3..c8acefe82 100644
---- a/src/plugins/platforms/x11/common/eglonxbackend.cpp
-+++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp
-@@ -214,7 +214,7 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window)
-     }
- 
-     // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits.
--    unsigned long nativeWindow = window;
-+    uintptr_t nativeWindow = window;
- 
-     EGLSurface surface = EGL_NO_SURFACE;
-     if (havePlatformBase()) {
--- 
-2.33.0
-
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
index bdca6e2081bc..6db52bdd7492 100644
--- 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
@@ -8,6 +8,10 @@ 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"
 ---
  src/plugins/platforms/x11/common/eglonxbackend.cpp | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)
@@ -21,7 +25,7 @@ index c62ec170d..d2900c7c3 100644
      }
  
 +    // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits.
-+    unsigned long nativeWindow = window;
++    Window nativeWindow = window;
 +
      EGLSurface surface = EGL_NO_SURFACE;
      if (havePlatformBase()) {
diff --git a/kde-plasma/kwin/kwin-5.22.5.ebuild b/kde-plasma/kwin/kwin-5.22.5.ebuild
index 2c65c2ef9f96..43b14d49330f 100644
--- a/kde-plasma/kwin/kwin-5.22.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.22.5.ebuild
@@ -104,8 +104,7 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-libglvnd-1.3.4.patch" # KDE-bug 440372, bug 810511
-	"${FILESDIR}/${P}-32bit.patch" # bug 813228
+	"${FILESDIR}/${P}-libglvnd-1.3.4.patch" # KDE-bug 440372, bugs 810511, 813228
 )
 
 src_prepare() {
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index 381e37f15a7b..fc8385a7ff5b 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-firewall-5.22.5.tar.xz 339372 BLAKE2B 332a7fd2be63429c452f43371b2875f8838e05b107a6c3472974c5db123eef9e415ec70601cb830a743d77422639225e01611e52c07a2b3fe079572278e2f638 SHA512 cc81884550b5c73061f5a1df24c0b32e5fff234a51e56153e95a9e4b0e23c305a555c2deff69633b9cd21dff7bfbcf5d9fcbd5ab3605d4ffa87be57514a91901
-EBUILD plasma-firewall-5.22.5.ebuild 1590 BLAKE2B aca3dea8f09213287870d8e7daf1a9ad48431f0597f8dc882985e1389c0f0d39e51c54dd7d2d6199da5eac1b837f9f60224be35beb42ad7861afba93c447d2d5 SHA512 aec62b82df5495f506719c525a5944b13aa2fd6cd217c664b968554d3963a5ea7ccce3441e5b143610b0f312f100daa16f838412f5ba5606b90175e898bf2bf1
+EBUILD plasma-firewall-5.22.5-r1.ebuild 1591 BLAKE2B 5a3ad21785167e8573b8d7cb9653529ee0587a7ab32cf2dd8f310fe683f93cb186fb31e006fadd06b869f3cdff571fcf54aa649386177cd0d3e2d9337ae66421 SHA512 6561cf3917cc7d98fd19a8372c02ca75812d530b10497a2f8d2f1476e4b53e1a2e670b376a4dc825aeefbce0f3a6484bb33adfc43b85c9c5505c377f7c3f6384
 MISC metadata.xml 481 BLAKE2B dccce364cb3100483c9d5932a250f05575badc6c66a0868a706817c3da4be16fabfdc584fea5d6fe45284da282b2123b1b7985e7813264d27a0338dcb76428ec SHA512 f3925caf241daf159b2b19ea70c4a177f023487ba3fef866e7fc529563b045664debaafb0a9978d05882b69457d9dada314c3109803eaf2e8bb244ac5f9b8f3d
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.22.5.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.22.5-r1.ebuild
index e8a18f40e56c..9fa4bdd860fa 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.22.5.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.22.5-r1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 src_prepare() {
 	ecm_src_prepare
 	# this kind of cmake magic doesn't work for us at all.
-	sed -e "1 s:^.*$:\#\!/usr/bin/env python3.8:" \
+	sed -e "1 s:^.*$:\#\!/usr/bin/env ${EPYTHON}:" \
 		-i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
 }
 
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 29bda38609b3..be37e1c1f07c 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,7 +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-krunner-cwd-at-home.patch 804 BLAKE2B 4bb337ea04037f8992988b70a40896166a2e10b2b557fa5518e3c2bd7129a221fe2efe064465cbffcc3db4abebb13d354599f44884eaf8c1bc029646280921bb SHA512 e49635bbb42c1beeaa9eee6a803f8c96497bc6e768a72d93886281edec922cb641a373fc0a1a482cedb36bd1f400f77b0030247f621373ebc141760a97ef5bbd
 DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
 EBUILD plasma-workspace-5.22.5-r1.ebuild 6263 BLAKE2B 35117c863cced911809ac43850aa0687299a21e75657f6bf98b63e973b023dda904e9587b5759f2f1fb6aadeb5240e7bd4b23b00614211363afcadce5e2ce424 SHA512 6e60c093910da37806d88f7408c3a902c380f1726c905f3f3d5e666aa4ca272ebfd52ea8b71cb6df820c728c2065b5ac2d55f289a5f39d84f460ede015fc865f
+EBUILD plasma-workspace-5.22.5-r2.ebuild 6437 BLAKE2B 3ab27464d25d38e33a94db71c463fdbd82ce606bc6010205aa8e80bced49b8dcff9019852ec4a02d8f7c331d306700e57f3124e8044c1b7f694c2e6b2456da8e SHA512 e0a00eee65d94662ce123a92c6781cd208bb6c91a5e4478dec785e75fb2b631b47159ab96375d4a6385632b8a8507926af6c70a49bf91373b3d8f2b8614462b8
 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
new file mode 100644
index 000000000000..e7cd0627a269
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch
@@ -0,0 +1,33 @@
+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-krunner-cwd-at-home.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
new file mode 100644
index 000000000000..27db136c2949
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
@@ -0,0 +1,30 @@
+Commit 7ca34e0baa7fa65efc929eee5b6b0c3d2104db8e already reverted one
+change that caused the cwd of all apps spawned by krunner to
+erroneously be set to the root dir.
+
+That regressions is back so it's more robust to fix in within krunner.
+
+Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
+---
+ krunner/main.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/krunner/main.cpp b/krunner/main.cpp
+index 4593687ca..fa4a62ac4 100644
+--- a/krunner/main.cpp
++++ b/krunner/main.cpp
+@@ -12,6 +12,7 @@
+ #include <QDBusConnection>
+ #include <QDBusMessage>
+ #include <QDebug>
++#include <QDir>
+ #include <QQuickWindow>
+ #include <QSessionManager>
+ #include <QUrl>
+@@ -112,5 +113,6 @@ int main(int argc, char **argv)
+         }
+     });
+ 
++    QDir::setCurrent(QDir::homePath());
+     return app.exec();
+ }
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
new file mode 100644
index 000000000000..2a5454791b8e
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
@@ -0,0 +1,210 @@
+# 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 systemd 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
+	systemd? ( sys-apps/dbus[user-session] )
+	!systemd? ( 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
+)
+
+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"
+}