gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /kde-plasma
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
182 files changed, 953 insertions, 1350 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 1acd3992e807..db7c27ed8ea5 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index aef73b4890e9..9d839ad204d5 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
-DIST bluedevil-5.20.5.tar.xz 158768 BLAKE2B 8204f1c34e64839ef9671e2c285c394c5a3408d0d4e1d11a8f69f0b51cbffaebf7fa3a7aec7f3a5182ab2754e376762ca0cf90ec84e0c146b2c7696d2db372f5 SHA512 768100b8f34e9a4d2cf1f64910ff490f15be04a2aecc241d64e72c4b57954cf1f48be93c640f93f8c455ef69548f26e659f7a4bec88228490b85130ba042328a
 DIST bluedevil-5.21.5.tar.xz 162788 BLAKE2B 33961069c1997e564f9cb26dbc7b866abaed8e52d8f9b532769b017c8768f5602e821d04836198a0d2bec94f18ea57bba075e676869f3cec9c0087629885db37 SHA512 9d2f06e767551b159433e87c2e0c7180152fd881d78dce59abe8af9268780e916378b2e3b3dd385d782893a530aa54f0b178762c18169230caf3975a6798fc52
-EBUILD bluedevil-5.20.5.ebuild 1186 BLAKE2B 7b169cb6e8a4599a2de5976e385acbedbdbd70e4cd21d1bf84cffa0cbfb89163fd5baaf8e41f1b418588c51ce04ed30eb601e63415c4b4ee443114510db49d21 SHA512 a42ed02515a3c4fccd8e61f8e4b652cefdad781b96f5b09ee669f42f49aa35340484c92be3a4c7d5f9b7396f54aa573c1c8503ae85bc11052d7ad53222cca9b4
-EBUILD bluedevil-5.21.5-r1.ebuild 1114 BLAKE2B 62075de061139b684027803dede5d45f7ffc5bb8534f2ce7d617360c83dd07b3b8f5e5b60c5a8c1e81b97cf2bf3f39a74badbf1ddb1ace44e4ec3242717d26de SHA512 22ae605e81bcc90b9fe4d498ad89ffd8facdb03e5009b4458128eeeffa81bea149a82213b8b9b63bd5252b37e25183259c83d88d53359a36e3ba1b484057b877
+DIST bluedevil-5.22.0.tar.xz 162824 BLAKE2B 88dd9b3a35e0872252f7a211562423a3242ec1cdfc7b0c7719fa6aeeba909cb6570bb6bb9d540881de01e92e4ac5c4c21120e9abfbe3c95e98d0cf793ac2fa3d SHA512 2fd736347f6144da38c9e53f1bdcb3946b9a6950f8ee2ee3e2663b306fa87fe02e8472266bb7830090835c71a3d14b5965753eadd049dc1b431993ddffd8736a
+EBUILD bluedevil-5.21.5-r1.ebuild 1111 BLAKE2B ce05fcd546105e93e08a5dc6dd85355af989752218a0fa0da860379a49e367c5a4f84f91244a2fc124eedca651d0ec5dbe86264dea8922f56bd319130adf8317 SHA512 74b6bd039671b3094dca77b13c366dfeefb0faa30e45333326512d921ecb4003bc9a6b60332b85cd1c2a14bacd5966328aaca22b188d99892a8ea1f154c41ba8
+EBUILD bluedevil-5.22.0.ebuild 1114 BLAKE2B 62075de061139b684027803dede5d45f7ffc5bb8534f2ce7d617360c83dd07b3b8f5e5b60c5a8c1e81b97cf2bf3f39a74badbf1ddb1ace44e4ec3242717d26de SHA512 22ae605e81bcc90b9fe4d498ad89ffd8facdb03e5009b4458128eeeffa81bea149a82213b8b9b63bd5252b37e25183259c83d88d53359a36e3ba1b484057b877
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.21.5-r1.ebuild b/kde-plasma/bluedevil/bluedevil-5.21.5-r1.ebuild
index abb2535daa5d..c753d39b09ba 100644
--- a/kde-plasma/bluedevil/bluedevil-5.21.5-r1.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.21.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/bluedevil/bluedevil-5.20.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.22.0.ebuild
index b3f2504f783c..abb2535daa5d 100644
--- a/kde-plasma/bluedevil/bluedevil-5.20.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.22.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Bluetooth stack for KDE Plasma"
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -26,10 +26,8 @@ DEPEND="
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index e68f96ac2494..8d9e0060bd69 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
-DIST breeze-grub-5.20.5.tar.xz 3153036 BLAKE2B 05a09e03e8ddb608566e6c9b1d28f117ee3b17e814baa2125b3636a872230733759ef76ab3030e288cced36d0380ad357983c1a2735600a0c98ac4eaba852251 SHA512 22524d3031689e8dca73833932bd1661fc7e85aedaeb136fc43cb9b72324efeca4c35f08fbd6d28d6c1b8333589b939ea162655173e54568c0ee4e4f1ee5d1c9
 DIST breeze-grub-5.21.5.tar.xz 3143964 BLAKE2B 96f2e3bb69dafb1ab7e2f328af0f8336431a7085ffd6ac335c6a107cabe73696bda8bb580b2529f01d0c46172e65ae46831f98af0c3ee413b80959b8ea740621 SHA512 c2f16338ad330004c961a9fda6ed48d9670e956bd8562ad05b5f804e3c45ce05c243933028caedb2de981d9fa4f6d66a627aaeb04652fabddebd71fc09b08f5f
-EBUILD breeze-grub-5.20.5.ebuild 401 BLAKE2B aea7a41c8088bf3f858366719857e1f6ab94258a132e42adf8fe38f0e89cb3d815916a3e6a9821077f1e0c36b9fe2e20159c27ee953be73c211e5ae9f48efeb2 SHA512 8f4eef2d928c524a6001a4693fa083eed4cad3e15a14eb3a37a4b33e34217c5d911439121bb9ef49bc39508a351c97306ac73f0fd557e8526b8eb8ebbd9facf3
-EBUILD breeze-grub-5.21.5.ebuild 404 BLAKE2B 371c8e22792752990a85c1d9b7017bed34d607e55bed1547e0f3a4729ff4d97804240c5fe53f48da2316519da052519f3a175e70c8d23c95292ebb692179cc6f SHA512 447a6adb952a7e43c6fd758404a71a40d30de6d3130808ca6518299b02cb1bf09c2a52f8f57d7d5c2a9d72f82820a912fc2f529d281361c7a02f4f40528d1061
+DIST breeze-grub-5.22.0.tar.xz 3157668 BLAKE2B cd19cca02ce47c9caa0583f61b8a66ccf46719d45c4ff3c4547ffe6c2d51234c6c15ac40603ee0a25cf6ccef52224907d89b6528752f12e29d0b64bfe594878f SHA512 7acbac9b242211d82a0d9f0e2922d0be7bfdebce0749a22fc0488cf9bd77bbfc4f8e1eff072aad2c507c7454b4c920b3d14eab3215590bb23b5f854e04136d78
+EBUILD breeze-grub-5.21.5.ebuild 401 BLAKE2B aea7a41c8088bf3f858366719857e1f6ab94258a132e42adf8fe38f0e89cb3d815916a3e6a9821077f1e0c36b9fe2e20159c27ee953be73c211e5ae9f48efeb2 SHA512 8f4eef2d928c524a6001a4693fa083eed4cad3e15a14eb3a37a4b33e34217c5d911439121bb9ef49bc39508a351c97306ac73f0fd557e8526b8eb8ebbd9facf3
+EBUILD breeze-grub-5.22.0.ebuild 404 BLAKE2B 371c8e22792752990a85c1d9b7017bed34d607e55bed1547e0f3a4729ff4d97804240c5fe53f48da2316519da052519f3a175e70c8d23c95292ebb692179cc6f SHA512 447a6adb952a7e43c6fd758404a71a40d30de6d3130808ca6518299b02cb1bf09c2a52f8f57d7d5c2a9d72f82820a912fc2f529d281361c7a02f4f40528d1061
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild
index e7e9654ba6a5..3b3d0d9f2e84 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for GRUB"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.20.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.22.0.ebuild
index 3b3d0d9f2e84..e7e9654ba6a5 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.20.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.22.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for GRUB"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index c4ee7688b8ed..71afc5c8faa5 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,5 @@
-DIST breeze-gtk-5.20.5.tar.xz 43068 BLAKE2B 09263f81c2a20970b6a3e0655292fef30cc3cc8a0ba4e458dbf046e306a9ea706c405fa022b670950ed8aecc762663a1e1548331f1e3f62b56fadfbd9ff3acf0 SHA512 4c159f28d6d5163cfbf6add00d1a5edd8caf4b6530e4d8b8744ad99ab6193dec3d774c267ab3a45d8eb8aeee0b3d7e3b4848ef6a21d589bef33763392a1fd6d1
 DIST breeze-gtk-5.21.5.tar.xz 47668 BLAKE2B 4f8d0980c359e9a9aaf8bc4728e8480315e35f426c8199982d2c0f34b62174736ea944689ab88af10c3431998b296049c4b7b64a115081184a3372e466881537 SHA512 afbd9348b2cfd55412df50ef4f2732d6f2fbd58356579766187ea79d20b86127b6e140caa14132edb940fb5d72b5da981869cdeca3abb1c17352782973bf0aae
-EBUILD breeze-gtk-5.20.5.ebuild 790 BLAKE2B a2d20d872e041fb9e76d8123887a6a81a6e3ce1ca3d10ed991f02a6ff56ae436dc0ce7497d88b0480053ee94a2fcebe2c8f91bef40fa5a939cc258b172c01408 SHA512 26d318ef28fe68711010ea601c753d29fe5e12667fe923c30dc9654c0391f86d801b6a5e147edb75794a94cf45a512c9c01e48b906c0af2e1a6e6d8ae3ef0f65
-EBUILD breeze-gtk-5.21.5.ebuild 793 BLAKE2B cdfe28c33188108cfaf35ba56aacafc9cedb123e10e5a4121d1f0aab48d24f11b72cbffd0db327798f84811dec9c21f9e4bff0446ddc9714c87ce62816e401f6 SHA512 d0766fe45764703fdefdbf3359e9f04ee2bba914a782563b8e955646584b39073323b5e7d75075c57b08911db764516cf8ee22aa2efc1adee39ef103aa597bf7
+DIST breeze-gtk-5.22.0.tar.xz 47684 BLAKE2B e45b09f73ce98f3988b585cb99370849de80d620999293bc233f81407b33969e81b2407c7f766727d3be9842ecea4177501a07617b608d767581359d92a37f80 SHA512 61ce15452173577d397e79ca131cf6cf150388d3972cac91f73e1aff9209a1a9475feccfb6dbc0e5a877e539e1c2a44cc7635e4f874e031e76f09cc4b49120c5
+EBUILD breeze-gtk-5.21.5.ebuild 790 BLAKE2B 80b432e2271aee44626fbf82f37a4224e6bfe185d5a40c8a520c885aa8217a751fc35938df2e586b47dc1fa436ff5f705acbaee8d1c2a85303bf4477404ec07a SHA512 d0fef1cab3a4be5fd0a0effa92e32e91bebb7e52b1b45ae18ada1bafb86e3d77c30e4f3dbe22ec9b1c86811ddc61a337b10ca0939060e15c33bde6fa5153f97b
+EBUILD breeze-gtk-5.22.0.ebuild 793 BLAKE2B ffe882580fe472641d55b7e661b05c53c5c1df4d5a6bbaa8f4508aaea8f0c58bbef5981efd2fbe7b3a3c3e0d16ebf0d66536fea7835ba86dc0d8b350b1d11d7c SHA512 d3a4482c54a748eebb45a6ca5bcb42e08ce4561665bc4fc56ff11524610fe0c24affd50dd57677b1d1ebe8ab16123791d64bb51fbd9033b65eb02208619db80e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild
index 4865bfe4a9fa..d869b30fb8ef 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.20.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.22.0.ebuild
index fa8955c15ef3..917da6e3c84e 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.20.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.22.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
 PVCUT=$(ver_cut 1-3)
+PYTHON_COMPAT=( python3_{7..10} )
 inherit ecm kde.org python-any-r1
 
 DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
@@ -12,13 +12,13 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
 	dev-lang/sassc
-	>=dev-util/cmake-3.16
 	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
+	>=dev-util/cmake-3.16
 	>=kde-plasma/breeze-${PVCUT}:5
 "
 
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index ec33487968b0..ea1b082c850e 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
-DIST breeze-plymouth-5.20.5.tar.xz 108832 BLAKE2B c0205874e22c60697e30f84cdda0d344248d772d7308fa9d3e4cbed54abc8aad56614de83b4f40daae52386110b46c6d9cef356a936738e9dbf91270eaecd578 SHA512 0c2526c14069f36b86fb4fd4a2b0ca7e283ed44f3a2a80f9b6de9efccefa5cede0d9214cd0c2a6adf43a78f72291d06d3dd00b01a10d36e517f67b1a432836b3
 DIST breeze-plymouth-5.21.5.tar.xz 108692 BLAKE2B 7b98b1fa6f2793470c550336c3205cd7846e40fbbe3cb7bc895e67fb557868ec3e73fd5e14a0efd22b055a760a2636ed301810c60ea53d27a382bca89525ae18 SHA512 7b562a9b86baf4f362e3cd97722bbe3940be4232910e68ff1f029f2de5d1e362d930dde03a3adbed738bda559f9f6b5b812ae7e1451a145edc37e60b5af66285
-EBUILD breeze-plymouth-5.20.5.ebuild 515 BLAKE2B 91d05f96398d5237cc9c47352f6455bbdda760ed2d7db5ff32915cf8f21409c91802883a27f06cce68509c691111b5f7e70be824b8a30ea4e231ed60e554f63f SHA512 0e9ab01c65a53885509a2b1dade68c387a6ecec47351b2587340761320b6482d8fab508f5dc950b5eb9f8d7e63fb2aa238bb62e31cb3eeea6a7a6ff8e573fb96
-EBUILD breeze-plymouth-5.21.5.ebuild 518 BLAKE2B 70b85edc94b2744ea490b6428d83a7bfbec913dd93cc17a4c55f695f2dfd640c29ce9d3bedb5dbad565e67ab3217f2fbdf2450ad8b8fafa61baa63bec042dcbc SHA512 29b50487fa92353159882e7d00f18817f84e7a5093fd7c65adabfc6463675149800d1182806ef821eb92adaf05378f653ff0c1ad3321d40c3e3813bbd78efe74
+DIST breeze-plymouth-5.22.0.tar.xz 108744 BLAKE2B 0b0ea2b89566f706a9975ae9e41c4819dae14565743bb5b2bb1c0e57dc768aaa3be4ac9fed71ace74734ef23166202b7ae0cb3a896ad9ebb1358f539da9641e2 SHA512 a6c58e4f303767af201397279b48dddb3addc4c6f793ed22eb3af50d0e99bafa387410f86444c45f61e12618153bce321eb32f40288d7e478953357ecab47a32
+EBUILD breeze-plymouth-5.21.5.ebuild 515 BLAKE2B 762a0f8b7eaab8a20ad9788d25903df6835c8376edd5af92c386a79624acb6f5ff673b2384e78b831b05f2788a9e6c82963b091ad0d7e004237e457353b40c6d SHA512 1ad7b85267f2c05f9fd1b0e4f1804c997f64448fc92b8b195dd5c7a8f701457de312562abd1ac692921310dea26d516996c533194d146611bc51b8641a706d60
+EBUILD breeze-plymouth-5.22.0.ebuild 518 BLAKE2B 70b85edc94b2744ea490b6428d83a7bfbec913dd93cc17a4c55f695f2dfd640c29ce9d3bedb5dbad565e67ab3217f2fbdf2450ad8b8fafa61baa63bec042dcbc SHA512 29b50487fa92353159882e7d00f18817f84e7a5093fd7c65adabfc6463675149800d1182806ef821eb92adaf05378f653ff0c1ad3321d40c3e3813bbd78efe74
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild
index b9ecc8176c56..de49b6028b9e 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Breeze theme for Plymouth"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.0.ebuild
index d751dc43126b..b9ecc8176c56 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
 inherit cmake kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="Breeze theme for Plymouth"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index a2e62d815d68..f730b62994db 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,6 +1,6 @@
 AUX breeze-5.21.5-fix-splitter-proxy.patch 2306 BLAKE2B 5d95c306c34482a1aa07a64671ecd4687dc61048829b129d15c302b16c30a79d97c2896f1b84c7fa7e2dc26d486742b3cbfbb9e8b42166b92586baf6efef3a3e SHA512 6e2eb41d9c44acca58d2e4c2a93c3fd73e808bc6eccafeae8278351b9a780a0f75d8ee80343fb55cee0880fd4081537223caf430ed2093edb8b59f1b27f84fee
-DIST breeze-5.20.5.tar.xz 15695388 BLAKE2B f8ff7df9449106815c3c356d96321118a388ef84530dd69f570fcfcb96ab9c20ddda3343a58535ad86232a34bf00ca6091c60350002e04c4bab8018e12a8b673 SHA512 1be4d2c52b683b042a4b094fec75ce069b011f547f8c9f58a04a17cc933537bb018dcab826525827a09b607426a65fbaa40b66ad3232267b34d4214be0a8e13d
 DIST breeze-5.21.5.tar.xz 26286020 BLAKE2B 437666f0b509fa9d63f5ad04702831dc0ec4eedf763594c831d335b5b69a6b04052af6adc2c550b903c94a084b353d700d88cec47af537778afa31f7150e38b6 SHA512 5e449624543e2bd437bd4311e7ff091ffae33c4da34da2b9968f9551970b66350d337e6aee974f9e2cd82eff877a4ab5c6f52ec52d4f2724fe93b747f021e9eb
-EBUILD breeze-5.20.5.ebuild 1265 BLAKE2B baa89c16e94aef4c3897609a0bf12cdc27fc2ba2e9c968a3a736e8cf56f9ab299792207726c68f9f66dc3f0a8fcc1feb7a25e35d74ba74274a5d386a220474b1 SHA512 45c00dcc2299ba52cebbb75a24a9ebbf2ca6cedb45a5c6ffaa39f51ea70a666632276be32719826530f992c362acc4f2c97a8617573801cab4f69555f71e78ba
-EBUILD breeze-5.21.5-r1.ebuild 1325 BLAKE2B 31bb7f89fd40b7afb9a495b49ab29a423ae124e2bba390eb9ab2cf5372de6d850faa1559c8c8f214e55402458e861e89ed49e116feeba57449a9b71817747328 SHA512 120bf11e9d6a707f523c73e13bacad3f3bf6d1502a766ba5c1093a0278365360b25981568b9a709a3ea836103f9a16943dd6d246583d7dbad081b64b68f378a2
+DIST breeze-5.22.0.tar.xz 34545996 BLAKE2B 6addedbe2e01b5964de4dd5fd878e553a255dd7294af430d2ec3575826d508ad686f96f64d4e7d62da3c4993cc276a1903bb8521715daf37ab75e5df20e259c8 SHA512 6ac6557dba04ea8546ba19a535e6209967d96f0ad6d1f4b653c1eee020db8af47787f510f885570b2c19a9b419e43fa4a4c9d06ed03d353d0e99d877b77def0b
+EBUILD breeze-5.21.5-r1.ebuild 1322 BLAKE2B efa9c3f9ad57d368c3256d5a506db91c9c68a5e50841aa23e9085ce59a9c51aaba4d9fa72f8b0cc8b02280e1b1dc7afdad3249bc5666c5640b0fb35ef897ac9f SHA512 b8ac6e723a12e554c848a9f55adb0a411fc0a1523074ab70b972f31030b4517792341759515ee1abfd6b81b3ee06146784b5e9bbdfb4491e91d55bf5d65388bd
+EBUILD breeze-5.22.0.ebuild 1268 BLAKE2B 3a861b41bf751ba791c81a5e4fc5b92fcf9b8cb6bc85973331cf622cb537c61a64e0f5e88b7c72c135e8c865b8af4224f8f39542ebdf6e1d521ad8ae51adf437 SHA512 0bb2d875223c501579fad443bdcbed1dee09c48eb5b0c7d63f9f03a8d04a64c48dce5a41e5d32ab1db9cb3ad210604c37501ece5c193b2160a8d1e9c8c3473bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.21.5-r1.ebuild b/kde-plasma/breeze/breeze-5.21.5-r1.ebuild
index c87f6e948b99..813a7e50e8d0 100644
--- a/kde-plasma/breeze/breeze-5.21.5-r1.ebuild
+++ b/kde-plasma/breeze/breeze-5.21.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-plasma/breeze/breeze-5.20.5.ebuild b/kde-plasma/breeze/breeze-5.22.0.ebuild
index cb9d539a46ca..d1a274a975e7 100644
--- a/kde-plasma/breeze/breeze-5.20.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.22.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Breeze visual style for the Plasma desktop"
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 44972ba0e7fb..482ada5fbbc0 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,7 +1,7 @@
-AUX discover-5.20.5-CVE-2021-28117.patch 1434 BLAKE2B c31d0032cdfe3f8d96ad5e7f736c92c2dfcd6cc8e2b8c9b9e90a4a3d41159d961b80427d14ff6a22caa06e6dbdc17535be6243180d439e04879bbd957309859c SHA512 1059cce1be5f8f24a4345488c60decb2e4782fdc11f02ef625111164b6f8b32343528282ec4d03a015e36aa076cd6f9fcfa24e9b7d5c02fe25295cf03c7511a3
 AUX discover-5.21.4-missing-link.patch 2141 BLAKE2B 23b81f9f4e0daa05183ed3a31e98d8c1f3ac3ecfdb08511c3fb14bbf726a14086c5c834d3c7b7cc3f575500eb86f4cc85e141c48361597329a62c47c45807956 SHA512 f8201dad0e00e1a36338ab9dc956cd1baa7268ce4dd23c3d2b5a7ba9c9922da216697115396b7c32c3656faa60a107da62343af3b7a250d64e6d51c43768a9ae
-DIST discover-5.20.5.tar.xz 10305280 BLAKE2B fe47718014d420947c1509577e28ec642ccdc975d2b9fa6d2000bfd190880aff4fa1f2ca4597a77980995209847647cc5fb5963bb1c0a88a8010fc1b198c49b7 SHA512 e33f1027a09c8c7733c0b9da81ee82f0c90237c736435ad93cfdb127d79e0ddee0d4d8214774032c81a4078613d278688f0fddbf287aa03a5192cfcdb1eeffa7
+AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d
 DIST discover-5.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf
-EBUILD discover-5.20.5-r1.ebuild 2217 BLAKE2B 41d5493274bf956d46e9719c4e174a145db849ea28650e1526935e3dd07ec7b8ef158c5d166712fedff439a4187f6e508ed34f1a5df615b9d827b9d7c03fbfdd SHA512 5b1e6e3721b21f2d927bb96c8f8cc89c5e87fec0f0271257f18be0fa72581710d4902c5163d3d7e9e5c29bc1d3a9154fd6927285fd54efa207ade598b786c757
-EBUILD discover-5.21.5.ebuild 2220 BLAKE2B 9c9bb819e84c1e9cfb777ecb8ee984b88bbcd1ed526a25c6a6653b3fc5f2290358472715a360506341eed77f4ee72ccfa030b01087d5e8a1065d6684a88f0679 SHA512 5bbe2bb595a0c89dc6c7828b914ff6f2646fa9a7c6fa7e4670438873a65b1b0698c295452d337a70b39102c7565818869c94b7b659dee425886b2c15fade31b2
+DIST discover-5.22.0.tar.xz 8455148 BLAKE2B 7ce36561ad5e1dc221b62b81822e49878f0b76ebcfc05278338ac90e90847a4cfbe3330146fac679aeedde20eeff14bed35d7696aace1f975030f58353f2190b SHA512 0612ef86b1a49ea06da9a89e5ef537d34d80ad3c9b748d1e91e6e574670eb545094eb52e858747567c82b0d13a064fb27a8378d1eda3059fb1e1958ad30df945
+EBUILD discover-5.21.5.ebuild 2217 BLAKE2B d6f0facf92e314fd59f5dd10422d0c065d9103ccfa0e3a78c1a9a7d39a00eb5bf31ab5d1855edd0e225a4d09ad387a9d37cd296702d21ea8b293da5ac9b8cd94 SHA512 c1e6c91410e560705e1be62818bbef63016bf879df5c8792be4f95451dd2c173016cb029c82bb75a801dba190120e6940c439db7d801294ea6cf0de16afd7158
+EBUILD discover-5.22.0.ebuild 2273 BLAKE2B 3ba30e3e9df6909855333ed312decf9a1b7c8ab6e0b4b9edd4d1b69b4fa1ea52321ce8c021311f21c0bedf8ff2f468062490a539b2a4b1ec8c2cf030464700a9 SHA512 a7891c220e26aefe53872c8def74a5dfd891f78e60c88f9609d97d9a5855227146769c52cf7e2696d7a92e4e64dad1b58fa003039a3454164fc80eea52667828
 MISC metadata.xml 468 BLAKE2B cd98862045ebe78aecaf3dc74526afd4ff2bd377816993e2a0aa4d61cd4f14f7b3e5779d5892244233cbef03b9aba6404aa9fe9aa161f2fc868e369df6ea626f SHA512 a8807c50a9ab4b8e9fe2876fe159a3880bbaeb36a84ad7e7fed55cf6367b1c17ed7e0af135a579685bd4a5d8b550f38b240ac31c00e463befc22de35fd67b2ff
diff --git a/kde-plasma/discover/discover-5.21.5.ebuild b/kde-plasma/discover/discover-5.21.5.ebuild
index d7ff1db71470..6546053e346e 100644
--- a/kde-plasma/discover/discover-5.21.5.ebuild
+++ b/kde-plasma/discover/discover-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+firmware flatpak telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/discover/discover-5.20.5-r1.ebuild b/kde-plasma/discover/discover-5.22.0.ebuild
index f66e12748b42..56b279a23564 100644
--- a/kde-plasma/discover/discover-5.20.5-r1.ebuild
+++ b/kde-plasma/discover/discover-5.22.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+ECM_TEST="true"
+KFMIN=5.82.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+firmware flatpak telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
@@ -25,8 +25,10 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -34,6 +36,7 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-frameworks/kitemmodels-${KFMIN}:5
@@ -41,9 +44,9 @@ DEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	firmware? ( sys-apps/fwupd )
+	firmware? ( >=sys-apps/fwupd-1.5.0 )
 	flatpak? (
-		dev-libs/appstream:=
+		>=dev-libs/appstream-0.12.8:=
 		sys-apps/flatpak
 	)
 	telemetry? ( dev-libs/kuserfeedback:5 )
@@ -53,10 +56,7 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-CVE-2021-28117.patch" # bug 777777
-	"${FILESDIR}/${PN}-5.21.4-missing-link.patch" # bug 785457
-)
+PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
 
 src_prepare() {
 	ecm_src_prepare
diff --git a/kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch b/kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch
deleted file mode 100644
index 1a2685dbc8d1..000000000000
--- a/kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 94478827aab63d2e2321f0ca9ec5553718798e60 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Wed, 10 Mar 2021 21:48:53 +0100
-Subject: [PATCH] Only turn http[s] links into clickable links
-
-CVE-2021-28117
-
-(cherry picked from commit d375031ff0262cedac7d6ee2b26d6a164ddebb67)
----
- libdiscover/backends/KNSBackend/KNSResource.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libdiscover/backends/KNSBackend/KNSResource.cpp b/libdiscover/backends/KNSBackend/KNSResource.cpp
-index 4394d5df..f7670c55 100644
---- a/libdiscover/backends/KNSBackend/KNSResource.cpp
-+++ b/libdiscover/backends/KNSBackend/KNSResource.cpp
-@@ -87,7 +87,7 @@ QString KNSResource::longDescription()
-     ret.remove(QRegularExpression(QStringLiteral("\\[\\/?[a-z]*\\]")));
-     // Find anything that looks like a link (but which also is not some html
-     // tag value or another already) and make it a link
--    static const QRegularExpression urlRegExp(QStringLiteral("(^|\\s)([-a-zA-Z0-9@:%_\\+.~#?&//=]{2,256}\\.[a-z]{2,4}\\b(\\/[-a-zA-Z0-9@:;%_\\+.~#?&//=]*)?)"), QRegularExpression::CaseInsensitiveOption);
-+    static const QRegularExpression urlRegExp(QStringLiteral("(^|\\s)(http[-a-zA-Z0-9@:%_\\+.~#?&//=]{2,256}\\.[a-z]{2,4}\\b(\\/[-a-zA-Z0-9@:;%_\\+.~#?&//=]*)?)"), QRegularExpression::CaseInsensitiveOption);
-     ret.replace(urlRegExp, QStringLiteral("<a href=\"\\2\">\\2</a>"));
-     return ret;
- }
--- 
-GitLab
-
diff --git a/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch
new file mode 100644
index 000000000000..43976d145baf
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch
@@ -0,0 +1,94 @@
+From f9e0be7a43665a7020e4bfffde0f48b332ec366b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 14 May 2021 12:38:57 +0200
+Subject: [PATCH] Use BUILD_TESTING to make tests optional
+
+Variable is provided by KDECMakeSettings and default enabled.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                                     | 6 +++++-
+ libdiscover/CMakeLists.txt                         | 4 +++-
+ libdiscover/backends/DummyBackend/CMakeLists.txt   | 4 +++-
+ libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++-
+ libdiscover/backends/KNSBackend/CMakeLists.txt     | 4 +++-
+ 5 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73061dde..7d230317 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+ 
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}  "${CMAKE_SOURCE_DIR}/cmake")
+ 
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick X11Extras)
++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick X11Extras)
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+@@ -23,6 +23,10 @@ include(ECMQtDeclareLoggingCategory)
+ include(KDEClangFormat)
+ include(KDEGitCommitHooks)
+ 
++if(BUILD_TESTING)
++    find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
++
+ find_package(PkgConfig REQUIRED)
+ 
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED CoreAddons Config Crash DBusAddons I18n Archive XmlGui ItemModels KIO Declarative KCMUtils IdleTime)
+diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
+index 661c371b..56c72008 100644
+--- a/libdiscover/CMakeLists.txt
++++ b/libdiscover/CMakeLists.txt
+@@ -4,7 +4,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_
+ 
+ add_subdirectory(backends)
+ add_subdirectory(notifiers)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(discovercommon_SRCS
+     Category/Category.cpp
+diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt
+index 5b4aef10..38377d80 100644
+--- a/libdiscover/backends/DummyBackend/CMakeLists.txt
++++ b/libdiscover/backends/DummyBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(dummy-backend_SRCS
+     DummyResource.cpp
+diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+index 2006a829..810238f0 100644
+--- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt
++++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(flatpak-backend_SRCS
+     FlatpakResource.cpp
+diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt
+index e2cb4e52..195cb98a 100644
+--- a/libdiscover/backends/KNSBackend/CMakeLists.txt
++++ b/libdiscover/backends/KNSBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ add_library(kns-backend MODULE
+     KNSBackend.cpp
+-- 
+2.31.1
+
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 2bc23ce59433..d8b921b9cd83 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,5 @@
-DIST drkonqi-5.20.5.tar.xz 755736 BLAKE2B 00dfcabeee2a7deae7cd4705d981000935c8ae9010cd0357b21b4245d4870a73b2d08539dc394d18db22112a77acd7be75d4c5c37cc3da738c71d22a5f21b6cd SHA512 b47c70a3fd2e9f2e7afe663e1dbdb93cbd69e3c864edcd68ca5a3af72abd554647b069d1f92a38c2a67e4a7abcc351003eee185ea751b32f26bdb164d0a0c3b4
 DIST drkonqi-5.21.5.tar.xz 774268 BLAKE2B ce58e47915577ac1eeca0c01619a3ef6c237a01c5273ae979409c004b3dc8e453855644d85165f0d5d8dabdc82dea70413b58620b4cc0b91824253b4275679c0 SHA512 ce24e52cff81cf2b9cf685dcce183cdce99110a1469d156726ca5c64e64dee6f064fe4750729619b6b455bc4e28792f92ec305c0f957f994c4e5a0aaa337f649
-EBUILD drkonqi-5.20.5.ebuild 1641 BLAKE2B 1c068c1e5fe42e91de3894219caffb74a2addd291be371aec836117c9fad9dcb12a15e850ad4412af13737ad1f7e2cb8dbc4f5a2676c340142e460401fe143f3 SHA512 490ea4d8560d4b7853345151ed17d3c9189a25cd34c08aa6d2df54556e477de12885b5c95ac04de928d5c059c066a7c0b01da8ab45d56fe51160e267caeb47ad
-EBUILD drkonqi-5.21.5-r1.ebuild 1517 BLAKE2B 673eb5d8b6e5155b1b21dd7432453a39ee555d23b8b6109702d56df08ed32a8426788eb5a544c6ecc74e51bc204bb96e2a50bceb626a818eb7ea5da0e3908985 SHA512 e977b5ee45fd2bf633e30e0c3d281c9b09201736858331412f0c56c1c423e6f0782383514b24193c914932e07ccfe84d0da1b44fca1d19484331330cbe1b1080
+DIST drkonqi-5.22.0.tar.xz 782540 BLAKE2B fa14770703b8b535e57425b33e0493f1ae2080da10ee111a5394677a1f3fc7c89e15f5136d63444505cf8b15cd3823d222b9025b5890b0824bf4101159f802d4 SHA512 4b4fb1277584f5200a08c866c74d7caafcb72af2527504cf569558a2ee9ae0ded6fd43020006936b0e969b8a3649a007866865d142da939407c0a34e2ef37796
+EBUILD drkonqi-5.21.5-r1.ebuild 1514 BLAKE2B 39dff8afc6e052f17418f44e4cede324d7795855076e60e5c1a78d336b5ddc6b33df4c2fc62a0304f697c4de1de4ac49605b47d7e3203cb2a6aae1e9152aa14c SHA512 49af648e2f8282e8184f2b9f5b97ba3daaf2ac937d413e98726949bff857f22062f0c2f9947057098bd6d51416fafede67bad538637a9bdb6baedd1df8cab1a6
+EBUILD drkonqi-5.22.0.ebuild 1369 BLAKE2B f343a896599166d22735c1cdd00ba3c87fb3000ed558264987d4a35a5db56c2567e23e8cd4535ec67c00d2d0d9c9b7922ae8a21e5303e1684cfca41b3b273e9e SHA512 50986b6e7390fecfb6e7030e96e776a66afe05c79fb06e72eb15e80682bafa8563766c02dfbbd8434441028ccbdb139f389e8b7a9b51a305394459508460daed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.21.5-r1.ebuild b/kde-plasma/drkonqi/drkonqi-5.21.5-r1.ebuild
index f8b1658a7e54..3a7f01e642c8 100644
--- a/kde-plasma/drkonqi/drkonqi-5.21.5-r1.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.21.5-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/drkonqi/drkonqi-5.20.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.22.0.ebuild
index bde3cce6c04a..e9a9d0bf07de 100644
--- a/kde-plasma/drkonqi/drkonqi-5.20.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.22.0.ebuild
@@ -3,19 +3,19 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="X"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
 
-RDEPEND="
+COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -36,32 +36,21 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		sys-devel/gdb
+		dev-util/lldb
 	)
-	ecm_src_configure
-}
+"
 
 src_test() {
 	# needs network access, bug #698510
 	local myctestargs=(
 		-E "(connectiontest)"
 	)
-
 	ecm_src_test
 }
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 1a530e94ab57..b58ebe01ddd9 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
-DIST kactivitymanagerd-5.20.5.tar.xz 95236 BLAKE2B 1fb4803309cce1207226fb330759c2235672265d2232c8faf9e3d8505243ff2fce4cc955a6a46a83b1d5ab3719fe39c998d4cb06737145a57b4122818945a0bf SHA512 eade394ce5e10f1dffe60784142a797ec9180cf339557e6f06f235b00127fcb910ea42bf0260990fd1197cf958bdb2bb607d9c7e0cd4a5ad075fa6d46c21bbf4
 DIST kactivitymanagerd-5.21.5.tar.xz 99760 BLAKE2B ffc9499fdd2942813cf35697cab0b2813c87614db3d72312329690dfb9a06fd8abef283e7e73cf1485d2bc430e5e0a82fc81688702750fe47494d957623cd069 SHA512 097c18f39d5024a05e645e7dcf82ad39df07afb0ad0b010410699e3fa1261002f05553dbc049af63e7882c305d4c2c20d5032e9448354de7c22d9b9371a8c633
-EBUILD kactivitymanagerd-5.20.5.ebuild 909 BLAKE2B adc2e13006c15daad7e6ce0435492420f1429cec352fb7a98b6a3d3f839bd5c31c24292f03553b0cb64f41a5301ef6ba9ce362b24811d0044b09e3cef55ef2b6 SHA512 ce43e7844ad4351c4a2d635170092739981fdeda832eb1c6f5b0f41fe7066238bf55269dd86adf0ef106008578427371ef951fe489f68422364dfd7001e6b12c
-EBUILD kactivitymanagerd-5.21.5.ebuild 912 BLAKE2B 7efe4edbe591789dd91201a4d887085abcc18a4fdcda83a0c316f26f49bb016800e6e005ba08adb165dc6254f367c8c90a1a470d0fe477a3e67faed16131a877 SHA512 87ce3c60f6ea78ac27c8d8035322cb269f063b9b7c4673e6b8ca35ec6fbc79493304a14e085fea3e209e884d96cd74dc0e68a04a582f271f9eae7cc7168c5be4
+DIST kactivitymanagerd-5.22.0.tar.xz 102960 BLAKE2B f38b51eb2058c40af633bd0fe89a5b5dd6afcec8a85ac766b6955780f5228cf7c85ce2d9f369d185c27ed06143a0a59e1280925f55c8153fc037333771299b66 SHA512 5f5e2ed9207a7a427f10cd0ee0e9083d56a742c0e3b93d30dd7df55db7da3609479c48261b020d7ac1178c60dfbdc0ddda6b518296f5386264b3a83be6d47396
+EBUILD kactivitymanagerd-5.21.5.ebuild 909 BLAKE2B 9fe2dcef2f797cec69d5fa6ab3735d88c88c4baedc5102968dbee76473f500b1f8adf0b28ae6ae8aeb399d8b98cc840fafe06126c624f5c9d04bbdda03f06bd2 SHA512 ecc51340c8c4c2b8a9243c7db2751cc1603efd587776b71ac7a7b9325991535e1e6c8eda4cb5ba95c2e01c7b1217d56e17b6bfaae78852d79e51c164de2bc714
+EBUILD kactivitymanagerd-5.22.0.ebuild 912 BLAKE2B 7efe4edbe591789dd91201a4d887085abcc18a4fdcda83a0c316f26f49bb016800e6e005ba08adb165dc6254f367c8c90a1a470d0fe477a3e67faed16131a877 SHA512 87ce3c60f6ea78ac27c8d8035322cb269f063b9b7c4673e6b8ca35ec6fbc79493304a14e085fea3e209e884d96cd74dc0e68a04a582f271f9eae7cc7168c5be4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild
index 60354aa2c005..dbc23e202da5 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="System service to manage user's activities, track the usage pattern
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.0.ebuild
index d16635c7b0c4..60354aa2c005 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.0.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index b73a01f34009..4a1927c49361 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
-DIST kde-cli-tools-5.20.5.tar.xz 602472 BLAKE2B b42d9e8f89cec058c2d98d37b77310737807ef63d4adc408f5b8150ecfbce5fc8076e3f44dd5a67fb1125a419202529309c04f08295bdc34ed6599153b873179 SHA512 60507745d0df94361cc506d00f82b361656e02b7a35d79f77136536b6916d7f4b5e379986fb1f20bc8401140451e90dc8d08891031b1d7c31c74658f6fb20662
 DIST kde-cli-tools-5.21.5.tar.xz 610864 BLAKE2B 5f4fbbc100d8f7baec9353f9540dafe9427cf0b01736f055aaecfed48b3e31e1fa2d0a70b90cc99f30d3df33e1bbade888781b1e2ce95e925d871ae44a9b33bd SHA512 20859f88044c6af84ba4b666b803a6a3a4fbe33748495d9c186fc0739e7b5464b234166cef4d03f0dd44540919eca4f3ea8a1f5ac7b54d480cc9dadeaa0ec3fc
-EBUILD kde-cli-tools-5.20.5.ebuild 1723 BLAKE2B 27a37e3d774e414f3803b5985acff0411ddddfa730c4360c95614f9dd775ec42313730559d563827da9660d6f5b6adfc845d5e15ba17ea500e2e9ec1ecb753df SHA512 5bfa56010993cf83806cde159c7ed968758fa65fc7b0e81ef66b75eee46bf228ad3641255ee9c8700aabf7061f1dbd5ac78d8226b06e9240669873f4ccdb2029
-EBUILD kde-cli-tools-5.21.5.ebuild 1725 BLAKE2B d51b8bf98e9d33e347b296693cfefea2f325c0f2d02137d3665f428b15e515aecbf98a0f5e5d9ea658258091b4fcb2eda19ff0748bccaccf79f408d2cdddda7f SHA512 b35738d90476e5992bcae877e7a925744fee79ea50305c0c81fa94095b8cf797ef012f4b44345c454679c349a5b39e7c156fecfb23e6733450a6df0c7c6288a7
+DIST kde-cli-tools-5.22.0.tar.xz 626520 BLAKE2B fba9cc069a95d7a723ebc652b88fef015716021a5793dec8efd6f93ad5427fd6d9ab2c45af5b34431cb2fd98887fff56c4c563c948e82c363634012e7d1e9e2f SHA512 6905a29e4700c045de1e04975d001835c1cc26a6999cfd20459d0a8ff0123974bd0c5fd7931de3ac7355420a294f066479f2056d56ae4d2280daa5be753a9fe3
+EBUILD kde-cli-tools-5.21.5.ebuild 1722 BLAKE2B c3f53799f5b03bfa623099b977f31d4cbd2ffcbcf24eb97419d06ef33d269a556db0c339c74dd415eb19059c444ba0eb7fc47f1bcb22ce77d958af33dedb82c0 SHA512 240c5c44eb886b8cbe850ec32e773f5e96111429cd2198e6aa13899f4ecb71bf16d621ec628469acc25637c6911909ebf1d0028b3c7d3de96629de8547907728
+EBUILD kde-cli-tools-5.22.0.ebuild 1725 BLAKE2B d51b8bf98e9d33e347b296693cfefea2f325c0f2d02137d3665f428b15e515aecbf98a0f5e5d9ea658258091b4fcb2eda19ff0748bccaccf79f408d2cdddda7f SHA512 b35738d90476e5992bcae877e7a925744fee79ea50305c0c81fa94095b8cf797ef012f4b44345c454679c349a5b39e7c156fecfb23e6733450a6df0c7c6288a7
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild
index 7ad4920020ea..94de2cd4d815 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.0.ebuild
index 2bf3da87f29c..7ad4920020ea 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.0.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
-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
 
@@ -16,10 +16,12 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
+# requires running kde environment
+RESTRICT+=" test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -52,9 +54,6 @@ RDEPEND="${DEPEND}
 
 PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
 
-# requires running kde environment
-RESTRICT+=" test"
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package kdesu KF5Su)
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 57c3eacc0ea5..e712eec18e9c 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,6 +1,5 @@
-AUX kde-gtk-config-5.20.5-window-decorations-reloaded.patch 857 BLAKE2B 7db0137fccaa223cf8d58c7be61c78385659ca691aa07f067c15bbeed2d092ddebfa1f69d341a339036b2953d154742c46acaf2cf008e1f299078313c2bfc8eb SHA512 47f2f5120c135c0c814f66be6d28f4dfc2e9c2d6abdd23c09b309bc6e737459d654f6dd56119dd2f53f683e0e802d440e9dcf250054d310659b0602cc3aa551d
-DIST kde-gtk-config-5.20.5.tar.xz 68208 BLAKE2B 89d52f60f0a3cd9d1407a8a537f2893107cc7ba37a5763aba532b665dc0b6c529c6bb9d5873de961e86e3be3cf386de907307bbdde119bdc6fb15b8e958f4881 SHA512 066fff2d3fee4468eb0b5cb27da857bb7d27f2d88f0ac5dd31b1eea928c051c47b3c6d7b5d7de08415cc498d7a6773af37035ede35e315aadd32893a3b0ab846
 DIST kde-gtk-config-5.21.5.tar.xz 68764 BLAKE2B 5b63ae7d4a2f7c364d202321c87a3c6cb11361d6ee74625c3786428adbfda72d792a6de1f51e32d179f6746b33ffb801afccfac8f0167b31f759973b48bc629e SHA512 7acd5036cc008fac85cabd9f3a5321dc1c0209a1133d6063342ca1b1235843dce5e37a7712e0cbbd520f09b3ff46b71a94517c61414c8e7c1c35a2d65b428347
-EBUILD kde-gtk-config-5.20.5-r1.ebuild 1355 BLAKE2B f0c4d2ed76d28fd0da23004b600d8bf80f7fef4765916cc4370be31ec28491a7acbc9fc6a7d2ce245878cf760673b602b0dd02bbd041f24b9ee8a671e3a1792b SHA512 34f9130c5be4a6699ac906d3f5a2b82cc59e775e2f7e868fe617a6fa5c50c832895ea40e0103eca0ff96e1189f1f67cc26b0b9a7082de7cbabc745a3e989bb9d
-EBUILD kde-gtk-config-5.21.5.ebuild 1284 BLAKE2B 2fe97ab88e174f2985b00846ca1f3840631abfe8192f3776f2c7b6c0027f8fccca9434db323b605faf7c72bf1ad6a85637505d51caca39f1b8fdd0cb9efa40bd SHA512 6886ae53627460280726f8cf09f3deb3c11e537471f3c53ce860691e2a89d5ea1a586a5632a50dfcf57117ad3959eb8fb6aa8de36c89a12b7d93bc5ec38f3ebb
+DIST kde-gtk-config-5.22.0.tar.xz 70720 BLAKE2B 5408d60c4e6e4fbaa1eb9306087d7ff3d99b9e0554a147574618a21e47d600b196ca063776733a82d677618cbcb20ad3bfe22acac90123c03b189cd616959a51 SHA512 8e0b41523dbfab3677065354c1cbc60b81dee081ea893331fd5f473da21b8db04313bdac793a354d3b0ee895f9e4996a39556932d99e4919fb6fc0aaef9ef233
+EBUILD kde-gtk-config-5.21.5.ebuild 1281 BLAKE2B 2966bfa66ca1bf58a298d8cd04e4db5052f6873aeffe865c502d3c9c1e0a2387c1d3c41c7837abe973a30b0747f5dde95126e3b74c03b3628e8ce7687e0ff0c7 SHA512 89e9a85aeb731f66987f267dbc810650a11b34d45a60458106fc6b4f3e8ecf592086fc679c3de83777b3335fd5c01668ef577f746a37b2d71e61ffed9a6a86b5
+EBUILD kde-gtk-config-5.22.0.ebuild 1284 BLAKE2B 2fe97ab88e174f2985b00846ca1f3840631abfe8192f3776f2c7b6c0027f8fccca9434db323b605faf7c72bf1ad6a85637505d51caca39f1b8fdd0cb9efa40bd SHA512 6886ae53627460280726f8cf09f3deb3c11e537471f3c53ce860691e2a89d5ea1a586a5632a50dfcf57117ad3959eb8fb6aa8de36c89a12b7d93bc5ec38f3ebb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.20.5-window-decorations-reloaded.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.20.5-window-decorations-reloaded.patch
deleted file mode 100644
index 9b790a03dd16..000000000000
--- a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.20.5-window-decorations-reloaded.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 62e272df848d6848482ceb534d14bf36c9fde241 Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt@gmail.com>
-Date: Sat, 9 Jan 2021 19:07:24 -0800
-Subject: [PATCH] Remove debug message to avoid polute to stdout.
-
-This would break application like zenity which output to stdout.
----
- window-decorations-reload-module/reloader.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/window-decorations-reload-module/reloader.c b/window-decorations-reload-module/reloader.c
-index 9e367dc..606bb1f 100644
---- a/window-decorations-reload-module/reloader.c
-+++ b/window-decorations-reload-module/reloader.c
-@@ -55,7 +55,6 @@ void manage_css_provider(GFileMonitor *monitor, GFile *file, GFile *other_file,
- 
- void reload_css_provider()
- {
--    printf("WINDOW DECORATIONS RELOADED\n");
-     if (css_provider != NULL) {
-         remove_css_provider();
-     }
--- 
-GitLab
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild
index c19ad83bd2c2..1568b0e460bb 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.5-r1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.0.ebuild
index 10b6fa2e6275..c19ad83bd2c2 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.5-r1.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-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
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
@@ -41,8 +41,6 @@ RDEPEND="${DEPEND}
 	x11-misc/xsettingsd
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.20.5-window-decorations-reloaded.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 92fb68cc9034..150f3b2c6e07 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
-DIST kdecoration-5.20.5.tar.xz 45524 BLAKE2B 3ba5a83c51664ce45b21055ca839cd390feb206d98c8b4380895ccc81f861b741a1a01d70f0417f36020322e5e94aa58ba41e75300a2d987dd3a27f65907b5fb SHA512 020130695a865a98acc3b8ec783650877addec8beb6ee96b87bf74f7bedd63aa2d06629d3f8f59a1b76ded72b4a6c85d462d61ed6c9a37876fd2f8123af8fdfe
 DIST kdecoration-5.21.5.tar.xz 46236 BLAKE2B 3fc48fd91ff5e53c4a98f37572785b25f25ba23218aefc6e07b1b7c3495055002b379f826191e0155a39ae61dd8a0052e51d50af059fa8e3bf12e3dcb22f613a SHA512 ef86f9946cad9de9a5e3767e2dce4f30436c9fb013bf73d5ca31cb852d3dae92cd3906adcb178070f74922f3776d226b8f812ea24eb82a57662c0bf675d38edb
-EBUILD kdecoration-5.20.5.ebuild 479 BLAKE2B bfad15f8c0653891ae88aedd7210aa0be9f48b8fd7e440f07f39dcd0a01978c9ec270bbbb9ced6c3b8b48fb547ff2c1a74497b1796d1101e0a1b0239abbee207 SHA512 5809e9fb0e8214bc568758ec5df8969b60d650a3f5f88064c473134d594b0a3a5a71196f5f29580a8b5161c006afbf5c9589077407410bdd953fb0e481526585
-EBUILD kdecoration-5.21.5.ebuild 482 BLAKE2B f786c8248edca18475c95df75a1309c30f51c8dc3f73e694c559aebf981d39f95b6569a4d1278e0ce1d4f71c1ff34639c49c96b4247f78c23708fdb85727affd SHA512 8376fc0a0c4153d9e2ba39a9ba3794bc4952491be6c9952347fdc97f3d59ffb64459d641ace223a1d770f1e45ba5410304379432773f4a876a3bfc5d7fffc426
+DIST kdecoration-5.22.0.tar.xz 46772 BLAKE2B 5ae25409c22eb364c829d062eeb177d07c09e96cbf765ee389521a83beadef6c18db0a3d3917a611ee27407be7299a03069ebf619e4ab6a56eff6b3ba7c492ba SHA512 435e90dc984bb7bf1e94672e6f56455f9265a0baf7dcca0da4655c88e008f4e1eb788b106edb5fce8153e6239c1d6d924c60e4804e5c02ef843e1201e432963b
+EBUILD kdecoration-5.21.5.ebuild 479 BLAKE2B b64ec4043b3a32daf4717bca3394c031b5af903243238cb4a5514605402c6154d837ab1046ffb2b3e9424712d1def35555bc38242e4e396240d6f471f1d0ec48 SHA512 5fbce6761a4afbc358756c80f3f823ed49c313a5d20320c14b32e4addb2a95fdb329088144b6610c388cc422231c58a81c67d37a01d279191171a390cb5583b6
+EBUILD kdecoration-5.22.0.ebuild 482 BLAKE2B f786c8248edca18475c95df75a1309c30f51c8dc3f73e694c559aebf981d39f95b6569a4d1278e0ce1d4f71c1ff34639c49c96b4247f78c23708fdb85727affd SHA512 8376fc0a0c4153d9e2ba39a9ba3794bc4952491be6c9952347fdc97f3d59ffb64459d641ace223a1d770f1e45ba5410304379432773f4a876a3bfc5d7fffc426
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.21.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.21.5.ebuild
index 772726b619c5..ba18bb06cfb9 100644
--- a/kde-plasma/kdecoration/kdecoration-5.21.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.21.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Plugin based library to create window decorations"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/kdecoration-5.20.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.22.0.ebuild
index 19dd80902673..772726b619c5 100644
--- a/kde-plasma/kdecoration/kdecoration-5.20.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 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
 
@@ -14,7 +14,7 @@ DESCRIPTION="Plugin based library to create window decorations"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index baf89835dd71..d3a4ba65d8e0 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,7 +1,6 @@
 AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
-AUX kdeplasma-addons-5.20.5-no-kiconthemes.patch 1004 BLAKE2B a1b1e95d377b15ab9753df6ca0d4121f6690de8e32782b3cda5f3d42b5be2791d400189c990ae4f2820820c8da68d3e39150bbc6de95db7a0104da4c74a01ed3 SHA512 376c8b2cd185b7ee633c43067192e775db61cb05456df615c6230076ca3ed0e5ae04e7e1ebb1147cbf482094d82748b3a29d1c52fa81d5a5fbbb9b6f18ab9499
-DIST kdeplasma-addons-5.20.5.tar.xz 644352 BLAKE2B 2579fafc102210006a8cdb4b303c865ec3aabe149c0d0acfa47640c272e4327fa84934f33e14f6c2fad20656fbe145793d375c81fa4028251cf623e37b243aaa SHA512 3a4f0715ac1dbc9edbb62f253b48520f9b011c29f87ef0a7ba25ea14dc24dcc698405e7d8e83593b51bab2976b274b0ac869cab8b17a50ba34902bd8121ee421
 DIST kdeplasma-addons-5.21.5.tar.xz 630108 BLAKE2B a3a4ee1885cce41621150cc1eb5fa5d6470b627f8a30231078938d82f39f888927f6482048403905cb3e680928be892718e0c4741a8da11f0e317fa06cee8106 SHA512 7c7afebd726e400c859be7051c14dc2ade658df7995b02f43595be5394f8d79322c7a7edeff6761e3980bc20aaedfc49d063308c4ee9974a400b8f855a89efe1
-EBUILD kdeplasma-addons-5.20.5.ebuild 2129 BLAKE2B f81e68e4c5a6d7624c5d6e593c39a2c076e7ff7eb329cf95d1922a9c901bf6a82812e05cd42139897ed40f9cc44e4fc77988ff5bf4432de32ce982bc8fc5baf9 SHA512 0bd0d2de34d489cb113bfb81c91032dfbb5ebd9241751801334331dc2f5373950776b8b02ac099635cb6199cd716d8aaa8060dff0488d8c614cfb8ea304d3222
-EBUILD kdeplasma-addons-5.21.5.ebuild 2082 BLAKE2B 7c48249ad97f9f6261825768fe7eda3e3c89612cb988f8ecfa208b1d06d08a8c8bf786d35b4bdff200d476174f35358fdda440f29db2b983e993bdbff710495a SHA512 72dfb4b13eedd04f46259d2f3bfcea9722e9dd73920176065154861bf589d8ba81e52386a2d4170ea4597b6b8d403ab890217602dfc88277997601df5cb7351b
+DIST kdeplasma-addons-5.22.0.tar.xz 633336 BLAKE2B 9e11954e7756bbcf5c27699fd76684c950db41b495ea033360db05cebe2cae906e361374e5884de4880ba0f591a455229e996af815f4aef630317e39590052eb SHA512 027b54c290011ad0b031515a744ce7ad1b18734054f892c119eddce744078b838583b6125014419c05dea3ba97207b095a487ede0d3e03e2df34d16fe189a543
+EBUILD kdeplasma-addons-5.21.5.ebuild 2079 BLAKE2B 19c27c73a2d26ffae8a1cc44e48350b3d391a45d33b8e61ca81b5b7ca8fa1b026867720fe34f79f4a11b6322e4ed8a86f3d7528fe5fbae503605af71d8671650 SHA512 db7612e36ce39cab39f65c8707e347cae01a3cd572f856e9512bfdf2d006558f92bc5e47c68cb897baff800d2abef9b6add55dc879d5b0939c09e0ad78c719dc
+EBUILD kdeplasma-addons-5.22.0.ebuild 2082 BLAKE2B 7c48249ad97f9f6261825768fe7eda3e3c89612cb988f8ecfa208b1d06d08a8c8bf786d35b4bdff200d476174f35358fdda440f29db2b983e993bdbff710495a SHA512 72dfb4b13eedd04f46259d2f3bfcea9722e9dd73920176065154861bf589d8ba81e52386a2d4170ea4597b6b8d403ab890217602dfc88277997601df5cb7351b
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.20.5-no-kiconthemes.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.20.5-no-kiconthemes.patch
deleted file mode 100644
index 5981fe4a7ef4..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.20.5-no-kiconthemes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 88fe32d4d6543c860bcec4e63782ee82fac2c75f Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 14 Dec 2020 18:26:33 +0100
-Subject: [PATCH] Remove unused KIconThemes dependency
-
----
- CMakeLists.txt                 | 1 -
- applets/weather/CMakeLists.txt | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 15e121e7f..bc3782f1f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,7 +47,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     Declarative
-     Holidays
-     I18n
--    IconThemes
-     KIO
-     KCMUtils
-     Kross
-diff --git a/applets/weather/CMakeLists.txt b/applets/weather/CMakeLists.txt
-index d88c5fcc0..fe88b68c5 100644
---- a/applets/weather/CMakeLists.txt
-+++ b/applets/weather/CMakeLists.txt
-@@ -33,7 +33,6 @@ add_library(weatherplugin SHARED ${weather_SRCS})
- target_link_libraries(weatherplugin
-     KF5::Plasma
-     KF5::UnitConversion
--    KF5::IconThemes
-     KF5::I18n
-     Qt5::Qml
- )
--- 
-GitLab
-
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
index 7d312067f3f2..11489f598f86 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="comic share webengine"
 
 RESTRICT+=" test" # bug 727846
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.0.ebuild
index d5e4bee93e2f..7d312067f3f2 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_HANDBOOK="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 optfeature
 
@@ -14,7 +14,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="comic share webengine"
 
 RESTRICT+=" test" # bug 727846
@@ -55,10 +55,7 @@ RDEPEND="${DEPEND}
 	>=kde-plasma/plasma-workspace-${PVCUT}:5
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-5.20.5-no-kiconthemes.patch"
-	"${FILESDIR}/${PN}-5.19.3-kross-optional.patch" # downstream patch
-)
+PATCHES=( "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" ) # downstream patch
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 835e298c41c9..ee3f03318bf3 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
-DIST kgamma5-5.20.5.tar.xz 81560 BLAKE2B b27cce9651fc78d28758f252cecbe36af52de0e76145b3a08abd0d741be015231fa1501201c115f29fc4f324bd05a3a327866cb594f5c72f34666e7c3978e67e SHA512 ea92e80a3c16e8ab357e9185d8bfaa157cb75edbb6f3d64b0c4d6f2951ee2335d52cda4c26913e160449c7dfad35114e8819acf95ebb12e011a3e7e8d4f0e654
 DIST kgamma5-5.21.5.tar.xz 83168 BLAKE2B 5b6cec28329437dbfd93ccf24e26032dad1a394133f823dc6e47a0d82e2aee1d5ca387876a4951c2dec4b072268dcddc58cf0d9c69ad107360279c9027e6e777 SHA512 31da4b0e4aceeffaa17b9d9c13a12db8a7009575e92977f5261fea4b578cc8cca1a8f159a4229a7995cac2beb76583c125448a346ac1cdfdbb774bf76b2e34ac
-EBUILD kgamma-5.20.5.ebuild 677 BLAKE2B 3bf52f57c349619543fbc9c21da7f2bc5d3f43392e1c93e443431316af858edbe98ea644f573e4b2bc60349436af3fe9891b62d18d7ebd097429e1f4213168a4 SHA512 12d05f2f9bc9a147f54ceabe03810b397f393d988050648debd992ec22d453210491ff2292a5034cc3efa3498708b8ec0dcbf5f03b6a1e25bd02942e45547d58
-EBUILD kgamma-5.21.5.ebuild 680 BLAKE2B 3f8a743abb35ea9b08a97b1bcfa58b2ca22599ea6cea4d5e8bc2696c7e6901bb174738acae18d2f184a9042399460cd567333fcbc8f9bdeccc41369b82d2666d SHA512 9545bd4fd9f85b331edce69a83bbf0f5066ca80ee4072ab57332732550198bdb5cf88e7ba2f25a78ac48032b3ff3778f7a00e3c72e84500416aade8b08d63c80
+DIST kgamma5-5.22.0.tar.xz 82808 BLAKE2B 7ccb818bc12eff521238ce091399b0f82216522116a696f66d1adab728935d80aea07ccd13cc277885208bf7ac841ed79baf331cc1a18b68bfd815a1a160d307 SHA512 45ad2eebb17b92d32d968cc7abd700b43439ac37e46cbf5a536d323a405325d4030882ce63dddbc7781c1409ae484489f17eaa21faad49fdb809c31d49b12118
+EBUILD kgamma-5.21.5.ebuild 677 BLAKE2B 276f1a82474c690e5ed4a803ddcd536728d70a3973151534cb435a69f302b2c612baa106281b28ad07b2571e739dc506549785af4e1028b11aa77a10c75667f4 SHA512 2c31c58a7011e039a4aa8f5d04520b15bd90dad56cce061d5d4b38e5b4991759ac6fa00deb9670b8926d52692d15cfa32b2d1be0eb9c18db8182891372706023
+EBUILD kgamma-5.22.0.ebuild 680 BLAKE2B 3f8a743abb35ea9b08a97b1bcfa58b2ca22599ea6cea4d5e8bc2696c7e6901bb174738acae18d2f184a9042399460cd567333fcbc8f9bdeccc41369b82d2666d SHA512 9545bd4fd9f85b331edce69a83bbf0f5066ca80ee4072ab57332732550198bdb5cf88e7ba2f25a78ac48032b3ff3778f7a00e3c72e84500416aade8b08d63c80
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.21.5.ebuild b/kde-plasma/kgamma/kgamma-5.21.5.ebuild
index 7b67115da52f..164fb76d3897 100644
--- a/kde-plasma/kgamma/kgamma-5.21.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.21.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Screen gamma values kcontrol module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kgamma/kgamma-5.20.5.ebuild b/kde-plasma/kgamma/kgamma-5.22.0.ebuild
index 6b23d08d5792..7b67115da52f 100644
--- a/kde-plasma/kgamma/kgamma-5.20.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.22.0.ebuild
@@ -5,16 +5,16 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 KDE_ORG_NAME="${PN}5"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Screen gamma values kcontrol module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 4fe3ea36b664..67b575812a6a 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,6 +1,5 @@
-AUX khotkeys-5.20.4-unused-dep.patch 780 BLAKE2B 82fe708c5e56a2f848dffeba923ea21f1661888d985a63d399bf79d8ab0fc502a7c85e1702b540cd6f5dcead1befc899c7fd3ae0c57266ce63817c12cc2e84d4 SHA512 6ec31bfe5b0f8cf21ae5e35b018829f1b88fbbccc39c27aeeac4e2463cf6c766cf9a5c51d832d7b06b14b3fc2cecd76ad5114e52672e0bd6b569034544caf963
-DIST khotkeys-5.20.5.tar.xz 1856468 BLAKE2B a29c2c6dd9d34dbf2919ab4020bc6b3ec16d25f0462485ed1940598a238f99b8066176462e6ce24ec2784150601d574eabd469b1fa9760f2afb630392c4a7d4e SHA512 7a18896c40749611b333b3a7cd5c064e61449579b141856f2d75f02fe0db12924fc8e6ccada00c6cca29a57aac5877f0c791d7231dc047b8b32c168ac507e110
 DIST khotkeys-5.21.5.tar.xz 1861604 BLAKE2B 69f0057e62d4a03ce3e54092def09ea7bf73a4063ebd8e33c2fb81566d9fd1e02a1712b2e941295a491821b3ba4695f43884e5db532a5c166439a2d26389b1df SHA512 16409a928af050278dda012150e969b60617a66aa000cbb722781788defb02268ac56ef521916e55f257e4b166df8ddffcf14c9c35b49410a79491f197b4aef5
-EBUILD khotkeys-5.20.5.ebuild 1403 BLAKE2B 38399ad2dab11d01440e70a695d87252cebba536ac1d839b6716cd75d334663a2e0291970eb11a5ab9f850578aae65e2c894cd7f2dfb1d076b25f2d03b937982 SHA512 acace4a1d436a6b976909b4358e6f8e94bb4ff85983af66f631fafbfc602c018ba99d6517421a76a69375e1469ce0b1e9c053b269151af1a9b161d16a05a79e9
-EBUILD khotkeys-5.21.5.ebuild 1349 BLAKE2B 44f45d12ecbc77b5334007c0fec67393b6dace0eee0044d4bd1026735ab463c7759ec1d841d8d631beccd829680c6a85b5a47073c6d4d36feceb6795193901c5 SHA512 5792e75e05382883b6c1055448d8dbddd76d9316ed521fceb8dce8e05ee3f61396c1e2d3f9408af4a2a141ee307532cf5be5e14d3bff37005e75543b456f1b3c
+DIST khotkeys-5.22.0.tar.xz 1858420 BLAKE2B cf0d244a12d113f733c261691b1fd1f4997d44ed5bcab00818723956998ab5516c7d800eaa9d7048ea48fbddd667b646adf1ddfbf340f0d131d278de5a8f65e3 SHA512 722e6d67cd1c131c1ee56dd348e4305ae6d8a408ddbaf188bcbccbb5107a6c9e64cf93605165613b2830cfbeb5d0396c9987901bf029fa36f63a47d60b28ae24
+EBUILD khotkeys-5.21.5.ebuild 1346 BLAKE2B 98d708e9f0834e4a4572ecb4a13deb8ae3819bb25aae2191ebd12e6207c30f6404b9c1afd7b34592a96c2be5b8c2c166b7b74008a6df62419ba44fff535c5881 SHA512 de5172eb39e2d1da905fa46ffe4553efa11cff52b05f14b2842d2ff82a2daabcb76ab715ac1439497a24da9d9af23a2025b284f1ca0962000c3d921b029f9d1d
+EBUILD khotkeys-5.22.0.ebuild 1349 BLAKE2B 44f45d12ecbc77b5334007c0fec67393b6dace0eee0044d4bd1026735ab463c7759ec1d841d8d631beccd829680c6a85b5a47073c6d4d36feceb6795193901c5 SHA512 5792e75e05382883b6c1055448d8dbddd76d9316ed521fceb8dce8e05ee3f61396c1e2d3f9408af4a2a141ee307532cf5be5e14d3bff37005e75543b456f1b3c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch b/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch
deleted file mode 100644
index 6d39c5465791..000000000000
--- a/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5f622844605a569eec776f3cdd0954ccefd8c99b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 29 Nov 2020 11:55:10 +0100
-Subject: [PATCH] Drop unused KF5Plasma dependency
-
-This had been already dropped in commit 1d60f46f, which was reverted in
-commit 8ba8a29c. At least that part of it was correct though.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a945dee..b49bff1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,7 +32,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     KDELibs4Support
-     DBusAddons
-     KCMUtils
--    Plasma
- )
- 
- find_package(X11 REQUIRED OPTIONAL_COMPONENTS Xtst)
--- 
-2.29.2
-
diff --git a/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
index c6e7519c239a..2d31ae1ce1b2 100644
--- a/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma workspace hotkey module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/khotkeys/khotkeys-5.20.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.22.0.ebuild
index be70e0fb1def..c6e7519c239a 100644
--- a/kde-plasma/khotkeys/khotkeys-5.20.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.22.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma workspace hotkey module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -48,5 +48,3 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kded-${KFMIN}:5
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
-
-PATCHES=( "${FILESDIR}"/${PN}-5.20.4-unused-dep.patch )
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 0e8afd7b9181..430fe2dc28ca 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-DIST kinfocenter-5.20.5.tar.xz 1286404 BLAKE2B 3420e9d73e5cf73c91733fb3c72a4315db577ef5248e11036c4a6bdb1e897deb5983276ef903c25664ceba549cbad12bff2b6e6951abc90fbca0cc97e42c60ae SHA512 c7d2eb7307682f7bdc8ac22d1905dcc8bab0e258ee5f3458c4f40e43fee4d14ecd6b423f4357b338e05924db93d7c9914d3c36756620aac9fc6d0897ea4e5a90
 DIST kinfocenter-5.21.5.tar.xz 1304704 BLAKE2B e63d261bd57f69f3941c670f7d4e45428959544f15187829a704a240706bc04a65dad4bbfeca32444050abb1a5a8c50ccb9365d261cf71149498d1ca408bb77d SHA512 2becdd6f6be00de309467fee1478bec75bc6fa7d8d233b0a5bc8e6124f780add705d549209c842c3cd621bc8931a8ecdecb5a2902ab369bcd476939580bec41a
-EBUILD kinfocenter-5.20.5.ebuild 2691 BLAKE2B 986fa3655c926cb93446e8b9195d0b43f4184e721dbc15911c877a242ce34c8078ed82cc3fc31e01eea0931adc33c522d97c045b137194518641a126e4370372 SHA512 5cf14c0d3259d0d05b957a553aa7c9158eabc6250815810bff1a66e292f2983a0f0464ec9fa75eb66191f0733732d602011b4853943ee41f5c4aa7cf45ef5b71
-EBUILD kinfocenter-5.21.5.ebuild 2539 BLAKE2B a29663fe6c17f8ec61919fed251ef9f8cd7ec0c5156d821a27596ce14b1beda233d27e979223ef5145ba8e76c494094a71c4be64579e3874f2d882e86bb9b6c9 SHA512 8b37737dbde1fc4b3b967cdf5a9cb0055a0247877fe56e612434032bdf032e901fec0321f44defbdef07390d3e9e082fe9ae0731fd747bcdb30d8c90de584b7a
+DIST kinfocenter-5.22.0.tar.xz 1162588 BLAKE2B d6b26d7e63af57c9f37202cec60861b89e58443631ab11215868c7b019e59211711e2f142f5275e3ba17d458bbe296d915f4a9a704311a36525f748771a1dae8 SHA512 ae5754d8c0054b35f78c14e54177480df9271dfcea80d72ecf8da7d89ea5dc9ff57964d88ab64cc15811cf4a15ffe0e5a7b4e186c5a1c1385167d1bc0653fdf1
+EBUILD kinfocenter-5.21.5.ebuild 2536 BLAKE2B cf5f5a7b0b5a934a88790f0ab564f1a0398bfe4ca94369aa1c0756e7e9846784175a0835f8062fc29ded31bb2c7254a44e47a9795ee129e07e0ff2e428641e4d SHA512 31c09305eb04dbcdd90b9c5436ce5175024ab6649085bf6f0f825bd48646ca119b6ffd86a5fddb897dc055a3c47d17bb07bfa369ea25a76aac80cf3bad0440ab
+EBUILD kinfocenter-5.22.0.ebuild 2607 BLAKE2B 807490cc08ade274e90bd2b324887fbb1de1886367071de479d937076765d42c732d8c4f94ce140cc920eadd8e664d92c11be8394ae3779e1231493560c7f729 SHA512 4dd529cdd2030276bcf201c27af789ff423b37a3918e8e8bef72c506483942fd2365ac913a48eff3a982054e49e1964c1b3c33847c3bf29148c801dadb3f141b
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
index 2321b8e4c6db..34faa34418d0 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="gles2-only ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.20.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.22.0.ebuild
index 80e318f9a816..56856fb3a329 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.20.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org optfeature
 
 DESCRIPTION="Utility providing information about the computer hardware"
@@ -15,8 +15,8 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="gles2-only ieee1394 +opengl +pci wayland"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only ieee1394 +opengl +pci usb wayland"
 
 REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
 
@@ -27,12 +27,9 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
@@ -40,7 +37,6 @@ DEPEND="
 	>=kde-frameworks/kpackage-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
 	x11-libs/libX11
 	gles2-only? ( media-libs/mesa[gles2] )
@@ -50,6 +46,7 @@ DEPEND="
 		!gles2-only? ( media-libs/glu )
 	)
 	pci? ( sys-apps/pciutils )
+	usb? ( virtual/libusb:1 )
 	wayland? (
 		>=kde-frameworks/kwayland-${KFMIN}:5
 		media-libs/mesa[egl]
@@ -66,6 +63,7 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package ieee1394 RAW1394)
 		$(cmake_use_find_package pci PCIUTILS)
+		$(cmake_use_find_package usb USB1)
 		$(cmake_use_find_package wayland EGL)
 		$(cmake_use_find_package wayland KF5Wayland)
 	)
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index bd84e5c95771..b018ef96da5b 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
-DIST kmenuedit-5.20.5.tar.xz 893840 BLAKE2B 5fe62cd5c297a21dd4fcb5298dad813bc4607aad90884e3f465f914b49c3d509af4d15cb1797ed179d7a912ff4b82fb4c802abe6fa142e31fb008600bc3ef842 SHA512 c42ae1351ba6eaed7996078aa31864a64fe6551fd688ab84146459f30d195aaa8d412ee526a011df8c21c1e60f8cb5541a5b0fbea85f4702b2249e2571c27a15
 DIST kmenuedit-5.21.5.tar.xz 899632 BLAKE2B 8b061f883fcd8df0ab62ad8e8e2b03bba8449e43056b5def98c4c22b49454c52e9034d17cc8d6f06664e33ccedb7ce9723fe63ea72f5c3f821700a2fe7c97fc7 SHA512 a375574ac41017b033bde10d7f2bcad980b5c0758855c9787518e1f9a5185b0dbdca775f45593144fe462fe52d01001ba72e775b2b728f7a39087ffeeaae8919
-EBUILD kmenuedit-5.20.5.ebuild 1096 BLAKE2B 32b74d2ce2e60b8629a3be5c0bc2c8371b230e3b9667210b77ba40740bb5cd2bd253ff15d6e984cb44c6ed3f13f0a420adf017bbc6ab5d381d2b206e5ee4c978 SHA512 2c4598f4ca19dd8a00b2ce25b7a9185464350ecdf882f98157a6efa98bdf9a6a790c0ca3eb75f374da614448fa1878ce4e088cfa0ea01a47e110f3b1f5cec5b8
-EBUILD kmenuedit-5.21.5.ebuild 1063 BLAKE2B 65fceb6567d6b45683853093c7d8c4cb61d8128bf40842126abeca938d6b57ab19c11c0f9281b680814190a63e0f77e0a90f3f4317c6201f4d7e0017ab10dd4d SHA512 6d21d92d3d0ff806b37326706d163b97eaf66b7f67813f9c082662e74bbbd67037cb3984b6afeee84ca80395a7bc4488e1dd478c3a5e6ee0b5d42c20538b1c39
+DIST kmenuedit-5.22.0.tar.xz 899200 BLAKE2B 07ab23c4abc99452118d8f8ae82cda2acaf912ced93c570611d7b674256667c70aa444b29d580529e7761f838d43ad279e800f0da3315f47a9dd69613b2ea532 SHA512 005982c2deeec0624e90d590253e5df42bfa86c8550a203ae6ad06160449ffe47fdd11b42c2602f54ebcd9cc10a936793cba55cab768da6c8b27462475b7641d
+EBUILD kmenuedit-5.21.5.ebuild 1060 BLAKE2B 9c0e66d2f8ff87c12aa71f1770f0338eafef0353733cc5e3a85629fcc3209619703717542730e712ea7827151058f366f1ca2e849c6dac844ed81f352da24888 SHA512 4734af0613b32b84d8eb38e3a4d99d0339fda1a538bab08b5471f1d69d5a2ef480d0961c5386b616b58aeb493e7a16c36e545f6b934904da28fe1df128285a8e
+EBUILD kmenuedit-5.22.0.ebuild 1063 BLAKE2B 65fceb6567d6b45683853093c7d8c4cb61d8128bf40842126abeca938d6b57ab19c11c0f9281b680814190a63e0f77e0a90f3f4317c6201f4d7e0017ab10dd4d SHA512 6d21d92d3d0ff806b37326706d163b97eaf66b7f67813f9c082662e74bbbd67037cb3984b6afeee84ca80395a7bc4488e1dd478c3a5e6ee0b5d42c20538b1c39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
index b295b218730f..41d7a4fa89b0 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.20.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.22.0.ebuild
index 985b50d236f5..b295b218730f 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.20.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.22.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma menu editor"
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -36,6 +36,4 @@ RDEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
 "
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kinit-${KFMIN}:5
-"
+DEPEND="${RDEPEND}"
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index a15a210df0ea..7c2bee26cdf7 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
-DIST kscreen-5.20.5.tar.xz 114932 BLAKE2B c703e4dd605fedf26dea0f04829d9ee900f8c007915123cb6e68c68bbeba8655bfb833bc180c2258c48e9e8c672d3b057bf2b3380fb7f687bbf0d4202a1217ed SHA512 c1a618605afe4861f9ea563472df104e0cd6f015b2ba1a0621ee6d18bd653598a6de0f800901dc07e8142969633d302e68d66f3b0b9650cbc4b6cd0eeca14dd1
 DIST kscreen-5.21.5.tar.xz 114956 BLAKE2B e236b765ae57f4138feb70d9652ada33f57abd0581c1ec9a5bc826a6c31a1a5a5a6236cf55bb3a24f7a4de0a1aeb088cc62a09dd6353f126aafa04f4d3b2e73b SHA512 d57a561b22aed2301574e4af37d45046f4fbd360f8eae3465303c29a490f9dcc33a93c7e38890bd2945a4d868c23719a0ac11cfcdd22e613fc8612fa53694784
-EBUILD kscreen-5.20.5.ebuild 1225 BLAKE2B 90e88d5de8bf1bb094912bd415f232e26723cc555be0107a85ce2c07fcde5be6ea00550c82e6e597673260c3364e7eaa1b28613e4c11944d1e48a576cf1a317e SHA512 75ea7aa848c2c453b9264c1975992e6aa8b1bd4b86f48daf58be727e42bbf0f21e1eaf670657c2ee8795b5dc721ff52715dd3d84bc185fc6727f76b71925fa18
-EBUILD kscreen-5.21.5.ebuild 1228 BLAKE2B 1674ab07aa3b0ecc2af7634455152a70a4086cfd108caba8effc4fe5fa1cc6e356b9694ae621a36442699422d10a8e34b5466bafeed42583d1c1543a72a45861 SHA512 2fa67b30793b82d4867b00128727e3f45f7fb04a4974edb09696ec10aa787a7dc0f040c2391214ee2a504bab64577dddc03b72885967f2a62c460851ee16df30
+DIST kscreen-5.22.0.tar.xz 116684 BLAKE2B 248a724a0fc23eca178cdb8cd854677144eac787d29986d59652a68782788106ee6b8acef64e055226931d13e6e51d170424a8daf609112985828f5bcb685c83 SHA512 00212bed49d079f5c318f374604a03e8dcdc128638666b3d5486230494e8fa980e279fda9380f3b0d818e3f1d0878dbe792b84a3a06f8ef1a2dcf9ff775731c9
+EBUILD kscreen-5.21.5.ebuild 1225 BLAKE2B 2ca59ec61ac7ee9da79514d7201b7c312a1b00f15bfef37a534861796fb989db15eb024616e95c513bac2973586ec7c311b84187471ea9ab264aba60840e9f75 SHA512 74e702f801e6b2949a71a1195f074cb0d98bf88c10d93190e0e64512d66dc6277c95afe3e7d529a255bf949b03d6544c7d3e0bd3f11372c1317aafd7a280375e
+EBUILD kscreen-5.22.0.ebuild 1228 BLAKE2B 1674ab07aa3b0ecc2af7634455152a70a4086cfd108caba8effc4fe5fa1cc6e356b9694ae621a36442699422d10a8e34b5466bafeed42583d1c1543a72a45861 SHA512 2fa67b30793b82d4867b00128727e3f45f7fb04a4974edb09696ec10aa787a7dc0f040c2391214ee2a504bab64577dddc03b72885967f2a62c460851ee16df30
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.21.5.ebuild b/kde-plasma/kscreen/kscreen-5.21.5.ebuild
index 43e8527e51da..c5f9fe7c4cb9 100644
--- a/kde-plasma/kscreen/kscreen-5.21.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # bug #580440, last checked 5.6.3
diff --git a/kde-plasma/kscreen/kscreen-5.20.5.ebuild b/kde-plasma/kscreen/kscreen-5.22.0.ebuild
index 6bf3ae99a3e5..43e8527e51da 100644
--- a/kde-plasma/kscreen/kscreen-5.20.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma screen management"
@@ -14,9 +14,12 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
+# bug #580440, last checked 5.6.3
+RESTRICT+=" test"
+
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
@@ -41,6 +44,3 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index ae171ca785fc..1d77181e7806 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-DIST kscreenlocker-5.20.5.tar.xz 115988 BLAKE2B 7a051bea3952da85c272e32bb0c04c94bd0eb5fa52e01e90d9ce7d2902b3e3fca97ae7a6ee2c0994fa775309e62c7b7f0ba8b6634f04188370809cef7142835b SHA512 0993013374b91a34fd9ff204012f83f63a4ffcde9c6562ae0f7544fce78f5d526ad0104154ad5a104742df77d77b2267290c451cf90b1931ad1b36254e2b7ec6
 DIST kscreenlocker-5.21.5.tar.xz 117420 BLAKE2B 1727425954ee4402b8e4ce6fd05ab157597867cdfd5c6a5a4d841f5ba1723c3f0a7b056ca3bc31b48891c2edacc670595ed59677a9ee479047f5c850f4cddc27 SHA512 0ed1f1399d493f39562c3655e4f541b65c25beaeac77315af34e49f79f7dfd954099b7ab91f2eab8b1d2f5dc3be8f0a54c7d53d902bc31971bffa6b94476c8af
-EBUILD kscreenlocker-5.20.5.ebuild 2146 BLAKE2B 3d3dc126b774e8138200799d790f0085f97fce4656635331c378b842b38567e1cb3692c6da55650473144c457d96d167bc4b0620b06718787a32cc8d328de7d7 SHA512 9e2f4532549c8edacbe448e3291c7f3d4a40e02a3ebcd7057535ef0d380c114aad8a143378e743e9d3031becbe0a97a3b67a019dce3759517d3e53940618ab2b
-EBUILD kscreenlocker-5.21.5.ebuild 2219 BLAKE2B 2fe00f76146c707be342025ab712a30e95437c0a2b01aae66ac4b2b4a00d5f7a262a3825e6253b9c463dd36b320cc29523854ebc386d5426d50955f6c72e7446 SHA512 d42b08cd56b34f36bdd7a9dff796257ad896e0f9af64bcd069087a920db30261d5e9816908aaf959d52a3cf0a6834012b38caac88963af971d803341a93b0e34
+DIST kscreenlocker-5.22.0.tar.xz 116520 BLAKE2B 04e00dcaffb0ef815170e91a1aa05d8b6a04e023115968a428d4bd2870d265320f8a4a6b868dcbb876ad82681f481f1f978ca2a5d9ca8348b9f7c69af8d29cd4 SHA512 8a9be9993d889ea47a8ec3f77c47e19d1cb44ee390d1c2ad702260a633fa60d01637a11a36de642cf37aefc190d1dfd2a8c614dee87cb8e8837f0144fbc56d42
+EBUILD kscreenlocker-5.21.5.ebuild 2216 BLAKE2B 7f9d583471c6863674b68ba4de62840875c592910e68ed8603e5a18c5e38968188f9e9ceac96600be1bea445fbc09d03a2e130f00a9edfbc669f3973306fa753 SHA512 0aa508fc73c7ac615df539639988a843b6dda928264309cfdc9519a7e1aa86fffe95aa05b8e14f1a20a8d2a2127287669b4891f4f687e08ec832e88f2062a51d
+EBUILD kscreenlocker-5.22.0.ebuild 2259 BLAKE2B 59f068af8cc7081fe1b2e454f21a6524bca36c806e3e02f099c5712421266ece1366d1c64d114340c73af1ffe33465a04a8855a343f51cfa462a7b704cd77e03 SHA512 62cbdcbb2aa7b21adf9d0dcad1e6761203834fb12558cea134686b50e6b368507b3f648de928eec3030d73497c745f5c74146cf80d1bf1dab7a31db1b67b5404
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild
index 88cc23577b3a..89547b3bd301 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+pam"
 
 RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.20.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.22.0.ebuild
index 730f3e940151..bf376cfd2726 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.20.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 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 pam
 
@@ -14,9 +14,11 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+pam"
 
+RESTRICT+=" test"
+
 COMMON_DEPEND="
 	dev-libs/wayland
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -25,6 +27,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -39,6 +42,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/layer-shell-qt-${PVCUT}:5
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libxcb
@@ -53,11 +57,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 "
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-RESTRICT+=" test"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+BDEPEND="dev-util/wayland-scanner"
 
 src_prepare() {
 	ecm_src_prepare
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index e7eeacfa8533..6a523cd3b83f 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
-DIST ksshaskpass-5.20.5.tar.xz 23516 BLAKE2B 328adfbf6ca7adcc9d9fbdb22d86e0e44b4056b4d7b3c3af13ebede5002ed587aa2102c6a90c27691f102f2c15ce08d2876e1dea6cd0c20833a21800b0b3fd21 SHA512 2dbe7b59b3469ae4ab20b896d11f354c6e335e5178a8647f1e71a311389b29c16cbba7fc925053ade3076063af9fd0497af3b8e060e554e68ba40b8fef47de55
 DIST ksshaskpass-5.21.5.tar.xz 24148 BLAKE2B 8cae47375a883948cfff373b1bf113359ce4c1d548c982dc6c9d8a9a28c16661813c1d8077f463a6ec1dc80c69b2736391c56382bf3ff2b7d2f3da24d6e64f2b SHA512 c342723383d13b8df977bb4ab3c6b50c15007d12fdd27c0e51ad41cf77bbc5ddae404a9fe10669ea22933140a55bc293e7296d8e3e488cbce36158475403d7ff
-EBUILD ksshaskpass-5.20.5.ebuild 1433 BLAKE2B 6dd8e7879c893ce4ee72ed3689436ba10b2dcd013a9a65a44b2214045effdee41e5826507067bd0c5dd2796a2fd3cc195ed8d576f53ec96a90d6c235f7caa5e4 SHA512 a166ec2e7109ccfda8e8d942ebe4e8b377d1de94c83ef4d97a552a7d7ecade3a8e4eede2d06b9aa7a5bb94a714a83985ee9d59d44b244cdc2c51ec9fdb0e158b
-EBUILD ksshaskpass-5.21.5.ebuild 1436 BLAKE2B 1d0d2ba232fff79afc46f1ae3a4f582d599b00ef13aa2655d3a6c30523491be63e01d35c578607d2a37182ce397623058a4d49e2675c45275f834fc60ff0d531 SHA512 592d1e743b30fc37464145d8de78126a2806bc39fa6ceccb7535e863b69cb3b3e35d30e4050fca34e33a779b42d08a8b9cdb2cf8a136e16a8d9de21f8985b3b3
+DIST ksshaskpass-5.22.0.tar.xz 23680 BLAKE2B d2e224c0e9952ab5da4c47c6337c07c0417043402d97520ff597aa532d85de2f6f31f7241b21a2112fc902df04805732fff35cc2645fe07d6faa873b29db1d5d SHA512 918c098c877fc48e6809e498e81b0ab1968371f58f1f89af65a45fb817829f8d44666c1fee4b84cae8a1f114b59698e48da683bc452151db57df0f2e4063fb3c
+EBUILD ksshaskpass-5.21.5.ebuild 1433 BLAKE2B 9d3692f5a819276620547d5220e654609fb1c0f4d4f31c4372ddd61f15cb41b46b742c105b4035c942dcb1331a44f7f99949e6868619fbbb48fbbfc387ff97c1 SHA512 c29fb24b6f166089ca64e802cee20897cc557caa92142402bd0fb25c70ce5161540463e3518874b6b3a56e878cbf51886bb078dc37d378a5da0f2317a86ebd31
+EBUILD ksshaskpass-5.22.0.ebuild 1436 BLAKE2B 1d0d2ba232fff79afc46f1ae3a4f582d599b00ef13aa2655d3a6c30523491be63e01d35c578607d2a37182ce397623058a4d49e2675c45275f834fc60ff0d531 SHA512 592d1e743b30fc37464145d8de78126a2806bc39fa6ceccb7535e863b69cb3b3e35d30e4050fca34e33a779b42d08a8b9cdb2cf8a136e16a8d9de21f8985b3b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild
index 696527628879..b57e023f47d1 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.20.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.22.0.ebuild
index 8cc4dbbecfe7..696527628879 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.20.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.22.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index a2e1a188218c..9797d824501d 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
-DIST ksysguard-5.20.5.tar.xz 564408 BLAKE2B c22fcc8280aea81007ec2366ac3f64ea7f66f1740a30ea49ffc4317c85d8e68cb5cd29ad4afd34dcb3a37ad6362bfbfdcb59b29e427d58c6de179ba107360a26 SHA512 17c96a3e19e428f90f729b813443199a5ab75608c0f46321127b1d4e2fc68a6a55df9ac8e3f194ae97ad533d3d22006c230f34ee328984e32205046e91487b08
 DIST ksysguard-5.21.5.tar.xz 604624 BLAKE2B ac95499a75be6eb2a56d8e96a560271cbaa2618c0a21493d3226cff0aeeb05ebd2644a65567f9ddae2f07016a22e2c9dbfc3c42b14b504d13e788ff1312a18c0 SHA512 53e41ae1fb14d8e3393671e2d42ab7304b144f8938c821402c16c66aa09917e3dfc8ce766df43f1bb9c09e2934a6dcd48a4a4781d379026164b278aaed95858e
-EBUILD ksysguard-5.20.5.ebuild 1643 BLAKE2B d36fb83d570031f8ff00c8251ea6396d5cbd72ed88731ef5ae5700350e236136a6bc768fc878ee4e010fe2f62bd2482b2d01c34f8f05e6631ff86d17e8f706af SHA512 639fa1c575235b7e740787fb90c64a2eb87819332e0bf248b791b773f739aed18168d25214ae1bf2e8f01b1a2eec931d85a32c47b8b92ecb8402dba63922e849
-EBUILD ksysguard-5.21.5.ebuild 1590 BLAKE2B 5b3b03c6886a5f2f3734cac2a96f012d9b75bbfe4d77a0ab336719b9a39b60d821d2296faab332e4d40480b3b8ca30b5e56bf58dc621aecf644cfc75e9150207 SHA512 5e9550b48a8125bc1306a24a203a1855a33e867ba95b744030ccf603f7c5f6ef6a8c4f9a7b45e0b11a098590cd13bea3fc919df5ecc1095f2e95b8aa8724ee5e
-MISC metadata.xml 508 BLAKE2B 0c56534db9cc082a5aed32fc958940d305acadc6aea338945edfc1adc349b51437bcbc549fc1983b73bfe4b511a0328be0632571ada20dbc2f6cb15f7300de5a SHA512 acf19c8d5b52abe5a2c0cb8fa4c75262613cf673e597ae3b3a4ce79fee76d75fbd2632612267eb9e4a18b27d32ca9c0f5df3a9d6a68f67e9a99d87d51ed2dba0
+DIST ksysguard-5.22.0.tar.xz 521768 BLAKE2B 0cceb54c19b5263d658fded8c603bbd3415b98c0e6ebde04fccc8d4f09a68037ba2b8666ed7beccaa1d54b9b792e537a730fa93233fd3cf1b59f915effce4b0e SHA512 07314366506d029206e6fba934eefc8d338e52ab0f8f79747c189a9f856e13f32c7b156bd49ccf1ab2bef5c37fb05924022606bae6bbf2eb4628043d7c2579a2
+EBUILD ksysguard-5.21.5.ebuild 1587 BLAKE2B 889817dede3d969f1c2dff5cb7f9a87ea334e07147dd34bfaebd2b71b6879f81f4b408b98c9635794b28cf54b7da7a72ec9df73a3e9a4a1237f7217614fe178b SHA512 7ff5fa50c8a4cdb382db1a1de5c685cfbc3565a041c0b286d2b872eb2c00c31f1a3c5322f76079505d895f39ddc9ec195878601b1330a1187f29b261892315fa
+EBUILD ksysguard-5.22.0.ebuild 1472 BLAKE2B 438ad27389a9ff2d5a88462208331e33ee4e493df7dacf48fe0d0bfc4ae0401654263ce6a78f341e59a2fde7c9c28c4827e058c8c6bd0e34161d9e875e305758 SHA512 5037f148b5f32adc576063b90503322909459376230d361606c3400f32de161c294fc9f8bd52bb2397bc2a167f80e2c1f6e4fba0e3bfbd04f0a29987731d9088
+MISC metadata.xml 398 BLAKE2B 74e96ef19d58955480eed6562f9be453b43dbad78933240fc7df76c762fbafc4e5902c59f4d26506d50c3fe60239846f51da362644fea0db6922aa5b7e977160 SHA512 85822c8e59b902ec140f8566b3451fdd8c9871477eedc610762a1504084db6908c7e673d882e1de522f319a42b340431605e4066a9b23ef8d79b2a9b79fe7c28
diff --git a/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
index b6ba2ea44f62..e370b1517773 100644
--- a/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Network-enabled task manager and system monitor"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="lm-sensors networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.22.0.ebuild
index f3592b8c6825..1be76e5802d0 100644
--- a/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.22.0.ebuild
@@ -5,18 +5,23 @@ 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
 
-DESCRIPTION="Network-enabled task manager and system monitor"
+DESCRIPTION="Network-enabled resource usage monitor"
+HOMEPAGE="https://apps.kde.org/ksysguard/ https://userbase.kde.org/KSysGuard"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="lm-sensors +network networkmanager"
+IUSE="lm-sensors"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -30,7 +35,6 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
@@ -40,22 +44,12 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-plasma/libksysguard-${PVCUT}:5
 	lm-sensors? ( sys-apps/lm-sensors:= )
-	network? (
-		dev-libs/libnl:3
-		net-libs/libpcap
-		sys-libs/libcap
-	)
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package lm-sensors Sensors)
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-		$(cmake_use_find_package network libpcap)
-		$(cmake_use_find_package network NL)
 	)
-
 	ecm_src_configure
 }
diff --git a/kde-plasma/ksysguard/metadata.xml b/kde-plasma/ksysguard/metadata.xml
index 4e1b25bdbebc..5b911e5d92ac 100644
--- a/kde-plasma/ksysguard/metadata.xml
+++ b/kde-plasma/ksysguard/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="network">Enable per-process network statistic collection using <pkg>dev-libs/libnl</pkg></flag>
 		<flag name="networkmanager">Enable improved backend for Network statistics using <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
new file mode 100644
index 000000000000..0b5e9cedd039
--- /dev/null
+++ b/kde-plasma/ksystemstats/Manifest
@@ -0,0 +1,3 @@
+DIST ksystemstats-5.22.0.tar.xz 85824 BLAKE2B 9db8b4a896f4c7797dc546d11245dce811e5c1338c4a7b70192f944eef4f6564e90705a3f8d494ca86e6c56f3d41b8b13b7ff0092b282f5557337de4a3dedff6 SHA512 9c60316d040bb875a23269f488a6ef4b2acc100af2be3a5191ada56b97903c0c7c37efafecdf541df9b819120bcc4efba4b582da83ef2d2e2aad2e8601b97546
+EBUILD ksystemstats-5.22.0.ebuild 1115 BLAKE2B 365d1f71b3d42c0386ab609ae826bab18522c0f9bbf8a7efb2c94262d218a08108411d917e1ebe5f70a696e2b9da6b6187038a306e4d05c372036bc553d6dc7d SHA512 4749e47e3e121d9f1160a5ff4e29549e248086edf1da85e7cf5de775dfe4a820ebc752e797a8fcb2568abd441e9d93aff01aa4933c61b405662cb32a611ae809
+MISC metadata.xml 398 BLAKE2B 74e96ef19d58955480eed6562f9be453b43dbad78933240fc7df76c762fbafc4e5902c59f4d26506d50c3fe60239846f51da362644fea0db6922aa5b7e977160 SHA512 85822c8e59b902ec140f8566b3451fdd8c9871477eedc610762a1504084db6908c7e673d882e1de522f319a42b340431605e4066a9b23ef8d79b2a9b79fe7c28
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.22.0.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.22.0.ebuild
new file mode 100644
index 000000000000..a8dabfc8203e
--- /dev/null
+++ b/kde-plasma/ksystemstats/ksystemstats-5.22.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.82.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plugin-based system monitoring daemon"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="lm-sensors networkmanager"
+
+DEPEND="
+	dev-libs/libnl:3
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	net-libs/libpcap
+	sys-libs/libcap
+	virtual/libudev:=
+	lm-sensors? ( sys-apps/lm-sensors:= )
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	!<kde-plasma/ksysguard-5.21.90:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package lm-sensors Sensors)
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/ksystemstats/metadata.xml b/kde-plasma/ksystemstats/metadata.xml
new file mode 100644
index 000000000000..5b911e5d92ac
--- /dev/null
+++ b/kde-plasma/ksystemstats/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="networkmanager">Enable improved backend for Network statistics using <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 4482ac578bda..ce0adafcb2b8 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,6 +1,5 @@
-AUX kwallet-pam-5.20.5-socket-listening-error.patch 1444 BLAKE2B 6013b4229b4047b35b6d7550fc8fab1b30027bd31500bba2ef7dbb7e5b53d3d7a390feb4d81ff29646c76e3b53bd9032dd53e441409ed7406cc4630d8a6f93b2 SHA512 61bb0b7a344d9213d4dfb4258dc8e8a92ee94be7117daa9cbb54a02cfa1d1a746e57ec83107d375274f062e94759bdc59371064c712172c77740585a07684608
-DIST kwallet-pam-5.20.5.tar.xz 19812 BLAKE2B d0ad931e47a35b5589e9c34bce924f697446460bcfbfcceb4e3f0564182bbac822f13488dddc592f7b6a119d774b6176b86df8ddca55fb0c9423d0c7634fa9cc SHA512 5f728c2fbbcbfa7a2b50a2d9b60e557360b48d6a5958ce290ace3e2ae8c253b56f64178942f958d38e7e62e0baf1cad0ddb2aa28e11d145f3b507d58900dcb03
 DIST kwallet-pam-5.21.5.tar.xz 19916 BLAKE2B ee0efa7448f7f7d599e83d9a923909fe0de965aa48a8e505b984a5cb54d16c20b3f2f57efb83cd887545e23c3aa9ac4a70c14e9173fff263190c8de5c2c9449f SHA512 4dab0ac4500c6ec01fef71e2197e59afb39c318dfe1e5727832fed2137b5d961bb1aad9c52d356346794ac1dd9e9451f507032aab29028806d9c04c3c566738d
-EBUILD kwallet-pam-5.20.5-r1.ebuild 805 BLAKE2B 955e48072ef94dc72e564c5d22a0a53ceac2f6e652497342b7ab9224551cd15b92a37d4a3a7909ff5039ec70e904b5a3a72860f8c24ba483c99a38e9d5b1afad SHA512 e7a5dcb9fa5a7392849c7602c5cb2ad730e12b62a98dc6b04556047db047af9c3b02827c681b487ff6fcd44dbbdb5c8603e4902338f6dc90dd9631f006be84b5
-EBUILD kwallet-pam-5.21.5.ebuild 734 BLAKE2B a526f6380a350610992b1b88f1114f4f81ad8b919fa785c421a9c849457b9eaeaabc463c687bc41afbdc8d5a95d98099fe485868ce42e210ae2220fa953453a9 SHA512 762a7bd7e8778a7070b9f8f151cd3f277f18b35528b51be9b6b7f9558fd2b38dfa40c55b3bc56cefd6e00fb6398f0c68498214bab40bda8ecc6ba1f9a0518874
+DIST kwallet-pam-5.22.0.tar.xz 20164 BLAKE2B 084c1040a6a88f4bd2a736a9ce78db6bf5d8ebc96ce15df84ff43e3295dd3794b92708ac1bbaddb73f5b0dc1585c54319bdab677476f9d2f15241b920077e9c5 SHA512 4f82b59c28879df3113c8d67171a50cb4c76728413c242749e5cce92d896f2139436263d07672fc4f2e98d457a7755a9901ddd3257a6c21ac088d24fec0b2026
+EBUILD kwallet-pam-5.21.5.ebuild 731 BLAKE2B d7380ef4185c0d9cc3a0ffdf5e36848292e083c2b20821a27ba50d9f46fd0ff2c2a03f4139d28a47a614c5f753c915c23fc47cf0d592a5330dc2bc1fb6b83d1c SHA512 ba1b94ad19d2cc0724ab7a72c04bf18307577e29d3ce8b0effc561f5323b6a9159360c39cfe121b4a3ce2e0c89514c40e097c504e9500b6776761e40b1efc422
+EBUILD kwallet-pam-5.22.0.ebuild 734 BLAKE2B a526f6380a350610992b1b88f1114f4f81ad8b919fa785c421a9c849457b9eaeaabc463c687bc41afbdc8d5a95d98099fe485868ce42e210ae2220fa953453a9 SHA512 762a7bd7e8778a7070b9f8f151cd3f277f18b35528b51be9b6b7f9558fd2b38dfa40c55b3bc56cefd6e00fb6398f0c68498214bab40bda8ecc6ba1f9a0518874
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/files/kwallet-pam-5.20.5-socket-listening-error.patch b/kde-plasma/kwallet-pam/files/kwallet-pam-5.20.5-socket-listening-error.patch
deleted file mode 100644
index 790a644003d8..000000000000
--- a/kde-plasma/kwallet-pam/files/kwallet-pam-5.20.5-socket-listening-error.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 06cd94634feb70dfa7e2f8695b97317cb2ebe44c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefano=20Alo=C3=A9?= <stefano.aloe2@gmail.com>
-Date: Sun, 17 Jan 2021 23:16:57 +0100
-Subject: [PATCH] Avoid socket listening error
-
-Closing all file descriptor above 3 is causing problem to socket() and listen(). Setting FD_CLOEXEC on them solves the problem and should have exactly the same behavior.
-
-BUG: 400929
-(cherry picked from commit 8f899902e6a3be8ad4948eb1ebdf679186aa20a7)
----
- pam_kwallet.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/pam_kwallet.c b/pam_kwallet.c
-index 2585a68..a099872 100644
---- a/pam_kwallet.c
-+++ b/pam_kwallet.c
-@@ -21,6 +21,7 @@
- #include <stdio.h>
- #include <signal.h>
- #include <unistd.h>
-+#include <fcntl.h>
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
-@@ -355,12 +356,13 @@ static int drop_privileges(struct passwd *userInfo)
- static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toWalletPipe[2], char *fullSocket)
- {
-     //In the child pam_syslog does not work, using syslog directly
-+
-     //keep stderr open so socket doesn't returns us that fd
-     int x = 3;
--    //Close fd that are not of interest of kwallet
-+    //Set FD_CLOEXEC on fd that are not of interest of kwallet
-     for (; x < 64; ++x) {
-         if (x != toWalletPipe[0]) {
--            close (x);
-+            fcntl(x, F_SETFD, FD_CLOEXEC);
-         }
-     }
- 
--- 
-GitLab
-
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
index 852aef5a0d46..b656915b89be 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.22.0.ebuild
index bcabb32f43a0..852aef5a0d46 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.22.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
 inherit ecm kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -23,8 +23,6 @@ RDEPEND="${DEPEND}
 	net-misc/socat
 "
 
-PATCHES=( "${FILESDIR}/${P}-socket-listening-error.patch" ) # bug 717606
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index c0e23a9a852d..8c1520a7a900 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
-DIST kwayland-integration-5.20.5.tar.xz 21372 BLAKE2B 31fdacff1225d61332c8b9ffa7365a191d55dc1d698f3b0f0386adff0fc9dc2a31e7de8f182de96bdd6def85927cc02b8ab9819e3f82fddc499897785f55e562 SHA512 46b8b799082c02c045155f3cdea3defbcd2684b1f39ee851d46075cea89c78e55172a7f5c5584d6e50c0af75640c120a6d35b3d4be6feead86df17efb30d581d
 DIST kwayland-integration-5.21.5.tar.xz 23336 BLAKE2B 361160eff499863787d997f7eabd9dc7acfa5e9831de700cb1fbe6a4a5f10795b9435a505ff7af40eae4e473826fefda275ad8dc15efb6ac609788d9c85b25da SHA512 87e1d71f8a18ebbaadfb76a7e2bdfb47933a500d3cccb589f697e2b368302f3b8c61a0e742cd436119adb3a885aa6d94b8d522befe2908fb2b3816def93bb282
-EBUILD kwayland-integration-5.20.5.ebuild 699 BLAKE2B 9a6e9b7c4d79ee888a4857ac896241f9a937d06b59c7e3cd7ee23eae6a2c17c41d21425969375f8fda76b44e11476e634712ca6eb8cce7781eac379b9d0b5b44 SHA512 5353f1632d829788fa7a1a4c6fb38cb99eae5f8005c7c343bec9ea1537c137e9af8e50770d6879dd03482956a11a4ccde5e85b9db5a40756f4498b809f4291ab
-EBUILD kwayland-integration-5.21.5.ebuild 702 BLAKE2B 6c080feff3e03ea7187872b7bfe28166177b73474cfeac8c31ed88a33f6b5a7b71f9af36629a1dd78c14f2e2dc1b0ab8ad9a5e007230644a573eb48c1eb2cb86 SHA512 a05f520a7770d48e29b792d0a5aec0d8398da70d02b0ebf4745d38753bbeac8e2ed64b95031d60672a6f60e9c6c0cd5a51527599d5dc5005ff99a37ccb5be634
+DIST kwayland-integration-5.22.0.tar.xz 22776 BLAKE2B d69f41f7c471e9a448677f2faeedb72b4e9ffefd38a5dbd56a0658a4aef81c089d957823b45b897eceb621df2ee61d4cf224943a008f9c88d95980afa2dc2d70 SHA512 337ec281dd0ce7791d93af123ef1e5bd476328c91edc28df514c87c714b27d0f6a739b55f11e1dbf3ce0f6826ab437f404639b116644234086b855b748ff71d9
+EBUILD kwayland-integration-5.21.5.ebuild 699 BLAKE2B b70d306f6debb66c8bfbd0aa3910bc109ce2dd525415ac6e7328f00307cc0aa24a201dfc5f5bd90afcc8cfb0b9582b9dbb48e7b860ae58e6af7a9262a3c51fa8 SHA512 61bf8a5a4c0fa9b5087797e579d4fd2682a21fd9a4e1bdb26c5086282345741df85cf1a264acfc4f309e466b36093a325a1f6954955182c4bacf733868dc0bad
+EBUILD kwayland-integration-5.22.0.ebuild 702 BLAKE2B 6c080feff3e03ea7187872b7bfe28166177b73474cfeac8c31ed88a33f6b5a7b71f9af36629a1dd78c14f2e2dc1b0ab8ad9a5e007230644a573eb48c1eb2cb86 SHA512 a05f520a7770d48e29b792d0a5aec0d8398da70d02b0ebf4745d38753bbeac8e2ed64b95031d60672a6f60e9c6c0cd5a51527599d5dc5005ff99a37ccb5be634
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild
index c999b25b427b..5279c343be42 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.20.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.22.0.ebuild
index 8873c34f8c0a..c999b25b427b 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.20.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
@@ -14,9 +14,11 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
+RESTRICT+=" test" # bug 668872
+
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -26,5 +28,3 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 09849b83d30f..165b710024ff 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,5 +1,5 @@
-DIST kwayland-server-5.20.5.tar.xz 220976 BLAKE2B f3f3fd6b6ef18c014457d550e0551e07a3a7d6dc0664ec661f8e1756f4b07b83dd45f0aad58a427d21ac1335e88a7486bd3cf70f7e4edb62a5ea7e3984ab8a55 SHA512 fb3ef80061541998b110b5edb20d84541704cb82c5f087bcfc6f937ab4bf44e54d37b1a4576875e46082e0425f2a4f69e63e55e043861a89f447d887232cacb5
 DIST kwayland-server-5.21.5.tar.xz 219148 BLAKE2B bae7a3a82a7251c249a8d36ffbab764c6f3372675605310f2c46d977f8a8a6f192b551b7adea590b253c64af1e22e2e8bec8671065a389396def35c83fcbe39f SHA512 ff02ee6b1fb7cd193b49a4cbcf98a6b3ab6262e9da4211d91b764d8aaaa858c17863fccee19b649d2966c3a2721ca3b7c55f8a660a91d9eb56b1eec11d0766f5
-EBUILD kwayland-server-5.20.5.ebuild 783 BLAKE2B 43c0ca3b268f9ca661e2abd1aeb6eb0d51e3540a85034654af5077ebb25046b41fffe26c8246062e1dd4fc239be5019220558914e2f7d9ce40d24ec415f40430 SHA512 9f71f6e2afd18cb92be2c8db63c3f2b1787f84dd3c57843e1e55b70a2ae891cd33f7b6d3c12bc5dd7dc28661c6f43bcf4a95d05ddb92ace9e84c6fd8080cd4d7
-EBUILD kwayland-server-5.21.5.ebuild 821 BLAKE2B 4d3e26bcf34073633341749110c6b98b210324ff48e1d46d088bd8e8c63e28f8b2c43732707cbae1d37b8ccfe493d13efc80d58f42914222d3cc721d71c05e4a SHA512 2df4f5beefcc19d4bd27254d7d731efd356854e7f43ba98e22c7907bb9cd8964ad126e131ddad51804ce9e0e03c307a52af8e47e81729cd64f16dc6cb6798083
+DIST kwayland-server-5.22.0.tar.xz 219340 BLAKE2B e406efb3dcab52aeab6d9bee0020e30fb24a624a5114490d71122265ed4a38fb20603676139ab25856c3fd62b8b9a85ed078b49cd49d6976099c9ce58175a19c SHA512 aea5aa7ffecb1c085f733aaf5d4f16fa01c11264ab1e3717c1fed51f9937c3a99cf505664021749c8b203ae1c6b804d856efd9389ec7b26bc90887b3f57aba59
+EBUILD kwayland-server-5.21.5.ebuild 818 BLAKE2B 37c065491c6eae784d1329e77d80279d8341c90ad74a2724a68cdf6972ddd653bb177def7bb18ce7bd3d8bab348fd2dc24f3a475a2da03f419ace42c029246e9 SHA512 6c2ff07507d57f8687b72e952a4e3e1633b70211a5cf1cbb99038203cd21b642a808bf506df786273f125c1fb7d0559179ae890f5107e358e07c362609b97255
+EBUILD kwayland-server-5.22.0.ebuild 821 BLAKE2B 115e6b3c57d5f9995ef852eedc12501ea2a06842882d101863d18cbb215146732d90e165a2c484c70318712c6140b0800f0b24500129c787ab48c7ec820dc15c SHA512 eb28b01292fa642b80c986f3a36c96631a7bc1e99d5ec46c2e664a30a4f936128976074c70710e56ed85330bfd31166463545fca4847726bba7322448a912553
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild
index 1f6fa51fe042..741574f84679 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.20.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.22.0.ebuild
index 3d82baba68c5..428f62c44d5a 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.20.5.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.22.0.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 ECM_QTHELP="true"
 ECM_TEST="true"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Wayland Server Components built on KDE Frameworks"
@@ -15,11 +15,14 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
+# All failing, I guess we need a virtual wayland server
+RESTRICT+=" test"
+
 RDEPEND="
-	>=dev-libs/wayland-1.18.0
+	>=dev-libs/wayland-1.19.0
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5[egl]
 	>=dev-qt/qtwayland-${QTMIN}:5
@@ -27,9 +30,7 @@ RDEPEND="
 	media-libs/mesa[egl]
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-libs/plasma-wayland-protocols-1.3.0
 	>=dev-libs/wayland-protocols-1.18
 "
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
+BDEPEND="dev-util/wayland-scanner"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index bfc28c178fdd..fcc3e92a5974 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,8 +1,7 @@
 AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183
-AUX kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch 5670 BLAKE2B 52c854a9fcc850f29a517eec5d6ced50ad840ce54f124ccd6caecb6446a67950463673e264d17af784d33b9cc44435a01e176a75aac285ff8169b6117c137261 SHA512 898105b424df78ca043d854bd811a112614b05d8df484705726c91149b47f505b6ffee494eb4cad81fe7ac10e922715e8d2b88ba11517d66c125c93070e5fd19
-AUX kwin-5.20.5-revert-new-focuschain-w-minimised.patch 2199 BLAKE2B 66835e1af9193c29735fe1f676e344927d1ed769b17e54a4b70abdd9d253c2eff22e0ea0f65fc2674c90868f008cce258b3064545619b1ed0fe36929194f0e70 SHA512 8b9c693c4293816a92b9d91964834bd52cb217c4369af442de1b0a19e107112941c6c0e982dd2757d55e861da6f00a8a95db5d95c9e2b7951f635516f149ab13
-DIST kwin-5.20.5.tar.xz 6329444 BLAKE2B e80890c1a353b3b8a15659ea3f88e08b84f29ee863aa41ed99758e93008def940450abc2ad66bc2f5d4c9cd391a3d6ddb21eb2ab79d3696b7373f8ae0fdb6d89 SHA512 e9186dc71e3e9b913314a83fe9413b956d61d633f0e8418fd47d82178c6f50eb75b03299c00495af351b0951df23057500ef28123123583c291a0c29ea3414f1
+AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
 DIST kwin-5.21.5.tar.xz 6394220 BLAKE2B 8a0b1ba6e1393ccd721ef8dcb925739a91ba08528ac2f61a5908b37372ade83496b3fe2dbbd9093727a12ffca35d5aac607d8888454519d33b0c924c9d030bd1 SHA512 b749892b12b027b306836bbd7b770602bff80c0ce6840db3345585a1215b415fe24fb823bbcb399f76999232f100bb2e1898d460160e1a762ea10fd24d6cf63c
-EBUILD kwin-5.20.5-r1.ebuild 3941 BLAKE2B 99593d2bc2ae9dd12ec340f2a610e23ae7870d2f88d2881707b65bd60efcc022f32c38a0420cc77b4dfa2ca542410040ef8efbb96d771af2f2743f6bd1d2238b SHA512 afacac18c55ad2325828a0d9387b024ff72884eb1de2e42fcb8494a978ec422d10c85539f2f986c3320e66a41ea85d3d3abe93d69c3e62de5373dc62f8aeeff2
-EBUILD kwin-5.21.5.ebuild 3985 BLAKE2B 77b9220f31be471d55f9ea5e0e54596e80dbb3272138f1e0dd350416d4768ad7f4c9d274df219c59e878a4d838da2792871aadd013947647c54af23ba392b14e SHA512 a42ca9de164f1df15535394b3f4c4fc2c1c24674adac466ff1a1e6d722de51102427f1bf53807270f65f3a62e24573bc496ee6ea93171bf740e10d28ae32ce2f
+DIST kwin-5.22.0.tar.xz 6440652 BLAKE2B 3adf9c55e722c41a014fb3784a834c45ce93c4e196bcb3c337f9243b196a3645d1fbfe87dea9ae000b21a10eed32ce541fbdc9159a86af44d4ea561f753299e4 SHA512 eccd6d674a6ab7820de8f7765b25b55e8554ea5ddc21af90f189789856a047dc4468ced4a897b2e94c084ebb7e85f114e75cb7e63253497d36c76c2b228eb471
+EBUILD kwin-5.21.5.ebuild 3982 BLAKE2B f311f212416378470e03db3f66ae92e3f714eaf93c7ae1ea5d9b4e5c02452efe7159cd73622f18249ef1d5be66f742442300699397ac3402f5bb249b8a79597c SHA512 9a86af01a4fcfe940114f594ce02486916c0ffb05e2a185fd9390a48b044e5ad29590795552fe3e474f838481e62ecc31e2b0a82b200ce75d8c6000156fd8a6d
+EBUILD kwin-5.22.0.ebuild 3964 BLAKE2B 7008e72f0d8a2fa8aca060fbf8206111696abaa6191cafe098dbbed3d7095fb652d985f23555d28c2533eee12122c26b55418ed85f90bbfb51233e6c5e88d7b0 SHA512 d5e4d21d4ee03752b582b1b6067938b7b658e9d00e90a92439470dc9d0a6f14c743825beb9996f24633b1fabf5bc2d596c5494f78ca288b3bc52c720b8e0cead
 MISC metadata.xml 443 BLAKE2B e972639d031b3e32681af007b9d5daa44167bdbcb9b83ff557e7bcde84b588403240021f8880eb1cc852fbae37d9e8c5ffb392fa1aff19f2075d32876f5082af SHA512 cf0743ac8f3ed8a2ec354653cfbec6bbd5ef191227e46d5d56119f7c0b3ac5a388cfef44f7ce5f2ba9079f3eee897b29b52b726f4e99ee50e29cbb584ed19b3c
diff --git a/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch b/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch
deleted file mode 100644
index 9677fc76488e..000000000000
--- a/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From b3e9c819537cf292d9b1c4d19c5ce7adde00158e Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Tue, 20 Oct 2020 14:15:46 -0600
-Subject: [PATCH] [focuschain/task switcher] Add hidden option to govern
- repositioning minimized windows
-
-Since some people apparently liked the old behavior of moving minimized
-windows to the end of the focus chain, let's let them have it if they
-set a hidden config option:
-
-`MoveMinimizedWindowsToEndOfTabBoxFocusChain=true` in the `[TabBox]` group
-of the kwinrc file.
-
-We can add a UI for it later if needed.
-
-BUG: 427840
-FIXED-IN: 5.21
----
- abstract_client.cpp |  6 +++++-
- focuschain.cpp      | 16 ++++++++++------
- kwin.kcfg           |  3 +++
- options.cpp         | 11 +++++++++++
- options.h           |  6 ++++++
- 5 files changed, 35 insertions(+), 7 deletions(-)
-
-diff --git a/abstract_client.cpp b/abstract_client.cpp
-index e44da4725..01f3081f8 100644
---- a/abstract_client.cpp
-+++ b/abstract_client.cpp
-@@ -703,7 +703,11 @@ void AbstractClient::minimize(bool avoid_animation)
-     doMinimize();
- 
-     updateWindowRules(Rules::Minimize);
--    FocusChain::self()->update(this, FocusChain::MakeFirstMinimized);
-+
-+    if (options->moveMinimizedWindowsToEndOfTabBoxFocusChain()) {
-+        FocusChain::self()->update(this, FocusChain::MakeFirstMinimized);
-+    }
-+
-     // TODO: merge signal with s_minimized
-     addWorkspaceRepaint(visibleRect());
-     emit clientMinimized(this, !avoid_animation);
-diff --git a/focuschain.cpp b/focuschain.cpp
-index a68e6d3c6..347df3066 100644
---- a/focuschain.cpp
-+++ b/focuschain.cpp
-@@ -227,14 +227,18 @@ AbstractClient *FocusChain::nextForDesktop(AbstractClient *reference, uint deskt
- void FocusChain::makeFirstInChain(AbstractClient *client, Chain &chain)
- {
-     chain.removeAll(client);
--    if (client->isMinimized()) { // add it before the first minimized ...
--        for (int i = chain.count()-1; i >= 0; --i) {
--            if (chain.at(i)->isMinimized()) {
--                chain.insert(i+1, client);
--                return;
-+    if (options->moveMinimizedWindowsToEndOfTabBoxFocusChain()) {
-+        if (client->isMinimized()) { // add it before the first minimized ...
-+            for (int i = chain.count()-1; i >= 0; --i) {
-+                if (chain.at(i)->isMinimized()) {
-+                    chain.insert(i+1, client);
-+                    return;
-+                }
-             }
-+            chain.prepend(client); // ... or at end of chain
-+        } else {
-+            chain.append(client);
-         }
--        chain.prepend(client); // ... or at end of chain
-     } else {
-         chain.append(client);
-     }
-diff --git a/kwin.kcfg b/kwin.kcfg
-index 0b59606e3..2b06efe52 100644
---- a/kwin.kcfg
-+++ b/kwin.kcfg
-@@ -295,6 +295,9 @@
-         <entry name="LayoutName" type="String">
-             <default>thumbnails</default>
-         </entry>
-+        <entry name="MoveMinimizedWindowsToEndOfTabBoxFocusChain" type="Bool">
-+            <default>false</default>
-+        </entry>
-     </group>
-     <group name="KDE">
-         <entry name="AnimationDurationFactor" type="Double">
-diff --git a/options.cpp b/options.cpp
-index 4bce7ee39..8014f8b78 100644
---- a/options.cpp
-+++ b/options.cpp
-@@ -111,6 +111,7 @@ Options::Options(QObject *parent)
-     , m_glPreferBufferSwap(Options::defaultGlPreferBufferSwap())
-     , m_glPlatformInterface(Options::defaultGlPlatformInterface())
-     , m_windowsBlockCompositing(true)
-+    , m_MoveMinimizedWindowsToEndOfTabBoxFocusChain(false)
-     , OpTitlebarDblClick(Options::defaultOperationTitlebarDblClick())
-     , CmdActiveTitlebar1(Options::defaultCommandActiveTitlebar1())
-     , CmdActiveTitlebar2(Options::defaultCommandActiveTitlebar2())
-@@ -679,6 +680,15 @@ void Options::setWindowsBlockCompositing(bool value)
-     emit windowsBlockCompositingChanged();
- }
- 
-+void Options::setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool value)
-+{
-+    if (m_MoveMinimizedWindowsToEndOfTabBoxFocusChain == value) {
-+        return;
-+    }
-+    m_MoveMinimizedWindowsToEndOfTabBoxFocusChain = value;
-+
-+}
-+
- void Options::setGlPreferBufferSwap(char glPreferBufferSwap)
- {
-     if (glPreferBufferSwap == 'a') {
-@@ -849,6 +859,7 @@ void Options::syncFromKcfgc()
-     setElectricBorderTiling(m_settings->electricBorderTiling());
-     setElectricBorderCornerRatio(m_settings->electricBorderCornerRatio());
-     setWindowsBlockCompositing(m_settings->windowsBlockCompositing());
-+    setMoveMinimizedWindowsToEndOfTabBoxFocusChain(m_settings->moveMinimizedWindowsToEndOfTabBoxFocusChain());
- 
- }
- 
-diff --git a/options.h b/options.h
-index 6d72017d3..0834f314e 100644
---- a/options.h
-+++ b/options.h
-@@ -590,6 +590,10 @@ public:
-         return m_windowsBlockCompositing;
-     }
- 
-+    bool moveMinimizedWindowsToEndOfTabBoxFocusChain() const {
-+        return m_MoveMinimizedWindowsToEndOfTabBoxFocusChain;
-+    }
-+
-     QStringList modifierOnlyDBusShortcut(Qt::KeyboardModifier mod) const;
- 
-     // setters
-@@ -651,6 +655,7 @@ public:
-     void setGlPreferBufferSwap(char glPreferBufferSwap);
-     void setGlPlatformInterface(OpenGLPlatformInterface interface);
-     void setWindowsBlockCompositing(bool set);
-+    void setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool set);
- 
-     // default values
-     static WindowOperation defaultOperationTitlebarDblClick() {
-@@ -881,6 +886,7 @@ private:
-     GlSwapStrategy m_glPreferBufferSwap;
-     OpenGLPlatformInterface m_glPlatformInterface;
-     bool m_windowsBlockCompositing;
-+    bool m_MoveMinimizedWindowsToEndOfTabBoxFocusChain;
- 
-     WindowOperation OpTitlebarDblClick;
-     WindowOperation opMaxButtonRightClick = defaultOperationMaxButtonRightClick();
--- 
-GitLab
diff --git a/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch b/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch
deleted file mode 100644
index 7de71bf959c0..000000000000
--- a/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 75fded6f11ed645b0e25bf42b05fa57b8a675197 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Tue, 20 Oct 2020 14:05:33 -0600
-Subject: [PATCH] Revert "[focuschain/task switcher] Remove special handling
- for minimized windows"
-
-This reverts commit cc862fa674d3407f516a89b8543acea04aa8b37d.
-
-It turns out that some people like this behavior and we've received
-various user complaints about it.
----
- abstract_client.cpp |  1 +
- focuschain.cpp      | 12 +++++++++++-
- focuschain.h        |  3 ++-
- 3 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/abstract_client.cpp b/abstract_client.cpp
-index 35b7fcb61..e44da4725 100644
---- a/abstract_client.cpp
-+++ b/abstract_client.cpp
-@@ -703,6 +703,7 @@ void AbstractClient::minimize(bool avoid_animation)
-     doMinimize();
- 
-     updateWindowRules(Rules::Minimize);
-+    FocusChain::self()->update(this, FocusChain::MakeFirstMinimized);
-     // TODO: merge signal with s_minimized
-     addWorkspaceRepaint(visibleRect());
-     emit clientMinimized(this, !avoid_animation);
-diff --git a/focuschain.cpp b/focuschain.cpp
-index 66d209709..a68e6d3c6 100644
---- a/focuschain.cpp
-+++ b/focuschain.cpp
-@@ -227,7 +227,17 @@ AbstractClient *FocusChain::nextForDesktop(AbstractClient *reference, uint deskt
- void FocusChain::makeFirstInChain(AbstractClient *client, Chain &chain)
- {
-     chain.removeAll(client);
--    chain.append(client);
-+    if (client->isMinimized()) { // add it before the first minimized ...
-+        for (int i = chain.count()-1; i >= 0; --i) {
-+            if (chain.at(i)->isMinimized()) {
-+                chain.insert(i+1, client);
-+                return;
-+            }
-+        }
-+        chain.prepend(client); // ... or at end of chain
-+    } else {
-+        chain.append(client);
-+    }
- }
- 
- void FocusChain::makeLastInChain(AbstractClient *client, Chain &chain)
-diff --git a/focuschain.h b/focuschain.h
-index 8baf3ea32..9a7c7e25d 100644
---- a/focuschain.h
-+++ b/focuschain.h
-@@ -41,7 +41,8 @@ class FocusChain : public QObject
-     enum Change {
-         MakeFirst,
-         MakeLast,
--        Update
-+        Update,
-+        MakeFirstMinimized = MakeFirst
-     };
-     ~FocusChain() override;
-     /**
diff --git a/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch
new file mode 100644
index 000000000000..15936e6dd311
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch
@@ -0,0 +1,25 @@
+From b5b277996322b0a37ed8a9443724183b82800e81 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 6 Aug 2019 22:36:44 +0200
+Subject: [PATCH] Disable the effect video button if gstreamer is missing
+
+---
+ kcmkwin/kwineffects/package/contents/ui/Effect.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcmkwin/kwineffects/package/contents/ui/Effect.qml b/kcmkwin/kwineffects/package/contents/ui/Effect.qml
+index 71dbc5935..86ddf40b3 100644
+--- a/src/kcmkwin/kwineffects/package/contents/ui/Effect.qml
++++ b/src/kcmkwin/kwineffects/package/contents/ui/Effect.qml
+@@ -112,7 +112,7 @@ Kirigami.SwipeListItem {
+     }
+     actions: [
+         Kirigami.Action {
+-            visible: model.VideoRole.toString() !== ""
++            visible: false
+             icon.name: "videoclip-amarok"
+             tooltip: i18nc("@info:tooltip", "Show/Hide Video")
+             onTriggered: videoItem.showHide()
+-- 
+2.22.0
+
diff --git a/kde-plasma/kwin/kwin-5.21.5.ebuild b/kde-plasma/kwin/kwin-5.21.5.ebuild
index ec85a4ca09f3..9340cfb8534d 100644
--- a/kde-plasma/kwin/kwin-5.21.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.21.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
 RESTRICT+=" test"
diff --git a/kde-plasma/kwin/kwin-5.20.5-r1.ebuild b/kde-plasma/kwin/kwin-5.22.0.ebuild
index eb5a94484cca..5042d737e0ee 100644
--- a/kde-plasma/kwin/kwin-5.20.5-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.22.0.ebuild
@@ -5,18 +5,18 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="optional"
-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
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="accessibility caps gles2-only multimedia screencast"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
 RESTRICT+=" test"
 
@@ -25,9 +25,7 @@ COMMON_DEPEND="
 	>=dev-libs/wayland-1.2
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kactivities-${KFMIN}:5
@@ -60,11 +58,10 @@ COMMON_DEPEND="
 	>=kde-plasma/kwayland-server-${PVCUT}:5
 	media-libs/fontconfig
 	media-libs/freetype
+	media-libs/lcms:2
 	media-libs/libepoxy
 	media-libs/mesa[egl,gbm,wayland,X(+)]
 	virtual/libudev:=
-	x11-libs/libICE
-	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libdrm
@@ -77,6 +74,7 @@ COMMON_DEPEND="
 	accessibility? ( media-libs/libqaccessibilityclient:5 )
 	caps? ( sys-libs/libcap )
 	gles2-only? ( media-libs/mesa[gles2] )
+	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
 	screencast? ( >=media-video/pipewire-0.3:= )
 "
 # TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
@@ -92,19 +90,18 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-qt/designer-${QTMIN}:5
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	x11-base/xorg-proto
+	test? (
+		>=dev-libs/wayland-protocols-1.19
+		>=dev-qt/qtwayland-${QTMIN}:5
+	)
 "
 PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-revert-new-focuschain-w-minimised.patch" # KDE-Bug 427840
-	"${FILESDIR}/${P}-keep-focuschain-behavior-w-minimised.patch" # Plasma/5.21
-)
-
 src_prepare() {
 	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
+	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
 
 	# TODO: try to get a build switch upstreamed
 	if ! use screencast; then
@@ -117,6 +114,7 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package accessibility QAccessibilityClient)
 		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package plasma KF5Runner)
 	)
 
 	ecm_src_configure
@@ -124,6 +122,8 @@ src_configure() {
 
 pkg_postinst() {
 	ecm_pkg_postinst
+	optfeature "color management support" x11-misc/colord
+	elog
 	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
 	elog "windows to the end of the list was changed so that it remains in the"
 	elog "original order. To revert to the well established behavior:"
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index ca3b67d6700b..e2b2c2080714 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
-DIST kwrited-5.20.5.tar.xz 20508 BLAKE2B 8555ec109bcffe731428bd379aa78498b89685a03db22f19949b7db6d609bdfd9d94aae0de9d84c8b56620a432e35fbf20c834f9f46ba13955e724a9c4fdf580 SHA512 77b2b3be3b3c3fc7689d9e8907a4c76bcfc012ca862a02d77273f6e373407e72ccf9e68d1e3a1b8eab99bfb390d472591074108a5233f48e7c97221d87f4838a
 DIST kwrited-5.21.5.tar.xz 20420 BLAKE2B f761da00c5025e5f9fb11b519ba5fc057ed24366206e421683ff281255d1d5ccac7ee2c33898654f33621d39e119fd16fd8d73a6cbe338af450222ffd421a82b SHA512 b187763675cfa386ef51ff6f5bb59458d799c2010d93fd35ad0fa32c1d0898d35927eb77d82dcdfa079bbd1c8c889823cc802742016d767618e6e9e25ac417fe
-EBUILD kwrited-5.20.5.ebuild 592 BLAKE2B e61189e803740da434c1947b07f7cefebcd6d673f399d5332116741656f950a7a79f7f9159a6818b1f78fbdbf586586084a29d856355534ea97586143dd72a5c SHA512 4b772de6b79b9febafba47e68f5135607f9485a49b0c3639236288f181ba1606e2b8d057c56b7241564baa6af785770e396d45d0f78e21c026e9379b66474008
-EBUILD kwrited-5.21.5.ebuild 595 BLAKE2B 312df57a2d2d12db465e13df5ae9ff450187f65824e74f4e88acd9f4a1a42573e30268499d665814d851b9adf1b14802f736a1e587d19eb78286b32cf292d84b SHA512 7a818ac5188f37260dba64a2e97fd0cfe5130ccdfe465c8e00c9b9564adbcceed72e13f01d34376555f0bf961c6419911905caba7047e791b6af3ac3de0004f6
+DIST kwrited-5.22.0.tar.xz 20464 BLAKE2B bbebd6f0e5a87056b4b49ae779d15215e9c053f960bf1f6b4dbff3ea3e27b2b70ac48b1de3881ce067b0e8c6d4256b38df90cb399e7a8cad530ba3d05049bef8 SHA512 810d79d7a916339a3bf4014863af5f6f0884cdfdecb9768d5daefee53fb19c7ef3897c838feef085e26b8dfa80fba80b14c41e9f337c623e5dd86c2de89ef297
+EBUILD kwrited-5.21.5.ebuild 592 BLAKE2B 0756a5820fed7a1dacfbc6c3ba7ca8bafd62c1531a693536b6a4924cff98168d216c50946af0a098c4cbc9a12c53926260b1f0f544c0a46ce8b38bc0e2101f89 SHA512 24525654fbabc2987d8f187c3be98a817e23b81facd783b77debcebd41a373f75dbfeacec7bfc4e2a1a1ac72b2f3314ecfd5a12940c7e42f1296f2b9bc5428f6
+EBUILD kwrited-5.22.0.ebuild 595 BLAKE2B 312df57a2d2d12db465e13df5ae9ff450187f65824e74f4e88acd9f4a1a42573e30268499d665814d851b9adf1b14802f736a1e587d19eb78286b32cf292d84b SHA512 7a818ac5188f37260dba64a2e97fd0cfe5130ccdfe465c8e00c9b9564adbcceed72e13f01d34376555f0bf961c6419911905caba7047e791b6af3ac3de0004f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.21.5.ebuild b/kde-plasma/kwrited/kwrited-5.21.5.ebuild
index 7e9879485783..10f4a89de81f 100644
--- a/kde-plasma/kwrited/kwrited-5.21.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.21.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwrited/kwrited-5.20.5.ebuild b/kde-plasma/kwrited/kwrited-5.22.0.ebuild
index 6d28e631c91c..7e9879485783 100644
--- a/kde-plasma/kwrited/kwrited-5.20.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.22.0.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
new file mode 100644
index 000000000000..bb96efa55e2b
--- /dev/null
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -0,0 +1,3 @@
+DIST layer-shell-qt-5.22.0.tar.xz 17620 BLAKE2B 487c27e4a5f8de07c0f6fc374dcd10a17eea0c80d5a4701a79c98d624d9ca72f1e89d3e1818caeb164f07898a545a3c4a157f4c1834f06622e75343f1b5fbf57 SHA512 7ec410925349894a9312ba5de08fe5ccf7d94ac295a39e256ffc5d46d76482f67d1f0b579d76796f9c194ac4f9f0d58d4a997afe5060fb3c746629d70bbd1047
+EBUILD layer-shell-qt-5.22.0.ebuild 609 BLAKE2B 3946cc53fb4db09f8d0160e1addb8f81460d9376f0582032b43895dc6b070c926df93dffc4f129ebf1d2693c95ee5de807eafaf54274c90ff8648f081b35e80b SHA512 daa0f91e10d7cf084f3e07debca99200fd6b23752a182a4124d701f256054f006d5fdc1c5e547f47a9fe1865450027fb1afb66124f297f13ebb45bb12b5d6a00
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.0.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.0.ebuild
new file mode 100644
index 000000000000..bb5a21f13cb1
--- /dev/null
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol"
+
+LICENSE="LGPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[X]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.1.1
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
diff --git a/kde-plasma/layer-shell-qt/metadata.xml b/kde-plasma/layer-shell-qt/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-plasma/layer-shell-qt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index f2dc7ea03e0f..11d3b986021a 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
-DIST libkscreen-5.20.5.tar.xz 85368 BLAKE2B 886156489308315c3366d7b6efa994d715ecb7729ad51a5b36285de2265ca49eee23f712a56301388398099336e7a07dca869fe23e1e70c876d070392b207a32 SHA512 4fd9e5a2f215f2da752929a2688022d78ec16a70342613efbf5649a1b6be09f0b4e60cc780ccc985c1b725ce1b38f42c7f8b7bd92eb2cd1612aa2c5a005fbbdb
 DIST libkscreen-5.21.5.tar.xz 84600 BLAKE2B a7f14446932a9e4bdd0d7d90c02916380b7f263e14c3e49d30932a2c2de50046a46b6644a24697e6f94d5e72062f17ff66a1496ca61fa65c53cde349a0b4421f SHA512 283d4cac77f106d24f6eef0ba6f7a7490aff87ef5017b2db7e52ca5fd3066a33ee4e40a190cdb4e26903a79defaa724ee0a3df360464af3f76c3386c341d2d75
-EBUILD libkscreen-5.20.5.ebuild 647 BLAKE2B 5ed57c2ae5202c78bff6a157b0e13aa9e14823407ebfd1c965e450e5f3cfd3a374bd6a4e505edf6359ddab7ed0f524529548a3d9dd9ad3c993f6505c5cb22b76 SHA512 b42752e489219cca984fcffcb5c7d1910a6a2d71b4335bda4f2ffa1ebbd6b0593ae47d1ae1c0b126ed5141e56c25fbd105f99cbc954738c22f21dc5d2b746b20
-EBUILD libkscreen-5.21.5.ebuild 650 BLAKE2B 8d5fbb7371470d091b934d35f6d80fda835419c942df81ff902836cfc8083c17ed8d1a60fac3530edfbebd556e5824f36435093f70a38c9be034af7571e8fc60 SHA512 2c765ccd0425a2278b595b7490b26e2c5af3a75760c4c0201a80b3550ef1778871d3090a6595a4fd8b3faf76a62b8f3c02d0fd46f428b67ba25aecebeb8e3d64
+DIST libkscreen-5.22.0.tar.xz 95404 BLAKE2B 9a5b124008090a7a59925260107b4a7cae77a9bc3aa3be8e3af465d7d0ae716c14716fa586ed9413f4d321209a85936322a54119ef6a202fe0855b885b0cb102 SHA512 beb4ec7f2cb3fea0dc503c4205fd7181f646a6d17c33197e51d343c55537dbc045069f6cae46d0de0602b8a09efe6b3577aaade09c976e91ee4aa6f00ff98722
+EBUILD libkscreen-5.21.5.ebuild 647 BLAKE2B 214676fb4fa3d3cd9dc4918ff516a3743e5596a1e048294cf658a7219bacf4f917cd95fb7bf0aa63c9172b8e84e2da2852e9fd953c15f7750a2b13f0cbc3a1fd SHA512 398b080163d6a5962981697994c1ffca9fde92d2f9bb16dab66f3779e2ed40644fd2cf55602da6121cc777d65bac3154d791f668d8dfb1580209841a9332d8be
+EBUILD libkscreen-5.22.0.ebuild 650 BLAKE2B 8d5fbb7371470d091b934d35f6d80fda835419c942df81ff902836cfc8083c17ed8d1a60fac3530edfbebd556e5824f36435093f70a38c9be034af7571e8fc60 SHA512 2c765ccd0425a2278b595b7490b26e2c5af3a75760c4c0201a80b3550ef1778871d3090a6595a4fd8b3faf76a62b8f3c02d0fd46f428b67ba25aecebeb8e3d64
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild
index 9392a06c43e0..0a239d5bf89d 100644
--- a/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Plasma screen management library"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # requires running session
diff --git a/kde-plasma/libkscreen/libkscreen-5.20.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.22.0.ebuild
index c6b0ae7b331b..9392a06c43e0 100644
--- a/kde-plasma/libkscreen/libkscreen-5.20.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.22.0.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 ECM_QTHELP="true"
 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,9 +15,12 @@ DESCRIPTION="Plasma screen management library"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
+# requires running session
+RESTRICT+=" test"
+
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -27,6 +30,3 @@ DEPEND="
 	x11-libs/libxcb
 "
 RDEPEND="${DEPEND}"
-
-# requires running session
-RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index b8798bd88fc0..310a209a24f6 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,6 +1,6 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
-DIST libksysguard-5.20.5.tar.xz 699156 BLAKE2B 749cbe4b73e8377bb3dc026000492d6dd0cea34dd13aafd32754aa84636ccf416e60fc97ca17c1810ea0b2458f6ec09471a383210b1a6b025a745fded3a1c734 SHA512 56fa61e1149f8a97f1884755bbc0475a1f9a458eb785d29416b4646e9a9edb1f2bf85e56dcf49226ab1509b4a63bf4334c1ad9853026ccd0eaf68dffa79864b0
 DIST libksysguard-5.21.5.tar.xz 706172 BLAKE2B 776c9ae2c79ab644ee377ff76fa3d3ef41da15431bc628aa6e2f14a3914212566797c779c8aac7f0a0df3e89fe55bb748558fa56e5a3aa516535e59b5a53006f SHA512 1626f9489e0bdff3acad087577470818bd04d6d74d6afe95b11d02ecfe306328b3898a573704c11b0a34e73ec7a662b9c609b056be369694769a3dc2e6671fec
-EBUILD libksysguard-5.20.5.ebuild 1689 BLAKE2B 89ab4bfe0742a8b6c3bbd6e8d356527e78328e9ba96d9a27ecb0d19c8690d1ec65f626e43e3ce5379100f90de32a9b17cdeb82170ec8b5b44f0b29ca88195d05 SHA512 acb35714b8b71469fb5ac15ce0d5283d79d01df335e5fdb3fa97aa5102bad9554fd35a808ebf8ed466477d4b07b86ab7e35325fa9cc7f42c13f6e4b226a14e18
-EBUILD libksysguard-5.21.5.ebuild 1692 BLAKE2B 10e41622113c837bd9d5077ff50420fa86d3ed146cffe64ea3c646b5b79bdd170a23aa4e257c0829bd2ded01f511bb38713f470975ba79ef6aa5562fa2d6ca8b SHA512 09f16b0d85aa099a385178a53a0063eedff8a69f6d720466e1a21b2365da070a4fd33af442fedf9ce87c5c340632f26e4fb90cd1ff21eb49e5503077f25f090c
+DIST libksysguard-5.22.0.tar.xz 737056 BLAKE2B 3285f40306051862e2bb68648d68901be32b81f6571b5eb881344ceecd121a25fbec1c127be96c1a4e213e2e4b7b6b3ce3a5d2dadb6fbce1b1d2ad8d0c5675fa SHA512 87630a8d62ec172e57fc15b51221b66536e74aa8999cc1a2749738ded16922a3c89cd13697b7168ac84af3eee7a03a49afba164b3ce51a33c8900648b9377f2e
+EBUILD libksysguard-5.21.5.ebuild 1689 BLAKE2B 25ba7ecd1b6590393450d4909d53064ee5c9b72f9ee28a2b58312293138dfdf4fc19be0060024876240ec00ea65f2d8d648c6c8602ad296d14b984314d8b3a15 SHA512 93a8decd5e9ab4e627b48cf57ec61a089dd7a81dd2f69433c3f0dbd2dae5a2627fceccbd0147b5240ee94d69b10ee5494281f41b65d12e7651d0470dc119baab
+EBUILD libksysguard-5.22.0.ebuild 1799 BLAKE2B a3c8f0962da5edc571094c092ee7e06be95cc13588ca103a2607bcd51b8488f8d8b740e905be0bab23731d12027e47c7e5c7de7fabfdff82bf28ede84f3c7a76 SHA512 c33a6420905cda7fec75ccf96d79b3e0afe63e18914988601a8c11a215a08b81f82f4ee16ace52d9b37b766b53058f790798029a3bd144c3154b9827737afcf7
 MISC metadata.xml 542 BLAKE2B ff3326f819a0324fdc3ab339c3172f91d1fabd5eae8faffdb3b3bcbaab2a73fb3882e57db5fb6bdb669b5ff3338fc8b3ccc63b771255e527c7a64f0cac0d3cc9 SHA512 ea5d493aa7e05db1b63db2556ff3cae361aee8a18fd2688871cba9882f91b8dbf7897b91ddce16b2acf0b12efe100e8db0754fd86126a7c1d95b6cee02b576c9
diff --git a/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
index cc9223d34656..0c4c4f344a8e 100644
--- a/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="webengine X"
 
 RDEPEND="
diff --git a/kde-plasma/libksysguard/libksysguard-5.20.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.22.0.ebuild
index 7ee8bd1bfd68..e69afb619e06 100644
--- a/kde-plasma/libksysguard/libksysguard-5.20.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.22.0.ebuild
@@ -5,19 +5,20 @@ EAPI=7
 
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="true"
-KFMIN=5.74.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+KFMIN=5.82.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Task management and system monitoring library"
+
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="webengine X"
 
-RDEPEND="
+COMMON_DEPEND="
+	dev-libs/libnl:3
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -35,6 +36,8 @@ RDEPEND="
 	>=kde-frameworks/kpackage-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	net-libs/libpcap
+	sys-libs/libcap
 	sys-libs/zlib
 	webengine? (
 		>=dev-qt/qtwebchannel-${QTMIN}:5
@@ -46,11 +49,14 @@ RDEPEND="
 		x11-libs/libXres
 	)
 "
-DEPEND="${RDEPEND}
-	!<kde-plasma/plasma-workspace-5.18.80:5
+DEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	X? ( x11-base/xorg-proto )
 "
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/ksysguard-5.21.90:5
+	!<kde-plasma/plasma-workspace-5.18.80:5
+"
 
 PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
 
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index c2b7ee1af2a5..4c5f43d76cac 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,8 @@
 AUX libkworkspace-5.19.80-standalone.patch 4989 BLAKE2B 6487cb2071b4ac026966d23cfe5dd6ca8e3ddab77cffb08d51b5266e3a9ea16f74a90d987fc1b86891a65b40bcbacc3fd9dc865c79e08206cd0ac67cf7bb82cb SHA512 d86365f59cbd20979c9f7412f106c34eec26d3ce0361269e192c0310d3107fb2486eebc1fb7fc7bd331887a883ae5722259467b4edb0d23cb4355ab472f93c7f
 AUX libkworkspace-5.21.5-standalone.patch 4984 BLAKE2B 84a43baece5d0233c7e274c28a7212d6fcec6692c51047ebe5459c9502bfc0fab9a46687fa57424d29691d20987ed9e2bd207b7d2d99a13ddfa7b5091267fa18 SHA512 710d9804ec23fed811d57e1f713738b435a526511609540f45953fa678eb733542682487d8a429940b20dd26bb898fbd70f2d6da3727fa6d26ff9cd839c6c447
-DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
+AUX libkworkspace-5.21.90-standalone.patch 4996 BLAKE2B 1f09de9fbd1426fc065066897b1b966cda3993f0b1b6ac2a490d4c3c71863b93212e58ccc87353dc836fd58d969cc22c0a3ab8e6c6aacf81ac35823624e693dd SHA512 8702b74cdefbfc793e9ec0a1ce6ed6cca9f92b6c2d8c60d1a40c1530336af9c212d460ebca31ba8d28e3bcb02c1e6ae99dbea39d3572f1658e8d3575d1d947ca
 DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
-EBUILD libkworkspace-5.20.5.ebuild 1409 BLAKE2B 522dd3752451c44c7e3552c48fe51e91cea10ba2707844dcaaaf7b01aab0310a7c6499beeb5fe1b33dcb5d91670936748df735d99fe2ee2bf77ab1e4a22d5433 SHA512 42954b88ffa84cc9aa30fa82fc00061c5cc5225210e47cc948de50ea7c7fb620bb9b07bc4bdc37d4c5be0610b4b4fe8de7be3970dcc11737842ee599be119a15
-EBUILD libkworkspace-5.21.5-r1.ebuild 1242 BLAKE2B 6527e217d14ec8e5b021416e3f8d5fa5b437d46a6ef191d63d78c1d1eba895c953bf4e1eb41d9233636b74906023c6761c7ec710014069b138b31df8338b5db0 SHA512 081e2b0b73db8c93f4e345f4ba7e38c196304ac8c7e32402755e875bffa902c3f0287e7bfedadf00eaee5c21ade56f8e6d2310f0be2dad48d2e4be3ccbbc7870
+DIST plasma-workspace-5.22.0.tar.xz 8349176 BLAKE2B 61993be02589be83911c8eebcf1bb21dab7377b47bf011a9900791f6aaa5a3e59d545116ad0728afd6565763e6396d12c6e3992fc3ea55c8ab76cfb14e5b21c3 SHA512 fb57dde0ae5f774cb782ab305a526ce22404972197d531a2c5e6972eb6400d57b99a7ce397fd417c0c42c8de58f4c06d9e9771b64eb94f501987da910054f4af
+EBUILD libkworkspace-5.21.5-r1.ebuild 1239 BLAKE2B 29b2a81890471c12443c93501ed5420dbc6fd6113a951dca6cb9ed58de6e22047c3fa54d11c5007e04ce6932aceb46742797cb17cd357a48f29aa8b849bda565 SHA512 ec2f1e5d5ce1cec05042a736ea48917521fa4c147432b92005e9675c3c0cf177f2598ead48ba043ceffab735fa5dcb419a64457e4620af050c950821525eba05
+EBUILD libkworkspace-5.22.0.ebuild 1319 BLAKE2B 4b3ab68da0124ec5f71ae70b4e79308eae68d12e09b41321451cba29fe92d7c9a8452d380f30880b05349c9491e348e0d23a68adf065fb7a84b164ea7dac1ee2 SHA512 1d505add16154af3b0ea90b6c72eaf0b89db23da8115bd2a968070f01122340cf494e9f6dc00d21aa61d22d453cd9decdfda99c4bdf7bf1bb1e632d080986fc0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch
new file mode 100644
index 000000000000..430b98aadcb9
--- /dev/null
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch
@@ -0,0 +1,108 @@
+From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 2 Feb 2020 18:29:57 +0100
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++-
+ 1 file changed, 66 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 015c5181f..0aa635e11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,56 @@
++project(libkworkspace)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++    set(PROJECT_VERSION "GENTOO_PV")
++    set(PROJECT_VERSION_MAJOR 5)
++
++    cmake_minimum_required(VERSION 3.16)
++
++    set(QT_MIN_VERSION "5.15.0")
++    set(KF5_MIN_VERSION "5.82.0")
++    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
++    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
++    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++    include(KDEInstallDirs)
++    include(KDECMakeSettings)
++    include(KDECompilerSettings NO_POLICY_SCOPE)
++    include(ECMMarkNonGuiExecutable)
++    include(CMakePackageConfigHelpers)
++    include(WriteBasicConfigVersionFile)
++    include(CheckIncludeFiles)
++    include(FeatureSummary)
++    include(ECMQtDeclareLoggingCategory)
++    include(KDEPackageAppTemplates)
++    include(ECMMarkAsTest)
++    include(GenerateExportHeader)
++
++    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem)
++
++    find_package(KWinDBusInterface CONFIG REQUIRED)
++    find_package(KScreenLocker 5.13.80 REQUIRED)
++    find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
++
++    find_package(X11)
++    set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++                URL "http://www.x.org"
++                TYPE OPTIONAL
++                PURPOSE "Required for X11 support")
++
++    if(X11_FOUND)
++        find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
++        set(HAVE_X11 1)
++    endif()
++
++    if(BUILD_TESTING)
++        find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++    endif()
++
++    check_include_files(unistd.h HAVE_UNISTD_H)
++
++    configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
++    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++endif()
+ 
+ set(kworkspace_LIB_SRCS kdisplaymanager.cpp
+                         kworkspace.cpp
+@@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\")
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface )
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface)
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
++else()
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
++endif()
+ 
+ set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
+                             "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
+@@ -30,7 +91,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface)
+ 
+-set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
+ qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
+ 
+ add_library(kworkspace ${kworkspace_LIB_SRCS})
+@@ -98,3 +158,8 @@ if(BUILD_TESTING)
+     add_subdirectory(autotests)
+     add_subdirectory(tests)
+ endif()
++
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++    install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel )
++    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++endif()
+-- 
+2.31.1
+
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild
index 10cabe55d613..73f46ec757b8 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.20.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.22.0.ebuild
index 23228e860975..683900192dfd 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.20.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.22.0.ebuild
@@ -5,26 +5,25 @@ EAPI=7
 
 ECM_TEST="true"
 KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-plasma/kscreenlocker-${PVCUT}:5
 	x11-libs/libICE
 	x11-libs/libSM
@@ -32,13 +31,12 @@ RDEPEND="
 	x11-libs/libXau
 "
 DEPEND="${RDEPEND}
+	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-plasma/kwin-${PVCUT}:5
 "
 
 S="${S}/${PN}"
 
-PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" )
-
 src_prepare() {
 	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
 	if [[ ${KDE_BUILD_TYPE} = release ]]; then
@@ -46,13 +44,12 @@ src_prepare() {
 		rm -rf po/*/docs || die
 		cp -a ../po ./ || die
 	fi
-	ecm_src_prepare
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		cat >> CMakeLists.txt <<- _EOF_ || die
-			ki18n_install(po)
-		_EOF_
-	fi
 
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+	eapply "${FILESDIR}/${PN}-5.21.90-standalone.patch"
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		ki18n_install(po)
+	_EOF_
+
+	ecm_src_prepare
 }
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index d2403751fe9a..e053157aaa9d 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,6 +1,6 @@
 AUX milou-5.19.80-disable-manual-tests.patch 849 BLAKE2B 96f6148e384bcaa62cd7748bb695c86dec1d12b93252a5deda724ccee92b72ab9cdb132848746771dd4ee539eb8ba6f83681c410b28c1a203cde50a0a36b7ffc SHA512 c5dd9078754ef0dabe5704df18423ddc273c0ac0d7a685cc3df949588202bc18dd3542925e67dba868074e2e4bb5ad06ca4c6d8efec91d19af6fbea2642d6d2b
-DIST milou-5.20.5.tar.xz 55388 BLAKE2B 5d2e977c884753a315c0c424d30ff5fb2ebc04e660b0243d2c352fb105811fde54f9c57f4e96a7abf2cc043ae6ca9b348ca4d84deefcef550814ae2dcbdd7822 SHA512 a67d939dc832b77ce957cc2e1b9a9e56412618d94217e0bb958db62fa41c5ba2e6e4311e0300a79800ef1845e425ca0e275fea10ece9d9a60bdf7bf690b71b32
 DIST milou-5.21.5.tar.xz 43912 BLAKE2B 070d5ba66bfd05dea05095524c71c2635dcff640deb1742ea71c08ee02d848aaf9e3f8abbed49b2d8fee3344e7a91b155f6a5cca45d9d0852c66316fbd2f3c4e SHA512 49f029d1cd5568aaaae7e7170c98e076c917bd6eeed83ea379a412f2faf2e11ce403b5d31f287cb151a37a1ad567f6f42c5f9f48c9af437d0c1ed339aaed802f
-EBUILD milou-5.20.5.ebuild 913 BLAKE2B 828d57300e687005e26521d5b2a1319865ee34291750fe66d5e2e2eea738090269035d242fbb8ced5e247848d0ca8a323aaa63bbf9eea3655ff8ef8e83caae9f SHA512 122b969b228816e4d2552bb5e52acd11efbff05b4208312b59049981abf94de250f04b3b38f08ab55c6e1f2ddabb4af86bf4abedf7a7790ac84d455136fae34c
-EBUILD milou-5.21.5.ebuild 826 BLAKE2B 2b8017674fcea46e24f3f4de17e2ff863936359aa6c22d883c68f6152e4144db60f657437c101505c77f945a553578088766588a331533ffe35a2ea37281251f SHA512 90f82b6df71c8e77925c2591d4a2dbf877fbe2d4af9ddb6c685dc7910d540cfa959b03ddbeda164c8eec5496d96dee0defc7279559095158fc4386e193f61c8f
+DIST milou-5.22.0.tar.xz 52600 BLAKE2B b220f01a87f73c2bf936a94db23fbc93ff67458fa855e121f5264023c371310e49d0e15961c260bc16d336dfc1526cdec3ea34511f5adb4d8d240af4c62a9f83 SHA512 a6a479d68d9efbb9be06c137e39a26635aabcb78ad569c25d018b10dbe79b3c7dddd8d1c5396ebf49fd7d08eb96cba3e75db8c4ad4048940cd31fb9175bcce26
+EBUILD milou-5.21.5.ebuild 823 BLAKE2B 753fd5c8246b905c36f73ff26ff58945a9d51bc5e46dae3ea6f6f011a2cac481cfbb4cb7323454656c72ee3d980854eccbe5e71f8fabbdacf26acc6719d34fe8 SHA512 0d1ad8eb23a902c13deb12da2e4d1471df72ad510335ed56c72f67a2a4ded48373ca4d8d41f1eb7fdd3758f9630a0586c102d5bf27fc7aece2d002cc9b515c54
+EBUILD milou-5.22.0.ebuild 826 BLAKE2B 2b8017674fcea46e24f3f4de17e2ff863936359aa6c22d883c68f6152e4144db60f657437c101505c77f945a553578088766588a331533ffe35a2ea37281251f SHA512 90f82b6df71c8e77925c2591d4a2dbf877fbe2d4af9ddb6c685dc7910d540cfa959b03ddbeda164c8eec5496d96dee0defc7279559095158fc4386e193f61c8f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.21.5.ebuild b/kde-plasma/milou/milou-5.21.5.ebuild
index bf862da17f31..3ddb72aa699f 100644
--- a/kde-plasma/milou/milou-5.21.5.ebuild
+++ b/kde-plasma/milou/milou-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/milou/milou-5.20.5.ebuild b/kde-plasma/milou/milou-5.22.0.ebuild
index c5f8a7ee3457..bf862da17f31 100644
--- a/kde-plasma/milou/milou-5.20.5.ebuild
+++ b/kde-plasma/milou/milou-5.22.0.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
+ECM_TEST="true"
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Dedicated search application built on top of Baloo"
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -31,5 +31,3 @@ DEPEND="
 	>=kde-frameworks/plasma-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.19.80-disable-manual-tests.patch" ) # bug 732584
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index d7ce9da13d97..840a6032aef4 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
-DIST oxygen-5.20.5.tar.xz 4471660 BLAKE2B 9ff9c4479d34020dc92aa6d68f44d80c6a5620d8f22449a67a1d02df0f6d68313b3f88c7e41e292fdafe2316f6b50145b7a5d4ce128e0961782e7cb71d18bf86 SHA512 c3dcfeca4264c460adec8a6f08a616d3647c8e7f4265a23b994ca1106d1c0a3aefd7732377f5e6a38dcecec4728eca2bd54a7290b2d52ab81a66b7b971503282
 DIST oxygen-5.21.5.tar.xz 4476864 BLAKE2B bdf9d15a44c18d4cb0f18647c3960ef927bd64b7fc2c61963781ec4f690486032c7167c6995d78b9a2918571a9f55f0d3ce5a8e9848eac4acb46acb9eb9c8e77 SHA512 f8ab4989376eedecc5402dd788b15abf1a748863c510bebd306110423904790a9d3df3a246b8ed87273c4bd0425813a9b0a51181dca08b4c2ed27dcade6c950a
-EBUILD oxygen-5.20.5.ebuild 1363 BLAKE2B 7c9c6354c95b83c9a998c7a52f11cbf6524031e3ada6fe351b3defe401f2c418f54b1e6f4808454f1141d55efdb1896d9cc388412ea97460928690cbd91ed20e SHA512 9bbfbd9f56bd3343356174581fbb912eada64ba1f2bc5c3468dd12da5b12efc5c38a88135248f76598e72590e2eb54eef7a80b3ac8292aa39afb5e6c16a978c9
-EBUILD oxygen-5.21.5.ebuild 1366 BLAKE2B b6c2200077941549c3d184bf9af1e7b14c5c41c489b49ac7cf370657e3ddd90996ae8ed137a529ea0308d71870a6658e88b4fa0998bf572dda63e877020d186b SHA512 5eeb1e66fc16cc8297774f45ad069916f7a44ec9bec4b22ee6a926bc3592f554150b9242e66d07c2e96d67438cc2f8689f504e99d13ced28c72ea260c60a4ee1
+DIST oxygen-5.22.0.tar.xz 4475392 BLAKE2B 1fa4d2d90422a01518c4514a2c3820e661a18a247bb9b1b4444159113b06185a76bb1437f7db22d9d48317eb8c104efc83b2ad13415c7ee06776b5c99897d21c SHA512 b3a29245780c8cdbd8531d6ea91d15363ad9633ec89b3112a32c8d0909f9c6c33dd69a3f6eca5de5a74e583dbee4649cd034c85df5c1cfea32cb8e8e5e6d5731
+EBUILD oxygen-5.21.5.ebuild 1363 BLAKE2B 700541554aad8371b525ac98bdd4f33e6bc78200e82279f120e0197561183f0298a1f33e4c398cb7988ec4a009d267bf08f4a907ae135db8f77d1a919ee5c11b SHA512 cc7e82878da2895030e9ff06651c7a1a71f021fb7e661e1de8b294e30c2a31145e72444fec9f6e66db597e00825fa71cba1730fad381ecf6ed8b6e21906687b5
+EBUILD oxygen-5.22.0.ebuild 1366 BLAKE2B b6c2200077941549c3d184bf9af1e7b14c5c41c489b49ac7cf370657e3ddd90996ae8ed137a529ea0308d71870a6658e88b4fa0998bf572dda63e877020d186b SHA512 5eeb1e66fc16cc8297774f45ad069916f7a44ec9bec4b22ee6a926bc3592f554150b9242e66d07c2e96d67438cc2f8689f504e99d13ced28c72ea260c60a4ee1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.21.5.ebuild b/kde-plasma/oxygen/oxygen-5.21.5.ebuild
index 8ba5dd7c0f31..6782ff35b4af 100644
--- a/kde-plasma/oxygen/oxygen-5.21.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/oxygen/oxygen-5.20.5.ebuild b/kde-plasma/oxygen/oxygen-5.22.0.ebuild
index a92f813c2d10..8ba5dd7c0f31 100644
--- a/kde-plasma/oxygen/oxygen-5.20.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.22.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Oxygen visual style for the Plasma desktop"
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 2babdb6aca73..770cd6682728 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-browser-integration-5.20.5.tar.xz 193684 BLAKE2B 9144233b0a36e913328e930a59973432ad9e83066e7bdd602a672f354e991fb6a971598c788e658ab55615ed6e2e0731d9749d1f6d471f928375b4af0852a2be SHA512 d6017397dc86c5e835b914748fe9fe4c3f2b499174dfd3a0a9575446a831478deb692663b6c0b6d6ac37aa309a5a0168a5db5d56babd8e802b419022ce88f152
 DIST plasma-browser-integration-5.21.5.tar.xz 205668 BLAKE2B cf2eaff44d3bd4553e09b5802d01903be6d6a57acac312068a636af15a4daee44a855d3dfee771ff47b4de6a98e46f8d8225242986fc73d5e21eff6b1a59338c SHA512 83165c59606d32b65359ac7a9f79beabdcd50ea35becab2d6cfec3c34e0981a0bd0452176cf213e6de0db293b4adc1615631be6477048f5e8033cc5e16f1b9a0
-EBUILD plasma-browser-integration-5.20.5.ebuild 967 BLAKE2B 1828fad5558bbbd88b3341860e17c42540eb794a8fe42bffa4f5bc39cc31564cef001bd643592af374d3e4f55796fdcffb1298e9c9665bf7bf22aa5c5d5f169c SHA512 9363154d26a04e728d16688f60f357a8cf4a5d1a53ab446523db95f337fc3dba2817be615f8059f35547cdf8cf862f3712e62a05a1a0576ddb09af832702c5d0
-EBUILD plasma-browser-integration-5.21.5.ebuild 1012 BLAKE2B 6948b6f1445ceb952a9700b98180ddd225e177ada0fca6568776e9bcb9d61572c83faff6b9f5342d078dd57c8b4f4b51963290c002f8b91e48c9af674d546fe2 SHA512 0cb0195d2f0530cb1ef17da57aa40fbb39e8a8356f81fafbd2b0513fffb53bbde7c84a1123db9700a21cd6b30353feaaec7b04581fdee03dd5c9865c4003d500
+DIST plasma-browser-integration-5.22.0.tar.xz 212996 BLAKE2B 198fc98c73c3d764a5cfffd076d334193b0d141cf77ea88ef90380891498514421ff3f795f3b5ae88e5bc0c8805b05b764d8fdb14a155bec27bb5388e514e985 SHA512 0b8ad95830261fe823c98a12fa5aa2832b64d2754585d05db413314f3e2617426ade0a3c71df46143514b97448bf74b15c805a6e5512ab0f95cb734d56911811
+EBUILD plasma-browser-integration-5.21.5.ebuild 1009 BLAKE2B 3053ba179dda44694f18a26061f7899453d274f596724f5fe478a0de1ea8576c51a1abd861a1a300da2ecd2a9b2a38a9d6c8eba86e34b9007d4e90d065c90050 SHA512 dc417612bbca4439133ca48e4b1ca027296beb56c3a9045d4f8e9aaed00200b66e07fd082508670d19c2ad1fa89904ecae463491e7720688ccf270b1e3090228
+EBUILD plasma-browser-integration-5.22.0.ebuild 1119 BLAKE2B 0918371278278d605d7f17b616a74b1b629bb8a230638f0e12f895a171601518426ae15665ed946820deda4d702e02712fa48bb5540a55bb03551efcb772b955 SHA512 4b97a762acf3448369c11f30be2232fb003ff16bd34f1be38c3de1945528d09e4e6b3e80bd156faaf51172a3dad974debb25148deb4b5a935286e7179c6f526e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild
index febe0f1383cc..cb03cd8cb0f9 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensi
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.0.ebuild
index d7ac87616513..5bcf9fe1f263 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.0.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
+HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -26,9 +27,11 @@ DEPEND="
 	>=kde-frameworks/kfilemetadata-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/krunner-${KFMIN}:5
 	>=kde-frameworks/purpose-${KFMIN}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index dad2ab40ec5f..884183b0b3d4 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,9 +1,8 @@
-AUX plasma-desktop-5.20.5-compress-new-input-notifications.patch 3572 BLAKE2B 90872167841b752dd3803d176cddc5ff053e64a4f0dd95bdfda8565c683c0e837b8df7e34efbc16abcf95b75821b73a7ea114da7dfb4ccbec73d3921d8d131eb SHA512 2468be82790c7beb41d8b40aaae5b0490be04761b687188790bd80d0c66ed28a7b26468dba60338bf4ea45a15700e32c1ade1fe1530d693457a9470b7b10f883
-AUX plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch 995 BLAKE2B b4e00a862885bae9cad600c0a67dfb1578c2bda0bb96b9585d5690f3d4303de1cd6808c7abc3709c030dba25c98d9cb7d4e8d0aafe0d1b89ffe48a6b9d15101a SHA512 3ad5a021eef8a20564b06a4a67952484712733efb989274438330343d40c86164fcacfe41d39b36d8ffb8839de1be17b63b39ed0ac705b5dd660bb2bdf22a9b9
 AUX plasma-desktop-5.21.5-transparency.patch 8828 BLAKE2B d847a5daf3836ecbc1cbc0bacb8e6a507e5a060330d835cbb5500982d0d20148831be53e39b9613fb48d0cb5c3203b00dafa7a627ff4471d866ac6217691b729 SHA512 9b7b73d59e7d52a1acc4eb2db498c8baa31853561900653c86d6ba651093099c4bc98197a23914276ca18553c538a79b927f5829feefbbbc76592f36947fc8c7
-DIST plasma-desktop-5.20.5.tar.xz 15899532 BLAKE2B 1ed7d6c1bbc8b368ed98c4f35bcfd10f8436909a8f66fbfdf2e4e5eb8b8dcd36903600a934512dac7a07d54ef830ed2604e1ee39df6e40156ef7cec1e96dd041 SHA512 a1af8d04dbf16e94777e018ff0f289b69928ccefeb31e6dc73a2425d6170a0a5a3fdc324d192b41664cd118eea9b15cb6e7bd3f49ee03095ede16a3fa53a6f2b
 DIST plasma-desktop-5.21.5.tar.xz 15913496 BLAKE2B 6923a4c48d20f2611ab92ec34517a339a4fbc53875545beb5c33700933262f67b48b22ea311812d7b0cd4a169a4b19f497c0cd559c5b5f74e52410e30c187ec7 SHA512 40814910676a05d3d5a308a432c06ce9664b90724fe8c56c4f68f6eb939f35401f19dddb8c46006f44fa418e0f18b4a42b0ff78b5b07031f54e6b3c10c919e57
+DIST plasma-desktop-5.22.0.tar.xz 15736196 BLAKE2B 144336f1ab80d1b0c9f32925bc6f487583d454ac43c479fc4e4332eedfaeb9e29d43683fa007d74ce5d780a9e5d95eea4fc79cec16612d7e0af4c49d97ff60e2 SHA512 b2799e196079519e2e3da27d6d41f2b9f606a1e703d3edb1a6c16fb74fc5d2a7d9452872cb70a3f3e8f699fb7951a9f178370744fd9989e1624294401d83d3ba
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
-EBUILD plasma-desktop-5.20.5-r1.ebuild 4879 BLAKE2B a099ab12d2c22952694f9990180523bcd3d36c2f2166baa6d8fc78a6c81a9c69d48b3cbaecb1d96984ad629bffe16709ab193069fdb5f4f522691b993a8c14a8 SHA512 74bd8aa888856ca1ea599e5df140f4236db55a4e18f0e4a4a69119c549649822cb7ac28a40ea1a596d9b72427dba98852b17a5dabb7eced8e5472d537be3ebab
-EBUILD plasma-desktop-5.21.5.ebuild 5196 BLAKE2B 60c867601091f91d2f4fca44a30423d7701e9f41ec1527dbbee1a6ceac875699007ec370a05a6d051c9ad6f4f61cf1f4f55e5599dc50634d6876876ddecb853a SHA512 50a309c3ddd1c9ffb30e7f10caca7d68fbb373d0b102b2a9509c043e79070046113de086bedd92004ff22550dc1637ae38fe27afeeacaf404dd63cf864286349
+DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
+EBUILD plasma-desktop-5.21.5.ebuild 5193 BLAKE2B 831ede60054ade3be55b1a7420a4196c4145227502b4f1f8952b7c075bd780f61fc15f06c5627f72e69e75c7a67779770647679f20ee9801157d4473beebbba6 SHA512 906bef59a4f879bf572801ba54b400223dd5c04503add170f42c6961c8332422a1719877acadf7f9d592f61102102c88335764774ef0fc803b9f22b153921438
+EBUILD plasma-desktop-5.22.0.ebuild 5302 BLAKE2B 3343cbf031abf8e4a13178ed10bd8ea5ed5d18b73391eb7881e331fe0bfd75fcb0959bab0904e1de5383eccd2563fa073cb1e4fbd7ab59fd6bf47c802e26f23a SHA512 10940cbb98555c54ccb0d8d6425d36bcb8cfb8ec8d812a28cc1584bc50f97f800e77a6ce1df8613ac3d2e998643c8ef5365e69867dc43cab60a5700b9152c7bf
 MISC metadata.xml 738 BLAKE2B a846c98d05f6e305354ee0fa36d26df2b60c3db3ee348edc64bbd5d5ab3c8f542b573d9ab395607edf0bc83fb95095147dd52a05beebe8790e21f86a45eb6890 SHA512 659770ee7aac2145f99a512049200f1049474fb97b553dd9b54663f104253939d80b3f35a6efc206db3de834862f074aa2cfaae22e2651198f6b9a298adfe6a1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-compress-new-input-notifications.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-compress-new-input-notifications.patch
deleted file mode 100644
index 734ae0ef46cf..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-compress-new-input-notifications.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 199cad52f0599872e57a2fcb391a459e48146be0 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 31 Jan 2021 20:59:41 +0100
-Subject: [PATCH] Compress notifications about new mouse/keyboard.
-
-When resuming from suspend, I get 5 "new pointer" and 5 "new keyboard"
-events (on a laptop with USB mouse/keyboard, but also stuff like
-"Thinkpad Extra Buttons" adds more notifications than one would expect)
-
-KGlobalAccelImpl::x11MappingNotify is still called 15 times, but
-that's better than 145 times...
-
-"new pointer" notifications end up calling `kcminit mouse`, better
-also compress that.
----
- kcms/keyboard/xinput_helper.cpp | 30 +++++++++++++++++++++++++-----
- kcms/keyboard/xinput_helper.h   |  5 ++++-
- 2 files changed, 29 insertions(+), 6 deletions(-)
-
-diff --git a/kcms/keyboard/xinput_helper.cpp b/kcms/keyboard/xinput_helper.cpp
-index 14974ada7..bade5ea33 100644
---- a/kcms/keyboard/xinput_helper.cpp
-+++ b/kcms/keyboard/xinput_helper.cpp
-@@ -23,6 +23,7 @@
- #include <QCoreApplication>
- #include <QX11Info>
- #include <QDebug>
-+#include <QTimer>
- 
- #include <X11/X.h>
- #include <X11/Xlib.h>
-@@ -56,9 +57,21 @@ static const int DEVICE_POINTER = 2;
- XInputEventNotifier::XInputEventNotifier(QWidget* parent):
- 	XEventNotifier(), //TODO: destruct properly?
- 	xinputEventType(-1),
--	udevNotifier(nullptr)
-+	udevNotifier(nullptr),
-+	keyboardNotificationTimer(new QTimer(this)),
-+	mouseNotificationTimer(new QTimer(this))
- {
--  Q_UNUSED(parent)
-+	Q_UNUSED(parent)
-+
-+	// emit signal only once, even after X11 re-enables N keyboards after resuming from suspend
-+	keyboardNotificationTimer->setSingleShot(true);
-+	keyboardNotificationTimer->setInterval(500);
-+	connect(keyboardNotificationTimer, &QTimer::timeout, this, &XInputEventNotifier::newKeyboardDevice);
-+
-+	// same for mouse
-+	mouseNotificationTimer->setSingleShot(true);
-+	mouseNotificationTimer->setInterval(500);
-+	connect(mouseNotificationTimer, &QTimer::timeout, this, &XInputEventNotifier::newPointerDevice);
- }
- 
- void XInputEventNotifier::start()
-@@ -83,11 +96,18 @@ bool XInputEventNotifier::processOtherEvents(xcb_generic_event_t* event)
- {
- 	int newDeviceType = getNewDeviceEventType(event);
- 	if( newDeviceType == DEVICE_KEYBOARD ) {
--		emit(newKeyboardDevice());
-+		if (!keyboardNotificationTimer->isActive()) {
-+			keyboardNotificationTimer->start();
-+		}
- 	}
- 	else if( newDeviceType == DEVICE_POINTER ) {
--		emit(newPointerDevice());
--		emit(newKeyboardDevice());	// arghhh, looks like X resets xkb map even when only pointer device is connected
-+		if (!mouseNotificationTimer->isActive()) {
-+			mouseNotificationTimer->start();
-+		}
-+		// arghhh, looks like X resets xkb map even when only pointer device is connected
-+		if (!keyboardNotificationTimer->isActive()) {
-+			keyboardNotificationTimer->start();
-+		}
- 	}
- 	return true;
- }
-diff --git a/kcms/keyboard/xinput_helper.h b/kcms/keyboard/xinput_helper.h
-index e29fdc22a..52b6a12b4 100644
---- a/kcms/keyboard/xinput_helper.h
-+++ b/kcms/keyboard/xinput_helper.h
-@@ -25,13 +25,14 @@
- #include <X11/Xlib.h>
- #include <fixx11h.h>
- 
-+class QTimer;
- class UdevDeviceNotifier;
- 
- class XInputEventNotifier: public XEventNotifier {
- 	Q_OBJECT
- 
- public:
--	XInputEventNotifier(QWidget* parent=nullptr);
-+	explicit XInputEventNotifier(QWidget* parent=nullptr);
- 
- 	void start() override;
- 	void stop() override;
-@@ -51,6 +52,8 @@ private:
- 	int xinputEventType;
- 	Display* display;
- 	UdevDeviceNotifier *udevNotifier;
-+	QTimer* keyboardNotificationTimer;
-+	QTimer* mouseNotificationTimer;
- };
- 
- #endif /* XINPUT_HELPER_H_ */
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch
deleted file mode 100644
index a2bee27e83d3..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cfdaf8636830df3760bf370d48bd4be890ada709 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 31 Jan 2021 12:04:19 +0100
-Subject: [PATCH] kcm_keyboard: Cameras are not keyboards, don't setxkbmap when
- plugging a camera
-
----
- kcms/keyboard/xinput_helper.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/keyboard/xinput_helper.cpp b/kcms/keyboard/xinput_helper.cpp
-index 9cae43369..14974ada7 100644
---- a/kcms/keyboard/xinput_helper.cpp
-+++ b/kcms/keyboard/xinput_helper.cpp
-@@ -102,7 +102,8 @@ static bool isRealKeyboard(const char* deviceName)
- 	return strstr(deviceName, "Video Bus") == nullptr
- 		&& strstr(deviceName, "Sleep Button") == nullptr
- 		&& strstr(deviceName, "Power Button") == nullptr
--		&& strstr(deviceName, "WMI hotkeys") == nullptr;
-+		&& strstr(deviceName, "WMI hotkeys") == nullptr
-+		&& strstr(deviceName, "Camera") == nullptr;
- }
- 
- int XInputEventNotifier::getNewDeviceEventType(xcb_generic_event_t* event)
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
index 68705edda325..0e6950fd4a0f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.22.0.ebuild
index e4402b805d6d..25ff57464ff6 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.22.0.ebuild
@@ -5,22 +5,21 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-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
+inherit ecm kde.org optfeature
 
 DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-0"
+XORGHDRS="${PN}-override-include-dirs-1"
 SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
-BDEPEND="virtual/pkgconfig"
 COMMON_DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -45,6 +44,7 @@ COMMON_DEPEND="
 	>=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
@@ -95,6 +95,7 @@ COMMON_DEPEND="
 		kde-apps/kaccounts-integration:5
 		net-libs/accounts-qt
 	)
+	policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
 "
@@ -103,7 +104,6 @@ DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/kdeplasma-addons-5.15.80
 	!kde-plasma/user-manager
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -113,40 +113,51 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-plasma/oxygen-${PVCUT}:5
 	sys-apps/util-linux
 	x11-apps/setxkbmap
+	x11-misc/xdg-user-dirs
 	kaccounts? ( net-libs/signon-oauth2 )
 	policykit? ( sys-apps/accountsservice )
 "
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-	"${FILESDIR}/${P}-kcm_keyboard-no-setxkbmap-on-camera.patch"
-	"${FILESDIR}/${P}-compress-new-input-notifications.patch"
 )
 
 src_prepare() {
 	ecm_src_prepare
 
-	use policykit || cmake_run_in kcms cmake_comment_add_subdirectory users
+	if ! use policykit; then
+		ecm_punt_bogus_dep KF5 Wallet
+		cmake_run_in kcms cmake_comment_add_subdirectory users
+	fi
 
 	if ! use ibus; then
 		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
 			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
 	fi
+
+	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
+		cmake_comment_add_subdirectory emojier
+
+	# TODO: try to get a build switch upstreamed
+	if ! use scim; then
+		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
+	fi
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
+		-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
 		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
 		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
 		$(cmake_use_find_package kaccounts AccountsQt5)
 		$(cmake_use_find_package kaccounts KAccounts)
-		$(cmake_use_find_package scim SCIM)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
 	)
 	if ! use emoji && ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
+		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
 	fi
 
 	ecm_src_configure
@@ -163,3 +174,10 @@ src_test() {
 
 	ecm_src_test
 }
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "screen reader support" app-accessibility/orca
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index 7f720587a297..6765ef9f69d9 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-disks-5.20.5.tar.xz 64636 BLAKE2B 769c131e069861dc06a56ebf0e5f8aef9306ba10660228a8a1b0d6a240126556d18a8c5323255efaa237bbb116c6db2881047257e834597e112e79906d1b64ff SHA512 dd27cd4b612620de2a28001bfd3c95a3ec41fc8f96fb0421ad660885600b663df95315a8cd0710c0457f51633dff91cdefc75417b3751f9c21d50cc45fced9bd
 DIST plasma-disks-5.21.5.tar.xz 71428 BLAKE2B a5f2d27afa851f84874b05531d2f4a80b02f5c4238594fb7bffd3a364883aea777379c565621350a227d3680d87d4553dbec1f86dbdde12ff1f125cb5685ddf6 SHA512 b7057416b9ea692b70865122b4f4febb727c6a6dd72ffcd1cc23c9280ecba650b30c2e0002130ecceeb78b556c3e922c3ed83ec0e0d03163e01789cfb10d9426
-EBUILD plasma-disks-5.20.5.ebuild 1030 BLAKE2B 927fe7401594d9e5078d6349b599550e5a1151bdf34afb9c02ab6849a53bc868596d48973db1c025471013a7c1913d35465874f7bdef33a2c945da1815fa3991 SHA512 a32351344827faee19cf7dc2a83f28f956cb3ace3096c424c7c881ef68004b201df7d6cfdf9fde870870377d920f73b82edd44dc3918e7eb6d2010be0b7c8aae
-EBUILD plasma-disks-5.21.5.ebuild 1033 BLAKE2B 9bd04493a19a15c4cb228ee3cb6e8367d9c267496d16a6d4e9fe2a3987fd36e9ee6fb8f2549886a7472e3555bbbc7fab6cb26237cc06aa1d95875fb6b80c9bf9 SHA512 77074b67c227729ca999d1a03a041b4adcf2dabe86f9043b7becb737451f1cb284712a35c2175b250f62a673debb71019e197c89275c9ec252eabd3cac03d414
+DIST plasma-disks-5.22.0.tar.xz 83804 BLAKE2B 5cce491bd941ce977e4262ed075b4f5e32a90fdba0a8356dfd1a470a7cc81cfe568f5c611aae7701182081792a14dd68cc696b1243e614fbd24872f5e9483c6c SHA512 c8e4df1d87199936736f31b5e10985d7319fccefe24434d669746ca0f17fb7cc1c015f51bd5fbd115aab5ad275773020936e78c46e895ef15fdeec88d38e8012
+EBUILD plasma-disks-5.21.5.ebuild 1030 BLAKE2B 8cc8c2981c42e066d573b4c61b0d06d6340ca62a347cda39fc807f978d4ca210e84f98736483f37bc45a829155eb232504ef2acfa3a5cb066a5c95f7aeab5cdb SHA512 7ae7aa0277c169cc8c9d25aa66db2ef1f8a9dc6b6adc23079a1f0da337dcb0e7d5577fc4c50fad3dfcbc5228365a30402ca83904ff696aec4c5dbb99a133c608
+EBUILD plasma-disks-5.22.0.ebuild 1033 BLAKE2B 9bd04493a19a15c4cb228ee3cb6e8367d9c267496d16a6d4e9fe2a3987fd36e9ee6fb8f2549886a7472e3555bbbc7fab6cb26237cc06aa1d95875fb6b80c9bf9 SHA512 77074b67c227729ca999d1a03a041b4adcf2dabe86f9043b7becb737451f1cb284712a35c2175b250f62a673debb71019e197c89275c9ec252eabd3cac03d414
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild
index a48f543b9225..13c38f80b378 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.20.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.22.0.ebuild
index 3959d887a406..a48f543b9225 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.20.5.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.22.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 ECM_HANDBOOK="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure"
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index 4de1eff2dff6..e10f0c6fc81d 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-firewall-5.21.5.tar.xz 331812 BLAKE2B 43a026a198fb61480e90c5a5235de1abbb106e3f78d4a81fe919ec8c65c4f5ca30b340436b28369d8797d9ad1eac87fd0a4e39b5e3670f68150992e6007c4a76 SHA512 93d36b12025f1918892ad02e6b92dc8c44c27d2c6426a19fb77d8b258940a25295acd923b3957d45eb1715dae097097368b0456bf27273c217b79b441dec55fd
-EBUILD plasma-firewall-5.21.5.ebuild 1394 BLAKE2B 52d9a0ecea9b59234ce4abdf59b7aaa26bf438ab00c32b7385c77cc24bc0a73d467c76003c16fa2635a73dc36ef05d808501bebc00b084670098925a0353ae65 SHA512 3825593fdf8f5a3944fe21070612621030339258e97a67b7cd5188148a40ca99088b901ddf5275bd7eeae7bddcc056d010ce69c53c98e927d39405163c254ffe
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+DIST plasma-firewall-5.22.0.tar.xz 339052 BLAKE2B 24838f427471415a0083c093b3d76803435d8c4a60fdf5780119fbaf77ac7aef5c29a9b7ee806cfd9bfdd69c1d96c07bf58a0e75ff0a407fd1d4b6a5c0b7de29 SHA512 500324331383c9aff899dbf9c78ec76c5ca468b1a06603b30d72763b88ed8f538b1c9d4cbae1e8b5777d0b1073710806db81601637d80f0fbead1471724cc5f5
+EBUILD plasma-firewall-5.21.5.ebuild 1391 BLAKE2B b5120092b36428f2458f26417c2190faafa856bc31e25a4499aa97fea14593b8f4fb26211b97871a8a65ae5c519f64a28aa2eb2d378872a402fee0579fe5ebb1 SHA512 7b7500aba94ca646d473fd7b7b76b20675257d72dbeb252c7d2f3187f093d705d49d1890a20f9b2b2e3699b2058954d7986f28056d7df5f9c66a95e53e4855f0
+EBUILD plasma-firewall-5.22.0.ebuild 1586 BLAKE2B 928f0fa99d12b2423fecac00e9cd881711e3575bfd082b54b77b7542176d531b43c0dd908f08e237666e0ae996ae272a9d3b98b4f2f49c7a5684769be553d760 SHA512 0eef5567bd32c2cb1e543fa7686579849ddb4a0f022387119cd93603845f5b78f487dcc0a3ec440ce2ca1edbb44876998745a708733b02d41b17a701636f54db
+MISC metadata.xml 412 BLAKE2B 738cc0553aa14a9337e41a7870ab733a78a2509b70eb4ff02f9783a9b89dd6b46830b23134abe528ed3a9fcceac7e2fe6166a6849f0675834e475c53352bbf9d SHA512 b13e2e68e403a2dad70657aa92b9ea6899716f1d74da9f4b8878909e990e1bc60431d80670ff4ead837beb4c1128871f7b9f63bc9517d1feb0bc14172c896e9d
diff --git a/kde-plasma/plasma-firewall/metadata.xml b/kde-plasma/plasma-firewall/metadata.xml
index 2fdbf33d963d..5a8c9ddc2e43 100644
--- a/kde-plasma/plasma-firewall/metadata.xml
+++ b/kde-plasma/plasma-firewall/metadata.xml
@@ -5,4 +5,8 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="firewalld">Build <pkg>net-firewall/firewalld</pkg> backend</flag>
+		<flag name="ufw">Build <pkg>net-firewall/ufw</pkg> backend</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
index a417fdd8672a..e4adf22c451c 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.22.0.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.22.0.ebuild
new file mode 100644
index 000000000000..5cbc21bbb764
--- /dev/null
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.22.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Plasma frontend for Firewalld or UFW"
+HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="firewalld +ufw"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	firewalld? ( net-firewall/firewalld )
+	ufw? ( net-firewall/ufw )
+"
+
+src_prepare() {
+	ecm_src_prepare
+	# this kind of cmake magic doesn't work for us at all.
+	sed -e "1 s:^.*$:\#\!/usr/bin/env python3.8:" \
+		-i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FIREWALLD_BACKEND=$(usex firewalld)
+		-DBUILD_UFW_BACKEND=$(usex ufw)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	if ! has_version sys-apps/systemd; then
+		ewarn "${PN} is not functional without sys-apps/systemd at this point."
+		ewarn "See also: https://bugs.gentoo.org/778527"
+	fi
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 75e2d77c6238..cc537c993054 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-integration-5.20.5.tar.xz 59740 BLAKE2B 8c6e054db3047093556ac9549ebe28e6270001838f28eea92138f4acc02c79235f6c0ab8d82de764dae16efa81cc7ff7519736935bd77153612ee035f7abf337 SHA512 fa0806c756d394ab6f419252396f9d0a18652ed652adcb016dd2885f5238df843814f4661c63b193805834dcd43cb346f69ce33339520229c215d2ff45a24604
 DIST plasma-integration-5.21.5.tar.xz 60972 BLAKE2B 2122d64fa98dcd65936b18a5f8c09939680566770468817ab14d9116c92d226f234811952fd61222ca5e000fe213735c0da26ce73f3c5587cff4d61fcf88d902 SHA512 655fee4335569325431e9fb7d368bdf82b43f1e0e0f727f95f11f481a81e8dbdcdc43470c1768b9ab5701159ffaf571b551edc57510a653e1c7fedc1c4216d92
-EBUILD plasma-integration-5.20.5.ebuild 1235 BLAKE2B 194e3e91201852ac809135bbcb2ffe9c0a19a36bb580310af719d53c4edccb860be165917d484d283dde10a3134576887da66a9369690dd84c96496c1a0d3748 SHA512 e82e9265f293ff1a50bb8b02cc84c3fe46035cdccc8a5bb4970c29a5734e7dcf1fda1a5736a2320ddd178fb83e8ef14cf96c7503669fbf8eafd5863fec350e46
-EBUILD plasma-integration-5.21.5.ebuild 1238 BLAKE2B a774d3389d2e968807b00075e48846bff8eb61ab5c2eb746b65e09efbcf96206d0e4e4f9e9859a5301cf2ac248eaa2e1b389a3520c1c70ea814f006865e3963b SHA512 3216cb569143f1ca7f935218d0b420d26d549e0dc668946ab71d666f661ef00caccae8e85bcbf3773cfe5ec60a0c706f9b5134fdf44c176bf832a094c7d2130e
+DIST plasma-integration-5.22.0.tar.xz 65148 BLAKE2B e67304ac62c744bee30e7e1ef38bb65d652aa05719169ff0c034e3af1d8b3ab9f4580d5f78a2ee6bf958f0267b8cae916c094e840ae3b0915a3a8391636af034 SHA512 0383d3c014c294c31e2dac3ef299288a6c67aeaec3e3367784add413c38edb16c96552fe315a4b77ded516c9e8efe246ae49dd98ab42efa13476dcafffe91315
+EBUILD plasma-integration-5.21.5.ebuild 1235 BLAKE2B 5c31aee5c4c9974e5d8b2cdffa271c2644e634ff2e99d6842f114aab07289aebb60cf4c6bf1398c568a786c77dabd22d5614b27ce1f24fda19b157bd0033be74 SHA512 7b9f7a55405ce89b556d04b63519304faf175b6ce119f9747d6b1a3c71b63255300d165d65663fc82e9e6b067bd33a4aacd4dccb8261ab5e96f595f1e8da8966
+EBUILD plasma-integration-5.22.0.ebuild 1238 BLAKE2B a774d3389d2e968807b00075e48846bff8eb61ab5c2eb746b65e09efbcf96206d0e4e4f9e9859a5301cf2ac248eaa2e1b389a3520c1c70ea814f006865e3963b SHA512 3216cb569143f1ca7f935218d0b420d26d549e0dc668946ab71d666f661ef00caccae8e85bcbf3773cfe5ec60a0c706f9b5134fdf44c176bf832a094c7d2130e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild
index 02ab146b45d2..b4955ae97b26 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # requires running kde environment
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.20.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.22.0.ebuild
index cce645201cf3..02ab146b45d2 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.20.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.22.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-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
 
@@ -13,9 +13,12 @@ DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
+# requires running kde environment
+RESTRICT+=" test"
+
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
@@ -43,6 +46,3 @@ RDEPEND="${DEPEND}
 	media-fonts/hack
 	media-fonts/noto
 "
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index beb3d43665fe..ad28e704a01e 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD plasma-meta-5.20.5.ebuild 3646 BLAKE2B e0e2f932a40c719a31a3c083c92c79d0953106ccc5f062d1214f4c93f8fd598182fa9a41910db67f1d1cff9a15164a4167fc11640060b15c4d5f8baad8909f52 SHA512 a483608e1b05606a3b93189beda17e7dad428cf183d48b8425dbb2d69124637fe34d4ff5ef499a386a7b9418f983d4181744d4fd6b860e201c1478edc4956462
-EBUILD plasma-meta-5.21.5.ebuild 4043 BLAKE2B df884c5ab7d2f61e00228d7ecd1635e191953179cae6ed21eb930fdbe4e7a592435e9bd60da7b2886ec9120315335db48cbd1adac1788a9be676e83d91e0a3cb SHA512 8e870d2305d8d44360f58bc7ef1128df5552f8fe6aed808441366f8e387489acf82ee59e17a2c473755b1ba209bde135de388f25795e4853521e4aa8717ba5e7
+EBUILD plasma-meta-5.21.5.ebuild 4040 BLAKE2B 614877bb903d223fadc2c19963ccada9a350d65e705eba59f29b753e5bd7448f4fe66bd42e94432867403293cfd84062fce597721c4e7b16bb96c6ea6ef83dab SHA512 ec273d84d957bdbd8d641dac1594cb068bac1fa7600d41ed91bb726aa838ce41646e5ef770447258a2b7ff1c20116894f8394223152e859353fc2e2371259d15
+EBUILD plasma-meta-5.22.0.ebuild 4089 BLAKE2B b37bff3af6f404ec4ab2792387e2ce24cb19aebb04b402494fb8a8bc0038ec684db912c6b50d736ce86100baeddf38885dfc1a865af7a905a45f8c0085f405f9 SHA512 b100226f8ffae9f18fa1c733898fa5f7c9dbbf77f8b6705963a8cf9a39fb38eb487b315cbc76ed18624fdcfb10f34f1705b773020e505d326b6617ea06aaf269
 MISC metadata.xml 2311 BLAKE2B e7f8095b8d868028ffb9a6f0fb9795d2eea72b22e3b770ec08a2b75a463198c1e82242b39b413ffc794462fd2ea0324eec38f210867d22814ea005966ba1dcad SHA512 e680e2d8103eb6f65f186a77c57692f17483c2530029c8f4bd94816d87b73e1157f7310f60f8660b2e45fa048e783208df1b19cdd5711616f497d5ab16d3e7b5
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
index 240dc1de7b29..a3729a5e3d62 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
 +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
 +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.20.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.22.0.ebuild
index 1d16c73d033f..82a75b873114 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.20.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.22.0.ebuild
@@ -4,20 +4,20 @@
 EAPI=7
 
 DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://kde.org/plasma-desktop"
+HOMEPAGE="https://kde.org/plasma-desktop/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="bluetooth +browser-integration crypt +desktop-portal discover +display-manager
-+elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager
-plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
++desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
++kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk
++smart systemd thunderbolt +wallpapers"
 
 REQUIRED_USE="^^ ( elogind systemd )"
 
 RDEPEND="
 	>=kde-plasma/breeze-${PV}:${SLOT}
-	>=kde-plasma/drkonqi-${PV}:${SLOT}
 	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
 	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
 	>=kde-plasma/kdecoration-${PV}:${SLOT}
@@ -29,17 +29,19 @@ RDEPEND="
 	>=kde-plasma/kscreen-${PV}:${SLOT}
 	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
 	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
-	>=kde-plasma/ksysguard-${PV}:${SLOT}
+	>=kde-plasma/ksystemstats-${PV}:${SLOT}
 	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
 	>=kde-plasma/kwayland-server-${PV}:${SLOT}
 	>=kde-plasma/kwin-${PV}:${SLOT}
 	>=kde-plasma/kwrited-${PV}:${SLOT}
+	>=kde-plasma/layer-shell-qt-${PV}:${SLOT}
 	>=kde-plasma/libkscreen-${PV}:${SLOT}
 	>=kde-plasma/libksysguard-${PV}:${SLOT}
 	>=kde-plasma/milou-${PV}:${SLOT}
 	>=kde-plasma/oxygen-${PV}:${SLOT}
 	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
 	>=kde-plasma/plasma-integration-${PV}:${SLOT}
+	>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
 	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
 	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
 	>=kde-plasma/powerdevil-${PV}:${SLOT}
@@ -49,6 +51,8 @@ RDEPEND="
 	sys-fs/udisks:2[elogind?,systemd?]
 	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
 	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
+	colord? ( x11-misc/colord )
+	crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
 	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
 	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
 	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
@@ -59,6 +63,7 @@ RDEPEND="
 		)
 		!sddm? ( x11-misc/lightdm )
 	)
+	elogind? ( sys-auth/elogind[pam] )
 	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
 	gtk? (
 		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
@@ -80,9 +85,17 @@ RDEPEND="
 	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
 	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
 	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
+	systemd? (
+		sys-apps/systemd[pam]
+		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
+	)
 	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
 	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
 "
+# Optional runtime deps: kde-plasma/plasma-desktop
+RDEPEND="${RDEPEND}
+	accessibility? ( app-accessibility/orca )
+"
 
 pkg_postinst() {
 	has_version sys-auth/consolekit || return
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 5a985297a95a..f5b9dfba0636 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,7 @@
 AUX plasma-nm-5.21.5-missing-include.patch 930 BLAKE2B e73b80967df714f8b9a5afbddef8e5951d02c553b70d2b7a40f7162db5fdf2ab16930ceef649818fc3afa658989eb6caf6e0f4eb91476aa88581307545f1740e SHA512 2f67d123a5280303ddd8c904828da6c2b8aa6b8c6fb06853d55d47050255d154b5731703c70208802ced0e03ffdbe85d292636cb686f0f70777903c7c5bc1ed2
-DIST plasma-nm-5.20.5.tar.xz 865364 BLAKE2B 3a316674e9c9bbe7df09c34610f117bbacfa60515e93077103a7956aa1999cc8bef7e4e5add53d3ccb847557c7fadf17ab23d82e392e1b2822cecb9dc33598bb SHA512 6413dcbc6b8723384ecc6897331947343f399bedba6aff9148bc34485b54c5fd6a91b77d63390b0c398c8bcad8151de3f1746c71f3cfae9476632e2386ab6ff7
+AUX plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch 871 BLAKE2B 6d65acc1f5ec663529abba3ab69c9705b81553b229c73f535563fcc8c64331a880b600d892675e23f6517b72c02ae64550ca5b0fbf3eae13a43fbbdb06739a65 SHA512 9421f54bccc1e6c6489bf002331d0b4c1e8b3fe259baa14928596caec82652e3b5ba0cfab8ef640bbce4be7438e3c48963716c477f259bf8024c9deac0ad2f50
 DIST plasma-nm-5.21.5.tar.xz 902104 BLAKE2B 8b881f39e01b7de0107b897c81fffb7bfa429a0bd7d8eb58026328ac42c411d5dd8e154e843767098731174a492e64b6c8a28c8af474584862f58081d9a5e751 SHA512 ac074e50d5ee3be99bab515b02522e391b14936c1c8152ca067c7513af7a8e8b81cb55ab9b412ca703554f3e35fc9392368159c9872d8c372017089a4a65e3fa
-EBUILD plasma-nm-5.20.5.ebuild 2320 BLAKE2B aced27381cb8b277a01c3d4b3799cc51fc8936d867bc82112fe5511ac5cda11ef1a52bb76122974345c21449218d4185d461979a670898ccb3191903e683a7e7 SHA512 364e2fd1608293b335445c867a1f7b20d652127cb81fd6fd353f575058ab70271113765a09b99c7355662e63946aa205b4532b7a4b2a37d1cb6655956a7b48a0
-EBUILD plasma-nm-5.21.5.ebuild 2336 BLAKE2B dc9e3466e4fb1e67fa12af3139d14182e3b588a083417b1c1391b7cbddc4e8e87a25b2df69b54e63cd642a6754e77fa511068d780e7c45c9ff1e9d152a3509c2 SHA512 998385241a12e7f8e8b7e81885a4e433e574449d6ab07c47db847a273d161e2ebdb808ee6c7e88c695ad38463592d4cd9602819fef56c66ef6021366f55909f7
+DIST plasma-nm-5.22.0.tar.xz 899628 BLAKE2B 6b6f25a09d27ebf60ac8fb91191bbef258b857e0b4ecb0cb74b4ff9bd458350ac82b3d166f31a938058f09e9a0b2d5df245839d70cc9d6c3449df8e1d13dccc1 SHA512 5fea3c71bba5481b363abba0ced6a546a3384225f57166c4fcba9f370f89f3a3b0bb98320239e61733c496ed17230fa38b0bcaeae927206f113976467f116a43
+EBUILD plasma-nm-5.21.5.ebuild 2333 BLAKE2B 79c1df7a5e2f57323c73e9ea432093a05918f93956ad4ff3b13d308d04f62648ae8a34f8884fef890a786ba2183134eb4667e8e2ef979b51488bbadff4823b48 SHA512 04a6eb5b20bab5ee3372f2b0cc9d0ba21731119e70704ffc6cc6865af3ddef64621a69f49e25f0d01961511c9d4fde86e4501e35ebc4f612fbdd842051c6a7e1
+EBUILD plasma-nm-5.22.0.ebuild 2348 BLAKE2B 7357aa88f5f050c468eaecf1bb468944b34abe770c1f2c3c41afc8167ac1be1f9f9640d4106007021b791bd22107d1846633930f1fcb21684d1a0f7d6cef50f7 SHA512 be2e6494a282c5e20840c65a948ac4b1316e79c0f843e8b47711e1bc4e6d82eee90e93009d8f52df397b17c84f3f298e90b63f31a0119334cdc6ca8a011a44c8
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch
new file mode 100644
index 000000000000..133b3e225c54
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch
@@ -0,0 +1,30 @@
+From 55ab9bfd83fb74d14e26cc1a3d8f257bc47c45ea Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Sun, 6 Jun 2021 19:34:16 +0200
+Subject: [PATCH] Add missing QFile include
+
+Used since 40d056195bc400bc4e249cd152993000011687c2. I suppose it's
+implicitly pulled in some cases, but for me the build fails against
+Qt from KDE's patch collection with "libs/handler.cpp:704:5: error:
+'QFile' was not declared in this scope;".
+
+(cherry picked from commit 6cac88b61da1277dcb9a801e47f2d69829c68086)
+---
+ libs/handler.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libs/handler.cpp b/libs/handler.cpp
+index 470b0fc1..7c8302be 100644
+--- a/libs/handler.cpp
++++ b/libs/handler.cpp
+@@ -45,6 +45,7 @@
+ #include <QDBusError>
+ #include <QDBusMetaType>
+ #include <QDBusPendingReply>
++#include <QFile>
+ #include <QIcon>
+ 
+ #include <KNotification>
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
index a24d6cab271b..8e934494dfe4 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.20.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.22.0.ebuild
index 856dae591577..c33df322fdf5 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.20.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.22.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
@@ -30,7 +30,6 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
@@ -61,6 +60,8 @@ RDEPEND="${DEPEND}
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.2ff-missing-include.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 2c0b8c1b71bb..a2431125ff51 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-pa-5.20.5.tar.xz 114276 BLAKE2B c41d5093af494ab0eb17452098e47dc53b56256c98181a4f034df8662aafe51b3138fbb41ae7ba0b9d31e6595bf8871d93b6838f69cec30c0981690c4df85233 SHA512 8d01c79fd75e494f816049400a10929f427bf09d79ebddd73a125d4795722fea44319450c5f4d7d8627a03fca4a8f11405e267a87ca5e85016038fedc8131bda
 DIST plasma-pa-5.21.5.tar.xz 114508 BLAKE2B b33b5050e7de5dfd99e2f6b881d779e6e92fbd30c45fcd86b0ec65aec81d06b983789c4e617372b74604fcb51315e57e5f1978fcaa4cb9c6c45aeac94f4a2c85 SHA512 96a170b0ae90ff5a8015a532cde50e7a786452f9d04a30f7ee2402c9e7065ed1891e229f589bc79337ad68cd310c339840b10e7bb94551bab744ab7ae9a2ba40
-EBUILD plasma-pa-5.20.5.ebuild 913 BLAKE2B f18b9f14e13d6896ce77bb0d86c8bb131788fb23e4b14431c342b365f6c363ea9083a8ad94d1031e323812e98d5065b91988dcfaa459a7e3e9ed7efb3e4bd622 SHA512 99e8aca732b0813b6f1583a08cc66d2d0f6f1d9c99f8ce14564bebf0a8192caedc9b694de1600ab8db6a5fe0c8a5b6d11a7f30530db8825f3731775bada4e1a9
-EBUILD plasma-pa-5.21.5.ebuild 848 BLAKE2B 518c70fb3e7dee877f0f91a6290502acd27196f44f751f1619e3950edb65be199f695092285a686d8fa3522b56f601e95575cab65d20932561a6c0a9ee6cc4fe SHA512 52fd2d1cc94d145b5b5244f4551dcbdd9a7c0386dc3a60b83d5117418418a41e5dca85169f75b834419bc2976b34337382f5ea4ddbc76fd167e3f5f3f221ed2d
+DIST plasma-pa-5.22.0.tar.xz 127228 BLAKE2B 6966f0074187281474afd32c3ec3e528cab113cce1142a142d6da4f654362036d69dcfacd18b09c2d610b3fb126515283f4448e4c22d050ca9a9bb8eca0455d6 SHA512 4791943ea7d44c0798d6d87553a70f9a9d3f5cc9cca729ef07af15ba3dc0e908ce1de370dd347bea602207eccc06b43700c84e22b1894009711b79e9675182e1
+EBUILD plasma-pa-5.21.5.ebuild 845 BLAKE2B db67708d89753791f8823b47248693673e3629f0fb55baf03f3bf1e8db4c4472e99eba74fd8b218a4abdc0f34d2232da59929b3c6c6f63645333e528a87be845 SHA512 082f71d18ba742274f806794225a8b6ca090266d2b53fad041bbdba09dc6e537d3067ef8e96278d52861ab9a401c6a997ef44c3ea2d9b816550680f93407890c
+EBUILD plasma-pa-5.22.0.ebuild 848 BLAKE2B 518c70fb3e7dee877f0f91a6290502acd27196f44f751f1619e3950edb65be199f695092285a686d8fa3522b56f601e95575cab65d20932561a6c0a9ee6cc4fe SHA512 52fd2d1cc94d145b5b5244f4551dcbdd9a7c0386dc3a60b83d5117418418a41e5dca85169f75b834419bc2976b34337382f5ea4ddbc76fd167e3f5f3f221ed2d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild
index 5925ffbdeefd..c02937a9d845 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.20.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.22.0.ebuild
index f9d149a2ea29..5925ffbdeefd 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.20.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.22.0.ebuild
@@ -4,15 +4,15 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -33,8 +33,3 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	x11-themes/sound-theme-freedesktop
 "
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep Qt5 Widgets
-}
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index d5ec8ac91e4f..94c4f6d22057 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-sdk-5.20.5.tar.xz 266680 BLAKE2B e6ba310a3d089ee36a9098d9a58276cb8491a0c3016990e7643036ee905624c5f974b0d2e470047b59e5cc114a80e7426dbf1d0561bdf4fd26a218e47ade8ca8 SHA512 d10a5413835ab9ac4f1c521839f56b12862d87eed25c13d7ea70398bb892da7ab558bfc62fd2fe8451fc11ab9023d2e9a6e78c677bfa3e104c15f8e87ae1db77
 DIST plasma-sdk-5.21.5.tar.xz 270648 BLAKE2B 59e6d00cb24a392aa829bea8e0206c7f7867e8f5cdba4a6a2ab6f4f328dd83fb18d1f25c78a5b461d182e8705cdfc8f3141ea947eba6545c9dee0d159de3bece SHA512 83d27d9ffca15baba292bdf285f19a743589f5a4433c6fad8fd581a93a910be0ce98f3163c7d6872d6a95b71342e301de5ebf6ce2677fcdfb61b8e4644a0d80f
-EBUILD plasma-sdk-5.20.5.ebuild 1254 BLAKE2B cb559aa2ee0528a7eeb8e243b20fb5523815824f462c753710ddea96ad91fe209901c229364965afa5b9f642bf5e2d58f9f3574c1fa35baab1b3d6a554abd2b6 SHA512 049e651adceb62effd9bd377788eea05297b20647159ee8eff151d7accd0eb8ddbf769e6dddc2f2e3c411c39d58929f0d7a03cc76cc523e0449781b7854d91d9
-EBUILD plasma-sdk-5.21.5.ebuild 1257 BLAKE2B 24e8a128c62defc55ef8327158275a6b3888e39551e10d63521ea69bcfb52ca8740ad5bbcd1f1c83d03323f46780749d44dd3656fa4bd5f6ad1d7eda6be16ef1 SHA512 25c158cdd21d525af0dc6334cf3550463272786666a4ba44197101b48b3c7187a666be06be3f7af75acc58f1626d7377a9bb772a5a1c85de64b5cc152a43dad6
+DIST plasma-sdk-5.22.0.tar.xz 269456 BLAKE2B 448c91e7c0ed6a7ef6676ab8b586f35a26bbfc7a2e8a912b2fcca07ca9f63340953b9b9e4330310f86a96191e8f151d0af7ffefb34ace9c1ab7a403de8097e50 SHA512 84be9a4bab8ef0eb8a6e9445b1bc74c6d8d460b657b9b2f1260b2444e3f9f95de6044f097aa2fac4f31308168f1d0130bcb65acaf896fd849f4a6e248c6c7c3d
+EBUILD plasma-sdk-5.21.5.ebuild 1254 BLAKE2B e7aa53c5060bfba5172d6f7acd95ded4b5ece499f1c9682ba71ec06253144cb6c778360a2bbb40f41171ae2a1fc146fd3e208d66971f6ceef6c6e05e4137bd8b SHA512 3f24a166cf129d2cee91aa4037e5754ab8bd8a179f003bf4d3448154da56407133348095c390317f7bbd978369c1e0726ebeff94517c45afe8e573618fd14e9e
+EBUILD plasma-sdk-5.22.0.ebuild 1257 BLAKE2B 24e8a128c62defc55ef8327158275a6b3888e39551e10d63521ea69bcfb52ca8740ad5bbcd1f1c83d03323f46780749d44dd3656fa4bd5f6ad1d7eda6be16ef1 SHA512 25c158cdd21d525af0dc6334cf3550463272786666a4ba44197101b48b3c7187a666be06be3f7af75acc58f1626d7377a9bb772a5a1c85de64b5cc152a43dad6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild
index b63a63ef1036..b27038110e78 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Useful applications for Plasma development"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.20.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.22.0.ebuild
index dc70503d57f6..b63a63ef1036 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.20.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_TEST="optional"
-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
 
@@ -14,7 +14,7 @@ DESCRIPTION="Useful applications for Plasma development"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index cc286f42a0e2..205ed4c0c9b3 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-systemmonitor-5.20.0.tar.xz 105596 BLAKE2B 93a5feb8fba244580e65b55633d803e14051b476f3ee5fde617285c61a84be7b22c5c09f4a14e0e7b9b3c88a45868c9f8c5c72e8cfd4488add192e9e1ceeb594 SHA512 56c6a5fe4646aaa2fc76c30f28362252308516b06132501efeb9905097a5c895250076b09ef2bdb7a9f4ad77435c622bd4b3f1ad5b69116f6654b3046829f2a0
 DIST plasma-systemmonitor-5.21.5.tar.xz 124792 BLAKE2B 47c55bd7ceb31c7128676e539d7c48325db68b49bcbee0a4d73cd61ed1360500e7765ed2d5d01bde542bfb74e7b6db26158c6b281aa1e65a5ba450595117777a SHA512 f21db1dc9428b9f97b4b012ae481738f7aa96c9080f35870c8a8f2dfed582b937507fd626723dbd60e66656d78984bda24279c77548d65efd847e15374b024f0
-EBUILD plasma-systemmonitor-5.20.0-r1.ebuild 1201 BLAKE2B a1e49bd8b4106cbda357a6067cb8854ff3d2e0b81a3fa35f7d07552b20ff2e0bb9f98770d7109b34202d077e0fdcf6fd9bf0ebe00ad644dba20a0e7080aa8bdb SHA512 02a6ccb0e36661a502fd5e7547310b4c57ded67196b194281499af9278c80671478dfdbde001a8c8432b93c9f7d3fd1b4fae53b4c1f438afed4dcd8674bb0bd2
-EBUILD plasma-systemmonitor-5.21.5.ebuild 1162 BLAKE2B 89735d0c7115a3ec0d2ce485874dff7fa3faec32d634569081fd7e6bd39cf0ad432f072ce1ce0b8990d59ffa21379ec75ff29a179f9e54f30406fb908ab196d2 SHA512 3372e6cddfd2830d6ab636ce21affe3b03ec2c390bcf2c7f53f4ef13bbe5a0af78af580a57e7a0e2b53cc8b8656d24c2e196eee3ea14bf486ff349c891eee93b
+DIST plasma-systemmonitor-5.22.0.tar.xz 133812 BLAKE2B 23d6558c841f44f1fa4935c82834d52f59609cb87298678a7badee0bb162f6d96ad842aada6b35ec517ba0d81a12d1f9d8585378190668d2d37214aadd29b5b0 SHA512 e1a8995660b440fb9af4b18737e45df7cb91995b9cbd75e947649b93c9654b9d28d16341ee2e2ed9fc6fa8e9645dfcf1a4e0d54500fed13a6fc013ad992e3970
+EBUILD plasma-systemmonitor-5.21.5.ebuild 1159 BLAKE2B adc30ef18953aaf667f8c424450d57cb47deb43311696847e664b8201dc72a05cebb472f6108a528fc88c7f8d3168bf3c9fbd3217ae9257d0e5e3128b8ed6c45 SHA512 4b7101d5da1682a10664edd530573a19028510baa6ba9a82f31f5e87bc05a8a52dc069d4a603a119ba9d498c56b5912515390716d89e28fc8fadd05f0665c662
+EBUILD plasma-systemmonitor-5.22.0.ebuild 1192 BLAKE2B 097d3dc4a263828c66a85f20c253f304a2df0d32d78e16238738419bea47086f79a467f781040befff26d543881eace08375391a7618c1f33cbb189e852dd7b8 SHA512 6e124ac6a5aa180b794b5bc223f7431644415485acb18ca96fc24b19b61d293272ea5b21541176f390129b153571b45ba7e4f45618ed17c26d74ffbb876491c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.5.ebuild
index 9b428635ce8e..67759df28e46 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.5.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-systemmonitor"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0-r1.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.0.ebuild
index a7dd9a1198b9..58e0044c8293 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0-r1.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.0.ebuild
@@ -3,20 +3,17 @@
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
-DESCRIPTION="New version of KSysGuard built on top of the new KStats daemon and using QML"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-systemmonitor"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
+DESCRIPTION="Monitor system sensors, process information and other system resources"
+HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -31,13 +28,15 @@ DEPEND="
 	>=kde-frameworks/kglobalaccel-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PV}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
 	>=kde-frameworks/kquickcharts-${KFMIN}:5
+	>=kde-plasma/ksystemstats-${PVCUT}:5
 "
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 26d8fafa5ecc..4a96eea57723 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-thunderbolt-5.20.5.tar.xz 56824 BLAKE2B eb3289a0e9959cf291d1eed2d52597d9ffdc8993096ec0b1ba850720c726fe412ac43bfcf8f7b4c721d6a982ce1f127e323b420ec57da33dcd206438d9602ba7 SHA512 ce07bfd0733f6dda4429b77afbe699edb85e46cc31656ccb7a6cbf366fdba2720b4d92e4327edfdb164867873bbe7d21dd2da5e8764bb36e8b3c154ab8f3088e
 DIST plasma-thunderbolt-5.21.5.tar.xz 56556 BLAKE2B 9f80e1848693fccb15cb56f8d6ce89136efa1baa60dfd42498a49f59c9e688ea454aa52b40e8791999fb12dc540308bcdb855cd7462b79079a257a58a29004c8 SHA512 b627ee07e0fe308b70b11c2a887443b8eb3997cb9895a67f8d7760a4294bf36eb612ff888c981ba63a6485180ae7d1cee3d9c7c0bb741a3db3599a2650ba6843
-EBUILD plasma-thunderbolt-5.20.5.ebuild 890 BLAKE2B 45c2d0e5db8d5afcb07765774699b20deed7edc2c0ce65cc63e220023b887e47183dc34dc77c262e6ecc8320197111317918b5408e235762f66d35729ef13382 SHA512 62504d4a964d604279263fcf03d1d3f239357bad1725e680d0d4016886cec7fc65be18dd7aa522a17e4d816990b943b196dfd78e1013ef6fe245cb485aefa9b9
-EBUILD plasma-thunderbolt-5.21.5.ebuild 892 BLAKE2B ecb7c9805c89a7b283bad0878565644666a82fba73b92bb78091949a3ed7628ff16aaa48e9e9a945b61681572dd90d4da3c80a253be6027be9c11a95e1359e52 SHA512 48f301b3be53f70bb87d4bc34ee496fe03743d3956149cf1abb6b38e279e6de0d73ee7d2395d7d7685108e16fd475d96aa2cc1e59c6c31b5497c1aee017a6256
+DIST plasma-thunderbolt-5.22.0.tar.xz 64396 BLAKE2B ce3e7d3df0bcff333e1e48230d721419b60811d06dd658ee2358dea2ece26ac25d3c1b2ab44fd928a0c343b81ed314cc3712149dbb00527bec59f937b3553bd0 SHA512 33cb92c07a212eb4c20faf8d0caf6a39f73326173c6765820a28562ce76480f1dc876a7f9411357bdd9bad6c4f3259e6a56416ccd0690ea9bcb81aa84088fe51
+EBUILD plasma-thunderbolt-5.21.5.ebuild 890 BLAKE2B aea9c51bbd46e64cf892347f12ef69e949ec8c2374380ee6a4cb36aeaaf97a7ff0e8f11796d0f308fa45d49a622bbeeece5f14611b826e332f8b89cc99eae977 SHA512 5df2219a0225b546724d1d823b8015b78edc392ae8fcd517549d2a879e7fe662729180a9d1cb5db5ec3aacb9b6959ec1059cd755e3f77e548b1b0e96afeb841c
+EBUILD plasma-thunderbolt-5.22.0.ebuild 892 BLAKE2B ecb7c9805c89a7b283bad0878565644666a82fba73b92bb78091949a3ed7628ff16aaa48e9e9a945b61681572dd90d4da3c80a253be6027be9c11a95e1359e52 SHA512 48f301b3be53f70bb87d4bc34ee496fe03743d3956149cf1abb6b38e279e6de0d73ee7d2395d7d7685108e16fd475d96aa2cc1e59c6c31b5497c1aee017a6256
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild
index 952807b2c0bd..20215a7ab5da 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
 
 LICENSE="|| ( GPL-2 GPL-3+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # tests require DBus
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.0.ebuild
index 22fd773a72e7..952807b2c0bd 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.5.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
@@ -14,9 +14,12 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
 
 LICENSE="|| ( GPL-2 GPL-3+ )"
 SLOT="5"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+# tests require DBus
+RESTRICT+=" test"
+
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -33,6 +36,3 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	sys-apps/bolt
 "
-
-# tests require DBus
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index e70834ddb5cc..7f01e894e4c8 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-vault-5.20.5.tar.xz 159080 BLAKE2B 2aa427337eb69b016eef9d5849c465cc8f55a900cd35739a88c51f622ce01d5b4a8676442ba78fc0b555e09de7a31b3ed6499c85968f5178d3613b88a6d114fc SHA512 2e3d6b221fdf363763b732f2e0d82afc63aaa727bae8755940c6e53eecb9ad6526071162202a24c93065a3e80598b3c25a71255a2fe032c71a771e611bc80c9d
 DIST plasma-vault-5.21.5.tar.xz 160084 BLAKE2B a893a8cb9a3911eebb7cc1933f5bd6ee527a639e0ffaabfd9db864acc15962127e87abe3838a24311c65e87f2bd2320f788a731ee2145909e7d2605fccc9184f SHA512 bb3a4471e6a7cfc98eb4867142467cb009456c7643e87f274372e6d9d8cff1b97c6e70c1a3a51e21b72cc0d7a63a801f4681e3977339eac6a9ab108b13dc6d5c
-EBUILD plasma-vault-5.20.5.ebuild 1274 BLAKE2B d58ac0f5516afb9df2192abcc98f61fbc6f1b626e76723a3a963859e7acd6242b1c3a91e5879c34608c161a1d841b310f7aa52e669e4f1824cb803396ad4b7d7 SHA512 6c9dc99f2a4e04a382b91b822ffb2a363c8952ed111159b8e1da9703ef553e813574a3cdc89497e29706074f6709d90eabebd6d7525d20bbcf5c63bace02d8da
-EBUILD plasma-vault-5.21.5.ebuild 1277 BLAKE2B f268af5874174cf55c37060db377c89957c9e948ba7774f1b188d2655ad98d04646ed64e6f54e11d6104a89064396042fe7ac5f8b2b65e2a0ccbadcc23588fd9 SHA512 d235011265a3a6a09ef33a6361aac0b04f5aa735c186f3abedf15edafcb293ca20183f10e79fcd1c0a423d45bf5238184882df9abd28f03baa7b387a296d1de1
+DIST plasma-vault-5.22.0.tar.xz 170712 BLAKE2B 1c921f9792a050af0a8f9438d4056d49575c66dac02100cf9d93fe380db4d09e5951aafe0ccefb67022ae33a1e2e99ac1ccd2d2b95d2543c07f3eb108546bb97 SHA512 176090b62310683fd6b44edf9205858bf55cb6eef43f6c351db85dfed5601c15ef20fd760632c1217100a1c5cb7473ba90ebaf7de6b25ed884212ff0257e8cbe
+EBUILD plasma-vault-5.21.5.ebuild 1274 BLAKE2B 3685fcf92739494b5a31ef3b1e0394e3be7a3e1f0d76eb5a4444e9232f5db527ac1f2e1b6cb79ab75378402d9168d786cca3e88484f106e458fe0d23713c0fc2 SHA512 920e0e6472ee03d98ca9849f280b7dfb02d08eab24d5965664762e8b3a917d2e83440f81d1f0372572a484f735d7e2a5ca37cf039455d052e1167fd34e020d38
+EBUILD plasma-vault-5.22.0.ebuild 1277 BLAKE2B f268af5874174cf55c37060db377c89957c9e948ba7774f1b188d2655ad98d04646ed64e6f54e11d6104a89064396042fe7ac5f8b2b65e2a0ccbadcc23588fd9 SHA512 d235011265a3a6a09ef33a6361aac0b04f5aa735c186f3abedf15edafcb293ca20183f10e79fcd1c0a423d45bf5238184882df9abd28f03baa7b387a296d1de1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.21.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.21.5.ebuild
index 6487b75bfa37..bd0a97d39996 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.21.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.22.0.ebuild
index 3504bc63378c..6487b75bfa37 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.22.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Plasma applet and services for creating encrypted vaults"
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 957b869fa4bd..d1b8ecffe075 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-workspace-wallpapers-5.20.5.tar.xz 45932988 BLAKE2B f97004b26d967acf8dc4e24b9d5efeb99c56d69f640d03662162ecf9782c9e0343d99c5ba2813ebab9d9811a03ca37c6ad73ed420f0bb88a393a49e1dce69a76 SHA512 60719b4d963b8e8e4306c2ced7433aa8a009029de7f5fe5e1d4a1743a2554bbf5a64d572a839c2210a474a51e849c7a5bae74dd121f06ca80f076d85bc8eb8b0
 DIST plasma-workspace-wallpapers-5.21.5.tar.xz 48099464 BLAKE2B 1cf45627c00ebce5ac6960cbc1c773f4239398de247a2e29866de8daa53e7a9804b2185d148c3a8c507eac1c6a333c9c6a5472b37d26979029df3652e69913c0 SHA512 d0a7862b55238bafc106b654bd584cd6e2fbeead8d6694cc71df23e74a2da02c0b25b2f412514b45c1d2b04567e7758ef7d77b6fc5bd814b5f5bdee0c26926ca
-EBUILD plasma-workspace-wallpapers-5.20.5.ebuild 348 BLAKE2B c1e079d7883ab5f823645802a14b49636285ef2e3f4016f93ac898bd2506a447939922f5718c1952ebd1f44951dce635ea360c29f63bac5aff85cc18ea8994ae SHA512 f51435ffe85756594615cb8dfdf6e5986c94463521922ef0e36246adf96da0f2dfa1195372c26da325878bd32c873fbc95892c747c9cac133cf66582438d5a26
-EBUILD plasma-workspace-wallpapers-5.21.5.ebuild 351 BLAKE2B 478fad4796a3013a7341ba3cbb940094710b9c1a7b04f08b8dd3d1d00666204693e2ace866961502ed99c310c735bae867b740657bed355a17827153d87c0ae8 SHA512 94099de5a96a3bec754c5d76519a0b48180f23401619e86cbcc6b2ec615f1071b4a3921b90c6cd6b24c29466fde7938dc421dccd93f01435ab2353dc5d56eb46
+DIST plasma-workspace-wallpapers-5.22.0.tar.xz 48099464 BLAKE2B ff5bae588aee48ec16ce409ef870f44eb7c993bfcdee5119127ec8591d13266a950d15468d53a9bdec6d9f4b21461a4e09d7210d715b8183f2bbd9f599c8c8bd SHA512 494fe7220b961ea6223f1fe66a3c8305418b12da07b08b94de96be2528f08a67bc5e5114899ce86f8a4ef0ca22a4450852bf3e92850a4b1fac85c3986dd2f1f4
+EBUILD plasma-workspace-wallpapers-5.21.5.ebuild 348 BLAKE2B c1e079d7883ab5f823645802a14b49636285ef2e3f4016f93ac898bd2506a447939922f5718c1952ebd1f44951dce635ea360c29f63bac5aff85cc18ea8994ae SHA512 f51435ffe85756594615cb8dfdf6e5986c94463521922ef0e36246adf96da0f2dfa1195372c26da325878bd32c873fbc95892c747c9cac133cf66582438d5a26
+EBUILD plasma-workspace-wallpapers-5.22.0.ebuild 351 BLAKE2B 478fad4796a3013a7341ba3cbb940094710b9c1a7b04f08b8dd3d1d00666204693e2ace866961502ed99c310c735bae867b740657bed355a17827153d87c0ae8 SHA512 94099de5a96a3bec754c5d76519a0b48180f23401619e86cbcc6b2ec615f1071b4a3921b90c6cd6b24c29466fde7938dc421dccd93f01435ab2353dc5d56eb46
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.5.ebuild
index d290aa752bae..c46c7d6c1304 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.0.ebuild
index c46c7d6c1304..d290aa752bae 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
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"
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 1a4b67c6fb6d..5f7d67400c59 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
-DIST plymouth-kcm-5.20.5.tar.xz 43024 BLAKE2B d7a2a6a347484f27d73ade549da7cd338ca23f2e69543c8f2724222e3585fe0f49067ea94c1a70e8fdead16634e408fbf742aa798c5b594e0040b96eb54263ad SHA512 a150c77aad5cc663dd8f2d718ddf06472563782ff5d831bc3ade5b790cb8eb4a15890181c7587e5c74d73db0b2f05185b705ff1288c43b3940461aecc87b5e78
 DIST plymouth-kcm-5.21.5.tar.xz 43356 BLAKE2B 46130ebb6ce4a9522546d87f7f42d65cf41f1eb9dfc5a454732a55d8cf0b6b73bf5f2a9286f05aa21bce73218c10499de7953fe06f3ecbd369071fd9a70e2b0c SHA512 d8b8187ecce7bfdd2a3c22dec9b4ea2b085614a7e3b495671226bb9c5fe0a674d75ea03c74bfc3cc58f0ae3a7fc82ec2261d1ace5483658fd65333f61f95ba07
-EBUILD plymouth-kcm-5.20.5.ebuild 958 BLAKE2B 56cdda9d404624a30ac92f34adeda79496b7a934e9f0452e45ea728e453c9de5a911ca11d6d05c204fbbc2fde66636668fed7c7d88b2fdc1603ea9200da7d3f5 SHA512 f8939dc468cd8b68aaa391e81dcb7f7e8128a8d65eded3487315377186541d057526e73f6049a845969f27a8f39e68d012a81c4d357942e8ed231284001f8a54
-EBUILD plymouth-kcm-5.21.5.ebuild 961 BLAKE2B 576c672d0307524dab5a190aab180845d9d8d3dc89a9204a1703d5fe252d5f4e5a7607df7243e2025945080ab2e49733c69c11b6d986cdb2cdb5a036fdc90d08 SHA512 ed211012ebcffd563b72e0408f4d747ee5da2a50f07162064e1f0d4c1712f6dc21c08eb28cc84a2ffcbf23c2ce36383069ff7e391d584ad178e9420fe9c6de5b
+DIST plymouth-kcm-5.22.0.tar.xz 38284 BLAKE2B 63f198fb3f3e315aafd983b1d800e3eedf220adc688c0810a56555d8fc1edf9086127b1f3d7cd2fbe6cd54c953c4d84512e3e9c5044780b72abfe0c5a10666d3 SHA512 608ae68550cf7514a16d47c8a6564badca2b620182ec2a08490a596396899e25d2bc38c0181b0359c5281d35ea8f7e498c45d1d895e20dc7504b6c933a27f850
+EBUILD plymouth-kcm-5.21.5.ebuild 958 BLAKE2B 36635d101b5ad1fe414c917c504a432e88b6281f474b04b5a9e62152a244150d914b571105517987496035038ad1f92f9408c5cb15a541e06b3c90b2bf21f718 SHA512 4ab44b34b5b2b59d50518641dc48df4cae86395c2ca084a64dce87d9d33e159b9ada04339557fa6fd9b2ca2ae0e34aaa1f0d8421b9951ffe3d15535b01066ba2
+EBUILD plymouth-kcm-5.22.0.ebuild 930 BLAKE2B 7581d321ecfe302a94d8b9b56e2efeed1445c7c545fd3c88ac50df92fa2cec8c8b6dea948548963564f1f8836188cbe5794a61155ead81570c6dd6a062b421cc SHA512 84314c0309c859291ac921a9772860a26c523b592609046e9a3b8f1af4374aaf135c06e0f473d6d30864c5f4e57a008a6a355f0a8ccb5de7143a93d4ca2aeacb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.5.ebuild
index bf306e6bc990..2ffc9fbcaca3 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.0.ebuild
index 7fe46dfc20fe..5d62f9cdd9ab 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.0.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=7
 
-BOGUS=1
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma control module for Plymouth"
@@ -14,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -36,5 +35,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 5f2098269552..b0bdc66df875 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,5 @@
-DIST polkit-kde-agent-1-5.20.5.tar.xz 44792 BLAKE2B 41adcf417e8ce207b3f2a28f8c5a9b2e7c4da155290c55742529101319cf8ead12de22d59b4fe8bf7e67b6e6b48fc7b8afbf9655d58903d5fed3447e85bf7d2e SHA512 fcc06391ec8d8bb8a01d86ef1f8bdc45cb0ee5fef23429b5488a62497036ac6001a928d1920e92306b3ec77669ea73ab2f1071652cde12786e497fa48adf8328
 DIST polkit-kde-agent-1-5.21.5.tar.xz 45848 BLAKE2B 1776b97fc4ea6a5d4ff13b90b054379997226ea3726c94ff886ba719f5445c8548d0680c3634b7ecd3f6cc2e9e1d2416e8ec58e8b822e465cbbc0c2e719053c5 SHA512 840e63d962054e6be2204f0ca5142249338050a1d3df3db66667275ae3fb1930bd3d9f4ea37b85feee73b33822c8b34015028b981d7a100afeaab793f1525ea9
-EBUILD polkit-kde-agent-5.20.5.ebuild 797 BLAKE2B cf8202ed6dd97e164233f887d8361fed86fee23aa12038c10eab511e32ae2d12a1ff35cd782da84700a5480e8ea361892e609fc064cf049b2406fa07c1f64c0f SHA512 00c522ce0838c4fe3adfecd94a16f5bb0459e6fd987e9bb3d8e936000259b55a6e69ad54e75fb78cfebe80d268650a4d8784ff844cb4e8fce358f98fdc4ab85c
-EBUILD polkit-kde-agent-5.21.5.ebuild 800 BLAKE2B abb95b7bc181db092f98dc0cec508b0844b685d7161be8bbbed907aad9ed9ce68b5a2630b1cdcd87cf44f58863e53a0dc76deb178dfb46fe75dd80644253d078 SHA512 703772b00b37fd1ba801c64000574e4b9b476a48fb15b64dc8b8a1795f38d8042141d6e181b60412e625cf5479e939f53e432fa895d2e2c179e298a76ee3cb68
+DIST polkit-kde-agent-1-5.22.0.tar.xz 45812 BLAKE2B 9fa709ee0ce17dbf67f582dc62bfba15fe9478117f160c9c3a505592a3dac77a494039a0306fbbbcf558d0a4a295d31224241838295433cae3cd86b01ca6d500 SHA512 4c93eef0451d7e55c7eaee92c653f75f245426945e622227e78b22b550cf5524f0ac316ad914b4fc66a2e4e6db47d7f788f353ec1b1b8aa29e7c2e1bbe2b609e
+EBUILD polkit-kde-agent-5.21.5.ebuild 797 BLAKE2B d7cb522daab68684ae76a2b91c95cba2b4aa788a96c439513e17e465dd485e7f8b275ad7d6c2b39762efcd8f03c43fca48039f8c5b25da6a137bde11cbb156df SHA512 76b0f30794becc44fedf66707e76a8f117e015797350994a58fa4dd93747635c7080e900d4af3826190fa6f3641a4e8e9cc8ead4b3398e3209ed02af7abfdd00
+EBUILD polkit-kde-agent-5.22.0.ebuild 800 BLAKE2B abb95b7bc181db092f98dc0cec508b0844b685d7161be8bbbed907aad9ed9ce68b5a2630b1cdcd87cf44f58863e53a0dc76deb178dfb46fe75dd80644253d078 SHA512 703772b00b37fd1ba801c64000574e4b9b476a48fb15b64dc8b8a1795f38d8042141d6e181b60412e625cf5479e939f53e432fa895d2e2c179e298a76ee3cb68
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild
index 4d7c33a4a505..b8356bded94a 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.0.ebuild
index 1026cdfd32b4..4d7c33a4a505 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 KDE_ORG_NAME="${PN}-1"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="PolKit agent module for KDE Plasma"
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 6aa7f0fc5a7f..521c5c7bb493 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,5 @@
-DIST powerdevil-5.20.5.tar.xz 610300 BLAKE2B 9d392db560a7685a3cef29bf61ae553a8bc8e3d6e30e22ccc5316117d78d7087c35060e777912962ff421cb0f23481fa558cda59237254c7ce201da97031d89c SHA512 c862314d5ad446fb48c08f3e6cbcc72bad0f1825756954ae0d2bd1ceac55e3324124698d3d0803103ff35561bf4fcddaa00831b7b4cb93763d17876a348a3c6f
 DIST powerdevil-5.21.5.tar.xz 617468 BLAKE2B a67f409ea8e5a6c3353deb749db65f64bbf4e40d8ea84b6d8df6385e62bc1fce34552bfcc7dbe63f19161af59098173c0ad1854d3ab8ff30457e6b44985b2af2 SHA512 0d6b9cbd5cbf5cf3d34e3053f352d86586ed3672ddfae068531b899827d65b9e42c5ec0013f684deca501528590ec5074371fa7699aae4d6a20b120e319b625c
-EBUILD powerdevil-5.20.5.ebuild 1944 BLAKE2B c607dcdde420cefbd792c3da32155ddbe3d9135fad8651d030154e601696c5d17487e98ac1a566d6fcf36b2c81b2e93792580097c9843d8b49207d10a9c5c625 SHA512 9f856f88e9ffd80d1b0a3a2679d6fc07b03752d6039ab6279ce1ce3142a3d934ba8a57797f68338a6a5c6d103e5ed3c861606b31ec30f4c29107a369917d0c89
-EBUILD powerdevil-5.21.5.ebuild 1947 BLAKE2B dbd20cc6d03d7c2d79cdc0e2b5738f70685a5effc1a479a54f1251429095c8f2be3df348171c51b7ee8ef2b829952a0bb6bce0f5b6c8abdfdf7d4c0f9ff01919 SHA512 4c10a44569d9f55b4a1f9125f8e3612618dbb8802633a88b6ca5e4816d75ee46bde988fd4ca5d9f816410b2caf4a2f4887ad3cf54f3a95f59424c9e99d26ae9f
+DIST powerdevil-5.22.0.tar.xz 617684 BLAKE2B a6046119647c61c4f94e24e03db335e24e6f707d7221f37d881c849d7e10e361e337afe801bec293b6de983e79066c01c9056dc3f01bdd6d18accf090fab87d4 SHA512 02e2bbbb763b130a22dca307a580f7f68f0cef2fb0f9d57c8a877897b22d368165f28e9182ff9dc71259595f9c74cf5d030e1e701ec0431d3c567cac0c967803
+EBUILD powerdevil-5.21.5.ebuild 1944 BLAKE2B 1432032d37d0b87d73948241be37f027abea350cf7fddd46c2392b004b2ae02528af97e6bbb6d7e89e6a06579d1ddd3bc07168bbd937085db5e846c293d128af SHA512 5ed57a70af96c40b428804baf98abf573002f567e85dbb8ecc0571a83cb1e0e58424d86aeb6f3e8ef2fe03aa6d9f01ce3b3b39cca7da6390b21f635d8697b7e5
+EBUILD powerdevil-5.22.0.ebuild 1947 BLAKE2B dbd20cc6d03d7c2d79cdc0e2b5738f70685a5effc1a479a54f1251429095c8f2be3df348171c51b7ee8ef2b829952a0bb6bce0f5b6c8abdfdf7d4c0f9ff01919 SHA512 4c10a44569d9f55b4a1f9125f8e3612618dbb8802633a88b6ca5e4816d75ee46bde988fd4ca5d9f816410b2caf4a2f4887ad3cf54f3a95f59424c9e99d26ae9f
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.21.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.21.5.ebuild
index 4541c8b19d68..14d9ed14da68 100644
--- a/kde-plasma/powerdevil/powerdevil-5.21.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="brightness-control caps +wireless"
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/powerdevil-5.20.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.22.0.ebuild
index 052d374512d5..4541c8b19d68 100644
--- a/kde-plasma/powerdevil/powerdevil-5.20.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Power management for KDE Plasma Shell"
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="brightness-control caps +wireless"
 
 DEPEND="
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 36f709515876..caf8a418d981 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
-DIST sddm-kcm-5.20.5.tar.xz 64796 BLAKE2B dc2365a08f64ebf0709ceda56599e7a183c0fd2c7ba33a05efb5132438c2e92c9c8b7d5e775c305e5739d04e633dd15119939e352e5842572d06930d7ffe9ec3 SHA512 96511d979046bd97da1513be559312f851e63b3e319ee2f78ac83b275cf748e30ded430d3f6b9736da21e7710802dfed31ae23187888d367537e3642aed1769f
 DIST sddm-kcm-5.21.5.tar.xz 64672 BLAKE2B 4c8f3059a4d6fb57f517eb17008bf923c91ee8cd18385b117666ca294b5ebb912280281e7be624d9be803272a644ed4dd01ff3e8b6e358c9248d7daa0cee3f98 SHA512 fc2fdaf67c144cccc8d2f68cc20e50027c1a083d6b33d37e8c8e7fa703b2904c11b63fc9acca63422688013346f565c77a1f02721c7f8dfcaf52bc97c7b07dbb
-EBUILD sddm-kcm-5.20.5.ebuild 912 BLAKE2B 2725b43e1a871a9cfe473112129e2ede2c720561a25edc40781f7334ac3d897040935e648a9f4bbe702db72d37c627a6d26a997bad7d7951fad3fd1bda93f42f SHA512 e231cfd5380e8c39b057fb9e8a723aa5b1c411379a314721c2c257c6c8f3940907a1d3f11544186f61fcb0f93eb8bf10cdfcb90181d080ad92fb279d5f39c956
-EBUILD sddm-kcm-5.21.5.ebuild 1075 BLAKE2B 4cb971b1428dd4fa5bd193f3f9eca67e2dca68b1b0c655c80b50531b7a83b51a2368aa34ef72c51c24f3080eecf75962f609407ec7ece9cdf63d4dd0763a401d SHA512 619c591dc8565fd1cd50fae67312ef9e46d8d6a399b61c624f8ee246b7f886e06c84661a6e8c35da840a6fe993f93d75018c3fc094745b93ef0ff5959b218b49
+DIST sddm-kcm-5.22.0.tar.xz 64464 BLAKE2B 443c377cbb4250f59a05bf9a2f507183d2f8de706a81ee9a7d967620250fec2ede92a83262a2cf362cf0685a327010cbca3d654a3dc095911be20f884506ce6a SHA512 240e6182c9fd15fedad73542c86dd9d910c79042163de800ea4e63b923c8fa5607f1a632b75ca2624463060877e8147b92350789b8236a58a781b18566fed7b1
+EBUILD sddm-kcm-5.21.5.ebuild 1072 BLAKE2B f4d0f44a3d18bd4e12c9bc8fd624629747607eb1055331815c1fb0fafd4484af1f8f750492a68610f6ac2b622d3073d19e7031e70885e79f1218f07a6e123364 SHA512 72aeb29b7261016868675f9a7a4008a2ac07f3f680e87e19d2d751f3575f294bc3e40b856b57fd615b295a4fbf17668186468b03fb9a8709361ca104aee58e7a
+EBUILD sddm-kcm-5.22.0.ebuild 1075 BLAKE2B 4cb971b1428dd4fa5bd193f3f9eca67e2dca68b1b0c655c80b50531b7a83b51a2368aa34ef72c51c24f3080eecf75962f609407ec7ece9cdf63d4dd0763a401d SHA512 619c591dc8565fd1cd50fae67312ef9e46d8d6a399b61c624f8ee246b7f886e06c84661a6e8c35da840a6fe993f93d75018c3fc094745b93ef0ff5959b218b49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.21.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.21.5.ebuild
index bfb383decbbd..0a69fd203254 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.21.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.20.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.22.0.ebuild
index a9ac0a53cc13..bfb383decbbd 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.20.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.22.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma control module for SDDM"
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -22,6 +22,7 @@ DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -31,6 +32,9 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 	x11-misc/sddm
 "
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index c0c423940819..a32ab7ebb46a 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
-DIST systemsettings-5.20.5.tar.xz 193844 BLAKE2B ec81542b9bc06931eff60204f87e2d6aec8de57f97d57d4e057a8805bb4c1b02278c9fb12a9545bdb632d0896a6ec30833ef024e5b4232fe41baafce5af517dd SHA512 c68669f5a5d08ce52a9b0034d319f691a9419cb035ecd04895313e7c853cf6c01e72c8ee1fa15f92f7f22a9734d45b2373d9a4807d576783dfd7f5b5de14c994
 DIST systemsettings-5.21.5.tar.xz 199680 BLAKE2B a37300b6f3b53f5c62ffa5ff06581f1988720e87bbcb64f5c8048cdb99834b5aa37528c80615a07f8dc8f1e2bb246543479777e5c2b2c5499b1187ffca041b45 SHA512 fac4f4081583079b20c4935e694ef05908d0ef62938e4560cdf9a3119234fa3d0c13f973854b83535fde3594e713b0bfdbfbc0db36994a9a507c4063b714a410
-EBUILD systemsettings-5.20.5.ebuild 1671 BLAKE2B 09e31ef2f9b0e6b20f7ed985d0396df135e9d47ae26259c6f43d71012648163a1f9602d46ebd359bf178a86b0fbe26c5838116e789a7aaf6315fce06b763c23d SHA512 e93803ac517b58f655380c4ab69082ec7d2f800c9372f8c68ef9504c08c42f30ee82847c5b93216578b61aae3692c45aa8c187dc141e8a7ed608ac99aa8552e0
-EBUILD systemsettings-5.21.5.ebuild 1674 BLAKE2B a79b56617cf723493335a7b22090ba80f3036cb012d5a805cc4b123d59f18310318a47dd60f5153c1deb614f48d10cc525f1cbf31ef727e60f6d2b988101f93b SHA512 e08d27a3368cd3b6a3521e012dc17dfece402e7b9f5bda78a26735241d6ae877659f314cc1814ace2242de10e3684265992adc5a2b36609801bd6d6e3e0691a2
+DIST systemsettings-5.22.0.tar.xz 204604 BLAKE2B 483b9607fd658943b2c78b3729f8f14ce425dfb9610cfb7b0e8f5a62be6f5a89ad0d17e299654bfe835c2490e1e06dc2c96232060819fcc9c4f284bfd601d288 SHA512 30b9e0150508d6c15dda61814436cec0bd941f7a70614c890c1b275f3290e5f696db088a7d7715e42a97c9b7c98d9d23cde49e1aff14caede48d0e96186c4912
+EBUILD systemsettings-5.21.5.ebuild 1671 BLAKE2B 95d86adba6cfea80c54ebe2126d7323017412ca3a167b479814cc7b04d535b827fa1882b41f98e1357f868613f43ecc1e8f1fb265bcc2fdcec2054a69b2b1988 SHA512 24124ae30f11144a29c10a2da73da1edb3f48a099c6ede5b9b7e6c21af32896451333e774522ad328eeafeb1e928aa5a27604b96700a86341b7e13ded6a2ee43
+EBUILD systemsettings-5.22.0.ebuild 1674 BLAKE2B a79b56617cf723493335a7b22090ba80f3036cb012d5a805cc4b123d59f18310318a47dd60f5153c1deb614f48d10cc525f1cbf31ef727e60f6d2b988101f93b SHA512 e08d27a3368cd3b6a3521e012dc17dfece402e7b9f5bda78a26735241d6ae877659f314cc1814ace2242de10e3684265992adc5a2b36609801bd6d6e3e0691a2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.21.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.21.5.ebuild
index 0db6d4e59dad..f50aa78a2035 100644
--- a/kde-plasma/systemsettings/systemsettings-5.21.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.21.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/systemsettings-5.20.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.22.0.ebuild
index 63b5eaf0ceaf..0db6d4e59dad 100644
--- a/kde-plasma/systemsettings/systemsettings-5.20.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.22.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org optfeature
 
 DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 5f2909805479..eaeb27c39e95 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.20.5.tar.xz 81876 BLAKE2B 9a0a8052a7a7d9d0200723440176bef37ae6e29417ccea67b222096f0b65e3c371ad83071d93ab05ec6d7de377383e61c126da3775f31189ff1bdd3c4a947933 SHA512 618abd6182e561664b10bd751792622dd88f05932c88505e141ee143e475b228727d2daa509bf113906a97ffc507cbd11f51e15b729f2e55210d9c0000f742a1
 DIST xdg-desktop-portal-kde-5.21.5.tar.xz 82860 BLAKE2B 583dd6f5360282d3b86d73b65ab5ddd136b5f251ad3b41a977248c44f99ab7c407868a8238307184d3206b35c987adaaa8aa15df5abb2a8ecf2aa31b4591e6a6 SHA512 98fe44d4a00cb16f3e3ebd30b184e836dd77efafbca7625b555852b0dcd45c4ecf71ab5d93659e3d508f2b3b42696422516a08e2ae759bbe916fa5f9fef6010e
-EBUILD xdg-desktop-portal-kde-5.20.5.ebuild 1098 BLAKE2B 605dabf48ead7954293cbad4674f56b275c426875236d896b4824ce2c189fcde97ea5b34290b1f7712b77b3f39cd2edcdc88359f12e77d3802e32c33a96ad8e8 SHA512 88a0f4b23d16feb7386fd021c3d5cb193f56d05069c38dcfcce78e9aac888a54bbc7bdee64ee5c42931e933dcb80235e8347b47592198f69bbab0fddbe64af43
-EBUILD xdg-desktop-portal-kde-5.21.5.ebuild 1101 BLAKE2B c2859fd8c2246df5d5e62900aa8edd7def13d11fcbd177e9581c45a091020c1392261e594ebdcfad37c2eb2745423efd4ed617ef0301d9ec02a1bc8cdbfa9685 SHA512 09bc21be18330f16ff14b9366ec4225a43b339cb39bdd8b2a71c471e35e48ee19d181d129b4aaa4f0d89fd7fdaf7a637edc287c412a31e89735ef0f76f2172c8
+DIST xdg-desktop-portal-kde-5.22.0.tar.xz 87000 BLAKE2B d99ec70aa0958387786f3718a8333d36dadb7cb45cd771f7fede3e751bbc5d532ec8feb24e9543ced62afc947210524004745455a7af0a3869f5e49f600384e2 SHA512 9016790fc08d1e57e60dea0d0cbfe9e1226170d6b22b61f74904ca8123f43b7475512fd0a6feacf1705bfb3d5aab50c220e4e64120568ec898d7c7c0d2bf54ad
+EBUILD xdg-desktop-portal-kde-5.21.5.ebuild 1098 BLAKE2B 22981912d0c61cb667690b79e324dfef8c30f8a59c85039962490ff865ce0b39411a2800d356ca13a0156e98aa228125fc288707bc7b301d314f657d4f8e583b SHA512 34aaf74d6c49cc3062e7ab793ba49f45036b23661c0bcf0440ecf5eef2f6f5c63b1b2da7f6e79f21ca1c1af0ba12d0397f39af84cd2ef070191d4976f79399a4
+EBUILD xdg-desktop-portal-kde-5.22.0.ebuild 1101 BLAKE2B c2859fd8c2246df5d5e62900aa8edd7def13d11fcbd177e9581c45a091020c1392261e594ebdcfad37c2eb2745423efd4ed617ef0301d9ec02a1bc8cdbfa9685 SHA512 09bc21be18330f16ff14b9366ec4225a43b339cb39bdd8b2a71c471e35e48ee19d181d129b4aaa4f0d89fd7fdaf7a637edc287c412a31e89735ef0f76f2172c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild
index 8f474386d973..86cffcfd51c8 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.0.ebuild
index 826ade43e358..8f474386d973 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.0.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index ee200760e9a3..b03d73dd3b56 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,7 +1,7 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
 AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74c963e6af642c956b2907a2995335845d730b11ab09b81bf535edceecca2bbc7fa44552bc1659e5e59e95415470fe77a7bece759ba4a SHA512 8eb77b1a97715d549164cff12dd4d1b63af2d0f8bbcb447d47b4ec82f539e37dad5395e0a7f8fd5c700fc82e06569313a36cf1f7e6eca09ad6d18bb890dbb9fe
-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 xembed-sni-proxy-5.20.5.ebuild 1008 BLAKE2B ec20ad28545f19387f66e83b6b084581aa9cd9714dcc77d69de13b4ff691fbe7c7c94fdf2fe9632f5db3551f97a135eb4d6a0a6d922d114ed80cf31896ac84d8 SHA512 2af9311890058f23bd5dfda125b6d6585d1174e945af9c60d3870026a5a4de7f4aafc5df3fee0f3807ea6d9b225761740be0b16ca3e629ed8986695e5fbde680
-EBUILD xembed-sni-proxy-5.21.5.ebuild 1011 BLAKE2B 93394e2287665a6bf2331aba17eb2deef1c57235f0f7d65f01b60015e2bcd104174411c630051545b7f7382a10eaaded7b90367ded58c2a2a78466243f32cb1d SHA512 a6c0c2ae972bc269e3cb50ae3be577f1747df86879e8ad8853617ff5c602156f2c17be2818812a0d943c17fc6fb79221ad6d6870c29a2a08c4b94b75274ef0f9
+DIST plasma-workspace-5.22.0.tar.xz 8349176 BLAKE2B 61993be02589be83911c8eebcf1bb21dab7377b47bf011a9900791f6aaa5a3e59d545116ad0728afd6565763e6396d12c6e3992fc3ea55c8ab76cfb14e5b21c3 SHA512 fb57dde0ae5f774cb782ab305a526ce22404972197d531a2c5e6972eb6400d57b99a7ce397fd417c0c42c8de58f4c06d9e9771b64eb94f501987da910054f4af
+EBUILD xembed-sni-proxy-5.21.5.ebuild 1008 BLAKE2B b8d6e076b18f28c877f39013b0f75ff1ce02b9b20643d0d292a422628290db5d6c0136f22caa075896ca4e59da3880f5b87dc2e4e366495e9781e5aa534a247f SHA512 d4eeee9d46b74cea015db69bc37355a290cad657eb420c9b514a491f0231fe02ccfcbc917ac92269ff096caa298acfd0ddd78ffc3d0dd11d762dab3a2d08e8d6
+EBUILD xembed-sni-proxy-5.22.0.ebuild 1011 BLAKE2B 93394e2287665a6bf2331aba17eb2deef1c57235f0f7d65f01b60015e2bcd104174411c630051545b7f7382a10eaaded7b90367ded58c2a2a78466243f32cb1d SHA512 a6c0c2ae972bc269e3cb50ae3be577f1747df86879e8ad8853617ff5c602156f2c17be2818812a0d943c17fc6fb79221ad6d6870c29a2a08c4b94b75274ef0f9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.5.ebuild
index 7049a2e9643a..32e2b27fd79b 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sn
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.0.ebuild
index 4c36c2b98841..7049a2e9643a 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit cmake kde.org
 
 DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sn
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
@@ -33,7 +33,7 @@ RDEPEND="${DEPEND}
 
 S="${S}/${PN}"
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.20.80-standalone.patch" )
 
 src_prepare() {
 	cmake_src_prepare
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /kde-plasma
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)