107 files changed, 249 insertions, 188 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 4130b23ba079..adaa72a6def2 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index b7cfc5adf6b8..3e3427bd770c 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
 DIST bluedevil-5.21.5.tar.xz 162788 BLAKE2B 33961069c1997e564f9cb26dbc7b866abaed8e52d8f9b532769b017c8768f5602e821d04836198a0d2bec94f18ea57bba075e676869f3cec9c0087629885db37 SHA512 9d2f06e767551b159433e87c2e0c7180152fd881d78dce59abe8af9268780e916378b2e3b3dd385d782893a530aa54f0b178762c18169230caf3975a6798fc52
-DIST bluedevil-5.22.4.tar.xz 162860 BLAKE2B 7445e7a7f5b4a88acd14dd1206708e73a9f3574464bd445cade5b68944d97c38701c48cd9d883f88112ea49f22cda3c5f717dd36610bf25aefa71fa5c0d86bca SHA512 44e11f8834b9c1fec7c017d91ec2ceee76b7cd2c035d2c6db90d42c3f43a0f6476e8ae45df1ab44ee7bcc27512fb7785baa03d8fb2a920ecf4b676cb98e59586
+DIST bluedevil-5.22.5.tar.xz 162740 BLAKE2B 2561bc614083bb7548c752330588d46afe99c0a0e7c215c8079044b240dce6dda8894aecf67d9af6750a1dbef5259e4e508d672485fe9ede215259bdb41e9480 SHA512 bd92fb1bd55f29916a5e4818785e9be43f7eec01bb5ec9ac35ffe5a8e20ac11079261f46f96a7e60d2f6c5b9b1a06773de2bd525f796d4e0d651edc5056202ab
 EBUILD bluedevil-5.21.5-r1.ebuild 1111 BLAKE2B ce05fcd546105e93e08a5dc6dd85355af989752218a0fa0da860379a49e367c5a4f84f91244a2fc124eedca651d0ec5dbe86264dea8922f56bd319130adf8317 SHA512 74b6bd039671b3094dca77b13c366dfeefb0faa30e45333326512d921ecb4003bc9a6b60332b85cd1c2a14bacd5966328aaca22b188d99892a8ea1f154c41ba8
-EBUILD bluedevil-5.22.4.ebuild 1114 BLAKE2B 62075de061139b684027803dede5d45f7ffc5bb8534f2ce7d617360c83dd07b3b8f5e5b60c5a8c1e81b97cf2bf3f39a74badbf1ddb1ace44e4ec3242717d26de SHA512 22ae605e81bcc90b9fe4d498ad89ffd8facdb03e5009b4458128eeeffa81bea149a82213b8b9b63bd5252b37e25183259c83d88d53359a36e3ba1b484057b877
+EBUILD bluedevil-5.22.5.ebuild 1121 BLAKE2B d07cb4cfa723ffc24a1d456663201b95c271b39fa6a4ae38d2a6a24da3832b70f4cf4a94fae737fe223de88e1f6c318dfb235c062557904c7036629fa444f392 SHA512 cca1f051c6a247e11bd6ca636587050f636c8dcf82c01a0f88e96d9d17d514a5cf5db0ac17b59c623500484caac1ffe8a8ccf0298fb4327fe21301ab8e3bfbc0
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/bluedevil/bluedevil-5.22.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.22.5.ebuild
index abb2535daa5d..446790e4b540 100644
--- a/kde-plasma/bluedevil/bluedevil-5.22.4.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
@@ -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 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 2beda99742ed..a9ccc3f56543 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-grub-5.21.5.tar.xz 3143964 BLAKE2B 96f2e3bb69dafb1ab7e2f328af0f8336431a7085ffd6ac335c6a107cabe73696bda8bb580b2529f01d0c46172e65ae46831f98af0c3ee413b80959b8ea740621 SHA512 c2f16338ad330004c961a9fda6ed48d9670e956bd8562ad05b5f804e3c45ce05c243933028caedb2de981d9fa4f6d66a627aaeb04652fabddebd71fc09b08f5f
-DIST breeze-grub-5.22.4.tar.xz 3138332 BLAKE2B 4d7b39986e20267b4c1d8da46a82a6f2d3bd14b7331a86a13d2bba6938ba1a7bfc503d06157f7d5564e943e4cd475bdb9e0041adc5cfcd60164ed80b816d9337 SHA512 5a5c97fdd597a6fa9f91bc2f68d997a469542db00e2973c7958639ddb0db48223c270bcb776007b7b64efeafe42dbc57d863c1832926ea56396d9a1a027131e4
+DIST breeze-grub-5.22.5.tar.xz 3144508 BLAKE2B 6c26fd22a142d00c904396eb460a10dc39b4206c0937d83a5fcb1d617ea278e67fa6b8d6fc6a2d22c83061664dd1b842c68387a71c9c000ee8942431ec1d165e SHA512 09071d7256c0ce21c13e13803aadcf044af2ea54f69335c3d7cb773d2e45d71932de9e3d2f8e662b6d5ffead9a216e8c6f1a6c298fb99893d2a1ae27eccc74d2
 EBUILD breeze-grub-5.21.5.ebuild 401 BLAKE2B aea7a41c8088bf3f858366719857e1f6ab94258a132e42adf8fe38f0e89cb3d815916a3e6a9821077f1e0c36b9fe2e20159c27ee953be73c211e5ae9f48efeb2 SHA512 8f4eef2d928c524a6001a4693fa083eed4cad3e15a14eb3a37a4b33e34217c5d911439121bb9ef49bc39508a351c97306ac73f0fd557e8526b8eb8ebbd9facf3
-EBUILD breeze-grub-5.22.4.ebuild 404 BLAKE2B 371c8e22792752990a85c1d9b7017bed34d607e55bed1547e0f3a4729ff4d97804240c5fe53f48da2316519da052519f3a175e70c8d23c95292ebb692179cc6f SHA512 447a6adb952a7e43c6fd758404a71a40d30de6d3130808ca6518299b02cb1bf09c2a52f8f57d7d5c2a9d72f82820a912fc2f529d281361c7a02f4f40528d1061
+EBUILD breeze-grub-5.22.5.ebuild 404 BLAKE2B f56fac7bd9f2f4af79a51d606d0d646d81551530c3af69e13a98928afc8c6b14dc3ceb6dae3c4be4a2fe37f61e24c4ddab88fde0bb934593b10f94a7e124fb95 SHA512 70c16c418794b8531a329d6ee3c1c67ad46fa0421aada4e4f944530b777d06737bc3c7c099c5b75d178d9ca6d55418f91304b23f21772d0dddf28d6e2d661ab9
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.22.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.22.5.ebuild
index e7e9654ba6a5..e05a4cd33bed 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.22.4.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
 inherit kde.org
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 29d62ca8a60e..604d93fac8ef 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-gtk-5.21.5.tar.xz 47668 BLAKE2B 4f8d0980c359e9a9aaf8bc4728e8480315e35f426c8199982d2c0f34b62174736ea944689ab88af10c3431998b296049c4b7b64a115081184a3372e466881537 SHA512 afbd9348b2cfd55412df50ef4f2732d6f2fbd58356579766187ea79d20b86127b6e140caa14132edb940fb5d72b5da981869cdeca3abb1c17352782973bf0aae
-DIST breeze-gtk-5.22.4.tar.xz 47688 BLAKE2B 36bbd9e190649f311c3997a2eb3e1fcb460f76c959c0e0c249738b37a301f9c4a882441c31917e11bb9e4c2bbc1f38e00d3195c6afc4257083ddfeb9639a9986 SHA512 13576288f2c2d6d6dfe12c6f8e8c8a5eb27d3c306a398bfc514dcf96261e34a937b77fff7bd3543611d11130ca5800778ae640598745f00990031e340304f6c5
+DIST breeze-gtk-5.22.5.tar.xz 47424 BLAKE2B 0252cad49e10153c99bffdf6ee355057d023bd867b53b7ce9f67c72808a0425efe5a8ae845297f0c1f558d7e5c33299de417fac78589001a59f0b863669153a8 SHA512 91ae3512ce71f04a7694e439b763b99faf10ca43af1b68790ae6822b481e43a769254add15fab01d9b45a5306a50ea5d59493638df9d6ca526dd8c2d54126c9d
 EBUILD breeze-gtk-5.21.5.ebuild 790 BLAKE2B 80b432e2271aee44626fbf82f37a4224e6bfe185d5a40c8a520c885aa8217a751fc35938df2e586b47dc1fa436ff5f705acbaee8d1c2a85303bf4477404ec07a SHA512 d0fef1cab3a4be5fd0a0effa92e32e91bebb7e52b1b45ae18ada1bafb86e3d77c30e4f3dbe22ec9b1c86811ddc61a337b10ca0939060e15c33bde6fa5153f97b
-EBUILD breeze-gtk-5.22.4.ebuild 800 BLAKE2B 5f5ffb5a27b716cd63d2fb67c794dc8cea8c77452ac4b667d446ffc2e9c66436774d8ca454f005ed175b374e48989d381ebdb9aff6f6ae1de042f635fcbe367e SHA512 d4173b39e7ddad060265ff9b0023cd1203f272c19ad007f4b8b4765d566cdf663e556cec946ce8ec4c88679dbabde8cdd27b74531177de587a19885d0741c6d6
+EBUILD breeze-gtk-5.22.5.ebuild 800 BLAKE2B e68718ca68a5a8afeae3b0a4303981260120ae03a0210f4406875772922b11f8cdffbc51f55788a80a4344b21da1658b2035286992f9385f57e33e86c4b4be7a SHA512 c359e7b7e6fdf90cc9c92ea335d541a92fc4477339cdf0a70bb4e1a1b25e97a7f0cfdeecd0cf116b441404be8d9fa9a4bfabd8cde9d0f3945148ab5df950965f
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.22.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.22.5.ebuild
index ddc2437bd93d..3a25f86673fe 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.22.4.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
 PYTHON_COMPAT=( python3_{8..10} )
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index f7f40bb309de..2671d1b31226 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-plymouth-5.21.5.tar.xz 108692 BLAKE2B 7b98b1fa6f2793470c550336c3205cd7846e40fbbe3cb7bc895e67fb557868ec3e73fd5e14a0efd22b055a760a2636ed301810c60ea53d27a382bca89525ae18 SHA512 7b562a9b86baf4f362e3cd97722bbe3940be4232910e68ff1f029f2de5d1e362d930dde03a3adbed738bda559f9f6b5b812ae7e1451a145edc37e60b5af66285
-DIST breeze-plymouth-5.22.4.tar.xz 108764 BLAKE2B 9c48c04790fd580c1da4872990226f6b5998e1ed35cafc08cf7e509489a3c3d726e7a8dae85ba81313a264eb1086f312ba1886c7ee5ca3d8f2b758445ace7979 SHA512 e297e378de3db5c1eb409de2af558cd8c7713d6f887eb62bfbb17dc2e26f641a335231caf9d8b725cee0740bf233bf9803281e3bf1e93c3562626df1c0d8d702
+DIST breeze-plymouth-5.22.5.tar.xz 108704 BLAKE2B 278f87416c22b14fb9d770401ce2fba1dee963678a58c6127c42c8074eacf9191b9e35c3da6e63f6a5d1760ee2e68a25f54e3dd59b4c270b56a8fd43457bb9ea SHA512 be27a707952da3573562a04aa9fac4f31f7e125ad068aab9a216af51df7b53eea830fc3998113f9a9cebb7d9f915e00391c9012791e51d15482048d7eff3e016
 EBUILD breeze-plymouth-5.21.5.ebuild 515 BLAKE2B 762a0f8b7eaab8a20ad9788d25903df6835c8376edd5af92c386a79624acb6f5ff673b2384e78b831b05f2788a9e6c82963b091ad0d7e004237e457353b40c6d SHA512 1ad7b85267f2c05f9fd1b0e4f1804c997f64448fc92b8b195dd5c7a8f701457de312562abd1ac692921310dea26d516996c533194d146611bc51b8641a706d60
-EBUILD breeze-plymouth-5.22.4.ebuild 518 BLAKE2B 70b85edc94b2744ea490b6428d83a7bfbec913dd93cc17a4c55f695f2dfd640c29ce9d3bedb5dbad565e67ab3217f2fbdf2450ad8b8fafa61baa63bec042dcbc SHA512 29b50487fa92353159882e7d00f18817f84e7a5093fd7c65adabfc6463675149800d1182806ef821eb92adaf05378f653ff0c1ad3321d40c3e3813bbd78efe74
+EBUILD breeze-plymouth-5.22.5.ebuild 518 BLAKE2B 9cc598e116fb90abe752a93fb1a27eacbd99154b25651306769b3b61c9f45504a0c5d1fefd23b990129949ab8ebb0456a1a32813c34c7d4399b61775cee199f5 SHA512 69888a95f8ec7cc2688cbc40cf20be97f5435b9f6864fdadfe22707e7d209f1b061d606a2dd65acc2780cbc0bc12f04fc065dad13f2a52020d6a21296ca97350
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.5.ebuild
index b9ecc8176c56..c8247d0f5d2b 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.4.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 2077c14a1dd5..79556b2185a1 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.21.5.tar.xz 26286020 BLAKE2B 437666f0b509fa9d63f5ad04702831dc0ec4eedf763594c831d335b5b69a6b04052af6adc2c550b903c94a084b353d700d88cec47af537778afa31f7150e38b6 SHA512 5e449624543e2bd437bd4311e7ff091ffae33c4da34da2b9968f9551970b66350d337e6aee974f9e2cd82eff877a4ab5c6f52ec52d4f2724fe93b747f021e9eb
-DIST breeze-5.22.4.tar.xz 34548204 BLAKE2B 188a150493d73655a5faa7a0bac1a667b95566e1b0245fc15e700f2e9cf57e00ba67ddf14efe7d78d741a86afa527cf8625e025869a5a215272d59e1671adc39 SHA512 a429feeb22abd1fc79a3f27b096689755efa422a595ddbc5108435af26d7c275858127ccae164bba9e9bd0f3c83645cfea466de0c8d429d8e22a68bc25d1f068
+DIST breeze-5.22.5.tar.xz 34548108 BLAKE2B aa92a0ac1054043e3584bfa82d783d5798b54d29edbc953ed69731295b6e076cae31606f5262313f5dd9e2036c05f4609c43b1e064e8b2308e4e4d56ace21ee7 SHA512 b9cc95dfbc21097f289d5c463f788b51ecc9523e5361981241a08ee80028a5f72f9dba3fc019006ec934104323c9c0a4d80742ae60a12f3d00751f75cccac66d
 EBUILD breeze-5.21.5-r1.ebuild 1322 BLAKE2B efa9c3f9ad57d368c3256d5a506db91c9c68a5e50841aa23e9085ce59a9c51aaba4d9fa72f8b0cc8b02280e1b1dc7afdad3249bc5666c5640b0fb35ef897ac9f SHA512 b8ac6e723a12e554c848a9f55adb0a411fc0a1523074ab70b972f31030b4517792341759515ee1abfd6b81b3ee06146784b5e9bbdfb4491e91d55bf5d65388bd
-EBUILD breeze-5.22.4.ebuild 1275 BLAKE2B 39b321eeb2b690bc2e4817d0d2410d9ebd96bb5574915abec4f8d9064a3af4a7cbbb2d98e7f00742a72f851a26c9f6c1ed89be793163bfb36446da381559be0c SHA512 38b13348aa0bf2d94a982a8cbf464992377ece961dccc28202608334fcfdef02f95cb041acf82bb8baf2c0afaed5301158ea7fe8522edbfaf37b5b4ec9817c64
+EBUILD breeze-5.22.5.ebuild 1275 BLAKE2B 51b39f0084c0ac6ae6fe68ebd00734ede91dc453f18e8a79194422f6e875711072f201cca10bf1165421792ae24be9c9cd67b6403a4f98c5a8401972903a431e SHA512 c407ce7b3775abb2b1a7d236ce790c0130379be0b73e2b1da8ad01ef5fdaa9aa340c05d1a3e0ed82c35fe1ff32af0c71f0b581f6d414f47ad3fef40588880dd1
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/breeze/breeze-5.22.4.ebuild b/kde-plasma/breeze/breeze-5.22.5.ebuild
index 73352641bdf4..968d1fdc77d2 100644
--- a/kde-plasma/breeze/breeze-5.22.4.ebuild
+++ b/kde-plasma/breeze/breeze-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 5323a765e00f..ba6eb374add7 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,6 +1,7 @@
 AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d
+AUX discover-5.22.5-no-updates-kcm.patch 925 BLAKE2B d1f5c52c3d9b47ae108712aad1e55621ae5be9d1ad5e97e3d907d0003e6c59b5296abaf1a79a05865598e71156e1fedbc5eb843c1f8a4f9058dfe2d4fd81b29f SHA512 03d1899af2c61465f9d8da050c55b35620c1624bc1fa89970fd73a490aaaa5d1e957b38cf0678a914598ddecf76dd762c1aa614a21db5ced10c06e50c8f5dfd8
 DIST discover-5.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf
-DIST discover-5.22.4.tar.xz 8459460 BLAKE2B caa7dea7884a2822888b0faa4bc33339f441aed19a947da49fa71f6a6cccc322925b330169628208ada6910f91a777023a3cd56344d8984652f5b8106882edcf SHA512 3045ba5b4260c3098eb6d536de3598e78df8f31e26667a2b2b4c1588d8cd920586bc18a642dbfb91e3a36e527e2c34756e83fd567df29f2e31bf04fe566eada6
+DIST discover-5.22.5.tar.xz 8462332 BLAKE2B bf5cadfa928afd81fc8bbd5c1b7c7e3251874ca384fc28fa1e0bad7ea0feca996d1b0c2378e2e1561a0462bdb6e15b4764d3d9a43f44b808b7e5be9b43608465 SHA512 7c4e5c17897dfabe306cdf5a2a7fa02639658a59e06b3623fdc1cd0f6b394a0861511016318e8cf62606261d102e0555b240e0b708b1870f8cdae96553cef912
 EBUILD discover-5.21.5.ebuild 2217 BLAKE2B d6f0facf92e314fd59f5dd10422d0c065d9103ccfa0e3a78c1a9a7d39a00eb5bf31ab5d1855edd0e225a4d09ad387a9d37cd296702d21ea8b293da5ac9b8cd94 SHA512 c1e6c91410e560705e1be62818bbef63016bf879df5c8792be4f95451dd2c173016cb029c82bb75a801dba190120e6940c439db7d801294ea6cf0de16afd7158
-EBUILD discover-5.22.4.ebuild 2280 BLAKE2B d3c71d672b0930c5cfc30f91237cc67e69ba548a4e06f8cda39f3e259a01226b3a86c7b83b488202e449cc6ca6511f07188cd11cc3c04b8faa51cf85271fda74 SHA512 b9688d085f55d338cd51e6196f6199fa51a50dc8d3b1b3d599655c76d2e6aaa8cacffe85e49ac20c00fbde72a373674432eeb3b8e97410d8e287b6114e0ba88b
+EBUILD discover-5.22.5.ebuild 2347 BLAKE2B 5266eb2446071420557738c916c1fd0ffb0c9ac2b8e2db6c3cc26797384481220435f56a7e5305300d937f88ed01e24f0b4bb078b6c75c8c7b936c7f2ab3f776 SHA512 96e1e18671e68109f37906e20e018f89c5a132340574c460f497ae5854210613daf1cc9ae8655386216a568333586e9de18148a536a00e6256732f798a6168f3
 MISC metadata.xml 536 BLAKE2B 20850eeb588c1fc58274a9c8ea680c7bbc77948719fd543e45c227ad327f381ea2554d0145975537f14c0039603fa723a4c3fe30612cbc04ca598ccc436817fd SHA512 1004127dac27d477b091b145abefb1b8e97be36c5b082c8ed036498e9dbe154c4baa91ca0a0122f1f9a3942e84f057cfa3dbdcbed974aaef4c5cda4bf48cc34e
diff --git a/kde-plasma/discover/discover-5.22.4.ebuild b/kde-plasma/discover/discover-5.22.5.ebuild
index 0061af9f0caa..b3d6a84e5b58 100644
--- a/kde-plasma/discover/discover-5.22.4.ebuild
+++ b/kde-plasma/discover/discover-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
 KFMIN=5.82.0
@@ -56,7 +56,10 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.21.90-tests-optional.patch"
+	"${FILESDIR}/${PN}-5.22.5-no-updates-kcm.patch"
+)
 
 src_prepare() {
 	ecm_src_prepare
@@ -68,6 +71,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
+		-DWITH_KCM=OFF
 		-DBUILD_FlatpakBackend=$(usex flatpak)
 		$(cmake_use_find_package flatpak AppStreamQt)
 		-DBUILD_FwupdBackend=$(usex firmware)
diff --git a/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch b/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch
new file mode 100644
index 000000000000..e2c21ac1b997
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch
@@ -0,0 +1,30 @@
+From 725ae1f2b9d4a8995881faafb323c541ff6d3c1b Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Thu, 1 Jul 2021 22:24:40 +0200
+Subject: [PATCH] Make building updates KCM optional
+
+Some distros (such as Arch) don't support offline updates or automatic updates, so the options in the KCM are misleading and can cause unexpected behavior.
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fa27fc77a..26387b2f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,7 +53,11 @@ add_subdirectory(libdiscover)
+ add_subdirectory(discover)
+ add_subdirectory(exporter)
+ add_subdirectory(update)
+-add_subdirectory(kcm)
++
++option(WITH_KCM "Build and install the updates KCM" ON)
++if(WITH_KCM)
++    add_subdirectory(kcm)
++endif()
+ 
+ option(WITH_NOTIFIER "Build and install the notifier plasmoid" ON)
+ if(WITH_NOTIFIER)
+-- 
+GitLab
+
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 68e6fababba1..27dfcae2d09f 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,6 +1,6 @@
 AUX drkonqi-5.22.3-unused-dep.patch 954 BLAKE2B 8daf7abdd007f0c4ba8adc1173dc314c17bc0144aaa494076d1a031bb1de87ef33da9d9d322fd63582cd1b917383295479fdd3547ce1b1651a9f36b56ca5d0da SHA512 8b26d70986ef5cceb7abf83c36a12d3b17158d87fa3b16ac6814c17b0afbc6258dc4aebe9a630f6724ada6f41a9d3f5029cb558966b6dc01f833a91ce36ef7b4
 DIST drkonqi-5.21.5.tar.xz 774268 BLAKE2B ce58e47915577ac1eeca0c01619a3ef6c237a01c5273ae979409c004b3dc8e453855644d85165f0d5d8dabdc82dea70413b58620b4cc0b91824253b4275679c0 SHA512 ce24e52cff81cf2b9cf685dcce183cdce99110a1469d156726ca5c64e64dee6f064fe4750729619b6b455bc4e28792f92ec305c0f957f994c4e5a0aaa337f649
-DIST drkonqi-5.22.4.tar.xz 781472 BLAKE2B dd6ada5171fd7d06edfb8df7a39e5b09e7f97b1c5427a90f1d11560e2011df8ea372e79a7f921d3221f2ff6eb88320e3113a8eb39b81544a8c1e1c9a4642e916 SHA512 8e47818520bada519711ede7604815510a51fd7978a50d6b1e5a211f0a3c27c04ebe0cee2fbd51b324d537e2f10e06c668e196066117878098823084f6ed1f6d
+DIST drkonqi-5.22.5.tar.xz 780496 BLAKE2B 2c9e6dc22070027d8c7864e4b6e74540bbeb09affaab491c1effcf47000edd6cce0cc454ea00c2ff006a7f871ab975c88da1d2416705b6e6e73ca1c3c1e5c9cc SHA512 a37679bc7d365fe194ba80d1254631aba3cd5811c2a4b97c1327f7f5e91f2e095b83b326f1a4dd0a85976e98f7392ae78db03ee383cea10d37ab5a0a25a3cb48
 EBUILD drkonqi-5.21.5-r1.ebuild 1514 BLAKE2B 39dff8afc6e052f17418f44e4cede324d7795855076e60e5c1a78d336b5ddc6b33df4c2fc62a0304f697c4de1de4ac49605b47d7e3203cb2a6aae1e9152aa14c SHA512 49af648e2f8282e8184f2b9f5b97ba3daaf2ac937d413e98726949bff857f22062f0c2f9947057098bd6d51416fafede67bad538637a9bdb6baedd1df8cab1a6
-EBUILD drkonqi-5.22.4.ebuild 1395 BLAKE2B 3254e1b8161fed33d6a36c143bc517903a1b88b020078928133aee2bd7527f17152fd14e92c4b25c25d8b7f7d73cf77d4abf956b2abffd93df9b40514e8de74f SHA512 a2f0a5325135a91cc724cb550c872c684a5bba59be0b162cde6274a44b81df0d43172615e4fbd5433ae36de4bab583f100f4742bd0e60baf4cf853b9d3814392
+EBUILD drkonqi-5.22.5.ebuild 1395 BLAKE2B 8e8a33fefcf06f8c884764faa21e691c63737b357ae5093ac686e0717f5b1a5bf7fee9a2421eea33ac1e71710dc33ef4df1a669ace69a56edb2bf028db698ae9 SHA512 30b088f86a797e32d11917c78dbb57292446aec01da45ae1e93bb95c23e63db263c293755b99f989af7e745eb2d5c6e1025af7662cadb84b7b2f1497e14d23d5
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/drkonqi/drkonqi-5.22.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.22.5.ebuild
index 8b64c1c4b4f5..ef254a76b9fe 100644
--- a/kde-plasma/drkonqi/drkonqi-5.22.4.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index ed50b144a526..c1b4d113e3c6 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.21.5.tar.xz 99760 BLAKE2B ffc9499fdd2942813cf35697cab0b2813c87614db3d72312329690dfb9a06fd8abef283e7e73cf1485d2bc430e5e0a82fc81688702750fe47494d957623cd069 SHA512 097c18f39d5024a05e645e7dcf82ad39df07afb0ad0b010410699e3fa1261002f05553dbc049af63e7882c305d4c2c20d5032e9448354de7c22d9b9371a8c633
-DIST kactivitymanagerd-5.22.4.tar.xz 103128 BLAKE2B b6bbb761fbfdcc09f65f714b9ca51aa1f3d5e0f39ff24b53e4b6a0952729f9d3c90f60237ba8b8a821e23b88da410037a2738108d067671904b79abd232183de SHA512 3b792abdefa7f8476b090dd42b91bf3afb90c28bc99f85e0b5af3838cef79e9341e86d04d18a3721a404153883ecb49907db985b7078ce87f0fbcb883c1df16d
+DIST kactivitymanagerd-5.22.5.tar.xz 103668 BLAKE2B 5fb63f387dcbf45f3e7be7818932844639dca88120096dbccb3629dfc823556cae29f4fa1c0ae9795e233ea2e56edb921284dd54f2117275691bee735ff716ec SHA512 00f5a071fbfb7dc4bd2dfea3c811f359a416310385a2d1e107ba8b7bce8449676c39ebd6cd02f2cc22776fde3f2d0ff9d6ff635bd0a3c408a0ee17e31bfb02b0
 EBUILD kactivitymanagerd-5.21.5.ebuild 909 BLAKE2B 9fe2dcef2f797cec69d5fa6ab3735d88c88c4baedc5102968dbee76473f500b1f8adf0b28ae6ae8aeb399d8b98cc840fafe06126c624f5c9d04bbdda03f06bd2 SHA512 ecc51340c8c4c2b8a9243c7db2751cc1603efd587776b71ac7a7b9325991535e1e6c8eda4cb5ba95c2e01c7b1217d56e17b6bfaae78852d79e51c164de2bc714
-EBUILD kactivitymanagerd-5.22.4.ebuild 919 BLAKE2B f3c998cc86ea33f2f44fd12501682256f2bd4a137e4e19d97ad2291c8eb3b969feac8609714b23188403a1e9ba8201cabc62719b8b00f950b2a1a3063e9b2da7 SHA512 145c4c0db69063f22dc1eff259d764d31b8cb67468500c715249d5dbabc1451317ce8b14f3604c664ce97ab64948f4caf4de2871a852c937446bc7f9e5ba43bb
+EBUILD kactivitymanagerd-5.22.5.ebuild 919 BLAKE2B 28fe38545ad8e18cd8ce5e5af62d2c5096c61049430452f9a27c11222da6b56e0424b49d4f735f46e134740ecbf10f3bcccc20ffa41f1fe7f18d975d7ccb0daf SHA512 d9df2d80ed5850b35d5742e808b03c77b08b59cfc0bbc99d7d1831b75108c4de5339ae51aae0cc66ddda99995961e99f5072e936748a55b16fed07c2732b4df2
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.5.ebuild
index 47b79eb97043..9b9f57668fa2 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.4.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 3a3f6aafa727..a8579edb2e1d 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.21.5.tar.xz 610864 BLAKE2B 5f4fbbc100d8f7baec9353f9540dafe9427cf0b01736f055aaecfed48b3e31e1fa2d0a70b90cc99f30d3df33e1bbade888781b1e2ce95e925d871ae44a9b33bd SHA512 20859f88044c6af84ba4b666b803a6a3a4fbe33748495d9c186fc0739e7b5464b234166cef4d03f0dd44540919eca4f3ea8a1f5ac7b54d480cc9dadeaa0ec3fc
-DIST kde-cli-tools-5.22.4.tar.xz 626520 BLAKE2B 70a7c21b83ec7cafe5c31ce9416309670879ea369c3fc5053167dfe62807b7a3c2352e840553902106de927f78e21ec9999f51887aa2412a9f8b6a432a39f7ce SHA512 8ef2852eb15d8d22c6f6ad3ba8f68b6df472d5641c5c2a9ce4227848c4439d0d37012122d301dd65b87b56c5420e761510be235a67fff22383b487289631f944
+DIST kde-cli-tools-5.22.5.tar.xz 626212 BLAKE2B 78bf7bcb14b101c6bc5d135b16e8a74c7d1fe5485b60b6977c102210840ae908cc9ef76e5d9d7f3278c8a3fa976013ba135cf47866bb05511de7dd53270876a4 SHA512 bbaca46ea389148f994ceef0ef0c55623ff739b3119fe6eaf967b315d3086a4e06c6c44aa065d44bfeaaf6768355774fc7b9398ea9f0ce4ec5d9fe386bc41fb9
 EBUILD kde-cli-tools-5.21.5.ebuild 1722 BLAKE2B c3f53799f5b03bfa623099b977f31d4cbd2ffcbcf24eb97419d06ef33d269a556db0c339c74dd415eb19059c444ba0eb7fc47f1bcb22ce77d958af33dedb82c0 SHA512 240c5c44eb886b8cbe850ec32e773f5e96111429cd2198e6aa13899f4ecb71bf16d621ec628469acc25637c6911909ebf1d0028b3c7d3de96629de8547907728
-EBUILD kde-cli-tools-5.22.4.ebuild 1732 BLAKE2B 6e6f6abd0184050493cd3e3317bed70b5f2ea49b9157ce50ec64ce18129696702c13c7efd8c9ca0de1cd350fab3cbaa2ad4efabe246d9dcb347dd174cd898f9c SHA512 39e04fbea821ed63e7335d0033da6dba44df0f2d13b00165dbb622871c8bad29b6d5389d5350b45108147619f98ec25660af7388027e115c469ffdd3cb6f20b2
+EBUILD kde-cli-tools-5.22.5.ebuild 1730 BLAKE2B 64c9f297ba363f0aab941a78931308dcebab0054baf0f95ce2e0cd2b1c73aa3a952d0ce94f7ff7d220a2e2db479bf0a5417703e5af2dbb70b0656c885bfc4ba2 SHA512 ec3cc694e9c575dda643f314238fcb2b1f6abfa6090175a58a94228730294af20936eda5d077dd0c7c0b84bc78cd97632fb934af1ea65e31bc63c5b08c6fe992
 MISC metadata.xml 421 BLAKE2B 73bea0bcbbd9095bf7bba823b40066ae355dc12fcc4b3567cd2ed8b9d46b43856c329b775da8389770745d8bc3e6a24a9845c9d9867963b3108de5c1f1955f7f SHA512 3ebbb0f5206bf229e02fae7146609acaa7b0a6a7614fba7a308043214949713485bfd33090f82abcf7a7722e8062a55cc8494836e7a07715cf1df2c26db13cda
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.5.ebuild
index 6174e1a0620c..db90f52acb0f 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.4.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
@@ -21,7 +21,7 @@ IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
 # requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 7550b72a6784..540af7470156 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,6 @@
+AUX kde-gtk-config-5.22.5-drop-gtk2-dep.patch 805 BLAKE2B 262b3d6e644b592d3323609e8958c189b217663a0e6653c82aad57ea85c266d068dd0d4166a2327c33a325fc251549a8eee2c26a45a8fd21800f14a0e2b05ef6 SHA512 8e418333f286f7eb74a6bea42d6c63794ff58520c17b51a0eb5436d753f8af727515db45e12d07bb393a2e0ea4b8562830f6e0708bd0eb2285c8f839e025591c
 DIST kde-gtk-config-5.21.5.tar.xz 68764 BLAKE2B 5b63ae7d4a2f7c364d202321c87a3c6cb11361d6ee74625c3786428adbfda72d792a6de1f51e32d179f6746b33ffb801afccfac8f0167b31f759973b48bc629e SHA512 7acd5036cc008fac85cabd9f3a5321dc1c0209a1133d6063342ca1b1235843dce5e37a7712e0cbbd520f09b3ff46b71a94517c61414c8e7c1c35a2d65b428347
-DIST kde-gtk-config-5.22.4.tar.xz 70832 BLAKE2B d77ed9afd5eeb73a98658e35a8f224589663addccf91fa167ce91afb7b0ecec15f3f9ae653038c23af4c584089aa648d17d251f100a863fc915ab31da8827895 SHA512 9fea6564d9d6ee03888c6c34002a0e387c573237a834bb5ecad28b317543744a9d4ae71d7c656fea76f738e29c13fd8c11f9beb6c03bb2f21bba1d7fa9fd72a1
+DIST kde-gtk-config-5.22.5.tar.xz 71064 BLAKE2B ef1f1d40ae76c526af164b6113e6ff2aa09a52eaf7434a7660062c26a25a18461f83dc7e31d974ad7c46908d80144611df6f970b1fd9d2fa7e996f62b82f7d30 SHA512 76d2c3b56c29aa251087499e96f91b02b1190202d3e93d4895366d0a39abafac442dbba22b3afd79867c82d0eb35c05c8d2976f35762d9bf52c5a742a22c8490
 EBUILD kde-gtk-config-5.21.5.ebuild 1281 BLAKE2B 2966bfa66ca1bf58a298d8cd04e4db5052f6873aeffe865c502d3c9c1e0a2387c1d3c41c7837abe973a30b0747f5dde95126e3b74c03b3628e8ce7687e0ff0c7 SHA512 89e9a85aeb731f66987f267dbc810650a11b34d45a60458106fc6b4f3e8ecf592086fc679c3de83777b3335fd5c01668ef577f746a37b2d71e61ffed9a6a86b5
-EBUILD kde-gtk-config-5.22.4.ebuild 1291 BLAKE2B 7cc680376104a38f519cd385b2d13d78690a08e33e8d6eb845d0ef371829a8cc63df47c69c653b2559ea168eec2524b1ca43d5c662af7270ae135f37173f393e SHA512 ff9e7053758afe6ac7b1dffad2bd6d45b2b859554e243fe8662ac2e02a68b1cff2178e9692dc4c31c463095798a42ecfb3d6c8db251dacd370dce9ec0e8c6ac5
+EBUILD kde-gtk-config-5.22.5.ebuild 1344 BLAKE2B d520962f5b33fa7a80e107d1d9eed69e5f9bb6342cb32507150d646ab69447da1f3c4dfad2e2e552e15a80600ce1c01fb431f4e687485a6e9194efdb5594fa6e SHA512 f5f659199b68db49ce55329fb50a55527aec97c1764aeab3dbdeea5d032e666dba9c6e8fe6e797ad531b477bac9ebdb793a7a25bc0335c48f20f4cbae70cd18c
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch
new file mode 100644
index 000000000000..77831e3ebb21
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.22.5-drop-gtk2-dep.patch
@@ -0,0 +1,25 @@
+From 090cfb2db4bc9c032cd7a7c12cf2a317c248e3c6 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Mon, 2 Aug 2021 13:52:38 +0200
+Subject: [PATCH] Drop unused dependency on gtk+-2.0
+
+FWICT it's not actually used anywhere.
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 45d02ef..f102642 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,6 @@ find_package(Sass REQUIRED)
+ find_package(XSettingsd)
+ 
+ pkg_check_modules(GTK+3 REQUIRED IMPORTED_TARGET gtk+-3.0)
+-pkg_check_modules(GTK+2 REQUIRED IMPORTED_TARGET gtk+-2.0)
+ pkg_check_modules(GLib2 REQUIRED IMPORTED_TARGET glib-2.0)
+ pkg_check_modules(GObject REQUIRED IMPORTED_TARGET gobject-2.0)
+ pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
+-- 
+GitLab
+
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.5.ebuild
index 7e2fb65d39fd..cc51bfaa8ff2 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.4.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
@@ -9,7 +9,7 @@ QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
-DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma"
+DESCRIPTION="Syncs KDE Plasma theme settings to GTK applications"
 HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
@@ -17,9 +17,6 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-BDEPEND="
-	dev-lang/sassc
-"
 DEPEND="
 	dev-cpp/glibmm:2
 	dev-libs/glib:2
@@ -33,13 +30,17 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-plasma/kdecoration-${PVCUT}:5
-	x11-libs/gtk+:2
 	x11-libs/gtk+:3
 "
 RDEPEND="${DEPEND}
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 	x11-misc/xsettingsd
 "
+BDEPEND="
+	dev-lang/sassc
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.22.5-drop-gtk2-dep.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index daca04af9082..46f4732137fa 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
 DIST kdecoration-5.21.5.tar.xz 46236 BLAKE2B 3fc48fd91ff5e53c4a98f37572785b25f25ba23218aefc6e07b1b7c3495055002b379f826191e0155a39ae61dd8a0052e51d50af059fa8e3bf12e3dcb22f613a SHA512 ef86f9946cad9de9a5e3767e2dce4f30436c9fb013bf73d5ca31cb852d3dae92cd3906adcb178070f74922f3776d226b8f812ea24eb82a57662c0bf675d38edb
-DIST kdecoration-5.22.4.tar.xz 47348 BLAKE2B 289590267a4dd7809172771ee4047aa34507c69dd57deaf22f4fea2349c2f332b702876c66488ea1642d2a29ea1cb3de31a67aa0676fc8e46dbccc6ffda0a796 SHA512 2e5dc386d53bdeb81a0341772eed8055a9ee881cc1cc4133893a7bb7d521cbe7b81527322ab0c7d6bf7312fb874f8519bf832be0ada580204a75a3ae3fad162d
+DIST kdecoration-5.22.5.tar.xz 47256 BLAKE2B 20b173e3364e0d40cd864cc985ee1d5a27ce8103cec7d2006e25117c231eedd6e6c6f42cd1144df1674bb809d334ad3b90b71ac588ec6fd2bd6e4a2641681b84 SHA512 cbb707cda299d8f2938c63a382e1ea65853754a130711ac4df16300d16b7d215a1d7150faabae04c32ac8e79218739cb9493fc481921b65a0c188ae66ebd7beb
 EBUILD kdecoration-5.21.5.ebuild 479 BLAKE2B b64ec4043b3a32daf4717bca3394c031b5af903243238cb4a5514605402c6154d837ab1046ffb2b3e9424712d1def35555bc38242e4e396240d6f471f1d0ec48 SHA512 5fbce6761a4afbc358756c80f3f823ed49c313a5d20320c14b32e4addb2a95fdb329088144b6610c388cc422231c58a81c67d37a01d279191171a390cb5583b6
-EBUILD kdecoration-5.22.4.ebuild 489 BLAKE2B ff5d2ae7b714dbb0ab274a213d4d6ab77c725e1151a3a058bd8bf8d5b165231439abe32e03ae5318d248c6942ecbe09312cb9d7fcdbdd8c7434cddc5d1c82b3c SHA512 c5850d6c511cd19945afee4e5decb98af4fdd5874e6d84315dcc65a032b1c71f225696f200a4f53079ca10269d5faf52e076df0428984bb78073df6368b2314c
+EBUILD kdecoration-5.22.5.ebuild 489 BLAKE2B 3cfae920c0183c854274a0ae3998777be0331a76e2496796b2111238c1537cd6aa1f7a8fb1927d7131e523a4a9a09c43c5da9248f7e18b82bf10f591bb331f61 SHA512 be97943a9ebe9d06998247c253af065665dc924112c795490bf6513476237479634aa0da546f83fcb1c8cd21a2278b7dc9ea540b2b330f382545f78200a54552
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/kdecoration/kdecoration-5.22.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.22.5.ebuild
index a57c32e7a28e..78b15cd99686 100644
--- a/kde-plasma/kdecoration/kdecoration-5.22.4.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
 KFMIN=5.82.0
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 871190940c3f..daaf81dabeac 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,6 +1,6 @@
 AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
 DIST kdeplasma-addons-5.21.5.tar.xz 630108 BLAKE2B a3a4ee1885cce41621150cc1eb5fa5d6470b627f8a30231078938d82f39f888927f6482048403905cb3e680928be892718e0c4741a8da11f0e317fa06cee8106 SHA512 7c7afebd726e400c859be7051c14dc2ade658df7995b02f43595be5394f8d79322c7a7edeff6761e3980bc20aaedfc49d063308c4ee9974a400b8f855a89efe1
-DIST kdeplasma-addons-5.22.4.tar.xz 633948 BLAKE2B c17ff07e1d1bad819592ffe673b4b215ae8a6d396702e7a7ac212e4af5ac228690cf78cee25d751719033e8181a6273bb5a8c4ad69dc8f8bb700c2d766fa4db1 SHA512 ab2bdeb5c1ead16fa11c3d7c06302038c25b6c1b913494422dc41f5d0f833c6568e7b984f416b8957ae1f9568f14b85baef05e688a0f821e578c02ecd83e2c91
+DIST kdeplasma-addons-5.22.5.tar.xz 633320 BLAKE2B 12cb41ebbbec6a6bbb65bbac55e856951cee7249acbc5e9228fddbf3d844066c6a674dfe45242d63b4e4b1321955c547c349ec735a966bc7c02ca38eb62c2f03 SHA512 7915d20808bcceea9451590723abd8f20fc2eb33c6b1346cf1b0971c69360eaf24ad72b141d15bc102090c1dc3f82f8c0e7398cfdd41b7452dbf57af2da87803
 EBUILD kdeplasma-addons-5.21.5.ebuild 2079 BLAKE2B 19c27c73a2d26ffae8a1cc44e48350b3d391a45d33b8e61ca81b5b7ca8fa1b026867720fe34f79f4a11b6322e4ed8a86f3d7528fe5fbae503605af71d8671650 SHA512 db7612e36ce39cab39f65c8707e347cae01a3cd572f856e9512bfdf2d006558f92bc5e47c68cb897baff800d2abef9b6add55dc879d5b0939c09e0ad78c719dc
-EBUILD kdeplasma-addons-5.22.4.ebuild 2089 BLAKE2B 03016d953bc1afadf9660a93e3dc239ab96774bf6d3e45709744baf98177e04c812ee0f567a429e2c7a806997f68f7fcab708b08f7fa4b14fb289bb9a7a845e4 SHA512 cd0d283adfd46b319a9937bf4c47e146aaa00d140e92241b9e7c63e61fec41b221135830fa2e79002b15b818fc9af85fa90c0ae2681bdf9e4740241477a4d53f
+EBUILD kdeplasma-addons-5.22.5.ebuild 2087 BLAKE2B ce4cfc8f37810506bb5b3c4c14a214ac5486589a24b0b35b0c21805adb92906aa2219277da967d05f1a1effeec633fc5146720d0de9c1b3aef034552dbdee52e SHA512 d6f6776bff5600a9ad43ce73708909204fc40d0b92b532fdd360731bf36343ccf82b7c7e495e09dadf969402a13367833cdfd6f1d06a89081515412d9124699c
 MISC metadata.xml 635 BLAKE2B 41a1bbc9d324978db3b1627334ad689c9b4bb1d00b1f3bfc9e04c8f3641d02f074f5b8f74acd8edfd968a989aba6ed005c63bda08633bd31263e1d8ed4e3ca6a SHA512 c4158938a659b61a16b402ca2dcc64bd11f3aea4eb633c88e99029c3a8740759afb410656dd211fa8dced411a9c912253fd95534ec3712a0736cd2bb83e0fec0
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.5.ebuild
index 4f02665dfd1c..229edfac09d7 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.4.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KFMIN=5.82.0
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="comic share webengine"
 
-RESTRICT+=" test" # bug 727846
+RESTRICT="test" # bug 727846
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 75760a5a6c5b..2d00e5b8e88c 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
 DIST kgamma5-5.21.5.tar.xz 83168 BLAKE2B 5b6cec28329437dbfd93ccf24e26032dad1a394133f823dc6e47a0d82e2aee1d5ca387876a4951c2dec4b072268dcddc58cf0d9c69ad107360279c9027e6e777 SHA512 31da4b0e4aceeffaa17b9d9c13a12db8a7009575e92977f5261fea4b578cc8cca1a8f159a4229a7995cac2beb76583c125448a346ac1cdfdbb774bf76b2e34ac
-DIST kgamma5-5.22.4.tar.xz 83232 BLAKE2B cd2843e7e911ee200100042aae9d63f7598da5eb0e34c3e4a510262b4245b3088d9aa12a1e5434828d6e42c062c1db83ebd3dbbcfc0917e27d997e52f1893831 SHA512 ecda64caeb7c8273c887ded9dc037c8fc4835f438632a8344aea70a43cc7513e221f5c2344cf80d49d5ed03b15dcb5be6faa14aabd687ac07c2e50605803041e
+DIST kgamma5-5.22.5.tar.xz 83124 BLAKE2B 0c90174ca3108c469ab1f2d349d533ea3592864731901d84426a3d1135497729e8fd7705fea4efcf4a160d9b2232073f6a8864256daefd01043c14448a22bc9f SHA512 c04e2c291cc0dd0c5edda07cc4b6c921ba1f297899cde95399e0d4039cea2a9c5bc2b2da319de227793e8a40bcabba496848f0559730a6105d215abfe8ee6069
 EBUILD kgamma-5.21.5.ebuild 677 BLAKE2B 276f1a82474c690e5ed4a803ddcd536728d70a3973151534cb435a69f302b2c612baa106281b28ad07b2571e739dc506549785af4e1028b11aa77a10c75667f4 SHA512 2c31c58a7011e039a4aa8f5d04520b15bd90dad56cce061d5d4b38e5b4991759ac6fa00deb9670b8926d52692d15cfa32b2d1be0eb9c18db8182891372706023
-EBUILD kgamma-5.22.4.ebuild 687 BLAKE2B 64db8bba2dc0942bc1d78dbad091d62d06f72444e08d7f02d207d4190417106c7a70003bfae50eb681d4d01d8a9fdceb412e9cd007ceac4e62b2bf47ac995649 SHA512 1c04d5263e884822fa313cb66a0b55eaaa2fde5472118c1d914fb19dc6dd8e6d1c55420b4491802c536ff9e9de57d1107031b2ba4157206445dccfb7be5b5337
+EBUILD kgamma-5.22.5.ebuild 687 BLAKE2B 1c395a75ae63b81dbb0f225980d1e72b581e55765e423fafdebc0f7669dec55ffe59698ea24c90216b2c491d87aa512d6137d7ad39ff5f46b39642e4061b2756 SHA512 29cebed667edad0112795f41b86a2027a2618187735b98085c1090648f6bed07594601cc53388ae333bfe64f24f4b2885b4aa4f2fcf7173e364faaae98ff088b
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/kgamma/kgamma-5.22.4.ebuild b/kde-plasma/kgamma/kgamma-5.22.5.ebuild
index 4cec7207a83f..925ba3fb4dd6 100644
--- a/kde-plasma/kgamma/kgamma-5.22.4.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_ORG_NAME="${PN}5"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 529cb192ef58..20c2634f4235 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,5 @@
 DIST khotkeys-5.21.5.tar.xz 1861604 BLAKE2B 69f0057e62d4a03ce3e54092def09ea7bf73a4063ebd8e33c2fb81566d9fd1e02a1712b2e941295a491821b3ba4695f43884e5db532a5c166439a2d26389b1df SHA512 16409a928af050278dda012150e969b60617a66aa000cbb722781788defb02268ac56ef521916e55f257e4b166df8ddffcf14c9c35b49410a79491f197b4aef5
-DIST khotkeys-5.22.4.tar.xz 1858380 BLAKE2B e434bf5f877f76a180c1a55207e70fa499e7046cea8b89ade9e049d9a32d60502f53ba959b22c0309c6e91da18571cf145c8fae2c6c8f2da80e90c145af23500 SHA512 1d9ee07b0e1e3f5eb0104cccfdef4637cbea4c25b94261e5692ad084f00fb1696a4f33d6fd1e439cf80e64cda9bb53facc2eac30df1dda0fef7c03521f95bef6
+DIST khotkeys-5.22.5.tar.xz 1859668 BLAKE2B a079df3082a6bc5147e8c3f9c63ebd155588c10bf752b27d22c3feac66aeb42229f194e47e33730643c10cc94132fb760061f6e5e6d035bd8c4f414951a63bb7 SHA512 de66cb92986c025ba0fd2b70eab65dcf25057e1a4afcd3616b7063047d0e41f2d80b780ab6a2d564e22be7bd4f9532e0c37c62c5e54bb6d9587ea95c363402d6
 EBUILD khotkeys-5.21.5.ebuild 1346 BLAKE2B 98d708e9f0834e4a4572ecb4a13deb8ae3819bb25aae2191ebd12e6207c30f6404b9c1afd7b34592a96c2be5b8c2c166b7b74008a6df62419ba44fff535c5881 SHA512 de5172eb39e2d1da905fa46ffe4553efa11cff52b05f14b2842d2ff82a2daabcb76ab715ac1439497a24da9d9af23a2025b284f1ca0962000c3d921b029f9d1d
-EBUILD khotkeys-5.22.4.ebuild 1356 BLAKE2B 3fecf03015a281caef7aea529ae611878e9cb3dcced3e464aa04d741b2db1c5dda744ef8476284805463b3fc7c4be429bb9eb78a2b8d3a192a0bec32749bb4eb SHA512 fbe6fe1dbe0fdab354345c251bb61e69ea882e30e3cddd1f044e44a2446cb5a49db29c875daae130a5b2910f279baba9b0a2184feb0d66dd0d02f767471b1a5b
+EBUILD khotkeys-5.22.5.ebuild 1356 BLAKE2B 46951a32cffd10345ae9743499a565dc51d153251a2a23a2de07fb91160967057587bec3337abe1f398b821a20d0f4bc91b0f9b9c3ffb32a79ce1b1d7787eb34 SHA512 ec038fc376963b155627fdd256d0f777c27bf1a94609a72dfa428c9df71bffb4d5ed32698f789163641fdda5ff2882a1f64e57dfeacb98a36135c98c24b6716a
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/khotkeys/khotkeys-5.22.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.22.5.ebuild
index 7861169b5783..1cece7a609f9 100644
--- a/kde-plasma/khotkeys/khotkeys-5.22.4.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
 KFMIN=5.82.0
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 84461a755436..28999dba3e32 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.21.5.tar.xz 1304704 BLAKE2B e63d261bd57f69f3941c670f7d4e45428959544f15187829a704a240706bc04a65dad4bbfeca32444050abb1a5a8c50ccb9365d261cf71149498d1ca408bb77d SHA512 2becdd6f6be00de309467fee1478bec75bc6fa7d8d233b0a5bc8e6124f780add705d549209c842c3cd621bc8931a8ecdecb5a2902ab369bcd476939580bec41a
-DIST kinfocenter-5.22.4.tar.xz 1164096 BLAKE2B ad384dfdf35c237075e2e25ac08eea1fafcfabb3bd28f72a452ff9a770577f416af52564aad9911e4d1282988512889864f20abd7f1a27e15c35f55d9d7a2953 SHA512 cb48dbe47e8d65441ba59fa1617a685218482a13099dc83667a37cfa512e0db2f0dbb954e26055926dede8ec52eebfe60312471b735b3abd1f229c3286979b14
+DIST kinfocenter-5.22.5.tar.xz 1170716 BLAKE2B 8e9cefdb426e9635928aa2b81359acc1e8b2113865b18109fa442efa7cd35684fdf911a39c3ce8a43c31afabced6820d6bac6ce31a5c00eb629f6a8462906a7b SHA512 7eaafde6f9a388e9d4cfe9a8f4057c462bf83f9fecdd39fdd96e05f4c5094c1a116bf66a781bba67721e63e8cfd5a8bfb32fb1906392c2acb70263afaa17c560
 EBUILD kinfocenter-5.21.5.ebuild 2536 BLAKE2B cf5f5a7b0b5a934a88790f0ab564f1a0398bfe4ca94369aa1c0756e7e9846784175a0835f8062fc29ded31bb2c7254a44e47a9795ee129e07e0ff2e428641e4d SHA512 31c09305eb04dbcdd90b9c5436ce5175024ab6649085bf6f0f825bd48646ca119b6ffd86a5fddb897dc055a3c47d17bb07bfa369ea25a76aac80cf3bad0440ab
-EBUILD kinfocenter-5.22.4.ebuild 2617 BLAKE2B a1d1ca99a862c96ee146ed8918fd1baa1e74d83829ead3a7d3eaca6863f76c1fe7c52b0a68664cce65da5fbdb9ee4620ac8f8d92ea1f1b54ae3577d012fd6451 SHA512 20af1e10e25c60ba3ce36f2a22d9490944c7e44283337b3299e097801e209921c3b2413fa8befec03f1d84fa03fcf293bc3732efcdb43f522fd27bac1b395ae3
+EBUILD kinfocenter-5.22.5.ebuild 2643 BLAKE2B 5dd0cff882c5d3a0246508299c74cd1e6662ccf70a95b583e1acc08583ee4ecf12c0ae2368028c0d3ccc018d6937c057d39ad5bce875ffb4760971fa199a1d18 SHA512 796fc3b46143f4313d44adf1113207b36a666bf71f416ed74ddfb586ad64cda53e3db0dbd49d0301943c651a874b128dfd86e89b78094eb57d40abd318f7d333
 MISC metadata.xml 388 BLAKE2B a9bbb616f10e0469c0bc26e04965247495ed3b4d080fb76bd7290b109580428cb481d014e38f0cb2a8bba16d8d6f89898c55aa54c91be020b3b13e0f0c70dff7 SHA512 002968ab7f6ee7353eec3a388449c5c12e48bf0a8de900db822100bb1ac2c491f12ef0d1811e93890b83832382a897f19e96e0b9a1d0120cf143bf42336ce89a
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.22.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.22.5.ebuild
index f8929e148042..6a89294f40b2 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.22.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KFMIN=5.82.0
@@ -16,11 +16,10 @@ 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 ~riscv ~x86"
-IUSE="gles2-only ieee1394 +opengl +pci usb wayland"
+IUSE="gles2-only ieee1394 +opengl +pci usb wayland +X"
 
-REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
+REQUIRED_USE="opengl? ( X ) wayland? ( || ( opengl gles2-only ) )"
 
-BDEPEND=">=dev-util/cmake-3.14.3"
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
@@ -38,11 +37,10 @@ DEPEND="
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
-	x11-libs/libX11
 	gles2-only? ( media-libs/mesa[gles2] )
 	ieee1394? ( sys-libs/libraw1394 )
 	opengl? (
-		media-libs/mesa[X(+)]
+		media-libs/libglvnd[X?]
 		!gles2-only? ( media-libs/glu )
 	)
 	pci? ( sys-apps/pciutils )
@@ -51,6 +49,7 @@ DEPEND="
 		>=kde-frameworks/kwayland-${KFMIN}:5
 		media-libs/mesa[egl(+)]
 	)
+	X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -66,6 +65,7 @@ src_configure() {
 		$(cmake_use_find_package usb USB1)
 		$(cmake_use_find_package wayland EGL)
 		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X X11)
 	)
 
 	if has_version "dev-qt/qtgui[gles2-only]"; then
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 50f0d592b9bd..d0e7adfb8692 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.21.5.tar.xz 899632 BLAKE2B 8b061f883fcd8df0ab62ad8e8e2b03bba8449e43056b5def98c4c22b49454c52e9034d17cc8d6f06664e33ccedb7ce9723fe63ea72f5c3f821700a2fe7c97fc7 SHA512 a375574ac41017b033bde10d7f2bcad980b5c0758855c9787518e1f9a5185b0dbdca775f45593144fe462fe52d01001ba72e775b2b728f7a39087ffeeaae8919
-DIST kmenuedit-5.22.4.tar.xz 899440 BLAKE2B 75499fa3d89bf41006f6db5c45e6c6b6957735d8fb0682e402d79c1b3c09b44ac2a8733acdc2e5e783afd5a7f021e7f1576bca4ad05cfd0b1c0f3b472c27ce71 SHA512 7a573434079cb57cd20287c37e66c666cc7d3c265d2d7e9065e2ad8f5baa58a3aa2390479f548755ee2da29a1dd25297964842f043415307c3dc0240355ec0a6
+DIST kmenuedit-5.22.5.tar.xz 900120 BLAKE2B 7ee3f94e3b749a54f893913b08bebc4515f27422498cad0aa06a3f7e687c7da085db57d434a224c8cabf6e6d8da3dea8b1c35d262e8f3d4e1da3ef983e8b9c95 SHA512 f7516303c45e1f48a3b329ef3df23a33011ed5be57307811f8b9ef6d92c4cf82793bbb1fabd69db0ad8c2c7005f8c453391ae18dc27439fc3d4e1510e36b0049
 EBUILD kmenuedit-5.21.5.ebuild 1060 BLAKE2B 9c0e66d2f8ff87c12aa71f1770f0338eafef0353733cc5e3a85629fcc3209619703717542730e712ea7827151058f366f1ca2e849c6dac844ed81f352da24888 SHA512 4734af0613b32b84d8eb38e3a4d99d0339fda1a538bab08b5471f1d69d5a2ef480d0961c5386b616b58aeb493e7a16c36e545f6b934904da28fe1df128285a8e
-EBUILD kmenuedit-5.22.4.ebuild 1070 BLAKE2B 68ecdb261d6cafe866f727007c380fcbe41442ee44c58c7ef8ef62adfa3ffb7683554ddf272777c526f32cdb48e4823e8e27393f08869df5c843825485bf746f SHA512 7ba8c1ae0b5e3b3cab9a2f8356fedc77ac853fe884f9d17b5db6f11c585a197066aeeb6c5b058c5fa71a57a77418c158cdfceedaeb9db36532eed2975f2abf08
+EBUILD kmenuedit-5.22.5.ebuild 1070 BLAKE2B ff22847e187d9960d3f527c6048cee262cc55b37d00a7caa75bb719ec9904cbe246e5bfbd0c433a26ed3a5b8cf19735e9a91f169f5f5a8bdd2e918079fa32818 SHA512 cba1c0d7224db726f7d23e9ef889a451904965992192eca73a13e3b3b3ea1c7594c99adda7fe3cd3d6f149638490a49ab3a080d6397cb6ee0cea51811272972d
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.22.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.22.5.ebuild
index 9e3f45a05cee..d13d0434f74a 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.22.4.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KFMIN=5.82.0
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 7fb005d9070c..aab4b358c6f8 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
 DIST kscreen-5.21.5.tar.xz 114956 BLAKE2B e236b765ae57f4138feb70d9652ada33f57abd0581c1ec9a5bc826a6c31a1a5a5a6236cf55bb3a24f7a4de0a1aeb088cc62a09dd6353f126aafa04f4d3b2e73b SHA512 d57a561b22aed2301574e4af37d45046f4fbd360f8eae3465303c29a490f9dcc33a93c7e38890bd2945a4d868c23719a0ac11cfcdd22e613fc8612fa53694784
-DIST kscreen-5.22.4.tar.xz 117636 BLAKE2B 5234b01b57ea24e061c5963ae12ce0af9565ee4f0e6ca8605a8dcc44f59e1577d4aa76ece353edde34dad2beaf791b48d5b78d3dea9c1dce06853cbdff2c76aa SHA512 679dffb7b2b40433d099358ca87cf50f6f32fe646c7498cdcd02e0a6a90a00b69aaf35daf52dc4917592f67871be62cde7d90a6cbd29a3324864c5f32c6dddad
+DIST kscreen-5.22.5.tar.xz 117916 BLAKE2B c965a4feee13aa2ae1af29feab9dcfc166a4d6ede547358902e5292d971909062095c3ece00ead0757ff1e50efb79e20cb2354c29ccf9b833be8ef81d1121a97 SHA512 c2be9546bdc00f83fe501a9cbd7b900b4201804edcda94d0632b8a09514821b52a57bf4c8db6111a6c1d54a6806a173d09d983b2e8d035cc98b57638a011920e
 EBUILD kscreen-5.21.5.ebuild 1225 BLAKE2B 2ca59ec61ac7ee9da79514d7201b7c312a1b00f15bfef37a534861796fb989db15eb024616e95c513bac2973586ec7c311b84187471ea9ab264aba60840e9f75 SHA512 74e702f801e6b2949a71a1195f074cb0d98bf88c10d93190e0e64512d66dc6277c95afe3e7d529a255bf949b03d6544c7d3e0bd3f11372c1317aafd7a280375e
-EBUILD kscreen-5.22.4.ebuild 1235 BLAKE2B b7f541c10527494df50d1ef29302cf7a6f650cfdc3ce5ea256383e5f8967db35911e4d71571c3cc24df8be98a44147d337ceed145bdd9e8fdbd93964606e62fd SHA512 6d29c6e57ba2959c07c6589c3ae91c9da894c4096d9d3136f040940a9f9f6d69f3df5d4cf0530d48a85ca7c7b31a6f7fa1812fc20d5f970460352c78b5875795
+EBUILD kscreen-5.22.5.ebuild 1233 BLAKE2B 15e461fc23495d042b4902e8f389012abf50de6d8cfd2544b89d92925fd6399fd3691b271d29797b1abca0555a290e0be3b794c05fac0e294591f3f56e69352a SHA512 a813f56b630f3898dddc07be50cbda3a3b55513585d045128a0c07e3759c396d24b97945005893d52827bf19db047a711b699adb746a2acb5db65835972828b5
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/kscreen/kscreen-5.22.4.ebuild b/kde-plasma/kscreen/kscreen-5.22.5.ebuild
index 0a0a250fc59f..86b42e0ee277 100644
--- a/kde-plasma/kscreen/kscreen-5.22.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
 KFMIN=5.82.0
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # bug #580440, last checked 5.6.3
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 8f00406a06b8..277f0444f4f4 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.21.5.tar.xz 117420 BLAKE2B 1727425954ee4402b8e4ce6fd05ab157597867cdfd5c6a5a4d841f5ba1723c3f0a7b056ca3bc31b48891c2edacc670595ed59677a9ee479047f5c850f4cddc27 SHA512 0ed1f1399d493f39562c3655e4f541b65c25beaeac77315af34e49f79f7dfd954099b7ab91f2eab8b1d2f5dc3be8f0a54c7d53d902bc31971bffa6b94476c8af
-DIST kscreenlocker-5.22.4.tar.xz 117112 BLAKE2B 051996aea1fd64c17e73885f8e9ec998529fa91e8e393f06cdead569affbf6196f97d9930c3d91de68b21ce24b2dbb96248c1bd3c4c2f873215e6dd46268be99 SHA512 a49a3e7de5d90d446c336017eb94ea69b0c758097dfe074433820805551ed0d3f01dfd4eb033520b38165d4d6d216da681547801d9637e00932bec65d147ff40
+DIST kscreenlocker-5.22.5.tar.xz 116688 BLAKE2B 8e4bba6e78910f37e6abe18130c634afbbf9be7bba2a6eb1a694badd376890bd16e96bc2e575f1468dc9c4cc0a9bb057bd5c1dc0c4a75e2e8feb9dd26caad3b4 SHA512 e2b467743f36271cf3eac2c7b593ae5971dcc3ab917af42480dbf782bbe93eb2f24cb600d6fceae5efc2ccd8e5ab3d6a76b921f189cfcec62c661d7cc1f545f9
 EBUILD kscreenlocker-5.21.5.ebuild 2216 BLAKE2B 7f9d583471c6863674b68ba4de62840875c592910e68ed8603e5a18c5e38968188f9e9ceac96600be1bea445fbc09d03a2e130f00a9edfbc669f3973306fa753 SHA512 0aa508fc73c7ac615df539639988a843b6dda928264309cfdc9519a7e1aa86fffe95aa05b8e14f1a20a8d2a2127287669b4891f4f687e08ec832e88f2062a51d
-EBUILD kscreenlocker-5.22.4.ebuild 2266 BLAKE2B d29d6f79d1bb6173ff1a742495a8b8ef4fbafa8f10cf2385c5d6c5c421b56ff72e59ad6ed5a92f24ce2751c11cb4ae5721c252e865459903bb43460970d5eafc SHA512 cc640b8632f8bbec9877442ca4775a23917115a2fb5ddd6f12b20ee5d95d7f3cf8dd879ada6a8aa7473b723b32185097b3b16de505617f9732d367861b71d471
+EBUILD kscreenlocker-5.22.5.ebuild 2266 BLAKE2B d29d6f79d1bb6173ff1a742495a8b8ef4fbafa8f10cf2385c5d6c5c421b56ff72e59ad6ed5a92f24ce2751c11cb4ae5721c252e865459903bb43460970d5eafc SHA512 cc640b8632f8bbec9877442ca4775a23917115a2fb5ddd6f12b20ee5d95d7f3cf8dd879ada6a8aa7473b723b32185097b3b16de505617f9732d367861b71d471
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.22.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.22.5.ebuild
index f28a9ed706fa..f28a9ed706fa 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.22.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.22.5.ebuild
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 3cbd27803faf..7c62d5a60e6f 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.21.5.tar.xz 24148 BLAKE2B 8cae47375a883948cfff373b1bf113359ce4c1d548c982dc6c9d8a9a28c16661813c1d8077f463a6ec1dc80c69b2736391c56382bf3ff2b7d2f3da24d6e64f2b SHA512 c342723383d13b8df977bb4ab3c6b50c15007d12fdd27c0e51ad41cf77bbc5ddae404a9fe10669ea22933140a55bc293e7296d8e3e488cbce36158475403d7ff
-DIST ksshaskpass-5.22.4.tar.xz 24088 BLAKE2B 9a7c2a5e52d5cd166ac03dcf91f36af3b7bc6c55b1225293c6ba2c8252132ca75a9d54d3f28c9264403f8c5598bccaf29628e6c7c1b620782993e6b551b56a40 SHA512 529ff46dc3398e954b2a885fbe14c735b7ff2eb3827797dfb27708624cb5b3aa85064f2ff2924167db80c7515b6a70f1cf1c7fb72f5aabe6d4beb9e5f8a9c1d4
+DIST ksshaskpass-5.22.5.tar.xz 24076 BLAKE2B 2625d07b18b5e1ccd98f5b34e402a4ea201190f3be240ea596e8b4c70f0a15204e7d5ea559a0b17bc253247eca41a988f65bb2e29ee07c2e35600d8a1f761b34 SHA512 35f430882aa735f1b9d7a1874f83fa67074cfb720bbba377d0b38baab2f3eaeddc1598f6f7b9c79479b95d22fdc661d7dfd6835b98a78ea159c68d64abc81a67
 EBUILD ksshaskpass-5.21.5.ebuild 1433 BLAKE2B 9d3692f5a819276620547d5220e654609fb1c0f4d4f31c4372ddd61f15cb41b46b742c105b4035c942dcb1331a44f7f99949e6868619fbbb48fbbfc387ff97c1 SHA512 c29fb24b6f166089ca64e802cee20897cc557caa92142402bd0fb25c70ce5161540463e3518874b6b3a56e878cbf51886bb078dc37d378a5da0f2317a86ebd31
-EBUILD ksshaskpass-5.22.4.ebuild 1443 BLAKE2B fff6044a98126277d4ef3a3313562f66049dc30720958d84bcaef5d141f4f148f6fbc5c9bd634dd63bbc9d4c9a1cc896ac0bfd9be2107a79c22d333272bb109a SHA512 4f6565edf2db32eb820ca98f93b14e1d2ade5b6916b5b3d857b24a373c3d3fc1d196d9492b73f4599aa2680783fd289b24e0d5a87baa2a56d258404d62d19921
+EBUILD ksshaskpass-5.22.5.ebuild 1443 BLAKE2B f77b9a16fbc0ead6431caed1280b6848206c6ccb7ab61c03eb781650600ea100af851f73d0352892e6e96eefcde11491c9a9db7194ff47d43cc7f7a21cc81d3e SHA512 83560afb7d70a37d61e14e7d0e35ae0a7a8661a6b99ce8818a7609654f54e7e42420d79a64bdca52db6c782b1d0e28b7b3293e3968b074e47a5f23f5765a3602
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.22.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.22.5.ebuild
index ea453f742bf1..5d53a4f81076 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.22.4.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 QTMIN=5.15.2
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
index 3085f975ef6a..726fbb5967b1 100644
--- a/kde-plasma/ksystemstats/Manifest
+++ b/kde-plasma/ksystemstats/Manifest
@@ -1,3 +1,3 @@
-DIST ksystemstats-5.22.4.tar.xz 86220 BLAKE2B 51c83e61f2745c8c7132380a6c061d4a88d82890ef8f793881b4ecc2291899773b75435bf4fb73b8d1864e0601433721e03ee4ce265ae5721c49b747b55402a0 SHA512 e7b1d936971b4d2654436444d6ca02bc95852f5bafd167a21f14487af689d50efb9fabaead121f54685f42c6a4c585de3f91e1a9c68da2fcbd6571c88b4addd7
-EBUILD ksystemstats-5.22.4.ebuild 1122 BLAKE2B 83826ac660938e57129efb9d5f12fc7f948573ce150732412342e2946bcc11eee80c16a0eb639699ba6871d02f6f890bce3a0e1f79d71a22c3062ffe4e6f65b2 SHA512 eb81d57b5753874b676f91c004b9d2413423445eb3241edb925f1ff512d1562a6e47628feb4bba5147313e729dab11940dd6a5b5b05b7dafa33d5008d0077fb4
+DIST ksystemstats-5.22.5.tar.xz 86240 BLAKE2B 397ab260be6d49174613ca4cd0a1611605a127a72641e53ec8c1f5f743b6799dac1c82632dc5830075e790f1184a10d283e2e5556b3d8a84c3dc59b5f5c36867 SHA512 020e5b9ab2768c37563ee8db8b6ec812cc86423f72629dbb777168c74a9c7a417db8b32e745d100ad1141a4915328ea9649d1d6a2e6eaa79e238f29fd336d546
+EBUILD ksystemstats-5.22.5.ebuild 1122 BLAKE2B 2c291e4e45be7bfb53101c5b74dd2d29cbf5c124b55bdc8fcbdc9dfffa925c3580bfe5eb855e60f3957cc92279fdeeadc5db819acee1c3c32805b55b2bda0918 SHA512 aaa5fc0f3c9d2f21cd55ab4dac7602d9dc76012854fa0e0ce9c828869ca03f50345cabc485decf75e95837786685a631ab3f249540b086461a17aaffb90310e7
 MISC metadata.xml 466 BLAKE2B 6d20337185a30d44c6c45bbb28b925c4aaed4ea99e23b0a04ca0aaa1dd29c44aef82eef2c94940d1110538347eadaa6ac3f86dacfd325a412af44ef307b9f06d SHA512 0f515ddb70aa10cc4db01398122a77fd732bc5d14ec312c2994fb81805b8a42c4568d85be50d3e60c354dc58857e8d12f295ae9a198be02ad8b6c23f766436ed
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.22.4.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.22.5.ebuild
index 8d88484711e4..2738ca837d4d 100644
--- a/kde-plasma/ksystemstats/ksystemstats-5.22.4.ebuild
+++ b/kde-plasma/ksystemstats/ksystemstats-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index fabc514a525d..d748c4eccb56 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-pam-5.21.5.tar.xz 19916 BLAKE2B ee0efa7448f7f7d599e83d9a923909fe0de965aa48a8e505b984a5cb54d16c20b3f2f57efb83cd887545e23c3aa9ac4a70c14e9173fff263190c8de5c2c9449f SHA512 4dab0ac4500c6ec01fef71e2197e59afb39c318dfe1e5727832fed2137b5d961bb1aad9c52d356346794ac1dd9e9451f507032aab29028806d9c04c3c566738d
-DIST kwallet-pam-5.22.4.tar.xz 20144 BLAKE2B 638876d0e0f5fc12bc6de5657c78fe9c0ffe331d3432e95617dc6b74f9f257483998ee98f37a62a88562c526f51525d3ad8fd8fee110f9b663142bf058468058 SHA512 ae2a3c2e71a62b090b5fc5cb46c13d719f234496e9603fed54eb0c63e9b3174e4b42f98fd8fcf11d16e9c55fbdab7dc00091ebe0743d90c9ea7985986351e63d
+DIST kwallet-pam-5.22.5.tar.xz 19960 BLAKE2B 978860fc113e2a02bd2543aa5147832050fb3b53a1916939cc21772e98a7a2e4d47892d514427f15a3fbff70a6eadcb98fdd934fb8d731992ff3fc8252c32f6b SHA512 230135ee7aadbbc9f08695afa87fd7d8f0e3dca5da40f94bea92ad83a8a2ccc86efb7d593730079a0affc91f28383d089a08fd2b4db57961ba7c5b3a009a6038
 EBUILD kwallet-pam-5.21.5.ebuild 731 BLAKE2B d7380ef4185c0d9cc3a0ffdf5e36848292e083c2b20821a27ba50d9f46fd0ff2c2a03f4139d28a47a614c5f753c915c23fc47cf0d592a5330dc2bc1fb6b83d1c SHA512 ba1b94ad19d2cc0724ab7a72c04bf18307577e29d3ce8b0effc561f5323b6a9159360c39cfe121b4a3ce2e0c89514c40e097c504e9500b6776761e40b1efc422
-EBUILD kwallet-pam-5.22.4.ebuild 741 BLAKE2B a3b85168e8e9464ed5fbe23eb6e0090f422fcc61578b4b0f4c19fbfb96226a4c50d1fca12644d0f930e41de84709c677b9110b35567f9c4cac277090d4a85d04 SHA512 2747bd1419d1e90b7e4c5faa90c2b7fd94dc8d94c677bc4845bd5956414b9d25859b34f3659d936b95ca3085388720674b36d2b658cb6c3634ca22671b4ea664
+EBUILD kwallet-pam-5.22.5.ebuild 741 BLAKE2B 68f62c8769fcc2fb6a9f01a32c5df8f788c17cc564ba1cc38e15b7903813be4f356f8f107c48a62fb20c39aa6d10bcafae005c47b163805ff9833bedbb51d225 SHA512 d306858763a6a65dd7bb362639c7aa6db2b297a64bba671e0d88e69d6b64f53943368843f0e5aaa5a4a963f77fdfd8c897cb230df1514b06588492e5b10ca960
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.22.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.22.5.ebuild
index 1e37df2b8765..2db13f66ab1f 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.22.4.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 7365fd4c6b3c..927783a5fcc1 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.21.5.tar.xz 23336 BLAKE2B 361160eff499863787d997f7eabd9dc7acfa5e9831de700cb1fbe6a4a5f10795b9435a505ff7af40eae4e473826fefda275ad8dc15efb6ac609788d9c85b25da SHA512 87e1d71f8a18ebbaadfb76a7e2bdfb47933a500d3cccb589f697e2b368302f3b8c61a0e742cd436119adb3a885aa6d94b8d522befe2908fb2b3816def93bb282
-DIST kwayland-integration-5.22.4.tar.xz 22764 BLAKE2B 3dc035adcdf0342801a20a9651153536db81ebb8ac3313ace32f6e7f12c99a07ce61adcf0979ee749782020f1bf02bb845a9e62cbb46463052ed32049cf095c2 SHA512 ead1dd4e74bc4c0d53973a52dda86750448f4b3af5c41655d073079c5b6ec42d98a1d7fe19fd0d7fb3d232ffc3c8372060b3273c1265d0a66250d78030e5682a
+DIST kwayland-integration-5.22.5.tar.xz 22708 BLAKE2B 61e084dd71721b556fc9bf0aafe92908c25070d1f8683ae53093ca413b0e81efb1c21a3fbb7c033c1e324b2032c8fe9946287eadd53607ee549944f06d081932 SHA512 456b745e493965781178e1cd2fe64b8833294800ea152f5f95d00e1e2c221f97c2a29b91498573bc25710e3ad42482e46a4f0f33d5a57ce8ed1454a65fba81a9
 EBUILD kwayland-integration-5.21.5.ebuild 699 BLAKE2B b70d306f6debb66c8bfbd0aa3910bc109ce2dd525415ac6e7328f00307cc0aa24a201dfc5f5bd90afcc8cfb0b9582b9dbb48e7b860ae58e6af7a9262a3c51fa8 SHA512 61bf8a5a4c0fa9b5087797e579d4fd2682a21fd9a4e1bdb26c5086282345741df85cf1a264acfc4f309e466b36093a325a1f6954955182c4bacf733868dc0bad
-EBUILD kwayland-integration-5.22.4.ebuild 709 BLAKE2B 01a84b3f79f3decdf8c34c252ca1c39e207959c45c487c869dfc9bacf1ceed91afae31e33556b603f9edb8a08a4cce1a71064d158f78a4abc0ac1f86cd56d1f6 SHA512 bd2c3ca08462d57975a0e06d4129c594a4361d8d2bf9ec0ab70b115d96e73a33861f2d5860a284057c3a2430b42b479a8ffb9a0064813afd6d14fda6ba059b72
+EBUILD kwayland-integration-5.22.5.ebuild 707 BLAKE2B a2ef4a687709ed0a6fd952274031f8037ec179aedb92c995b763363021f71e3e35b5c684778e29edc6e39cdb215cb5b60703338ffcaff9a42791566c55e339cf SHA512 f848e60685d19124cc4c281495266a00e979c53ae17c94c2680093cb5c5153efb9fe8f06d43743697bd50663a758fef51bd8c2b10226ade4fe9dd6300b67b135
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.22.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.22.5.ebuild
index 05923fa73d1d..cfccd65c5443 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.22.4.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
 KFMIN=5.82.0
@@ -17,7 +17,7 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-RESTRICT+=" test" # bug 668872
+RESTRICT="test" # bug 668872
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 2a766341e42d..f3817b522718 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-server-5.21.5.tar.xz 219148 BLAKE2B bae7a3a82a7251c249a8d36ffbab764c6f3372675605310f2c46d977f8a8a6f192b551b7adea590b253c64af1e22e2e8bec8671065a389396def35c83fcbe39f SHA512 ff02ee6b1fb7cd193b49a4cbcf98a6b3ab6262e9da4211d91b764d8aaaa858c17863fccee19b649d2966c3a2721ca3b7c55f8a660a91d9eb56b1eec11d0766f5
-DIST kwayland-server-5.22.4.tar.xz 218984 BLAKE2B a3670ea03eb92346f20f509312d87e088b017132f5efb17b3899dac97a55270ff00af1a7fcfbe64f876078845e7aaf5faad505b242d5ab42213cbc2622a05a92 SHA512 70fa5911a6a1e14691348875024455eb74b2e814921fa0e3560ccc97469b23e6b2c8885aebd6ad866851af626c9a2edd02fdc61e2fcfa1d55d3a7b824dd6e934
+DIST kwayland-server-5.22.5.tar.xz 218728 BLAKE2B dcc74e853b5d63709c72e44c34935829e4b14544bf8571578d08cbc3d8fcf52bff9f53cce82538be28f4c2fe2eddeb0042ac43081cab000816e8f3491076fa2e SHA512 2fbbd025622fe01b57099a418e2b42d567d1874ac7e04ee21b19f471ce7a89a9feb7ccd79269dfa2b55d043d234bf0454368fd304039d9a3e056602d1f6c0dd0
 EBUILD kwayland-server-5.21.5.ebuild 818 BLAKE2B 37c065491c6eae784d1329e77d80279d8341c90ad74a2724a68cdf6972ddd653bb177def7bb18ce7bd3d8bab348fd2dc24f3a475a2da03f419ace42c029246e9 SHA512 6c2ff07507d57f8687b72e952a4e3e1633b70211a5cf1cbb99038203cd21b642a808bf506df786273f125c1fb7d0559179ae890f5107e358e07c362609b97255
-EBUILD kwayland-server-5.22.4.ebuild 831 BLAKE2B c053d1e0415e9f24ae39b0d835fdcfc7c18c54861a5e612928a51a4216b4a6bb4fed838162f755a840cd6483f5ce1990b0cd92e53108e272d577ec3e00c4841c SHA512 5ac507f87de28d8b9f7009f939f3b00d421423a10917cbcc3a5ecbaf9f79e5e0f28123c10a7b3f0c4f78788b8b0dd5d1900765c6c0800e0a6165d10e11bdf7e7
+EBUILD kwayland-server-5.22.5.ebuild 825 BLAKE2B 2aa1e771486ff9ccb0202b1de1023d8318e292a67913e2e3672acf550d59271109760a51ec1a582f680bba3852e7048e06fb9758cd40ffc7d73d3c084fbf5c2d SHA512 f6eda61404531c045e141fa7ae9086fcc1997c94a1668b92e32ff1d1e10cad0555a6925479e304ce8d074319a19b5bf057b5ba7259bdfdea094b5700e0b5a1a3
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.22.4.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.22.5.ebuild
index 4fa46a238ec0..75721f6e7a4f 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.22.4.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_QTHELP="true"
 ECM_TEST="true"
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-libs/wayland-1.19.0
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5[egl]
 	>=dev-qt/qtwayland-${QTMIN}:5
 	>=kde-frameworks/kwayland-${KFMIN}:5
-	media-libs/mesa[egl(+)]
+	media-libs/libglvnd
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.3.0
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 11fecfe59272..50ac7783d754 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,7 @@
 AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183
 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
-DIST kwin-5.22.4.tar.xz 6454932 BLAKE2B fb8a45124d28daff1011995c0e9a29365309afb4c2b6a42d9f9a65e24f5672adf160e0b06a2084d04130fe5ce42ac3fecdfb36e8d02f18eadd916f6d9e69636c SHA512 3be48794b8a6ae1c8b932f1b1e7db74138bd5e1edc32aa86bb6a1f51a109d20d72449d30fddcdca9d026a4c99be564a06a0a5064a51124b8073542ad5c3df8e4
+DIST kwin-5.22.5.tar.xz 6459916 BLAKE2B caaec435be180fd4c359bea2d1f4a9a0e3e5854f73b91b83d62ad4e488e9d779a7f6bc5620dfb2ebcf5629b2f90c958d4a4a126df34c9734220c64262e751fba SHA512 4e466f3961279610c16d24c1dbc6368862308ee7bf677bf9f8ed1898465aa31263a34362b1beaad451b6c5e94068d908718c7bb37d12b814f2af9a1eccf417d2
 EBUILD kwin-5.21.5-r1.ebuild 4046 BLAKE2B cbc52cf5c4fed84cf36b94041882e03390ffb66585879a11fa394de755dd9dce84a5181205660a3b1807ee3517f9cb3c27fea5e45201ee2f69dccc6bd6c30928 SHA512 2315787b1363d4177da611f45973a115a033e672a68098fffd56bb83b32c17c44d6d8758bbf84b1ef372c84f518cbaf4370b90ba367fc66ad0b2e97dde16b333
-EBUILD kwin-5.22.4-r3.ebuild 4069 BLAKE2B c5073462dd653c69409135514d640b65f89ac5f2cb4d020313fc6af1d3cd0015cf5692811ccd3e28686ae55881b8e8ac30cfe9d13e6b2a16de42c993da4ca61b SHA512 a0c576c46c86c6eb8a5107341bbb7df56832e8876ade22a353e6e351c79256725c932b6ede6a61199bf70d4e94d350e2ca32f529385f5f1e48b69408bd3628ca
+EBUILD kwin-5.22.5.ebuild 4182 BLAKE2B aa8b7f746962c3fd89c26657bb761e2f16d24867bda21ea464bd78388da973f6f75158a547ecda955564a4b020d5df44e6bfc7462a29e3baf1d52309ca9b6825 SHA512 f909e5d10ba63262f7375fd26b1a9deb95b72d5b62d273721e5069df863a8d6cccc1bf022fdb185a3f3a98c55aef5e6b46034dd4125b6e2562e33b439efa4c2c
 MISC metadata.xml 511 BLAKE2B 8a8393b8b3af21d175ef4353261d4caf91ad62de581ada956f74165351ebe123e4573ec9d3135aefb72b1ad0b19b82305ce6df5a8c9631bf49eb93539adecab4 SHA512 74457b580e6bd3c1b4cb86c28ca81a16688496110ddbb15887736c7ef2785dff02799e2689f9b4ad2d456ac07c3307cb8f077101c6f6767aab12e7d58287b14d
diff --git a/kde-plasma/kwin/kwin-5.22.4-r3.ebuild b/kde-plasma/kwin/kwin-5.22.5.ebuild
index 90cf72f9d9ec..493e658800d7 100644
--- a/kde-plasma/kwin/kwin-5.22.4-r3.ebuild
+++ b/kde-plasma/kwin/kwin-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="optional"
@@ -18,7 +18,7 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-libs/libinput-1.14
@@ -79,7 +79,7 @@ COMMON_DEPEND="
 "
 # TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
 RDEPEND="${COMMON_DEPEND}
-	<media-libs/libglvnd-1.3.4
+	!>=media-libs/libglvnd-1.3.4
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
@@ -91,9 +91,11 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
 "
+# FIXME: <media-libs/libglvnd-1.3.4 not a dep, only temp. workaround for bug #810511
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/designer-${QTMIN}:5
 	>=dev-qt/qtconcurrent-${QTMIN}:5
+	<media-libs/libglvnd-1.3.4
 	x11-base/xorg-proto
 	test? (
 		>=dev-libs/wayland-protocols-1.19
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 618eb54318ce..acbd413350a0 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
 DIST kwrited-5.21.5.tar.xz 20420 BLAKE2B f761da00c5025e5f9fb11b519ba5fc057ed24366206e421683ff281255d1d5ccac7ee2c33898654f33621d39e119fd16fd8d73a6cbe338af450222ffd421a82b SHA512 b187763675cfa386ef51ff6f5bb59458d799c2010d93fd35ad0fa32c1d0898d35927eb77d82dcdfa079bbd1c8c889823cc802742016d767618e6e9e25ac417fe
-DIST kwrited-5.22.4.tar.xz 20512 BLAKE2B 73e80fdf3fa7fd0e54b8c577b92c8e12187d4c1f64bd10918833a978142bbaa5795a403fb7d72487f51ea785ba6bbb6b11f33617bcca18ebdbeccf6236dd0490 SHA512 ca214b579e623ae96f594a0940a78dc1bdb2460f5295032ba8bf73b7990cb231a44476f025fd3ee85b15434b8ecc3251f3278dcaba6bbb7c504edc56c706155e
+DIST kwrited-5.22.5.tar.xz 20504 BLAKE2B 05e306020cfdeaa2273f2f9e782c19dd7ae319f6318c70498d4aa32d00d97add5abc5c19e69726b4269d9274a85377c3f1b1affdad911dba857ad6218880bd08 SHA512 2988b0cd5f287503367d48f43ac31e454d5545476bc6763360b111f945d6b3ebffc1a55f8746493c70e9443c6d04d1c41f25a0484932de2edb12a54ab54f117c
 EBUILD kwrited-5.21.5.ebuild 592 BLAKE2B 0756a5820fed7a1dacfbc6c3ba7ca8bafd62c1531a693536b6a4924cff98168d216c50946af0a098c4cbc9a12c53926260b1f0f544c0a46ce8b38bc0e2101f89 SHA512 24525654fbabc2987d8f187c3be98a817e23b81facd783b77debcebd41a373f75dbfeacec7bfc4e2a1a1ac72b2f3314ecfd5a12940c7e42f1296f2b9bc5428f6
-EBUILD kwrited-5.22.4.ebuild 602 BLAKE2B 99d5f1feadd0c94a95549475a7ea86a90e54f6252475a7b88f1af2c2f230d653adda7db03da5a017061a93ee3b9e9cf39a16ae30d1496567c23f658713b3e6d1 SHA512 c0693cbfc90294e9398133345ae7c4ad757168dc99252c72f0024077bc819bf66cfe39e7283364d7f26e4a350294b12f2ec8ce33e611d7385c388c5bf5470c70
+EBUILD kwrited-5.22.5.ebuild 602 BLAKE2B 14ef746fb324f4d0d9500f3038eb15aa193099c35de7a2ab0ea63d5fadf5390852831a012f35cb1f463fbb6e370bcc55b0a55e3ea8a075e57f33902931b83e4a SHA512 10d7ecffbdad606a69a7cd91a7e7643d6ecd20ed2c36a82d2e291d8c10fe2fa0e5a31a8e108ca4d0264f299ae8525f62734eb466315c7f8520da8dad28213591
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/kwrited/kwrited-5.22.4.ebuild b/kde-plasma/kwrited/kwrited-5.22.5.ebuild
index 359f94302d6c..9bddad6b1536 100644
--- a/kde-plasma/kwrited/kwrited-5.22.4.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index d1c4f8c6022c..b2f57fab8298 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,3 +1,3 @@
-DIST layer-shell-qt-5.22.4.tar.xz 17620 BLAKE2B bcf8d1b0e56c2ad6d757d4632bbc3034bbb3fac81b876b84793ce4d1419fc61fa85efb7723c6826170163f2dee2e5b76a552d2ad8d49bedf99e325382d30eb13 SHA512 5786493195f524068ab55258a252d7d4cac2ef92d074ac9a57346ddebdf259a33959ba7093cd9ad1caf06cab52bae362054999e16fff48485c3daa418507afc2
-EBUILD layer-shell-qt-5.22.4-r1.ebuild 601 BLAKE2B da2bbdb19be5c3bc257679b13d5ece47edb807f21aedc6b27ed7adde448fb0b36fc327abec84814527d116f33750b904d6d8e3abe1be52f22d308db4cb391b4f SHA512 b047f9bcd41483202252d9f0d7198d46793cc1d932777ace608b02e43a374d08ce4e44b437cd3dd6b1f46c7c0ef6479f28bdc5d3655a7c51655102bc25a57820
+DIST layer-shell-qt-5.22.5.tar.xz 17604 BLAKE2B 4079ffebddc52b3ec4422516daa4894531b2a99fd184135ce081de1cbd8cd14ab477be355ebe50bf41dc4ee323ced7a7cf00a629c8ee16a0072d97eb18dc1628 SHA512 5bb85f73d68eb47b9fcad18e5d52ce22bddb73a486710dc2b47e5eb5f3ffee9674969505e55bdedbae19669c9568f9b4276a739aa1cde326c7795a199e6776d2
+EBUILD layer-shell-qt-5.22.5.ebuild 601 BLAKE2B 921086f410a5cf2cb4e87c543bd469b96d527aa2d6af0e28d21315cec7a7c36e0ae815a9acbb0ac5513e885bfc4a0f56d7ae9c0fb04cc77c37f4cf7be0e9dd81 SHA512 099e5492f44196bb8f868269168eab577a8fa1a289afd9709631a5e7467b4a88f9e2fccb547eedf66e56bc3ad9224f3d88fd0c0fb90a383f15afae5783cba40d
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.4-r1.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5.ebuild
index 734daaadbef4..f5192a0bff03 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.4-r1.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 QTMIN=5.15.2
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index ffacce312c90..3fe4ad94f240 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.21.5.tar.xz 84600 BLAKE2B a7f14446932a9e4bdd0d7d90c02916380b7f263e14c3e49d30932a2c2de50046a46b6644a24697e6f94d5e72062f17ff66a1496ca61fa65c53cde349a0b4421f SHA512 283d4cac77f106d24f6eef0ba6f7a7490aff87ef5017b2db7e52ca5fd3066a33ee4e40a190cdb4e26903a79defaa724ee0a3df360464af3f76c3386c341d2d75
-DIST libkscreen-5.22.4.tar.xz 95416 BLAKE2B 45046040e1f549ad6f1488b0af7b19fb29be7d0c01d0d6d9d02a5c2107ce5ac765717c05b2fef92d671414ace673bb508a8f50af52fc87b020c207f1cbba5346 SHA512 464e84ac1fe65092b7286a33ebf0adfbc144581555a1c1ff7b1c0335e39ed649a06487cad913d7cb5b53a8c7616db98391a04734a02530b24a01f592bd9fd3ad
+DIST libkscreen-5.22.5.tar.xz 95376 BLAKE2B e5182f2bbc3805e3aab90966ea2abb91c8651acdd6aa315bd58d9b52320cf56e53588fcd7b8cf97a6b69ad523b7abb886c53a7a72a512aa1d76652e86ec7166f SHA512 3b6ccc3ebc813345dec6955ce95bb8601879614a89fc8b319da2430d261dfa0d326c64a19d3e01fc9c3379f3b876c56fc3da4ade5709aaa0f31217dd04d9a226
 EBUILD libkscreen-5.21.5.ebuild 647 BLAKE2B 214676fb4fa3d3cd9dc4918ff516a3743e5596a1e048294cf658a7219bacf4f917cd95fb7bf0aa63c9172b8e84e2da2852e9fd953c15f7750a2b13f0cbc3a1fd SHA512 398b080163d6a5962981697994c1ffca9fde92d2f9bb16dab66f3779e2ed40644fd2cf55602da6121cc777d65bac3154d791f668d8dfb1580209841a9332d8be
-EBUILD libkscreen-5.22.4.ebuild 657 BLAKE2B 0c099be61a74fc38df1307bc8b4ffbe0b92871d38324ff8f91643b67c4efa0c59906b3a11ffc53363749e48fa3a3dc326c452ce44162748b724718aa99588d23 SHA512 b3d4ac988a656f216b84558602d8c4bd9ed739f615656cd53dfb276491b09c4a78cb68f13cb1236989b9ab7725bd543358855e669992e3aa964f1def20084129
+EBUILD libkscreen-5.22.5.ebuild 655 BLAKE2B 2fe6ea0521564a0ff532659ce80a8f38b16a4408c14b5fa638f4e5a806fd45bfa03f60b04ee2f2b3fa931a3916dfa600ca1b14d43e3e1c59a36b25db8755392b SHA512 2a3539b4a244e469ef4030bb37e052afca9857ae6b5a367e8b83ff662107d5f62ba0271556d94ab7930aaf76d9ebccbe1c479d04e44a4e940a05c64b28e6a685
 MISC metadata.xml 405 BLAKE2B 56a32bcdb7cb1e85d3d992be159a30cdf5d3f42a56d4a5d838da0cd891f772dedf6554babe386eb8a78acc908ee4002ec83924de594e65a97ff176aae67e9cb6 SHA512 b4ae80d8d5685ba8cb5ba189026c5129df78aa298e7ef0552147cd60851bb93c4a4964109fd7b26a5c72ff0add56ec147aec833f407cf2f5dbab47164e3a1ef5
diff --git a/kde-plasma/libkscreen/libkscreen-5.22.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.22.5.ebuild
index 83d839047e08..73caddcfd130 100644
--- a/kde-plasma/libkscreen/libkscreen-5.22.4.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_QTHELP="true"
 ECM_TEST="forceoptional"
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running session
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index f65b2ed8385b..3b7166f1ea68 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.21.5.tar.xz 706172 BLAKE2B 776c9ae2c79ab644ee377ff76fa3d3ef41da15431bc628aa6e2f14a3914212566797c779c8aac7f0a0df3e89fe55bb748558fa56e5a3aa516535e59b5a53006f SHA512 1626f9489e0bdff3acad087577470818bd04d6d74d6afe95b11d02ecfe306328b3898a573704c11b0a34e73ec7a662b9c609b056be369694769a3dc2e6671fec
-DIST libksysguard-5.22.4.tar.xz 737212 BLAKE2B 437906819fbe2e8c1bf4377bff5f1cb6ebe87008c7e147f8a5eae89fbed4a86c64cdf0adc5ecff76c891d3253b3f19376313920d8d16a7a03efbe7ba28ec4b7f SHA512 68eab307512b6c4c5793c3baaf1ec38c5cff82cc5c4f75fba26a6605c89f438bbeb959e55ef8226d50a09f0b796dde83ae77db00aad13efc63cad24fee2f5d49
+DIST libksysguard-5.22.5.tar.xz 736820 BLAKE2B fab0f51362bd973d1b5d1ed2e393614b12e334f002b1bdcd8d2c4d582e2dcf03dabad86cf325944bdc565fb9098a361b73ec5645a0b2887b585c57c0f0acff06 SHA512 e7f14519d35146dce9eea3903cfda25e63d819a6305b099786404f2eb44b0923cf2296cf576e33b9f642c0934e7baff6fd87ffc505cc2af9f5807082f3aefd80
 EBUILD libksysguard-5.21.5.ebuild 1689 BLAKE2B 25ba7ecd1b6590393450d4909d53064ee5c9b72f9ee28a2b58312293138dfdf4fc19be0060024876240ec00ea65f2d8d648c6c8602ad296d14b984314d8b3a15 SHA512 93a8decd5e9ab4e627b48cf57ec61a089dd7a81dd2f69433c3f0dbd2dae5a2627fceccbd0147b5240ee94d69b10ee5494281f41b65d12e7651d0470dc119baab
-EBUILD libksysguard-5.22.4.ebuild 1806 BLAKE2B 5776242a366605c7fde2c9c788f570c0a90a844e20a6c8b3b14d4880710bf749facd8adac55173f8bdb9234ed37091815e3c16cce1cbe85aa10575b1b8a0cee1 SHA512 1e0b57aedca4b5696fc1729a83dbce807428d3a4b79860221d8ba1dc3968331efd4d125559f188cf0287037c4ab4d5e6ceda70c14bc59dfd26ccfcc3e574bd23
+EBUILD libksysguard-5.22.5.ebuild 1806 BLAKE2B 5fd588d323ecb7857c8f852dc214487fb92e488bb5ce203f819fdd9c0ab4bca9962df8762b5e7640a6d8649c70ecfafb2902a68fe13ffbada4b137205e8e059f SHA512 b84a3ad9ab407e5491e51c65d11f29115b6f6a9a996355c67ca90fdd49256a90f6c24499e37c0bd3f8ee7208afdfb95ffe13f08768528b85125a369a1537ecee
 MISC metadata.xml 610 BLAKE2B bb0e7feacf14aba0c3076ef60c86d09053ddbe57ffb2fb4d19c287b25dc4afd0e3058132356702caad20432c1419e4b6a5ab1ee2221a989be378e73ba7c8a1fe SHA512 f609c5b64c1b8a31129e6c968827bfe199aa5fdf096a65144b5883ed8dfd8f0dad3063184b74a40d55067b808fe6dbcde252342ec68cf3c1f02170b234a3a051
diff --git a/kde-plasma/libksysguard/libksysguard-5.22.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild
index 4dab40d83bd9..70c379be6c7c 100644
--- a/kde-plasma/libksysguard/libksysguard-5.22.4.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="true"
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index cf4520a15788..b406bc8616ef 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,7 @@
 AUX libkworkspace-5.21.5-standalone.patch 4984 BLAKE2B 84a43baece5d0233c7e274c28a7212d6fcec6692c51047ebe5459c9502bfc0fab9a46687fa57424d29691d20987ed9e2bd207b7d2d99a13ddfa7b5091267fa18 SHA512 710d9804ec23fed811d57e1f713738b435a526511609540f45953fa678eb733542682487d8a429940b20dd26bb898fbd70f2d6da3727fa6d26ff9cd839c6c447
 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
-DIST plasma-workspace-5.22.4.tar.xz 8381132 BLAKE2B 350ac0492fa393dda2613ad0828144bd7eeefb9d6cdc1ba452c9c567829ab790a880a522ac1d9dec86af47bf6643fe115a6c0203e2dd843d613d2e8e81755374 SHA512 74d0f7079977429b10f0cb91ffe1afc5c46af8aee7069730d6adad5eea29ea2877d7dadaeb859dff967453829b7737a7598cdc095bcc4ade31aa646761f12c7c
+DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
 EBUILD libkworkspace-5.21.5-r1.ebuild 1239 BLAKE2B 29b2a81890471c12443c93501ed5420dbc6fd6113a951dca6cb9ed58de6e22047c3fa54d11c5007e04ce6932aceb46742797cb17cd357a48f29aa8b849bda565 SHA512 ec2f1e5d5ce1cec05042a736ea48917521fa4c147432b92005e9675c3c0cf177f2598ead48ba043ceffab735fa5dcb419a64457e4620af050c950821525eba05
-EBUILD libkworkspace-5.22.4.ebuild 1326 BLAKE2B 239379c3464ebcb5e61518cb6cb76d1a9e2ae90650d20dfb7eacd470f7ecc7884681e5a69afa579ba45cdba0e336f11b2cf174f862993d48cd264b29c033e81b SHA512 43c948384dfdd084e7c2b81e3ffe0acc41f77e311b76f234b08d61464ae2e075fc7a387606917dbdf0e94713b478f9501b4e3dc493807d2d52994231650e218d
+EBUILD libkworkspace-5.22.5.ebuild 1326 BLAKE2B 18972fea16cb1311d66f40ecba3db83dc2340a321008abf9e32c411520591b12af0f960982e642ec11e9f0a669d7fa2e575b1a4b7bd8b194a4256488717a9bc7 SHA512 86c38adfb670695fd1686f6c3adb4e587f6dc65af3ee2cdd2f671348319eefdd11dae667d89c991b526167a403ca79bcf5382efbd697c61132124661ef672446
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.22.4.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild
index ab049eaf6632..9d21d071839b 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.22.4.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
 KDE_ORG_NAME="plasma-workspace"
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 184bc751ae55..2c348fda10cd 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,5 @@
 DIST milou-5.21.5.tar.xz 43912 BLAKE2B 070d5ba66bfd05dea05095524c71c2635dcff640deb1742ea71c08ee02d848aaf9e3f8abbed49b2d8fee3344e7a91b155f6a5cca45d9d0852c66316fbd2f3c4e SHA512 49f029d1cd5568aaaae7e7170c98e076c917bd6eeed83ea379a412f2faf2e11ce403b5d31f287cb151a37a1ad567f6f42c5f9f48c9af437d0c1ed339aaed802f
-DIST milou-5.22.4.tar.xz 52956 BLAKE2B 4ef083e1613a6a28c25b1cae50bf1d77d921eccf63bf97bc2f6da7c335f045e93153a930ab6a2d7376c42928764c18133dd7c344dd7c404cb05443dabbbc706c SHA512 d89a8a0bd7425e9046f8c01ee95ce23c0af5c389397d22cfdfa3d68e9f5b517168be05de533ee30aa2557397d7656635ec0c6eb61223a75694cec9ca22d8063f
+DIST milou-5.22.5.tar.xz 52868 BLAKE2B 188d764cf5ce14db38368cf3b1bb8a1fb62796f8eaf2e3933d53714bcb94eee657c88dd3fb485ad1471a9f22fa19fcad4e0262ec953f366aa2cc4b88d0ae6a51 SHA512 9be952458c3e5c6b0cf99fde2c6dd810f109af5c6c1fecf0419b615ebeaf5c2794301ed7d96e234a4b111fb8e5d63e11e9848f7112bc16580fda7ef107b81d60
 EBUILD milou-5.21.5.ebuild 823 BLAKE2B 753fd5c8246b905c36f73ff26ff58945a9d51bc5e46dae3ea6f6f011a2cac481cfbb4cb7323454656c72ee3d980854eccbe5e71f8fabbdacf26acc6719d34fe8 SHA512 0d1ad8eb23a902c13deb12da2e4d1471df72ad510335ed56c72f67a2a4ded48373ca4d8d41f1eb7fdd3758f9630a0586c102d5bf27fc7aece2d002cc9b515c54
-EBUILD milou-5.22.4.ebuild 833 BLAKE2B f6fbdedbcc157d042111634f8c55fb47fdb9e6c417e4e573ec801854e31cba88ffde0c909aa559411f19a38e25e59ab937fc2cc956f1058e089a240d2a9b3933 SHA512 0920af085c17a5dcb42d299b8d28e3e3053766c228ca988f91cf8d3b3802b0705d9be755e0a15ba17e18648b5c0d1d5cb986dd2c8d55ef79086ea526add1f43a
+EBUILD milou-5.22.5.ebuild 833 BLAKE2B a72f10e59d204a343d3b23728f4ebb581cd0302afa57331dfa9df37730d7b974f8b157cdad9c254b5cf8c89dde6f6ea724641e1a2a30718fa175e340f913c422 SHA512 93d9f57510ac80f11ea4c22cef660d04299956462d7d9a9bfac3dddb8b4b2a7efa0577295c8eb93ddd444cfd2fe6a32b56de9a7bb4cb6402a4d8416444c744cf
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/milou/milou-5.22.4.ebuild b/kde-plasma/milou/milou-5.22.5.ebuild
index ddfc3914771f..4c4d95850a93 100644
--- a/kde-plasma/milou/milou-5.22.4.ebuild
+++ b/kde-plasma/milou/milou-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
 KFMIN=5.82.0
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index b56d3c1d36a4..a7f134b12e1d 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-5.21.5.tar.xz 4476864 BLAKE2B bdf9d15a44c18d4cb0f18647c3960ef927bd64b7fc2c61963781ec4f690486032c7167c6995d78b9a2918571a9f55f0d3ce5a8e9848eac4acb46acb9eb9c8e77 SHA512 f8ab4989376eedecc5402dd788b15abf1a748863c510bebd306110423904790a9d3df3a246b8ed87273c4bd0425813a9b0a51181dca08b4c2ed27dcade6c950a
-DIST oxygen-5.22.4.tar.xz 4476840 BLAKE2B b3eccef6da983489c1a1779dbc83113eba28e6b046a3b91c96f4646d7e8d0ea089791f9e5e9b185ed07cb7cdff98ec736407c02ef2f450b0624152278c0ea581 SHA512 f65b0862a4c5779cab072b3eb8273fcb76b6b5972c3f9d0d3f281ac86b4c56bb6763e7711d6e51874b9071ecfc1127d0be0891d159184eef17f15afe56d899aa
+DIST oxygen-5.22.5.tar.xz 4471020 BLAKE2B 3462d89fc6d151d9a746290374c174066eed0e95404b8a6fd4c1810b185ed3d74ef78e76c583750dafb2d29cc7fcb9ddfd6415db061fcad6040984e0145fd1f5 SHA512 5002d0260a5bf93ac98d9262330f4db8484c0a6ecbd217783321bf916ef4a8f27e5c94d301e6da95cf8f276ab210e14765439f8ff6be44220e8f526d7bb24fe1
 EBUILD oxygen-5.21.5.ebuild 1363 BLAKE2B 700541554aad8371b525ac98bdd4f33e6bc78200e82279f120e0197561183f0298a1f33e4c398cb7988ec4a009d267bf08f4a907ae135db8f77d1a919ee5c11b SHA512 cc7e82878da2895030e9ff06651c7a1a71f021fb7e661e1de8b294e30c2a31145e72444fec9f6e66db597e00825fa71cba1730fad381ecf6ed8b6e21906687b5
-EBUILD oxygen-5.22.4.ebuild 1373 BLAKE2B df9f09c16058e88ec868b8a47585dd20550fbb404274909ff65e4503aec08e3ce1077cf0f5ff97582a434a6f4e0bd2489eea3035a0495cf98f38efc82f6667db SHA512 7f92df5cc3f3dc37e97f9bec2c951e4f8bd086907db6f8659a5a6b79aa4b5b0c434e3912641de38aeb13b905f2aaab01845a29cd944befaa9cb3477173a30d7f
+EBUILD oxygen-5.22.5.ebuild 1373 BLAKE2B c47722ffcc99a616a2134dd674fa2ad534a25d17690a02ddbda736724f46f2b890e8ae8091e526f64680ce342ad534df2c6cd05bfc9530773faf11eeec7bfb8c SHA512 891fb543f4f3660daf18d36cd362b85cb5bc8eed459e694f7ce4ed7a14fb62ee3a81d919e136bc2dcc13f5060cb90d140095cb8d68cc4d61f0daf01782ab72d2
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/oxygen/oxygen-5.22.4.ebuild b/kde-plasma/oxygen/oxygen-5.22.5.ebuild
index 9f873b848edd..e06df308561a 100644
--- a/kde-plasma/oxygen/oxygen-5.22.4.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 8657e344fac3..06f794fca7f4 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-browser-integration-5.21.5.tar.xz 205668 BLAKE2B cf2eaff44d3bd4553e09b5802d01903be6d6a57acac312068a636af15a4daee44a855d3dfee771ff47b4de6a98e46f8d8225242986fc73d5e21eff6b1a59338c SHA512 83165c59606d32b65359ac7a9f79beabdcd50ea35becab2d6cfec3c34e0981a0bd0452176cf213e6de0db293b4adc1615631be6477048f5e8033cc5e16f1b9a0
-DIST plasma-browser-integration-5.22.4.tar.xz 214528 BLAKE2B 8ca8b42a138b03e5bf4877f8407744ab79052a1549675b3111816044f22bf4aaafbd6748d90f4132ade1d4d2d8d847b528ec671b3a4e7e2b9b32744da4cbd558 SHA512 5be2468937542b2cc2037e9102cb861085a8f3a368d122ac4cabfa318306fb9a8b276223c30508d55588e51f6fca4da384f0c2a2f552120194f04bd588ef2d2d
+DIST plasma-browser-integration-5.22.5.tar.xz 214448 BLAKE2B 114baa04ab7fad7a3450c199b405afc3d0ce6c4a7e7cf8828dc15e509417de003ffb6b73a002b52b5d8a46f566a63320d33d23fdb8a60484e65c0176afcfadd1 SHA512 8cc29cc51c6cce4dd31677cff8851d58eb0dded0d41c52e0fa488a6f5a803c46b0f29ae02642707a039a283e19ea49fe2dac36604202282f6a62cd0f8716940a
 EBUILD plasma-browser-integration-5.21.5.ebuild 1009 BLAKE2B 3053ba179dda44694f18a26061f7899453d274f596724f5fe478a0de1ea8576c51a1abd861a1a300da2ecd2a9b2a38a9d6c8eba86e34b9007d4e90d065c90050 SHA512 dc417612bbca4439133ca48e4b1ca027296beb56c3a9045d4f8e9aaed00200b66e07fd082508670d19c2ad1fa89904ecae463491e7720688ccf270b1e3090228
-EBUILD plasma-browser-integration-5.22.4.ebuild 1126 BLAKE2B 1d6479285d2fb00b049dc5cb67a5bc24f47ff091eb07a2d5911aeb1a6f1f4f3083e5300869f664849f4274d846ee1b7e447bcb986c3402ce30788e9b72a2d166 SHA512 d37da25a7d871c734314e1b5401871700a05078e6d7ae765d237488432f26593137afb3f130295a6e01b9e2ec152a91f0057a92ee2e4f1d6399b038770910a8b
+EBUILD plasma-browser-integration-5.22.5.ebuild 1126 BLAKE2B 2c6f50ae225b52c2104e23130a000cf2fda10617e4b34fb09c5e49dcf22399a47d53792d83b60f161e3b352929807c1aedb62907b01241e29fc477d84f220dcc SHA512 1b6281df0b85dbbe9af44a3271216a1048ab6096c385fb15f0f549b208cf91fd7502b1ded9d92ec3f79e7b995070b9ffe77f2635983d38997694715111495968
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.4.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.5.ebuild
index a9f529a91bb3..93d643e0ab87 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.4.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index b54942827567..cc92697e1d7c 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,8 +1,8 @@
 AUX plasma-desktop-5.21.5-transparency.patch 8828 BLAKE2B d847a5daf3836ecbc1cbc0bacb8e6a507e5a060330d835cbb5500982d0d20148831be53e39b9613fb48d0cb5c3203b00dafa7a627ff4471d866ac6217691b729 SHA512 9b7b73d59e7d52a1acc4eb2db498c8baa31853561900653c86d6ba651093099c4bc98197a23914276ca18553c538a79b927f5829feefbbbc76592f36947fc8c7
 DIST plasma-desktop-5.21.5.tar.xz 15913496 BLAKE2B 6923a4c48d20f2611ab92ec34517a339a4fbc53875545beb5c33700933262f67b48b22ea311812d7b0cd4a169a4b19f497c0cd559c5b5f74e52410e30c187ec7 SHA512 40814910676a05d3d5a308a432c06ce9664b90724fe8c56c4f68f6eb939f35401f19dddb8c46006f44fa418e0f18b4a42b0ff78b5b07031f54e6b3c10c919e57
-DIST plasma-desktop-5.22.4.tar.xz 15742204 BLAKE2B badd9128cc9c53a4e5ce79b067bd95539f1e174e2c774c87db732a20769a6cf03518c9c2382441f0abdd38f526b097729a3fd9d8a83fa783cba61bd6df68afd3 SHA512 ac355b611fb473139f23b352ab8e496ad01a4c2377c24ce7e7951847e467b176a585c92d43e4ea54cde0a5b985e2e4536c57b887fd62b747fe9ba82f34b4e739
+DIST plasma-desktop-5.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
 EBUILD plasma-desktop-5.21.5-r1.ebuild 5213 BLAKE2B 37173e6c0cd30af1b12dc4fa71a30ca5fc3ed5dbd25926bab399aa0d7da0bd0f1e686a251b07cb046d695b3e44c3afce889677bfa1676cfac9a96e075d006cc5 SHA512 cf1f896736e0a44210c2ac0c716ee3b7adbe97940811c162e467f9dd2de75ded801b4f48abebad92685182654cbf40d54e60fdc48c7d1216dd65237ec27e623d
-EBUILD plasma-desktop-5.22.4.ebuild 5329 BLAKE2B 0eafa4c3a07e0bf09c1b094bf8fc791ba8a971d60a67e784c0804da2b0c5c8bedf466ead6b48118e0ed56c0f44288878f1a338f9fd8a9b3420c052649263d5c9 SHA512 7753be37b61148d6652c3037563fb99ea74ee9691d48b593ca61af7db76f457cc3aad35518295af8175ee487c237bc61cef6156bd58b2f1c15729c835a29e76c
+EBUILD plasma-desktop-5.22.5.ebuild 5329 BLAKE2B f68408dcee69073b5d2c07ebcfacf0c12f4bdd7a778e5d6e33ffbf72238755932f34355dc2fb92a6c2147be1d71d7fd06e5b03298b85bd8257a9123e24d411a3 SHA512 dcba01d5f9a94e03925e3eaeae99288ade10d4ff3df3dd656332846895255448d43ffd943b63218efeed523b3c905621e6a5b621b54d4b79083107032cbbbfc4
 MISC metadata.xml 806 BLAKE2B a6bb70e82516ebb513b90e1905c3ad15e42e992cf36f8a6eaa3d46a9d3d8d92782ba79c3a192b66bea948c50ede07241fce94dfc9df53581669ab52fa8628f8e SHA512 2bb0e5f1684813481d91a1c4882fa81adb22a88add7186083997deff8dbd383b2f6a2553a152d9a809a69e81f0581b48b22b0f4e4b480010c1414703c6cd40ad
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.22.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.22.5.ebuild
index ba305fc72b7d..a78364acbd50 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.22.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index d3d602526323..21fdcf2b3b29 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-disks-5.21.5.tar.xz 71428 BLAKE2B a5f2d27afa851f84874b05531d2f4a80b02f5c4238594fb7bffd3a364883aea777379c565621350a227d3680d87d4553dbec1f86dbdde12ff1f125cb5685ddf6 SHA512 b7057416b9ea692b70865122b4f4febb727c6a6dd72ffcd1cc23c9280ecba650b30c2e0002130ecceeb78b556c3e922c3ed83ec0e0d03163e01789cfb10d9426
-DIST plasma-disks-5.22.4.tar.xz 84496 BLAKE2B 45b00fb5d400b051373a16a7586d6fcf2e03bf2acf3bcdb46d169521d0403118b97b968a583039eea83889559cf08b300ea95bdd91749c5d2974059579842583 SHA512 cf54be894a61fbbdcbc32010475e0542dae4da59b43a5f9b2ae9e8a8e511b7a64fd1475dc4c90f33b9918f864e34549b91f210cadbf50681e36b9a6919d8711b
+DIST plasma-disks-5.22.5.tar.xz 84464 BLAKE2B 983ed0d6a478b601f8183abdb4d971523b30cb50038799a045a4277cf494d18ba3143a119d1e9dfc303576f5f863811934a9592e01211f3b9f0d64cfb6775dda SHA512 a49644a696d00ff84e150e68297a574b5d33190f0ecf407dc741d60f3243fb02507133bcb2e3e7bd1fc860f466a48988ac861e2b518b5a60cad9bc9f51490a1a
 EBUILD plasma-disks-5.21.5.ebuild 1030 BLAKE2B 8cc8c2981c42e066d573b4c61b0d06d6340ca62a347cda39fc807f978d4ca210e84f98736483f37bc45a829155eb232504ef2acfa3a5cb066a5c95f7aeab5cdb SHA512 7ae7aa0277c169cc8c9d25aa66db2ef1f8a9dc6b6adc23079a1f0da337dcb0e7d5577fc4c50fad3dfcbc5228365a30402ca83904ff696aec4c5dbb99a133c608
-EBUILD plasma-disks-5.22.4.ebuild 1040 BLAKE2B 74eab171d3432e844b9ddc8e6217e40366961c090d48e5492ffe0e350c65322385e746305e55db6470831c5f304069f65f83267c691a87918e31c7b121153824 SHA512 a6f79059cd9f9753e38cc76612ce1b4c6c979223be296e71b856ebdd1634f43179130d962ba2d1aee0846eec495b97c537fa5f6596b8cfc2691b7b4ab5d31258
+EBUILD plasma-disks-5.22.5.ebuild 1040 BLAKE2B f2e2d6d0c20062142cc5bc3a4f02b9b842bb91c0371f9f2b297f6b60f01c79424a3836529ac5964d4d74b5daa30da6d44d6f22fe166f4379a8434f0f0eff2413 SHA512 85875b31de4103591bf2338b898d6f9e242eb9d0e5b09a04fb945191f2825727bf221378a5cd25ab8c59dec8c17a60037c74148ecedf936cd217c325a8d95b8d
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.22.4.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.22.5.ebuild
index 07f31ace13f7..add6fb3415c8 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.22.4.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="true"
 KFMIN=5.82.0
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index 4d90ba770a15..025626d24d94 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-firewall-5.21.5.tar.xz 331812 BLAKE2B 43a026a198fb61480e90c5a5235de1abbb106e3f78d4a81fe919ec8c65c4f5ca30b340436b28369d8797d9ad1eac87fd0a4e39b5e3670f68150992e6007c4a76 SHA512 93d36b12025f1918892ad02e6b92dc8c44c27d2c6426a19fb77d8b258940a25295acd923b3957d45eb1715dae097097368b0456bf27273c217b79b441dec55fd
-DIST plasma-firewall-5.22.4.tar.xz 339068 BLAKE2B 3b3948e9905c448f36eba48af55983479dd4e72f4511033e445bf621cd9f2b3747ba1402611368974a6f19170b8f54207d397ed18e71fa11f2f13d87f4f5c41d SHA512 6863e369183d81d7ac381f0951dbf6b4c903b6ca1c5780c1bba80843b8f0650272059b1e3627762edb700162ac0488a3b07d159e86e78d1f0026f282815421fa
+DIST plasma-firewall-5.22.5.tar.xz 339372 BLAKE2B 332a7fd2be63429c452f43371b2875f8838e05b107a6c3472974c5db123eef9e415ec70601cb830a743d77422639225e01611e52c07a2b3fe079572278e2f638 SHA512 cc81884550b5c73061f5a1df24c0b32e5fff234a51e56153e95a9e4b0e23c305a555c2deff69633b9cd21dff7bfbcf5d9fcbd5ab3605d4ffa87be57514a91901
 EBUILD plasma-firewall-5.21.5.ebuild 1391 BLAKE2B b5120092b36428f2458f26417c2190faafa856bc31e25a4499aa97fea14593b8f4fb26211b97871a8a65ae5c519f64a28aa2eb2d378872a402fee0579fe5ebb1 SHA512 7b7500aba94ca646d473fd7b7b76b20675257d72dbeb252c7d2f3187f093d705d49d1890a20f9b2b2e3699b2058954d7986f28056d7df5f9c66a95e53e4855f0
-EBUILD plasma-firewall-5.22.4.ebuild 1591 BLAKE2B 0e2a7885757ed7dc4f2f2f1d6f3c0217604232242bfb088d40aae059c5ff39045f4841ab6b41b724dcdfc3cddb267b7b02afad5253d783ccdc09c0b99936f0d3 SHA512 1e4605767d4328d8d2e900e96ef12284f76cf25430714973abd2694f9e4d9155b754a0eca4f856543eae3645e28be2ace88f9cc0985e023310945f2a5af0b766
+EBUILD plasma-firewall-5.22.5.ebuild 1593 BLAKE2B 20e3ef0a82928a84231d8c01e7025bb59c991ce01468617c93f1acb3f35625dcf69c03de3549ad1e710169e356e5e1307ec6c3b0520d0092d54dfe4d392026cc SHA512 ff5dfd5d33e27ebd05849df987abdd0b967945f92f98df46e29b94df4324545d3beebba2d58e3d6c02e0f8853f93bc2d55272bf42caad44dd64dfb228a1b7429
 MISC metadata.xml 480 BLAKE2B c7bd7d16abbc4a73c7322fdc1b03cfb0de8f046c59ede768f72d817d914cd6b4e00632750004f7c8b8fc0310d2af817ad9c7bf632b115abe0a8d4abc29a35df9 SHA512 e81d7a8a804979037f94ceb6799e5107f464ba26bb480b73695ce5d87d9bf4e261e16e42320ddd307e304e4bea0bf29a348a86f3e38f2f5e97d094876923915c
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.22.4.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.22.5.ebuild
index 0a417c4b26f1..b8b3c53d50a4 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.22.4.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.22.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 KFMIN=5.82.0
 QTMIN=5.15.2
 inherit ecm kde.org python-single-r1
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 8921d913a9bb..b33339691f72 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-integration-5.21.5.tar.xz 60972 BLAKE2B 2122d64fa98dcd65936b18a5f8c09939680566770468817ab14d9116c92d226f234811952fd61222ca5e000fe213735c0da26ce73f3c5587cff4d61fcf88d902 SHA512 655fee4335569325431e9fb7d368bdf82b43f1e0e0f727f95f11f481a81e8dbdcdc43470c1768b9ab5701159ffaf571b551edc57510a653e1c7fedc1c4216d92
-DIST plasma-integration-5.22.4.tar.xz 65560 BLAKE2B e0e3409300c73fa17c4eadba0de1bc9ae5fb3741e5818959f4b8d3053aca916e1b0b34c818a2408165b9b9e58ba4f994099807025996bc910820de5dff4a3fec SHA512 1106e8e76391f79dad89483fa8db2d185119ac383213bb5f9597aad82642d7454822f54bbb249aba26800cfb4408e45fd4b9a7af354f2b1cee27c86afe3a25e8
+DIST plasma-integration-5.22.5.tar.xz 65644 BLAKE2B 5a127c3f8ceb95177447fbbfd29e24ff65aba0dba4373c42ec358f2f0df941baf428962bcc90c25217d843df7c8f896ddf35d6001f575d4d226929a62c514136 SHA512 5da783bc3e32de5e68fb065f7dc014f92216821942b6f2c016fe494915fed1edaaaf88c26cd2a830fa306459e03d63d73dfbc805a845a0ac1f215128aa18df3c
 EBUILD plasma-integration-5.21.5.ebuild 1235 BLAKE2B 5c31aee5c4c9974e5d8b2cdffa271c2644e634ff2e99d6842f114aab07289aebb60cf4c6bf1398c568a786c77dabd22d5614b27ce1f24fda19b157bd0033be74 SHA512 7b9f7a55405ce89b556d04b63519304faf175b6ce119f9747d6b1a3c71b63255300d165d65663fc82e9e6b067bd33a4aacd4dccb8261ab5e96f595f1e8da8966
-EBUILD plasma-integration-5.22.4.ebuild 1245 BLAKE2B f7e768d2ea24752b2dc3c0ca1f72a16638ebaacebdcaef2eef1e0d9aeda58b503b3ff02dd3d8a5e24424285853199ac6b3edb2a7abeecb67fe116505572e6d73 SHA512 06bfe3ebfced70e4d4c41c676630cce922bf8c5084a0982594c7283881af3588137f6e163901a8e6fea7820bafa68939b71fb5fcfede9481b3410ea2e5afd685
+EBUILD plasma-integration-5.22.5.ebuild 1243 BLAKE2B e66cda749ae014bda78dff757966791da1164778a02871430d207e698efa51576b9dd260e681b4b7aacee4d6b1329aa04a1417821a78285aaf4d7f6962bcdf22 SHA512 a2fed4fa8dca1979947aed93c8f9b31cd270f9032036cf5e9376ae6411bad3e1ed6307e250b0747fb690d1709175d06568971b2fa7d34681fc7b1b218e64c294
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.22.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.22.5.ebuild
index b0e6ebc18e9a..c1fbce91483f 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.22.4.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 648097555f95..9e25f443c240 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.21.5.ebuild 4040 BLAKE2B 614877bb903d223fadc2c19963ccada9a350d65e705eba59f29b753e5bd7448f4fe66bd42e94432867403293cfd84062fce597721c4e7b16bb96c6ea6ef83dab SHA512 ec273d84d957bdbd8d641dac1594cb068bac1fa7600d41ed91bb726aa838ce41646e5ef770447258a2b7ff1c20116894f8394223152e859353fc2e2371259d15
-EBUILD plasma-meta-5.22.4.ebuild 4096 BLAKE2B af69b4c70cf703e4136498c6b63c1ace856d4ea9e28da584c6fa89bd9f41de99cd2d1e414e1ca5160f03d0cabd9899a4f789a59cc4d7fd3724124882322314e1 SHA512 7bcacc764fe9b04b7b6d7a828c7ee6e0004cef7d72ac8686fed3584c0cb1ece2031ec9380d1c3dcd756e87ffde1b46f99d3fc5ad33e20410c2b447dd106b8238
+EBUILD plasma-meta-5.22.5.ebuild 4096 BLAKE2B 3157908a91e43d54808f0e5ae397aaf405c5b3e49cb2e2aa1fa0a5a1254d8c29362b0e05203aba46333d949ea0814d52f7f2ad79cd8aae52a473c05d01185271 SHA512 de937c877713f92e5000b45554eaf09685daa82bc87e88686bc4dd88b87f49fe4c553c6db7959e48877d3f2e19dbc8be59aa42db9f8bc9af9daef914653c22bf
 MISC metadata.xml 2379 BLAKE2B 5fbc8f0a3435246cd7a39a20c003e65e602106d7874c915dbda0da4bf1b5fac3cc48dddd63ac5cac7278e991cc93d6245787541f07b2b623bc4ee09453d872d1 SHA512 90e3111e7927086214a0bc738cccd638be74cac630e5b1e09129335fc7f8a1b15da6b6ce08f3b5258990f6d77ff899325241bb35629f9a4d2f6a4088c3138e8b
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.22.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.22.5.ebuild
index 58d1344b1117..eef3ed03861c 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.22.4.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Merge this to pull in all Plasma 5 packages"
 HOMEPAGE="https://kde.org/plasma-desktop/"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 1c9b4e474d2c..e60dfe25af74 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,6 @@
 AUX plasma-nm-5.21.5-missing-include.patch 930 BLAKE2B e73b80967df714f8b9a5afbddef8e5951d02c553b70d2b7a40f7162db5fdf2ab16930ceef649818fc3afa658989eb6caf6e0f4eb91476aa88581307545f1740e SHA512 2f67d123a5280303ddd8c904828da6c2b8aa6b8c6fb06853d55d47050255d154b5731703c70208802ced0e03ffdbe85d292636cb686f0f70777903c7c5bc1ed2
 DIST plasma-nm-5.21.5.tar.xz 902104 BLAKE2B 8b881f39e01b7de0107b897c81fffb7bfa429a0bd7d8eb58026328ac42c411d5dd8e154e843767098731174a492e64b6c8a28c8af474584862f58081d9a5e751 SHA512 ac074e50d5ee3be99bab515b02522e391b14936c1c8152ca067c7513af7a8e8b81cb55ab9b412ca703554f3e35fc9392368159c9872d8c372017089a4a65e3fa
-DIST plasma-nm-5.22.4.tar.xz 900192 BLAKE2B 33f5030500b8e9700e50fb1394830fea5a74bfe01f62364cb1971f6362c630a773991489d555b975586cfb7a03c89a461cf6e59bddb07d60bc6fafc552fb23eb SHA512 4c4f4f8341fb73dcd47f201f4f48a2309c9880c6bc611ab0ecbf9680b5a0bcf877faa10be8800894f141843c4fb87b1e2219dd23a44b560d14ac4f9c5a757cb5
+DIST plasma-nm-5.22.5.tar.xz 898960 BLAKE2B 0285425f4ed474c38e3a72b8b6654ba17e957921db0372bc24a9ce4fe226186cb687e5ec91836f7bbb1cb2fb9f4da1287efca41cd7b11673e2086477024f4578 SHA512 802b908c61214e77162f09289d9e9c1d3c9d39b77799d71b3c4802245f2920c29065b793a83a483a9e9df004e113bcb06fa864c456b6950ba3a4d8eaf4ec4b94
 EBUILD plasma-nm-5.21.5.ebuild 2333 BLAKE2B 79c1df7a5e2f57323c73e9ea432093a05918f93956ad4ff3b13d308d04f62648ae8a34f8884fef890a786ba2183134eb4667e8e2ef979b51488bbadff4823b48 SHA512 04a6eb5b20bab5ee3372f2b0cc9d0ba21731119e70704ffc6cc6865af3ddef64621a69f49e25f0d01961511c9d4fde86e4501e35ebc4f612fbdd842051c6a7e1
-EBUILD plasma-nm-5.22.4.ebuild 2289 BLAKE2B 97f810f4c12e3540a8e99b6bb762d492797a852ba5c94b4c48625604a041f0a1256a6384dc05ae4dbf942ab68a1df3c00c6cd223c4d16c84ac63fb64c7c00558 SHA512 14758a8294dc991218f4638a57dadc6e3c05ade2c8d4902595d15e08d73b314fb981719fea38058fd329c329a5bf5c276211995966de766f537ab67ee510364b
+EBUILD plasma-nm-5.22.5.ebuild 2289 BLAKE2B d406a5bbf13e29e8a9e8d36aa13a83cfdeaa6208e6752c684c7fe6382269f4e1a693819ef8eb1cad8649be70238c55f48cafe3a1913bf0b866bc47cbfda383c2 SHA512 3c99d3778321ab5544459640e7f9d453c1de5b988643ebd46320399924dda1ad300640ce2a7b79606a0128a214b4c20792227342b7ab09acc278c55ca42a0790
 MISC metadata.xml 547 BLAKE2B 494a59e4527773e8075dc3f9d4b2b62eb193d66225764644fca3071b4b3bab4bc8c0ad0628a8dee16c89ac023d54ba051af594b4302b2d8f82e5ffe91bb6dc9b SHA512 cba9726aa3cf865d115bac78be3cd43c05e98dbaf56cfeda7f68191c875385b3d5f48228a8a405808b458baf7f50688ce5617968d1551139dc1141f5eca29277
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.22.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild
index 8d8b48eda04c..04e172aad5cd 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.22.4.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
 KFMIN=5.82.0
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index a7fc176b1d2d..80134f385fad 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-pa-5.21.5.tar.xz 114508 BLAKE2B b33b5050e7de5dfd99e2f6b881d779e6e92fbd30c45fcd86b0ec65aec81d06b983789c4e617372b74604fcb51315e57e5f1978fcaa4cb9c6c45aeac94f4a2c85 SHA512 96a170b0ae90ff5a8015a532cde50e7a786452f9d04a30f7ee2402c9e7065ed1891e229f589bc79337ad68cd310c339840b10e7bb94551bab744ab7ae9a2ba40
-DIST plasma-pa-5.22.4.tar.xz 127416 BLAKE2B ceeb17c7eed3cfdaa4f2496396a734834570969bf9841a0b4cd7927175f8a7de846d151cb3d31535a49603d428469d7add4bdc24941248c03fff531b2d2f8c1c SHA512 73228e5b69aa9a6f9f6f11742c09daadfb0d8369766b774281a0a84a827348d44eb9b494e047652e8098fc59f577bd4f6f85dbf73a9969fec5e0c9a5caf5e39f
+DIST plasma-pa-5.22.5.tar.xz 127092 BLAKE2B dd57129aec51056ac7f7020d0e479718c3c18b7da7c7e75e8b4dd2f052c3e198c6dfb350000b50230293e8e35281862a6ad503fe62d23af7083f15f650a13d38 SHA512 4082096d532ddeba6b9cd117a7588fb5b62739ce7265b70ad5834cbd30dab140ccb8b3146f9264dd01a664bfc72071bd42cdd23c24b08fd7f89919d939eb4ba9
 EBUILD plasma-pa-5.21.5.ebuild 845 BLAKE2B db67708d89753791f8823b47248693673e3629f0fb55baf03f3bf1e8db4c4472e99eba74fd8b218a4abdc0f34d2232da59929b3c6c6f63645333e528a87be845 SHA512 082f71d18ba742274f806794225a8b6ca090266d2b53fad041bbdba09dc6e537d3067ef8e96278d52861ab9a401c6a997ef44c3ea2d9b816550680f93407890c
-EBUILD plasma-pa-5.22.4.ebuild 848 BLAKE2B 518c70fb3e7dee877f0f91a6290502acd27196f44f751f1619e3950edb65be199f695092285a686d8fa3522b56f601e95575cab65d20932561a6c0a9ee6cc4fe SHA512 52fd2d1cc94d145b5b5244f4551dcbdd9a7c0386dc3a60b83d5117418418a41e5dca85169f75b834419bc2976b34337382f5ea4ddbc76fd167e3f5f3f221ed2d
+EBUILD plasma-pa-5.22.5.ebuild 848 BLAKE2B eecce9f78971b0fe01414b97b196dcc4040e850e4f1adf9b0b15679d1142b50f29f1b4349e369ff43614510c24108f576776c791f01046a08ec661b0e60b7502 SHA512 ddb36e96c6c731cfc070a0b78e997aaece62702b04bf4e366c41bac692493b70359827415f33c0a71d128c76ab4d8576eef929ff58b12bfc7c426711da37759c
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.22.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.22.5.ebuild
index 5925ffbdeefd..fd8ff5db22cc 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.22.4.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KFMIN=5.82.0
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 5a36ca319a60..83c213c6a7fe 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-sdk-5.21.5.tar.xz 270648 BLAKE2B 59e6d00cb24a392aa829bea8e0206c7f7867e8f5cdba4a6a2ab6f4f328dd83fb18d1f25c78a5b461d182e8705cdfc8f3141ea947eba6545c9dee0d159de3bece SHA512 83d27d9ffca15baba292bdf285f19a743589f5a4433c6fad8fd581a93a910be0ce98f3163c7d6872d6a95b71342e301de5ebf6ce2677fcdfb61b8e4644a0d80f
-DIST plasma-sdk-5.22.4.tar.xz 269548 BLAKE2B ee25d81f6dd602ffc91ffae9a2619cbfb015b9cbeae18e24f61e4080541c91563309fdb1f2d0aa28cf4db8f9b23f02035ea3cce6f96ba6e9d2766083c6f35be7 SHA512 4809f69d450f226c2d80a6f469b0c9d5e1836fd76209e7ea3e27c213e0a5ef69895da130b8021ed7ffdf2f50d3d998113b1c1c547d6b3e4a0e789b9681961c8c
+DIST plasma-sdk-5.22.5.tar.xz 269688 BLAKE2B 90ed4b103b7b2ce3bfc3b84dcc0928d7e7b4ab88c7eeea9be0f2be8807b96271e9e5c0a00e04e252a3c099384f90f532084a03eae79ed5d88da97994bcbb715d SHA512 893bf785994537068efe5f8c854c2bd9a650849029822a5790b3874e2137eeac4f587185e571471494a47551c60e8b395520e125b8e2f511f36f6f483867671e
 EBUILD plasma-sdk-5.21.5.ebuild 1254 BLAKE2B e7aa53c5060bfba5172d6f7acd95ded4b5ece499f1c9682ba71ec06253144cb6c778360a2bbb40f41171ae2a1fc146fd3e208d66971f6ceef6c6e05e4137bd8b SHA512 3f24a166cf129d2cee91aa4037e5754ab8bd8a179f003bf4d3448154da56407133348095c390317f7bbd978369c1e0726ebeff94517c45afe8e573618fd14e9e
-EBUILD plasma-sdk-5.22.4.ebuild 1264 BLAKE2B 0480ec779fc9b48435952394b91272e1ffb6dd400b7cd7c292d222914122a7a63ac7f514d3ca33babd833d3a2047ed5f54e1ba8a66cd68c4877c64f660b227cf SHA512 a77e3ca143c5aaa227acb62a37ee01000455779727941ae1d78edf05d46b7ea67dc488ea41d90e2d55b6b9b1fc9925cac655c26cb6c03669b84ff6351e901883
+EBUILD plasma-sdk-5.22.5.ebuild 1264 BLAKE2B a5b43eea3c6e2d75bc814812f24858d8a35e479bf964b145b9a6231eb419ca2c363285ecef3a86e705c524604e9c6a835ee314244d1eeac76df36e99ae631824 SHA512 08092fbace1eb9a4399cc5016262575b794fbe39fac18bcb8ed5bb6c3690170fd6fbd0b1f156a6379ad53f89ff650bf9fed162d3f22eb284eb06a5a6cec781cf
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.22.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.22.5.ebuild
index 20916e5a1afb..09ceedb3ab6e 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.22.4.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="optional"
 KFMIN=5.82.0
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index 82fc06148c77..6ad65b6e26b6 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-systemmonitor-5.21.5.tar.xz 124792 BLAKE2B 47c55bd7ceb31c7128676e539d7c48325db68b49bcbee0a4d73cd61ed1360500e7765ed2d5d01bde542bfb74e7b6db26158c6b281aa1e65a5ba450595117777a SHA512 f21db1dc9428b9f97b4b012ae481738f7aa96c9080f35870c8a8f2dfed582b937507fd626723dbd60e66656d78984bda24279c77548d65efd847e15374b024f0
-DIST plasma-systemmonitor-5.22.4.tar.xz 135508 BLAKE2B 1562d9f66c8b61c1016b702084a01500195e9fa77ad616c03b1c09593eaf2f6e73b609aa436baa43b6100fc03117ef0f78383ac0522b0ba2a136eb6dfb6808d1 SHA512 c14e93f20f6412d69ea8e9bec7e57462a2b816ea0330a848a604a297ef41dbf586e29f8cb0fd8a49240804c66f2b08996473a44ff82ac960503a214dbe4455ef
+DIST plasma-systemmonitor-5.22.5.tar.xz 134624 BLAKE2B 728ce4b89405445cbe385da504fb026d0c310eb06d41a3c4ab5557b8d66d1ed000ba30334363e5a9975e7515595e1cd3dac493a01f1f1bb235df4b9cb3f6ba38 SHA512 4116be820038318022efe6d7460d7deef2983940dac7ab1949aa0c8d18473b15d9de41f21241c63342656b5871c1a2291daa3ff0d576849fa27177425419013c
 EBUILD plasma-systemmonitor-5.21.5.ebuild 1159 BLAKE2B adc30ef18953aaf667f8c424450d57cb47deb43311696847e664b8201dc72a05cebb472f6108a528fc88c7f8d3168bf3c9fbd3217ae9257d0e5e3128b8ed6c45 SHA512 4b7101d5da1682a10664edd530573a19028510baa6ba9a82f31f5e87bc05a8a52dc069d4a603a119ba9d498c56b5912515390716d89e28fc8fadd05f0665c662
-EBUILD plasma-systemmonitor-5.22.4.ebuild 1199 BLAKE2B 8f4e4c86cd52dc3335e6c035510f0857cda01a32711488654a1534c081403b4731ff4fe05c1a66df20e49de2cd659bb4097b8c6f4dd9467dbf984ab0437eedc5 SHA512 89b22d3250d11cd5e11ae4978442ed2ed268e8cec390b08fcd5479f72789a563d2abaf5cafc4d6c1d052baf812dc664def780de541ea53d7e68239084b43bdd1
+EBUILD plasma-systemmonitor-5.22.5.ebuild 1199 BLAKE2B 0f32983aeda298370ae8a984dc9916aed9865c5ef8c8027d07a86d796910ee3546637600c33cee88b251ada724649018d8083459fe5ab20741338fec75415f37 SHA512 092a60631b8ba8d484803f8e6a46ae4b37e8f2622f795c68b912469a6e2c45f3ddb6b48297aa8f07a5beb784b4149f3a34e8eb95a4a6a640886a621f49a1c08b
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.4.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.5.ebuild
index adf6e9ec292d..51959f88ec37 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.4.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.82.0
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 1363766d0174..ed85b2705df2 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-thunderbolt-5.21.5.tar.xz 56556 BLAKE2B 9f80e1848693fccb15cb56f8d6ce89136efa1baa60dfd42498a49f59c9e688ea454aa52b40e8791999fb12dc540308bcdb855cd7462b79079a257a58a29004c8 SHA512 b627ee07e0fe308b70b11c2a887443b8eb3997cb9895a67f8d7760a4294bf36eb612ff888c981ba63a6485180ae7d1cee3d9c7c0bb741a3db3599a2650ba6843
-DIST plasma-thunderbolt-5.22.4.tar.xz 64416 BLAKE2B 4af480e579351906421e484e224bf0d57bb75329862424d77aa7dfdf3efee9f673358136d46d0bbe72f74db0acca781dd6d41e0abdc35f1c21481bb483dc88e6 SHA512 e7a870d0a23f38111b0f1830d25d9a2174247e874dde08ca615bde73290137fdf8dabd79436c30cba3d9eadf286ae2d184730b63cecf0c1cc34467cf07048e20
+DIST plasma-thunderbolt-5.22.5.tar.xz 64216 BLAKE2B 74914087256f7f0496c4f1f4bf2f82180b424bf357208b70d0c6416a9288b7f26d0dc385823a5ace087dca3aa388963b28be00d31f1335bd0ba1071ed382bab7 SHA512 abc492c6a69cd3a2efa82c798d9a5e178f08fac098cd68055308f5bb4459e16914210e119e50838dd5af8d2240ead47e1dcfb06cb49a9a8d4e4ee6c0ba386581
 EBUILD plasma-thunderbolt-5.21.5.ebuild 890 BLAKE2B aea9c51bbd46e64cf892347f12ef69e949ec8c2374380ee6a4cb36aeaaf97a7ff0e8f11796d0f308fa45d49a622bbeeece5f14611b826e332f8b89cc99eae977 SHA512 5df2219a0225b546724d1d823b8015b78edc392ae8fcd517549d2a879e7fe662729180a9d1cb5db5ec3aacb9b6959ec1059cd755e3f77e548b1b0e96afeb841c
-EBUILD plasma-thunderbolt-5.22.4.ebuild 899 BLAKE2B 852a2666c5e2c280617502406ad1fb9d8a009a0535bf28c06d09193c189330cd6ade98200d3ac1303a656e6aad9e80f8924b5216a976a4f9ad3827b824ab6d63 SHA512 f1545d66ad0b62f4500fcf91f2a0aced836d6fa01c7e5693451d2b839b15d1165dd49633e4d370ca143f16e205d016938ec071652a44cd6cd585a8f7b8320cee
+EBUILD plasma-thunderbolt-5.22.5.ebuild 897 BLAKE2B 0da3969bf13cd180c6144e19bfa7d93034bbfa6298e4b8863aa5db8e490f53e6bd76f1d071e152d71628743e556976000f0e41957c6873f1eb57fc8377a472ba SHA512 af9a0fe883cd010d32675be6a4cad240fb9816fb9a493ebee118ff9ebbde7f567ea22b4471da5e3faab6e82b65c8479484564aa0e8a283557825b04643d9941b
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.4.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.5.ebuild
index 7bd9abc3b92d..8daa425b8ebf 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.4.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
 KFMIN=5.82.0
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 # tests require DBus
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 95f8b0495bf6..25aa926950f1 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-vault-5.21.5.tar.xz 160084 BLAKE2B a893a8cb9a3911eebb7cc1933f5bd6ee527a639e0ffaabfd9db864acc15962127e87abe3838a24311c65e87f2bd2320f788a731ee2145909e7d2605fccc9184f SHA512 bb3a4471e6a7cfc98eb4867142467cb009456c7643e87f274372e6d9d8cff1b97c6e70c1a3a51e21b72cc0d7a63a801f4681e3977339eac6a9ab108b13dc6d5c
-DIST plasma-vault-5.22.4.tar.xz 170956 BLAKE2B 516edc988716cb87e62a9c08e338fb63cfe1cb81deb00c5cae3c7687d9300e1ac36ebb2bccf5c8716eaea7183bfa6b4918a6a2b9366a8312579b6be7576ebd27 SHA512 99654996a8fa5f7cf813b2ad8735aaab055e012c1c4363d2bed6dd34e51c8f642ac9d2c48526c8c1c98c24849230b296aff148c9e863b9de8cbb411c01c69000
+DIST plasma-vault-5.22.5.tar.xz 171012 BLAKE2B 44cc939d1fe03d4a042d3cd28b9ecc9457a1c667f5c7ee145db9d600ffaf49407108c019e91b475647bb5922b5fd9a25224dc00d3c6eb18e1adc67b0ee83cfbc SHA512 360bfe2ceab0f6318dff866af9a1445ea7f43bffc0471cee50d2283bc125062cbea5974a88db537384a5b5bfd28e679be3c50f95afe4b53c9f7c8a6ab6756cf0
 EBUILD plasma-vault-5.21.5.ebuild 1274 BLAKE2B 3685fcf92739494b5a31ef3b1e0394e3be7a3e1f0d76eb5a4444e9232f5db527ac1f2e1b6cb79ab75378402d9168d786cca3e88484f106e458fe0d23713c0fc2 SHA512 920e0e6472ee03d98ca9849f280b7dfb02d08eab24d5965664762e8b3a917d2e83440f81d1f0372572a484f735d7e2a5ca37cf039455d052e1167fd34e020d38
-EBUILD plasma-vault-5.22.4.ebuild 1284 BLAKE2B ad6563215463614239c0e50258b708cba5b7d1fc2eeb0a0d973037468002357df949abcffb7289765ff19c18aa70c9840e92c9c92cf3a2b5c5b9e2004c643b53 SHA512 c006e1b7011d49b16351ee37b0482041a69c203e6c2398d39f65f1a274d1e51d505a9536673b2f305553585aa77292685c928bad0dafb010462641f692ca57dc
+EBUILD plasma-vault-5.22.5.ebuild 1284 BLAKE2B 648706299eeb167c751ad7ded3ab7641a4f6173cb883a8638c038e6acac550e37bab385a349ee91fcc0be889cbabed65c04f5d169bc34939708c83192dcc71f3 SHA512 cc81936f139f9964c384d9a22151c0a414543a29fa99feea8b8517b20643258b80dbe4ab55242bf2b3f2478fbf0224a14693e99b9e076664348a3e188b830a6e
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.22.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.22.5.ebuild
index 3f0197c29a79..129bbac385f3 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.22.4.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 23f555c80a08..8953fbcd77ce 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-workspace-wallpapers-5.21.5.tar.xz 48099464 BLAKE2B 1cf45627c00ebce5ac6960cbc1c773f4239398de247a2e29866de8daa53e7a9804b2185d148c3a8c507eac1c6a333c9c6a5472b37d26979029df3652e69913c0 SHA512 d0a7862b55238bafc106b654bd584cd6e2fbeead8d6694cc71df23e74a2da02c0b25b2f412514b45c1d2b04567e7758ef7d77b6fc5bd814b5f5bdee0c26926ca
-DIST plasma-workspace-wallpapers-5.22.4.tar.xz 51348292 BLAKE2B 42a47d808f17e34af208b54dd7999389c89d7b8ddbaee36351f262c970fa9736bc8167a59a2a44170593399b52f5d96a3a7ff29ff84bac26d98554411ec1e275 SHA512 77330c5483642b9dc2bb5c985fc10a65bf11b50c1fa58a516044d82abdb4942b41617f5eaacc73283217f6aa27ed48041a3263f90fee5f5f67aa0ece2b578f19
+DIST plasma-workspace-wallpapers-5.22.5.tar.xz 51347952 BLAKE2B 090a0a72357e3597e102f3164596cf8614dea88f06a30c07019085891c65278dfff6149588e3c0cdedabde3d8c76cd0030878870ce3106b27b0222577133a3a8 SHA512 851e81e901fb50fc1c65c0863570b4c13c41ab3b4eef0fa862e60813ea6c316daa629464184cbc7f76f4ab4fd7422abe5ee1931f46ec968b9176bfe7f72aef19
 EBUILD plasma-workspace-wallpapers-5.21.5.ebuild 348 BLAKE2B c1e079d7883ab5f823645802a14b49636285ef2e3f4016f93ac898bd2506a447939922f5718c1952ebd1f44951dce635ea360c29f63bac5aff85cc18ea8994ae SHA512 f51435ffe85756594615cb8dfdf6e5986c94463521922ef0e36246adf96da0f2dfa1195372c26da325878bd32c873fbc95892c747c9cac133cf66582438d5a26
-EBUILD plasma-workspace-wallpapers-5.22.4.ebuild 358 BLAKE2B 1f28a4c9fc5b0442347bd35a97f5c6c7bc89088fa7f3ecf582a5fabe642c02a07e3d3c4baf6e655317378ad666ecadc6c790dec593002e2f94830916240af5da SHA512 9a0f56d713d04361e8eb59f0879717dff9c154e1151262922d7b5b67240a8fdb715f19ede26ea18ddeea56aa08bd53a93e084f6a6b340f8c06f19c24c5743ef3
+EBUILD plasma-workspace-wallpapers-5.22.5.ebuild 358 BLAKE2B 29af02f5b757245b3351633816c786120a7cbd7468c306c1f38de7de5e5f73befc67d3c85ac89e9e022bebea97064356f9f32e335fe535f9cbe2e054582b84fa SHA512 d26b6b8000b08c95c964e286ffd1f78aa3cb9885c10dbab0884296d4c05a6fcb4e691f05a9bc3f5a54c88b06aaa0a74e740b47b9e85275f3407d5f2f4b707510
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.5.ebuild
index 4c2cea1cc415..505df2c2d303 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.4.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
 inherit cmake kde.org
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 29bf231eac33..2822bac24843 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -6,7 +6,7 @@ AUX plasma-workspace-5.21.5-split-libkworkspace.patch 1154 BLAKE2B d37f649971b95
 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.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
-DIST plasma-workspace-5.22.4.tar.xz 8381132 BLAKE2B 350ac0492fa393dda2613ad0828144bd7eeefb9d6cdc1ba452c9c567829ab790a880a522ac1d9dec86af47bf6643fe115a6c0203e2dd843d613d2e8e81755374 SHA512 74d0f7079977429b10f0cb91ffe1afc5c46af8aee7069730d6adad5eea29ea2877d7dadaeb859dff967453829b7737a7598cdc095bcc4ade31aa646761f12c7c
+DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
 EBUILD plasma-workspace-5.21.5.ebuild 6350 BLAKE2B 4d126e250eedfff978e5c0d36d3f629bc03057347603ec470c4ed69656b2025ad4704883b086cd33eeb591a5dd8d259b4f58342c426b853ba86cfbc9fad3d066 SHA512 79e67ef32136f66256b044a60ed1780bf8814a826730402033c386bf538e4509807890403a5238cf6f95c483f668e7d7b4d823b9c15597e005f859ce960dc58e
-EBUILD plasma-workspace-5.22.4.ebuild 6141 BLAKE2B 729c07fec584d4368ec0430910d18a89827bb74133e984a9cd10c39c1e5b3ffd7bfca360b90c187b208a81d2d7fb5062db233975412986f6a7712646af1c3996 SHA512 ab08a5a213923b5bdd7f5706fb0b40e581703ca1d8bb5eb3b1890852b238bd74625b23e2c8689d5a17846d943da0fd86d19d16ea78698f0cb5a5b5aec8e796c1
+EBUILD plasma-workspace-5.22.5.ebuild 6156 BLAKE2B 8ea0667431876b92d3d287582d058abce82f6ffd7483f43dda5330eaa0cb4544c8811c615f47c6c3af0d3c6155a08a13fd901012f49f05a51ded151b7e68f519 SHA512 7c2b9bb3f3d83e4de64821f96eed69e0a1e61e5d6c87279acf13ab9adbbdf0d67f613ffb5a33da097c30fb309e569f4a76ff0277db36b501916adab804d83343
 MISC metadata.xml 793 BLAKE2B baec7c71bc186807dacadd0df0a3c52b535833cfaa2dbb6c8e1ccc6f19b6cfe6c2768c0a32c81d1c87ed6546d26b17ec87505e105660b98637399644d274bae8 SHA512 5e72da9450d60bd98312992e8ce420dbdd0fd2093bf18eb8f15b08fde93d3a506d4a5be9adaafe7b2ca47fb342da0b43fe38ae7c648cb1a144a3f1f24fe02ca1
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5.ebuild
index 607a6f702485..22c7fe6af2ba 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
@@ -20,7 +20,7 @@ IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
 +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-libs/wayland-1.15
@@ -107,6 +107,8 @@ COMMON_DEPEND="
 	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
 	gps? ( sci-geosciences/gpsd )
 	screencast? (
+		>=dev-qt/qtgui-${QTMIN}:5=[egl]
+		media-libs/libglvnd
 		>=media-video/pipewire-0.3:=
 		x11-libs/libdrm
 	)
@@ -126,7 +128,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtpaths-${QTMIN}:5
 	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-apps/kio-extras-19.04.3:5
+	kde-apps/kio-extras:5
 	>=kde-frameworks/kdesu-${KFMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-frameworks/kquickcharts-${KFMIN}:5
@@ -140,13 +142,8 @@ RDEPEND="${COMMON_DEPEND}
 	!systemd? ( sys-apps/dbus )
 	!<kde-plasma/plasma-desktop-5.21.90:5
 "
-BDEPEND="
-	>=dev-util/cmake-3.14
-	virtual/pkgconfig
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
+BDEPEND="virtual/pkgconfig"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
 PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
 
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 86f0e88473d1..ad19a5abc8e9 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.21.5.tar.xz 43356 BLAKE2B 46130ebb6ce4a9522546d87f7f42d65cf41f1eb9dfc5a454732a55d8cf0b6b73bf5f2a9286f05aa21bce73218c10499de7953fe06f3ecbd369071fd9a70e2b0c SHA512 d8b8187ecce7bfdd2a3c22dec9b4ea2b085614a7e3b495671226bb9c5fe0a674d75ea03c74bfc3cc58f0ae3a7fc82ec2261d1ace5483658fd65333f61f95ba07
-DIST plymouth-kcm-5.22.4.tar.xz 38276 BLAKE2B 82b00e6e84b36cf2eca5a66b095cab77df1c3d7d2f33b39fc219aae95d65fdc7061c021cd243d108a7753a4344b5e5a6da6d442bfad6ef60d7e982c17e917387 SHA512 e3600f041f023a0324113cc0a7a54bbe2f99fb9cca014e6fcc7a39811439f59420ccc99fe9818c6673d13f964247f9d228007df65aa86d5fdeff63e52b1f662f
+DIST plymouth-kcm-5.22.5.tar.xz 38064 BLAKE2B d6177f953be19344eb949ff2a76da131cb18cb62e9917fe480b703585e57fa063b01783233376a8cbc51f7dc8b204e7bc42738685ee2cfa3838a95a2db9e3970 SHA512 eb18fa7d6c4c0df765679db000c82d95c72346a812005a743b83491ce476fdb790e302ce074568420041b3f9dc23c0fde21dcffa8dfaed02ce0725b831961ba3
 EBUILD plymouth-kcm-5.21.5.ebuild 958 BLAKE2B 36635d101b5ad1fe414c917c504a432e88b6281f474b04b5a9e62152a244150d914b571105517987496035038ad1f92f9408c5cb15a541e06b3c90b2bf21f718 SHA512 4ab44b34b5b2b59d50518641dc48df4cae86395c2ca084a64dce87d9d33e159b9ada04339557fa6fd9b2ca2ae0e34aaa1f0d8421b9951ffe3d15535b01066ba2
-EBUILD plymouth-kcm-5.22.4.ebuild 930 BLAKE2B 7581d321ecfe302a94d8b9b56e2efeed1445c7c545fd3c88ac50df92fa2cec8c8b6dea948548963564f1f8836188cbe5794a61155ead81570c6dd6a062b421cc SHA512 84314c0309c859291ac921a9772860a26c523b592609046e9a3b8f1af4374aaf135c06e0f473d6d30864c5f4e57a008a6a355f0a8ccb5de7143a93d4ca2aeacb
+EBUILD plymouth-kcm-5.22.5.ebuild 930 BLAKE2B 7bea64c7a0aa73d635fefdc58ca12227c02d01add83293cba5c54f42a2affbdd65aa1fbbe033aff4908400cb47444207ebccb2d49b57d08e15ddedf17667c51c SHA512 b14a5f11808c84e0259e8153d7d56b4a6549014a46989bda252820a80ce3d335c5957558aae581d506577a818ef15ccc61f038f0ecf0ded6e227cb4e571ec1c8
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.5.ebuild
index 5d62f9cdd9ab..1b2413f157af 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.4.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 503327f974ec..bcfd1972502c 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.21.5.tar.xz 45848 BLAKE2B 1776b97fc4ea6a5d4ff13b90b054379997226ea3726c94ff886ba719f5445c8548d0680c3634b7ecd3f6cc2e9e1d2416e8ec58e8b822e465cbbc0c2e719053c5 SHA512 840e63d962054e6be2204f0ca5142249338050a1d3df3db66667275ae3fb1930bd3d9f4ea37b85feee73b33822c8b34015028b981d7a100afeaab793f1525ea9
-DIST polkit-kde-agent-1-5.22.4.tar.xz 45764 BLAKE2B 188f18b0d8096e3e65d501482b2ab8db29104704fcb20edb56b771c2baa7e96430062eb9c30229fa7eeae6406205a74b140e4560408807a7441c2cf38d5a15cd SHA512 19cefd4b7e7a8de7ac3dcf83e2d68bcb9a317d4afa70a610174adec4c20fe013b468d13742def227fac0218459639683f8439703562184c5cd4593a21ba81981
+DIST polkit-kde-agent-1-5.22.5.tar.xz 45652 BLAKE2B e95815b7760810743d54f1adb10992f1bf1cbf37870729c022aa8d34e518b41af2b81c9e3eb0f22dad0facbe97d1a70d26b31aa1aa8d8ba2ab99674fd0357814 SHA512 418bee7d6f32577a68e7a7a2f3db0bf54eb213bead9852356cd813c1a64ce64e9cd217f7b9b13c8872a797c4a629eaffa7d2f1ea4ff471b70567de1f6ac808fa
 EBUILD polkit-kde-agent-5.21.5.ebuild 797 BLAKE2B d7cb522daab68684ae76a2b91c95cba2b4aa788a96c439513e17e465dd485e7f8b275ad7d6c2b39762efcd8f03c43fca48039f8c5b25da6a137bde11cbb156df SHA512 76b0f30794becc44fedf66707e76a8f117e015797350994a58fa4dd93747635c7080e900d4af3826190fa6f3641a4e8e9cc8ead4b3398e3209ed02af7abfdd00
-EBUILD polkit-kde-agent-5.22.4.ebuild 807 BLAKE2B 8f8875d681c2501d62c11b63139af5344dab5a3da5d5fd0b95edffd99397e30cde4a2b5e1af6aa0f337999f84fef894b590568f1f19bfeda244ab5da66cb3e45 SHA512 73ea9dd298d6c5b1a824ca8a00ffbbd814b05f380b3c41a5d1181cfb12fa014f60e3f77815bd88f7d9a21c0a768fa070c6e6420e5665f2ff33ba5dbd615bd74f
+EBUILD polkit-kde-agent-5.22.5.ebuild 807 BLAKE2B e7a1554b7ff24b27e70843542f12d06b3ba45fec22a4d2834385fa7ef062911190f287cd44f0c54bbbb74197cc334be5c1e62eaf590791b22b23655e48adb819 SHA512 8ac811c1f0a447cf3947794d447eea4bf79a7f7d28ed5fca85c1f4833d657611a60eb36c1968861bab003963f376adb49d5e74f7926c95c6da7335b244c24765
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.5.ebuild
index d28e06f84eb9..acf6505b8cb1 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.4.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KDE_ORG_NAME="${PN}-1"
 KFMIN=5.82.0
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index c6c4cb4070a2..cac44aee8708 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,5 @@
 DIST powerdevil-5.21.5.tar.xz 617468 BLAKE2B a67f409ea8e5a6c3353deb749db65f64bbf4e40d8ea84b6d8df6385e62bc1fce34552bfcc7dbe63f19161af59098173c0ad1854d3ab8ff30457e6b44985b2af2 SHA512 0d6b9cbd5cbf5cf3d34e3053f352d86586ed3672ddfae068531b899827d65b9e42c5ec0013f684deca501528590ec5074371fa7699aae4d6a20b120e319b625c
-DIST powerdevil-5.22.4.tar.xz 618088 BLAKE2B 7eac3e88daa15ddcee72265b231669cf3af40b2e2d1b4c9bb07095f6d45352138ab3f4138cd6efd7ef5bda609ec649cf95c4e5c7ca2c4e049df027b92a2fa28c SHA512 24ec7c3283562930f0b128b938df4ec76671011fdc8c259db94d3331654b0df4bfa4a3460920c13b47b1d17520f7707071ed967e6891182a70db6547eb8b3257
+DIST powerdevil-5.22.5.tar.xz 618576 BLAKE2B 5d4128adf99d0d3c355b28ca320c280b44f605a92adfb86582d9294752fce47a689023d38a0480dc5e91704c273774048fa8a38b62f9c3065bc5e9fe91a8c050 SHA512 9ecef0eec3673ac4560a0e50a3e31299718af9575d4a11e274d5e1d1516971362d93ca31e66b79b3593a68b1aebf93502066de7e4134761c5681dba84ab79318
 EBUILD powerdevil-5.21.5.ebuild 1951 BLAKE2B abb321d6746066c52ad13f7718e945a880ddac4828d281af2374cb06f61082f8f814b74e467304984d74c8a6d0f74888bf8e338284c221aeb55e29effe15f759 SHA512 5d7143bb92bf76582e9a5cd3b15789f0a029293976db245cdbd628c1d06e0886234749aa0f9883e4e623aaca69e469d6a84124e628cd0b036bba9c36585afd8f
-EBUILD powerdevil-5.22.4.ebuild 1954 BLAKE2B 11c5f106bd590e83a3242735739634d9a87a6eee3b6cc4656521c5ee257b85fa4da340d430c2a726b9feadb1670e9b85b0c1fcd10af6cfa0047801582194fe80 SHA512 d106bc7323fadc06a4fd2814d170fbbb6996dc0ce819795c67e28765dbbdbcfb193c1a5edf1e4efcc92748df8da9a899ae179ff2f890cca3d761945646cf5a70
+EBUILD powerdevil-5.22.5.ebuild 1954 BLAKE2B 0c4859b8672c11bad596c03220b5d557288a811dcc4d00c6d61ea1e9f8de6c4e89c05668ee025f2b7fdcd1f671ed429c666467721bced7c058ac2a10ab2784aa SHA512 7c029e0eb81e48a57e9d9bc6650c8a067f1d14d53e6713baf114e6a1a1070944f083dd5f8f7b8ecd0198c1c28606ce7fc9af5e30c8062357bc8d848166ac0667
 MISC metadata.xml 596 BLAKE2B bd998c8aa2fd82862f5cc014f65b746cadb6c4383b8e3d790734978b18b8aa1a8b7174d352997a04290bcf3603116215613c2deb25c5bbf1972483119e382f6c SHA512 4c1bacbc1cc8e0c407f4c0d1ee2f05aaaf0f5216a413c14fd9f88deabe1689d936d9d817058fe93d0a09f5757ab07a00ad94b719438277d3138703509b7fa99d
diff --git a/kde-plasma/powerdevil/powerdevil-5.22.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.22.5.ebuild
index 4f6701a9fb74..8323834b0e9a 100644
--- a/kde-plasma/powerdevil/powerdevil-5.22.4.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KFMIN=5.82.0
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 79696a089f94..ae6fb6de0271 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST sddm-kcm-5.21.5.tar.xz 64672 BLAKE2B 4c8f3059a4d6fb57f517eb17008bf923c91ee8cd18385b117666ca294b5ebb912280281e7be624d9be803272a644ed4dd01ff3e8b6e358c9248d7daa0cee3f98 SHA512 fc2fdaf67c144cccc8d2f68cc20e50027c1a083d6b33d37e8c8e7fa703b2904c11b63fc9acca63422688013346f565c77a1f02721c7f8dfcaf52bc97c7b07dbb
-DIST sddm-kcm-5.22.4.tar.xz 64540 BLAKE2B 0dc646a9cc355ec7de28a9a0e3af2f31c4ee5329748fa71c7ac898a2d59a573f3466b965a717bc80a4a09c08188ff7d33ab6dae671ecc389c159face93f6947d SHA512 2fe26e978a314af4387d36adcef2ab8cb77612d0d48183cf50bacfb36659b9b8cfedd488e1c4ead19ee1c16745e7ac25a83fe4ad89ecf6dc478cd952e7eb327b
+DIST sddm-kcm-5.22.5.tar.xz 64592 BLAKE2B a0980e9dcac2ea6d61e2493c64f338442dec55036598048c2feb1bdeddf7f8b7f71c1dd3759d1d7b2548ee1cb197497ae13bcc08eb776b6f19012e4b6abca11f SHA512 4026d5ae90ce6842541ef405c5859c35f7eb12fb16cfebb21a438ec33c73f7c741e1a2a1338caad9d97eb31bc8d74453c19a13434cbdf03a33fc12b1466f9cd3
 EBUILD sddm-kcm-5.21.5.ebuild 1072 BLAKE2B f4d0f44a3d18bd4e12c9bc8fd624629747607eb1055331815c1fb0fafd4484af1f8f750492a68610f6ac2b622d3073d19e7031e70885e79f1218f07a6e123364 SHA512 72aeb29b7261016868675f9a7a4008a2ac07f3f680e87e19d2d751f3575f294bc3e40b856b57fd615b295a4fbf17668186468b03fb9a8709361ca104aee58e7a
-EBUILD sddm-kcm-5.22.4.ebuild 1082 BLAKE2B b82d9764a78184f76658f85336cc273cc5749a8c1beadeb3feed7822308901ce02a9a45ed5de1e0d41abe38327fec7e3b2011a2f2dd5d7c9847e64adf9a32bf5 SHA512 5f20d157b9db7c034300773b27ac427c343580e7894bd2f1c1d068ce64895720c3fbb3f9cabd0c2847a4293bfc002144cb9b5a2d7177db2b952e1218beb1bfd9
+EBUILD sddm-kcm-5.22.5.ebuild 1082 BLAKE2B ee8d6c6aa5750d9b522daf0dd8b337f9b0aa7944a80276ba0c49fe94f322fa68c9fdbddcb33d3cc7df8ca52203e327131692378972b36e00e89ecb7edcd285eb SHA512 30a50263b8c7ce634960f36ee6b08613dcec381ae8af511374a488454e414a6c966dd4fa3adfa6b624fe546a6588fc789478ab7e43d445b9c38f84a141e8c8dc
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.22.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.22.5.ebuild
index 933d434aad20..676a690e680e 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.22.4.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 639f68d170d9..8d20f32f0af1 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.21.5.tar.xz 199680 BLAKE2B a37300b6f3b53f5c62ffa5ff06581f1988720e87bbcb64f5c8048cdb99834b5aa37528c80615a07f8dc8f1e2bb246543479777e5c2b2c5499b1187ffca041b45 SHA512 fac4f4081583079b20c4935e694ef05908d0ef62938e4560cdf9a3119234fa3d0c13f973854b83535fde3594e713b0bfdbfbc0db36994a9a507c4063b714a410
-DIST systemsettings-5.22.4.tar.xz 205644 BLAKE2B 8970037d92a1a3c616dab148f48dd00af8b0bf1271864d2b680149a23a0fb2ed258a3192f376aa4f35d116fc5e012275ae837a578787653437aa5f7303b90348 SHA512 3b3aba18f31d18f45c9d509b2c760ce1f719355d09f9790518e0938e057095c967074f37f23024d4080b440dbeebaf7ee77470c52d14b338c8516ad4dfe6b717
+DIST systemsettings-5.22.5.tar.xz 205224 BLAKE2B b9aed5a330f2497e7df172e83a0633e3ac1fbaeba58d4dfdc6f9ec5f1645c164ab426396d9e9fb8640c7567b61c17a172e5bc9574dd108e3d8da4a8d56f1e627 SHA512 d74aca46221dd8da152139a7cb0d5eb05d29d9d39e935b8d29f8f105bc7573af55808d7b77d8416deec1743ae1a9149b24a6c6082dedf7ada53d16d4cf09f22f
 EBUILD systemsettings-5.21.5.ebuild 1671 BLAKE2B 95d86adba6cfea80c54ebe2126d7323017412ca3a167b479814cc7b04d535b827fa1882b41f98e1357f868613f43ecc1e8f1fb265bcc2fdcec2054a69b2b1988 SHA512 24124ae30f11144a29c10a2da73da1edb3f48a099c6ede5b9b7e6c21af32896451333e774522ad328eeafeb1e928aa5a27604b96700a86341b7e13ded6a2ee43
-EBUILD systemsettings-5.22.4.ebuild 1681 BLAKE2B aedc6c91fcea23fcdb3012c63ec2eb7552998d31565d0dda20e827824748bd5bb9ce308400ce9e5bd9e4ffefc6ee2322439ee56b9a2489e257d8baf3c9a05b68 SHA512 ffb9b18250c62f0a863477eac5a2cf8bbfed7b6dc66231f899737fa58629a109e122eed09f69313c9ed324a02ddada32fdafccfde4b99311065128889457cc2a
+EBUILD systemsettings-5.22.5.ebuild 1681 BLAKE2B 60f774f338aa306abe7e7de442a775163abba48af6ecd72d498c23a5fc04273964d10e917fbeb09912ccef7d058a9d8d52d8d461319b336a17748b7d04f18657 SHA512 32d83a3fa231d5e2792d9e461a7b69c8315ea71ec0a7503fea74dc573931040501646add6e1c67e9b6d0a69b07685097b4f9e3fb2b9f10b0f5f56bb59b08b24e
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/systemsettings/systemsettings-5.22.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.22.5.ebuild
index 767043f8bdbc..8d9a64059764 100644
--- a/kde-plasma/systemsettings/systemsettings-5.22.4.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KFMIN=5.82.0
@@ -36,6 +36,7 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-frameworks/kitemmodels-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/kpackage-${KFMIN}:5
@@ -47,7 +48,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
 "
 
 pkg_postinst() {
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index f8eb7fa4b728..2cdc6b461677 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.21.5.tar.xz 82860 BLAKE2B 583dd6f5360282d3b86d73b65ab5ddd136b5f251ad3b41a977248c44f99ab7c407868a8238307184d3206b35c987adaaa8aa15df5abb2a8ecf2aa31b4591e6a6 SHA512 98fe44d4a00cb16f3e3ebd30b184e836dd77efafbca7625b555852b0dcd45c4ecf71ab5d93659e3d508f2b3b42696422516a08e2ae759bbe916fa5f9fef6010e
-DIST xdg-desktop-portal-kde-5.22.4.tar.xz 87076 BLAKE2B 463124915b0b8b4a52f9ac59964f535f4d28217fda0a7183e8c0cc75e12f20c8d0d79a3262d94959001cac6b3dc5042cc6370728db4dc9526b0ff112d5a67376 SHA512 43764076e992c16039e160daf0bf430d63d858479380f462375190ef44660fc51ad3fed29e2e3c0aec182c38d0956c5612b915727ce44a12afc6ee74ab8d2841
+DIST xdg-desktop-portal-kde-5.22.5.tar.xz 87036 BLAKE2B 57bdcd7999587607a7e952ce52b4ab9a6fe948af4d2cc4929425618b372b3d20eeece60e8cf2baf11ca989e3c79d77c69469aaa4e6120bd069b82f977216017e SHA512 753adf3a4b7543ebbd220f85980e23f1bf98642c8aac408b41ba07bd7aa1ef9929518794e946d497b216eb781695b491c4eb35fce47c43a3a3463d6b9e62017f
 EBUILD xdg-desktop-portal-kde-5.21.5.ebuild 1098 BLAKE2B 22981912d0c61cb667690b79e324dfef8c30f8a59c85039962490ff865ce0b39411a2800d356ca13a0156e98aa228125fc288707bc7b301d314f657d4f8e583b SHA512 34aaf74d6c49cc3062e7ab793ba49f45036b23661c0bcf0440ecf5eef2f6f5c63b1b2da7f6e79f21ca1c1af0ba12d0397f39af84cd2ef070191d4976f79399a4
-EBUILD xdg-desktop-portal-kde-5.22.4.ebuild 1108 BLAKE2B 165cefc150abf74b41707aa8faa8b63ff6e9cafc309d2d006838ac60fe1ba50a0a5f1856eefdfd002c9b9d927ff379f19a2935642d4eb4f51f70542705b803e7 SHA512 6337925e188b40d373893b8655aa55a61d0f4b943d6ffa23746003b17d8a036ab9e34353aefafc33c9913d99caa2c7a6a016492bd3598d04fc6e9c3ff50662b5
+EBUILD xdg-desktop-portal-kde-5.22.5.ebuild 1108 BLAKE2B d931d1e7fcba9931f5b1c64e343f227f6104bc31b00497c9355aaa5dbd7dabd330a71d08dc88814b6e072803de27a59baa7d1c38c58f4b24718bd7945871db3e SHA512 daece608f121a5082188267c2bb243a0489fc66d9132f54f64bbcce0e654d9dc5a3f9deee0cef1211aaa365845f0027128397d639cc784d8caeadcb3b63b8c4f
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.4.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.5.ebuild
index ca0cc2fbe6e7..6b88c84fe16a 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.4.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 151bde972995..1944698ed7e3 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,6 @@
 AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74c963e6af642c956b2907a2995335845d730b11ab09b81bf535edceecca2bbc7fa44552bc1659e5e59e95415470fe77a7bece759ba4a SHA512 8eb77b1a97715d549164cff12dd4d1b63af2d0f8bbcb447d47b4ec82f539e37dad5395e0a7f8fd5c700fc82e06569313a36cf1f7e6eca09ad6d18bb890dbb9fe
 DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
-DIST plasma-workspace-5.22.4.tar.xz 8381132 BLAKE2B 350ac0492fa393dda2613ad0828144bd7eeefb9d6cdc1ba452c9c567829ab790a880a522ac1d9dec86af47bf6643fe115a6c0203e2dd843d613d2e8e81755374 SHA512 74d0f7079977429b10f0cb91ffe1afc5c46af8aee7069730d6adad5eea29ea2877d7dadaeb859dff967453829b7737a7598cdc095bcc4ade31aa646761f12c7c
+DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
 EBUILD xembed-sni-proxy-5.21.5.ebuild 1008 BLAKE2B b8d6e076b18f28c877f39013b0f75ff1ce02b9b20643d0d292a422628290db5d6c0136f22caa075896ca4e59da3880f5b87dc2e4e366495e9781e5aa534a247f SHA512 d4eeee9d46b74cea015db69bc37355a290cad657eb420c9b514a491f0231fe02ccfcbc917ac92269ff096caa298acfd0ddd78ffc3d0dd11d762dab3a2d08e8d6
-EBUILD xembed-sni-proxy-5.22.4.ebuild 1018 BLAKE2B 90a3b31e8c51d58c12e6d9560c21539be295efbee41f81ba9b66cffeed45cb703c9330a7c6b386f3b7fe6d23bcecb3535a2c854a33613fdb264fcb7a5dfe4e7d SHA512 2ccaf3aecf3a9d28346fa0f205f2aa40becd2365f5e0a838b38bc49c153dfcfaf48dffb623fb4590187140bf7f4380a93b6d0d1300025aa8365586d10b9fc6cd
+EBUILD xembed-sni-proxy-5.22.5.ebuild 1018 BLAKE2B c78f65ea080de484cf757bf923e34bcf14926df47d25b105d11769e4d5e729f62a01f3fa86aa205bf4149b8cc000ec06f03ecc84f4f80d300606ca365d421f03 SHA512 6c853ebf85147fcc0fbbc231c613b3f2d81d1f2f64e1002bddbc3558c4bad10bd5bb203c951b771310274b198fa2d2ff733bbaa123679069c1ecb2f82ab5c10a
 MISC metadata.xml 317 BLAKE2B fe6f2d2665436ac520b360fcd1278ef117d274ce4956e1e3e5d8f249fe599b24fa505c80200f8f408cef58034d99fb7df0104cc06fb5e173948617c0cb580270 SHA512 386bdabf344736baac2223bac211d0c08c86c78323ae20be5e8103469576b42ce61336f921f39a7a76693eea22a0ac0bccf0e03b4b3431e003f191be34768369
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.4.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.5.ebuild
index 1cf333e04595..f38bb0893f8a 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.4.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KDE_ORG_NAME="plasma-workspace"
 KFMIN=5.82.0