gentoo resync : 10.09.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-09-10 04:21:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-09-10 04:21:55 +0100
commit: 677b7ba5c317778df2ad7e70df94b9b7eec4adbc (patch)
tree: 6c418a1546fff5becab5d8b9ed6803323e7f316e /kde-frameworks
parent: fbda87924e6faa7a1919f1a2b4182490bde5ec5c (diff)
164 files changed, 597 insertions, 180 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index c7763bb59cdd..3d72c3241384 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index cc98beb67d1c..09a60ce006c0 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,5 +1,5 @@
 DIST attica-5.82.0.tar.xz 66220 BLAKE2B 22ee6014cae294cf772eabd874fe1afb493ad1ac92a1f511cbe6912dbbc4f81a684989a285d388d6a1dc5f7180d6930e839a5ba05c1e81b306ee69e572f6fb2b SHA512 8569ec110679bc026f98cf98ef79aba44279821f10f6153f0054c7a75806921683a83317bc1873896f5bba23679eb4fbe50b50ea43b22813dd2b203e84bf44d2
 DIST attica-5.85.0.tar.xz 66672 BLAKE2B 61e3ca48058f615af27fd7ad226c2a3ad6a05ae6edb1e1e59ed4dded937ec24a5115780fe128011bb983d83d3d7e3603a1780a5b15dadbceb95165f05e2fd1e6 SHA512 a6f64c51bd0b6a8eb739db198b6db7f5c91f3276912a0bba8b20bbca526738b6e8baea24e6f4502cd0f96b1fc704f4a61445dde0acd645776052527d376215bc
 EBUILD attica-5.82.0.ebuild 467 BLAKE2B 8f78d72bc7d8287883a0a74d584cac14c342d014596086859c9bd2310ada604ce27ffd5f0cf2370d4cb683ecffd7fc100f1a8c645bdb6b72e5f56c5ef9a4be81 SHA512 501b4bca7f7b50110e25250178f9b7dc08205798eac70c8b78751bfb5915bae99dd15740e2655cc3157e9b92977a333bec517b22e8e531daaed49c180cea09fd
-EBUILD attica-5.85.0.ebuild 477 BLAKE2B 13cf2c3be5af683770245d5191b0908acedd8a2ea4d9fb0de789d1bed65ae2725f08c2ba72d8499c2120c7db2db804f98483f9959e46f4189dab4a2aff750380 SHA512 bace31628db7daf5242915f8b86f03112c8038f44ebd1c677f9e8a627a683be1ed4d1e2bc8ee8ae7ed3f549b431a5b4d2962401a0e7ab52f460083fafe007e61
+EBUILD attica-5.85.0.ebuild 477 BLAKE2B a317b99cf0e08a4bd81bbae69d2829f73bd23fcda698c01e96ffc5733eb3d4fef461dc29b05e88503e5fcafe42ad539424d416b0ccce2a1a1f36224c0f582e97 SHA512 ebe9f550ff6bd301ba3ceac3be6bb1ce2394a58b8370d46f68e6a80f3596df309e1ac49c7b5275a5e4ddc62682e285f91215f4635e708abfa61b91920f52c8b1
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/attica/attica-5.85.0.ebuild b/kde-frameworks/attica/attica-5.85.0.ebuild
index de36f44dcfe0..b126db32d6af 100644
--- a/kde-frameworks/attica/attica-5.85.0.ebuild
+++ b/kde-frameworks/attica/attica-5.85.0.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
 
 QTMIN=5.15.2
 inherit ecm kde.org
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index d9fec4f6554e..08f32842bd8b 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-5.82.0.tar.xz 291468 BLAKE2B abf25e14f5cca320c89a909bf4fe1d483b7e4ba1b77bce8ac12152b242af28a525179605078ed11f4c4f3e5abea338dfb510992d02748bf9a746eade1d1c7160 SHA512 aed73f3c67f3c7331706fa121c0fbc062b4619adf8ebe65fdb4edbd033f6c4bdaca17f8c00fc3eb3f4159af1cd5bf89c144bbf87d87e9ef60d5b682dabe059db
 DIST baloo-5.85.0.tar.xz 281308 BLAKE2B e5d1812996674ce9542ba437ec6318ed81d8f00fa1acf2db3a5cf118d8c620ea2e9b3fb0f937390e21c69106a77bcad154a53226e88d3e2b44e87690a1b4b1e0 SHA512 63d483ae4688fb093cb8566366b7a821840ba7d1dbec916fead088d079771c803adb06a0d7252aa07058b9571ae8a84caab44d34c1d6ee1e37537113c1e92831
 EBUILD baloo-5.82.0.ebuild 890 BLAKE2B 62db950b70933b74eb5580d0b3ecff4f7abc9411f3c5d835ae0055ef61a2b2c9c0c26958788ee834359520c068a95d0fd2e07a824852b62798adec0028c55f2c SHA512 31f145bf2ef03289eb9c6db7109114e06a82c9f1f43e468db0f5bd1f70a6ee069ed9acda85c2ab7bc6184d701c2588310776e7e2f0e0c042aca1c58c3af4ce3c
-EBUILD baloo-5.85.0.ebuild 900 BLAKE2B 3e066749136795ee937f5950aaba0eab9ee8aab732cb07e61ed154f32f75a3a83dac975d98c3aafd6f2dddf983933e8c4a30d99628557da3f62d79a2604712dc SHA512 609c23ced5bb34a5ace67ea2e7ace619a366554ad86bcc8fb9d6f4e035b6a03e033c6ddd32a4594e35af6aedfb0ca32ff885f8f5209c3ec584a5be33fc827b5e
+EBUILD baloo-5.85.0.ebuild 898 BLAKE2B 2d09a66594b917a223408c73df79fba1cdb49673cecdccb4a3e5aa7fb87b426d1be2e6200e7beee5b7ee688f1521ccac17368785efdadc86d3a57647f3ed2e92 SHA512 88131b6f6e0be69d0d4c1fadafa1cd7f3590207ad904c89f2492aaeacd8104b61bd5ab306b58b909e8495154781bc64526cbc7a82c5a2a759b2a67bf3ba8417a
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/baloo/baloo-5.85.0.ebuild b/kde-frameworks/baloo/baloo-5.85.0.ebuild
index cd6f12baac15..5f0003ad737c 100644
--- a/kde-frameworks/baloo/baloo-5.85.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.85.0.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"
 PVCUT=$(ver_cut 1-2)
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-RESTRICT+=" test" # bug 624250
+RESTRICT="test" # bug 624250
 
 DEPEND="
 	>=dev-db/lmdb-0.9.17
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index efa45a76f114..5b9feb7a5fcd 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,5 @@
 DIST bluez-qt-5.82.0.tar.xz 101788 BLAKE2B b9e67c22a8c3c6e8756fb140622d5847c52dbc536ffe4cbba6811af7a49996abb3613dc2fe481dea98c16badca9a560d9636653dd180dfea6256cb4b6e298ddf SHA512 defb301f7095730e183e63d267fa774dd6466b8d62eee2377d4f1d8a77393a848caf7f401c778b3ae7fcbaf1b0c408fff365e2a13d109120e07ddbd2735dc3e8
 DIST bluez-qt-5.85.0.tar.xz 101768 BLAKE2B 43dea08e7370f13247908c4545a6f755f259b3a76d6a3600b08889e7ac7a1b0cb71cac45435012ec6efde9765aeb5e315fd051463feb3d80401caf83e3fe837d SHA512 cc86562edc55ca0b7db2a475068bff8a0094f74780be07c5080000f14d0568f21bf9ebd239a886023ddcb664cec7b4fc393133c5fa8bd2c0cae8b9aec74aec77
 EBUILD bluez-qt-5.82.0.ebuild 678 BLAKE2B 526dbd4248cdca726126cb5197a190be1590ba4b08cc5f519d83dca1f088cc5d152e0c2fbd5bbd68547d66e9c4dc3bc982439cc095406f79729523377a480467 SHA512 e94d087e0f794aa71a3e0b8de2c19e0c75610cffd8ce876c81fd3504944e2fe326e1511bcc45aa9bae1bacb3a778ecf4fb8d198dedb6c8d6a385928b1779a97b
-EBUILD bluez-qt-5.85.0.ebuild 688 BLAKE2B ac3902f3d178bb4daad19eac62086fa0f7c79dc4549fe60dfb77b1c474e05d3ecfd320fa76e83259d5d01e9939b6df35f99b4de8f1f75c328748ebd87f331d81 SHA512 327fe60b77e6ae885c1b3220b88aa7f1b002e8df2489a2efbf8e933f9dd7c4aa38d9082dedecf7bb0af7ea3188c991a24d67fc7661aab6618a4f48917402c122
+EBUILD bluez-qt-5.85.0.ebuild 688 BLAKE2B fc17b49f90b2acfb35b69f26e4195a87d3b9cef0d5df6942e5f56884fe19645f2512b1dff2243539791fe8fcae79614b3fb00ba811eccc11b739543e1fdf1d90 SHA512 b024f3004583f98ad6be88011f1eed70e662cc9ea5283d67f06b59657e03196cab9716789d5d79a6f5f021023186a3c4fff78568a283b49a80295e053b501598
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild
index 6ff9eb8b8e90..036f8176f68f 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.85.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.85.0.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
 
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 22935def4c3b..47c00f801c03 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.82.0.tar.xz 2035608 BLAKE2B 1646f4587b449315be5d9245f93e15915450ad07459474954b752876d3b2d6dda03aac371a80d16f98a636ee1ab8a07149cf616e9cd0b8ef66dd4c835f022beb SHA512 bec29bfc1b70f3e99dd4a622b5cf7b403517c9c5e91107b7fc3d845cef2a6413c57b0270a0510ff56a2b50a125b1bca339c85906eae7037db226cc895aac5bfa
 DIST breeze-icons-5.85.0.tar.xz 2051056 BLAKE2B 443edc464db1248ffef50e64fe8d680e9e854ad6f389861cff242c1a174cd05ac7c77cf172ac96510fa55869d8d9657eb6a99db730b86cf7de1892dabae2f23d SHA512 78be4cdf9701d92a5e8f405bceb64334c84008cb63c08af861e7d7424e08970d07f9f8320df2e66ae3468860424792c55b26299c14cb4cf347cfd65f513ab363
 EBUILD breeze-icons-rcc-5.82.0.ebuild 913 BLAKE2B 9739ee627ca8f9101b1a5590c4b1b3a4644cfa5519cdd7c3f47255e0021b12762e3dfa4f9a8241db7a3f03d8987add2e7a56fcb1427a4e39647b48d34e709602 SHA512 cd06fb2d82b7e02af22bc568201cd00b66d61b4c96760436cdcd6f4f99267848a57ba7238bfaab9a9cd1138f112640581c4a2ec9ab0558f2508feffd97215a28
-EBUILD breeze-icons-rcc-5.85.0.ebuild 916 BLAKE2B d850c2e0b558f9bca371808d874ad9b957361452066aa2cea3d61ef5dfceee62fe43f86472889c015b88ec1e89cfd4d57b2dd1f64d30e869b58d84088cc0af89 SHA512 bce73b8ad07251ee45fd848ea08589f86f92a7f4b5843f98602fdcad936e6328daa8f03a7d64a14780b0a7bfa44f72f30c99a132c7c6944ed0e0d5e58356c53f
+EBUILD breeze-icons-rcc-5.85.0.ebuild 914 BLAKE2B 5c1c0632d46703f6f7d610cd168d606f2e84156b429aa3d02c5895be7a570766adad03494e795fe86bc3a508e00daea21a72e9e2a733b37271d235a95f0735b4 SHA512 8cf4096d3fc70f6c1f7a6af75b64b32dd80a7c4eb37464cbb2ac0f6955757b5b7bdd52fb61dba1851d92554228f56f7641e2df4cb146321e1a9260be03e9c7dc
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.85.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.85.0.ebuild
index cf56dfe74633..f18acabfef4f 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.85.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.85.0.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="breeze-icons"
 PVCUT=$(ver_cut 1-2)
@@ -13,7 +13,7 @@ LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="test"
 
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 6ba891adb245..abcca5ea3d16 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.82.0.tar.xz 2035608 BLAKE2B 1646f4587b449315be5d9245f93e15915450ad07459474954b752876d3b2d6dda03aac371a80d16f98a636ee1ab8a07149cf616e9cd0b8ef66dd4c835f022beb SHA512 bec29bfc1b70f3e99dd4a622b5cf7b403517c9c5e91107b7fc3d845cef2a6413c57b0270a0510ff56a2b50a125b1bca339c85906eae7037db226cc895aac5bfa
 DIST breeze-icons-5.85.0.tar.xz 2051056 BLAKE2B 443edc464db1248ffef50e64fe8d680e9e854ad6f389861cff242c1a174cd05ac7c77cf172ac96510fa55869d8d9657eb6a99db730b86cf7de1892dabae2f23d SHA512 78be4cdf9701d92a5e8f405bceb64334c84008cb63c08af861e7d7424e08970d07f9f8320df2e66ae3468860424792c55b26299c14cb4cf347cfd65f513ab363
 EBUILD breeze-icons-5.82.0.ebuild 944 BLAKE2B ac823981285ea8eb82d7b2a1076067105a6dea6cdaec6fa6613dc3be8eb353a42180ad580cf9e70a64fe7fbfb59da094ab26cd4efe6ff1c45f7e4dc2647ebe5c SHA512 3b922b6249f61ede2374423cde87b6571d74ea8003e73dd280b8935a58cc23c50cf189303a8fc65ed9ba1b3d5b4f7ba78df9c05bf7fce831176c78ab8affbdb5
-EBUILD breeze-icons-5.85.0.ebuild 954 BLAKE2B 974d94762432be7a7304fb6441d7f65689dcd8feb52cd706cf5a78ada047faea8dff2cd56a8e3fe8267ddd7403abc8bcab81cda2874d3b3bb56f969a3a6ea113 SHA512 fe9be4e980c01b632685f4471205d437def7dee3f4d9f6ab759081b3d9b2f89db898eb38f9fbcdfe3062759c06ec2ad35795272b0c330e10e32780a1fe08f1d7
+EBUILD breeze-icons-5.85.0.ebuild 952 BLAKE2B f6ae242001a8e5892419ecef6e4dc8b66bc34467250dcdae5924f15fd1da313abea70369e4d8ba4c84f21e8f61351bea6b330a74f00b4ee0492b02af99f3aa34 SHA512 172509ef731cb5c7b152f902f4d48a75c88074f8d1c94c0c201703f2f053d00aa984e17261ad042edd0dc18400f06699076896ffd23d5c77abcfa7ffe585ee68
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.85.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.85.0.ebuild
index d997590aa7ee..6d4a5b957a40 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.85.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.85.0.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-2)
 PYTHON_COMPAT=( python3_{8..10} )
@@ -13,7 +13,7 @@ LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-qt/qttest:5 )"
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 5908087e85cf..a0a292311caf 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -5,5 +5,5 @@ AUX extra-cmake-modules-5.82.0-sphinx-4.patch 2959 BLAKE2B 1edd0052595551e33b231
 DIST extra-cmake-modules-5.82.0.tar.xz 313052 BLAKE2B 40f4a64ce1b9175137f01db9f148b21bde931934d238b3080fa8a8e6830fa556d5c0506ddd52705d3d0b1d419508663a0f96d7e9dbe565061081c48c47eabc5f SHA512 a8c8d1d15718760de42238b121ed1294d12d36f1ef25acdd2542f12a56d5091a5cc0135884b6c97e62123d64fc80e2756dccd32c88b65caaf6e86418bae4217f
 DIST extra-cmake-modules-5.85.0.tar.xz 318048 BLAKE2B b33d1e4d131349f706f7ef3cc75b59dc48299f03c62699fb1cdc6a9c496ebc527628bf07da41241ddd86128c5fa44b2b2c0a68509a0eefe742efa37d02386be0 SHA512 78ff26496c37d93106449663ab30ad35784a3ad668f4b1ec49d1ef51916e5de050e828fec8f6dc4ee5e2bed95cf22becb06ddd971dc46b65acc19934f5c1c5b3
 EBUILD extra-cmake-modules-5.82.0.ebuild 2014 BLAKE2B be99e95ae4343cb94f1b7ff1805b19e52bdd122be61050de990189345dcae561b4ddd1d15e6b61aee751206bc9bf55d7635717773887e3cce551997d22046a9f SHA512 4532518bbc890485c1970436a215e4d268fec3b0d6cd251fca2a29a5b16e7b61bfa0ec07db01a85f877aa0f8c3af525ded37bccf5cdb0fce450884e9af4520b7
-EBUILD extra-cmake-modules-5.85.0.ebuild 1825 BLAKE2B 61ea0b544bb445af615c927caaf721919a85f88a0222f8ba33385ae0147908513820d412bd58953f95997832f39bc8f0d36c6ab5d4ccb56f2c8a099bc85cb7e5 SHA512 5c270d2de4ca2b06e54c5f86c3a8ac44b5fb7d27a20ed9bab0c9b7c879fba67b6bacf9992bf561593d8a7a19a8bbbb46ac048bafc53c00c5ca5baec30cfd9202
+EBUILD extra-cmake-modules-5.85.0.ebuild 1823 BLAKE2B b3b0e5b5f98ae2606fe0ba5dc6f26cfd936cb3241e5da5d49f172b751e45fb453f65907fd297b4057ca4a02489e3c597a99df83508d620154fdf37bd209c18c5 SHA512 419b66e3f05220ba7d65108f4543305cf680175e7f5419f5f549488339e0e73bdc40769c2efd498284df15992ec6ab9f7cc35efec3b2076b9561eef71e9ded52
 MISC metadata.xml 479 BLAKE2B 51b802a3a0a624919d8ff7b5cbbf255932645c1154437def8efe73975cd4a0d3a046a4a7f0c4ca9c67ba7a75b1e458d35cae802766317bbf548c9647dd66bd1b SHA512 5e7d1c6f0b6682b7218b0d7c42876fa6469346d48a70e2ad841a82e25bcae7ea9b05b896637d861b7a72e49dafe826755fe2f1d56bd0ba26bad404fca6d2bd10
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild
index 13b356518d93..fe872c28e049 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.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
 
 PYTHON_COMPAT=( python3_{8..10} )
 QTMIN=5.15.2
@@ -14,7 +14,7 @@ LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc test"
 
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	doc? (
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 9c15931ac1c9..e0c3a63a0511 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,5 @@
 DIST frameworkintegration-5.82.0.tar.xz 1755828 BLAKE2B 18c056daf8db8e06995d3f0b6985f9aabb05e8a4e7323635faf92701f04dbf135cf63221fe739504d2ccd7718dd02a6718ab7fa7ba84b86cb37394ff878b6e3f SHA512 5865e560789c50829c5648365db58497d0da141d1699f396ca431740e6f919ef68c89e2cb98ac1f320cdb07fae098de683b17c920f79a2b459ffd874935b6e77
 DIST frameworkintegration-5.85.0.tar.xz 1755792 BLAKE2B 0a9b6b9a35d20fac0d07cbcf23f4ca1e0627a0175a7298a6b6391b1f4e1c38a46e029dc21ff22ea397ad3de053485097137e5a0de818300000f0c0e4f03c474e SHA512 d496c3b2ff49a3e4ee43e3c208b7dd3df68561fed0fe519f22a163c3389683f7d776270fc6472f4b52677cf85eb4a73c6bb7bdeea951600f8f5302411677a4f3
 EBUILD frameworkintegration-5.82.0.ebuild 991 BLAKE2B a2504a4055a05297517cb5ff6335d97d05fd77f811b49beb7e13cc917593e068ae061d17f1a3d383fe6115062622fd44bc719128ca9d2cc4808eeaea80c894d2 SHA512 0f3288378838ab2dc3c0dfe880343f132aa54f2f52a0aae6b23fa50181e609f0e381897aecf8e5b5256b9f307fbd5901f5e2f96421158f642b224c06e1731aeb
-EBUILD frameworkintegration-5.85.0.ebuild 1001 BLAKE2B a8bd8563a9d357550b851238cd569bd8b0a8f15d15ff0ab0c884af25708435513a2d5f8f0add0fca86dd0bf2d4fd7f235955dea777be3f95faa0a280c6143648 SHA512 798199501b5be159c2714ca23dd93d98ce723305cd04810227589642e47081dcf1f0f763730d552c65474bbf07835a57e065583a25db9de95dcd8f9d7484e422
+EBUILD frameworkintegration-5.85.0.ebuild 999 BLAKE2B 1fb9970af1d6d216ffb54713db1705bc7207cee6636b0130f2f162bcdc9ebf302ada3adfa74e74bea71d5f8b7c293e41f8917801f77b499424ed2e6eb89c3cb3 SHA512 bfd51abff3bf71b2b84f164f757fbbb96774a6aa65ffe3c4a8914d23509423105e63e141555f508a76b8ba6c90fcaa235643b4229b9d77fbe7c1ac450aa6558f
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.85.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.85.0.ebuild
index 5d114dc75ee7..d52fad501353 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.85.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.85.0.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="false"
 PVCUT=$(ver_cut 1-2)
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running Plasma environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index 21ff7e1c959c..a2e6f98af64f 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-stats-5.82.0.tar.xz 81740 BLAKE2B e9cccc36e88a743f7a9b47c8b03ca5be980075346820be8108ca8f0f612e2468d379729be063318a1c3edf15afd3bf56b691b65ad1492e6ba07f64cfc703a02e SHA512 0dd6bed082318a40afc94f0f525cb9c8cd6f9066a4bc38389d23f3dfcc8ed46929e4150660b3c2eaa37241fdbedd10e6b4d472e8d649664dc9acf68b002f206d
 DIST kactivities-stats-5.85.0.tar.xz 81924 BLAKE2B 2e00d96f01b3f3540405c0e4dcddc201eec8218e025e0c3086a9038ab24f4727acf7c11af7a8234d068d6808ce4bcd1384fcd14cc858c6dc33079749ac6e37f6 SHA512 4d58a6ca1f5d373a0c625bcc782e3f6e3bd68c960615c1a7f08ec3ca0e889b72dce300e80d080ae3e531bbcfa9cadeb50cea27a517e35f4cae3d426d487322ed
 EBUILD kactivities-stats-5.82.0.ebuild 516 BLAKE2B 9687fa6ba5dd88b7ac77f8dac14a0b2df5e55c1024ce9f699e0fe56e247d12420de472d2437f4c5e5c7d80425e380ef49593f4028d57d5fd41c12538b200e2fc SHA512 44d50161ea7699159cc19d16a4b9921d01fcd144361357d6194befc45bd2a4b5aefe0eae3d47113866438fad30f58d3cad3f1c9538647d064180c2fb2b266960
-EBUILD kactivities-stats-5.85.0.ebuild 526 BLAKE2B ac81f1fdfb5ce5de721d1659e6664c0ef8a65aa6f08e10bdbdd9bd1d5cee619954a693687481d6ed16c48d727ac8d72e5b035763fe61d15b0618a55eef7bd5b7 SHA512 daa85c9c332f00162881b54174d50ec87e9a9aa1bf9e6bbcdace8a5962316083d6e29611544f498d8ac8e1c70ccb4385a2841033e0bb169d69c8ed27e77b5582
+EBUILD kactivities-stats-5.85.0.ebuild 526 BLAKE2B be0bcfc14b467dd662ebd84fe0334ef40c583ae390a97accb0c564516b65f44d49280a651ba8e9102dd6ca1e815d876a42fbabe872e7447f5f9520d654de4dc6 SHA512 19c81f5d876624b00b4e97c6b0541750b9d76771b14789b062103092170d40d54f7d42d6bb3e7159d332ed9ba3246138d6371599d52e7cc08f95ed28b23f66c6
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.85.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.85.0.ebuild
index 61c66f8fe896..02989e763ca8 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.85.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.85.0.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-2)
 QTMIN=5.15.2
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 05d96b80d397..bf6ee6b0ea46 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-5.82.0.tar.xz 71356 BLAKE2B c83b384f4aed32554dfd96951a9efc22cd8cd6c644a674b8d492e571ebf261201be78ac2834722f12fb43822ff17741054e7153c279a8ea7bdf6318cecef20bd SHA512 f1da5447405e53a4c7d11c0ff14ee80c725f07df929ba6b4380239675e2efef21bb2e6e0d028146ad621440b01f76314549779a3f7a79e639537fa7bb8e96729
 DIST kactivities-5.85.0.tar.xz 71328 BLAKE2B 59f01075a0cc785061251ab9da1cde122b0bdd7cd02c870f875513c54e8a008e3069952e860b60399b714f30eb15229f2581557948d951d47eff038ce3393c91 SHA512 62769a6a0f8d243e9774c819658b5e451c0d1fa4910987d7b07d809d61d63355300d5ef29f91193f62f66d032539066286ac11b4da87e7b60eac4277df68c0ab
 EBUILD kactivities-5.82.0.ebuild 679 BLAKE2B e6c029912ce02949bc0a49ba1683f8657aa2c02b8fd450ed4a3f401a504351aa382c5be34a5da3d71ad706dba09f260d8535152e4d7007198899d39a347e3133 SHA512 a25f1e454e5df018b65eef4434c51fe67be4e9c37890c75ebd977dca603c8f83af42efe43397be8cc963808d875d4dc5d2f923b5ef7f9fec0e6fb3a4d0e51667
-EBUILD kactivities-5.85.0.ebuild 689 BLAKE2B 1bd23ebe182bd9cc6124c386280a8c2ea1ce488d37df3b2bc1f61bca1a92af8b82999447a9a15d76b02652d55b1aaf45cd7537ba5ef9547761528f752b0cdcf1 SHA512 2cced426850a712e80cfcbab0967c057315d9417c76f85e57fc655834825c5dd3cd3cd8eeda73986e5861de756a6a2b12197b545efee769426c94e09b691fb5c
+EBUILD kactivities-5.85.0.ebuild 689 BLAKE2B 8d1578630bcce4b73793cb6bd7c2f6651bb1a10d355c84249de7ccb7263fe6f8365aa14016613535df6351f08f035eabebf67e185e4ed12561a59b5b183c1d13 SHA512 bd06da405a53cb0a6f324e91216924c1c9e7e71eb16a63d371a55df0a81a385ebf400af21f0ee651910253d7952222bf278e8633fa8d778704c5b3af48240568
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kactivities/kactivities-5.85.0.ebuild b/kde-frameworks/kactivities/kactivities-5.85.0.ebuild
index 5c121a555e58..426ccf34ebb0 100644
--- a/kde-frameworks/kactivities/kactivities-5.85.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.85.0.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-2)
 PLASMA_MINIMAL=5.16.5
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index 50a64c916d59..4613c32090e9 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,5 @@
 DIST kapidox-5.82.0.tar.xz 194608 BLAKE2B 3f45c5d23a3b939ba2d7249358344ce8db7458bad7017aa40ad97ce2bbf626bcbc9a3adda18b87f8f5f37e5378bb98762accb779523932e9e388aa6b8eea1f64 SHA512 4f69a497878a6a6f0271e7d073a0be80d7c43be2c90bc14accc6d861d0e569131ea9543f81949f2b54765aa2ff6c6bc0e3f6339a4dcc1f875a01adac54e547f9
 DIST kapidox-5.85.0.tar.xz 195060 BLAKE2B 9ae5cf5f6930174ad966e6b5625b1a1619f4ff241388c3f692cbdbd6f56c2df685ca78b4dfbc07ea307db16f39c2bd6c81cb78b41584c25dcf7c119805c428e8 SHA512 afbcace81c249fbd5e26cbb53afea0f30d690fbef0c35bcca674ffaf2fffbcd73f00a21c4f50bdb4e32d8349c40f680fe1879df2d8f79eb284e5863fa7afd07f
 EBUILD kapidox-5.82.0.ebuild 578 BLAKE2B 49f227140227f8bd0a7815849098058bc0c1b9da7b4a974f01cbfbb5eb57b5c07109573df4c484317b7d077e7be5cf5ba124ffd2758dcbb5a9e1ba8b1ac56065 SHA512 7eb931c1a5e12b2bfdd34ee8bdecb53947be8d644e9cd70688bcb856c5b74695b09b5c919d0429a87798f27826090caa90e9ed68bcf2b2560bdd7d41443f5b68
-EBUILD kapidox-5.85.0.ebuild 583 BLAKE2B d8d193d4863d924c693c79717aa1a050be401e1e08c1c3c9919f1b51cbe93a36d50e13055936935efcaa62749ed3779aa7c9a941f2366fe5f520315d150a82cf SHA512 6bf433cb3bbca057a7bf25272a3ca8c199b1719b78a57735385700ad8b9040be03807de9ce3d010f8b9eb5717e177574070e37d55de53c72a4fdb12791a6b6bd
+EBUILD kapidox-5.85.0.ebuild 583 BLAKE2B 65652f3afa8965cb29d66ce1df2e7f7731a4e0b89e5659f527045df5b3043917abae063b3890bb2b743e0db25bfd8af618c22660648026f8d54e575466e9823a SHA512 4ffab2721405199d4279b73a4b7f455155089754c7402b339064128c2f10a605182f819af5eea36bd03cab7f9718c4fbbed9ac624be7866ce50da6ca3fffc9c8
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kapidox/kapidox-5.85.0.ebuild b/kde-frameworks/kapidox/kapidox-5.85.0.ebuild
index a404e2adda94..904180677a05 100644
--- a/kde-frameworks/kapidox/kapidox-5.85.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.85.0.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
 
 DISTUTILS_SINGLE_IMPL="true"
 DISTUTILS_USE_SETUPTOOLS="bdepend"
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 220668ae6268..9f5a7f1c4b94 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,5 @@
 DIST karchive-5.82.0.tar.xz 984872 BLAKE2B 1a8e6b758479a4ff5f1be774b6deede551d9a306bf8a3fef845ff6a1532fc84d36aa9697f6de7455746410f233c70072ec49d729e20eae2baab529cc1d3ea9af SHA512 7b735b3f1c325bf8dc9044fc9644fdaa3442baeae16831ea79cf84f7da0d5cb7757e2201d8cb73f18a831c49f079b87c75c8387a53c236386e4da47437884183
 DIST karchive-5.85.0.tar.xz 985392 BLAKE2B 1a38aff9e62ed0cd5936992d514707548fc0d727b9c3da019d97ca600a34c303e9c88962c96d3c897a9d95dab8f9a02253be91d3ecf7ba490870f9ddd0b7df9a SHA512 5890e1b7e354420a63f8deaca0375b8caf1d798c5682ee4ef902c40435d493e232d66528fcd40c7efa40a390d76a22ce6d6f73e884e95528f5d56639cddbf7f5
 EBUILD karchive-5.82.0.ebuild 627 BLAKE2B 3a6b934d17a552a48aa12f75fded100ea4e69a7bed0d91a652858748addcbdca8dd2673dc15f081c08f44e6e29a93938fe765237aefffa432041682c172cf79c SHA512 33d172edd8080203e26897dfaae28f8177ae9a01a77cd1038fbaf935d05a5a5873c786b74f9e4e64acb468e0e8802617b73913c6c34b86d53e1c36c1b7d8eed7
-EBUILD karchive-5.85.0.ebuild 637 BLAKE2B 2ccce2069efc0d13581cbe6262d3b9f1cca2ea5a0ed9fe47555c40d8055af28d7b3cfd9b658f4a517040c27ea81808cf4997db8932de8ed835c449b1ea69045e SHA512 bd1359bbb5d2d4d76e38513f363defc8208ca81e67f555caa44a6e7f8bfe2044dbeea04b7b3a5f46f7fda45f226ab9925de5256fc1aad5dbd2cd4617fb719cde
+EBUILD karchive-5.85.0.ebuild 637 BLAKE2B 25ffcda0a9aad044083f125829f59b8d060eb87c5a934e66092b641228e0f248e3e1c95867e4ce52404e9ada31c5cc6283e2f7ee3eb515cc85ec9e27972f86b8 SHA512 b14086a2bdb82214474f1d53e2de9fb745b47e224e698454efce50c651bb0c30690cfe1b8e806e59ca49178b0de2c23ec4deb5d86c7da9156087b444e7e0738b
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/karchive/karchive-5.85.0.ebuild b/kde-frameworks/karchive/karchive-5.85.0.ebuild
index 84d2658f6e7b..37a163f34150 100644
--- a/kde-frameworks/karchive/karchive-5.85.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.85.0.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
 
 inherit ecm kde.org
 
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 1651634b5de0..7e180219d71e 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,5 +1,5 @@
 DIST kauth-5.82.0.tar.xz 88396 BLAKE2B 1c99917b26f9738b876385276251b7bb616a35bdc82bf581aabba693a0846b8fd615e960dc95829e6a19b158299117988aef10ba965ca16135cbd51c2f4891a5 SHA512 ff69853dbdfee9b22431ee495c07875430015ee706357acdcdfc93b3deca7a373eecf40d30977de97253f044a4dad7548b2ad55c84583b92587a77be285e3ed8
 DIST kauth-5.85.0.tar.xz 88580 BLAKE2B bbb6d0d65c3ee0090ee8c7201938ca92cd59d9fbab84c6051b0937d9a6acd8fa3770f11a4e7cff32662c4d6d98296a58960700a87d9359124719be57f893ecaf SHA512 a775f1952ae112fc80a8119dd7060146dd427da6f73d9d3bb308c9683ffa263949e5f06615bc397806e951cf6156631a3d02505edc390c5982732199f17d812d
 EBUILD kauth-5.82.0.ebuild 976 BLAKE2B 67f13a3de6a40a0ba2c1d5f25a476f071d1ef405b1c621db5e82ddd33a25b02bbadcd52eeff4a5b409afaa35029d2e69b285682850d703cc63f482905de2ae02 SHA512 f1e5cd1a9ad562926cf51a288910c52133a4a0dac463a597e6d1be207518d97b8bdd6a7fd07fcdee7b8566d9b7a847a5c2a0d2ad744906846c8bec01c30d3f41
-EBUILD kauth-5.85.0.ebuild 986 BLAKE2B 8d23b035db6db897530628ccb76f6a23ca24d6d7f58e5ca037a6a708e643f86fb192b7b2589894858c3b99919275c182a210cd7eb27b79687aa65d5bd252be43 SHA512 64619b9faab5abd0d8a9a0c4ac3f970f59bbb783a59af47229c372b122fb092ba15d52e3adf502018a99182da5ca6e88622f65206ce7025cddb2f30b4d2734f2
+EBUILD kauth-5.85.0.ebuild 986 BLAKE2B aabb41ce2062801f265a5124825a891b3432b02757756296a1af75e41ba6db16c718761e09a900855c377743492f77b9e6e514ade0923f76e4a46b9eeedd9f7a SHA512 0362163b9d9a19a9fbd3b4bcae9c359abb9bb4e7fd60dc384b2c949d54ce5267aaa2844d13a80a6e26b74ae2163cbdd8674a4307815046bd731e63b565a0d833
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kauth/kauth-5.85.0.ebuild b/kde-frameworks/kauth/kauth-5.85.0.ebuild
index 0e9b5dd1cc10..1b89dd9ac255 100644
--- a/kde-frameworks/kauth/kauth-5.85.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.85.0.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-2)
 QTMIN=5.15.2
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index a6167ce86cc1..2b6d6d58422e 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST kbookmarks-5.82.0.tar.xz 126800 BLAKE2B df1aa0b34b1fcc21a481995001ab563ebafdca67d307d1f610033aa364899bfb9dbf5a9aad4d4eea4bc5a8a4e93c5afcc45dc1efb78dbd79d7cd4125ec8749af SHA512 aa1ad09e63eee22eb5aeb094b9d2986f6a700038c790023878d7a6a6fd6e9e2f0af0092f576d1e1e6b2413219c3461f1bbe3347afb19e3be8e9a081443aa5872
 DIST kbookmarks-5.85.0.tar.xz 127000 BLAKE2B 8d334192686f1696aff395acf7d562c55201d20eb3588083b44678bb9aa3a589e056e092584821c805be159283b3c22fdc5aa752648c286bb7610901726d0176 SHA512 f67f59c4fa6ee0eec16c431216223f352bdc4852c0ba4fb89cb50f477485a6a0dcfae161c69b49956d19b533d1624968e2275e3e2ac26a2da66a126c7c4334c2
 EBUILD kbookmarks-5.82.0.ebuild 816 BLAKE2B a8510d3a04540677a424587a54b04a1cb7b6aa76e274be3440e4bb3db0f7f0c95cee4b007597816525a63445b94a2d969575ebe954a478f028d3d328cfdc68ce SHA512 a3f717d91be236e7cac89252af268e7ccae1e605f2d75cbc20a09e9d4aae23d9d3d98d3129ea6239a03862ae5af3353888fe82375db2bd089f50caa62151a070
-EBUILD kbookmarks-5.85.0.ebuild 826 BLAKE2B 3a7fbdd527e6c66959f2f5d095b7703293f88ff86bd8fb78d0e5d6452ba30944f1af4fae39e1715675342def95bbd8631584fc9baf973cad48f66616fef7c4a1 SHA512 c441a499b427b72852773afb39050a224eed4af5e7e3aec43a4e7c0b4f336c35f471fccf784c7f63e3ff1e5afc9006963d50a7158c38da2e69216e10c2351c3c
+EBUILD kbookmarks-5.85.0.ebuild 826 BLAKE2B 22d170040cc1615542c7b16802e9bb73a9e058ddb0de873284ecca6f70a529784edd39fabfeb15d084819c431e2f377760f9bd0d4825460309b1ed8fee0bb59a SHA512 bc37714fa76ba2aa64066245a8a34b99b399b8f58fe70caaee2f375c614710b10ff9d0fa7cc84d126eff24388f3ed07bfaa8e28cb7256a8ec1c1216f09792229
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.85.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.85.0.ebuild
index a6ca5c1729b0..01f3a9d2a959 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.85.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.85.0.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-2)
 QTMIN=5.15.2
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index 2fe10cc0c6e1..95f548e4c979 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,5 +1,5 @@
 DIST kcalendarcore-5.82.0.tar.xz 254996 BLAKE2B 255728d2ce6036bbb35a2acb077a1cca23420d3d60584179a27ea2d801b9191d7696b4322fb41023420993a69dac5649f43fb4a52c708f9b48aa732719297c5a SHA512 26d76b20faebe36b9e5a9e234364fb5e8cda1c3c519ce5e3fbd0d9e36657348010dfc7ef4865fcc3326978aa88847f5d5304d3dcccbfd0d728c568b2e149214b
 DIST kcalendarcore-5.85.0.tar.xz 258044 BLAKE2B 469af118c30c5fa685625271fea5490a2d13b611541787e1998c5434bbea1a30fa283b9fb9cf60cbde75d9e7fe2ce9511ee9f81613c2675b09d594b72e3158e5 SHA512 91d37a49bcaace1c7717b1ea0e710b13f1e56edfbb0db2b7c012e7b86e0a4437466289a6770c745cc1993c6b1bbf670f238b3dd1b033225e6e6d36c19584c79e
 EBUILD kcalendarcore-5.82.0.ebuild 519 BLAKE2B 312d74f10c1b727824b483aca478d2b63c89da0f842fe5159fda852a28e2e1c441bef5f1e593d8d27fd718e9478573727132c465228ec46056474a6dd0d0949a SHA512 dadcbb83a4c6c65bccddaf5777b532e36b94d0dcab281655cbc82b8175cb443d71bce69f356d989c0266f3ccca7971ab5dd2ce9e72858d6ebfea0d6e4b452a37
-EBUILD kcalendarcore-5.85.0.ebuild 522 BLAKE2B 17416540f8b97f14cd4b753e189ec3201af9952dab59bd1f4a2d3fcd0d1c6bb78da2bc06c4507055bf4de746909f6e3b4097c0c237974d785b1e0376ec8b4155 SHA512 f06bd9859378078de5bf4280c1d4564e3e2560acc95247bcbe59d419c53bf73026eecbe33cff9166a00baceeca46ec82aff55d674d00836eb365ebe1285d29d3
+EBUILD kcalendarcore-5.85.0.ebuild 520 BLAKE2B ef086fd421abdc5e7029b24cf0433f46539b2c2285aadfa9626185633374e91b6f3fe056fd9f13ac59faf8f39f598b85c63209e4f81443bf517028e8051eb56e SHA512 ea9941688c57e77ee48650c79b5ca20c97333ccf9b9df89051cf55f8c3f06bfb30d30ad61ecbc153d2ec5427ed2769ac69d2058b1c376fba778ddbe1ad6b4d8a
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild
index ab621edd1b5b..fe9cfac4fcd0 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.85.0.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"
 QTMIN=5.15.2
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ test? ( LGPL-3+ )"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
-RESTRICT+=" test" # multiple tests fail or hang indefinitely
+RESTRICT="test" # multiple tests fail or hang indefinitely
 
 BDEPEND="
 	sys-devel/bison
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index bc25fc95ae35..846eeba2300d 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcmutils-5.82.0.tar.xz 160816 BLAKE2B fd75c8e42c7df2c05048ece51e19d4a27358871c56b6df3c086b4ea2fd83e3be758a9e370bd9b4956da18ffe9025044bea91da3a1a3fc4a9e65894d976a3585f SHA512 709294fbbbaabf31384753651a320069e6779d101dbbec94ba09ae95146344989e854cab5fdd39510c300e026f113a156fe43d3b2fa57191851c95709a1997e4
 DIST kcmutils-5.85.0.tar.xz 163296 BLAKE2B d392902e5629920f307b224bafe07037426152660a4ba8c66eab17aba356304c99456b6f487a8f8954266ab3a7b4d0b207dbb8daa692485060046ae6b853050b SHA512 38c7168d91b535a58317ee36442ef2857aa3c43c7a33ba2abab115f7f890f7c53f29b488c0d5597a93b500814bf0a0bc8d8347124f5ced5d13118a0efc95f1fa
 EBUILD kcmutils-5.82.0.ebuild 942 BLAKE2B 9e675a08a2915e5dc9d7fbdeee09887976466822123502f6217f02ffbb3c3f0ce2b5eda35973665b1ec8768d5ac9c28c5b6361b67a78d5e12b8191e81fdc1ef9 SHA512 8e8d0012f1dd4a48530e5ec1e156f50535ed146cf93d2b22f2484c17b7e1c97390198e853017f548f5b0b23aabb8dbeb0d7a0f269432d6a4e8798bd2d45b3a7e
-EBUILD kcmutils-5.85.0.ebuild 952 BLAKE2B 64285abb38818469d582d6cce5be079de61293c51cab0be1f7868e99cd68cd8f7a9a0aa9bc2eece833f32faadc881df8fb59931d6dfef48ce848d10e98120713 SHA512 dd8ce05a3a7826ed0941637c15d054c65eb6eca7b1d467ba138bf5599b85d9730f9953fb46936a2eb69f3e63c15887bd892d497f476ae720a42a20a0d1d431e7
+EBUILD kcmutils-5.85.0.ebuild 952 BLAKE2B 962a284cb175e4c2dff3fe17bb59f4830cb2c8376a74f9a577bc5c9d41bfe8c6c44c57adfd9c3a278773ebd319f1de74c5862e6693c482472c01eae41c2bab44 SHA512 15cd3f6fb61d24becdd40f8eb0b7bb5c089ec1a12a743add3e7a52d8b83d608d6f3d923ab8c22fe02a588dff16d08f544fd2c244af5e6cb4ab2867512c2cf659
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kcmutils/kcmutils-5.85.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.85.0.ebuild
index 4f530d0bc8de..52061f0cd40f 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.85.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.85.0.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"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 277ebd673c97..288cc09f91d3 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,5 +1,5 @@
 DIST kcodecs-5.82.0.tar.xz 230560 BLAKE2B 53494862c07e1df594c0c2f2e7ec295c763635c6e1203111d797195a0cd0a7d4f76d152945971051a136971c3b072744cc08b913e40534fd64d568e6748c95f9 SHA512 fd331cd1ead5dba016f1c94429bc4fbfc5268563341e93d418e856340c63fc7b7e72fb6aeac6ade0de209235c52e8d16118351825000e9d8b47491a55124ecfc
 DIST kcodecs-5.85.0.tar.xz 232016 BLAKE2B 1165a5c89682d2987d414c134a6e0481d9ed5b7d17f3e76899105feed510a4deb27d018b4f1dc6c7c9c70712aa66c36c1768ad557490f527375de8e29e8a1667 SHA512 1ea9b627d71cbe5435ba584f4af6e28b2c68ecbe5c415e125aefcd66c3418535cac6b5688e138aa60b3722374d9dade736590ee0900cbe65638814c80921ace0
 EBUILD kcodecs-5.82.0.ebuild 503 BLAKE2B e675498cfdd749b0d31f089d92b8ecafe9d150c6272aceb26659235b46902d1388bc6119920db18a75dbb9e73a6b2fe511bc7bb4afff74ce813857f2fdd14688 SHA512 d1151d164ca3229ea7efe3f8737e77b62afcec02b0bc4839c0ca81708fdaafe7634d9637ac0d1c4e58d28480fa29c799f3bef07f36adcc47574e75c3b9d3778d
-EBUILD kcodecs-5.85.0.ebuild 513 BLAKE2B 16e2d7b8ab6df3422fe0eed3efb510e5f1376b69614de5ba71ca14c89683d168dc2eed722e11a2ec24118db9e581c866e3a05dccc0b2c535096b24e4f4e68260 SHA512 a7ec49eb18b6d14a4f7228494ae7bde2ce8257e4b052743a5001313c096b0ca728d2b371a969f8d55b4bdb6beb2dff9add211d9da2a04df8d1108219d4b47ee2
+EBUILD kcodecs-5.85.0.ebuild 513 BLAKE2B 587de5bdffb17b0eeaaea8a116651f33370cd13ef1c33168a49b79320feba1c6405a10f16b6948807a67023e177cc4bf5619aecd4a22e5f896764b233f309767 SHA512 08733d10cdbbe17066f5d51814220bc2826890c17569abdf54e4e97c16566faf9c22022dba41a41ea81c2b6a26f1e1101dd81e87e3f8c8fe97b05a7642dde051
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kcodecs/kcodecs-5.85.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.85.0.ebuild
index d211409383fc..a624d4944065 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.85.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.85.0.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
 
 QTMIN=5.15.2
 inherit ecm kde.org
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index c9bf825e14fb..ba050795fd1e 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,5 @@
 DIST kcompletion-5.82.0.tar.xz 122088 BLAKE2B ce534393489d6ab980d3c093ef39b3d2341734e147231e6f22c5316091bafd40ef343432128926ec18e25ec8d3843018fa582bd2dc7475bb3c260e42452cc949 SHA512 19b76a46d09005ed5ab5b66ca48403f4bb0baade2b2f937ad6afdf5ef92adf7c94330502adc3aae29bb88fc5848469580319cbf4bba4bfa128537f4541fd9d24
 DIST kcompletion-5.85.0.tar.xz 122020 BLAKE2B 064b6074827722ceb852faa93c0a1132ab8dfb7496eddcb951deb52d9b6acfbaaf0cf2ef5f74449889998b734b4db9d9114972ceb2017ccf26dcb1a25c1cf5d4 SHA512 c10cf1e5710dc7cabc107b8e9320f79a3eda28bc7ca386853043fbc229736ad10f1ea3bdd2cd77c4a1c0ffa4f0e7407bd400929d0d4bb8d61afa8832889b31a0
 EBUILD kcompletion-5.82.0.ebuild 736 BLAKE2B 9d3f8e265ff6b0ebb54db1a29cb0364c5e3db88a3efc32cef097224a699cce2396f7cf6ae434ef43ba237f1ef6a4194b839518dde5bfb0e67ee3ddaf3b2828d8 SHA512 e4f6ed827d51a258fda55f3ca01fd7bbd59f014f4d67c6a436fb9191841eb09f00ed57727356b37a266020ed9dfe4bdbde96b245b787419f687208617b39996d
-EBUILD kcompletion-5.85.0.ebuild 746 BLAKE2B 6442d13858d4d2e47fb973389ce346c0796430ebacde81ff03cacddad9b2b07e4a163b6b37260d0002a36d92489d8b64d9e87b14ced9d6f1501535d04a25c466 SHA512 883f85a3b5de7dda96dbbf9ea2cc76fc38ba29da67c9845461d5eaa7cac39171d07a9fc8c2f43f72f506617d94827681abdaf95d99bb6df8a19ad7ddcd0f018e
+EBUILD kcompletion-5.85.0.ebuild 746 BLAKE2B 6cd17786c17af2ae42fc1a05faee7af3df61d62ee8d9faf6cb789f39045f9d478860c0fa1bee79ecd058181aa04b90601525851c058648fb6c69377bc9e54461 SHA512 b4a6752c7dbfe0a7d77199cb2a372dfd221d5e84c44a8c758fd166455db4b4ada855b405e0b987dce7fa4c11df8d726ecb3bf725a6ba74f983ae0a3ca678a856
 MISC metadata.xml 546 BLAKE2B 9cfab5e5f3efb341d3c84140c65843d706a33bcba9dba92b62e7365c1cd5fbce8e0d52e5bd342eff1e05ab38fdcd6a9a8b8b441f8cf5a94dd70233e4a3ec36ed SHA512 8504b2496b14ff6bcc7dad0eef39ce8ce12516ae54d498e3d609512ddbda6b587359403fe12d57530e59209eddbe30f23ded0d2d385c773dec561efe610ab32c
diff --git a/kde-frameworks/kcompletion/kcompletion-5.85.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.85.0.ebuild
index c688261967ec..f0f1b4037efe 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.85.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.85.0.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"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index e04518bc46dd..93c614530f13 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,5 +1,5 @@
 DIST kconfig-5.82.0.tar.xz 268416 BLAKE2B c59d435f2e562f218b0b6080c862758c6c271aad4ae76ad000e722b7f2edd0b40cdc4e9f64d5128c6f7f2c0028fcb5d4ae35c696b511a7593651a34c4b1528a6 SHA512 8989bcd1dabc2ad795aa464a7bf7ff2e4e2a4c56a5e7828906e00852eb5fc2946e89a4fa7df691f8c5e1940d0b171c02729bdab5ce9f7d6ecc0d3d1880e2ee4a
 DIST kconfig-5.85.0.tar.xz 270420 BLAKE2B d2de8ba3f91857d9b806627df685ebaf14b9e02620fc820163f15d8a36b51b190a2984d06ec1133bd2eec2f548c38089d7d50105e3514cecb64ac052b1f8b4ee SHA512 38cefed52e322be34bfd4b26a243b4f931442239a14bcb1f496f9223d2b87e05cdb9931a2aec9579b8bbe31d716bb6a1ce7901ba3cb525607bbef2aee7b96d52
 EBUILD kconfig-5.82.0.ebuild 784 BLAKE2B 4e75c1eaff14c56d5c811dc656b46a0e5132cc37fcf3e4da5cb971024cd71d1018c1d5de00008500fecb9c06c3e05e78675917a9fbcb009b894972f5b412aa4f SHA512 18fa973182ad7c6a924ce61133eae2e82be63746c87667cbc463a8e9067b3a4566a36d1828245b554073193fe2ca27cd3d560a31a5751fd42e4441e4a179f45e
-EBUILD kconfig-5.85.0.ebuild 794 BLAKE2B 76aa6e822d23295a5af743e34b87a375b6855c737e832c308abb6b8d48e530bf05b7555c2777831658af7605ab1df8cbd4ba796e84bc8ffe357238dd3b5bf96e SHA512 dc1379d3624771a107df71b5c466048f40e0e0a79c72c14014bc2a4df3f74cba57d85d3714a7c0d56bbb38a0db4b311fc6b13f16e254e60c5deb6527392bd105
+EBUILD kconfig-5.85.0.ebuild 792 BLAKE2B 2ddd99144f622d8266aca771f70ae598b85784876629f584a32f8fc5febdb35c56f4d644041da1c2ef19e066700d0769d1b0b7015a397470afe7a1d29fd80b98 SHA512 77c2236ceb75cdce810e9699172d989fd2c41475542778f407db4ef2e26783fcf1151f0f5cad5103ceb8f00c87c0a447071f8fadcaf2b6deee4c9b30877d8fe1
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kconfig/kconfig-5.85.0.ebuild b/kde-frameworks/kconfig/kconfig-5.85.0.ebuild
index 7696524b519e..f2f24bbd72a3 100644
--- a/kde-frameworks/kconfig/kconfig-5.85.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.85.0.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
 
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="dbus nls"
 
 # bug 560086
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 09205052a006..4163049b44e2 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kconfigwidgets-5.82.0.tar.xz 401320 BLAKE2B c117777cef4ff0627577b6b7b3fe4b18b8a0ded1b233888953f56beca6c7bf2675382e1d5f6e05e64a4eabb793dbe2e0b3f1b56296606da76a0d54e15cf2e530 SHA512 309b6e2591ae88a454bd6dee4cff5e1eca3dbb36ca4b7b02081602fbd6b4bfe06a99d2afa6eb931fa927759f2c32e315b3c548746207673751e9753de651a6cf
 DIST kconfigwidgets-5.85.0.tar.xz 410632 BLAKE2B cbeb31c40a5cd22c5a0ebbb83089387482e1b54571d02a7c7dff8e373ce11bcb9215ce778be45b9deda544e82140080edce6408282af1ecdcad7ef790178b75a SHA512 dddcfd54e36b2c45ab42d5e61811141eff2bb8d2d70a5bd09993e742bee05bf18a3b2e94b2ff8bcf6199db84044542a8d3d01a36f6b29d7d9b33e6c82392ac7b
 EBUILD kconfigwidgets-5.82.0.ebuild 995 BLAKE2B ddf99d30177e1647b034405da45eb35dcf2e5f2e817698486bcfa1300b8759ce50a5341e7df0de434326f81a36e457775a5edb895bdb001a9efacf4d9dbe0e28 SHA512 1fc6567450d96a4837439d4f48bef9552c7af90498f04af51a0dc26e696df2d5f81d0d0f55e805007a5d81c7356d58d0a82694a19650bcdca4f02dac21bb36eb
-EBUILD kconfigwidgets-5.85.0.ebuild 1005 BLAKE2B 8fda68285f142a64ee79afc1ecf79753246f8510a43d1a443e5e1ce3078f2f3c3feb2646bd53c5a7e3a8d3946ac5e45c160b64efe2cb1f860c6ca40bb8c42fb1 SHA512 68c6c55a3b727fc6d340dbedad0222ef3275ac3f1ce8617833af8cbf5c0b33311c627045790e338b39380d293124627025e83c219ba2adeeac89da6e01645488
+EBUILD kconfigwidgets-5.85.0.ebuild 1005 BLAKE2B a182c531ffcef1c1ab83c1e1f7a08154c8567288b946a4c80cc06c06473b3c338afa3710e073204ec1f1a60c9d4dfaf5954f6316bbdd10c31e862ff264fea472 SHA512 6ebf47a55a061c7039a8d52e97158cca9f9076e36f2e08bb8eff91040f8bdeff6de9db8d3958e418dbf0c9c3e62718f390a6d58e8252f4b439d60e0a0b3983e4
 MISC metadata.xml 546 BLAKE2B 9cfab5e5f3efb341d3c84140c65843d706a33bcba9dba92b62e7365c1cd5fbce8e0d52e5bd342eff1e05ab38fdcd6a9a8b8b441f8cf5a94dd70233e4a3ec36ed SHA512 8504b2496b14ff6bcc7dad0eef39ce8ce12516ae54d498e3d609512ddbda6b587359403fe12d57530e59209eddbe30f23ded0d2d385c773dec561efe610ab32c
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.85.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.85.0.ebuild
index 6092dcf5a231..50e1c0fc6af5 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.85.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.85.0.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"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index 891d48439437..0b675d7aac9d 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,5 +1,5 @@
 DIST kcontacts-5.82.0.tar.xz 543960 BLAKE2B 48deb0a593825fafbd850f0345ff052d4809970706b18355388c077cdbd0f66d63f951bc8d063df82495822a6754b02531dfc676c100217f882d29f837045a75 SHA512 05cde28d3b9c83054d004fe6fa9d439358fd95ae3b739089a08b37a3b44e1b3119242de64c5e5155bda9df9ad5736a2629385c1b1c39326fbd9e3fa6a1984e6f
 DIST kcontacts-5.85.0.tar.xz 543896 BLAKE2B 68ce1d43539f7d4a5d41e26e45f8267c6ca70cd04991d8917708352b44a71b95d891a5fd8c931d08a3ac2b6df67e304d1d72a3acbd14de0b12ed8ad74e079afa SHA512 bd43baaee638455038c7278eed5bb3a46ea8171edc1aeef86e150a4d5e2e07a45fc0a4e7e93d70bdd53603e43771256e0a5e85c8d59456651bf4370fffa7427f
 EBUILD kcontacts-5.82.0.ebuild 745 BLAKE2B 6445aa6c21ee852d9a54f33014f3e938174c7df3cc3822da5c38b3af337768b8b57644e00f735200300defd28317cb3af3cb0f0b994caf62ba1e04c14f0badee SHA512 3294c0bc9b658bc4e8b7856fb11c7fd2dab9794b81b6c6687cf77589698a20bfaf0cd7c96263e837097ca8a4e3588362e387c2d373e09cd5f9879c1a15da6da5
-EBUILD kcontacts-5.85.0.ebuild 748 BLAKE2B bceb8beeecd125dee53a4acb5bf1b90f6c0e854a56b615cae134bfed166276d024f0f44c97457b0a22c5c0360217f95d33ba2a3588018ae92907caf920c206fc SHA512 b207dc665058c7e5949b52095a6c212cec5449da9fa40065709e7537488f9f3991ae31e35d45353e2e4e3d2dea7f63f93d4df8fb313c2e2dfab15b1384f5e67b
+EBUILD kcontacts-5.85.0.ebuild 748 BLAKE2B ed46d9f7d740560d80185153454f6f6d7770f4f902c1fc078b6aca83f5180053b7d4eb8bcae91b280b45aac8f788585ed2211d0ff19ca55becd557a511bb33f6 SHA512 41900020f8c5b2fd6f250798b2eefa6dca8c6e640391a3038d871197f7d96745ad30ac58b199151c3f7fdfba862019c0b6d293a950909c1901f1e47d3452fa2d
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kcontacts/kcontacts-5.85.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.85.0.ebuild
index 9c7352d00bb1..45d6517f22d2 100644
--- a/kde-frameworks/kcontacts/kcontacts-5.85.0.ebuild
+++ b/kde-frameworks/kcontacts/kcontacts-5.85.0.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"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index ea11f368d007..f8ae60006fb4 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kcoreaddons-5.82.0.tar.xz 414272 BLAKE2B a24534a5f3ba900c6e77afcbb6218fa02f093c58283f228f8b41272ab82eca214f2b080356facaa2a800f63ee80f048c7e20d9e22bc2d7d2604a7fe9d2c93d3b SHA512 25e320e6d9a436091491572cf8623a0abaf3abc7d5edde44403701471fc0315b6ad5d09a44b93de023298ffeb9c14366de23c08f43abc51c87c87f9258a652a7
 DIST kcoreaddons-5.85.0.tar.xz 427876 BLAKE2B 2e4dda676209333cc735ae4028bb245d4828af49e79cc3e3a7101f06452b35f04d72496a777a9039668597c9703b518674ed17dd0e05215daefe29da38fdc8e4 SHA512 46509b91a138924c040a7dcee87be1ebe5d5324a040fc76cab1b19e427b03eaf80766a0bfe708d1226be83d8307253061f11604ce122dc8ef354b47dbe3f7753
 EBUILD kcoreaddons-5.82.0.ebuild 994 BLAKE2B 20b7d96ee69de24e9933ea7f5be9b8a3a0a03d272812ba7d68894f06c99bc65e58f2a2269029b2dea45dc4c631f6b0abf7f731d89fb2eb1f0610b3705d1249f9 SHA512 5d4b933c79d1ef784621772a6c150d8b1adf2f8560d12c1fc654e871b2ca31348def8c51e643a367e7eb9aad7d8e6c6ecc095132f1867aee607a06b834a3270e
-EBUILD kcoreaddons-5.85.0.ebuild 1004 BLAKE2B f4cb133c5171153dba069abd31e6b33ab7ab004b9f05429e002322c51bd67713a989b5f0300590134ed9b6d74d9cf7ffe9b46b6e6d1e7318322a9c7e5ed775c7 SHA512 09a025924026d0f94f29f8656251e511f5862a4e02a511495f41b08c749d7a77eda27dfad504c60288a19f5032d1fc663abac4d69d50a05494172f811ebbd0a3
+EBUILD kcoreaddons-5.85.0.ebuild 1004 BLAKE2B a5a98e948aa36b02849f1197335645298f5fe493a09414bd12a750e8b5105eb1c0f161bf9537686b6d7f18f6da7e3d0f5557edfd0c56d8c97cfa0e88f79339d8 SHA512 879c445cba83c766abf78e51a83bbfbbdc9bd929a665cf9aa3bc2d0ce1b537957becea4fbbf34773f721263bdfadfe52e5ba998dcabfd9ff9e2ae61a2430d084
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.85.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.85.0.ebuild
index 1c4c1e7552ea..fd23dd204b01 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.85.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.85.0.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
 
 QTMIN=5.15.2
 inherit ecm kde.org xdg-utils
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 37a39a48fb3d..b18e430c5ade 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,5 @@
 DIST kcrash-5.82.0.tar.xz 24696 BLAKE2B e13388661d3661216df8900875e86d7ad71352c229e9cc4be78d11469cefcecc51cc11aa95badb12e2dcba22eba22533b959ca3ab8317c205a06e3f5e906b203 SHA512 9cec96ef82f9628fbbbe0fd4e0687c094f7a1b1385e6ba6807f1dd49c9f8d19a29497b29b31bd9a86c59f498d76d54bdcbfafa86a480ccfb29dcd488eee22340
 DIST kcrash-5.85.0.tar.xz 27936 BLAKE2B 943e42fc7aa4db8e1179970f3f4e1b532c9efd4a609263919adefa90e2288e8412b52e84bab8a520ec04d4114f64803e9e6581c0be689c33d2de9041b444f6ae SHA512 26ae87cf816f104cd2da4052eeb8a49a6afb1227e873a4ccd829e8a7addc162ec86dd5ebee83b47d57d9c5cb79471239b1504c54603828dd8589f9ac0915adba
 EBUILD kcrash-5.82.0.ebuild 703 BLAKE2B cafed6e0316a42a4d673203090624da89442e9139dca5209f7c5ea81024364ab827102635c842727479a11d5dfee5b04e2b336986f1b1c7cd71ccdeeffaeb75b SHA512 1ce9a48e80d71f4221b7b1031845191159e20022ffa48d7be3fcb77634b07bf83c143f648be98507daac0fc20d490f2b9a1ef771d326c5c35744ae33c8a2ff0d
-EBUILD kcrash-5.85.0.ebuild 713 BLAKE2B 825c45111b309109550ab2d7a10135f09783a248b7ecc06f0cd16597315f2ed1200c39b8f5c87ea07bab9232bb4823bbb598d5c2cf4a7b24ec4b3498006e30be SHA512 ec1a28fd1e863eadf38839a3cb0335df79ece5f30b69466859ac63ae0eea9e2e13093289c5a48d7cb40587f96e7bebf3a3f5396d796b2f981dd02dc54febe7db
+EBUILD kcrash-5.85.0.ebuild 711 BLAKE2B 9993e5475e6d6a82eee19a4213edafbedd35bc4e26cf46fca1b88eadc6122a35fcf00647692288619477090d7b95d6a9f6c8500f5cf75275ad7398f32a15d417 SHA512 e54f71158c3f18a3e028a60c042c4361da66718b01fb9e51123ab592ae63823509ca1c0d29e1fa60f42049989ba015356e3fe02ac02ed24bb4fe0cce5c56fb7d
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kcrash/kcrash-5.85.0.ebuild b/kde-frameworks/kcrash/kcrash-5.85.0.ebuild
index f775d9837859..9662571cc324 100644
--- a/kde-frameworks/kcrash/kcrash-5.85.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.85.0.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-2)
 QTMIN=5.15.2
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="nls"
 
 # requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index e9e59f1c180e..c4993a420a95 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-5.82.0.tar.xz 60180 BLAKE2B f4860970f75588ea69f032912d9f105fa8f204b36a0ba48e7cf57246c48ce612d66f7f1bcf0cc773dd699e6cc475c139ed450767a79afdea92e6f4de9036419a SHA512 84882e4c4debc2cecd7c206e84b7534bd23fcbd28abf8e1438c8ed06faacdd3312e955dcb5233cb38f1cba4d4fa88cdec9f2ba0e7bc13af3bb07ac999efcfeb2
 DIST kdav-5.85.0.tar.xz 61600 BLAKE2B da4ec7e2683f15e8fa8d4d6ffc9cd6408a2d8ab42738278e778307b01f9674cd287050879aa08b072144f3243ceae077185670384ed1218ba77df58b241fc2e8 SHA512 85c463c742b48a07de9f72e9ee922876f50742d6a82f897d564fe59f71cc4fd39d77e520d432fda4418a8e574657cf8daac86744885ff46467495c0e693b96d1
 EBUILD kdav-5.82.0.ebuild 793 BLAKE2B 2e9fc6c1d995789aa2ef5fe73fb1fb6ceb27044b6a293452e760c2c75547df2b3607c8be97b9ca8243a83269f03cd3a5ae544e5a43045179337bc846b6bffe3b SHA512 f3395947d8137791fd358dd998d214f471baab7c55ae5b99a60bc0d07fbbbdbb3a8d4bf5a13a12fe6169e7b0b4d5d8020194155d3cf1b1d04522c1f7a65aeb4f
-EBUILD kdav-5.85.0.ebuild 796 BLAKE2B 593681bca49d55833957a242c3b6b95bdb5ce1ac9e5db86cd9c49b79ebb4ac17d918f3836b28127e8a92a605625cb289766cb4d5027ca2390ad3feb525cc7f51 SHA512 014521431002306a34aff85cc6381f8374016b8526c6ae1e6267bc3b3fce6290569f791338e93bca497903b94f8b9e799869dab43a7cb5ba3c984cd1131ed47d
+EBUILD kdav-5.85.0.ebuild 796 BLAKE2B 6279359bced6c81e39b8714f3d4152fbd66a8371ceb8d917f7e45744029fc7fda525b36d792654641e70a731424a6d5d8eefb297166ff90fec060ae8069eb441 SHA512 204f6d13baf51d70b0a942e70418c8e53c41e026b339d4144991a966317f8d0bb0b150d940f6f170bf0272ac2c6cd80ed58c1e70332b21c3620893677c9f2c3f
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kdav/kdav-5.85.0.ebuild b/kde-frameworks/kdav/kdav-5.85.0.ebuild
index 925ae2c1cb33..1b84f1a6e828 100644
--- a/kde-frameworks/kdav/kdav-5.85.0.ebuild
+++ b/kde-frameworks/kdav/kdav-5.85.0.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"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 4c055854fd92..0eff8376e580 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kdbusaddons-5.82.0.tar.xz 42792 BLAKE2B 7b20072c93b1149d31f3bbc020de124a05ae96bdd6affa6a77d46ea69f5ac1b458851f97115dbd6ce18e12773e39c240daa2035056496a431849a51a096383e9 SHA512 a0ece70b7f79a5d391244d145d8167c0bbeba5f99db48b513f187638aff6af3f150a75b84d8534ea7b381d858dd743bf73884286bb2ab951d4f6e1675d319fa4
 DIST kdbusaddons-5.85.0.tar.xz 43212 BLAKE2B 8e11c4298e0e46224bd2d61e666ff504c0a112224452b2f25ad7cab618524f17cf166abf2d74ae05f0e945d3b95e872a84f01bda14baa635d96855329e87aea9 SHA512 7c83b546795ca944afd58e95bee2dc5491b295a3adadbf0ab027a75d2ce16ad6100f2cf92bf3c20fe2ea17c68338cb5a05da56b0ae1e03682b4276021d8ec370
 EBUILD kdbusaddons-5.82.0.ebuild 668 BLAKE2B 7802e88fef0b0956b3310d8087745fe6edb807ae43b39b41a95c0708902395dbd931c31d585f2ec6af0df04c775104653ffcf258a1d42aaad3b8498c6407c174 SHA512 ca8079b269c13f0db05dcd3cec53be6c0790c2c8597ea15a6ab620fd6638aca47d669b0842528e3ea7807f5f682f5d6da49b0097c3a0190267c5dbaf6e45a597
-EBUILD kdbusaddons-5.85.0.ebuild 678 BLAKE2B 2bfdbc9da1ba538339a284088bad27802aca07474b2f27b0c8967e30b904568156f51566ad2586b536a8e42ed0a8adc3874ddd4eae789d0ead4c0f1d1e160b02 SHA512 18fc2a9eeda5153a9b965761c2a19c3abc6e0a3479416a1b729bbdc07eacabf47c9768bcdec28bf4a8f68ad8b564297d67123276f7b1084ea6b98172bc023979
+EBUILD kdbusaddons-5.85.0.ebuild 678 BLAKE2B 7aa83682eeae997e23f92b68b887759621024fcbdd94800ef3dd0a31dedfd8c92b2afac523b4b796fff7028a9b467b809ef80f926ffc005a37769131108a0f0d SHA512 501d9ab44e7896eb82a6add57e49a250e87ca9e23bb3770161ba5d4807a6193ff92f6a363c3b5e97b6313a0a677b854a4c4eff6e7a4845f84b307ce9296e7314
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.85.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.85.0.ebuild
index eca05fec7626..fec82a5650a6 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.85.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.85.0.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
 
 QTMIN=5.15.2
 VIRTUALDBUS_TEST="true"
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index b3af52eb41a7..5381fcdc2ae3 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,5 @@
 DIST kdeclarative-5.82.0.tar.xz 186252 BLAKE2B e5b4c22e14cca01614d1bc5556bda00e1ffbcf2b1b1b3277d96a12b380b627a5df4151ad443b5301eeed568bbe1852ef29e3a47f2dc4bc3c037b449441cf8542 SHA512 48ea28aac41cb6d5d15488b80e5cf7abc18b774fe35d22dc14d030b22e56b3b9bd116a44a0e7c44adf9fd26d0d4cd73782a6aa187f35375ffbbbf08374cb5658
 DIST kdeclarative-5.85.0.tar.xz 189632 BLAKE2B 9c0f83849337d2dee0c1b104fcba556633e013a0902cf02c6958bda0296a2c84064dec4fb0bc88f4d3c79ebe2c6c7d9b2ca28639341884dc0a1d7288b989f91a SHA512 49eb6f6318875af5c5aae1d6c937c600bec395d5a4edbeadf5e36c68d40f5fe400c0b7ef127e1ed10d442b42564c8dee6ebf159915f5cd0618392ca07b858276
 EBUILD kdeclarative-5.82.0.ebuild 937 BLAKE2B ed63fa3a76fee5a004b5258c290c2565b02ebb9d95b4f23132d0517dcbd98d5bd9a6bf048b58d5ce05c5a33b3ce7674258a203650dad821d5fda65637f5a5b15 SHA512 d00ff0be2eb91e7805a1f19153c556c546babcf7bd911931ada1a7565d02659401e66c015144416a8a29739455ce2f0b5c1a085695bc4cf39eafea2932b14972
-EBUILD kdeclarative-5.85.0.ebuild 947 BLAKE2B 8a46e5e164634e25afdb3749b0423bd90698343a7af80fa96e6c7a300ebeedc8940631abe13462ddde5d20e1f92021ab7a95e2a7ba92f390735df72bd260926a SHA512 95a6deee7f84381de79584a27d7af29ac0795d231e255b27b05556e2f516f85244f7d8f187f358d7d43ca1cf3301e6cdc90097d71118d3db8de89881c8eca166
+EBUILD kdeclarative-5.85.0.ebuild 947 BLAKE2B 6548c286eab8e8e804c70404be9d57bb9550b3a2240e6bc7dc2663953ca6cf391c6bd6c8bedd6c6122b84acf6bf5ea660a17ee537ccb921174a2574019507a29 SHA512 f9432a40922025949a9646c3b204daad6bb96095581c476a314121352752417d6abc7e02093409288d4cf34c491096d8c68798c8b0beadcbfc467b67861bb0d3
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.85.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.85.0.ebuild
index 4c958bc2ac79..0f5f80cc7699 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.85.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.85.0.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="false"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index bbe02b244acd..d888caab8f2c 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,5 +1,5 @@
 DIST kded-5.82.0.tar.xz 36964 BLAKE2B bbc92bde53caaca442808c154bf7bb88c3edca9b979c597ea08a0a0901b40d67004e2f45acec663b22e318e547c86397a99c8c895a374b73d066c2ff67b3f868 SHA512 10ef292186d652a519aae01681934f70f820ff4c480f9ed9868f7dfaf9dba016e035b565b220fb5d3ef89dae5180088ed3a93d0682c54ba27978b53df00c2755
 DIST kded-5.85.0.tar.xz 36952 BLAKE2B d237349d95f2186a102181f420bb1deafb9fc83332dc535084531a6b73c5feac2c37e6c15589ed8225d0391f4f6541720525d3cd7d2645e6e90789a013c6e5eb SHA512 cbc8e8c101d4af7df0d47d91c51273e41dfff4bf8e558f93a0d2c16cd814cfb4ba73e69a00b3bacd944d677de778456b0020e063af6a4cbd3957296387eccb8f
 EBUILD kded-5.82.0.ebuild 835 BLAKE2B 0d655e09cb0e6c4547d5fd7b0d211791cff4829b5235d55e0d96db024ea6ed1fe183fc214fbbe5970f101c4cd151bdb0c164507d422aba83ea34b26074311b78 SHA512 e70cd69797d06fda8f88f6c42700c57b23d3e706b26f20715cd97d9c498f0b0404935a0bdc97ec34706cfdeb44a26c62b8f70462695091d4093bf26182d1e377
-EBUILD kded-5.85.0.ebuild 845 BLAKE2B 390064001f40a90dcea5b4780c26750051f4076d931848112d3b07d4943384709bd33dac8bcc41bdd5b8dc5cc89bfe2e6ce860dd1d81aa148298a0c9a2aecd70 SHA512 813544b48d50c71a6bae560178936b749671ad581d902d1c01bd358641967e18014c44902dbafdfb652d40c36f5deae91f1a62f9b6f55bc263e39856c9c6ebac
+EBUILD kded-5.85.0.ebuild 845 BLAKE2B 8e3eafb1bbd286829a1372e52fcd23f0094b7f6ca2d4707d1320a65038cf84e3738353af3317f15fbecf9f9cd520b9dfbd535f833dacd0dee8a9eccfd83450ba SHA512 f3f59fd58eac002192d121bee32ea3183aa30c4e4b5b297effe33efb5139b24f83c83874331d0b78eaef1fe4030cdd23d0d786343e2cf4a5db496f9294c65195
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kded/kded-5.85.0.ebuild b/kde-frameworks/kded/kded-5.85.0.ebuild
index 7c157b0dd383..d80bb022fe14 100644
--- a/kde-frameworks/kded/kded-5.85.0.ebuild
+++ b/kde-frameworks/kded/kded-5.85.0.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="false"
 ECM_TEST="false"
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 99b6e39ea782..fc0d92f1f612 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -3,5 +3,5 @@ AUX kdelibs4support-5.82.0-unused-dep.patch 1693 BLAKE2B e11fdcf22b656952871730e
 DIST kdelibs4support-5.82.0.tar.xz 3553264 BLAKE2B db2db6b67e27b0b0562b88afbda739fa109faff52689d7132519b75784a5dbf95c5585bb8ba9c1e85a06553ca572dd8f6480e00a99b1ce252505fb10c6e89cf1 SHA512 0662810f884d65d33b789fbae02009e5e6c92d8df45a4355899722a96dd7402168a46998150a9ee580e5dad8873a38a829c1f73d8157cc3cbcff495cd5a875d9
 DIST kdelibs4support-5.85.0.tar.xz 3642876 BLAKE2B 436645e8ac519b5078c37797fdea854e25e71a8079a49a33436a88576f1f370409a6fd780ab778520c474263df66b3a37d06398fdcc1ddfbeef8be5933f30192 SHA512 6edf7d612be56f81b7908ae85f6cfcc9618b14e8b9741fb19e0c8eb55ac73b9b82963be923d67ddfd450401fffc29bf164d112e45cba3657f10a1c84f86e346c
 EBUILD kdelibs4support-5.82.0.ebuild 2485 BLAKE2B 8f115b67bc325848a02b6ffd565d602b99f0984e471290608bb5a91606d2dd023bdb92b6b1d736ea2a1c3c25968f86037be1261c70176d9b1435bca86ecc2e53 SHA512 d3e280bd5505080bdf67124ca410ccddb61d6abcbd839314525af06fbf478e9d44d7b89b89c38ecb7896eade4c028dd35fe5b645ed73efd90b9c6781ad6d387f
-EBUILD kdelibs4support-5.85.0.ebuild 2495 BLAKE2B 32d1d67308722fb20986c00a7013ef6e73dd3c09afbdfff5f36ad9b9c48475fffbb5605910190d4535d06ad543347859bb9dd486d196a7bb8ce189a10e6fab12 SHA512 22ef7592cc99f1b307b9fa926421f59caa65f8f5e34737cadac5ffcb5868f2bf2f616bf5b5d33af46201c76b977e30ba52fe9aa6990c8b02e4060d0d5ac0ed17
+EBUILD kdelibs4support-5.85.0.ebuild 2493 BLAKE2B 8a84e1020093609b1e61c8103f4997315e0bae99ad7204e3b77a1f95ce56c8ac37f6985f0be32c181b314ddc91f93e6753bbba565a49bf62f966917adf887aec SHA512 7150f861bba85f7e5e19c26bb7a73b8f31e7572c9d3b08fc09d3593e420ce74aa3c1e4853d76d93073e37e07e32159eb351942e614aa46d00d136f034bcb31f6
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild
index 24709f1d2187..267add834f65 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.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"
 ECM_QTHELP="false"
@@ -15,7 +15,7 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	dev-lang/perl
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 378e4f79c549..aa8ce87318f7 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,5 +1,5 @@
 DIST kdesu-5.82.0.tar.xz 52236 BLAKE2B e674b6e7779cbe858828d17a8e72e14570007776461d3da99cd86adf92380fa5a95bfc394436f8e900e2fd90052b35c6a68b91c2e12e9c8cd835483c7f2b6262 SHA512 6d4cbbc783959d093f59221dc0cf7862f30444878a32475976519b443713e8ea1f154c8a62f7cf4468e807ebd983afb037211d5641335822037bad04501552ae
 DIST kdesu-5.85.0.tar.xz 52460 BLAKE2B b5a9c5c5bf0842ac7686bf4f2888186bc5534f8af4330c07bb757a90123be22c7460836c2508124f2f2a9a78d686493c0cf666a048cfeb5f72170b6c2fb7f5e6 SHA512 77e5fcfb00ecda59a6e1496f97cda10b6dde40ab3ea3c4537990ccb02561018d540d89988633fd17e2f22f64f6bbbbe02e6d0bea0c7484790f59812d94773c9d
 EBUILD kdesu-5.82.0.ebuild 659 BLAKE2B 228857930114463ee93ab0d5a3d1ff704c5f67812f11a9903a0110392a15efcc405f9cc0d3f2d7c7e7c741feacd8feccf469b619630bfb2ad9ccd5269d9e54ec SHA512 f0570452a998fb6164315ae9f1ccac06af2bbc434ac2e38d6967e86090b3fce5c2715ddace47e799dcc5f694c1528b4dd7ece048136227b43f4b0c9d122b62ed
-EBUILD kdesu-5.85.0.ebuild 669 BLAKE2B 40c1a9ade25883cb5851e72c417c12c2d69992eabe2c3a7a7849bbc5c4ac60a092c58a0f674d84b58483c9cdc5d2613f5a53ece337d02e201ac40aea3dc416b7 SHA512 946120dbebbce098eb61e3e6edb0d1a49e634ef6ff85a51f1bf52eda8a9d3e800412fb69f2fce115309a104935de50d13870c6b08b5b2c51b69d97e0eae74f33
+EBUILD kdesu-5.85.0.ebuild 669 BLAKE2B 01b0721ce357b5c3ab4afff1af2da6b7350c2e3b9cd824e4eb804483b2234f1c16e5a04a46958623844e7ee84932859d358412267b9d254765e5a6b6b8d31620 SHA512 08a2774166fed9f215c263ef26e6b5d56f3e8bbce29e880a0a5e755a1456819d897aa7a77aa84e4b23e3c704fcf2fa4fadd3f7ff4b6884a4847d143677ed07f7
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kdesu/kdesu-5.85.0.ebuild b/kde-frameworks/kdesu/kdesu-5.85.0.ebuild
index 2c4a9dceeb9f..9f1f81824f2c 100644
--- a/kde-frameworks/kdesu/kdesu-5.85.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.85.0.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"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index c86bf2fe2382..050a9c3fce1b 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,5 +1,5 @@
 DIST kdnssd-5.82.0.tar.xz 58296 BLAKE2B 3a7b2d48724fd9982ab74f9bbfcf48dc465082753fa1375d73fae3b53121dcc994ef45777ff01bf27b4f691c0e84d40cf7715ef5d5fc4cb511f6a6983b400cce SHA512 fb365bcf77f81f75a8a2fc62154fec9ef16df30e0efc40d89936532b197d43fe9708f889caef9297946f9c2dc4e44ecef0d8cc30f2e1a847d2b745b2b5dd0e9e
 DIST kdnssd-5.85.0.tar.xz 58676 BLAKE2B 174114189daee2a2fff8b42c81a81d640af2b2f43bc4a889978db468873dc5b330495fa5c5a0283fb2e5a4e0083a97d47296002c29bbd5641f5b4ed4e57c65b0 SHA512 a6356b5c643a1e7e1f7d30e67a1ac8f13427ee3758709ccaad83af68f30a085f46a3d12e814ea8ec29adc1f9bea2a48e2c180b20ad9d5bb5834c02894f4286b4
 EBUILD kdnssd-5.82.0.ebuild 644 BLAKE2B 427d6828558bfa5a7507855b3f5b6ac73a90ca32d1960f5bcf10b9940388ba718af99572594c705183a4d387aab5a773b431a7d9020ecc6c6c25ca61ddebb687 SHA512 ea782e6c32f494c9133cfce5dbb5361d7bfd110eb4a8e23237556e1e16f8c426c3aa99825ca9e4cec76caf842bd299ab64583db558eeffc36df19b712ee0131d
-EBUILD kdnssd-5.85.0.ebuild 654 BLAKE2B 5147c046f6c86a0bd8145d20614d3d0afcdb350a67524cd038dd126bb1aef35deb01b7d747def15969057d85133fe96787c4a5e52e563d60d764f034d6c4d880 SHA512 9707b84e28c86d38f574a70c72c77ee731ed85b3813f8f72382604a3f5c5687a846e8d654cbce190ef5625a148edc82ace53131734d664cf0cc90761b41d32ef
+EBUILD kdnssd-5.85.0.ebuild 654 BLAKE2B d9bdf338ca672dcc5423f35d260573e41cfa431f09735a04f56a83a1dd2a046a94561ba21447f60c097fcccdfa7f041e310c5eb4c6586f0fb46788e6eb042e15 SHA512 929cb23f459594ed042d7f3262562bdb47e0b5bb5455f2de9100120a9fae8b9c55c0edc5d2c3964dba928eb2e191b1e662975377dea29fd0c7eac1b5053ebb61
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kdnssd/kdnssd-5.85.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.85.0.ebuild
index 50999d662f74..286299b7a37d 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.85.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.85.0.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
 
 QTMIN=5.15.2
 inherit ecm kde.org
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 0d0fe41dac02..07ae2c3adc58 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -2,5 +2,5 @@ AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d
 DIST kdoctools-5.82.0.tar.xz 437024 BLAKE2B 6e51452eef36a28af3adae497906ab02429ac57361bf598b347dca7ae0f9df33b7af0ef4c7ecaa5cde1f1021e9a44633013014d2d5a893f319bd8085b732eb65 SHA512 5255b78f1a51a9e2adeb1c6fe113c6555f50eb8af04d3d78c3942f924c071c11c1598245793c68c97eaa3bd1f299b8f9fe7f190da5b720ab7930ed53070f58d3
 DIST kdoctools-5.85.0.tar.xz 437036 BLAKE2B 76b1e2e10e058e541b45f520c11503a1360af2a053d5ab493b867f5166d84271d53a41c8dc547b78bff22cac06f25e66605337cc4e5a735513475ba14f2b4300 SHA512 b0118c94a3a4520076e9849ca4a7cfe13ec13ea7486d2c7bf81689a6ec6b23280793d87057513ebf45291c400a59d110583411eca9ffdacddc5c53d5a2ff4620
 EBUILD kdoctools-5.82.0.ebuild 869 BLAKE2B 37d94fdc143f12080efaa1fc9ed40ea16c369658742329ff3181748f709c9349befd7124db939b25eb764a7443e1aadd71cbe191e0c01ab85ca30c82999ad8d6 SHA512 b85f8267a233075dd38066ba9939ea98279b33989e8e287b08fbf260023455f8adf260cf86ca50d55955f726f334d98e812fa2b2836a4db1a2b6977a5ffa5e7a
-EBUILD kdoctools-5.85.0.ebuild 879 BLAKE2B 7e00e969e6c57b84a8c13d96c15deb777e5b5c5cb0959afba5d4694857b239938b2fbc6069fd80617432bfe1bcfc02f107e68cd2cd9f98b011f63fee0c96355d SHA512 92737a5efba8d8ff56a09855a336cca7929127f31834e9f13da5448beae3a09e49fdd402acb78a5b112d1592384a1d53625d35142b554fec764a5e93b88db316
+EBUILD kdoctools-5.85.0.ebuild 879 BLAKE2B 24d0be13dbbf7fd009605f3ce491a66fd1120d6f6446fb8d504971784b4853691f2f181a2e4aa941e93a9e2247f09a63d85d91b82d6576432bac27110a527950 SHA512 cbf8fbf92bd309e818befd8c7a32334ef47cd48a9fcfa5b04d21807a6aeabe364291ba1dbc274195cc641a1e21d30c1c82e03234c5dceb6100e05e18f5eaea68
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kdoctools/kdoctools-5.85.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.85.0.ebuild
index c1ce4270ff65..70d5563f3007 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.85.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.85.0.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="false"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index b54a9a9bddc7..53015208265e 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,5 +1,5 @@
 DIST kemoticons-5.82.0.tar.xz 1698472 BLAKE2B fc5f8401a4b5482126a9b054f1fe6107c2da759df0a4ea960cc4a139d9ce8dcc22e6b94aff64780d7b7cf049d68b67b799011f3d999b07ce2f1e065e6d6612e3 SHA512 c3c3813613891e23db9b5605de6dcfdf3e5f973e162d27d37e907b60d49bfc3ba99743534d3749dad6a67217e44220fcf52c880563da82dc465eb10536ea40d7
 DIST kemoticons-5.85.0.tar.xz 1698484 BLAKE2B 46c7a07b3bc80c54a461b1f47b57d6f155af3fc71b6eb4cd8f0c56b3c9c7571ffa93703f07ac4281453bfa6d19922f21bc4ca6e92b66fafc7d87fee7accb1ff3 SHA512 62fda2265b0fa7154f68d2535e331e38fa899b1517b7fd08faee1419bdaee46f2a3fc63469a54277ce25997df4215d3314219e608927389da4451c8fa3bdf526
 EBUILD kemoticons-5.82.0.ebuild 665 BLAKE2B a6ced1dc1d62fc0498b3b8eb1bfd3d4c20eb2e92ab99b50d9d7d7333bb6164fc538ef98a813bcfa052e3ec19e37712de4a8ceaad31ac9cd9134090cba0b79ea9 SHA512 4b307dd2a1e49baa683631e071e24f3c4f846a9a6e3a346354e38fb295e90652b4e390e4f9cfe8ade5932dd9e3cd7d83fb5a7f1c2d092de4858cec197563616d
-EBUILD kemoticons-5.85.0.ebuild 675 BLAKE2B 225ecea842cbf13bea8f9989655f60d57c1fcf3346db23b6e76d9b363638a7b380e7f7535812644915e160dd4829d781a1a0823d180a77d6b92f526e8ff03630 SHA512 5a5036f3dfc14d60454016c3dda40b8d96dcbbc8e4209e84ffc47f353a636e3bbe714cc1ffc0761d8c91d426842e62cda509c45740b194865da6748ad4019690
+EBUILD kemoticons-5.85.0.ebuild 673 BLAKE2B d2d51ecbefa6707415463a810c3d8f1b57145710eaf06b342e32a1df68c3412a196fadd386f2f51a0ffe5ca13225513ab0cb760e1007737c35e63f18f6f33717 SHA512 4e13b1c9f6f6452a25fbb27e8f377eb1cc0c384890ffce1b6b86a8ad2f2e3ed555867abab92d178b30e9ba5d084c459fee07a455645b8079156394e98e322b91
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kemoticons/kemoticons-5.85.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.85.0.ebuild
index 4ac8a8ee074e..eee0296e94d2 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.85.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.85.0.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-2)
 QTMIN=5.15.2
@@ -14,7 +14,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-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 28c7f936f4dc..b0269648db88 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,5 @@
 DIST kfilemetadata-5.82.0.tar.xz 425540 BLAKE2B d9102aaca3c49fb81bdbef517ba1a6040d0653ce1fd517ce61854b221b8abffbc49c69ad38b98cfc47877f02d7885b9560834cc55b5e03ae2d05eaee51906a12 SHA512 7bd70ae0c2d49d2a9d312dd79dc9268862efefeb48042d0fd8a8e11daf75cc67b6dbeb28fcee7c3f87517476f6eabbd3d4e9a1c61440f62cee0ef93c165cfae5
 DIST kfilemetadata-5.85.0.tar.xz 426336 BLAKE2B f68125f17afb6f3f9c65486670ad2eca8ad057927c30ad3f765d6551cf3cb1801512c9432c70f2e87a992e7ef8f81ef23908cfdcac0df5c466eb4a0e932e58ab SHA512 f531a1519ee3efc8b6973bf979ce2ee1380c9b425f06233267d007c1b79f6b7c2166e47212093ec8250f75dc9897dbb0d9b8b17ee4d999c487f10451a725ffd7
 EBUILD kfilemetadata-5.82.0.ebuild 1570 BLAKE2B a13ca1c0e412caaa88522f8d57d109e3be404b47fd3bb2095541c09db7c27bc9670722200459a5d4619c5e9d070553eb747c1cf28a1fc91f0f1f391b851c49c7 SHA512 7be89f4609812a090833a884ca467b0ac02560846bbd995bb6dbf6b8e4519172094373f96cda7285e416ac28e9b57fc797bd10224e27c21af0daff77ed340879
-EBUILD kfilemetadata-5.85.0.ebuild 1580 BLAKE2B 1008d6134def93edfe4c734ad43232ac24c1b6bc197832752f46ed6461c6933cf644861ed1dcfe560144fe7a8489e2f308c78d2c1558ed367cbf8b39d2345202 SHA512 24188042a1ce6157898c5d783d48593c9b9997c5faa382658e331f3b5ba0dce1b2b2d7a2a7e4c4615cb82e05954edc1d5025c1b0d96bdeb05e0c189a99caa790
+EBUILD kfilemetadata-5.85.0.ebuild 1578 BLAKE2B 2fcc08fba41ecc2b804f03df94af739ccb8a032cc93c827bb9900dd3cd4e0915569293bf70c0e9b4174473855ead07a72d61daa2ca74546be9fcb8bafc964a33 SHA512 cdb4675570b7ff8f14c46b71d5719cbaf9cd4d6cbf9256c3060f555291de2639311575d19c4230cf87e1619b6d9033ca4031898b9dd3cd7a5f55460d0912e6f5
 MISC metadata.xml 623 BLAKE2B ff419889af4186d3a3a16e8607e81645fb0dddc46351f77ed59b50b4da275313c1a6e7de6cfeade0cf25e523e2bdeeca3f3a7c271ff415fefdf5d8609290ceb8 SHA512 a842660a808784d3bbd7b9c423170843af33a6f0263f7f0171ad33f389ccdd35cf7aa8d4efe60f65e2740b4909c8f03cb2b472d72af2db83008860c68c3b86ea
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.85.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.85.0.ebuild
index 97ed97adfa4a..b66b72669f85 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.85.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.85.0.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
 
 PYTHON_COMPAT=( python3_{8..10} )
 PVCUT=$(ver_cut 1-2)
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	test? ( ${PYTHON_DEPS} )
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 9d74f1db6ccd..bbb3547f41a4 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,6 +1,7 @@
 AUX kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch 7552 BLAKE2B 37de1efd65119ca8df9147a5f52da98711102215a381c9bbf9c8796558ceafab8309225281ace5ec4dd59692a37e11a051f0bc1ff0755ba8a81705f7e4a634d7 SHA512 2c8e910240c3405da9bdc5962fcb3cc2db5a9b5a61f6155d8b2673ec30c957d00819f661e605fba3c2e14734e944c766376df6cb3c3e8708b62d5b64672f3007
+AUX kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch 2743 BLAKE2B 067e602048a9caceee71d1288f43d3da06b4d00b904f46ea2e227c7af18b8c1cf543f8f84e2bec1890187488cf81abfa0a9cfadc311bcc67169a85f8b5876393 SHA512 21c6d19fa875b920e80027ddc9122a4f6855051b3397948864e408dc2265da405eac4b5d345930f94d4eda32e0340f746e20c56c7068b99fe8f5b5a8c6fc747f
 DIST kglobalaccel-5.82.0.tar.xz 87932 BLAKE2B feed60b09b01da373b3a6b989ca465b93a67d1ba84ce45c503805e6cb49af1b7ce99afa1921414e9a616d344f95366e0e4822b58f41ea73222dacfcc448a588c SHA512 c6f757628ca8123183b1ead08fbf326bf8b6d5b97e4dc65c33a2c158103aa7915617d423692ee417059bd08a299546b7cdd373b31dbfd80f2498193da7b5aaf7
 DIST kglobalaccel-5.85.0.tar.xz 87868 BLAKE2B c76a60426406689434b8b7e90ff9f107173ffa8bb6e6f78603541c2f7fdba62719d141f01ac2a7e3ebeae06a2a891a5467e6ee87eb5d30a53ed4e3faa98a1b28 SHA512 091194d3171820c121c32356bf1dfd98416b91952b745afbf35fc75a7e944a5c80f17fb1f8418016513eaaf63ccb07c1aec822f5f3823f3f4aa604c3dd9963f2
 EBUILD kglobalaccel-5.82.0-r1.ebuild 923 BLAKE2B 70334606890e0d5f0725335e7e2bf47fa7a4f4cfc726861c6f05d3d90ea957bba3556841ba9431c81ae0901598c4738be8fa8109f666c6d19ab9f458b99d5d9a SHA512 dc744dd22f8330c36bd0adee7a898c8cbd272e4c6f9f032af8cb873c518f58735af321ba097e62152908e4117f7de8c75f6b6c384bbd93183f55989512bd6605
-EBUILD kglobalaccel-5.85.0.ebuild 842 BLAKE2B 218c70491ecb4cfc10087ceaff5d2773e28f849e740e6087629eb2a6f560cd3badb29d69c69f42bc0f272d54f0ada804589c0bb265d908fa845807dc8758fe74 SHA512 d97ce1ef94be40ef56e17cb14634818ba9da0deabed0d20856426cc48fb48076ed9787a9cc2f57c88db745d7dba3b11b5467200807eb849150a38c0251bde0a6
+EBUILD kglobalaccel-5.85.0-r1.ebuild 937 BLAKE2B 418871e9de4816a2b702e3b7d855fe7f7c5685d0885d7a1f72b5b4ff5c1235cd02f8c1b761a07e42a60d2e7e221964ba550038e5b558fbbb219e1b1963aa8ee5 SHA512 72d074d786140d9fce8954fb8c5d3cd7874c0da4342996816c2a0de65cba000d5f647e855658e86931017a32ae98f6a70f21368a9e04643a597bc55802d8c612
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch
new file mode 100644
index 000000000000..0a5dcd5c4f37
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch
@@ -0,0 +1,67 @@
+From c6c14830a98050cbee5aa48dd8812e2197515de3 Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Mon, 30 Aug 2021 15:45:36 +0200
+Subject: [PATCH] Start processes with kstart5 if available
+
+The intention of 717e4ea9f8e9d3f9ea5e6c8de2efbffd5ef2af82 was to start
+processes with kstart5 so they are in the correct cgroup. We should
+always check if it's available first as we still want to prefer it once
+klauncher is registered.
+BUG:433362
+
+* asturm 2021-09-04: Merged with:
+
+From 061c45df933f6a346c85c34fe10df6f1bd857908 Mon Sep 17 00:00:00 2001
+From: Nikos Chantziaras <realnc@gmail.com>
+Date: Thu, 2 Sep 2021 09:42:51 -0600
+Subject: [PATCH] Fix launching commands with args using kstart5
+
+By prepending "--" to the command, kstart5 parses it all as one thing,
+so additional arguments are executed as expected.
+
+BUG: 433362
+---
+ src/runtime/kserviceactioncomponent.cpp | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/src/runtime/kserviceactioncomponent.cpp b/src/runtime/kserviceactioncomponent.cpp
+index 8bb6962..09b3d7a 100644
+--- a/src/runtime/kserviceactioncomponent.cpp
++++ b/src/runtime/kserviceactioncomponent.cpp
+@@ -48,7 +48,13 @@
+     }
+ 
+     const QString command = parts.takeFirst();
+-    if (klauncherAvailable) {
++
++    const auto kstart = QStandardPaths::findExecutable(QStringLiteral("kstart5"));
++    if (!kstart.isEmpty()) {
++        parts.prepend(command);
++        parts.prepend(QStringLiteral("--"));
++        QProcess::startDetached(kstart, parts);
++    } else if (klauncherAvailable) {
+         QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.klauncher5"),
+                                                           QStringLiteral("/KLauncher"),
+                                                           QStringLiteral("org.kde.KLauncher"),
+@@ -57,18 +63,14 @@
+ 
+         QDBusConnection::sessionBus().asyncCall(msg);
+     } else {
+-        const auto kstart = QStandardPaths::findExecutable(QStringLiteral("kstart5"));
+-        if (kstart.isEmpty()) {
+-            QProcess::startDetached(command, parts);
+-        } else {
+-            parts.prepend(command);
+-            QProcess::startDetached(kstart, parts);
+-        }
++        QProcess::startDetached(command, parts);
+     }
+ }
+ 
+ void KServiceActionComponent::emitGlobalShortcutPressed(const GlobalShortcut &shortcut)
+ {
++    // TODO KF6 use ApplicationLauncherJob to start processes when it's available in a framework that we depend on
++
+     // DBusActivatatable spec as per https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus
+     if (m_desktopFile->desktopGroup().readEntry("DBusActivatable", false)) {
+         QString method;
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild
index 0b456b3676f0..f50a9bbc7b53 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.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-2)
 QTMIN=5.15.2
@@ -30,6 +30,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-start-processes-w-kstart5-if-available.patch # KDE-bug 433362
+)
+
 src_test() {
 	XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
 }
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index a9c8031c2134..9a7cf103abda 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kguiaddons-5.82.0.tar.xz 59020 BLAKE2B 7954f85a013b0ea5a69f524a7a8e4f715aae3a6e526c9f574e8d185bb3d840fc16a7556424c9183b51782007f39df2470d2f511ab9fb486ac61da245b7df1970 SHA512 8713b2036371240e92503e4be51bdd16a354bc08f1831fe242f64841945ce99e1c1e3a62d367f1c07c4769768d724341733c6f1360985e215bfd3a85d2574ca6
 DIST kguiaddons-5.85.0.tar.xz 60620 BLAKE2B 11910055959a4d257969c665be64f6e1933ae7afcbfa16f3fd5e31503935ffe5b62188f0da7e0b9621cb158e01512c88eb07d7e2c4e6ec1600fa932157a08b53 SHA512 0f2b1f0201028da520ac0b04fd66c753a953a675cd29249bab79807b08739979601499530be119b5bda124bda4dd09e10c8e11b68d0bcaf8a1a2283e853cadc5
 EBUILD kguiaddons-5.82.0.ebuild 716 BLAKE2B 3eed4ebb6872636ae2b7248e91d63466ad1837a4a1488fc7fb565b314955771e321e4aacb25c4542f4f62c659a4a04df6d71dbb52764e2a896e8af8f341b9847 SHA512 89a81624f19b2bef5a41123b283b91e75854ce67f43eaaa930b67aca87dd4311690c609d08519198a9456605f75fa12384e9a907a4cbe75c39a0cf6897af3594
-EBUILD kguiaddons-5.85.0.ebuild 726 BLAKE2B b3c2a6bbd9e6bdee63bb7894062f65a9c36c7e617a3d0c957599e978fc49c0218980e5a68113fc17921c6b6c4b607dc48e992ba8ea21559b276bce341a923b82 SHA512 322ea929d4734e1019f25088b307194349878658ebd5ff7cabdb54187b6fde37ff9c6bedd51ac123e1e2f501728b32ec3b9b25fb7b7435eca183a35b6ac14e33
+EBUILD kguiaddons-5.85.0.ebuild 726 BLAKE2B 01bdd037323919aeaed97500ce787298251c73ecaf67c35284d0485c6faf5b809778a11c1341f7339966eab4bc3612c155a43f2f10b0a60dee011f7f2cac5537 SHA512 c6939afc245f804eadb0627025bf8eae5774f2cca535ff0367650ecd664a2a922763e2d3aa80f5b46d2192e0c20b3b27a97f9610aa8e7ff7f1260f8d1d00d219
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.85.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.85.0.ebuild
index 1b1567e95b75..cb7795440e88 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.85.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.85.0.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
 
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 2b53c0acb6aa..16b289ce4255 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,5 +1,5 @@
 DIST kholidays-5.82.0.tar.xz 226732 BLAKE2B 76a1f0adbe3a558b2cf6aac7782795fad869423cb42e70fe5f8dabbc1d5aa0b5a6e5036d7fd68b8bbf6fffc63e095a471a72afd9501c328f2a7878e20e53996e SHA512 902065bc4d1ea733d24adf349bc895020eb49ec1d3f98c3e8ef4a59e3d0c968e998081c7ff1a18466201372c6f51fa9ae251e747da1b959f696975c886a42306
 DIST kholidays-5.85.0.tar.xz 230532 BLAKE2B c9212b1036af4767eb7dde0cf504cf1ff255ff329c041d9d00f656419b3b92f9a82b0c0c0008511bdc59e485f60a5f57fa91af31842a1bf053c94d42d4b3b030 SHA512 c58ac20764db8eec399ba0ae77d227023cfc455c76289faa4a688f8dc3e6987a87c7b0825ed4d4bba4198915d39ad9d74dd6abb3a10b04d2128764c201bd4ab1
 EBUILD kholidays-5.82.0.ebuild 649 BLAKE2B aed1acf368fb5c61658d05f09969aa6a7febe5f63e2e5465fa3eac327dd3f3c762ea7dfd41d6fc0729b87af8dd07bd715115ab72a034b2887528fec6cda1a5e0 SHA512 3f202fcbbaae11ad03dc19da4f50353bebfcea1549bff5cf8bc7e745fbeef65f6c54a53d3ebe1689f757134720604f1113496a65f6620537de9168cb8413c54f
-EBUILD kholidays-5.85.0.ebuild 659 BLAKE2B eee176a3a97491c05122120600868a843c92c7ea316b98e933cd5db26fd815594176947eac5b0627bf0a9952b7c5dde957d9e1e9258f4a30d204f7beff94b4cc SHA512 817df540e979b3a0d118a97210b582869e59248d456b7c6b2f44a75474ce0ba3af79300a7297e833ff87b9339fcd9d172532ecf2b73712a117a1e1e1ed833bf5
+EBUILD kholidays-5.85.0.ebuild 659 BLAKE2B f92eeb5f0487e9df7c7098f10bea075c6e0a712432985baceca4833f65114e39b2016f7d57611727209cf99a6930511f0d4058058341427e80d6c5f89799e6aa SHA512 42ac87dbdd5b956a9b894f2f4b638cf429dbfa9aa16a734453aa55510385ee365c5bb34b999a1b796d9dd90f1e013f90f7af8e4e82d8a74d48423da0c106f784
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kholidays/kholidays-5.85.0.ebuild b/kde-frameworks/kholidays/kholidays-5.85.0.ebuild
index f2e49b172154..db511b412b81 100644
--- a/kde-frameworks/kholidays/kholidays-5.85.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.85.0.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="false"
 ECM_TEST="true"
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 5c7d72f9d059..95af177418ba 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,5 @@
 DIST khtml-5.82.0.tar.xz 2093168 BLAKE2B e4cbcd5e187d8ba563090097d362ed6138575da93ce3c25796e1112b3a39c135ffd53d4dbd7302a9482069111bdc01291027a9ea6253ace972b19983db5b6386 SHA512 8aa3c615cc13deee3e4859f84636fd1cd18190b0a99849a6782b0a106a1a8808061258e055158cbd3dc15d5842ce3cc82fca8eff2fbd1634807744a0f7288cc0
 DIST khtml-5.85.0.tar.xz 2093124 BLAKE2B 627bfa8581c6a5574027ddbc8c9c87544e218068ea6deed5190b0528cc8a9035eb8154b1847fcceb7f4edb664d72aea23e608880cda84eb610da66ea9a74a85a SHA512 772aa4bc541be3f03274f01810bd7d49486f9a7497e8f6e2bd4cbdf3dee4776318fddff0c2b221181184dc185ac4549457ae372b5521462749f5213c62e1dddd
 EBUILD khtml-5.82.0.ebuild 1753 BLAKE2B 12ec33b0e6075a9974b9f154f9f8e2f94b79a3ccb6ae59e0bacf2e589df8db6fdbec1b4c5feb757a9fc07feb08ad0982f162a8612fee04d5d8579336e722a384 SHA512 c653efc2d0c78aad650f43dc7291a3602e4ec6369bbaeee3c17a88b59e2a650a597a3af82d0c34de20123398d6975a52e51caf6aa6bc114dfe9424d49a60e603
-EBUILD khtml-5.85.0.ebuild 1763 BLAKE2B 594e630cde49d0d0232d1decae31dd4db3d3d790249fbb84209886e9de91a433a16e1a22d2692725846b42a0b7789104a1a708a9b645d20a3ce3c2fd2a64b5d3 SHA512 eb97708570b90e7b08ecac0d304e727224d1a69728376835c17379108faf9c68e41e5d1039bff87a2d40302c2b8c8ed375f346ce14da74096355ca653a90d03f
+EBUILD khtml-5.85.0.ebuild 1763 BLAKE2B efbe9c64000d063d6a3ce67e673e6dd884fcce750d8bcbc2b1aa07278e241bb72ae717754c581be4c82361eb4e39b08d5dc66b083b85e92d166cfa702400386d SHA512 753a8039ccd49cad4b7527e21e75994d62de76f430a6ad89421bd3c33c701cdb371f56d5545e9028c2219e8edafec77f02f39eb48ccba49b8ba4aa71370bb356
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/khtml/khtml-5.85.0.ebuild b/kde-frameworks/khtml/khtml-5.85.0.ebuild
index d16848cf1340..e20decaca238 100644
--- a/kde-frameworks/khtml/khtml-5.85.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.85.0.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="false"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 8aaeb181ffed..4cad26f8f3d8 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -2,5 +2,5 @@ AUX ki18n-5.57.0-python.patch 512 BLAKE2B 9feb6bd88fbf7ed853be777320d5d4821320da
 DIST ki18n-5.82.0.tar.xz 590552 BLAKE2B 628acb64959fa4b38ddc44c586218d1841b03dca2ed11d72ba235bd9868b50f63f95e46847783af14ff465f9f89fa8c63526631dc648b1f9baa6a02130ae9e28 SHA512 a0f84494897d5c614923581bb3df016ba8801b7404b933c7cf85b158be96baa0cc87199a4798a694654fa80ad8204085a2fb6da8e6f930156071261b213894eb
 DIST ki18n-5.85.0.tar.xz 590384 BLAKE2B 337898b907e673365175a3fd7f122baa156266e60ae47d0f5f7f9afa577c4ed2abfd34d8b2189c162fa4c15e4b726984cf620d699a65b8dfebbeeea99eab0079 SHA512 01053f5715d907eba28daab411880013b9f0305f72d84d1a26edd1aeae6b3f05c1b580ea95aae4de122a57a3bcabb11c4737a82bd51facf8201d584c64708856
 EBUILD ki18n-5.82.0.ebuild 830 BLAKE2B a0e385cdfa4e9f8f6b48cdc7aed245a66fa4894bd2b62790aa85c1ebd171118913ce4b019cc632c0a4d713136e9e87fa5e7526510832c75e79041b07ef8e5e33 SHA512 35c401841a829a5bd1150bf18a062562789487dbd4fc5b1ba265ab277e8ddb169a0bea96c1cb07724ff28f2fdc5ab1547c7e0e83b5f902ec5122d4d8ebe1512a
-EBUILD ki18n-5.85.0.ebuild 840 BLAKE2B 40d0b166df26749e4300402401d4e871cca10f5599e19f885fe0c0bdb7b8890995f318430b30bbc9dabb52932633e8047e7504a07382d5b4c9a0d92437305624 SHA512 cf2e85d10e212800de8a23a01d19fd3eb77c8a612b193790f47958bde32c064134c580cd4b03e3e16b88a663a4bbae715e3d74591132c1693a8e628787b4e767
+EBUILD ki18n-5.85.0.ebuild 840 BLAKE2B e16b66252c783261c7f84d905b178dce98057d9269299ce8ce135e4acb693e71e38f0aa22cc5577269f540d84a63cc87061e2317ad97375b9a5aa98215f7e18f SHA512 95bf43617182d7680d2c0d6f15091955b69e9e00acdcec215afbf07198b732efb78cb0c8269f27a323db8e213d2cf9d1fe1693d2ee4558c83f42aa8bd8578e7a
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/ki18n/ki18n-5.85.0.ebuild b/kde-frameworks/ki18n/ki18n-5.85.0.ebuild
index dba624ab6507..c3e589fbadbd 100644
--- a/kde-frameworks/ki18n/ki18n-5.85.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.85.0.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
 
 PYTHON_COMPAT=( python3_{8..10} )
 QTMIN=5.15.2
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index d8f115e2f0eb..45373c7edff0 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,5 +1,5 @@
 DIST kiconthemes-5.82.0.tar.xz 222884 BLAKE2B fd7404f50ec503e853d25fff6b61d55a133a26f7fec9a2a4b50da15d721ef9a2ca116b2307a6eeed7316693a68ca053f0d955d0417b19e0aa79bc6a6eaf64c25 SHA512 b323d9ef88e6659977a3a8d1a61b8bcb72c299ee16fbc42f4ac2c02f50dd03c211e9d79aff71e26ffce4a0a1d496533a5ea1d0aa07c30664f5dc78af9b105abb
 DIST kiconthemes-5.85.0.tar.xz 221352 BLAKE2B ee619a6192b1d6dbfa000b1f6366ebe1dd8c25df41dabd2dd15f888f7cae2a9f5cf53d5d0a0a2d5ff7d95a224137a69a31f4c2e67fb6419b750241c7cdf05c81 SHA512 87e041835401273627c596338f94a0507f3184fb3e0a004ad4ba0c878fc2ef9ceac5bd4a9318d8c8e852e1ab26944368ca6b27a3efcd4269643d8e0cd0d60953
 EBUILD kiconthemes-5.82.0.ebuild 799 BLAKE2B 3ed7ff52370ce3a320b23c240bc6e02db4916e7d8c0db81db6eca07d497238200c618fc3c03b3c9877b5a3fae2a3c8d8b70ba635f47a8bd587701488b5eb9fbc SHA512 b5e7cb72ea8ab37e90ab3e684cef4f1f5c6879b735fa1ed48aba1499e8cabf772024dbee20dae5d3440adb8608fb3e4755c8973fcdb7194485a48da442f81ea9
-EBUILD kiconthemes-5.85.0.ebuild 809 BLAKE2B debc9996c7ab8e1584d134f5bea7b93f2badd4947fb19ba13fa0600d1a199acdb4731d6fe8f596ef70c5cb2469b35c244d99c7e98bbdc3a64b7de68ed9bc2f95 SHA512 b0dfa04d00efadefd7ecad899f87b45d530cf6295d01ae41b75366cf8435910a8e7caafd9f2f7fcf4c8aa332719138984f016cf6bf4e5817d557b94146237002
+EBUILD kiconthemes-5.85.0.ebuild 807 BLAKE2B 4e27e943e7d26ea898e67f30049b3e322c539a0f522be53d833cc0e51e33345a488804e86de4874f9c3046edf83e8d98d9746fce6e5740655d9d2bb1385ee542 SHA512 45c8fe29a48202324f3da249dbc1aa11ae73ef1f3067ca0809f80d5b80546f66a3523a101fd7878d94dd6cfab572cd3e2fbe4f2240afc38c86f7081047c6edf3
 MISC metadata.xml 546 BLAKE2B 9cfab5e5f3efb341d3c84140c65843d706a33bcba9dba92b62e7365c1cd5fbce8e0d52e5bd342eff1e05ab38fdcd6a9a8b8b441f8cf5a94dd70233e4a3ec36ed SHA512 8504b2496b14ff6bcc7dad0eef39ce8ce12516ae54d498e3d609512ddbda6b587359403fe12d57530e59209eddbe30f23ded0d2d385c773dec561efe610ab32c
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.85.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.85.0.ebuild
index 65271100211f..1898cad3ba08 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.85.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.85.0.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"
 PVCUT=$(ver_cut 1-2)
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-RESTRICT+=" test" # bug 574770
+RESTRICT="test" # bug 574770
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 260dd3f338ca..437c77ba97e8 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,5 +1,5 @@
 DIST kidletime-5.82.0.tar.xz 26040 BLAKE2B b5e7ee686c9ffaefc0f321bfff15f0ee633b04ba07753702d2f76ebb069704fd9c5042904e726e617754432df6caacd305b0c4095178b71077801089a76f29dc SHA512 35cb528aeaf0d28ace354eff8f65812bbc8fc7f0b8b01ac93b8317de6267d93d1e1808ddb5b136c0ec9980544f27518cea2c3c577dd8252be05b8fdecb396f39
 DIST kidletime-5.85.0.tar.xz 26116 BLAKE2B 45a51974ec3e3db3a9528d7c2073b13536ed291691fda7fd3fd5810cf4b602ab394419bc67286634d6beee65a1f6e12f7962431cd34e64b819c16dd7ed207b03 SHA512 1a3c322bffe3d596283ac4b48c10b83deb9cd5f792bb47974e048994f74117d3f65148424f48a9b4f812cab3b96a1ecc5360b0fd69efc9c4f0326d630046e880
 EBUILD kidletime-5.82.0.ebuild 855 BLAKE2B a9d7f8cd29c4ea71e71e9b74c0b51bd36da0da2123c3388c98bcb59c65c2b338e6964cc11060ba0a91ba8b6bb010b663cff76990c36b77d2dc9a649cbcde745b SHA512 afed3764af89fff78b5972eeb385faec8903068fc771c6d1f251c8ef2417e31b557d38f0be6f73710c5bf41c2fc9a9125af51c0c8dab6b530348e891454b40da
-EBUILD kidletime-5.85.0.ebuild 865 BLAKE2B 6d98d81fd61920659b8d1ed0fb9da0dd871b624be676f47e3765543109a08bbb1de3939e3d2adc88b58292a38b78b128f97a753bcc5dd331d450a04f0e85fb25 SHA512 805663b041361d37ab2da4a77beaf631975ff7f80417f2644fbb5678a81f14cffce0a3ea283860bcf9b57cda6a9323f6c348976c3952759f7d947d3e1cc9c6ed
+EBUILD kidletime-5.85.0.ebuild 865 BLAKE2B eabf83de33504f49c46684ecde9c7355482c5d7cfe110e0966d4aa5c7ca140b70d747de6eec86d17745cb9acdecb45ab827584513b82ed412f28a809a5b99e0c SHA512 0198a814fecbc6ea04948e6e0d841dd010dcaee8c6f1a6535f7c8686019bab1037eba71e1657a3d30f70f9ca25d6cb5496a114ec6d8871e8691cf99fc29209c8
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kidletime/kidletime-5.85.0.ebuild b/kde-frameworks/kidletime/kidletime-5.85.0.ebuild
index d19acffec7cc..a3ce5a27e933 100644
--- a/kde-frameworks/kidletime/kidletime-5.85.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.85.0.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="false"
 QTMIN=5.15.2
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 9d5bfd97d06a..98e5e50769fe 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST kimageformats-5.82.0.tar.xz 590128 BLAKE2B 2136a68dd1c7a9dd6c07da180d228ceafdeeb6c7bc35af66e53709c33e9bef40c4bc37a78243c29ae8041d1f92b365c809de34fa134ba66494dd50fad1f4ae81 SHA512 7f24763602a47eb580685164ae0ca2d074859eabed449c41ec28385a5cc9d2dc0ef348809e98452a320268fde37e1569e324c75b3de3908b7070a78749cdf56a
 DIST kimageformats-5.85.0.tar.xz 590844 BLAKE2B 39102bcb685a35146871201604d220a0f439531ab65b1d78b6045bb9c45651c7b54967c8c82a100dfb5da028fef1c845c8711a632dcfffa9fbd752a2884e42bd SHA512 7f72ee1d0d56638c1aa8ab0b61f18e69517921f25a64424ab848177da13506ed917eb17661f5a1069f5e56578f6a5271c9fbe665d8cfdbd284e28747e6bfc321
 EBUILD kimageformats-5.82.0.ebuild 935 BLAKE2B fa9b82a438b5868785f25051545bdec9b67c9b547755e06b8fb7463cd5197ba5d0a4d12ef7a1d67f01870aa6ee3121dbfde2addac825cc46871c8e0750efc5a0 SHA512 dc20e7b6ce16e5cfde67bddf141571a50d9f52ad617b2b242472cf37e0717e17599e9968a166c1f12457fcba33f5c59422a47bc3933c3095c8e71b4e6e8f1821
-EBUILD kimageformats-5.85.0.ebuild 947 BLAKE2B a35f4d404cf73620c37e78fddf158bb8677d7ecec6b0eb1e09d7a0e5aef14b4438b922a2082895ca77742add6bb8505404642bd46e79ec34c6526eb41b904638 SHA512 ba823dc607e316cc17cd448af91d4d9a5cfe12cd733669c28da4bafd6bf97daf2ebb26413b8ce1bdaa69f812565546d4d534398caa1568a79a2c916e407933d6
+EBUILD kimageformats-5.85.0.ebuild 947 BLAKE2B 364ac00cd0443ddba9281b44909aa9720f8a63fa6120220919628def5cbe12e5345ed1a0186004f027de583ba538509b5d988b95c601cb2875b3b38303cd166d SHA512 5dc3220a358500419f921e2e91509b1836de329f50d779f84fc155f7b2ba4a83183b5537cef47187ad0d1d6d1468a39f778752ad9fde7a73239247f55a82ebbe
 MISC metadata.xml 651 BLAKE2B e1431ddef70223c480c71eadab3b23ae16aa52787d0bc3bccf89c340eb3558adf3286124290e558ec73fe0325fe106d85e68f28eaab2131968e9e910f876f066 SHA512 2a2389243d65699ac9c3ab9d046e6ed45bd37935b7fde8d6efa17bfc1a103affe0729e3424f9196df0eaac23ad36943822a301755109f7b0e5d860964db1e66b
diff --git a/kde-frameworks/kimageformats/kimageformats-5.85.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.85.0.ebuild
index e5bf4997343b..2a5327eeb89b 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.85.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.85.0.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="false"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 7c2fc1462813..c5cdb2bcb426 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,5 +1,5 @@
 DIST kinit-5.82.0.tar.xz 121448 BLAKE2B 1c38e31d9ab2231a808edbb713629d91d1068263a56426303428e20b066256381030278cebc30fb45234df92bcf30fef40ad2a3a2e4066f643ce172f6c701862 SHA512 7c6dc83d1ea10a8271fe23a45a7e5bfc7e67a7f9c25914386d65157f253c98fc518aba4a4cd7d724d1684097e3e94e866e18165debe0717e7917572436fe3af2
 DIST kinit-5.85.0.tar.xz 121608 BLAKE2B e6d8f14dc6930ad058c35246dcb408d7249de800a27e2db07091cae93bfd3ad0b37cadb048ee95398a0330b571a71517d4e7d61d6b98edb40e73201786a5a532 SHA512 9968dc1381f236c843aa76bd3ede13b83607dd6e6a9fc5723e3ff23fa1d924536fd227ffbdc20a4c914dc76843f0b315b4247410dd5580ae1134db3b50ae679e
 EBUILD kinit-5.82.0.ebuild 1134 BLAKE2B 4e157916a91ed39ad8fc9bf70af2187cdd9b66fa7645cd716f2d3b68bb990b813480d3d94cf656de9ed876c447683b8b5c11755ee8aaa2c3d86932e043ee2084 SHA512 1e4fc8c805b841b5c108be00bf7c7e5526635a1fe25fdc46073dfb9b484c093414248366c96d2d18fd2d58ff389a1201c2c028034778e128307b803d50a6f27e
-EBUILD kinit-5.85.0.ebuild 1144 BLAKE2B 5fcd3c3199ea76be3d069c665f3253a64938af7a56c4cba2b48d8140db9ca090d879b0863eaf160ce9a107dc035f989930ff6d483f87dc7ae3033b279fca17a3 SHA512 a5071c605ece79ca3487d568c0347643d08c019b31778223d2c0b138b985f3d61897ba6d42c7219f8304f1fd46613a9d06e1c9dfb5e71d6ac7a8c2616369e019
+EBUILD kinit-5.85.0.ebuild 1144 BLAKE2B 148a1f2606c84faa07651b4f1d5e4e6d4674852c4852abb2c00ca85baf490782987b309eec8ec4b67e5c9e1f02a8c7874e8830ccbf93d2a53e322cf5cbda22ac SHA512 85494cf1488e279b9ad3c4bb2e391cf4badf559b6ec05ad7f465aa3815e3ae2e537ef737d89f09d7332e200569088564db2ed366bfdac4bf4d231d6a69ae1466
 MISC metadata.xml 564 BLAKE2B 62fede94aa4ff2a954ed33110d7ea1280093ff4a556a2aef045b44e7d42e2291626fd0982af5d5e15e71ac774f3ab5b14f2856450f65435deb05647ed5630ff8 SHA512 83db4c14578c293f0421eb08c7685c42bc0737609dfa713ddfdb59ba6432892a8c88e43240a7e2511184b3ca6ebec404ded459619ae1d115dd3c78c7c4747b30
diff --git a/kde-frameworks/kinit/kinit-5.85.0.ebuild b/kde-frameworks/kinit/kinit-5.85.0.ebuild
index 0bbb079a9141..bf8dfd8761a0 100644
--- a/kde-frameworks/kinit/kinit-5.85.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.85.0.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="false"
 ECM_TEST="false"
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 549f0559411c..49627812bc54 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -11,5 +11,5 @@ AUX kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch 1156 BLAKE2B
 DIST kio-5.82.0.tar.xz 3330028 BLAKE2B be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0 SHA512 a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc
 DIST kio-5.85.0.tar.xz 3200300 BLAKE2B fd723dba761b81862bf503645a8526a246867e5a10441f3edf895e4107c189ead357615e17f3704325976ed29867c54f98bc11b4e977e21a78d429ee7efa2dde SHA512 73c69743f3d99671ced8176bf9806df54eb3afd04dbdd9dd92b79c9979428f980d3dbda9504c81aca4aa36249b3e43edcc38831497752e31a510a70ee98dc4e8
 EBUILD kio-5.82.0-r2.ebuild 2933 BLAKE2B 0a5403e19ca99bfd4aca781fe39db28da02d1cd83717aebed1ca51d245ac49e57ee0fa4ca60c98ee675b331ef7947a2768728dfe6e5a5bc78c27a52a0b07d58b SHA512 e7172bcc1813bca6f08486db2af8dd33a3de5ebb2dd46ccaf137c74b34a4ab74237cc1dd7a13aa732667353f70020aa1b8a6977318537a08901849edb165bea3
-EBUILD kio-5.85.0-r1.ebuild 2627 BLAKE2B f70ecb9b082fc76f7b558e39a39caf575f1f47561ac5d78e22f5490723d639b241ccfb10922bfe0165538348d5f29b2e670408df2099b8577d5b9ebaa3787da1 SHA512 7d5466fd3c3eea4d5501add478f767770884470aa1de4d215c4655f2c62120b1b585708275218ca4fba406899290785121cbe2c27a9726f0ca610613feb6385e
+EBUILD kio-5.85.0-r1.ebuild 2625 BLAKE2B 672ec6795da13c4af17cebe586c7fc8cd46163e270f63159c1186ddd176124f7804af0b0080787cfe0a2ba348018226f6af51f36d1ee85b956e19b5d9ea9095d SHA512 d8fe973f5a874e7982f277f605105102acce1a7aa40d2d092e3bc6486826b3c9226e59d24e60340f9f0cd3db7b831011f007ac1d451c7c9ae3bd8b50fae50fc8
 MISC metadata.xml 671 BLAKE2B 9f99b79d8e3abd487802564d1af175cb88f807d77f184f4bf470b9a9293dd0962350c122041c06bc0f5348ad2a5d2d096181e2d8cbb1199ff56aec08f8bacad1 SHA512 900764f193062a4df9a3f85e348ce38ef7f0e6c7509fcbcb3f467aee4146a0d23ebea85e06ac88d81d986f898a126999b9e8f039592ae8dfae177c2ff422f363
diff --git a/kde-frameworks/kio/kio-5.85.0-r1.ebuild b/kde-frameworks/kio/kio-5.85.0-r1.ebuild
index a3ae236a2eda..46ca739c2b5d 100644
--- a/kde-frameworks/kio/kio-5.85.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.85.0-r1.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="forceoptional"
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # tests hang
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index 0f64df50e76b..e98ac1498273 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,5 @@
 DIST kirigami2-5.82.0.tar.xz 315952 BLAKE2B 470199ae252029e7abf78b1d3853f72635bd0a68a306695d2ba2a88ed2114e129a1b496cbc6084da17e9d39f5bff7c44fe0a72636f22654aad582b658484aa8f SHA512 d2a72879bca7151dfe07e55089bf61c8f3157ed78357b894a7834a05c78ee790b55afc2633e491b358b8b6c86ba73a000f17c7b224c88e19711a065debf0102e
 DIST kirigami2-5.85.0.tar.xz 323312 BLAKE2B 4953b9d3f0114aa7f12b23c7c12092cc0de57ff67e73130a1428e7c334d34b5a87dc8c7b2095dbaa2f28f6a96cc8be67682a73b2785a19f39ac9396c20646213 SHA512 239a8f7e5e77ca19cd9b8e45a383959c0c5b07dda279862c3aa0474fd34d58d905ca947c7f19eec3bc2de53557e8ae7dd8cb5a4879a53c28436e6636931c2603
 EBUILD kirigami-5.82.0.ebuild 975 BLAKE2B 14cf5456ee43bc83a9d5a3fe832f0fa1689484d635bf31c1cd43aec1164675a2ca2e005cc30007f39308691749ec132577bf3eaf55b220c0f6ee68af58cb5928 SHA512 e6ae1c47d36ec8351caed8ed168aeeeac91fcd5e2ad23ad1f197a1563c5c38bfa6b07bf3065a7b437f11ee987a9b5c81c72c4ccaf09223417cf6479783d8d515
-EBUILD kirigami-5.85.0.ebuild 985 BLAKE2B 1ea3c615cac317b3dff90df20beb6c019e761025ad36debe84d4b35e2187a13fa6ba040bd85cb421b875f94a56acc1ff4ef662bbd0268f9afdeb056c987f8f32 SHA512 e3e1e4d890d11d8b92692a2dfc42cc4d03fc1aa6100e62fd98deb44ea4c140b7713d91c81b133ea17677104933f511bd9157a2a330d3fcece7520ee3a13297cd
+EBUILD kirigami-5.85.0.ebuild 983 BLAKE2B af4c4f0de065b04abea3693bdd35ea019e8aecf35abefdd3e2c20aec6afe929dbc580ba7fc7f33583440043680606c995008e8552340e2ae245a0893f4a6fac2 SHA512 f4ead26545ce0e5f5c71c4e4ca01ed0b91a0ff37b6f920e52875ba5618c035152c0e9a50174b3fd95c2dbbc460ff9fd47625a4e4393772a6fc0260de91e7abe7
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kirigami/kirigami-5.85.0.ebuild b/kde-frameworks/kirigami/kirigami-5.85.0.ebuild
index a7b59d267cff..32d0b42c0693 100644
--- a/kde-frameworks/kirigami/kirigami-5.85.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.85.0.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_EXAMPLES="true"
 ECM_QTHELP="false"
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires package to already be installed
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	>=dev-qt/linguist-tools-${QTMIN}:5
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 3bfd8a6cc12a..838b17be1550 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,5 +1,5 @@
 DIST kitemmodels-5.82.0.tar.xz 403080 BLAKE2B 722bb9df4bc8743d1f64c99735b9b97a7326dd4fb8ed51d1e220f8b584cc211ee5f7d75c7735156e8223450acc1f78e5ef10b87f295947b7130fdd861510bf62 SHA512 a28862e46658be6d3f7b8115151088fc5febcb804e115d541a0514f12cfe0019ce4b5108643290db817a06b19e613c99ce68cbc32ee7ea90c906dcac8b392d6c
 DIST kitemmodels-5.85.0.tar.xz 403004 BLAKE2B 3d5ebb1ac85d56860dc141a055341f90111554158c5335d2f4cdb750a0904db75442c464e4d547d4ba5596ffafc0eded9ed3b5a966542ddebaecf038b72bc81d SHA512 e953a8145cfbae9ee3041ef12e1a8c2a3e8289be116893b6e0c89c32e0cc39207928732ef7930b9af1466672d429ecf7ab85f92ae83ffb75906e201455b5d85f
 EBUILD kitemmodels-5.82.0.ebuild 686 BLAKE2B 7a03e55fc99c72e185c9286f7fd2707b7008adb44ba6139d33cd3b0a23237f90672b3ec0b8c0e4e8e52b286ebe236d1ff31a628816efb19dcae6ac3ad91787ec SHA512 c66ab8a142495a1ddf61e67836a9a6bf31fac6557b5e39e31222a27b34ced6e9ce854b802335a0ceb982a8a2b50c5ec07e0ae0989cff6daa6ba06dd85d33c31f
-EBUILD kitemmodels-5.85.0.ebuild 696 BLAKE2B 0e09f15b259b27615cbdbdc04fd58475488b859de252dc2864e2c6a46064f4d14b76821d9a0f92a79c32e301fdce43a083c5e506153eeb01ec76c35246894147 SHA512 356e03af3490b44e2f7419fd9bb2e5bd089290684042306f425d272e2be2fb57a2e7560846d4f3949766871fde0b611fe789c2354856ecc59120d637f8b79236
+EBUILD kitemmodels-5.85.0.ebuild 696 BLAKE2B d7118662e5cf8c012f166890dbb5223a2f4697c4429238d1b1b605ca6a841e3af45b5464c83f35d7943b93cf5e00c69042214fd2ab7e51efaae76330dcc7366d SHA512 c04436e9c66366916b8616e4a3f41f02675f4e1e6101eb16acb566b72302023a45d0e3bf49fb5c47ad0b9e880c8c301b00d32b3ef71982051d7d3d17faba4932
 MISC metadata.xml 551 BLAKE2B 47b147bdc095d79d5a23dfc6bb1d2f607ad90939df8d03ddfaf60901e6e1336d0c16619b43b619234f8fff58e657a790caef97f1d8ca23370ef3dbfa36f91441 SHA512 a8463077d89e4e25277358b94e799ffaf7ae2712ac9434761d4258c5a3799b74fc65d5a68f91909651fb158158b6b33d143de2ee6ebe79cff89a41247dcaabed
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.85.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.85.0.ebuild
index 8ba34ea421ee..f0e41176ca8f 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.85.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.85.0.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
 
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 3ae140c69436..e6ac566b3b06 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,5 +1,5 @@
 DIST kitemviews-5.82.0.tar.xz 74908 BLAKE2B 0419be4239e07260606a8592a55bb16d4477d2a4f7b53aed5c50a872c6e32c35d62a550de5664cbd332f2d3be7b7f11dc6f50d983294b50649c8d5c9704e0054 SHA512 5b2d343331a99418e3f6030d5732d998149670c7d7075de3c0c7431b1855ef75ecd192838a8d2d5d10119eb4cfc397b0bcefff48dd11974cbd332d05bbb5799b
 DIST kitemviews-5.85.0.tar.xz 74868 BLAKE2B 96fe28e325e88eb713220f231ad9ec93eea8128ffebe5b67db16179e659e8880a7920f4637ccf5eaa273a3519da494bc97296a8a0e4f6ddeb9afd1445fc5cc4e SHA512 63e7b4ce92be46e631ddbccf1fac484626f236e215e2b314f9ca088be36af794527f903a1fe28d450b8b5fb2852891d1c7e298d299cc7fda203a072d8905fbf1
 EBUILD kitemviews-5.82.0.ebuild 616 BLAKE2B 56ecba2d309de88d951f2cd390b852cb9d4dedce7990c1a80231101a7e8001674be3de1dac2e7802b16e8eb66d90afe4343c3f5527ca573a001a5aea8b35302e SHA512 a5dc98c5a5e893d0b7009046fd4e43efa9e04eccd52b7d22fe7c25a40b124777119f275fb66e2998f2a74f4a1fbce7af4b642b705c4cb0685857a96abf278a69
-EBUILD kitemviews-5.85.0.ebuild 626 BLAKE2B c08ba8b71da9e49142fac60198e0e0733fe8767fffa8a666a3e820386a78c51f5ef2d12747ecc28b5a9fe9afdfbeb8d49eec677c986ee8852bfac1339f94f96f SHA512 2b6d7ab9e28224f92ffb38b1699338bf578f2f676465cb662951f77201aca20aec45b0f1db2828a065aad4a03bed965e3afd545a56073a7aabfaaa324ff5948d
+EBUILD kitemviews-5.85.0.ebuild 626 BLAKE2B 01f2ccc01bd542cbb946ce833b66a6e1b8593df4f101a67444ecc041180e52ef1f5995f587028af716e7ba00f84f62494939cb1f2c9428135e41b775748a8f04 SHA512 c9ba786e1d833432c44c076df6b54b1c9d4a5cfdfe281f2e19a3e0a4fb4becfe686e43c623b7a66daddbff0ffa98fe324bbe6616121fc0115e61651b503b746a
 MISC metadata.xml 546 BLAKE2B 9cfab5e5f3efb341d3c84140c65843d706a33bcba9dba92b62e7365c1cd5fbce8e0d52e5bd342eff1e05ab38fdcd6a9a8b8b441f8cf5a94dd70233e4a3ec36ed SHA512 8504b2496b14ff6bcc7dad0eef39ce8ce12516ae54d498e3d609512ddbda6b587359403fe12d57530e59209eddbe30f23ded0d2d385c773dec561efe610ab32c
diff --git a/kde-frameworks/kitemviews/kitemviews-5.85.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.85.0.ebuild
index 17b8161cc0d8..0285b52bae8f 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.85.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.85.0.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"
 QTMIN=5.15.2
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index a01e6b0f6a87..adbb674c2cbd 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kjobwidgets-5.82.0.tar.xz 95628 BLAKE2B dc4cc0332f54c3f44034ac0534dfb60c655e4a089cac9cba97472cb3c345bd0617b13ebe0f152ecfdcd438965088fe45cbbe8e83d2c6017c90fca0181e052e96 SHA512 9fb0d2ababee7824772748e6755641910fe0fcbf0ab91ceb5cc326af12b0b9a5d853c84ca226ca0ce476132acaaf5cacc626ffa820ed04fc1a05ea4f68f0f454
 DIST kjobwidgets-5.85.0.tar.xz 99076 BLAKE2B 77887b78e37644d3a6cbb7528532385956efe7c152d939f25a8d95e07be004973a2977e251ca67200f341af0c213b7483d1466d541adaadbbd161a2f6c7e50b5 SHA512 d3ee9f74f0aebccea1a939568793d3162d76bd2fc8dd8271d2b9b19836fe1f05bb1eb8fdf4c3456891587b8c6b6e91004d3b18374420aad8af0e9efaac64fae0
 EBUILD kjobwidgets-5.82.0.ebuild 842 BLAKE2B 76e3d634c96289fddedb6507911426a7df340bda2797a2a542eaa1e1950a57495a66528ac5e0507269826766cc3bbc407a6a1f5df24d15a964aadef9b40d9558 SHA512 cb0093d89b82f258d9f5d2f1d25c1c816c92970f39e67315549ce4983150e3f488d9837b7589ddf6c52e7995e90cc9f1d44bfe689b38a79489cf5f0c86b48e5a
-EBUILD kjobwidgets-5.85.0.ebuild 852 BLAKE2B de257507c5679f41fbf6a37ad55b71c6751c01da595f1f05acb06bea8f9101cc9e92342deae0215fd958cf3cf9ea4fa941f1aa01be593d6abdc80a2460dfd812 SHA512 9ba43e1a7ede07f228c8e05e77ac3e4487a5ebea725f2d27b224dd5a7b7a166b20b99866923fb48fba60d331c793e358cf6d3d294e09aa19070f4c27593d313a
+EBUILD kjobwidgets-5.85.0.ebuild 852 BLAKE2B 6df2c4cd45f870fcad8e8403d32bb7dd7be67498159457ffc38ef9f04d9c247a73001c835057a2faa0d1b9c0c7e25ede90b9f0d6c5c3741b9e4333d6f1db42a0 SHA512 72d5432949da3cbaf1d62031802591e8d1ef17ac213d5f46bbee0b475ccdc61a8a646cf201826ceaa4241f46b6c4a54a88daa504dc98fd628e82f1102505fb09
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.85.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.85.0.ebuild
index c21077e703b2..67c1618edbbc 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.85.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.85.0.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-2)
 QTMIN=5.15.2
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 2040a5c78da4..0643fdd1e181 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,5 +1,5 @@
 DIST kjs-5.82.0.tar.xz 337880 BLAKE2B 304acd60f22c3ee3cacabe1794369540dd43473464fe42c7cb3c2e498a3ed6780eab1f75823393efbc9658a06d3b19e718e0ea3d39463acec9b778162c56d214 SHA512 9ac3f70b09d309fe11026964607aa102d1b6264ad19c8618993fc533ad13dd367772886c56da26d980cef1aa1b80d228a8822340be582cb2a150352d64efaef8
 DIST kjs-5.85.0.tar.xz 337888 BLAKE2B 1ba61fa79ecc130744ba183fab25b8118bf4f3635f11ec50d73a64c83508941fe23c6eea92f688233d70c784e82bf460a6c4229c8f449076e6c2d12842cd08aa SHA512 80a873d7277efe053587bb9875f0958e26d5ad582a9c12377b187584f76e88f1ba64f4e071fa1329fe42690379a217a9f68d28cfb1a6724b615c01398840f324
 EBUILD kjs-5.82.0.ebuild 399 BLAKE2B 1eaba452d35a4287ea14bd7b23f6328f3df7f5e007726180e42a5b02b489bcce95713e38d934b9202b6fc7fd83c182b75b1b57c82782c16c83e355d2eae2634c SHA512 817cc1494caedbcf00550c5c27e614680ee0e77d7c60b2633856cf003ef84b66a4cbf769dcc032a4fd6b2a2026f0fef254d75baa6b86d8fd2133896de8b810f5
-EBUILD kjs-5.85.0.ebuild 409 BLAKE2B b3e42eb9ce7c8de9f7d321374267bd17abf3efb55525a7e8158a3e3a69181e991728c9fb2744d1c299d61cf052894312fea85760c29c54d391c58d63cc7fd503 SHA512 315713cf1dcb3c8af1715e5323eaf2f099bda3c4dd071f9ecff31047ef8a0e72317b08c1bc60d8d2d0d83a11bcecb995b9ee275a18230c432db8f7ec78b2bf60
+EBUILD kjs-5.85.0.ebuild 409 BLAKE2B c619ead54e44ba9e06b83fed6c8137454b110af75df2c4573d507a3a9363cbd14e88b0d11f483875e0a5e0ec88df70daa099deb059fa8eac9c7035cfa2624194 SHA512 3b731097af14f7d0bbf9e1154e0e5a716f55613b3c35aa5a88af1b3eaf7b791f9f8e4a616e49c33ac8e7d0a47c2a43397aa2575ee4eeec17d047f24733311f05
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kjs/kjs-5.85.0.ebuild b/kde-frameworks/kjs/kjs-5.85.0.ebuild
index 64f6d6043f41..0fedac96ed3f 100644
--- a/kde-frameworks/kjs/kjs-5.85.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.85.0.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_QTHELP="false"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index dfdcca051c1a..6d83f303fdec 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,5 +1,5 @@
 DIST knewstuff-5.82.0.tar.xz 1167420 BLAKE2B d35ad76c4780b79cb40b7920febfcab665bb071e26fde98710435ff7cac92454c0f07a76d7b42d2c786aa793be97ecb3f92954052a1f3e43e34d316c021d6b10 SHA512 50377c16447dac2f55e025a320c51b86142dec7109c33a9e46415c5acc4d8d234ad49f7cc25f3f29f65d37408a6a780df1dfe279b151d109d601f9504d9f7408
 DIST knewstuff-5.85.0.tar.xz 1138788 BLAKE2B 6f037ddd3dd7d9499d19b8d10b2486ced1ab169180d69a004369158665eb098015c60fd657e9d84af7b15634a28abd13e761b2728861f3f88c02ac0510121c5c SHA512 2da81b520ecab1d43b79e75ec56cbba410bd0944b13ea53eeee5ca94c77f9c04ad91a35b0c1942516edc5101a365f2a91b774405183bc8bf82c6cd5fb53a0570
 EBUILD knewstuff-5.82.0.ebuild 1094 BLAKE2B 02f94784c66eef324537836dd38ad2009333ad5bb02ae1dba414e5c83f69c8daa18ae6a1791b045181b984303a216a48bb4eeee13729ce57c8cddb3b79ce5ce7 SHA512 fad266c06544f42f99f0d1c188de141e98a497b3e8788827655c8d52db68e847814d46d024f66e2ec5502c51ea4c560444e5e3f7327bb19eedbdf9ad44e4903d
-EBUILD knewstuff-5.85.0.ebuild 1272 BLAKE2B 65f7ecb3952f4468007e42380167c8dd7d46acf0325bec8f36ac9f5890f5b8ff5f72c367870b50ac1d510a394a79368af7908f8813bc306c97a308466998b226 SHA512 3d54b51ccbc4555d2a1681b4271f00cf822aaf834da45e2d17162cb6b98f4fdd3e5a34158564b44c407c140ff667d6ab35ce8e85547c6b6a0a13153aa64b6559
+EBUILD knewstuff-5.85.0.ebuild 1272 BLAKE2B 017a8aef427b4916fd4741cd8719d525514a73550e8db9ef9e5461697f1a277ef8e19daadd15a676060a34f07e07be13846011c6b6ee48a52ba8389a0f1c5799 SHA512 8d3d4e1c3ec22535f8f0feba2ed13b870d8c201faaa910c51318b63132b076380378826ec12638ead82d15050efa1953263bbb3769d999185a18b5089ffd89cb
 MISC metadata.xml 599 BLAKE2B 959bed7a06c4237f57f82ff44ca8f4941a666dec1cdfaa1ead01b2fc7e9a079d719632fa8ddc8ed8fcb807f4cf0b3accfc9cc36742414e0f3a2dac9605b26236 SHA512 14d9921e04059f977c08fb3a2d5f1808386a17dd881b962fc76c7bf223b11dbb6bcd8ca9810e076a42b65bbf61b6b8d499a30dca67c1fd88ae9fcc80b9910dcb
diff --git a/kde-frameworks/knewstuff/knewstuff-5.85.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.85.0.ebuild
index aab70c2c816f..67d43e05a700 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.85.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.85.0.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="false"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 7c9e0f5e694b..b651bd1ef18c 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,5 +1,5 @@
 DIST knotifications-5.82.0.tar.xz 123864 BLAKE2B b798fcd8c7f493b518a2a5d405c18ae028fa187e4a744de087bc3087e2491007e93c1e814b2e0491e0d0996aa06e3fcb239b1646baa77d3a5003afe9ba33594d SHA512 5b90e641adbadfd31ee44344361d964cb35deb93cccd2de1199c633986c08ce7e8321cfb73a50d99a954c2652a9a78c9c07d0026fcea115bc5dbe4e5898aaa12
 DIST knotifications-5.85.0.tar.xz 124336 BLAKE2B c6f12695b30fa8bb6a183cf7a5a1be515e5e9ceae81c4c3278fce84e25f782eda589795f879c4dc50cd1303cc2b49f99dbb9e0aea3e8f9b1ed70b769cc333b65 SHA512 e95106af6a0dcd7695ca58d0146189925a6581991aaa151a3978686be88b5d6686e370fbe9a5736b824acbf4041316519dfed1c38abc2048bbc1626516ca5670
 EBUILD knotifications-5.82.0.ebuild 1144 BLAKE2B b2277def6cdb291e1a6e5cfd7bb4ee7c18ac342630e843a24c6ccd4c86eac2c28816ddef3b95c93915284ac607073d2cb8427abdc33f85f4c3683888499eb70e SHA512 267fde926dee2d9c567b9ed9fb26190956e464bc2f666833926afeff89ffc4faba9cd13157d8696b4d3cf16ed595317604d42d40e923a212aedf1977ff6c0d53
-EBUILD knotifications-5.85.0.ebuild 1154 BLAKE2B a8a7b6121da36860e6adcc82d40cd72e5a4d449bae0bcf954feafe6498c489688fa4254455d33a62300ca608b13c8948ed28d5929f1d02b5452b1390485b899f SHA512 2faa2038ca8edd3af315391a9c601096e2dba8231a90df907be6aa0570e8eb6dc70ef72c42a12002b49124c708bd35e1e2f141b30b12923f9f6e2be608f71087
+EBUILD knotifications-5.85.0.ebuild 1154 BLAKE2B c9c029319fd4e71167c41124493154b324ae4aaa356299c08bf6e94420daa262cdec0ece8b64389c64c62b0dbc173607bed48ec576ec6c175b02767bfc438bf3 SHA512 b36cd2ca472e0674b1c2765fb27d265b01bac5b56bc73fa16cf17baf93797667c9d12a9e64675998e00119bb584f8882d29baca4b5b1d46fb1773215f3d5503f
 MISC metadata.xml 674 BLAKE2B 6b30cf2d65d945311d8137fccf070a47df1756eb8519a79f9cb10068b26027e0f1dd958f35845d78257a0793db84e363fd63fe7df51dce74febbc62985a00561 SHA512 c803cc676b62e5a32f7eb1ca2b93fd5f170c5b05b34b78f8ea5f80227b0bf0613c3c2970220602c51b53f00e0e4f825b9a13a71fcbeeaf6d35000b1ba9eadb44
diff --git a/kde-frameworks/knotifications/knotifications-5.85.0.ebuild b/kde-frameworks/knotifications/knotifications-5.85.0.ebuild
index d0a134ccdfb3..3868de606f64 100644
--- a/kde-frameworks/knotifications/knotifications-5.85.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.85.0.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="false"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 043a3427cd92..899b2be56d97 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,5 +1,5 @@
 DIST knotifyconfig-5.82.0.tar.xz 84692 BLAKE2B 44d8cc0bb1caa2115fc54af5f8a042d29baebf4ca595576a81e01e24a2141b6077ca938a6d00252701d813f10b2aaa4ccbd9e4600ed9448e8a18a628cce84966 SHA512 d214d8019179c079a22f4076bb985f1528292c467cce36a18e2457a4051264f915f48a35ea2b508b900fded020bf20c8d3e784149e9be7993a80a027a70871e3
 DIST knotifyconfig-5.85.0.tar.xz 84852 BLAKE2B e8d8a9580241ec2f57fc32208aac536a0d86f00946a1c2c56fdab1bdc1461a0dd8ec4d4b3df33c68a8c46d30fa4c6c1db1253c7f1595e6fa37795b84cd7e3820 SHA512 0bada9636e8c97e85d1405054dc5def34c25ecc8ce49dade8407de2213830f3802e044a4cc8782ae8bd4c89fdd982624454b6b77c469981b1fbc811b40edb326
 EBUILD knotifyconfig-5.82.0.ebuild 768 BLAKE2B ee48866fcd791abee06fff79971f03aa3fbea7037b4089acf9e1bf14a2bb5954200810542665185d44ac0be686808b26ff58943cbb7dee2d3e09ceee331c567a SHA512 ffa99af357dbac4b5966320ed633b52c4ba4e5ae20ac54908f8874022a165118b2e1986a8beca775715ca4b7e3fd640d72e5bf43aabbc8c50495591f4aa553f5
-EBUILD knotifyconfig-5.85.0.ebuild 778 BLAKE2B 3616e95c2d4a0437bbb996b81f997d474ce0e185fbf27f7a7cba04f704ee0c38250d1820a17d9f5722a90242b9a30eec8e674b99a962d833922cef74389ee154 SHA512 87bbb12bfadd75e4a7bde22ea1d66f898ab7a25431629cf4e70275f24cc0e81d4247d6a406d9c8423213571797ba17f236d000de0b1e5c5c2789baeee2dbf890
+EBUILD knotifyconfig-5.85.0.ebuild 778 BLAKE2B 61d0b3a5b57d97a290613e87f1c833cd2e5f75877cb05deb792a174a9ae0822f012edc4a41e275b3bf753720ee1569c8f1208a87666524494c0a0ae0be91b128 SHA512 330b55077918c5aee4660abf34410b6800ad26bbbd694e8d53d359f06d64ddb229ff7da35157b1e63b7f108552db7b2f0fdb40306506db32b2901a6742d8b4ab
 MISC metadata.xml 602 BLAKE2B 1426e53945801c0cb01739985cb1fa71ca0cf46adf42ef7b00230b3675c363f05052cc053ff948aaccba1169e4529b65008e1254d6cad65e2ea461d87b0229ed SHA512 0597ea9467df6dd209663feb3573dd1b81fc0fd1e5dd66b07ec91d57aecb0230ac1ed95bd8f07f3cd7b6a89ddbe3a88ad5a6fec9d735f03a7aa72804b256113f
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.85.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.85.0.ebuild
index 1dae4bb5ab35..8dd2bf4f3b09 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.85.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.85.0.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="false"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 53eca6665264..c766c48131a7 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,5 +1,5 @@
 DIST kpackage-5.82.0.tar.xz 137892 BLAKE2B 292ffdaa8271f63b178304e85ce53f8dd35ff2f46bd5c2b9828a6610c2939918d51d02d29cd2dd799c7fd77c02c3ac23ce7015c2d41b63cc3ed23833958643c8 SHA512 9d8a168b48903d4b5c68ffa0709fd0cfea1e08376c1c0b1ef820ad13f6399a1792be724eeef18a27402f18c62494c864fe4dac17e9932a1ee3a5bb4de50f5fed
 DIST kpackage-5.85.0.tar.xz 138696 BLAKE2B 4c1122bc24c7914cd0bc8e6f390f637b4ce0d9bce692ae2a245fbc53adb86649c7db683d829427e6e728746ec6a78f8e2178b5d27a9c399f0e6e95a5e3448c67 SHA512 1209088a78e0ff2d3db1cbd8b0e154364febbac2941b064e196fed296b5ed963278fff4db21136dddb4f8d20e990b9d4773ea39edf1ef5a07528987b6fe8cf54
 EBUILD kpackage-5.82.0.ebuild 755 BLAKE2B 931b2b74ce3752e68a1fc2078ce08b873b8fe53edbe1a8617b4f97d26932978f73f0767fc4d36b6d058437437a0a7fd5e4037860cf20307a3bce94ef967b461f SHA512 a91d2a68180e48aeafebab3c9cbd108130390efade8aad7dd6872ccf0d6a474e3cdd29f55507f3a17227bafe5aa0a2183bb7e70051bc0cf3074ffa2333adb8db
-EBUILD kpackage-5.85.0.ebuild 765 BLAKE2B d190d6a88b3ebc06b5d068e72749aa07898e01b96fe8d424c38d0629798c419405cc7ca5162823d48b549fc8b408e7edfd7e6309aeb25b487ee1a65dbea8938b SHA512 47948e38ce45a50aa92d9cd17e4dab8c5b6cd54951b71419b121395da9127216f8b51920860d29f2db29bd5e114524ba04d8a7dab2648b97f9b3e41cc7f1214f
+EBUILD kpackage-5.85.0.ebuild 765 BLAKE2B e4c3ac897784ba4befbfdd507ca6afd231fb2b6db8f00f19c351d295f05d2658ac567e3ae2fe1af1d53b071b2d12e8ff05fe4540022728f6642a2d575627a740 SHA512 ccec4f6705dec454f323594f8640151a647250ac31bc50b25764c395e0bd78e7d9e3ce41acfd1d44746f24d101b7e660d34bb8aa172b4c32ef846bb8fb980a8a
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kpackage/kpackage-5.85.0.ebuild b/kde-frameworks/kpackage/kpackage-5.85.0.ebuild
index a060d3800527..f49451a2fa7a 100644
--- a/kde-frameworks/kpackage/kpackage-5.85.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.85.0.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-2)
 QTMIN=5.15.2
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 69c4b464a610..8090306486d2 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,5 +1,5 @@
 DIST kparts-5.82.0.tar.xz 192240 BLAKE2B d46b407479c4e3a11a91bf990da14e914008ee6cd51d9fc3f67a89a33811af6201226a1f8971129cf0d3fa5189a8bf45810c2e24bdb6cca3c261465afc0380b7 SHA512 865cb26623b8e3dbf2fff7bff7e7dd0334d5cac487635a4aa88a69fbbb1a4eda2fa67208f6cd4bd3496188af4fe256558b737604202fe30a749a06671c078eba
 DIST kparts-5.85.0.tar.xz 192484 BLAKE2B 7a5bd8d306ba3fc12640996fbdd7493347ba4d1b8fa74588e96b985c788803c6c18445ced757a5d07186cca1f2da807033bedf673926b870471b7e695dfe490d SHA512 d255cff86a434a886c1466c9b84a9818f0e93c49c17af9351b324c89f7f2f807686718fcd50cd70bbfba0f8af8af01e5af9d60f3c361b0a196e48d591711444d
 EBUILD kparts-5.82.0.ebuild 837 BLAKE2B 2832ac7b369554597f57ae134ead71cbf461b1f372fa08409edac05bfd459ed1436ef60e4bb5a01a3eac063b34ffbdefcb747046b7532aebbf3c0cea17fa4bdb SHA512 299a813285bab1e3a415dfdad4ec7495f05cddea78e0619cc68ecfcee58af545a9cc202fb252de59427aba87e7f62f2abb6828ac12c36e036fe391c520ed3bdd
-EBUILD kparts-5.85.0.ebuild 847 BLAKE2B 4ea0de929c5c5da8a2bf6ba8c82ffc2dcf1fbc73e6834ae58a7663c0931e121dd0ec2081895fd5201778db6473a263ec0d5e813515eb5f042687c37e850ba841 SHA512 540760771b09402f38fd694f923bd4f91ad6a6c8041991134edd15bd5afdde0265eabd69513bc79729b3bfbf2da28919373133e4dc376bdb043ed179652819ba
+EBUILD kparts-5.85.0.ebuild 847 BLAKE2B a13cb699aa530975e27a0018a3ead2077fadc692603666bca423dba4a7bbac24d8b4596b4632c31410eee67bcaf60e784a1c35a57ece428660af0695bfcb339c SHA512 c8fb86a39cca29ed612a13e60cfb125ac34b23f54dc6c8bcc265170d24a8a8f6af8bb2e5037246c17bcf60e5e1524f58b7c0bcfd3084989dc51f9e488dd64485
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kparts/kparts-5.85.0.ebuild b/kde-frameworks/kparts/kparts-5.85.0.ebuild
index cfdce61fe179..9d4cb3eb5ee9 100644
--- a/kde-frameworks/kparts/kparts-5.85.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.85.0.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-2)
 QTMIN=5.15.2
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 994577aeefa5..cba711cef8a9 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,5 @@
 DIST kpeople-5.82.0.tar.xz 61728 BLAKE2B 5e5abc67b4d918696ce274327b23674d018958cf9eea0e2489918c052891aacc9265172bfb18a88ebb34f6a0b653f6659ba4bf4c27548e1ccf6b99d9c63c2b49 SHA512 3437ae1685427f5b9ca98f75fa2822b68d1ce5cc902810530844e5cdc01fcf3a027d495a5457f31d8b3838622c425fd835df1b4293fdf53ebc0fc34f869bc44a
 DIST kpeople-5.85.0.tar.xz 56732 BLAKE2B 2fd14a33ab2ea49234caeded7807f0d1efd642ab1003b0231c3389158a5b4365c1b2d0e994ea8bfe05663927e5225c27d168e6bfe06fb03fd10582a0361c848d SHA512 f93242008625fd3aec28e113d34ae7d3bfb919cbc0ffa897d12a3b782bf713803202cb21f81e6b66f7c49c80199be57f47e659d04587c63eac770629bfe88cdc
 EBUILD kpeople-5.82.0.ebuild 870 BLAKE2B af799ebafddacce944132fa911ca1507f05b5da997646e7952adab6330bedaaa2282418d507fabfb5a90c25c4aa061088dc88f8fc669645855037b17de595f75 SHA512 b0520afaff6d39302e7ae7b115599532f4b669b83dcfc87e1663d4e2460f42672aa2304682335cd2146699dd6e583254a430902d628198ac5114d63320b32d07
-EBUILD kpeople-5.85.0.ebuild 880 BLAKE2B f102f99640dbf92fa3eb80be7dbe6d7260423e302bf6a173de34000e5bbb63be17a41f32964b9a7efb1ff1fe80c5e0f4b5402f8d7f64c9b602fc5b2c2ca05337 SHA512 d335a828a0fcf8f4ff4617277085bf7f8581d36e812b49bc022283ab905921035e8690072889edc2392789ba70a5a222c93fd8950e4d3189b5f1a3dbbab9b915
+EBUILD kpeople-5.85.0.ebuild 880 BLAKE2B 397595c04c7236088a1bf368b7bbdf4b811f8d12684514a4aaaa20bdc545b238734100e768464cbe44af756421fd927646a83a95592a87991168f1ff58c9fbfa SHA512 df279374d31a83ad316f18b7a0618860a539625fe5d175c646b4e8d3f7c7318699fd3695b92639c26b16638ec00060378f5b2577cebcd53d73350af64a0d3503
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kpeople/kpeople-5.85.0.ebuild b/kde-frameworks/kpeople/kpeople-5.85.0.ebuild
index 10161807be1c..8fb8ba0fc8fd 100644
--- a/kde-frameworks/kpeople/kpeople-5.85.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.85.0.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-2)
 QTMIN=5.15.2
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 7c0f9ae6ef22..64b9b4b9b16d 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,5 +1,5 @@
 DIST kplotting-5.82.0.tar.xz 31220 BLAKE2B c7eb39d8a8846c6c230a98cba83613d4468b9a62fe1014fa240fb56021d6cef0122d1bf7df5cfd727f5693f495d0942d04ca0e43bc609283a9da1ca94cb63d55 SHA512 8e33b37e61708e637d4064187ab4acf7f8dda846eaf970efc78138590c600c0a7fa320110138e396dc91c6134ce4a1675aa6d4b199a2a385596fb1185d428a75
 DIST kplotting-5.85.0.tar.xz 31192 BLAKE2B 3b9edc82cef6cc76a514f9b91589f8d8690b3e9a4f373a12e0bbd027a072fca6651c84dc4eeebf968b646d8b30c558d97c05938ec0bfa9a95ca59f334f69ca16 SHA512 ee36730cbde0461e72ebf012f88fff0b57605eb3fbdb16dde3921f044f074f834038f79ec45d2c7b5b12b9ca3c69dc08a1db28fb17624e9d020b58f7739d266e
 EBUILD kplotting-5.82.0.ebuild 437 BLAKE2B a97e60e6e0362bd7e6b818f17cc6c760f646766e251008e241022503cf3648ca50a073a9c57e8bba3cb2ab34c8ced13590d05dbf08df45f80dd66b96b764c9d8 SHA512 58cbaa40154b01d58d88314c62eb170020c5c55163e81b330a04a2e926e4d37bc804887eef89f46ab8c73e09567e6d3b4de5a013ef6a35930790d3f79cdb02ad
-EBUILD kplotting-5.85.0.ebuild 440 BLAKE2B fc28799f842c5c68d4cadeeb01d3a4f0ff1175915f91ec2eccd7c796bac539e7becb9823b2779ff58d31a16a3d0db8eda03f6470661b29deb9284c655fc28a57 SHA512 74afec5b09559fff8dbe02f09b90c132876970b549a3aeccf336e1242f8f400f35b822b6548830a0d3567495b6c3052f045e898bc2356975ab54c901d6504170
+EBUILD kplotting-5.85.0.ebuild 440 BLAKE2B cd20cfe2dace53ef4a23e5e66156646689324900fe2d6b234d67e63ac3ff3d337c47f8316ade7f8a59c883594916fb3ac03a22c395bba8c9144b9f67285e8d2f SHA512 4bc2d1b2e279a2807d3c35dac14f0eaad7f21b79bb01ebb5fedd09c12c5db571209b893102d03ff371b15294d791f265e83f60e20f1cb729f6540f7b250475b4
 MISC metadata.xml 546 BLAKE2B 9cfab5e5f3efb341d3c84140c65843d706a33bcba9dba92b62e7365c1cd5fbce8e0d52e5bd342eff1e05ab38fdcd6a9a8b8b441f8cf5a94dd70233e4a3ec36ed SHA512 8504b2496b14ff6bcc7dad0eef39ce8ce12516ae54d498e3d609512ddbda6b587359403fe12d57530e59209eddbe30f23ded0d2d385c773dec561efe610ab32c
diff --git a/kde-frameworks/kplotting/kplotting-5.85.0.ebuild b/kde-frameworks/kplotting/kplotting-5.85.0.ebuild
index 71388c7ee73d..69d6a7966519 100644
--- a/kde-frameworks/kplotting/kplotting-5.85.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.85.0.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"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 1b897a1a5fc7..68bd493c1e93 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,5 +1,5 @@
 DIST kpty-5.82.0.tar.xz 56348 BLAKE2B 954dbb443c9f7eb43abb9aa414c77867dbb831b767eb2c8d985cdd4eb0dc003ab3338282bca5ce547e2b84e5a714cb27aa8771653b27111cc303bada78bebcc8 SHA512 9515443671c2030646dfa628555b3e131ad8ff018aa73fe7e0168e352968cbab6111f8e00a47cb7c26ca3807da2e502de19505d44da84750ca46a834bb7a3193
 DIST kpty-5.85.0.tar.xz 56272 BLAKE2B 1fdf346b40b9200622670c58b7480ad01fdbde5b58f543f61e68fa291d0d76008213904a4118ba43d55c716593aa901e0bd7d9cb4a8c2e76308036c89d08ad7a SHA512 51d00091f23b5cf1d397d3055283a945803372e8b3c7f99cd18be0c23376d62156e9135488fd6788752233b3aeee827a5f9ecdeef838308f0289bdbc632d61c2
 EBUILD kpty-5.82.0.ebuild 550 BLAKE2B dcd8ed024d7f784859f592a6ae8d7c38246867cbd6b61e6c040e3b4bf534ad1257bae719c8a3e0b89a315b32063db38a08105c57ef9c39c87fa243416109e2ce SHA512 324d33ddfe86d1ab187fae50e22d2ac7cc7db31f7eb17b106f4b19d0e387f04ddfbfa4ff0fb0822ebfdfe4aa8284da966ceacdff3a1dc7e573e1deda5a6ac6ca
-EBUILD kpty-5.85.0.ebuild 560 BLAKE2B 27d0b9a0c01fd27c7e2b8ec9eb19f7936646c2d3c075a06dfbb782c7b17ca92754a845f16f43704b098a36adc6726d0aed42621cba13fd9ee6afd0eabea6c67c SHA512 de50b2aff0229bf4115ac1c1758b68cb6e48c9ab30db9c6b9b555f3f31cfd14c7ae9b99eaaa50f56eb9c68cd6ca57526b9c3e82d9ad74c03347e16e32a6afd5c
+EBUILD kpty-5.85.0.ebuild 560 BLAKE2B cde3a1b4d9631c21605ff2e40e71b9bfd45211673b014e716a02f853d1b90dcb9c40293e5cefa88b9de71ea69f2aab6f072ec1205487cee7f1b110cd5e88d3d4 SHA512 24a721c5e8406dabf6aa1cfef1cac7468db8b057ecbba5e611e672b210423897c1d61c16fe01fc602d44e5497f5303c6b98afd3f7e7964f5ef82e04ddc0c0fa2
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kpty/kpty-5.85.0.ebuild b/kde-frameworks/kpty/kpty-5.85.0.ebuild
index 4fe9f6232786..124c8900dcae 100644
--- a/kde-frameworks/kpty/kpty-5.85.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.85.0.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-2)
 inherit ecm kde.org
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index fd6090ddd497..af0510692ddb 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kquickcharts-5.82.0.tar.xz 105832 BLAKE2B 00bd1f5ff89e11758607a9b6c2705d4c670107b18eb5ac67522b1f5a6ba5f4b5897b86582ad6ea5f2a1e9245efdf52614a6ee418ff0c2ff8a0499de5211bfe49 SHA512 978e9644d62a3bc7c9e5fddbc7ce67551941a2429804d93a5745584c28555a748f7804287162e31217082bb9e9391d2d86bb50eda209f93da15cb4b5c93ed583
 DIST kquickcharts-5.85.0.tar.xz 105940 BLAKE2B a7b3b4b16602ab030102310e8a94ad3ea64d5e9fa3db60e12ddd947a9c2385976ad80755608896cc22c2fd3c884a3ec8b1969f95002b2c1313d64ed688cafce7 SHA512 ea5e7187a15e715d8e6359cfb08696030243c190fd70ccbf60e82ded22a24170dfe3eac3963ccc44782c5fc7beee6e398435d08fe1b5bc19c26386fa83645f30
 EBUILD kquickcharts-5.82.0.ebuild 798 BLAKE2B adbcc2d8f29109e0735d678252909944ab4d7fa8a978a9ccfaf490272f1b79171d2ccdbb28eaf8ae647e52de336248efd96e8d4ef312edc3f2cdabca953ce5eb SHA512 875acb51f6aefe6ea3abe0ff1a9b5a4895d80ad84bcb13084823ee4a1af2e0297f4ac2536567780bb543d809e5b7d6e2d157ceec148b13744d8154a09ae1dfe7
-EBUILD kquickcharts-5.85.0.ebuild 808 BLAKE2B 464a8f58739df80689a3aab5fdec8ebfe7a8f388e57166400397bc51f1b5f2e894a169c8f3186c56bfcae17bd41f2c0e005774ceb956dcb36f153ad6e2437e5f SHA512 1803f461b9ed08a55c2dd1c37115e920cda46428b81777856ae3bef509873e087bb8b140f06b9e8772d030c9a6e1947b3832c0441ad8e7533a0d49a4b6af011f
+EBUILD kquickcharts-5.85.0.ebuild 808 BLAKE2B eed5215550e898153984a35c3ee673e3405f10456c931e016b386dc9e110532f63dd47e95ca27bbdd348a48c9300e0d3160639fe8d7790abc5ae99ee246bcadc SHA512 18502fb0c53ff30b58cc2b9e739e975386eab8d0e78ba8a098caf2ef04e548e0ad8eb6fbeb4ba1b12e1c9917e9863a352be48eea078f046a0edf85f601132e95
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.85.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.85.0.ebuild
index f033619d7ec0..d4f10a50a5bf 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-5.85.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.85.0.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_EXAMPLES="true"
 ECM_QTHELP="false"
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 51bf13f51d75..32dcf749967a 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,5 +1,5 @@
 DIST kross-5.82.0.tar.xz 128940 BLAKE2B 38006266d918ea9800c91e3a5149d97850d3b7d2b3b31f272c88400b8973442db3a84f0637fda13dd4086df9b7abaf5e3443c6dcc1da31d23e5ecbec7ec55e41 SHA512 ac3b30bc49e4be321c2171dc8229df7df2f7980d4eb47af11141bf51ced4602c1ab81a8150612f02d09c33226bb98cc278451b5c1d4c10f465035f1fceb12ebe
 DIST kross-5.85.0.tar.xz 128932 BLAKE2B 21029db192b6ce4432d28fbb3acd9d5411b33183b45f131e8dc4fc6db7cf19d09aa5e4deb6784d61b0c32256a0acabee0f599bb13a3f46c2de3614de8fbef71d SHA512 35d459e60edfe43df7064ba64c719dc0acb37b8cb75dfeb61d75a505e0791e90e23e3558944d94d146e521593c510e3d59fde4fd5c7197151f8e05aa1c79c0cf
 EBUILD kross-5.82.0.ebuild 859 BLAKE2B 5d864e7393539dbc4cb95d5e5541ef1e9f951e0805f0adedb92f8b09f563190e7739ed84b3edd4b54f6471938a0ce1559cf09cbda7146c755e48c845c62bb384 SHA512 7524fb90c6b1bf7c04bc57a895ad6e808e8dda7787dad8914ae526d8442ebf45b5cb5d9d856c868d93e1b719e0141d860f8cd5fa99863f7b2dac8f842698bc2c
-EBUILD kross-5.85.0.ebuild 869 BLAKE2B 35f45c850e165cc11cbce4db2f8bf17b2bc69b677bd6b8094f8b33580c14a38dcec778f8696b3c43c259a6cc6a11de8a805960d56d75522b520bda71971f4dff SHA512 6bfe042d8ea52b942a587aa44a489752a2363c1b15de02dfdb34efa61429a2d191b732dac60334e96b3032be4508ab3e404a6728b30951a64e5e141a377c8b1f
+EBUILD kross-5.85.0.ebuild 869 BLAKE2B c6bb4dc56480ecfdc5418165b0fcad5375c690d715b2256b5f1cf34392b19ede26583ef8ea4a5f1069041ec083c42c3454d3866b0a4482926ba9e3d150a34961 SHA512 541598d05d130e74390d0f99cbd1e30f8519e5fb1a2f509fc0048eca5c5455a8fc82835d7a2a8ab65b1b57648843bcc25c34038a3d694a0183ec8e5f2f9cea79
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kross/kross-5.85.0.ebuild b/kde-frameworks/kross/kross-5.85.0.ebuild
index 38cb0316b6cf..30bb4ec0d0a5 100644
--- a/kde-frameworks/kross/kross-5.85.0.ebuild
+++ b/kde-frameworks/kross/kross-5.85.0.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_QTHELP="false"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index db4a08366eea..3c18989e0560 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,5 +1,5 @@
 DIST krunner-5.82.0.tar.xz 76916 BLAKE2B f846383458b46bf655a2a2b08fea099eff910aceac90306bea1f3af1b1370d2d59169ee4ff0e68c6ab0186c35b336b4a807f56cd8374f89b16c5319ddba459f9 SHA512 a4430196d32d850f9498027df251a65dcf3fcb161a7005926a9ec3de429bd03487e72fda342a6a588c4e5972ee55baf21e53433d68408ccab1b0b99b5c2980da
 DIST krunner-5.85.0.tar.xz 76940 BLAKE2B 889577cd2b889a7e1aaf8b6b7070c74480e0e17ab81a09fce4b5e4bf5624acc3b86c327fb7293474d18dfa0e369ee174a27432ee2ae2df1a6f08d99297ef5d1e SHA512 6af8f5a3208acb571346b487b2233ed5294f6358a1a3bf5dfb4f3a5a247da9c83b67a0a0942561682009e49d92d00d2b9d8181ce1e40ea312aeaac0bde727831
 EBUILD krunner-5.82.0.ebuild 1147 BLAKE2B 5449bc1fe1bd46e405fea98ad3b3a57519fa9972e543bd71dc9019699b14d66262103f05ba9ee3f44f30437fb10bc82f8bd9bd07e3454af52c723a3947f5c2c9 SHA512 41466ea5bd1758d83f28bab1cede8318aa32310799b710ce1882f48ad37e00715a6eb8d0b1eb20ee6b04359f9c9e44de986e684440946aa66c58524a587a3f5a
-EBUILD krunner-5.85.0.ebuild 1157 BLAKE2B aaa3edccf99414364f940361692e1591919f42ef0e6eba40a45c90f3e6335022be0af27db3822c8c09e81d16817146c07fd30e03e31ef983b013ccb8908f7f53 SHA512 3778b46c5b9735d2c86ddd98f12883590d2ebd8f4e13f938d1fca2d20c57d6ea2a574505d1962edd028115524e70333fb9a11467a5472d612aeb41c1146d06e7
+EBUILD krunner-5.85.0.ebuild 1157 BLAKE2B e522e4b73e2ac329e22c371b11498791de3429678e9200e858795c6c01bdaf4d67e0b7b8d2f396a91131e9c2a16511ba9bad79c473e00d930df36cdbe0aa8ea7 SHA512 0dfc4cc2fa339309bd94b57967195fca575ceea64e06be7d7b790afbde1a7cd3f51403a795c525533e6a245342d9f9d771312fbcf277a5f81c9a182317bda2b9
 MISC metadata.xml 551 BLAKE2B 640def453f194043f018141852da93cb84f7e96924b6b71b62b28c0670bdd39812802a014a416d148d467ccaeb181f9deff62ae143074a0d75a13559ac5dd141 SHA512 b29197375544fa216e1989b6b503a98921aa7a4c7215cf626ab16a15444feb0772e66c958dd8eba9ee2672aa73c1fba45ff32c07c6d61ce0663b215b6fa6b0e8
diff --git a/kde-frameworks/krunner/krunner-5.85.0.ebuild b/kde-frameworks/krunner/krunner-5.85.0.ebuild
index d8cf51840023..802ba9fe2c47 100644
--- a/kde-frameworks/krunner/krunner-5.85.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.85.0.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-2)
 QTMIN=5.15.2
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index a3078a017d2b..bb3a1ef6f463 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,5 @@
 DIST kservice-5.82.0.tar.xz 261932 BLAKE2B 42b95ecca3c5a4f14578491fb1460dbeab4b866b94ab6b26d53aadd059b9190642e5914a926d2faa559a95a50e03751c5717be813254e839a27b4310adff63fd SHA512 6294beeb19773d7b58a23f01e9c9c281c4b2cf8eade19d0de6537ea295ad595ec79a22cb1d3049cb79bfa5eb43fc1e80037227217a6dae212b9e5234b3c9aa5f
 DIST kservice-5.85.0.tar.xz 263292 BLAKE2B 8f71484ce4f454a368491c7ed8f0624b49cf7059f8b74ec90efe368933ebefb73691764109a98e045f68684e85a35f1c4b50d1c07ef5b09463e2f4fa0710b0d9 SHA512 b6aa99578f676aa00527e91d09eaec48eda7e71b975015fc433842fa8f973198828172d9c63f9d72fd3a17b0c72e3f34a7f01657cdba796fbc1ddcd730b41010
 EBUILD kservice-5.82.0.ebuild 1044 BLAKE2B 56eb8947b452481f7b78e0a6aefb61ebcff58d9a0acbff0ea28194db5e532af87c4e356c6adf3a174c1036f78dfa92e8b0a54e0fbdcdcc7d22052d7a59173e38 SHA512 b1f6c1cff5a58fbbcd1a9091e0fc3a46df37883795c1d0e48f2b8bc8d6c9bf1669500ed99cddeb84acc1469a2efe3f6d5a8eeff391d472754b04106a6c66a790
-EBUILD kservice-5.85.0.ebuild 1054 BLAKE2B 85dd840208e1f81238702035759091d34667a41267b734e3e8df2574d81743e7aefbd6b3271d11dc1e287e1190c0dc9259bd72da78fdbebe9823bc31e4865f4a SHA512 d921ed40a743f4c2b9fe578423d3b5ef9f9f6f230651da94f9e1552d860bea76b482f7565a7aa6fd9b03f2aca4a98ed9c17d146806d4427e8475fbddae31b165
+EBUILD kservice-5.85.0.ebuild 1052 BLAKE2B 7e7cca09f36f04f17644f45501d25b7c6651d191ba2b72eadfdf7d8351ddcf4d1b63dc74858bd50ef3ec69aa14e21ac1664c8c2d9eb6f0d6b0c93d07299a162c SHA512 e489a5ff6dd18bfc17e0d3b739659ef8b9f5752b3308ffdf478ad2305a43bfb05a688fb57ebc94337f719b3f1de17361d6ca31c571f167854a3194bc5894d3c4
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kservice/kservice-5.85.0.ebuild b/kde-frameworks/kservice/kservice-5.85.0.ebuild
index d7ec5feee129..270d0821e790 100644
--- a/kde-frameworks/kservice/kservice-5.85.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.85.0.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-2)
 QTMIN=5.15.2
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+man"
 
 # requires running kde environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	sys-devel/bison
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 2069eaaf6df2..974de48d73cd 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,5 @@
 DIST ktexteditor-5.82.0.tar.xz 2341712 BLAKE2B cab63977dd8d2e8e9c2b766a9b0563cc98f0b25e2f39f2b598f9b8162ce2e12a3ac41cb74cd6f9cd9509f5987d47d27c9ee3114579ce260837d84bb06b7ae683 SHA512 1459ba61ed4a4b603cd984449a217230914818e32c318a92232957cc83d5e70f2a55bf150ca946252c696e019c24dee5b852ca5046c9914f3fff1c6906487bdf
 DIST ktexteditor-5.85.0.tar.xz 2327328 BLAKE2B 528f0888a09453613f76ab3209090d8a8a3647e71617fca280adb5e828b4ba138a4f30361e60fa8bb96316edf543f49a62a31e14328410bf4d8771012f9b3b8b SHA512 90219189043fc04920a4462f67d5cd9ebab8ab720801e29c5d4ae4d7746413d7776f37204486245e21e1da47605d6ecef269acb48dfc1431255335fec6e0e8ea
 EBUILD ktexteditor-5.82.0.ebuild 1589 BLAKE2B f0543e75d291de2b1d5eba8391fe5c1cd1a5e51172f76dd7b1605dbc1f42a16caf2d7ef4d7f7e7f89ffcb5eb006740a17447849af1417524c1495266c12be445 SHA512 a91c2874dc968fe7ac310d84294bb122cddc5b71d894fe4f58cab31c8762571c604c3944f6bd7c9e1bedb96d8538df8e8618858350046a51b34d177aed707482
-EBUILD ktexteditor-5.85.0.ebuild 1599 BLAKE2B acee255afbc49355e6479ce8c021773847c2b1e09ad42a954e03a8d6f80dc7b828c321dfac805b5c152a6be6b552b01245df331b41385ef70873102bce867d50 SHA512 5f62bd0451bbb82ab5b84edaa8a97af1dc3a1af398416e20fa2a32e27d170eacf1104215ce844c13442e672c0da091757a6884a9d0888f3459563fc5f137eaac
+EBUILD ktexteditor-5.85.0.ebuild 1597 BLAKE2B 6fe3fa031d19a5ad5c53cfbf86bf2ef5f18a4e0e76862a49bbb131a7eeaa88ff7f91ceab839e25dcde654c8fdc04884f03cf6cbc655375853a8a482def04de02 SHA512 25963a6a16bc09b031be6b94ac1d51e66b4bf732477466baad7d03b1dab27629a826521fbbe69498fa002adef97ef96ccc0254a349262562b8ebc2512ff0a9eb
 MISC metadata.xml 557 BLAKE2B 9fd29655cc8288ac1b727c9da1eda2cc6f12dcb4fc6672e34c30a85cf94365e7d18a90fd2bae17f931b5a609fcf421ebf5e2286677a65f4dcc66def92987edc9 SHA512 2f16b7f5f7a0a0eda5c0c616a5c3c28da4e4063a22cbbf61b1524238cdda60192f105e3f1cfde94df77e1bebcac84c26627dc6f44bbfcdd9695c47965821965a
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.85.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.85.0.ebuild
index 8fbe5e0ed381..8dd4b006a85a 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.85.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.85.0.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-2)
 QTMIN=5.15.2
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+editorconfig git"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 61a620732793..87d7a2dd3de9 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST ktextwidgets-5.82.0.tar.xz 326288 BLAKE2B 917b1c91a29462dce779b1ae569731ba1c9f810d01009608f71149e13523ec0f1d94582a03cd9fbdaeb159be8abc002193240bba34ee67614e9572578cfa69b9 SHA512 7156ef721c9d9eadd66aa72a2f0da4538a009e14f0058169a95c1ad1c9c19f4120975e2cefc2fb0e20e435ee46dc59cbeb83231fd29bbc7bb815aa59a929e9bb
 DIST ktextwidgets-5.85.0.tar.xz 326548 BLAKE2B 23a584eec7a0a8d2ac713a824d64df98b80c39c809e17b366c78f5a2eca2e8e3010dad3fbcf49956f463ea7a554d918e6995678511f16de655ae8358ef19eaaa SHA512 c17b5fcebd03ee1852f461c406cfe0894264a8b9aaf7f86a6ad6b90a7c764222f511ec58db29765fa74dc82c8b9fa518d7613ed39e5eb837e62db3be17390737
 EBUILD ktextwidgets-5.82.0.ebuild 955 BLAKE2B c48b371d1165a1361601045d53d71fce0f42aa3d8e60cbd504eb462950f525d1fccdf2064bd24fffe3e64304cbd6bb30e215ad7390ce60dcee9cf797bd1ac6d5 SHA512 2f4dfca698597f239aade5ef57232cbffc01ea146e39867813a1c4391ec7beec12407199250ba3257d09d2f7400da7eac5ee2d9cdbb53143fe5be25c0f0599fa
-EBUILD ktextwidgets-5.85.0.ebuild 965 BLAKE2B 6febf364a96bc105e41f5773a7d6f0134be9b7b278592deced8973098fe0e77a36c5cd8c08a4025332eb90a316c94d1a9733c9a0471c6f3810e21abbcddf3494 SHA512 1ace39d936d780b6fc309050bc875276b3210ff1553ed5750eea3a0ebcf09aee57c336865da7f22e7eef811ce88c93f4fe054415d0ddc311a24ed7ee568e66c6
+EBUILD ktextwidgets-5.85.0.ebuild 965 BLAKE2B e26967da109dbb6e1c0a60a5c209a3bc868f3c60378294e3a607e5984ab15858e0446df75f22281c629512e61938811565e21aa72cbc60ac53c62f38782c015d SHA512 670dbfe51d0b68bef9f39052667d626fe82a2d25e05fa7378e2c120d11279d5374329f40258ac7e278e0efa5ad4d038bd32734244568cdca73f929dc1a857a4b
 MISC metadata.xml 605 BLAKE2B 160729d960264d5a334ce2b30b456c970564d953f5c174dca2c3b9ec0c432c2e49c493909259a2383478a2e0ef6c29597c3d2366b802c71c4c87920b0ae3b498 SHA512 4c2d97c1d030b6aef98b7d62a278254a55f50108286fe3d0aa8a23fafe0f446454a4a533335f3ba50c50a6aa3a1a6c836d579da01c798732020f42d12263ccef
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.85.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.85.0.ebuild
index f45f0bbec353..e920db3935ff 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.85.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.85.0.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"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index ff092fe74418..a8c0e2b4a02c 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -3,5 +3,5 @@ AUX kunitconversion-5.85.0-fix-currency-values-init.patch 8599 BLAKE2B 4650128f2
 DIST kunitconversion-5.82.0.tar.xz 869936 BLAKE2B 7812dac12f9e854c1178ff72efd13cba0d36d55c0046898ceebb4dbbce6a8244824bf4453a240661cda83e87e60630268c723abc57d6e86b960eea8ceda83255 SHA512 735684240372b9dc7a37205af92172be164a71537b96c810bf64dd46123748901a079202aef394b2624ccfe5aff2ac69e9380e5715c57089739eb59fbd48a527
 DIST kunitconversion-5.85.0.tar.xz 888652 BLAKE2B 8e5a773f0f8acdd1c24b81a8946b7190e52a3dbe5a63c48027f423be9fb735508394ccd01b3caa4bb7c920dc873a73a08c78afb335a158b598f8793c53d194a7 SHA512 f053ba454f4a5a44801a1f5b8c6562a7db71f4aef1c3b253610d20d3bb1b634347f9bb1483f607cbe1746f0b80a8625dcfb05bee5cbda467b799c9d3d5ca6668
 EBUILD kunitconversion-5.82.0.ebuild 524 BLAKE2B 3f0bfebc97827dd3837e58d05f44c9b8dbe61ebfd276fa8c4c5921037016d8b6188e4d49cc3fd91ff421a0a3326650f86cd5f47a758e198fc5b0f4a52e9548b5 SHA512 c1f6d3a23f8f60c6c1df3cf609e0544f6f918abb3792578b732c3384d58fcf65c52b2aeefd1cb8d6fa1b735f1bf5ad76b2e346117b002bcbb09ae23f906720bf
-EBUILD kunitconversion-5.85.0-r1.ebuild 663 BLAKE2B 3c640b6bd6e0cedda969bb8a61ab78d41ac4ff04809f47dce229c2cb3d19abbf3e978ae5b751ef922abcf930a2fa90b6c37ceed68d3cba801ac2b192d2696f53 SHA512 85d23613cb40e64e3ed311a83ba963e132e36062f5b479f267f3025c10c53241a387ad76a3aafb1e9d75ab859957c1e05e0ff12627cf69a9546b6b8e493fab2d
+EBUILD kunitconversion-5.85.0-r1.ebuild 663 BLAKE2B 114cfa506cc079e376a1c7a617b82d886f888f77c5b77f2cfb4e4a87a190f37b50c4a877b1140198552a61609a7405b87b5864fe9d7f6de0affe0798566f319f SHA512 3c7bbb3528940bb071c7b579f5dd12710b501e3163f1cc598b693a3a68111f6f26b92eab6cd083705d469d583ba48941215fffd3d38dafc64fe427dea66b918d
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild
index 1a8a5753d916..2447b770aa77 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.85.0-r1.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-2)
 QTMIN=5.15.2
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 75083bf1b638..780810070529 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-5.82.0.tar.xz 300944 BLAKE2B d15119772389a2b422bdc5564d5dd14012eab47ea1767dab0f439db842debd26632a6eb764a33ceb68f0851bbd3ff8bf5101729b8fea1eba6be675608b9cd769 SHA512 b23d0d9229df9060dd71d9ac81247f70bf246f00f6bc0026074be4964532f5e0986c49414d11affbcd88d89de761486e2f3ea2fcb6d023723285e14af85a06cb
 DIST kwallet-5.85.0.tar.xz 302844 BLAKE2B f43bd9a0046cd18490961fa0d97e40c3fe0502306afc76416f045d7fb7f74c3a54cee90b2a0fcce1f847ce97e18c3b2b680c235bb899720643e2b22b9f968c0f SHA512 7cead5cac3856ad08a71778e44ba57cecdc97cbd2abe3ec33d461edd95a8fce742ec011b8773841cc5f24d8eb282a197d462e979829c62d477c87625c5107c10
 EBUILD kwallet-5.82.0.ebuild 1377 BLAKE2B 4591ceed9c3bec2b1cc8af2b6be232388d332ea1050e02789bcdb3a6c294179a9d3c083fee5e0fa0985c9ce82774d689fcd0e5468fefbf6f7a647a43199b3cfa SHA512 50cf50205f79d0da8e700bfa942a0ae80d634e229222b328af32f59a975ea37f98b7d4432268f2fc30dd98a7d35fb5f28133803b63523cd68f9d256ec79af82b
-EBUILD kwallet-5.85.0.ebuild 1387 BLAKE2B 9927f065dd31991ecdb1cb5bdb2555ac3a53cdf1057dc47b7304c7eddaaf5a071367f0244daa6691110199b0c2c2def4381dab9b5b447ee86f731c0bfbc70678 SHA512 c738f70ecc2210759a8dd680381791404a535bc4b79f886f2beecd3d3961dc5f029d49229e3f92d34361d08d975b72a4c8cb1b19a7771c4f30794b5c101ca054
+EBUILD kwallet-5.85.0.ebuild 1387 BLAKE2B b91dbfd61fe54be3b0d8dcd5b9dd71687f5bd8841c9696f41b9a3970c8449098b5d83611cfce262b406362754cf8daa5fdd8262bcc45dc1410a2c4ec55d71c32 SHA512 43a240a00043eb849da252d1293c015a93b2f4c69cebaa2fb40889b8c73c4a6e3c2111d3724b3f2520dfc9613855fce7d57e5a3a47b86e9459f656029f69306f
 MISC metadata.xml 585 BLAKE2B d0c62d676ca9709281be2058e7d4c8a54ac0857586d52dd51d6053b4b23dd7b0108947f9ea75c984c8ba4eda5c5f7d222dc7cc25094732af324042ec39b357a8 SHA512 b463449de0b38a1ee47a501f7311ed17327fb72f43f7fcd024885875b21672180a40d10aab28d0c7170818275407a2221632c1259e00c629d7656c00726ed776
diff --git a/kde-frameworks/kwallet/kwallet-5.85.0.ebuild b/kde-frameworks/kwallet/kwallet-5.85.0.ebuild
index 4a7733a6f9a9..f985d0d7667a 100644
--- a/kde-frameworks/kwallet/kwallet-5.85.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.85.0.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-2)
 QTMIN=5.15.2
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 866b86ea1e83..36af4fb97a5e 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-5.82.0.tar.xz 346464 BLAKE2B 59b0e28b2a9984c923c211cd169b4abf9d7c969ae1de31db3e08c0bd2a127b19e652c6666b20ee49d73c9d2736929a45a2124353fd19b320be9256e2f87a6252 SHA512 80cddfdcef545315987d27167ab2ed35b76b9b02e2310913b7c27cbcf27671b1f1f66b8dbb8dee82d42bd2e4fdbd5853109783e76da7ec794f6eebfbef9cf020
 DIST kwayland-5.85.0.tar.xz 331208 BLAKE2B 87397c48534784dac0b7b864ec1fd6579308c34daa5ff613d6b39f50b5fa6f5c59b33f648479e694e4135460468df9196682e169fcc9aee22d9dbd1be70ffc38 SHA512 b45321c2846c2311c2e4b48aa5edb19a3a4cac889415d490a21202470ea27281d8b9cf69f1521109bd236eb48ca93702e461b54c49e38dcc50fb90f4cea0d063
 EBUILD kwayland-5.82.0.ebuild 764 BLAKE2B f5ca1ecbdbdb23975f337dd58b86b6d8740ff9453e62881ad27d3f9a3859a771c94de027ff2deb9f495cc47593887f0751b19e3ba4206753728f6b888f22ddd1 SHA512 91880d5bbde65e9875e948d8a2b5507a4cffd27f2cb9c5b995eb0f7b93d49b4bdb403a9fd632e6f57925903916a13c371afdfaa84ebd4aad26154931a8ac193f
-EBUILD kwayland-5.85.0-r1.ebuild 825 BLAKE2B 4b191ec6904bf85a6788693cd529b2a55d40fb2ea2fbe800f1ce6b8bb1caac6245319dcf0bf72dcee99330a16af207b035fe4aefdb59bbab89a61a256ac9b2cb SHA512 0f905a6404334c014737f5f3a176ca1223c5537b1696742d0b05271f3e9369b24b93ebd977693fe84c2e05a24f1bfa8b9773253c08ba83b7dbda87f1e4f158ed
+EBUILD kwayland-5.85.0-r1.ebuild 823 BLAKE2B 8119ab86def0f386268caf7221c7aaa1f5e79d4fe6e066c3b52584a63984d94f89ffc1224f214705188f1b99a1239657055e9d706ec1e79e98d63cd920684379 SHA512 2aa474a0469ec1a20c9881f4b21dd3d12af3b1eab84f9ab25faa6cb9af1a3826ba8824e9af9b18db25197cc2b59d21d47abbe80d54558f7c6762b8334fb3b3dc
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild b/kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild
index 99f2db579e40..257d3e7adf58 100644
--- a/kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.85.0-r1.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"
 PVCUT=$(ver_cut 1-2)
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
-RESTRICT+=" test"
+RESTRICT="test"
 
 # slot op: includes qpa/qplatformnativeinterface.h
 RDEPEND="
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 9069263a2a41..a5db6c49bba1 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kwidgetsaddons-5.82.0.tar.xz 2375140 BLAKE2B 044a1af35ce5f756c49b849f0b56e024e709643967142f1d9634ccaed882e1973c5f41c2794470563cbaceae8f7b6a72fb9c89a85005dc723e09a668af0c2fa9 SHA512 6535353c931edd6b0d8bae70fb67e3f6b2bf365d143424a7df4b63de9e174e9b9da705ed17e64f497923909a9d7eba0282d934a9c7abe2b80675b3652d1bf9fd
 DIST kwidgetsaddons-5.85.0.tar.xz 2306380 BLAKE2B c2fe7d9fc1680b90aa32fc3d5c9d88b1bb0b94094065f0c666da35bead3ff6dc76a6b943a0f814dbc322ce1493af414044b1a7fefc9d6d316db5a6fd9a61d974 SHA512 973ccc1f77f092384e0933972ecea8ed7fcc4f7891e7393f4ebf860ebd4155b7b7e6229b92d308844c8f3c31f720d150c3afc5573c85d9b6d34e1ac70ad3d315
 EBUILD kwidgetsaddons-5.82.0.ebuild 751 BLAKE2B 21207bcab17507caaa5ddb02836ec6df4b31dd4e38a4460bda574e897dcf0bb7fdfc5760c6e28410defb96d0fe11a0cf123300da36c9434d2929fce5df739c1c SHA512 e031ca7dd9fc35c9dd855a6fb5da62d13da7cb170fadd36893180d49e71a382ec3c632f7d11533f84d7786f871280ea793d926b686600e170e0d9f3565b1228c
-EBUILD kwidgetsaddons-5.85.0.ebuild 761 BLAKE2B 940291b368a913bd2fa76db7ec06ab300846e8f57aaf95cca4d0cc0e40fa08e69e3217d5fc971da97b2539ad63a3a2df09bc6b4e2dbd1a6256b313ae4d09f86a SHA512 f5e62a390c66d73c6208039999e7ca68b1b4102c5d822b5f9fea788233f3a23c567d2610b45e61668a8615d644fb6c152affea172380508577dd3c5c5f5819bd
+EBUILD kwidgetsaddons-5.85.0.ebuild 761 BLAKE2B 3779a47cd11a181e54a98bfef5be0774749710f516ea4f64e7cf49cacecb0a20693f22d5e43af3586046aecf9e0aec83e173eb86a4d28f46fbd102469d9c8413 SHA512 8c571aef69395ce4e2b9627a7b9dd43f3dd2c3b3d1f7b322726cd9f6732766537e930498823c5b7f7441102f04f05b2425bc1fbd3adc3cc45dd1dae933915afc
 MISC metadata.xml 546 BLAKE2B 9cfab5e5f3efb341d3c84140c65843d706a33bcba9dba92b62e7365c1cd5fbce8e0d52e5bd342eff1e05ab38fdcd6a9a8b8b441f8cf5a94dd70233e4a3ec36ed SHA512 8504b2496b14ff6bcc7dad0eef39ce8ce12516ae54d498e3d609512ddbda6b587359403fe12d57530e59209eddbe30f23ded0d2d385c773dec561efe610ab32c
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.85.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.85.0.ebuild
index d8f7cd813013..0745e43d968b 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.85.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.85.0.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"
 QTMIN=5.15.2
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 4c14c56cda4c..5f05ca57944e 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -2,5 +2,5 @@ AUX kwindowsystem-5.82.0-no-qtwidgets.patch 2499 BLAKE2B 30602fa8fec92647cf92abc
 DIST kwindowsystem-5.82.0.tar.xz 177932 BLAKE2B e3089e51821f46eb061830863bca969e5da693a815bd17db3d674912fe1c924fe2d590c982c93ec9926d381ee8488287f669745113c1a96cd5e4f3f8ac3c1297 SHA512 fd823e718e439d40e85146195d03c6868c99d62cc9495d5733157db081f29884cd9a9d11421d81c47fe4cc5661107a1b52ff55dc9e0a00565682f1d7845a2e68
 DIST kwindowsystem-5.85.0.tar.xz 178256 BLAKE2B f18dbe1f56529f7500ede59bc3447d6dfd4439086dadbd59d137a21ddea01653cfdfe945f6120461f507e7007228ef2135687ba740981a37e2e9ffe1866e21d3 SHA512 517943febe93ec84d91792ece6a2ad4518c3976d4f9ae3ba631713bdb87cec72817d3231da0fa6318c93e7b6ccf4875ba1c079b3838d3d68ad28cb9c35211d43
 EBUILD kwindowsystem-5.82.0.ebuild 922 BLAKE2B 627b7d7260383ff83a7b778599d5c6559a43232ad3d45fb4d77ad60906db764b9a8252c7672c223c06005f6b7e4ec7acef986933452ce9153980f18a4c43054a SHA512 2dc1aff1b888ba35badfce72009989dc08f82baae45294a2a6c6da830119485f786f2397e8094ff1a919876fe8a67ba10014c1e736fce023e8c2f2226b4258bb
-EBUILD kwindowsystem-5.85.0.ebuild 861 BLAKE2B 6bc8afd175736dd9aada6b48c28bb9e6b1090bd472eafde8e1864ab8841840c169f9b458309cecc43a26fbce6ac97823c7eddabf8e355c2fc614734a314a1087 SHA512 b7fc410b6461f47c703886912d9269517744b967983004aa37f276e36c7b2c0cf53ef93a03b4d95d389187eb04a24f1af106bf3da9afed5e2265c85381b0c5fa
+EBUILD kwindowsystem-5.85.0.ebuild 859 BLAKE2B 70ab39adf48705f875651cabe6fc3fffcbaa21787ca74d490c14ea9c845368365eb6cc1ac930b628b72f6748a12c3b172dbd917ff1e29791284689122eaba076 SHA512 fb6116316e193d30863b29c63c22972b0bd55e5c68a0b45eb34300589267206a24fe73d9b28a5ae9e1a89a9a381704fea8db5865e86e6c3832f13debe658c38f
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild
index 27d95f86a264..18350d22806e 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.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
 
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -12,7 +12,7 @@ LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="nls X"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 6cc33a720e9e..90d2b0fa0026 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlgui-5.82.0.tar.xz 863880 BLAKE2B 045ed589d52ac901aa128d4f3e8eb2bd2f9b09ce22e6a7e28dbc34d208a6c00167c94e5514f47acce640d18f86f37adeeac79a25dc148eb58c038fddc9fcd59a SHA512 2ed59fa53876005f326e323e153d44d3144c9d49bcccf5aea68f5d743a79b505526286b6307e193878541c5cc8260220ca0a9a169b18d0b0df4720aa8541d0f4
 DIST kxmlgui-5.85.0.tar.xz 870124 BLAKE2B d9f70d0cc936544f6370cc361bbab39e2b7cc2decd15d01946dd277e25f735924bf5feac552e78fd041ca4693520fe7ad4019140066b55aaad8394a755b0c3f8 SHA512 03e36478e07635ff0acbe86602f64fc9d7c1c334e396e3136fde56a3d4fc28ed0c5170aae43d1a586adcce17241da0ffdc0836a9dc94f204f93cbce32a03050a
 EBUILD kxmlgui-5.82.0.ebuild 1282 BLAKE2B b70ebf07b32922e3305161543dffa76c619b596b9a98dca886f286519561d293fc4479459934a81533779cfbb6decd6c11147e7ffde9632d9bbf8b9b6e957491 SHA512 5b0b2f1b60f784947253b08a929a155777948130082af735811c2412574e6cfc2665fca6ff3063e8805368c55494e64675ebcccbb46aaa13ff23638cbacecc4a
-EBUILD kxmlgui-5.85.0.ebuild 1184 BLAKE2B d3c1c26143e3c2eeda8cd80ee1262a0d2866c0a01c0f77a6514067191cf719401a5126f35f097795dafe15e21c3335cfe4c408b15fecd451f4e30f44db83615e SHA512 4a832b3f34bc5bac58bc11ca1a601c654af2364ecd332a627c5aa92209c5ba60c47b1b19254c72c2f332046035fe27d362791ab0dff1997a38a86057cff3ee24
+EBUILD kxmlgui-5.85.0.ebuild 1184 BLAKE2B 959951efbdec8c3ca189b4a5848d70d214d9cd63a875325c4f0440059a64d2df3f3c8459327729e4411f57395ad29fb751052f0d4893b581246894466c080fd0 SHA512 7309e43e5caa3d10560643440c726d645cb39c2327c8d08e8571fcf2c99cadfd556c1d7dab3f3ad382513fdeefe08a177c8e991eb639d3a6457648358cc4a72c
 MISC metadata.xml 546 BLAKE2B 9cfab5e5f3efb341d3c84140c65843d706a33bcba9dba92b62e7365c1cd5fbce8e0d52e5bd342eff1e05ab38fdcd6a9a8b8b441f8cf5a94dd70233e4a3ec36ed SHA512 8504b2496b14ff6bcc7dad0eef39ce8ce12516ae54d498e3d609512ddbda6b587359403fe12d57530e59209eddbe30f23ded0d2d385c773dec561efe610ab32c
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.85.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.85.0.ebuild
index f1296267f3a8..2fc6a255a9eb 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.85.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.85.0.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"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index b708c955d4b5..a35627c479ae 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST modemmanager-qt-5.82.0.tar.xz 112524 BLAKE2B 1569dd2defb8b99b41d3ce8c94e010a8274e04012dc72b442e13761d287a1ed6f3e281ab0f03659f1d034fe6e79c70bd6ff3c07c7a4189fbc4d154fea122a1ae SHA512 129b1618f9bb5a59c79a7a202e297c3dc6f90829c2e4841a0cd2ac15440fed19ea78ce16d2ae3b012fe02db568d337210bafcda183db9cb8a1dba0d087f16ee2
 DIST modemmanager-qt-5.85.0.tar.xz 112436 BLAKE2B 8e86d6c330a048a6f2ac522f1b59d89e3b1951d21c3667254c2f8c6d3e01f0d2e53ac55d4bd6a4edfa6cf68413dac6afb71ee1c6ba59780a4d033614fcd24b06 SHA512 535cb520bb2102fc50ee884b50edd02689c59528ee9c9fdfe958d14dc1c57c1e3805256ad15c6ab8e0aae43441139ae659a850b5cef350011da4d2b554e3aec5
 EBUILD modemmanager-qt-5.82.0.ebuild 466 BLAKE2B 26bf07c44b1d2e8d42bac5f58ad8d3257376eae6fa3d93bb87d78f8a3e2c7aafb7dc7a2ffc24c654fb4d105650847a3b4e1529cfa7ecee0c9f72185977ef5a2a SHA512 bc73ff5231ccddc78992d4d2389628fc3f50555d69694ed761cc43de87f8721f5aafb1272a00e6c74b7af4e9fff0bc969fc30f0f8f07f9f09cf418935fc0423e
-EBUILD modemmanager-qt-5.85.0.ebuild 476 BLAKE2B f0caf506908a78d2eb49f776586e655a8adad8314c11f1693bfc178da0d46f9c4ff4f942635295cda63f735dd7c7bcc8d4d5fc3f94f441c86d1359f785067e2d SHA512 2d2a8b499b92cf62bcac5c2f1b2414315aba51eafd21f542a8b51bf935fc0d3cc5cc79bb63be6f25055318fe97c89eae92bf90ebcff7d302c09d59d1b639d5ab
+EBUILD modemmanager-qt-5.85.0.ebuild 474 BLAKE2B d35b4c2cd21514c2765958eec99c359f9917f7aaf1112da9a8364830d76a920ab565684abd217323c1ac69214a2938d249dfd45bc808f83677c527837397269e SHA512 98eaa16eea9c5ca43866f869ac68069d2ccb1e053ff92aa502deb96cdc1c6c7ed20b8403663645a0f68464783133cc2207a3f62372d22581240d477279555d5a
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild
index a0128939e5b2..5cec0e740d6c 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.85.0.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-2)
 QTMIN=5.15.2
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # requires running environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 325327d40405..e55aca935943 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST networkmanager-qt-5.82.0.tar.xz 195688 BLAKE2B fbda99af246ed652f39c48bed432b934ba3aeeda7c7009c238464e2f0c586a226343dac3bdc1612c970766b3801ae0e03492dad7c73325d0254437f27d428cf3 SHA512 07d3d0e5a9f526ecea5942f5d16aa97c3ee8ab3f2481cabc01a9132e85c92a3dd1a3da744accf413d8239dbca1fce3d1ae022ffafea620f9212bda2a8fce00fe
 DIST networkmanager-qt-5.85.0.tar.xz 195996 BLAKE2B bbd41b95ca8c9f676941240bdab40f2d9ac76ca6ccb3eb0cf133aaf4e8bd7bffaf13a91f0a3cae06ea617ee11dce2c198536f134f9e17246897a9afebc89348c SHA512 84bb0edecb6162834caa495d9fa34947ea25f69cd915ba7a516657077492fb7f6c0fedd7a127d7e2caa7d8c038520410505b829eadd19d3ef9daa445442b090f
 EBUILD networkmanager-qt-5.82.0.ebuild 651 BLAKE2B db20b2cefb809e8f759a2643e15bd1e665dab4a60b3759db61a5461deb3db027cdd7c1a6566b5e7b22d0606d50503b1246a84fb1f1eed0858a0b2bd9c38b8014 SHA512 0cac1b4354ff95c8adbcbf405a88a9ecf48fe197b7558ded9a4c718c895225dc4f22a947889488f1ad18ec870b615b6091bb51f0b23e760e3283f084042245ed
-EBUILD networkmanager-qt-5.85.0.ebuild 661 BLAKE2B eca869b72a3d292a69a65378f69fe9fb0578ebdfddc92e1c73d83af65cf375b8ba342f8ae8b0bb5e398002c084d25708fdf27cfcafaf6d3cd8ae081bfed0c288 SHA512 ec242148e20063a37b42969086c8d76302b9e50d05aaa3f3a7d4efd641c327775743e3aeaf1d3e1399eb6e9f4b6038b80ebcc1e3f7f8e720f186cf6816930297
+EBUILD networkmanager-qt-5.85.0.ebuild 661 BLAKE2B 49d0a14394b1f62e8b51006929d5d8bcebff80ca17a75eb5a29e0aa9c09f6190cf5b1e5dcadb1ffdd735c3ad177ea9015b6870f002b66ca6083dc16b17ac1980 SHA512 c03d6275f8f2cc70496bd961aba3f50217d141e4d6e3e1d03f02769805ecdcdf70ba8fc223eab55282b5474b44645310127131784421d7bfb30259a07ce2cace
 MISC metadata.xml 527 BLAKE2B d1acb2ad3f6e1c8e384d51a778e8364ada61503a3ea1a627a3a5c4b46952d0af9c33d2f1131da4012b96a9de7987d5d096be40b190bae0c0236f1a665513c021 SHA512 1a5d43d030054ed46eecae2fa74989f6fc8ffa45bf6f9b97bc6588ffdf55b6267968ae479cc7f64a73f85559bdc7f7b25ce3309eae9854c8579d173e6f348386
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild
index 644aa4f7afa9..cb414e811d3b 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.85.0.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
 
 QTMIN=5.15.2
 inherit ecm kde.org
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 5fc1860966f6..3c1b5c4b7f21 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-icons5-5.82.0.tar.xz 234613000 BLAKE2B 49c25988ccfa1a00a68c55a51b20d3052f1206a74f9ea12534243d106326471ce8219a7bb1c7abb30f1c8994bbd098753107570beb8e7f1f058eba91fabfb609 SHA512 b35ba0bea0fe88f8ef65b7ed7e56157ff4d34ebc516e0009a2bd9969bfe477a6150484f5a8987a9ee5866d27c21f92efd0eaf9673b537a6b92732b3af8133bb9
 DIST oxygen-icons5-5.85.0.tar.xz 238630636 BLAKE2B 7a6656d8474f2acd734da6bb673603d059afe76e2f2a8eb5e0270c4f72a2155486d985861582070c7dd8fe3cb154f310cd6662086ac45e867feae6e1da75190b SHA512 c3ebcdbbaa65177a5833cd51808dea4205a27f993de9a2aca4af37512a2b258863922be8389c3ba8090183a092f72754efea7521cd1cd7e1a2bc2266768daa4f
 EBUILD oxygen-icons-5.82.0.ebuild 688 BLAKE2B 8cb46b48972acff4ba7504e694c526c2c382546ab916d9c7dd475e8e353ab571feabc0d1629df3158f00d07da16bc8a1d8d41f14659ce69ed6e31756e977f58e SHA512 6ce6daeaa08970b337f2d514b0b472e2aeb39713b29a60d4647969972eb394bf6496d5a8b59c6784f76ec26548a7d352eadec54cd5b7d6ef6d7087979ed1f59c
-EBUILD oxygen-icons-5.85.0.ebuild 698 BLAKE2B 9d5f8035e559dadcc61fd2df58355b11400b1ac7b7d67128c85cc60c26b39ccdb5ef7435b7ea2c38962748848587a2df5f6d1ff61a608fa572a4e30b790c01af SHA512 04fd5fb898081809824905b480ba4746481626c464ae00ee8d1d233d99159c408938d5942b64ee132587d7909733f6ea7ed3968384d7c0de0458f84881b383c0
+EBUILD oxygen-icons-5.85.0.ebuild 696 BLAKE2B 236ab60579167fac318e1e36576caae1a110a6c858efc8046e322d08d38ab132951aa59834dd4425a9a1cc7ea01ebfa5b62bef948a9ec7752fdacd6f0adbee33 SHA512 e3d17b2a37044a172340d8bee77ca3f88cb3415ab8b199538494b38b618463ad3cda43709d8e708f0b67d35b0b7f55c3361117a9a9e304cef64a58d70e3781bc
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.85.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.85.0.ebuild
index 3012b2e566af..e71b5c0490b2 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.85.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.85.0.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="oxygen-icons5"
 PVCUT=$(ver_cut 1-2)
@@ -14,7 +14,7 @@ LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 
-RESTRICT+=" !test? ( test )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 37050d2798d5..7f66cbf97baa 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,9 +1,12 @@
+AUX plasma-5.85.0-fix-ExpandableListItem-overlapping.patch 1676 BLAKE2B 0335857db4528881056a10cd4037b0288fdacd3a1e55a90f01523071122f974c7925e49d841c8d1ef40bd6d7731e6d05c747dd116f18263ad156d557d79aeb78 SHA512 72a6a67a5f8bb713c5d5456af6d0c2d6d2837d9610068174528a239a88d5b75ee30a86133eeedc5793e55c856a52bf762337819c5a27f4c0196220263d8d1ed2
 AUX plasma-5.85.0-fix-cmake.patch 1752 BLAKE2B a148a2836ebc6dc6ff7c26e811b4406586e389ef9d5ae30e2f6996f7328a698493f198312c3b86894b36255689be9ccba3368a1e6b03c76b5646b70b039c3303 SHA512 227fb2817e2620cf120e8be94a1eb27b925ed65c8f8ab0327414d6aa391aa5cceecd944ee2f7a0804f5c3246b249ef4c25505a37621194875da982351bd1fe01
 AUX plasma-5.85.0-fix-pinned-calendar-dots.patch 1466 BLAKE2B 1d4f72269928e35e0364a325f9700cd0b265cf26b00d46b228aec9cb5fdc82cc652a572a3057720beb2acc783eb7ce451dbbe358f80ed7d48549cd144d4d6cf8 SHA512 4f6e331a3502b9d73c554a44569569989c7b8f33dfe7a4362654ed899dde302541024c30b98b7f31636fc40c19cb48e263266c6f89c27028bea6119d5f823071
 AUX plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch 1766 BLAKE2B 07e8f384a2dde888465b4c6e3317afdd511ddc03fbc18ccf6e76d235bd6552c9b0dbd292f19244e0792129c68b2284af9220f9ef54240bee1255e35a5e94d907 SHA512 5f452b6634bd53f7265dfad2a38e40aa46ff69d10081b51c47b1aed97cabd28d545e7fd985ff26412c07315214821f201e5ff2de3d895e8afde9523d187b932c
+AUX plasma-5.85.0-fix-svgicon-memleak.patch 1613 BLAKE2B be00da72ac0a1a8ce97cf771ea83db44fe97142ddadfc1a1b283cce5297568ec0566b7a2ce626ad7d7e4f7bbc82edf260dcda1db6ea8cf8ed1c132b3a25dedce SHA512 c8dbb37558ecf3491edbbbda6f93075d7ddea7561eb42b30416d61f7b7256966c609862fb8e0c746b9a93d2caff37b8afef9eff0d5db271d6e3cff8aef2d560b
+AUX plasma-5.85.0-fix-theme-memleak.patch 3873 BLAKE2B 8ec65e67dab0020febd483b4b369d26d4f9e7a1782b783c2910e80db643f92562559053a6319b57af4f905daeaa970db7d78e1a2c11b07dcdbc9d3bb74f52c10 SHA512 fe93829d4881a71bd4671af187a7210fb8fec1c92b29917d1530c58d1247976d59ea2e16eb0eec0c14e25824a9b15caebb7912f7db23b6088c1352e9925d15a9
 DIST plasma-5.82.0-plasma-transparency.patch.xz 3552 BLAKE2B 8e9f1bc91b2d8ae623ff8f31d5de0ae812ffc1666badf388fa711887afd9479d718cd50f9bdea42d725f30fbae8d32d87cd071b30b1ba49768377a8d07e9bbc3 SHA512 3e8608f7c7d6da150a30fd48e2ac5115f95f6346056ef2f12134ba8e93617c7b067b8ccb1bab5e1586f3ef1af7f010b8ddd9fe0a9a7ee0def01bc991be8e546c
 DIST plasma-framework-5.82.0.tar.xz 3160744 BLAKE2B b0e8ebf51fa41b7ea2f3290b157d30fbf2cf2bf5fdf867c7601ece615d8f2ad93b87976f7b093bc7909e1286021db8d1ec5971cbc8b361888450a9e6a9bd64d7 SHA512 e973d1b2683a88f370587a8dba71b1f3ff8a5e23127dbe4c30161fb827b6e3c83e7eb0a6860478d160c6fa69bef9fde0f16f0a8d315672df433ac9d7157b8ea9
 DIST plasma-framework-5.85.0.tar.xz 3145156 BLAKE2B 8a9257e3613ecc20051064af8eaa94cd30d07fd9c6349f6dd2aa1169ab661dbede1ff424ac1f96a30230270cf8f957731465c0a655270862c104987576b614ed SHA512 aba7e62ff3d9eff7c28c1736bd1b25e14c19502f021ed7f78025f7129abb728a066de0fff327098f52b84e78f78fbe87743563b78a4c91e2065187fb443eeb77
 EBUILD plasma-5.82.0.ebuild 2030 BLAKE2B a64a05c28c10890fb3f845286362f0041de75d1f895e1166ee7f1d4ea2f84249582fb4f06c202d4493b97c05359df34c3c1a6938042c9a0ef740d96c3906d398 SHA512 1faab810a201f647dabe24e7d192b53c1b7cbde16287f35c4ccfeaada018d5c967b07589e6d82734f1f5a229d351bd19666ad16d888f34dd4c599d12e07c501a
-EBUILD plasma-5.85.0-r2.ebuild 2140 BLAKE2B be37c7efb88e70410b852a9027cad8f27e482cf94d6a663ff38cc5606cccaa1aea3dd8df56f6a64ac54056e337ed7aa9dd630593a0ce5edfcea8b1e08f47b61a SHA512 a8d9fdd14617d510f6f04eeba9910b770e8616b834a0e1f4dfc37ad6eb076cf70bc66d55c11d59a2ce8d010595675ff37b4c4e9af324f4a40370a0984a8aff79
+EBUILD plasma-5.85.0-r3.ebuild 2332 BLAKE2B 210c27c7263f3b6d59a5a9e3dffd1c6cc6f2d2d2d4492618d3e1b6a51172b33adda22c8bff5f363a649b7b1e95fb88278c70e244915a57dabe973e432ca5f8ba SHA512 c9f5315b6d50decac97aa44e6ec56b7fd082777510264f5fd757c0773e5387bc7aa69da8305d98a1106d4019142bf29e63b6f66da9553149686054ab9696b9b3
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-ExpandableListItem-overlapping.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-ExpandableListItem-overlapping.patch
new file mode 100644
index 000000000000..8063039b7626
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-ExpandableListItem-overlapping.patch
@@ -0,0 +1,41 @@
+From f393bace87e5fc8c0e68eff9faf0656df64715ed Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Wed, 1 Sep 2021 12:30:01 -0600
+Subject: [PATCH] ExpandableListItem: Fix overlapping entries with many
+ expanded items
+
+A previous hack was done wrong, and was not taking into account disabled
+items.
+
+BUG: 428102
+FIXED-IN: 5.86
+---
+ .../plasmaextracomponents/qml/ExpandableListItem.qml         | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
+index 47b3e3684..851961a4c 100644
+--- a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
++++ b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
+@@ -523,7 +523,7 @@ Item {
+ 
+         // Container for actions list, so that we can add left and right margins to it
+         Item {
+-            height: actionsList.contentHeight
++            height: actionsList.height
+             width: mainRowLayout.width
+ 
+             // TODO: Implement keyboard focus
+@@ -538,7 +538,8 @@ Item {
+                 anchors.leftMargin: listItemIcon.width + PlasmaCore.Units.smallSpacing
+                 anchors.rightMargin: listItemIcon.width + PlasmaCore.Units.smallSpacing * 2
+ 
+-                height: PlasmaCore.Units.gridUnit * 2 * actionsList.count
++                // Need to take into account disabled/invisible items
++                height: PlasmaCore.Units.gridUnit * 2 * Array.from(contextualActionsModel).filter(item => item.enabled).length
+ 
+                 focus: true
+                 clip: true
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-svgicon-memleak.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-svgicon-memleak.patch
new file mode 100644
index 000000000000..89896911d0a2
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-svgicon-memleak.patch
@@ -0,0 +1,37 @@
+From 73782c8b39d1cc41fef003acca8df75ccdf384e4 Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <kde@mattwhitlock.name>
+Date: Mon, 16 Aug 2021 19:37:28 -0400
+Subject: [PATCH] avoid holding onto old Svg object when changing source of an
+ IconItem
+
+A long-lived IconItem instance can have its source changed many times
+over its lifetime. Because SvgSource parents its internal Plasma::Svg
+instance to the IconItem instance, this means that such Plasma::Svg
+instance was not being destroyed when its responsible SvgSource
+instance is destroyed and indeed would not be destroyed until the
+IconItem instance is eventually destroyed, which could be arbitrarily
+much later. This commit adds an explicit call in the SvgSource
+destructor to delete the Plasma::Svg instance so it does not hang
+around in memory until the IconItem instance is destroyed. This fixes
+one of the major memory "leaks" in plasmashell.
+---
+ src/declarativeimports/core/iconitem.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
+index 0db750acd..3f06b8b0e 100644
+--- a/src/declarativeimports/core/iconitem.cpp
++++ b/src/declarativeimports/core/iconitem.cpp
+@@ -196,6 +196,9 @@ public:
+     {
+         if (m_svgIcon) {
+             QObject::disconnect(m_iconItem, nullptr, m_svgIcon, nullptr);
++            // the parent IconItem can outlive this IconItemSource, so delete our Plasma::Svg object
++            // explicitly to avoid leaving unreferenced Plasma::Svg objects parented to the IconItem
++            delete m_svgIcon;
+         }
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-theme-memleak.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-theme-memleak.patch
new file mode 100644
index 000000000000..1d7dc596c20e
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-theme-memleak.patch
@@ -0,0 +1,86 @@
+From 14b495f933dadace7832fa6cbc809c3abdb7c682 Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <kde@mattwhitlock.name>
+Date: Mon, 28 Jun 2021 18:01:14 -0400
+Subject: [PATCH] don't make duplicate connections to
+ ThemePrivate::onAppExitCleanup
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Plasma::Theme::Theme(…) and Plasma::Theme::setThemeName(…) were
+unconditionally connecting the QCoreApplication::aboutToQuit signal to
+the ThemePrivate::onAppExitCleanup slot, even though the ThemePrivate
+instances are cached and shared across multiple Theme instances. In
+long-running applications that make heavy use of the Svg class (such as
+plasmashell), a single ThemePrivate instance can be reused by huge
+numbers of Theme instances. If the reference count of that ThemePrivate
+instance never reaches zero, then the connections just keep piling up,
+contributing to excessive memory usage. This commit moves the relevant
+connect(…) call so that it only happens in the case that a new
+ThemePrivate instance is constructed. Thus, there will only ever be one
+connection from QCoreApplication::aboutToQuit to
+ThemePrivate::onAppExitCleanup per instance of ThemePrivate.
+---
+ src/plasma/theme.cpp | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/plasma/theme.cpp b/src/plasma/theme.cpp
+index fabf98f4e..f403d393b 100644
+--- a/src/plasma/theme.cpp
++++ b/src/plasma/theme.cpp
+@@ -39,13 +39,13 @@ Theme::Theme(QObject *parent)
+     if (!ThemePrivate::globalTheme) {
+         ThemePrivate::globalTheme = new ThemePrivate;
+         ThemePrivate::globalTheme->settingsChanged(false);
++        if (QCoreApplication::instance()) {
++            connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, ThemePrivate::globalTheme, &ThemePrivate::onAppExitCleanup);
++        }
+     }
+     ThemePrivate::globalTheme->ref.ref();
+     d = ThemePrivate::globalTheme;
+ 
+-    if (QCoreApplication::instance()) {
+-        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, d, &ThemePrivate::onAppExitCleanup);
+-    }
+     connect(d, &ThemePrivate::themeChanged, this, &Theme::themeChanged);
+     connect(d, &ThemePrivate::defaultFontChanged, this, &Theme::defaultFontChanged);
+     connect(d, &ThemePrivate::smallestFontChanged, this, &Theme::smallestFontChanged);
+@@ -57,6 +57,9 @@ Theme::Theme(const QString &themeName, QObject *parent)
+     auto &priv = ThemePrivate::themes[themeName];
+     if (!priv) {
+         priv = new ThemePrivate;
++        if (QCoreApplication::instance()) {
++            connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, priv, &ThemePrivate::onAppExitCleanup);
++        }
+     }
+ 
+     priv->ref.ref();
+@@ -68,9 +71,6 @@ Theme::Theme(const QString &themeName, QObject *parent)
+     d->setThemeName(themeName, false, false);
+     d->cacheTheme = useCache;
+     d->fixedName = true;
+-    if (QCoreApplication::instance()) {
+-        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, d, &ThemePrivate::onAppExitCleanup);
+-    }
+     connect(d, &ThemePrivate::themeChanged, this, &Theme::themeChanged);
+ }
+ 
+@@ -105,12 +105,12 @@ void Theme::setThemeName(const QString &themeName)
+         auto &priv = ThemePrivate::themes[themeName];
+         if (!priv) {
+             priv = new ThemePrivate;
++            if (QCoreApplication::instance()) {
++                connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, priv, &ThemePrivate::onAppExitCleanup);
++            }
+         }
+         priv->ref.ref();
+         d = priv;
+-        if (QCoreApplication::instance()) {
+-            connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, d, &ThemePrivate::onAppExitCleanup);
+-        }
+         connect(d, &ThemePrivate::themeChanged, this, &Theme::themeChanged);
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.85.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
index 30eba0b8af0b..b75fc07332f5 100644
--- a/kde-frameworks/plasma/plasma-5.85.0-r2.ebuild
+++ b/kde-frameworks/plasma/plasma-5.85.0-r3.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}-framework"
 PVCUT=$(ver_cut 1-2)
@@ -15,7 +15,7 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="gles2-only man wayland X"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -63,6 +63,9 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-plasma-scaling-w-int-scale-factors.patch
 	"${FILESDIR}"/${P}-fix-pinned-calendar-dots.patch # KDE-bug 440627
 	"${FILESDIR}"/${P}-fix-cmake.patch # bug 809815
+	"${FILESDIR}"/${P}-fix-ExpandableListItem-overlapping.patch # KDE-bug 428102
+	"${FILESDIR}"/${P}-fix-theme-memleak.patch # in KF-5.86
+	"${FILESDIR}"/${P}-fix-svgicon-memleak.patch # in KF-5.86
 )
 
 src_configure() {
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index a2c5e3b103a0..09272f73194d 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,5 @@
 DIST prison-5.82.0.tar.xz 41044 BLAKE2B 869d41631f1c41260144cf43d043bb868f3c9cf1443e544ad2a084852fa58d2a2b08a1abcd8182ba1bc2cadec229fd870ff10f483f3a9a92bc3e8b49c4138d87 SHA512 bfed4293bc3bc0c39d8cecf37a33693af59831ccb9aefc32ea717d363cfe6e0769f0f90296dd09ce5ea24016e25f352c0be400e9eacb80f813221ffce02bbb82
 DIST prison-5.85.0.tar.xz 47056 BLAKE2B 8cba0f739c93b759f3683eb1a5077656111aeeca13b367d5ca7689516517b56b1afb9ac255f486d2ad003a2b6b86bc7acf7be718badddddf042ed8bfa632da8f SHA512 29916598b8ce86ac84014f5b107012cd636965ae65a7071971155b898484e97e79e1cb78f67dbd77077e0ffaddf759cf0fab8b370ac1c0d92be0b9b9f06e406c
 EBUILD prison-5.82.0.ebuild 613 BLAKE2B 330030b711029903d5aa93c6a74d4c36654daacdccfa0767ef620d614880758f3bd889e238a434ae4e747c396ef3dd93a8a4baf6b8aef54b7f2c9155a6a3acd5 SHA512 5a16ae8cb5c9cf3a8e3aa98bc900a9f6405b916a8ec9fde75f04b955741967433491bcae412679659b6d08052347fb225fcc9be8b0456a9b01b2192870b9944b
-EBUILD prison-5.85.0.ebuild 623 BLAKE2B 7efe0babefecde9a7a106ea57188bafff9e19f48215a7016d1ec79e8f49ef0381296b8e4e707ce1d963f9bc8e9c6c1392d353447b9820b65f8b08856dea44787 SHA512 8c39341e797e53d2b9d445d14b5571e067d5c27b6ff702e7fcd4324ad86a934939ba066fb407902ae0837719c307b9ec2ab0a55f090d12daa40a3babf398c040
+EBUILD prison-5.85.0.ebuild 623 BLAKE2B ae2694c219641469f9eecc36c0b5381b9707ab51dfb1f7d9f0d518dc2d9fa1daf062a5fdaf044ffacee11fdae2252737cd2e4c7c70626dcdb55ecce4c4769d8c SHA512 b56396b658b00b55d985c4e89671b8fe5f04ca6128f8c7cd03895c1cd42e8c253bab6865102c233a290bbf5d37415557547d88b3f02c436584dbaaa11494a03a
 MISC metadata.xml 559 BLAKE2B 931021ece596e348649270c35d0026d9f92ab6647033a67e9d8db4ad45426e9b0227bb155dc4f49084698159c1faa5ea5fdf2617bc59b3b7c98ab274080bb6cf SHA512 1a65269a54a53b8901896f04c1895a99bfd620c59c0b14e013484957e7baff80135dc8c98c7fab7eba63a6ae5e00a330d0bebe232c4c465b81eb6630b101cf51
diff --git a/kde-frameworks/prison/prison-5.85.0.ebuild b/kde-frameworks/prison/prison-5.85.0.ebuild
index 0ba45107737d..ac5b2987ac95 100644
--- a/kde-frameworks/prison/prison-5.85.0.ebuild
+++ b/kde-frameworks/prison/prison-5.85.0.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
 
 QTMIN=5.15.2
 inherit ecm kde.org
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index e8a148980990..90d3128a7982 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,5 +1,5 @@
 DIST purpose-5.82.0.tar.xz 159860 BLAKE2B f29c436239b13c5c025b990a0bdda00107f947dda44b56546049a6e1341f5ca35592c5a4626d62c9ce15b914e566b9a4c96852f0ff9b22d6a22b07b744e1e5f6 SHA512 bccb2cb1ceec619eb61d27cfd027ed20e824a2ba627120581dd928bb331cc1dfc416b5f8067aa31b2a9166dca937a180efc094107a4585e590a5bd9eceec21a5
 DIST purpose-5.85.0.tar.xz 161412 BLAKE2B c6d55396ebde4f8b3f08a71c429bce4f0bbfe1303907d06faf841ab53147a78b582bd63e4b731eb6c5d16b939dade6dab2ca30930a9fa31babb9c1b68c37e53e SHA512 30da8286d7eb8b0652656d0c52fe0f95dd4c3c1f86e468af5f9b546b0afc996dbf9f3a0e011376de5b58e34bf529faca9f3add7ee0e820ab693745c98e21b1ed
 EBUILD purpose-5.82.0.ebuild 1547 BLAKE2B 017622d61514b611f11b5e9f56cd691e101c40ecdef4ada3d1f722fd9c1b9e448b4358a76255ea8de20676725f6a895f4c80850c131c800f0ad0df9dc8861666 SHA512 dee644951181affce53a9aecf5b0ec16e92bff5385923be5dac14a7f042fcda63d6b5a4b9e1923071257d2c0d57ef62865a6a27a412af74ef973c8e95b937cdb
-EBUILD purpose-5.85.0.ebuild 1557 BLAKE2B 8eb7674909477c70be3c74981657dd1a77756412956ac2895bc6f10556e9f170e3ee5db118966de8864076b63f9337534d231d609e0717dc4ae952aeb8254191 SHA512 21966be4e708c55336da41f76545724d67cb6c5bfe29de39f10b45fa4af5d6985303bddc68cf2ec0d790b2992fe344f7753a0bce890d5b9cc1013d198d3cc23b
+EBUILD purpose-5.85.0.ebuild 1555 BLAKE2B 31374f09031e19b38d6592391b06af89dbd6059b6506201c145f22ecdb543f16b74753e278917bf6ba25661b8c9415ea970ec4cd02b7673323d94696ae3e3655 SHA512 7675dfbe8e7ffd70c025bbaff70daf04ede5002cd7ed1002f294fb0936e0b1e1b9ba65bb22b098afbdf9f18f1b806f4eada44305876483098223f06ad23f174a
 MISC metadata.xml 551 BLAKE2B 061bc383228007668b63833826017eabc08f6160a2346c1da43c64772e4fe6f1c7b476897e3c6c09ee2c549a13500c174ff3e5a45b40da5bd328380a13d5a8ea SHA512 63ebe0058ba9c225826b1b186f5b1f833cbd203fdd580b0498f3a331bf2b5fbe7b3a4638191f3fa8f1e97c51303054264d0495c604dd7a8ece488854793ede5d
diff --git a/kde-frameworks/purpose/purpose-5.85.0.ebuild b/kde-frameworks/purpose/purpose-5.85.0.ebuild
index 1fe988571454..6993a98a7883 100644
--- a/kde-frameworks/purpose/purpose-5.85.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.85.0.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="false"
 ECM_TEST="forceoptional"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="bluetooth +kaccounts"
 
 # requires running environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 4a476c4577a1..83291dc0475c 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,5 @@
 DIST qqc2-desktop-style-5.82.0.tar.xz 60076 BLAKE2B 1d743ff60c5862740bd2ef9c0dcadacca3f63f239a78dbd12e459f929f323b695ddd9c03323146b7ac34772ff76f2137e8dad826e04abef6a1f4ed514163e305 SHA512 ce4db38f835971d6f63dced360db8a320e06e3a6f808bd017d56548041f6d0332b119dc0f6d4e160c7847d9d47e6818d2a867e0f243e58fd6c56843643d55a52
 DIST qqc2-desktop-style-5.85.0.tar.xz 60580 BLAKE2B 15cde2a32102e64db7b9f94d894d67d4f067febeec622231ed8bb78909453c7f3207568d2c9a3d84e0c655b54bf7367bd9c6db711ea70bd388fdda7d9bfbc445 SHA512 9129044781a3bdbed7af932d498cc87b9d6b65f95833502e934245afb31337a71a5c578f36a74fe5f5aa88b33dc56b8fa682a4d8b938c0d62025cad1ff3bd18d
 EBUILD qqc2-desktop-style-5.82.0.ebuild 677 BLAKE2B b68dfd2079b33b871129b1342f269021f2eb186f685a1e3bbc75e07ff61282f4860436c83212fa9bfbb9bf1e15fb91302f46ef5652f19a874df63a742de9a26a SHA512 1d44d6e4006a469812cf5b31d3c0c06fd8851de046456a8a4db37fffd52989fb06cc8289a49a4f313b82fdf9aa6046e9b4e306f2bab92942d11026929dd5b023
-EBUILD qqc2-desktop-style-5.85.0.ebuild 687 BLAKE2B 2d5dbeafad6bccaf4047992c2ea85d6c638fe41f8e240794108dc0c784c12281a1b61215c0740ed1fda69375744b288be8e9cbb859ababe122542fb3d195d345 SHA512 02c49ab4b699f358c16c880b4df1df7841dc6e5393d1df24f90aa9e5ee03dec24c9f3128cef1aa88611647f5c82d2ea90787038da008ba7b1e08feb2fb406d77
+EBUILD qqc2-desktop-style-5.85.0.ebuild 687 BLAKE2B 9f2e7b6f5d5d70d048f66454570fbf0d8b9a7ddeffa62157c9aa259bf6cba8c45a9d4633d62a2e4c7effb20241c30085907bd245bf80b5813fa4f8eb6ce09d29 SHA512 b5504f0fbdac27678dedc4a500fffd74a6cda3f321a023c1b09d4b5f0bae8011f2955ba1457eabec4a6cc7736ca4854be428941ad03198260e2cfdb54a091ee5
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.85.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.85.0.ebuild
index 8ba03b802bac..1bd33428d23c 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.85.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.85.0.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="false"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 0addf11737dc..62c3a0000c70 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,5 @@
 DIST solid-5.82.0.tar.xz 274184 BLAKE2B 296535424310770f3c1acb82217906c5f9ca0885202c51a6bd65e5ed4230a5f93d698a112323801f2d44fbafa637407a5e7793eb36b230e83c77059cf8317305 SHA512 ae15081a07e46590eb36f6c642adcded7bb519010f6f8bce1f38e14e97900f029a1ae0bc61d64d8a2752479ae54a9d2188e51698e0b46ebddd15bab6941ae59a
 DIST solid-5.85.0.tar.xz 251032 BLAKE2B 31fb2c180506ee52955753c9fdae262d940d8e21b626ba9ef3e41b43cc0a26fcc901d7991a5e7f174eb218109cf992dcfc2f05c7bbe3d96b8144634ec8443c48 SHA512 e84148cdc76d8f0c075f5e064c4e7b5a886fb1beb6f343f9ab450cd17db8aa5094f839dd0fc383bc4ef1764e75f1444841bd802093343544cea99ab9668ac4c5
 EBUILD solid-5.82.0.ebuild 1038 BLAKE2B f7a79563a60771ce4500b61592f33ba93ba6d0dd674fc2b6dd3a00b652d135bfef91e6945179288a17ad6b4360ce6e503b334499523dcd1d68b0e88732b5b207 SHA512 7c2b0b7e7e90d38a49d7806aef5ada3875c704c5360f4e09e6a9702302260ed7a294f7d4daa93f337476dd5685a8337a8e96b35b854356159151d823ecb64fa2
-EBUILD solid-5.85.0.ebuild 1070 BLAKE2B ea4b813e1821929986164cc9e2ed6e8c27ba4f7a9d3de11ba5ee63cca94c5ec430b48705adbf584162da7650538c300a4f8db09ba8e064b68628465d24397d87 SHA512 213aa6dcb13d1c44b8c04dbbd195b3d698dbab2c5e0203ab45e756e29d07599554eed8fcbfbb3d36996102e14eeb06a855a3feac73b0d161440e67663b7656aa
+EBUILD solid-5.85.0.ebuild 1070 BLAKE2B d7ce403eb14867ef0739eeea302f6ca21698ed069fdcb70daa4d2916667c5ecec8f41391ba848303d95d07dd0f9d3abe860a7950038b22a6c79e066db37308ac SHA512 4169376cbab73770a794faf56d32bf8f7c989632726c308d105e8f6114647afbbd4925a1635634795d12978d18d9dd67d16d658e0d550455b7a05f7477c278dd
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/solid/solid-5.85.0.ebuild b/kde-frameworks/solid/solid-5.85.0.ebuild
index ee0d8d0d9790..522552e6a6eb 100644
--- a/kde-frameworks/solid/solid-5.85.0.ebuild
+++ b/kde-frameworks/solid/solid-5.85.0.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
 
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 7f81f7f30d37..ab85cff7c60a 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,5 @@
 DIST sonnet-5.82.0.tar.xz 293844 BLAKE2B 6e2c4558957d845a281955c63de7dd87fc21634a4cb3e89af47345da070b1dc15e91c558a865e0c7ac5e2adb2454d36b6b8f2f521112b4fd07ad1b2ad02f6c04 SHA512 3bc876b1e06ba5c08c05ce74530a2584b9853e8c9742f66b19529e7f78f3aad89d3a72e0a615e912d1cfd7a24b3de3a9068d0f72dce3c51ca03b896eeedde817
 DIST sonnet-5.85.0.tar.xz 297068 BLAKE2B 7f5bad0ebe851443dd2150be3784442008ffd7ad7acdacb42d0f3495490477a1f570a0aec6dd1b600ca01a5f9fa13c87f56cceb50c98cc2ab399ce85bc04c369 SHA512 50ed8787a8c7378574376ef0539b211eafb349f139fabe6d22788af91d57e758c994ddfdf72d83d76009570dbc8dd4bcb3df3add5c9dc17347b9263e09969930
 EBUILD sonnet-5.82.0.ebuild 961 BLAKE2B efc1e30526224c3d5e6e676a762b29dc4d8273b807f6247fc9e28f41ec74da9086b7f5afe13c82aa67773c6c59eadfdd1adcad979ec6b31d51412f34102685a3 SHA512 ecb9a097249ddb1dc9f9471f4785d06779f8e1cdb526bc97b5153c8eb735a9844cd21c6da0693b65f0784f29094b75d6b8d2585604fafa4304e0bcdefe026784
-EBUILD sonnet-5.85.0.ebuild 971 BLAKE2B a0e9abaf087325c5e04309393e9f64e0412d42ecaa98ca800a10ad378127ebd7f67fa857096ffd34af0dacb2cc729b0ee7136fe6fe506e5e092a455be55ea049 SHA512 284179e4d4927014e97d81aa491e295b36db8302bf758e99fbb84e8b2fc42ad6da8d13ad9fc1fb89da110cfbc687e734a11502ef58789758d1a4e411b2b58eec
+EBUILD sonnet-5.85.0.ebuild 971 BLAKE2B d898144e91a4da5293170b77fb00e8d80b180cf4b326bf3c406e4cad9354bc64ce6b2a4648d8cc759d62d35daabcef39370e0c1bfb5bfa491232347814371220 SHA512 fed8507e03184712f6a0672a7c612b2d35faab15a9990ba722148da97a6a49ba4fd78c7b59deaca0006572e945e736e35019892fd4fe8b32264ad7eb666211f7
 MISC metadata.xml 708 BLAKE2B 300e896c57dc245d17baecf3604331eb774a149eb792a5c6cd97fa67a405f750723d34b258389e1e94e8055ed70b561ca20a9df3d203a88283d3ab81d40027a0 SHA512 f03d94323e82a1edb709d96e89b2fef4994409832a7a9017cd1223c861051da9ef943cb18afabffe99a7ac113183be3080031b7fa2aa78ceb61649259a0bcbc4
diff --git a/kde-frameworks/sonnet/sonnet-5.85.0.ebuild b/kde-frameworks/sonnet/sonnet-5.85.0.ebuild
index 3f162b8847ce..dfbc16b70395 100644
--- a/kde-frameworks/sonnet/sonnet-5.85.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.85.0.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"
 QTMIN=5.15.2
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index 4b565c1fef08..77df05871931 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,5 +1,5 @@
 DIST syndication-5.82.0.tar.xz 508368 BLAKE2B 5bae3d80f818670cad1a08f3e085fff45116067f811b34390e4cb64c2f4aaf6c171abdc462e7075ce43b1208ad25cf15f088d8d06f3e922222cac94eb9108d80 SHA512 59e8f88138d6d18d7b4c4f2e5596606bdd13aa7425e55dadf24cf4a1592cda0c547b077d303dce514a0e20d5cca0740e6e6879ffda6470c0fa9302cd11eedbc0
 DIST syndication-5.85.0.tar.xz 508288 BLAKE2B c7c90e7a8735ec3cadf9e290644e87dbc1a18996150a779146a2a0bc4a8e838b0bade9d4f486901ddeaf4eaeae1a9f9c883e4ac589a53cb591f8faeef465a8d8 SHA512 d0f57e7fcd02efaaf69b90c921767c7f053e8dbe43c63963a56329e1fc9da46ee14980580f44e0015a49482ea2848887f1e92b4151973c5a60cbd7ccb4365f64
 EBUILD syndication-5.82.0.ebuild 437 BLAKE2B 9be19b82c675786aa597b095b712dc714068620d98a11fe82f535609b38f09e37abda0e97ea7dad1f18ea7357e93a3f380bb423d78668b45dab84874981adea6 SHA512 72ca5be7b60370d674604cc5de99855644eb0f914be70ae71063d166882a994efe504c6d2b41d77f92c9fea502842c50648545ddc72f5ba8681042a1c55a8d7a
-EBUILD syndication-5.85.0.ebuild 452 BLAKE2B b408be8ab1a653c3cb5a7e2b174fd51c036193f2166d0189a7d726ee7cc373f4b5fda659466947a7ddcee3a460512840d11d1c4125b98e97de2802b380f691c3 SHA512 ed48c2014086bae83ede0bf5e984f74cb9b48f8f68bf396c81a727d081c63563c521921c0aacaf44be998aa1978b912d97baae1a71af13218268d4b7fad9374b
+EBUILD syndication-5.85.0.ebuild 452 BLAKE2B 3427934acb082b9e46605d69a8edb15c0bb43f3831c4f2d8ea3d15ca0183ec5e79d23a94c14fc45ef4b310ebdf54af859ba1b540982d25b17b3d41803d094486 SHA512 930815db662f6660646731c1e91f5d7158027fa0f01d7984bc6080ec27507a8f0aa37a2d1c797577b1de9969aed783c2c4cc5f43cce461dc0f4f902614e704e6
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/syndication/syndication-5.85.0.ebuild b/kde-frameworks/syndication/syndication-5.85.0.ebuild
index f6df5d788fe2..c36c2a59b68b 100644
--- a/kde-frameworks/syndication/syndication-5.85.0.ebuild
+++ b/kde-frameworks/syndication/syndication-5.85.0.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"
 PVCUT=$(ver_cut 1-2)
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 579497d4a622..7216cf1a17ec 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,5 +1,6 @@
+AUX syntax-highlighting-5.85.0-python-add-yield-from-keyword.patch 11150 BLAKE2B ac67afb36241a591e9a773d359452f8c101df21a62d332e76617be455f962e944a18c7c1cf61c2b37ccba85a6079c509290e5dc7f2897173e6c7e46e20226571 SHA512 cf5472233c61033625e178dc19bfd5ffb2181b2ecdb969807feceb38645a74dcd04909b01d1410fa71b597654bcedf81c09626ef5973c7f909d03822183c3231
 DIST syntax-highlighting-5.82.0.tar.xz 2290880 BLAKE2B 14a98534b4e0ec85bd3bb3603c6330f665b5d2a3958f1b9034e48fdc542aca0c0eca80a1bc5c75179c480ffb40189dd94a847093e81ab4af91442a9e323f7d32 SHA512 4487fece4b144fcdc3b03bc0c11573dcdb0bb073218f25a98a7d08fe55db0fde027f32b5614fa5083097136310cae46d7d28288f7f874eaa2fbd930af2d9fb16
 DIST syntax-highlighting-5.85.0.tar.xz 2334784 BLAKE2B faaa2e57b4f5acc6b090e0ffebbeb70715dc164f634683b2d442017087aed630581ab5d91e04fd4591d28c3a6d7bbfff395a36af6ed3911de79a512c00fe1f3a SHA512 d01ef96ba4fc2c281918850adbc72239f60875a6c9f1c589286eaa4cb7a18be96e8b184f77e1a056ed17ece7d70338e4b6fd7cadf69a307e4a8bdc0ce6dc3d38
 EBUILD syntax-highlighting-5.82.0.ebuild 567 BLAKE2B 8695a7114da0e9cdd60c23cb683a081db1c7ea7de45c7d859632d9d1b7add893a84b2e83811da08d7fc8fbe559031c972b67c4591cace6dcc37d3c5d5abe6e97 SHA512 467147bcdede56f1e143414be3ab96dc5de9d624399a86613dd1e9bb6e9a4e8e5f34756f38c37a9aa18ecafe540229837fbf065075bcae13cff8cab0f52bb760
-EBUILD syntax-highlighting-5.85.0.ebuild 577 BLAKE2B 0a7236545a616ed78cd41733a55952981d1be2a3bc418e5ff127dfd28e859dba158c1bd1c20b0ed7a97e0413198dafb3101cecab0216a670b0704babfd24e0a1 SHA512 89aa5445ba5f4d736303577f299c766c5435d156b92065736f68b768472b495bd44d7e5e3aea0423f9ececfac4fac2085e46e22f89768b326b0a9cd856ade5a7
+EBUILD syntax-highlighting-5.85.0-r1.ebuild 663 BLAKE2B a81199cbf541b8a140b432419ac121a099087a588945f94f698c15d4b7df68b200068201cf9c0990342f09484c51da29ef8022af58de31b543d30ed0e559832b SHA512 c4e32b95678514ab15e52d52c8405565de2baacbcfad67a1798fd7497fbbc4f07bc5f39acc5769eeba2e2ac13f15e5ce91fc2e64fcc83edc34b47acee57ae893
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.85.0-python-add-yield-from-keyword.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.85.0-python-add-yield-from-keyword.patch
new file mode 100644
index 000000000000..ba1ae38355e8
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.85.0-python-add-yield-from-keyword.patch
@@ -0,0 +1,170 @@
+From 439f8cbfe0b5d1f931c2233d1790e1280170c24c Mon Sep 17 00:00:00 2001
+From: Jan Paul Batrina <jpmbatrina01@gmail.com>
+Date: Sat, 28 Aug 2021 21:27:41 +0800
+Subject: [PATCH] Python: Add "yield from" keyword
+
+BUG: 441540
+---
+ autotests/folding/test.py.fold   |  9 +++++++++
+ autotests/html/test.py.dark.html |  9 +++++++++
+ autotests/html/test.py.html      |  9 +++++++++
+ autotests/input/test.py          |  9 +++++++++
+ autotests/reference/test.py.ref  |  9 +++++++++
+ data/syntax/python.xml           | 17 +++++++++++++++--
+ 6 files changed, 60 insertions(+), 2 deletions(-)
+
+diff --git a/autotests/folding/test.py.fold b/autotests/folding/test.py.fold
+index 7bbf054c..5e7a3ba8 100644
+--- a/autotests/folding/test.py.fold
++++ b/autotests/folding/test.py.fold
+@@ -118,6 +118,15 @@ match<beginfold id='2'>(</beginfold id='2'>command.split<beginfold id='2'>(</beg
+     case <beginfold id='5'>[</beginfold id='5'>"quit"<endfold id='5'>]</endfold id='5'>:
+         print<beginfold id='2'>(</beginfold id='2'>"Goodbye!"<endfold id='2'>)</endfold id='2'>
+ 
++def func1<beginfold id='2'>(</beginfold id='2'><endfold id='2'>)</endfold id='2'>:
++    yield 1
++    yield  from <beginfold id='5'>[</beginfold id='5'>func<beginfold id='2'>(</beginfold id='2'><endfold id='2'>)</endfold id='2'>, 1, 2, "3"<endfold id='5'>]</endfold id='5'>
++    # invalid, "from" no longer part of "yield from"
++    yield, from 1
++
++async def func2<beginfold id='2'>(</beginfold id='2'><endfold id='2'>)</endfold id='2'>:
++    await asyncio.sleep<beginfold id='2'>(</beginfold id='2'>1<endfold id='2'>)</endfold id='2'>
++
+ "\\\\\\\\\\ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE <endfold id='6'>END</endfold id='6'> OF THE FILE\\\\\\\\\\ \
+ "
+ </indentfold>a = 'otherwise all succeeding lines will be
+diff --git a/autotests/html/test.py.dark.html b/autotests/html/test.py.dark.html
+index 23718b11..1d6c1dd2 100644
+--- a/autotests/html/test.py.dark.html
++++ b/autotests/html/test.py.dark.html
+@@ -124,6 +124,15 @@ match(command.split())
+     <span style="color:#fdbc4b;font-weight:bold;">case</span> [<span style="color:#f44f4f;">&quot;quit&quot;</span>]:
+         <span style="color:#7f8c8d;">print</span>(<span style="color:#f44f4f;">&quot;Goodbye!&quot;</span>)
+ 
++<span style="font-weight:bold;">def</span> func1():
++    <span style="color:#fdbc4b;font-weight:bold;">yield</span> <span style="color:#f67400;">1</span>
++    <span style="color:#fdbc4b;font-weight:bold;">yield</span>  <span style="color:#fdbc4b;font-weight:bold;">from</span> [func(), <span style="color:#f67400;">1</span>, <span style="color:#f67400;">2</span>, <span style="color:#f44f4f;">&quot;3&quot;</span>]
++    <span style="color:#7a7c7d;"># invalid, &quot;from&quot; no longer part of &quot;yield from&quot;</span>
++    <span style="color:#fdbc4b;font-weight:bold;">yield</span>, <span style="color:#27ae60;">from</span> <span style="color:#f67400;">1</span>
++
++<span style="color:#fdbc4b;font-weight:bold;">async</span> <span style="font-weight:bold;">def</span> func2():
++    <span style="color:#fdbc4b;font-weight:bold;">await</span> asyncio.sleep(<span style="color:#f67400;">1</span>)
++
+ <span style="color:#7a7c7d;">&quot;</span><span style="color:#3daee9;">\\\\\\\\\\</span><span style="color:#7a7c7d;">ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE </span><span style="color:#2980b9;background-color:#153042;">END</span><span style="color:#7a7c7d;"> OF THE FILE</span><span style="color:#3daee9;">\\\\\\\\\\</span><span style="color:#7a7c7d;"> </span><span style="color:#3daee9;">\</span>
+ <span style="color:#7a7c7d;">&quot;</span>
+ a <span style="color:#3f8058;">=</span> <span style="color:#f44f4f;">'otherwise all succeeding lines will be</span>
+diff --git a/autotests/html/test.py.html b/autotests/html/test.py.html
+index 55cfefb0..4d7a2709 100644
+--- a/autotests/html/test.py.html
++++ b/autotests/html/test.py.html
+@@ -124,6 +124,15 @@ match(command.split())
+     <span style="font-weight:bold;">case</span> [<span style="color:#bf0303;">&quot;quit&quot;</span>]:
+         <span style="color:#644a9b;font-weight:bold;">print</span>(<span style="color:#bf0303;">&quot;Goodbye!&quot;</span>)
+ 
++<span style="font-weight:bold;">def</span> func1():
++    <span style="font-weight:bold;">yield</span> <span style="color:#b08000;">1</span>
++    <span style="font-weight:bold;">yield</span>  <span style="font-weight:bold;">from</span> [func(), <span style="color:#b08000;">1</span>, <span style="color:#b08000;">2</span>, <span style="color:#bf0303;">&quot;3&quot;</span>]
++    <span style="color:#898887;"># invalid, &quot;from&quot; no longer part of &quot;yield from&quot;</span>
++    <span style="font-weight:bold;">yield</span>, <span style="color:#ff5500;">from</span> <span style="color:#b08000;">1</span>
++
++<span style="font-weight:bold;">async</span> <span style="font-weight:bold;">def</span> func2():
++    <span style="font-weight:bold;">await</span> asyncio.sleep(<span style="color:#b08000;">1</span>)
++
+ <span style="color:#898887;">&quot;</span><span style="color:#924c9d;">\\\\\\\\\\</span><span style="color:#898887;">ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE </span><span style="color:#0057ae;background-color:#e0e9f8;">END</span><span style="color:#898887;"> OF THE FILE</span><span style="color:#924c9d;">\\\\\\\\\\</span><span style="color:#898887;"> </span><span style="color:#924c9d;">\</span>
+ <span style="color:#898887;">&quot;</span>
+ a <span style="color:#ca60ca;">=</span> <span style="color:#bf0303;">'otherwise all succeeding lines will be</span>
+diff --git a/autotests/input/test.py b/autotests/input/test.py
+index 3eb8378d..d91db578 100644
+--- a/autotests/input/test.py
++++ b/autotests/input/test.py
+@@ -118,6 +118,15 @@ match(command.split()):
+     case ["quit"]:
+         print("Goodbye!")
+ 
++def func1():
++    yield 1
++    yield  from [func(), 1, 2, "3"]
++    # invalid, "from" no longer part of "yield from"
++    yield, from 1
++
++async def func2():
++    await asyncio.sleep(1)
++
+ "\\\\\\\\\\ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE END OF THE FILE\\\\\\\\\\ \
+ "
+ a = 'otherwise all succeeding lines will be
+diff --git a/autotests/reference/test.py.ref b/autotests/reference/test.py.ref
+index 9c5bdb54..1742da2b 100644
+--- a/autotests/reference/test.py.ref
++++ b/autotests/reference/test.py.ref
+@@ -118,6 +118,15 @@
+ <Normal Text>    </Normal Text><Flow Control Keyword>case</Flow Control Keyword><Normal Text> [</Normal Text><String>"quit"</String><Normal Text>]:</Normal Text><br/>
+ <Normal Text>        </Normal Text><Builtin Function>print</Builtin Function><Normal Text>(</Normal Text><String>"Goodbye!"</String><Normal Text>)</Normal Text><br/>
+ <Normal Text></Normal Text><br/>
++<Definition Keyword>def</Definition Keyword><Normal Text> func1():</Normal Text><br/>
++<Normal Text>    </Normal Text><Flow Control Keyword>yield</Flow Control Keyword><Normal Text> </Normal Text><Int>1</Int><br/>
++<Normal Text>    </Normal Text><Flow Control Keyword>yield</Flow Control Keyword><Normal Text>  </Normal Text><Flow Control Keyword>from</Flow Control Keyword><Normal Text> [func(), </Normal Text><Int>1</Int><Normal Text>, </Normal Text><Int>2</Int><Normal Text>, </Normal Text><String>"3"</String><Normal Text>]</Normal Text><br/>
++<Normal Text>    </Normal Text><Comment># invalid, "from" no longer part of "yield from"</Comment><br/>
++<Normal Text>    </Normal Text><Flow Control Keyword>yield</Flow Control Keyword><Normal Text>, </Normal Text><Import>from</Import><Normal Text> </Normal Text><Int>1</Int><br/>
++<Normal Text></Normal Text><br/>
++<Flow Control Keyword>async</Flow Control Keyword><Normal Text> </Normal Text><Definition Keyword>def</Definition Keyword><Normal Text> func2():</Normal Text><br/>
++<Normal Text>    </Normal Text><Flow Control Keyword>await</Flow Control Keyword><Normal Text> asyncio.sleep(</Normal Text><Int>1</Int><Normal Text>)</Normal Text><br/>
++<Normal Text></Normal Text><br/>
+ <Comment>"</Comment><String Char>\\\\\\\\\\</String Char><Comment>ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE </Comment><Region Marker>END</Region Marker><Comment> OF THE FILE</Comment><String Char>\\\\\\\\\\</String Char><Comment> </Comment><String Char>\</String Char><br/>
+ <Comment>"</Comment><br/>
+ <Normal Text>a </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><String>'otherwise all succeeding lines will be</String><br/>
+diff --git a/data/syntax/python.xml b/data/syntax/python.xml
+index 7143bf30..676872f0 100644
+--- a/data/syntax/python.xml
++++ b/data/syntax/python.xml
+@@ -52,7 +52,7 @@
+ <!-- v2.07 add support for %prog and co, see bug 142832 -->
+ <!-- v2.08 add missing overloaders, new Python 3 statements, builtins, and keywords -->
+ <!-- v2.29 recognize escape sequenzes correctly -->
+-<language name="Python" version="21" style="python" indenter="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript;*.FCMacro" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license="">
++<language name="Python" version="22" style="python" indenter="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript;*.FCMacro" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license="">
+ 	<highlighting>
+ 		<list name="import">
+ 			<item>import</item>
+@@ -90,10 +90,17 @@
+ 			<item>try</item>
+ 			<item>while</item>
+ 			<item>with</item>
+-			<item>yield</item>
+ 			<item>async</item>
+ 			<item>await</item>
+ 		</list>
++		<list name="flow_yield">
++			<item>yield</item>
++			<!--
++				"yield from" added here as a keyword for autocompletion. The actual handling
++				is in context="yield" so that we won't need to add space as a weakDeliminator.
++			-->
++			<item>yield from</item>
++		</list>
+ 		<list name="patternmatching">
+ 			<item>match</item>
+ 			<item>case</item>
+@@ -380,6 +387,7 @@
+ 				<keyword attribute="Definition Keyword" String="defs" context="#stay"/>
+ 				<keyword attribute="Operator Keyword" String="operators" context="#stay"/>
+ 				<keyword attribute="Flow Control Keyword" String="flow" context="#stay"/>
++				<keyword attribute="Flow Control Keyword" String="flow_yield" context="yield"/>
+ 				<keyword attribute="Flow Control Keyword" String="patternmatching" context="Pattern Matching" lookAhead="1" firstNonSpace="1"/>
+ 				<keyword attribute="Builtin Function" String="builtinfuncs" context="#stay"/>
+ 				<keyword attribute="Special Variable" String="specialvars" context="#stay"/>
+@@ -428,6 +436,11 @@
+ 				<RegExpr attribute="Error" String="[\w\d]+" context="#pop#pop"/>
+ 			</context>
+ 
++			<context name="yield" attribute="Flow Control Keyword" lineEndContext="#pop" fallthrough="1" fallthroughContext="#pop">
++				<DetectSpaces attribute="Normal Text" context="#stay"/>
++				<WordDetect attribute="Flow Control Keyword" context="#pop" String="from"/>
++			</context>
++
+ 			<context name="Pattern Matching" attribute="Flow Control Keyword" lineEndContext="#pop">
+ 				<!--
+ 					Python 3.10: https://docs.python.org/3.10/reference/compound_stmts.html#the-match-statement
+-- 
+GitLab
+
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0-r1.ebuild
index 2118f82f77db..0b22fba7fa4e 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0-r1.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"
 QTMIN=5.15.2
@@ -23,6 +23,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-python-add-yield-from-keyword.patch # KDE-bug 441540
+)
+
 src_install() {
 	ecm_src_install
 	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index d74b1dddb8c4..6cfe5d5c7cd2 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,5 +1,5 @@
 DIST threadweaver-5.82.0.tar.xz 1410496 BLAKE2B 2723b05277c1f8baa35ca0b759d21c75016a93912eb99600002cc4d5c816971fbefa41330fb1d2861d9d1a71ea9e4b8c5e938f87c5f61f450b93a18dd365b2b0 SHA512 11814680c7209ac29751e4b1411ea2d177e71306e06a9f01635f579147efa75641d6d3dfe84c0c52950069b415edb67965fc899427d69e896028510676af0e6c
 DIST threadweaver-5.85.0.tar.xz 1410060 BLAKE2B 06c388dc224926482092903159d168348da2289808157517529c9180dad5bc8782dd5d171bbe28645fe6aadd59aadf7c14802a4ce6a7eba37634c4507ce25859 SHA512 4c2de589f9648dc56a05789349dcd45a5e7a75fd5804e82f9e4f418330404e66028450f3c713f184ebec1c8c53d46df7f3d4264f3f3284acad3e4dc7812ed199
 EBUILD threadweaver-5.82.0.ebuild 360 BLAKE2B 0387409754b4cd356f90a0b62c535c0a26fffa5e61498896be5f34970b57d78a61446840a3d86a755d8b3bfd8fa0a77b2eefefbd8f84fce0b9caef198bb51d66 SHA512 bcb46d5f683f5434d0b3bdf5433efaf01b644c29a6074f0fb4887d1120e0ce4a62eb3e1129d4cd5e0ff14590fcf33446b080ed3b94e0a4f0552efeb2ebc593d2
-EBUILD threadweaver-5.85.0.ebuild 370 BLAKE2B 6e22d1c41428aa82cabffbe748f1129d89ad974f8c8b01d9ca70a51f0ab275f137b741d2ae0f7e2aeb482155746bd028c3ba0d963512903ba46c1091e93e8151 SHA512 19df4757bde9faacdbbc2f0a897752048eba50c2cfcba1e4ec831df2f6a18340748a399c76828249abe7f6953e14279044855d96dee3a831540089d48398efd6
+EBUILD threadweaver-5.85.0.ebuild 370 BLAKE2B 4b1cd2470f58a3243979fb62e5d26ff5aa28b3591b06790bcfbadac2a187a3958e475505b55bf2cba28e8e8fb35371107a0df1a062a7f3302173f36fed6c67e1 SHA512 fba9c8f4a03b5460dcb7e196934691debb31f098801dbe1e4f69ebb38a1dc701b4f0303bc4b2ef64e27e9ccf0bb980aeffb88d0a1c44ff6c82b85bd2b01f965b
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/threadweaver/threadweaver-5.85.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.85.0.ebuild
index 39ccb217d1a2..5b5690a5e3b7 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.85.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.85.0.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
 
 inherit ecm kde.org
author	V3n3RiX <venerix@redcorelinux.org>	2021-09-10 04:21:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-09-10 04:21:55 +0100
commit	677b7ba5c317778df2ad7e70df94b9b7eec4adbc (patch)
tree	6c418a1546fff5becab5d8b9ed6803323e7f316e /kde-frameworks
parent	fbda87924e6faa7a1919f1a2b4182490bde5ec5c (diff)