From 401101f9c8077911929d3f2b60a37098460a5d89 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 24 Mar 2022 23:59:54 +0000
Subject: gentoo resync : 25.03.2022

---
 kde-plasma/Manifest.gz                             | Bin 9112 -> 9108 bytes
 kde-plasma/kwayland-integration/Manifest           |   4 +-
 .../kwayland-integration-5.23.5.ebuild             |   8 +-
 .../kwayland-integration-5.24.3.ebuild             |   8 +-
 kde-plasma/kwayland-server/Manifest                |   4 +-
 .../kwayland-server/kwayland-server-5.23.5.ebuild  |   8 +-
 .../kwayland-server/kwayland-server-5.24.3.ebuild  |   8 +-
 kde-plasma/kwin/Manifest                           |   4 +-
 kde-plasma/kwin/kwin-5.23.5-r1.ebuild              |   8 +-
 kde-plasma/kwin/kwin-5.24.3.ebuild                 |   8 +-
 kde-plasma/layer-shell-qt/Manifest                 |   4 +-
 .../layer-shell-qt/layer-shell-qt-5.23.5.ebuild    |   4 +
 .../layer-shell-qt/layer-shell-qt-5.24.3.ebuild    |   4 +
 kde-plasma/libkscreen/Manifest                     |   4 +-
 kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild  |   9 +-
 kde-plasma/libkscreen/libkscreen-5.24.3.ebuild     |   9 +-
 kde-plasma/plasma-workspace/Manifest               |   4 +-
 .../plasma-workspace-5.23.5-r1.ebuild              | 213 --------------------
 .../plasma-workspace-5.23.5-r2.ebuild              | 219 ++++++++++++++++++++
 .../plasma-workspace-5.24.3-r1.ebuild              | 222 +++++++++++++++++++++
 .../plasma-workspace-5.24.3.ebuild                 | 216 --------------------
 kde-plasma/xdg-desktop-portal-kde/Manifest         |   4 +-
 .../xdg-desktop-portal-kde-5.23.5.ebuild           |   7 +-
 .../xdg-desktop-portal-kde-5.24.3.ebuild           |   7 +-
 24 files changed, 531 insertions(+), 455 deletions(-)
 delete mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r1.ebuild
 create mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r2.ebuild
 create mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.24.3-r1.ebuild
 delete mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.24.3.ebuild

(limited to 'kde-plasma')

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 3a50ed2277f8..a2d8291068a5 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 52f16f00e878..ed5535b634b4 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.23.5.tar.xz 24188 BLAKE2B 7e6e4b842a9751539a709a452e8081ce615ec960965bac42a03aa2b685c0815dfebf996dd485d433d9d5797c26bc2d4e5782cd49235eb8936a50bc8f1d5b7d26 SHA512 105ee9df541cd6c167fd3434ac846a065c20b82b85c57a2d465c17256567fc7ee717f2fbae4f6acad61c4a6111f6262a2dc7e3fe23cab0bbb3ae2e478ef4ec19
 DIST kwayland-integration-5.24.3.tar.xz 24820 BLAKE2B 3bded1bd691c79732f0bab1a8d82455b68d5bc51882de3414a25d3c1539fd9fa5d7d40f5e354214db98c5e838023248bf204644c81a5695f5aeea88b8a9c1949 SHA512 5837db2dfa4b3c363ebb3936d0b7c1a8e99032227da3536efb3ae50137013cb5d8e82b81fd68fcebe3a028f2100c29f6ccfa09e503172fb772457b112dd198f0
-EBUILD kwayland-integration-5.23.5.ebuild 1153 BLAKE2B d1919a9973a3ba7e50c63f5f39b66b3d0bfa584ecf909587901df3233284fcc3ea2fe485a4908f0ab0c40ca3c8f00e0a8b50ada679e741ef50ca74989c3e595b SHA512 76e1d2c72d756473a86d840396c2e094ae03d98bac53899492eb0e400cc00079c0a4b2fddb0db01d25daf7f143c235ee0dd5674b18c643afd5e7656948585fe3
-EBUILD kwayland-integration-5.24.3.ebuild 1156 BLAKE2B 371dbdf1fad60cc7e1e23bd9bb153df7f6cafd8788e8a8cf71d2884d29748120653a1797c5858daec3beaf6d9bac07524746f0540142e17855857a1b712f606d SHA512 1ebb0a236dc5206cf669fe83f18c019a61f5e87b3c6b9df8a2d327d47fdbc5b8a9fb1b7cca75ebb9143810753f1086fab499717a0d7acd9e7b3695243cfca844
+EBUILD kwayland-integration-5.23.5.ebuild 1233 BLAKE2B 18d5b5ba145a33c247d68201c2e6b06cfa20d9732cdae54cbac43ad52733d4a6727730fc6627bb75ed9de7ef8273ce033ad5907f767383d72b558538b7271a50 SHA512 98b9a161778d39545777d0bd1a61109b064c553c7ac8ad36a100e5050d4627731e0d9e90e480620a24326f9c2331c78925d14620782bddc3106a9e30aa3f0125
+EBUILD kwayland-integration-5.24.3.ebuild 1236 BLAKE2B 93430e494e184adfd4a4863ffa7a039c2ee991360999c73811b22ddc46a46319d42d8572e24729c52fcc45bdfb020523abdae59b7afac684b6372d82a5ff4d15 SHA512 97d7539632e2defe6fc92ebc57f302b4ff0bb292c9861854cc3c38a4bcde03c9ab2bf8e4bc627f51a68bcad1b7fd24937101d0df0f796f9c40f29b5a9b07d9d7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.23.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.23.5.ebuild
index fb1059f5b169..913a35584290 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.23.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.23.5.ebuild
@@ -39,4 +39,10 @@ DEPEND="
 	x11-libs/libxkbcommon
 "
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
+	virtual/pkgconfig
+"
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.24.3.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.24.3.ebuild
index 546195c57a12..e635d8fd2e52 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.24.3.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.24.3.ebuild
@@ -39,4 +39,10 @@ DEPEND="
 	x11-libs/libxkbcommon
 "
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
+	virtual/pkgconfig
+"
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 186abf3f83d1..c0dade79b246 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-server-5.23.5.tar.xz 217524 BLAKE2B 0bc2f6b3137ba9620e7c37fa381fea3037d06cfabb8921ad5417589e6408ebfc603c6a7d73e550b40d7c00f0d8a97f1d946df730358fd6b1758a29183d3779c3 SHA512 bb5305e823d60612f79863de02337855c96de1ba908bf19ad14d0d67c8a199e9f4215faaf5251974cf1f012337a71c444d831a307d112bf5e7fd5b7156c384cd
 DIST kwayland-server-5.24.3.tar.xz 221384 BLAKE2B 5dd7ffd3f96f8f329269f8d8eb9cd526a61bf4dc92701e238798feccf15dc06871bad4eb675b08b23fb87886e49a3d959b6dadd7ec282ee57d1321ef736fc388 SHA512 ed7acd40d88c9108a406b4e459685e37a68c5c6597177e1ca5944a411fe6b0a1b9ac2b520318199efce6f8ae6b581ccc1db1c5a73bdee17126686e44eda49515
-EBUILD kwayland-server-5.23.5.ebuild 822 BLAKE2B 6cc5a829b940588b53339752d5f6abfe31bbf2c76439cd8df01b4e4de286b9de23bfdb28b44a89e16b910e820a3023307d572acb9cc15eef2465192cbb858469 SHA512 521c5266e12d619a0cbe364a932c77e1ef615f4afd904ba95f203ede0fc58e955c0d08d5d6cee613c9694bb3ca831885caf7fa3234c8962239dd70dbd04910d8
-EBUILD kwayland-server-5.24.3.ebuild 825 BLAKE2B dc554d9c4395ad00d9ce8e232b5c27b1da979c941eb7b3e0c5d46175062408d4574623fee77beccd036c26c2a2b99cefce7bce0d9e856ebdf89b5665f37a027f SHA512 1865af3285a9419196196cae76531d7b3194ec8780fe8236935ebd108149270a19b0e81ed304039923b0a0a057a374f20f523d9dafa2ad2637d8cabdfc5bce81
+EBUILD kwayland-server-5.23.5.ebuild 902 BLAKE2B 230c8c66a5483186af6e0ae4051b2304080dfdcfb206717f1d189ce2f2ef41b6b615c9ad9d88331b1df763bdb974d0db3eea2c3469f9f89e4ca33d0d0c47eca1 SHA512 5436b3b036a23f002852f407aa2cf412f843da2febd9b9af15deb9f76d3ffb6af05f29f9aa33d783c4e0e730ad808417ef62f356e98c943574bf778920f693cf
+EBUILD kwayland-server-5.24.3.ebuild 905 BLAKE2B c895c5797a17978fc3c1e0313e08db1b9628eda574136ae0f0f661ffc612374e31b7cc0307371a0c87e24a4b2380eb87cbc1a23da993b1b74c2cae8e5a533822 SHA512 6b355421aeaf4414658d85078b07a59728398a29308ae9bc87e97dcc6f8f788410f62dbf9a2cf2f5888584d15b4324f48c873fddfbe5e4fe1e9639da3413fd41
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.23.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.23.5.ebuild
index e4fc76795832..749ea067790f 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.23.5.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.23.5.ebuild
@@ -33,4 +33,10 @@ DEPEND="${RDEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.3.0
 	>=dev-libs/wayland-protocols-1.21
 "
-BDEPEND="dev-util/wayland-scanner"
+BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
+	dev-util/wayland-scanner
+"
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.24.3.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.3.ebuild
index 5ed70cb0cb8e..01f58af88ddf 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.24.3.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.24.3.ebuild
@@ -33,4 +33,10 @@ DEPEND="${RDEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.6.0
 	>=dev-libs/wayland-protocols-1.24
 "
-BDEPEND="dev-util/wayland-scanner"
+BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
+	dev-util/wayland-scanner
+"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 3aaf6925f033..0d29ea6a5c09 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -2,6 +2,6 @@ AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea
 AUX kwin-5.23.5-fix-ProvidersUrl.patch 3016 BLAKE2B b2deeca8ad365c932dad34762673947bf250fcdd9ed3692e34d3be51ac4470341f7f6d655aea99998629efa2d5128f1a1c46f6d89c3d56cdc7106b02af98eb7a SHA512 89a64c739aadd189593d84a0f403aa734c0aa7dac4103882f095330f6eaba5768a0c9d05c403e3e17c4888dee88e9438bd6f602c6f6fae56dc11262e41654e8c
 DIST kwin-5.23.5.tar.xz 6347020 BLAKE2B 30a47d572665084aa4569dcfd525ac197648bcc32f2650460803eb592e34dd6e2395be2e491c76b71afe32968bdc2d6aa67dd6f8adb0f776366a7f9f48fb5047 SHA512 45bae86857391b9ce9eca8e75c664914b3b59d0327b670af8eaca6b2bd8008376ecb18347019906c9a9553c8767ea3e05d8ad81d57d4bfb3e91589ae27e3680f
 DIST kwin-5.24.3.tar.xz 6437848 BLAKE2B fa8b82c984ce15607424a907322e2aaefa9e6f04b1ff1a9b40b2ff0dcb3d971c80a7e632af5e71893ea6e30200ebe241597e1f480050069ca5ca4113e0e49988 SHA512 b0a578036b84b457c968f583ba0bb44dacddd04cf0e7a86664a6348df3e44ee77d818347a2cb7d9daf2b8425d81695b996fcf272cee80b88947e230b66639b97
-EBUILD kwin-5.23.5-r1.ebuild 4022 BLAKE2B 420b9375c4e972afb622a4040b6a469a19a7efdf658bd5036edf395dd267e27a752cedb7d268ead2ec24aa4bac13f83142a7a3d93659fbac73f7099d852d32ed SHA512 6ba1c639c4dbe7769c0e31da94f1efab8f6a8587e3c83eb5cd671b28bdb59ff63996af90a72b9e17f3fad3f13ed5a27c7dc05ad5308d0c000d69b3f3b738a62a
-EBUILD kwin-5.24.3.ebuild 3938 BLAKE2B 2e573f93f7ccfdc41acaea46fe84a6ddd4fdf442fbb439035ca3c2c738e298965fd38ec29bc4f9d8931cf1019ac0c90946010fecf5e7ccfbc6a217eb3fd4321c SHA512 fb5be20eb13936313f892d285d1286e2dd0339cf7ccdeedb089dc307eea4248ad5cd52ca5a4c8ecd4c3c04acb23dfe3b180aaddf958b3903bfa9134329334988
+EBUILD kwin-5.23.5-r1.ebuild 4125 BLAKE2B a1b40580c45afdfa9ad35b97119db55084648e314f283749fcb1509e5939e0bcba83499210baf017fc0c50e72929f3f079a020aefadae5a9c429db77dd445978 SHA512 5a39ecf522c6af23003e1c3ebce9bc76ac5d9b2899d647a60b09b559b09b419ef494ed3de5bbd60840f80145a96c07a9f791356d376cc588fa00749e88cdf0fc
+EBUILD kwin-5.24.3.ebuild 4041 BLAKE2B 0156a737bebe18f6b4e4287098dfe0805209cdc47dd82653a5a8d378eb22cc3a51092fc6d7cb967b5146c199321fc27e2b1087fe832d1ee33dbf58ceb70ff305 SHA512 cf690a9afabbf810627c01644cf9827fffea4372bf58579a97cb98b6829f8240e1d37f5330f7eae3e7b1ee412e7ba16c9716b4d270105e060fe18fcf22da5f2f
 MISC metadata.xml 512 BLAKE2B 3e81119dbc98181573e294885c52623e4799b55c238ca9513e33547e718ec0f1762371d6391a4291c54159f31cd510cd8d9c192aa16ef0fc16672a3d0ef25dbe SHA512 a9a28562cb0f25abf24cb89c48fea816bfaf701c889ee08e66b80b3afe434af68e5ddb0fa21d313d68418c81a1e73eefcabf75e8e3878f55a1292039dde6ecdb
diff --git a/kde-plasma/kwin/kwin-5.23.5-r1.ebuild b/kde-plasma/kwin/kwin-5.23.5-r1.ebuild
index daceebb79c40..744aefd646ac 100644
--- a/kde-plasma/kwin/kwin-5.23.5-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.23.5-r1.ebuild
@@ -91,10 +91,16 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	x11-base/xorg-proto
 	test? (
+		dev-libs/plasma-wayland-protocols
 		>=dev-libs/wayland-protocols-1.19
-		>=dev-qt/qtwayland-${QTMIN}:5
 	)
 "
+BDEPEND="
+	test? ( || (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	) )
+"
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
 # https://mail.kde.org/pipermail/distributions/2022-February/001127.html
diff --git a/kde-plasma/kwin/kwin-5.24.3.ebuild b/kde-plasma/kwin/kwin-5.24.3.ebuild
index 92235562b5a5..7c0506735d47 100644
--- a/kde-plasma/kwin/kwin-5.24.3.ebuild
+++ b/kde-plasma/kwin/kwin-5.24.3.ebuild
@@ -92,10 +92,16 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	x11-base/xorg-proto
 	test? (
+		dev-libs/plasma-wayland-protocols
 		>=dev-libs/wayland-protocols-1.19
-		>=dev-qt/qtwayland-${QTMIN}:5
 	)
 "
+BDEPEND="
+	test? ( || (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	) )
+"
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
 src_prepare() {
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index 6ac89b5b1956..c23ca30aff15 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,5 +1,5 @@
 DIST layer-shell-qt-5.23.5.tar.xz 17772 BLAKE2B e056eb5122bab70931139fc4b90573dce01e42fc50704c46006ebd81cc297c3d2668ad8b2c4273b4168f3b41efed92face67c37b03d449cebf334fb84402791d SHA512 d44ec72093bb1aa3fe4465a8843c78876c1055277779544e4501368b750a8c8c4d6a0ed5ba12883a8ccd71a6c494c0f738b98f22b6165499c9b5671d0d52f300
 DIST layer-shell-qt-5.24.3.tar.xz 17880 BLAKE2B abcf3bd444b25cf05729477bbbd0c3e37a81c27799355d52dd3a39799f1faf42d79758679a091abbca1dedd72d1983a537a27ff49a6aa36f42b1185ede14419f SHA512 0645cc6cfb954efd76340073ecf305be7750a572c05fa84ff878d1231c7938c679791ad010c4a5665d4f93765133708fff1dc2b551fe62af54ac5dbae6aa8003
-EBUILD layer-shell-qt-5.23.5.ebuild 774 BLAKE2B 7f9dea6ca890609cb5d9305e89eb27723e5db8237b074c4dae106d611fa8c940debdfce6e73d589a47ee036b105abe551668d5b7fb20e73081f9cb148b21dd83 SHA512 43528c35ecbffcbbc8a4fb314b176d976ea9b40c98c5142986f36e7eedfbfd45245db85ca5336efa156cd208fc4eae858d1ddfd292663c34b40469539a55b586
-EBUILD layer-shell-qt-5.24.3.ebuild 777 BLAKE2B c04fcb0088dd91c07f5f38b82dd4beda117dc31516e76e7201356b03f9751698320015e6a5354052358920a58e567a8af74d2944fb4894b00b2397ee155ce34a SHA512 8b48ab3b8c64a26444c7588e9c7dbf8b63719c2e26317962a9a00838a8437727565034b98a6c790f4e026e184ee8e726ed1a8c44e44299d4787e184d11b908a7
+EBUILD layer-shell-qt-5.23.5.ebuild 851 BLAKE2B 3153c3e14635562a73cc081ec609a8a59bb140cf8e4ba93aae5b72a8d51125ea85f5f9b49eb773022cbcfb354700435399268d484c31039b5b82615deba61512 SHA512 16c85567d205064a4f6f26bb7607d30ed0baeb9ac64552174e0c5b3487e297c5e35b557d207e440f6eac199b668af77c71718270fe9d6bf07a9b6d26d49f7bbe
+EBUILD layer-shell-qt-5.24.3.ebuild 854 BLAKE2B 04fcee67b6c202e7373de1bca0ac358a689e58bd24d49fb0584aced5bc9366ee4f3ce814d10637d5d7d8eccc8f0707ae912e3c8ff2047e71d83d76778708304e SHA512 b9c1a100a1ceef99d2495b4207db35bf951e5156b6ce1f4c84b39c688b8167d5e18fd54efe43fba460c5ea83a534c96bb2948627d7d5d376ca07bc4452a2edae
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.5.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.5.ebuild
index 24db6aeefb5c..257463ff2c30 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.5.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.5.ebuild
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}
 	dev-libs/wayland-protocols
 "
 BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
 	dev-util/wayland-scanner
 	virtual/pkgconfig
 "
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.3.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.3.ebuild
index 9d53d1f15e1c..3d3deeb5f091 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.3.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.3.ebuild
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}
 	dev-libs/wayland-protocols
 "
 BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
 	dev-util/wayland-scanner
 	virtual/pkgconfig
 "
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index fdb96be1375c..7c8e7538b098 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.23.5.tar.xz 97940 BLAKE2B c2f449c00582ef8017c0cd388532ec969328b9c86f13456f952dea4381aa6179e1186595a320dd6ee9837d9df0d00b34e24c26790bf698f67c3df5f48a75cf4c SHA512 467555bfae1cb8d1948f395362fafe4c556abf8be1d47ee99cde0853533101f6b1332a7883ebae64005315593afd551190127d094fafe5b85703a1fa5e91504d
 DIST libkscreen-5.24.3.tar.xz 99464 BLAKE2B 78aab8e103b5bb4feddb578fbda767222d6abe4f1f45b6cd7eeee79b909b34b9cefc59524b3740160f067867cfc8b237cb4cf1291a3f42b9b7bd6b100567e88a SHA512 4594fdb975072765d836e075f0b0c2b10ede1c77317621ef96192367fa1de2ff1dd6e28cfb3f9fedb256363ae1f0bc3f11527f82d3febe2bc46d4ee9dd62816d
-EBUILD libkscreen-5.23.5-r1.ebuild 781 BLAKE2B 63d1a14a8bba0680a2ca63a8063ea0212786ccfdc241b98b5e2fbf72ba6c55c3b15d74b1fcd84a23fbc1d4ca54ffa128fc1462e9906085e178ec1bb053eee532 SHA512 fcbb95a2f5ee3bcfd135703851e0f676f5fbd44c69e087af37b269a00ee5d96ce00a0a0fb737dfdf59b2921df5f5ae0f058792f741d8bd635cf29c0c0f716b1d
-EBUILD libkscreen-5.24.3.ebuild 784 BLAKE2B 182b53e3fd36dd04da776eb49650cb3c860adee7cc951700eb89fd2af1ca276ea4ccea8f9c4bfc73bf5517c3dff1b20f98ac57de67f64ea9e151faaaa2a5d8ab SHA512 a3e364e165796545306780bd4aeefda696d9e2f0d7b1e974caa0d2a3a53691eb0d3f268532edc4d9499a48a850c350a7a09bdb484db79ea6b3edc1cd24de1a22
+EBUILD libkscreen-5.23.5-r1.ebuild 830 BLAKE2B fb9b7be400b5a7c6bf44c7a0330e02559795cbbd202cc8a96c6b43fd7ef6b8bfef8bafb0456c2a4881089a2d52d7a8e9efbf9d6c88b3b7b95b2303b77685c231 SHA512 f82ef3b5069a5c70f918632bd76364fe353618f235bfdd7f6283da23e9cbd60dfea1b67b874125b4bda99f7ba18c437158de0082ececeef0e8b7b85e1c08beb0
+EBUILD libkscreen-5.24.3.ebuild 833 BLAKE2B 242db149e42fff66b2a68f810d03cf2217f696e0356f01a2d0afc89be0b59bae54524ee6df20b8a39ec2b0a1ae6747a93115d8efc5a7940112d75bd58321d177 SHA512 5ec02af88b6b7493e82a65411fe00ceabd5fa7ce88e96bebcacae31b715f9e0768f18c240de7e601976f1559e6c07a94f0f4d17ef1dea33cea6df9e17ee64c8c
 MISC metadata.xml 406 BLAKE2B f47c4d7eab804ce88be47f9723f0610045c62b51883ad7877b00388cff9c2a6cd1e72afa24076c1c9affae154d6cc881f33eab04b862c4e40f708fde341a4883 SHA512 47370335bdf14118dacfa8189bcafd2089a2ec131c62d2c07a21ea4db32d837de1f5765be2907fd709b263f5fd3c3b2c5f12da1646ad5d9ff6d2b9ea9f99ebf7
diff --git a/kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild b/kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild
index 04dd749ed9ad..0f8497b6f960 100644
--- a/kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.23.5-r1.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
 	dev-libs/wayland
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kwayland-${KFMIN}:5
@@ -34,4 +33,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.4.0
 "
-BDEPEND="dev-util/wayland-scanner"
+BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
+	dev-util/wayland-scanner
+"
diff --git a/kde-plasma/libkscreen/libkscreen-5.24.3.ebuild b/kde-plasma/libkscreen/libkscreen-5.24.3.ebuild
index a819e9141a8b..3a8515872607 100644
--- a/kde-plasma/libkscreen/libkscreen-5.24.3.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.24.3.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
 	dev-libs/wayland
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kwayland-${KFMIN}:5
@@ -34,4 +33,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.6.0
 "
-BDEPEND="dev-util/wayland-scanner"
+BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
+	dev-util/wayland-scanner
+"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 7f9778bcc97e..ba3ee035b236 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -6,6 +6,6 @@ AUX plasma-workspace-5.23.5-fix-kcmfontinst-ProvidersUrl.patch 994 BLAKE2B b1d47
 AUX plasma-workspace-5.23.5-fix-wallpaperplugin-ProvidersUrl.patch 1071 BLAKE2B 27619af4b1ca08b1c4dfc08f01e19b64c6dd82050071363ba38b4ca1d5265f331d641b11237f642aab0b04faa7f02a84abec426d71dc6c35bb343981f5a87270 SHA512 d2a194df812f3d3b602f4fdea6a1996221072a283edc619cb8c9d3c65d37c503a309846817616584b7dff3d78861d8a5779dadc8eccc43649c43627145e7b066
 DIST plasma-workspace-5.23.5.tar.xz 9010724 BLAKE2B 215b862bcf31c4cadc381f80edbc28f6f63d73066dcb43200b1527a07312bda2721ed1cee700d009f4c67add01a1546a7b0cbae944b28dd3ad22e5ae29212bc5 SHA512 5f55137a1c0949ea65e61d8bbf5476a7ba56ef5afd721945c42817030d1c519ada86442426a4eda0dca164cd6676534f710ddc588c319f849415224b6c953099
 DIST plasma-workspace-5.24.3.tar.xz 18481188 BLAKE2B e4dd150f42d6e192a05341141e0ba0d80dfb758b48226724e3be83da523b82f72f630ad1463ef0cf07e24c3a1c738a178aed149ec2acb62854d6488e74f33036 SHA512 cc442e4ca064ef99555c00ebfded348d2358b73dbe9d6f34a63267f9e066b63acad8b18576532bc4fa413c239580e823bde1271551f445190f566b87f66646a7
-EBUILD plasma-workspace-5.23.5-r1.ebuild 6568 BLAKE2B dc11c3051493b02fa1a2e824544509258d155e0d4db222e69cba14545c0370a5954d6568c378ebb6de458bd0d4dff7117d92dd63c916b2a536b7b3486543678f SHA512 f54bc3abe040ee3a621a877523700fbfb818821e5710dd9321db1e51c65aa62e4630d0f9df10153b04168cfaac6816a9542d5c89bf27d8aa7953608c44d79d60
-EBUILD plasma-workspace-5.24.3.ebuild 6452 BLAKE2B 8132d415d37e1659d7e049629e581c232f11c73f650dbd01f997fa62a9152b9b675a48621953d87aa95db59e41fc0b60600acdfe80a40fbc2c04c498f64746c6 SHA512 89d0c1dda02666124e6da125afd552fc97e0ad555e157389c91226aa951208117c290c6fec3ace50ae32dd3b20e6d02856b0e6e338ab4371cb2f3eeeb7b3f1aa
+EBUILD plasma-workspace-5.23.5-r2.ebuild 6648 BLAKE2B 87e6a386cc7a5a2d4dda80dd2a7ce712f2f124353835e6bb22055ee829a92125a9a1ac8b9fbe726cfc40580a31a1964941516eecf4a60f5f330e36d37fd6fd1d SHA512 d046ca0dce95f79632c345c457a6e37552684ead25517b799ce22e2a156a1954038efb3868384c7d0a4e98c7d19c8d5c61c8087895e15f897663fcc111431f5d
+EBUILD plasma-workspace-5.24.3-r1.ebuild 6532 BLAKE2B 02ed5dbb1f14feba06d3168b3dc4a9194505cf6079bdb2b73a71139731d04472cad6a12eed49f04ca43d03b3abf456d094db7f4e1170ada9db5515684c3fe9d1 SHA512 ddc409f96b0e37c94f5617400efde7a8de96b7bcbe6e77b11999193570d7a75eb160da34bfc4e09fc77a8ce2cd8f5caee0a72c63c41a49403913495d88fd0b1a
 MISC metadata.xml 919 BLAKE2B f8ac08e31ccc060e3cc16370cc23258f49957e2a026905baa85669a46e673c83370486e2e06b0796c7385d92904cf078be73cffa934dd7188c9b231338f64093 SHA512 16c0b3e0ea50e6c145da3993cce54f99c4cea79846d3c7da5326f1d754aac27c62db8e670d449e8bcdd9057a03a846fbf40f811ae96a11c1feff484af990dba4
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r1.ebuild
deleted file mode 100644
index ad412dd4223b..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.86.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"
-
-# slot op: various private QtWaylandClient headers
-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
-	sys-apps/dbus
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	!<kde-plasma/breeze-5.22.90:5
-	!<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}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
-	# https://mail.kde.org/pipermail/distributions/2022-February/001129.html
-	"${FILESDIR}/${P}-fix-wallpaperplugin-ProvidersUrl.patch"
-	# https://mail.kde.org/pipermail/distributions/2022-February/001133.html
-	"${FILESDIR}/${P}-fix-kcmfontinst-ProvidersUrl.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.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r2.ebuild
new file mode 100644
index 000000000000..d3c17ff48ed8
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.5-r2.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.86.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"
+
+# slot op: various private QtWaylandClient headers
+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}:*
+	>=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
+	sys-apps/dbus
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	!<kde-plasma/breeze-5.22.90:5
+	!<kde-plasma/plasma-desktop-5.21.90:5
+"
+BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
+	virtual/pkgconfig
+"
+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
+	# https://mail.kde.org/pipermail/distributions/2022-February/001129.html
+	"${FILESDIR}/${P}-fix-wallpaperplugin-ProvidersUrl.patch"
+	# https://mail.kde.org/pipermail/distributions/2022-February/001133.html
+	"${FILESDIR}/${P}-fix-kcmfontinst-ProvidersUrl.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.24.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.3-r1.ebuild
new file mode 100644
index 000000000000..a783b627b934
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.3-r1.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.90.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 +calendar +fontconfig geolocation gps +policykit
+screencast +semantic-desktop telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT="test"
+
+# slot op: various private QtWaylandClient headers
+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
+	sci-libs/libqalculate:=
+	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] )
+	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 )
+	policykit? ( virtual/libcrypt:= )
+	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.6.0
+	>=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}:*
+	>=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/kirigami-${KFMIN}:5
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
+	>=kde-plasma/milou-${PVCUT}:5
+	>=kde-plasma/plasma-integration-${PVCUT}:5
+	sys-apps/dbus
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	!<kde-plasma/breeze-5.22.90:5
+	!<kde-plasma/plasma-desktop-5.23.90:5
+	policykit? ( sys-apps/accountsservice )
+"
+BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
+	virtual/pkgconfig
+"
+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
+)
+
+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
+
+	# TODO: try to get a build switch upstreamed
+	if use geolocation; then
+		use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+			-i dataengines/geolocation/CMakeLists.txt || die
+	fi
+
+	if ! use policykit; then
+		cmake_run_in kcms cmake_comment_add_subdirectory users
+	fi
+
+	ecm_punt_kf_module Su
+}
+
+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)
+	)
+
+	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.24.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.3.ebuild
deleted file mode 100644
index 54329d72bade..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.3.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.90.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 +calendar +fontconfig geolocation gps +policykit
-screencast +semantic-desktop telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-# slot op: various private QtWaylandClient headers
-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
-	sci-libs/libqalculate:=
-	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] )
-	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 )
-	policykit? ( virtual/libcrypt:= )
-	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.6.0
-	>=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/kirigami-${KFMIN}:5
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-plasma/milou-${PVCUT}:5
-	>=kde-plasma/plasma-integration-${PVCUT}:5
-	sys-apps/dbus
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	!<kde-plasma/breeze-5.22.90:5
-	!<kde-plasma/plasma-desktop-5.23.90:5
-	policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="virtual/pkgconfig"
-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
-)
-
-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
-
-	# TODO: try to get a build switch upstreamed
-	if use geolocation; then
-		use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
-			-i dataengines/geolocation/CMakeLists.txt || die
-	fi
-
-	if ! use policykit; then
-		cmake_run_in kcms cmake_comment_add_subdirectory users
-	fi
-
-	ecm_punt_kf_module Su
-}
-
-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)
-	)
-
-	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/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 05ffaf716248..93fcb09edb6b 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-kde-5.23.5.tar.xz 89520 BLAKE2B 6ec2b844f64c2e099120ec17e23c42db6b55f40fae4992c9a02cd815bc78337f76209c821980141d7bfd19135058caeefe313fa37ae236865d5f134af3750b47 SHA512 7481be6c3a5adb42e3a9b2c03533de9e956e188f3ce5edd349a65a8d65dd690f5292cdc8431dee71bee089ef8c5a30b5c18925e61658facf6dfed1d332bdaf6e
 DIST xdg-desktop-portal-kde-5.24.3.tar.xz 88424 BLAKE2B a235ae6b87ee7269533650a95f94468ceeb8c094b565389d5c79a0b7a6c6ff00b9c4c6c2c05a976099f55e5ca4835cca0f719bad622e7febcc878e9e1223c48f SHA512 685fb8165740b94c68015ee47aec7e407e0da476bb61b306b0ace91a9c7b794afc6bc46ea38bf19ccfaab3ef5d016ddad58ff1a4783f43b5157e42317046a7a2
-EBUILD xdg-desktop-portal-kde-5.23.5.ebuild 1105 BLAKE2B 4459ae781fcd23d39a54eeabcb51fe65c7decc917d78e8dd3923c1eef5b6aa379aad78db0891c05d2d22e24ebe7a98453411b0cb74cc6e5214119f726e750e57 SHA512 be21a5a4e6c524fb1660c07fe24cd5015bcfc73aceae1e1631225fe338f80753df958aed18f8496140329f0cdccd7756eda4a38dba3304d786860067c75b86cc
-EBUILD xdg-desktop-portal-kde-5.24.3.ebuild 1108 BLAKE2B b6ee039f1d5d485269dff16023ed7c616be8f2425cb4e96268f5db6e9788685c7c65077c1fdd9619db9796fc34127715d01eb698c4e1c30689b13d1b6ae9fba8 SHA512 e2c307d22bbfdc3bcc46706b6ffda146ae43c943842f9a1c498d0e0a4e5a612917c269c7d7b33dec90653f9ecd1467eceef6617b45185f47a88a2cc25ae8b715
+EBUILD xdg-desktop-portal-kde-5.23.5.ebuild 1163 BLAKE2B 378d63f8dbf87c20f2747739cfb0751a9977f4d37063c7d95f166234fec28bb29b7b0a373430ae556864fa316cafbe4e2e06271cdae356c975b8c6a4bdb17c6c SHA512 c6272de637002b6a44ac942917e0ad7ab721f0d8bc3bb4422b463410ecf34a06691cc403c8b9c48eb3443df8ef8878b245daa3e3a3659205312e7961340da702
+EBUILD xdg-desktop-portal-kde-5.24.3.ebuild 1166 BLAKE2B a1ddbf75b695efe2ecf5bf06a75c1f4f687f31011a5515866209553d87314aefafe09aedfbb382609cffbec6c2c72460f0794a0fa8e7589418a3e91b16d6397c SHA512 16ff1ef5409a43a616b573954d8d421fd988ed45db110e5fff4e0c8908779a9995a19f0d2fcf1c221b06c45ee8aabcf8e6bf651650d73c19796051c58f52a94f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.5.ebuild
index 5caa494e61a6..f0a81f75e03a 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.5.ebuild
@@ -21,7 +21,6 @@ COMMON_DEPEND="
 	>=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
@@ -40,3 +39,9 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/xdg-desktop-portal
 "
+BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
+"
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.3.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.3.ebuild
index 8aab31ba669b..daaa5a417460 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.3.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.3.ebuild
@@ -21,7 +21,6 @@ COMMON_DEPEND="
 	>=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
@@ -40,3 +39,9 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/xdg-desktop-portal
 "
+BDEPEND="
+	|| (
+		>=dev-qt/qtwaylandscanner-${QTMIN}:5
+		<dev-qt/qtwayland-5.15.3:5
+	)
+"
-- 
cgit v1.2.3