gentoo resync : 05.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
commit: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree: c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /kde-apps
parent: e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
709 files changed, 2077 insertions, 5610 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 4f8701bb09ab..eec564cbc493 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index c8c387760314..fadaa084e9ee 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-calendar-21.04.3.tar.xz 353884 BLAKE2B be9dca3e2e4920d1e3fe253dfe986035618cd5d0a28150b757044a5e336549a3c8283142ebda3b4d4688a5a27bc7d14b871ddbb9170f65c47aa330ac704424f1 SHA512 220f5ef5d403d3b1f59faf7f57bbd33670e9bd909896ac786618563c8fc67856727f4587039b1666f1f5b1d4bbce93357d474e865b29ac629b21fb59f023801c
 DIST akonadi-calendar-21.08.3.tar.xz 352800 BLAKE2B 00a44feb32622d6cb4c14157451fb891ea4a4115ac4809ae59a2ad0b26c021cc0b910d285663794afcd3a92d61304666a68e8cf40e8899d003e0b8d6e2901d87 SHA512 80578a9761b1fcff2c6f4c0065a7788ca1b9fc8cf3864c65780ca9777df31cf4c69e607829da3106d108686d505beee6341f4622da7f069a41f2a425dcecc2aa
-EBUILD akonadi-calendar-21.04.3.ebuild 1192 BLAKE2B 0b7fd4fcfbb5f29f2328a63f5ae60b02e5b40cba7c3c8ca747b6d4dde14edf5d0909eabec4c24da2ee1662ff32bf708586f16fb82e9d94d56931ec506e791a6d SHA512 76cc55f624ab11e2612ae1f2654138dc71ef4a6d53647afefbc569c1f0ffcb40a6abccd00a1bb5b6ad508fc2e0222855cd1285b126fa89e6ff2bca25a195fc3c
-EBUILD akonadi-calendar-21.08.3.ebuild 1193 BLAKE2B 82390a3c5709fed1e65707464c2aefd0050a290e80513fcdea1decd33ec5e67625cf03611d122aafe82c73ec562bb0655b4149a375f7cfaec8e866e1f3f51529 SHA512 dc19e4f50d348c17567f8e60b363acea72fc482c9e268ade026340cbf9cac0c8e5cb1f39fa59368dd8dbb1724755ed64a0a68c404b9189d915fcebf06884ce1d
+EBUILD akonadi-calendar-21.08.3.ebuild 1271 BLAKE2B d0cb1dd30dfcaab6671d6b24a4a2f031fe6952981bb96038ec9eb871d0bde53abc79d6d1c313fcc0d44c6ece2e702c92b4d91305186519a84fad751614161a98 SHA512 eb146cc9a7a32b673a73fd9930cb8b21c5cd54c1d057746f98e911a2e07f9d17f355f9edb080463ec4c7274a502a33590aa0d90f57063cc16d70618c6e824e71
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-21.04.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-21.04.3.ebuild
deleted file mode 100644
index 121277a76a91..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-21.04.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi calendar integration"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-21.08.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-21.08.3.ebuild
index 7d80d7a03db0..799852719c16 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-21.08.3.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-21.08.3.ebuild
@@ -13,9 +13,11 @@ DESCRIPTION="Library for akonadi calendar integration"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
+RESTRICT="test"
+
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -42,4 +44,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT="test"
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 8c69daadb924..5d44d8377181 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-contacts-21.04.3.tar.xz 424004 BLAKE2B 2eb168269c287e15cdd6f8c85669eb7f689b183d058b55330fe96f1b5595d7084eb2712ba61b0401515eb49a00c268c7308dca6aaaf5469a5a55c5597c293de1 SHA512 11e9d2122fbd8c870bddae42b63f00a16b755c8aabb0f5f88066179d99b721bbbed93dceb9242a36e6aa222a2eee13bbd88235eedf0899c2d2a85aacf0c00ea2
 DIST akonadi-contacts-21.08.3.tar.xz 420936 BLAKE2B 496d942d0ecc010b354fcfbb334aea8366a2d567e553a7d0789964554f0c81855772030b1c8369e65580da015910a75b1f087db38cd5511a7b6c99dae46a8e01 SHA512 e2d7f73ceb5f6f0580b4e80a1497d388951cee1ac94b4e188eaec3cff9ae3fd7635de29aa27171ac78a0ff6c25b308010cc6a6a45afb9fe43f7baec7034aba2e
-EBUILD akonadi-contacts-21.04.3.ebuild 1248 BLAKE2B f5719c30bccd6fb5a8991f1f79da26572501c978dd459e04416a1c7555e5c7fb0f2eab4b89d4d5d92dfb3e6ce7a57b8a6a0ab1699495736251611a517548b55d SHA512 fe86cda1c4d885e41c3a9599f73b7def44373fe1b2c53ecd07fcb4924ee339cef58e7f6040bb6a56e3e5c2ffa7b784217d49c345a366b95f5fc0add1e9ff7cef
-EBUILD akonadi-contacts-21.08.3.ebuild 1289 BLAKE2B d05f25f1aa67f99c5bc97cd9337c02a212655857b0c50d5ffb2ca31c6480323910735ce6f7707693d2dab4b1d2ccec92f94c7c30e6a837fad79529d4cbdd4cfc SHA512 7a26d324c047d41e8cfce9968d7e2544ef2f716a0ef7745d3cfb4dcd82318b3b12522f05ecadd98d834c009659b11646222f336d40ac91dd5908fdcc5a43ecd2
+EBUILD akonadi-contacts-21.08.3.ebuild 1293 BLAKE2B d132d91dfaca067fa3b6d02680506c217735d96413e60b0852598d82f306c5f848488544cd976bdc233221d8e3438f2bc8291714cf9bf1e75c9ce480d6866b7e SHA512 cb9eca82b4419a844f68ff2e84fc5100a8a49af15db3bc5e935228adfe504e5a1ea73b278b73a9041c1f0b471f37d48cf1822e080c67d9b29dc691abc4050003
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-21.04.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-21.04.3.ebuild
deleted file mode 100644
index 25af0a9d5bcb..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-21.04.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi contact integration"
-
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-libs/grantlee-5.2.0:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-21.08.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-21.08.3.ebuild
index 930051d38b23..a4b99a4aee4c 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-21.08.3.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-21.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for akonadi contact integration"
 
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index de2573e7dd06..6db6b017defb 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-import-wizard-21.04.3.tar.xz 512432 BLAKE2B 106d257fa4b8de5e77bb3587897b233d85d251394a583daadfa63d68d06b0aa3abe8b87bdc0105c09a45d269158830b6e9a26a93d61dd4025aea1245996d7a5e SHA512 9ce6034d96dffd6cc37b80419faf5eea5687ca768193210c5d13ae1d3acae2336c6cea9fb81489a799f79c9c38f2a4d335769f78bad20252ce75bbb8b6bdc749
 DIST akonadi-import-wizard-21.08.3.tar.xz 511128 BLAKE2B 460ee2844e8ec506de6d9de32291f306cf9dc7d951b9f13eadf0f9ae59739c7058119ce6fee0b6ef9af9a462bf3c5cda5b6ee6d6e2d8df08772973c2040d191a SHA512 f56b7e6b8b5689a0ce77e0db82c52f14430a8792b496183b28ec1ccf59ae3616c5decb82ef57335b16fbe6934e8a2ddc6600f713ef623ef45be93622bef9e3c3
-EBUILD akonadi-import-wizard-21.04.3.ebuild 1218 BLAKE2B 4b257ff75bc2ca778a0406aa308138b33e3b92c52b960b490a5c139597ca067aa8cd6b2b6d9ce763fa691662bc14e6bc4fbda87c31da797c29c2d83ecb42fa58 SHA512 3db76b4bf0e618210faeb8d13acd49b166ea643f813f9ffc9c8a5af825c8771ed712c41acc39675fd37f3f3a1b9dd3e1da9943503be739ead374c4e984c605fd
-EBUILD akonadi-import-wizard-21.08.3.ebuild 1221 BLAKE2B e0f16ea40e91b81e0e964232b9b87159ee22866fd742fee71810d7278e350ffcfaa2385fddb36b70ea08d14b8d4ae0fc8530e1b03479400e7fb57b715b6a996f SHA512 56eec3a6e132b2cd98807eb1a2adeb61e35fa37106623d6b8a814a8046d9f5b902e4129013a67620767a6dbc4cd51273507e35f4b1819c7f5d69f550792b9c4a
+EBUILD akonadi-import-wizard-21.08.3.ebuild 1218 BLAKE2B ba9a27e9f64fcf28c7c00bc70aa2e2cc5a7a512d5ce2dacff906f45f0bd3cdcb3dd81068bc3fb7c4e9d213d606713e9126ae6ebb519cc7d065b243bc726aaeb8 SHA512 69480cdcc68230576fa04ac8d50fae265998d52277e3152854368393f257cb8d88e1186e3d8498208629f6092677383ca98d0a92de8adf9b640ef1cb7e74062a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.04.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.04.3.ebuild
deleted file mode 100644
index c7a6ccc394ce..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.04.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.08.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.08.3.ebuild
index c240d4129a60..681fc11054a5 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.08.3.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index bb8944e5ef57..30fc5ab58030 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-mime-21.04.3.tar.xz 142216 BLAKE2B 34cee8faa5f32fd0fefabca22de88117a3db9ad625d4abc64f55ede8762ffde982f15e95c4f20702122731d86bc1057c80cfc172591607fdc54d86e2207c3754 SHA512 c665a2b64275798b4732aec651cab1395feb8cfa8c961498065cfe55aa1c937c3fd47912439fbd150cb902c12ca5023dfcf43018b8a394280b50716b5d735a8b
 DIST akonadi-mime-21.08.3.tar.xz 141232 BLAKE2B 2317db1da991671403f54f9f020bbd45f57ce1f8759910ab8464939f35ebc999fd762df3cdd3a647b42f901d0033c27727db551bebf4aaf485080b1a9acbd70c SHA512 33ea68e454b0ed1c3b93c7da700454f3ddabf255a88c1d4d7933bc4c430e2b82e6b36861c4f676a527d373b2d57d39b0ef8511e224591ec2f00073be84dc37f9
-EBUILD akonadi-mime-21.04.3.ebuild 884 BLAKE2B 17f549e4fe2f60030c80fa38ee64af28b16a52575fde6f099b2eca538d4d0bb63f95cbc802497ee19b56d9b15aab75b557e046df9e6c57958fbc0965f46cf559 SHA512 42799b0857e08f8b0ac9b56621860c8318388a1529da7a4b334cb55f5b3d60ecb914baf17aff8fee2c0d3aa584ee1c4a4027b8c5df18951e0ea16f0d0dea4d74
-EBUILD akonadi-mime-21.08.3.ebuild 885 BLAKE2B e1ef9863449481499dc794abd579e570c81216b8963675169f5f817a2a68a9a03cbfbaae1c954a8ef67fbf81ba83a6cb93d06aac049b661d8d96bf0edea1d6e3 SHA512 f7c5a15fbac33e8992a276038b483e109daffda9b88c1287bcd4b61e697fd5a866014c653eec31d99ee02515b8fd879f5392c8aa881375f9d6baa2a1af187727
+EBUILD akonadi-mime-21.08.3.ebuild 889 BLAKE2B 62b1b994454475c5ff4c46f386a0bf3ffeb7e15d1b56dba0eb3dc5cd96d678d3b0c26ce57fec70f4018a7349d69ae6a6109a51260f30e5aabf8fca88f0261e65 SHA512 9c9b64e47904f1ba156df12e1c881aa2c2abf39d5e07de3ea9aa2c931142d16a0c80170e06fbb022cefe2a243e84e8795842768ef9d8af8b23ad3a38d58de094
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-mime/akonadi-mime-21.04.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-21.04.3.ebuild
deleted file mode 100644
index d05300f039aa..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-21.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi mime types"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-21.08.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-21.08.3.ebuild
index c037b267386a..ff806aec4083 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-21.08.3.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-21.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi mime types"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index ee6c7201a8d9..54213f6aa2dc 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-notes-21.04.3.tar.xz 26976 BLAKE2B 9bf5ce4d5373b0f1250cfe31ff10ea19db8dd25794ca68957816d9f826a0b1be3f44fd89898b9c347de5da4b07210e949b1203498c35574fabb759a7e5ef22c8 SHA512 2432077d1336a432cc77b553c9e1b0446a2d99a31f588ea865c3a242419dccf9a3a23086ee5ecb91380a8d55aeb9041f6428c903f06bc472e9997a7310abd82c
 DIST akonadi-notes-21.08.3.tar.xz 26428 BLAKE2B 71e93cb62cbeb7a90b186eb3c9b0fb926ec626b52f4343964a0ca058ca3de3a6cc062e85152690eefc5b5ea7e3994fef837fbcc869d07c841f83c407c426c52c SHA512 ec5944e5cd097a342aa342314c395eb4de787e06a633f6cd2af47f63a28ecf51ceed483a955ff020b5848458969c8e48611f1220d81760221ad112762b787915
-EBUILD akonadi-notes-21.04.3.ebuild 468 BLAKE2B 2afcf542bbd71b3235daa5d544a8eb621e24f03b4d6fbb1884a8724594bad13a106e32905d198672d3457ccabe3dc3f57829ea3f172fdf506ad30eb4a8eb9840 SHA512 3342c3de4ea09191a0ada6bf3c781fb974da1704613defb35c1f812d384c89811a97bf49d10f44e9e4460f63605a6119078001c183111e231965024317e47e16
-EBUILD akonadi-notes-21.08.3.ebuild 471 BLAKE2B b90535bdc3b0172706e249aa09aa00411e6bac6a9a833f4b5e482dfe59e7b035d2dd609d88df5ac8fe8b012facc3fc13bc7f29ab28f4ac625c1c50e8fbeded0c SHA512 dbbdcb0d47245a134aea52b962522f3148a1b4947733ff70b187fb597e84c6e3f8085182b77cab9b9f093f7632d41ee23d75e3b4995a061981c13aa1a6759721
+EBUILD akonadi-notes-21.08.3.ebuild 475 BLAKE2B 30a9ef0eb62497a8b279ee2205f4a95e9201e54ace374160345c7e9676fc1ef1ea7e630f0a9bd35f2715f602da18e2c5d3e1a9adbc5b256d88a333e1ca150a4b SHA512 c000c6575ff82eea5793bd94d5bde282d6c7578024eaba4282578a8b1eaa5c1916499d815f18f3d825cdda364f2fb7631b8b74aa867a2e1e77fb1f53827893bc
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-notes/akonadi-notes-21.04.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-21.04.3.ebuild
deleted file mode 100644
index ee94ac7bdf8b..000000000000
--- a/kde-apps/akonadi-notes/akonadi-notes-21.04.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi notes integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-21.08.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-21.08.3.ebuild
index ce43d03c06b6..b460b1106936 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-21.08.3.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-21.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi notes integration"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index a10bcee6ed67..d247e389dee7 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-search-21.04.3.tar.xz 98676 BLAKE2B 7d42c5e1a4c141ced81cc0ac7f3f8b941d6f7f03b358eb3e027eab12ddb65825d335a2e59ea5c956e6c8a4276e14cd90cb616e3a523ce4d708615da39d3df104 SHA512 cfeb929b4716a2a96e284dfec31688ec80b264a422cb2713fa20a8266452351f8d094f0dfd08c8687115c4862481901e183258e269a5ef2421a3736f89a677de
 DIST akonadi-search-21.08.3.tar.xz 97344 BLAKE2B 92c64d7896142a145119cc3ee4ab5069a99219300898696583b9d87a130902ecf32a072bf2cdf65f5cff4ecb1a8d57af30cf0dae2bfb4053633841460360bc88 SHA512 749f857b96223ddfc1906de546d9c5feb065afce4545d1410a8cb6260bd8f6c7d2b165082e77685c683081bd5223ea0dc7b902edf6b84956afd66164806a5da4
-EBUILD akonadi-search-21.04.3.ebuild 1301 BLAKE2B 98d26957e388e8b9510c2171b7d3e48b384f104e4afb366d55b0480a153f2c44ed0802573032d4e0a56b5a50bbed806c5c6c9de43f74435a3f75cc188c00cc0b SHA512 2428b6a3a52884a9c815aa2a8a105dfa0989a2a2a6605d196e5011e958db999eaf990bfdd40a3df32ceb216624e5a1ee687f6e43e0e9b89331b4aeb6eaac96f9
-EBUILD akonadi-search-21.08.3.ebuild 1302 BLAKE2B 913f5d6eaea8e0510141af8a2860a0a5d120925ce203888e0f1971cd01a07ff786ec8b0f1a958a07e441c1d0437e958039d2f8f3e5ed8c5bff428dbef3042725 SHA512 9029c143f13b3b9d7dac400b9b876b36b3ce6f362792f04543cbbfb11b1e37f57220fea3d347bcd9ec059cce300350d71aa8d006cd945c92e2967874972513b5
+EBUILD akonadi-search-21.08.3.ebuild 1306 BLAKE2B a28e65f0d4f46d13ccf7bfb52c0be01529b64511f7df299909a8da1583132516beb22592d7adf06613fa232037431a2709bb2aaccd67995a5b5b77328ce75aa7 SHA512 b9fd3b8a9fa9601ce1dcf157544ef9bf67f93ac1c471cf42429483e67eacbaf08b0bcc76d8c41f38a47438c34948ece84b22eb2609005c84d18e4d2de87b60e6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-search/akonadi-search-21.04.3.ebuild b/kde-apps/akonadi-search/akonadi-search-21.04.3.ebuild
deleted file mode 100644
index c0feb8aec266..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-21.04.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://invent.kde.org/pim/akonadi-search"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RESTRICT+=" test" # perpetually broken, bug 662378
-
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-RDEPEND="
-	>=dev-libs/xapian-1.3:=[chert(+)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
-"
diff --git a/kde-apps/akonadi-search/akonadi-search-21.08.3.ebuild b/kde-apps/akonadi-search/akonadi-search-21.08.3.ebuild
index 87f54707e06c..d82d2654f252 100644
--- a/kde-apps/akonadi-search/akonadi-search-21.08.3.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/pim/akonadi-search"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test" # perpetually broken, bug 662378
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 49a2ec1a5df6..9518c8638c85 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,7 +1,5 @@
 AUX README.gentoo 1607 BLAKE2B c5f6ae8c403ff0306e7c83f54d7b0bea5ae273e090d9ba1cb1c13ded4c292d7194433998a2d02ec7ccadc0f27bf12b6b64539338effcd49e242edd24a4230e58 SHA512 e4480205a76d2a5acb7882984de7de27322a816cccd1ef40886be2f90e551806d93ede5968c40a72a9e3b3dbf13cc58384dbbeb50224f74be198a861c5eb1dec
 AUX akonadi-21.03.80-mysql56-crash.patch 2534 BLAKE2B bc36e6a80f6f93695e35fc19edf9d8a1139508b9fe3cd1f81a1e6a1ca7723def4ed81fb9bdc75822b00835ad65333bb1dc44a552d33f09bfd331a4ddb8e23d13 SHA512 acb0432f98a96d5af609d43dc5aa25d3d5d0668c9493c62b2339add0f3ef78d54449137884eafc0201b9f0f4de4543a584ef6cd746cd3634d1a84169cd0e4219
-DIST akonadi-21.04.3.tar.xz 1610436 BLAKE2B 28bd02fd19c88c20dace16df8e738a35c7f02b45a216fc93589c1772f9862f175ea86f734bd28dd22c3261c3a8a09f45f194b2e925a3ed2745f402c891b39e5c SHA512 4da83167904ba21305963ba204fd23e42d7a9ae8bb7c1538dc694cccdeeb2bfd4f76bb558e8033d8b100800755308d6e8d6f5bbccd8a4cc5eab6f85484244044
 DIST akonadi-21.08.3.tar.xz 1607984 BLAKE2B 676881d442e196ca385c3203110ac7c9bc4ff5529550e5ffb68ff085cda7b03d01a4aadace33ebddf280dcece8830dd21baad596fbaf6c18268f9c151ac7636d SHA512 6305d8574e2be4e9b95b08e7990682eb32298e2dc89bf4d2372b5842e2880d69e95d598f34104e6207c985a0170ce92f23a8bf9c5c0e82c4ae0d85dc6bbfcaa4
-EBUILD akonadi-21.04.3.ebuild 3445 BLAKE2B ed1f409fa9071cae93c60bb87c19080b9f7e99dc38a39d725d7b47d6ae730a553cca682670330aaa7b3b6e4aa16e09b3395e949051f0f77342d54355f4f40c89 SHA512 12c591753e9168abff23bab19bab947f155e39d4707a248b83fa53f59e7c82f2973d98ff60b1b12c78fd57045f41aaeada5545ee968af7c73d64bc51739687de
-EBUILD akonadi-21.08.3.ebuild 3453 BLAKE2B 5704bd49a5cd49b2291fca2cc46d02d06b260b071e6379de61642e6fd100fc826785f532bb35bcdb82f71ecb65ef30652a70a4fe958b1e27082604858650ee63 SHA512 a7872da820810dfb26fb011c4f673d0f9b1fd51158fca190b68a398ba3565fe888a2c9a82cf0fa836de19f5e2765771bc7c3e4db25c663188f4d2b0dbe594ce2
+EBUILD akonadi-21.08.3.ebuild 3450 BLAKE2B 5e094bf7db1530d67527e56c18c5a6db96ad648285c93092ad799c0f71ee12d693c492cd1005484bb651c452f6298374cb31e3fa60304e70219eaba91bfd2ef0 SHA512 d22e4d3c8f01cc5ada38a9b215b7965686b93ef10c911f83f9439c697d101452d349dcd51c1c6a88ffcb003f53959450a495ac08b51c172df2cd00431d833f8c
 MISC metadata.xml 560 BLAKE2B d9e5a78a01139f88ec170123145375cb66824e6a0be029af75e95dee4ea69d8f2ffc6044951b50f32ef0c6bd905ceaca34022107a624b6b7830aad09e1369aff SHA512 e93981baa6ea40338301da4565134e52668c2f03f0f8f25edf98fed3d586759c423282953930004402a4adf5476ba2235aa4b66065674d450cfa32a17e713808
diff --git a/kde-apps/akonadi/akonadi-21.04.3.ebuild b/kde-apps/akonadi/akonadi-21.04.3.ebuild
deleted file mode 100644
index 405e88f45ad9..000000000000
--- a/kde-apps/akonadi/akonadi-21.04.3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org readme.gentoo-r1
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+kaccounts +mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	app-arch/xz-utils
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	kaccounts? (
-		>=kde-apps/kaccounts-integration-20.08.3:5
-		net-libs/accounts-qt
-	)
-	sqlite? (
-		dev-db/sqlite:3
-		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
-	)
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-21.03.80-mysql56-crash.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	# reverse driver check to keep the order
-	use sqlite && DRIVER="QSQLITE3"
-	use postgres && DRIVER="QPSQL"
-	use mysql && DRIVER="QMYSQL"
-
-	if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version "dev-db/mariadb"; then
-		ewarn
-		ewarn "Attention: Make sure to read README.gentoo after install."
-		ewarn
-	fi
-
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to"
-		ewarn "either MariaDB/MySQL or PostgreSQL in your user configuration."
-		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
-	fi
-
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake_use_find_package xml LibXml2)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	ecm_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are:"
-	use mysql && elog "  QMYSQL"
-	use postgres && elog "  QPSQL"
-	use sqlite && elog "  QSQLITE3"
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	use mysql && elog
-	use mysql && FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
-}
diff --git a/kde-apps/akonadi/akonadi-21.08.3.ebuild b/kde-apps/akonadi/akonadi-21.08.3.ebuild
index aec1c3a750c3..dbf89bd42cdb 100644
--- a/kde-apps/akonadi/akonadi-21.08.3.ebuild
+++ b/kde-apps/akonadi/akonadi-21.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+kaccounts +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index f338ccdd5b4a..f7655dc274f5 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,3 @@
-DIST akonadiconsole-21.04.3.tar.xz 201740 BLAKE2B 89964b6592a155b80357299842aed95e7c1bc371734b408811f1345381e360a3c278f46f42806306182ad2becd8007962c54de5a928847744ddf82bb57c52d47 SHA512 d2a1daf6feba0154dedbdfebdfb1a5744e523a44d35ca38f46567c7cb50683ac83c604057230957be9d735ec5790e2a28abb2bbf1947156c7dd3104b9a2bafe4
 DIST akonadiconsole-21.08.3.tar.xz 200736 BLAKE2B f8365e5e985f573dd5ac3e695580fedd6a77239cec013e116f3338755a5ae7c80ff8d61b868bba8fd66745361752124c623d68d6b6434a9f7b3bc3a3b0b72c3a SHA512 699a943a02bb307e01fff4ab25384a49833e16208b3d72d760b29e332e47acbc23a80857fff91d692349744a192668165412d4b4aa2de7625c13ba95756268f0
-EBUILD akonadiconsole-21.04.3.ebuild 1481 BLAKE2B e2dd020491ea028c1267b5fcff9818c8e9cf0370f06348b2dde18ce4a21deafbc8d91af0883e6741dfafb7bbfeba8e563eaf322ea7c5b23f16edea2ef16465b0 SHA512 f5ec58f18a8028142f4c7712f72896811187c5ae87ca6cd617807631ed8dd38c3026dfcd1492651547ba4916f1693c88ed72c252809c020c3c209973c3680441
-EBUILD akonadiconsole-21.08.3.ebuild 1484 BLAKE2B 1367310f7857357f4ea8656b465160ffa1f98cf49f9387204f2d5f675312f3f0b106bfc1f06e435a88f4d8c50033b5f5a6de778862f86f2a9c32c98df35837ff SHA512 aab164125c688ff3e9264dd30fa591900d55168c2b7f3b45dddbb98264cb6ec80107860180e33c1851fc1ef4222a88654ba58b0789b3e8f3a670ff62c91ad4c9
+EBUILD akonadiconsole-21.08.3.ebuild 1555 BLAKE2B a748d208309661cca3c946b25fe3a8768579f971f3d74addbbd82accf17cca4b8b659729933b1edc9e7a5bcc53b47f9ee2e512edf8c894aacb81b99972d0e7c0 SHA512 0d6b15dfda565bfe90fc7f7df19163378d9fd19d7227d88e89c3360e93510b9c1c7de42d0823d959caf77a9043182342766898804b832c0893cdb714fa519d76
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadiconsole/akonadiconsole-21.04.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-21.04.3.ebuild
deleted file mode 100644
index 9505674d566a..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-21.04.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
-
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/xapian:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-21.08.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-21.08.3.ebuild
index 1fb49cc99e52..c978f8038d2c 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-21.08.3.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
 
 LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
@@ -47,3 +47,8 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index e0e40eb718e1..9e109b6bc9c5 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,6 +1,3 @@
-AUX akregator-21.04.0-fix-dependencies.patch 1061 BLAKE2B eaec25b98a2f4aadb4547a50c1d732c015a6775aa435a0ff866289e794eba9cd927a8b510f034463a11610332d73a96a768a8fa90686c2ccae0851d8ead853db SHA512 1e1cae77456104dd127076439f857e26950ec672ee22ddb37b6218eece56ebbddf37d93fede886ecce606717260df7066db2ad1603483a69017bca1bb35bd3dd
-DIST akregator-21.04.3.tar.xz 2250844 BLAKE2B 25b3e5d2699509d2bc4ce141065eca1da6974314473497c104f75a5054a195106750d084eae9dd11e4f5619d056da0a6b7d86fa7aaec56ca424d566b3fc9edb6 SHA512 cf431b849e31d01976414f89a887f4de46b22607cfbf4332f272ac15cc0d8334df6adbf03c7a3106b560dc01b58522966906bc828333d25cd872d8e7a6cbf396
 DIST akregator-21.08.3.tar.xz 2246092 BLAKE2B 02ec9980dfcaca1a10be6bb8ae4b3067530f122297a633daff9f9ee5787003d178494cf2548410f4904f713207a8fd6d5e0fe331dc353a4e549c47b12c12687d SHA512 44d32689b3e717a967a6444742198122452bbaff752006dce29228b278299a44b7c71d3c79207d5b122e3c7a8b89513eb6bcc919d08c1e9a52704a96c27970c0
-EBUILD akregator-21.04.3.ebuild 1802 BLAKE2B 26dbb3205265ad769605162d078fc563041aca93507537f30956baab11ce9b9ae956b6c4b38407ee37502dbb3013ce7d0115caeb8f6ebbc7f108027c31ad8e4a SHA512 88a76c0ecfec8dbb19c344ad6ef5f4628191506ded900ff2a10ac502635c5273d779d1288cda8cee3cf850e183694dbaa68272e84efd6d49fd1f960f1059b280
-EBUILD akregator-21.08.3.ebuild 1723 BLAKE2B a145fe7b7a889bf1842699ca13202f465cd6ac4e25d98e8cc18efe79d018c25f7cabb3efed7cb8c6ad700d8b5c16ee7025cd81d576c27473d973b31c4935ca26 SHA512 8596677f234fcbaaf933941898aa1debcd0465b94813e0e343c5ce80a179a378f3a1c821b1efb27c84b699187d48b9ef1b76d81c63c5cf7e2d1add1b1214a797
+EBUILD akregator-21.08.3.ebuild 1720 BLAKE2B 34e70093a88456655d643d6fed49aff6f536366fcf77329673a39511dd69f15ac5444f09b7635b30cbd77b8ab08c4eee8d52ab697675b832191c3a675293fe13 SHA512 8d285d35fc86591a0d9bbf56207abec8304e6e453884cc1ecb75ab369e270ee2c5625e61f538ef6d593edd6b2b3740d5db9d47abd27e81e31b8b19a1e5538631
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akregator/akregator-21.04.3.ebuild b/kde-apps/akregator/akregator-21.04.3.ebuild
deleted file mode 100644
index 96b7bce9bb85..000000000000
--- a/kde-apps/akregator/akregator-21.04.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://apps.kde.org/akregator/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syndication-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/grantlee:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-21.04.0-fix-dependencies.patch" ) # bug 783921
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/akregator/akregator-21.08.3.ebuild b/kde-apps/akregator/akregator-21.08.3.ebuild
index 1e008daf211d..1e2e8b789fb6 100644
--- a/kde-apps/akregator/akregator-21.08.3.ebuild
+++ b/kde-apps/akregator/akregator-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/akregator/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/kde-apps/akregator/files/akregator-21.04.0-fix-dependencies.patch b/kde-apps/akregator/files/akregator-21.04.0-fix-dependencies.patch
deleted file mode 100644
index 4455b10fbd30..000000000000
--- a/kde-apps/akregator/files/akregator-21.04.0-fix-dependencies.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2f8cd478df76c029d20870364dae577fe1bf82e5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 23 Apr 2021 21:45:33 +0200
-Subject: [PATCH] Find KF5TextWidgets instead of KF5TextEditor
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef9d3084..04f14929 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,7 +62,7 @@ find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED)
- find_package(KF5KCMUtils ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5NotifyConfig ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5Parts ${KF5_MIN_VERSION} CONFIG REQUIRED)
--find_package(KF5TextEditor ${KF5_MIN_VERSION} CONFIG REQUIRED)
-+find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5Notifications ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5Syndication ${KF5_MIN_VERSION} CONFIG REQUIRED)
--- 
-2.31.1
-
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index e9b22bd05fb2..0faecc15a0f1 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
-DIST analitza-21.04.3.tar.xz 346104 BLAKE2B 4187d20ae90dd7e2e326af2cb3ae7e0d2fc2d07feba2565bce63be089115f6e2b898fce316aa1ee7ecafed8b1d2da1c9277217481510d907186d2cbc5f9e23a7 SHA512 d97139f9868e8ad19d8560bcc403fa9a45761581c1f048de113523a157d15b201288bf87c79d634ed408660ceb6f31e0514e1e09c73f5c95e0cda3c659bbe211
 DIST analitza-21.08.3.tar.xz 346716 BLAKE2B f7d45cd0b4960d6833e1cbe4cf9cdc93c2da5abb0f12f156a9297a2a09543f3d0f64bfe0a206896fc8178d27343032bbdf16316827a43225d6033b3ddf74e044 SHA512 ee333dfba8e7e35747b4eb6474641a4bd8f55a8466aa70053ab9521402183115def32e7707bfa2ddfc2ebea401f49effd5904265952a1b3abb242f917806bc11
-EBUILD analitza-21.04.3.ebuild 913 BLAKE2B c458cf7ca5ed9a9283efaea699c7be1eea149280b95734f1f556b8435154377e67bbcde441082d6edbbf5b91153583f7c0cf4cab3e1b19a4617fc4a2162a35fd SHA512 b108b40cfedce4b6c7de394a43a6f342526e855447aa42cabfb2c133b72760cc41763b9ddfbea71aede71a6e3098393637d6d12d20209405b193ba67022344d6
-EBUILD analitza-21.08.3.ebuild 923 BLAKE2B 086f22d2bd23a227a0345590f3eca1825110faeaa90df62d1e580af0c4f752697854f00dc506a0f9bc94ca6c6a44de0545ba2312bcb9d941602bc0a60e4e8915 SHA512 c3659cc0f4b031e48323b163624abf87cb1bb155cc52968b4d1e09ee5f43558e0e91cf288f16d730a4e06f1ebf4365673af91508a1789eea8c8fbd1e8788f333
+DIST analitza-21.11.90.tar.xz 347736 BLAKE2B 5c67954433d493edfe49e6afc57d85f4145141450921ef0cc337e1350210103c32970d6e81d84ad404acac51c1822fcde29b6352436539d818eb10ed23186f7b SHA512 3cf2bd85ac690d2fee66f54cba2f893ea242f5056b1f47945153a57e7f3a6ac33676ed7ebaec1871e35ef6fdded1bf31ec28aedb9b5c33ce9cda0891fe9b3b26
+EBUILD analitza-21.08.3.ebuild 920 BLAKE2B 6c920d2c87417d9ac8223f8ce33969c3188f503f30e8994438a23696eb2fa17de61a43be20ffda46c2a87983672c685eb6b1f89e6d2181416a845ed63119bb62 SHA512 6ed89e4f5d86693d6cc7726b83c9e9346297c8abdcbe3c5651036e4431fba3d79ce2f0d0cbfd287c3e92726273b0a3d10e27de743da1c1d44fb7f7fe584b12ff
+EBUILD analitza-21.11.90.ebuild 923 BLAKE2B 086f22d2bd23a227a0345590f3eca1825110faeaa90df62d1e580af0c4f752697854f00dc506a0f9bc94ca6c6a44de0545ba2312bcb9d941602bc0a60e4e8915 SHA512 c3659cc0f4b031e48323b163624abf87cb1bb155cc52968b4d1e09ee5f43558e0e91cf288f16d730a4e06f1ebf4365673af91508a1789eea8c8fbd1e8788f333
 MISC metadata.xml 424 BLAKE2B 96e094c8fed309802b0c6ee26a785044e6fd895bfdd9e2ff2077f4b0906fc1c4561db4fb3fcec135a4797d812b5cbedb52cd5678772a06f8a82abe300cd2c9f4 SHA512 f98402c3e2093cdb3ff8af13bce9a376589127afd2cf3f4e9c4a9ec1a8e283aee4da30d3572cf396bf5cb4de53a4db5bbb34da57655bf850ea1833a5329b0ddb
diff --git a/kde-apps/analitza/analitza-21.08.3.ebuild b/kde-apps/analitza/analitza-21.08.3.ebuild
index 12085b59fbc6..af74650cdc1b 100644
--- a/kde-apps/analitza/analitza-21.08.3.ebuild
+++ b/kde-apps/analitza/analitza-21.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE library for mathematical features"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="eigen nls"
 
 BDEPEND="
diff --git a/kde-apps/analitza/analitza-21.04.3.ebuild b/kde-apps/analitza/analitza-21.11.90.ebuild
index ccbb8c1184a3..12085b59fbc6 100644
--- a/kde-apps/analitza/analitza-21.04.3.ebuild
+++ b/kde-apps/analitza/analitza-21.11.90.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
@@ -12,7 +12,7 @@ DESCRIPTION="KDE library for mathematical features"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="eigen nls"
 
 BDEPEND="
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index ef29c79d7277..95b326eeeff3 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,5 @@
-DIST ark-21.04.3.tar.xz 2757408 BLAKE2B edc2c874addb49c56f24c0f506d2c39ccd912887f1f30cb3e6eca49749beb22a99ba42c43ed3ce81d94a0b4fe2dc86e842c35ae71ef35d3e68e97d6e8d00d1b7 SHA512 dd68e113d770b5f871b5fc9b9adc136af4fce814f04ee14c18ad16e17ce4c740aafc6a4fd867878142a500590e074d0068ab6cc1ac87d4f8178ec0d4e1f763a4
 DIST ark-21.08.3.tar.xz 2769868 BLAKE2B 8e208bb9067bbde43e311aa88cd16bbf2957b434906b42114c08c518e301a89231627450885e3c145452fd538106b173a881da7d0100c670612cd08c3c342500 SHA512 4b434669e369636774df84d48ea277860886db29055f26d40f0ba08242eec9a6e6d7727b3e405148809e86db1e06f5517bf35ceefd17a722173c4de915f1eae9
-EBUILD ark-21.04.3.ebuild 1950 BLAKE2B 1e410014398408af6263f5acd6344e0efc4df3940459ec5039e3c9fc1724450240dcb39f5e0607b1188c172e9a59ffd86db78992f49e1fc33ea02828e8b86882 SHA512 5b979e2e106ec8feabf2efb7901de072085edbca8f7f17106c6a9f656f22f18c43e661c548499137505178c88122223958e8b1af52755ec1703d3819e2af95d1
-EBUILD ark-21.08.3.ebuild 1874 BLAKE2B 0cd85b17639751309f521340967592c4191a8b2113c11098f09875bf4f35c757e879edbfc1c217268445c9670ef2cb632665cfcf9ef6edff2fc0a76c2f440f61 SHA512 05bac8fd2d567dfe884dc5df18285b33507ba16108f19797c161dae06e63bedcd918daf3720bfc8e750f7f1985126b8d4f58ae4b7ce199276aa89ed4d60ccd62
+DIST ark-21.11.90.tar.xz 2771372 BLAKE2B 4aba62a9a788845b9bebd86d03fdbe98223ab95527e19556dcb57cfc359a99c80e6321fdad95b1aeb565418f1bd2159559303c25bdc00568172d9718ac512f1c SHA512 19f399bc639b11fba776afc57de40351cf7dc1372c1bc630373a46853c2f1e836428a739f22914642c58297771edcae7d4f962f4bd9c4f307b18294970f8ce03
+EBUILD ark-21.08.3.ebuild 2109 BLAKE2B aec7fbbd9bcb1592369a8801320225005b47e216d77ca2e946dd4000e53351dacd6f9eb08c628cec9d7711139ebe7476033fe3956e877100e3985f1d85ba4423 SHA512 7e36adeddf234c71413aaae3ef13f848648ed9c10cf27777edf860557fb962a962e32f2802ffd7d6e3d1530e30994ed02fcef22c6c03c64e2c40401473e3b680
+EBUILD ark-21.11.90.ebuild 2112 BLAKE2B c059167f3d4f1237eaa01f03b382c273bd1efde3c9ed59445e6e86ce483c123ed9de53d69ee4d8eafa73c9579ef981a85f1e0bb917cd5d4335d5f2d9954bf392 SHA512 9aca15fd90d880a9d9472727c49a4182586a02d29f0663875fa4965978d1dc6f22a361292abbe6690afe9ed4cc607663dc93e5ec7419fd1f382b56676f35a09a
 MISC metadata.xml 417 BLAKE2B c4d2ef57ca332dfd54464c4fa711cbad98a12099aff3a3ef7cbd056cc68ddf96d4efc9de4db60f5b8f3eb26c027cb10fca5f2cbd80d39c9ec09bac639a6fab26 SHA512 77edecc18cc2ba328edc4780e23028fe362def0d558bf51046f5dc8fbcc485b5f6a659896670160abc48dea45c32faece2540376436879ce3590030f9f369565
diff --git a/kde-apps/ark/ark-21.08.3.ebuild b/kde-apps/ark/ark-21.08.3.ebuild
index fee43a8e300f..b101a80f0286 100644
--- a/kde-apps/ark/ark-21.08.3.ebuild
+++ b/kde-apps/ark/ark-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/ark/ https://utils.kde.org/projects/ark/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="zip"
 
 RDEPEND="
@@ -44,8 +44,12 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( >=dev-libs/libzip-1.2.0:= )
+"
+BDEPEND="
+	sys-devel/gettext
+	test? ( amd64? ( app-arch/rar ) x86? ( app-arch/rar ) )
 "
-BDEPEND="sys-devel/gettext"
 
 src_configure() {
 	local mycmakeargs=(
@@ -55,6 +59,15 @@ src_configure() {
 	ecm_src_configure
 }
 
+src_test() {
+	local myctestargs=(
+		# bug 822177: may segfault or hang indefinitely
+		-E "(kerfuffle-addtoarchivetest)"
+	)
+
+	ecm_src_test
+}
+
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		optfeature "rar archive creation/extraction" app-arch/rar
diff --git a/kde-apps/ark/ark-21.04.3.ebuild b/kde-apps/ark/ark-21.11.90.ebuild
index 3d1acd6d2638..49b1f4b18340 100644
--- a/kde-apps/ark/ark-21.04.3.ebuild
+++ b/kde-apps/ark/ark-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
@@ -15,12 +15,9 @@ HOMEPAGE="https://apps.kde.org/ark/ https://utils.kde.org/projects/ark/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="zip"
 
-BDEPEND="
-	sys-devel/gettext
-"
 RDEPEND="
 	app-arch/libarchive:=[bzip2,lzma,zlib]
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -47,6 +44,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( >=dev-libs/libzip-1.2.0:= )
+"
+BDEPEND="
+	sys-devel/gettext
+	test? ( amd64? ( app-arch/rar ) x86? ( app-arch/rar ) )
 "
 
 src_configure() {
@@ -59,7 +61,8 @@ src_configure() {
 
 src_test() {
 	local myctestargs=(
-		-E "(plugins-clirartest)"
+		# bug 822177: may segfault or hang indefinitely
+		-E "(kerfuffle-addtoarchivetest)"
 	)
 
 	ecm_src_test
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index b7a3d012f305..3560ecd66626 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
-DIST artikulate-21.04.3.tar.xz 1090580 BLAKE2B 974f3eb1cdf8dea80d967cc7311438e0b95688f19240e0c7e7472bce3d9f4c5a6f036c16774ef1709d05f0217918760b696390b7f21bc9b25a403c3326bd6aa0 SHA512 08ce1529011ec0a7baf6417f4839093efac80f79919213e5f85bf0de8575f28966cff0ce24735e07ea3bd0684eacd05a98cd1903b4f46156ee70dda446f1ffa9
 DIST artikulate-21.08.3.tar.xz 1090576 BLAKE2B e0bbfdeb9d954c9a5001563c53851b796fc2a4cdb474b57261fc820d7ddadd759b7a4113eeaf7c7b267ef664f4b859586480aad7fe0ed04c5dcba3fa5661e690 SHA512 c0642fad8a85b0d0e3e9b52ae684f4d6026fe70710f946ec14c6923a6c56805c9026508da58c29e1820deeb4b392c5f2b8146f150707ccf9010a4704ff146dd0
-EBUILD artikulate-21.04.3.ebuild 1080 BLAKE2B 84bede36c84a7475657646a0dfe9a99427f18e4060935a70ebeafa32a55b6eb5cd6338810f273ae56dfdeb9a3f3b6312c5e95e1a1b9e21db4c2cb82574560860 SHA512 1f202df8faa3e77368b02cbeb93617caa7f573cdb84e20db02609f6cce349e11f04970f31d47cbbe190825c7fbe14b67e17872417059891bdc9bab44cad48fb3
-EBUILD artikulate-21.08.3.ebuild 1090 BLAKE2B b0e1f1ab631322ad6e6e3da6b70d52a238c1f068d11168d1be2d786b784d6eabffc39e6454a1dda4d73d6a1395f529a64124b6ca0bc9d7b04c158f0ac5173eb5 SHA512 4c83303654c67a3a06c68acde7c996f6f48747bbe3fd3f18a9a9e78075fcc4892c016f8c32e1a512a309b6f6bd236a148c3fb6cdaba457d875404fe47a1582bd
+DIST artikulate-21.11.90.tar.xz 1091320 BLAKE2B 637f921d8a8c9b0d20831cd01a6aa5ae3c4698ce7e53aea2c0fd5d48f43290986d09c520566f0ead78d98c90359f0a8f78768ef78e1b131114b7fe40f4575550 SHA512 06b10a48bee15720ddd895de847f13f6c776462ae31867880c0ed936b3473a380404051f5bfdc62e161e969f043a575819b964da0ee6d17fd51b8f7ff398f580
+EBUILD artikulate-21.08.3.ebuild 1087 BLAKE2B d9186428d6d22e66c8eb12a857ff02d5b20173f142b9b5dee6ae19d499ffbe9e6c3e43d4d4810b992a04b40be77198774491557f44eaadb24280cdb13457921e SHA512 60108897443ddb62e5d7ff4bad63c4af97afb1593ca5c9194b19b47f43d232eb250d96b908d1a909f96981d3307a4ec1d991fb27544bd8c40d6c94821275622f
+EBUILD artikulate-21.11.90.ebuild 1090 BLAKE2B 94b63f5a2839cbf6e805d2692fb0baee79d6ee5d94e044b696980512c9e891f7d75e775891dcdc17cd7226ff95aed27d225da7e1d2b8418f8d77f65f6a91b753 SHA512 5b620b79c9871d787bd632b28bc77ba4d1f50718b77b0f8df56ff2a57776cffed10c80f74bda1fe92adb84cb9a97532b4be482d09e98e354e54f51eb9c5e7bba
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/artikulate/artikulate-21.08.3.ebuild b/kde-apps/artikulate/artikulate-21.08.3.ebuild
index d766b0c4150c..684a28bd63a0 100644
--- a/kde-apps/artikulate/artikulate-21.08.3.ebuild
+++ b/kde-apps/artikulate/artikulate-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/artikulate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/artikulate/artikulate-21.04.3.ebuild b/kde-apps/artikulate/artikulate-21.11.90.ebuild
index 87a28886a074..e56790fef8b6 100644
--- a/kde-apps/artikulate/artikulate-21.04.3.ebuild
+++ b/kde-apps/artikulate/artikulate-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/artikulate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 91e060976f8b..459e60d25fe1 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,6 +1,6 @@
 AUX audiocd-kio-19.04.0-handbook.patch 717 BLAKE2B 997c82779a9598d0ffbb0605ca7b9f71ed62298ea3f3acb2ec88ee99417dac84fd8e6ffa0036d036346bf28612c6bb4323ce2e4f62316c4d321201d00462e665 SHA512 7601c79145be90cc9a49eec28b8ff63e275212d76d4faba779a1cda53c45ad863cd638de64d522c099a2c8858275c92058928a6f4396951aaf370277189e72ba
-DIST audiocd-kio-21.04.3.tar.xz 517876 BLAKE2B 6e6727c4fa02189184bf0702c92860bfb1a4daa5511a15b279af9101ade0eb0740c8364bca486ae2e317c87e9861b85948bd3ecf70dcb4a213811de1b65b0ed2 SHA512 05c824efdd308070a113ec81b1bb8ff3dea1399c2e9228e7d239ade670bc9e6934cee9abc21deaffa01720d0563a116de786320db19c543c06be675be96d8512
 DIST audiocd-kio-21.08.3.tar.xz 522944 BLAKE2B dd9d165d7db9c45b65c8862ab8be2efc18cff5ee435b57c3bf0a5882f60c9c72499d49ca6b90c41fab67b86293082270a6b473bd7282e22ffef75aec4c5529e0 SHA512 6f81d3890531bc56c61c1aff9dd15f26f908992ea54b454f0371751897f94f30280388e8f5f8197cc4800f1fcd43541ef6741a318bdea04e2e2ba13addcc2c6d
-EBUILD audiocd-kio-21.04.3.ebuild 1082 BLAKE2B eee99be5846001d530d0a42bc60a01d943d0aadcd695186ea3becf352cbbfd0418a6aad4c2d0e6981c75c2c991c2c5baa0b468b9c2185542ed69675dc0272cb1 SHA512 b86d6d2a9e0d77bb1fcc8e579e241cd81093d93d6d42a71b06dcfebf8e50d34100fc54d4e20e4e0f7c61c67d2a900b928f7655cc5d8b101b186959f142bdb257
-EBUILD audiocd-kio-21.08.3.ebuild 1092 BLAKE2B f76943f8e9a03085dcf2e568715e1199a8f848e1d839fb1f7e5816b604d9afd7def220208f6114d0bab5dece71ce11b158e8ee2f2bac221e7b0e0216cfb83f9d SHA512 a1a80557db1032312a91e2b480f7e72ff8510baed1b061b25c4aa67f682546909958c4dd3f7071c02da043134613a01d71cc644f134564df8bf77a1cd627066a
+DIST audiocd-kio-21.11.90.tar.xz 522768 BLAKE2B 92d0c4bec949f981eacf2b19a96fd7cb9d64d07d725f4814abe3b6755941daa5e7727625c944169beb499d064520532be174f032a26e0d72360f0d6cd2846345 SHA512 f5bd9086c6b5557b25840ff265095df98ea9af09fcb6d5339f205d0a2b658fff7b5cd9e9ff6b19a91acbbc80305f6603a73c6ce0c00f44fd21273c0e042b4d6c
+EBUILD audiocd-kio-21.08.3.ebuild 1089 BLAKE2B 37ca63c692da42c8b6dff51c603659d12c380cc6d301256fbccc7665ed48aba257e37a302558539524a69a09285513ed1f640a0f162d148606fd018ced5f2fd4 SHA512 6f70128f42efe523b87fc7550eadc4a08c59b5cdf3777c35d36e53da1b1d25833b9726e9fe2bcb151dab1e549e30f619909b4661194d6ad06322af22b9ad3d1f
+EBUILD audiocd-kio-21.11.90.ebuild 1092 BLAKE2B f013b5b461742833a6b8585a01178f4b1291cf9cda28c49c9c2c2f7b97ac46e67aa8b2e21df7431988cf67f9370deef930d90a1cdab338a540f1a9e4c7e4c288 SHA512 da592365bfb563fc66e0c1f7db29429faf5d4f50a6b77581c15eed243fd2eb1c888dd6e6e448914465b14405afe6316864c11778f2930434066defe2b4ef0dd1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/audiocd-kio/audiocd-kio-21.08.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-21.08.3.ebuild
index de361e8223f2..3ba5cbfb67f2 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-21.08.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-21.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="kioslave for accessing audio CDs"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="flac vorbis"
 
 DEPEND="
diff --git a/kde-apps/audiocd-kio/audiocd-kio-21.04.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-21.11.90.ebuild
index 87673acc12c6..35cb24717702 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-21.04.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ DESCRIPTION="kioslave for accessing audio CDs"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="flac vorbis"
 
 DEPEND="
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index c9f8e0b95361..0fe63b1baa38 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
-DIST baloo-widgets-21.04.3.tar.xz 262660 BLAKE2B a8ed3204f80d5c98dc9081dbfc434b855dd193f7c192cf96820d21fd5677848e5b5da51c158cb90549fb498ef7e2d8147d2ec3f20902c0ed25eca360b2c5016b SHA512 89f83b02052d61079ef4b7bc879e1e6deb0f4ffec90905f40cbc0f8647437852a679bf606f1368d68d9d5fff4532e0d3be8ec48ee1f1431a3ed9a03e1e541d5f
 DIST baloo-widgets-21.08.3.tar.xz 262612 BLAKE2B 1f427102ee009d7b9039ded49922b2c24c169155ef02e6258ec998684917055a2629a7271f12e67f9b53d9b4d7a31861bc58140b48b0ee3342e9e92c95ad6888 SHA512 576c37e5ab0a8eed02acaa53c0706ff3df7a7be7ce63822ef0443a69702c2fdbe8d057d2c4c6e5a351bc93487b30176f870c661db8d36525d839ac0b8e011066
-EBUILD baloo-widgets-21.04.3.ebuild 704 BLAKE2B a06cdba4b27dee4d6951cef2fd5efa78c5754da6d27f60c446dbfbb653869eb90195a2ed8eea4b461dc201f9faad29d4439575909927b53b9fcb7be4e88778af SHA512 6bbca0d2a341418d27d3c45cf1bc278fa6c7aa6a41b6556e71d9a4ae57a1e5ab11ce8e16b7ec5a6e3a7c3bec02aea18a659d8fe8374cc5b9e17efdd1ce3ff21b
-EBUILD baloo-widgets-21.08.3.ebuild 712 BLAKE2B 07eb319b393b23a1c0f9b50ffd1bf12fefbde2ff37eeec0c19c9f95db092245c44a3fd60b9bba0d8965162de6119e3f743845fc9627bd87926bb837977ca560d SHA512 76edefbf373213c60caf7534e9e7e1d02aee90ba7d10955ba9e4aa47d4f1db176f341a9b896feefab57af2b47420bc44ff2cb34ee5b0659230f525fd376db40e
+DIST baloo-widgets-21.11.90.tar.xz 262780 BLAKE2B 3b40edd09ca0b4d1145c52b7324e5528c9f142cf9514006f1ec637618ac1e1dc53a10e109911e56fc3307dbd84c97badef6f9f863aec1195a64c1b94c919caec SHA512 8347e7a55e4599133b20458913246ea9d4c6a68020336958e809c097931717290b4c76a899c666188e6feebcc69290eeaee342402f1f0aa7fc43e0fb5dcdddb1
+EBUILD baloo-widgets-21.08.3.ebuild 709 BLAKE2B 4d7e8a4467daae590a67599a46e59f77ec8514e0388d003507e35efb1485306ed5d7a8a0face2ac429f939518a6787e46b49e826d55bd43f8d1cb33d8f47a00a SHA512 64949ebd92e26e021d4218d4be85b36ab9b6723d128fdb30a2405906c83f90bba8e6a5ddc596e12e7d2170fb25164a70b7318d0006f02009ac5a3817f358b18d
+EBUILD baloo-widgets-21.11.90.ebuild 712 BLAKE2B e9a34f115adf60eebae2aae5873034d7ccdce5e55bd39ecb7e3634e31818aa0e2911b8593cb0a05619e3b7db9be6650e59454277004a1b388e12f6703e914dce SHA512 a955a236b2047292ec0cdf0988c307781454f99aa9a42c160f206383ffa29db664f684361659b125a0713ba1ee111649d45d85bc2a72e411d8caf3ed8603ec75
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/baloo-widgets/baloo-widgets-21.08.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-21.08.3.ebuild
index 6aa6cbd5b492..6f08cd74b925 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-21.08.3.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-21.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Widget library for baloo"
 
 LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/baloo-widgets/baloo-widgets-21.04.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-21.11.90.ebuild
index 4021f288458e..ac131da30de9 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-21.04.3.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -12,7 +12,7 @@ DESCRIPTION="Widget library for baloo"
 
 LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -28,4 +28,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT+=" test"
+RESTRICT="test"
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index bd51c1805814..666369398937 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
-DIST blinken-21.04.3.tar.xz 2713184 BLAKE2B 81fc786d91c752780ef1855881e4a7f50a5ffba5492ad6fcf35673fa8a046035d798f42352161761e228b50870dc61f7206893511d1b30bc4c781f190765a14c SHA512 245944eb06df94f2df53596f7947fb5eaf8c543062234ab5e8dee61114523e9a40c0c85854509f7e48c0bcdf01ca632925f75a6d69a0870563d1c1869523dd06
 DIST blinken-21.08.3.tar.xz 2714060 BLAKE2B a664ab96e45e16d4f003fccfb5f875f49b8b47630f763742d5eaf2ebed1a3bf9622f6ba925ee546a4717932222e223033473f864b99a0c4f4581d9783385d24d SHA512 f3befb99992c062fadb955d68dc53eff9f164dd3963dc168368288b946cd53867186be30b32f3a5f61555db90ac5d11f1429cd2fee8d13b2af6116c849fe361e
-EBUILD blinken-21.04.3.ebuild 896 BLAKE2B 017031c0f9deae5f98bd6e33fc8b5d907cc617827086a5d45e6f2d9fb0230196be96f6e0c0513dafd871e423135f39c7943d8cc133cf16e05d206450e032f558 SHA512 4460aa624971b971e02310b9b7c03a5ace44e0e9e2e2ca8884a052578857518d0af94041e83fcb44db1e0a717b43f4696411f24651a4c13f6ca465c3dc162952
-EBUILD blinken-21.08.3.ebuild 906 BLAKE2B 24922e40c51469e54b66b4e2fada3afae2133a449e3c1fb330a1119fbd069b30e1902582f6bc60bc248dc3c7db7ddb12864dfa77f9a2d53b4bd0b5b7315ac218 SHA512 7c2539deb0c4d329234ce4c3367216b425b0cb3451ab51291f7f436765151b1ee1a2b4039a3396d28067dc5e2273e6bec4adfec257eaeee3e298a1c12f6d1cbb
+DIST blinken-21.11.90.tar.xz 2714120 BLAKE2B 18215fb8b1cb4603294522033254b7350d7bece9a2f0431cb927986ce928f6d152db8721546d92aa15484c08865d9adc4302ee47acf938900b913369a0f765c7 SHA512 661a5af79b3451cf5ecd33ea3990faaf71c837ef09e3c082634e2c1b4c47dc91b90ba230f15445f11aea83296eb58decc222fbfb7adfde400364d0e44888992a
+EBUILD blinken-21.08.3.ebuild 903 BLAKE2B 3f812fc6f8b2e3623f90090d4e95bd70e48bccccdfcbf07c7ac77f7201bb87e2fb99b68fcc20a5b4770b97b40c86d2b4d0234f03a88cae7d2d26fa2a1f7d36a5 SHA512 295ed160da7165787efd9b056cd4de146db45264f4fafa6f8ba24a4550c5dce40a2c5ee9da43e7cb3a34bb0236b78e1a82e750593b059b03740923e5e8d420cc
+EBUILD blinken-21.11.90.ebuild 906 BLAKE2B 0eac704561212f0e8cd59bc30b3874bfd720397f8680e8aa330663b1d4741150482b7c7e26f65cf08bff43380372e42b2250f7ed490d23db4cefc0aee95bc4d1 SHA512 4ef51868b2c99a82c49b30fd3ac2680dbcf2cad97cd454dd52287332614a648e378a8f8c37d280c375b922805e232bff39113e3075c11bbce85aca854e3a2149
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/blinken/blinken-21.08.3.ebuild b/kde-apps/blinken/blinken-21.08.3.ebuild
index b7ccab6e8cfc..836ebf3b7264 100644
--- a/kde-apps/blinken/blinken-21.08.3.ebuild
+++ b/kde-apps/blinken/blinken-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/blinken/ https://edu.kde.org/blinken/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/blinken/blinken-21.04.3.ebuild b/kde-apps/blinken/blinken-21.11.90.ebuild
index 282c1860cb06..d217be0d0959 100644
--- a/kde-apps/blinken/blinken-21.04.3.ebuild
+++ b/kde-apps/blinken/blinken-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/blinken/ https://edu.kde.org/blinken/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 946bec7e53c7..9fd1a639fbfc 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
-DIST bomber-21.04.3.tar.xz 828452 BLAKE2B f7fbd659a6e8560d2af3a34c39562a63d9e61d7f4211701e74daa15be42c9a07c7fbd1cd4e57bdaaa1409dd90aa937913b0b0b5ee355cbcd1b49ab46fd8e5898 SHA512 3d03b2a5cad86862e694195cb02b93392f7fc6c750fd8c90d6d137277cb35b081aac2a9c3900ff6703a5e99c9184f121a415a734f356cd6272f7ff066d54becb
 DIST bomber-21.08.3.tar.xz 831096 BLAKE2B c8f9f346b65d6efd8b9c317b718025f1ad93f6b913d75d69b7ead18c2b1277bff57af8ce3b84272dad0dc08e28111cb1e10e94a1dac33f79e567cde0000c92cc SHA512 663912d5260ed941e3c41fd6d25b7dcca96ad7d4b1ac5de6f697aa408274cc683222efb6ea97ea55955eb8dbb60fc997fe55ac5171100bb589f2c6f3572606e6
-EBUILD bomber-21.04.3.ebuild 837 BLAKE2B 94448c2799c53fcee8f5e1fc668644c2cc60cff5a4583023e305c08b12ed02e2f552aa3e65f5d60c3a13d4f8cf580aec4265b32c82b4effd70f010ae3ade8a74 SHA512 ce0ff82a299dfa74e2329cfb0e2484cb0f3f231329300f98aec371a5660ddab2c08d78311f63f1a51f2d7ab0823f2356f099ffeb906409829ede391b31ae878e
-EBUILD bomber-21.08.3.ebuild 847 BLAKE2B 53fee843b7fe3d3d7b2752eec87d365057c797b24266dd57ec048f3030702e0a093bd0fbfa298273124c1d27025c94ed7503970cd8a2eb071c0c9a8a3369b4d2 SHA512 fb49f48e6b0f693841b931bc833fb1f932691557d4c1de073528891affaa9436fd12ea925833c44a75dd1bb6fdce4b4b696f07e13f483269533422d4bacb5ed6
+DIST bomber-21.11.90.tar.xz 831228 BLAKE2B 78e2be1a284b5723dafe98390d043b7d2aa0bbecfa717d515da0e20574e4910d4e371ae1d3bcb6004034e642df72f888f2e9f4daea306e2cfa70067c5af386f9 SHA512 ce5cdd15983a920319dab626ba9abe081977c7f011d20daf24f406e348eda59c636a4b91e9b5eba0ce0711b6724114e4524d8dae4ae3e54042cdbe484ed79ca7
+EBUILD bomber-21.08.3.ebuild 844 BLAKE2B 3c518e072229206db31bf80430fb2bf97812f6e3d8d5d3c28dc16e319f80532cdbb46b00bb112f929f56d1274353e1695b870a418cd8283194d4d3b9f9998b28 SHA512 223bebb58af538c9ec9eda9e49e14df2744f56b7a7b095cdbf36f4747d409d4462c0c1b6845974381ad930332112284e3fc0ced890c6b527161d8ec222281b0e
+EBUILD bomber-21.11.90.ebuild 847 BLAKE2B 574b94a7a62c751b7f9c842bf772874e727ff8597385dc288e2e314ab4b14b976e217c5ea09bf3e4b3333157dff8fd1e8bd1f6627efe6701afb2b2b4b3a111e2 SHA512 87efda3c4026fea9b7dddcf6f57e63e2128fc12cf99743991d7ab2931441d61b13e61fda2094178e62d8313caeac6ed867c48e12e722231d7739065e6aa95211
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/bomber/bomber-21.08.3.ebuild b/kde-apps/bomber/bomber-21.08.3.ebuild
index 549335301f23..312e9ab48e95 100644
--- a/kde-apps/bomber/bomber-21.08.3.ebuild
+++ b/kde-apps/bomber/bomber-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/bomber/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bomber/bomber-21.04.3.ebuild b/kde-apps/bomber/bomber-21.11.90.ebuild
index d7ad48411b4f..9289a5334a33 100644
--- a/kde-apps/bomber/bomber-21.04.3.ebuild
+++ b/kde-apps/bomber/bomber-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/bomber/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index 824222322013..967bc40c7e8b 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
-DIST bovo-21.04.3.tar.xz 207032 BLAKE2B ddf93f0987acfde679a5ff50f854ab36c9ce7e8405d0f3d188dd89482ab476bd93e889bdc7cf2bc39e4f05829c13e02df41fc81d5bf6d68e4baf362d2e065358 SHA512 13c7c3bcf275f1f4ccfd4754844b4ab08618ed80a5ba0681bdc62aadb1a7e8a4275c56c5967394d553890c384198d2bfa49dc66200642ea9e5608bff64006691
 DIST bovo-21.08.3.tar.xz 208792 BLAKE2B fc2349cbfb7b884c9983ca28ddccd44cea49ff4bc2e9984fb2ef28f1ac0ca41865585381eb6e3d3ff4edfa84faaefe06a27a84597ee1d7eee55877677a69e8c6 SHA512 abd9b2dd7acd0bb61d77f4eb9bba72d128e02dbd3bf0d3e19a1c22684a549421af075b09af869f59f6d43fb83bd613a5ef598828a04a80a206a8408a303d95cd
-EBUILD bovo-21.04.3.ebuild 850 BLAKE2B 44496062ded77a3b64ac8f1317609d00478b05ef0a3f1555fd2608bd8dca4578d799fb45c8af41cf3e7a2145f8132f2d055bb7dda4e33be6e7d37f1f197c0e73 SHA512 65b3734fc015f87b8987fc1f5edf136506577e96e65e73f34cf6ec96c50ad00502d469abd5c0d345c8315f5c66b6487d8b23e64485de89f58da47848cae3052d
-EBUILD bovo-21.08.3.ebuild 860 BLAKE2B 88633abf06cd3a2e1cb7aba1c7a8f1d7f5eec43848f7f92252434f14ba54713ccfbeb9d0dae80919780028b6f534998ffa89d432a0cd09d3a7113aa798bc8719 SHA512 097f4a2f6bc0eab640d198edbfffdb980fd5dd9c1ac617fa33b51246f3d7e1a2df862f64e462881595ca39fb62b5a53433308c0ff1e39103eef2f0a63c942b3e
+DIST bovo-21.11.90.tar.xz 209484 BLAKE2B 6edb0c5a66228d8b23a4c8af44cf385febf57c92715b647ee0563ae1e00fd4126a12e4b3fdb096bd955a474cf2eeaf0723899b3a366e4c9b94fe16e86c3383cc SHA512 d354612151325f2c9d0aaf3e7f73fa2ea7695590a3a93b9f7111a30407179dc30259ec5b44874fe21675419b2b56e61c7580025f33761186a92b91bfba41af9c
+EBUILD bovo-21.08.3.ebuild 857 BLAKE2B c01e3f61f4cc6561802630c6e2868ed5eb326f218116e4c8c8266a1942275bea94c0dbf23ce6f1e8f7fa2c49d69a9fc5d11f9756d629e931d3bff93a0c18ca8e SHA512 2d9fe185c0b6b5c87480bcd0082d3a2e34af8bd78f928de252a3224e3901d3a21a7af5fd7828218c53d9f62746e965b458bed434f375e2a7dd632da03b33aee4
+EBUILD bovo-21.11.90.ebuild 860 BLAKE2B 87c5305fbf044d6c2dcf6e057d488be4d4a37c607cc63f311b6ea748238e08cf5ff9fb044ef87ca0dd32ca02b700f2aac02c49dd1365106ccb2cde1406340d4d SHA512 53e0b027b3e7bb8bf7c574ecc6e7daebbf1af21d78951d603afe5414869e4ee1cab9a042c8cfbe93a76262b3a4ae0f2c9e50a81a4b52860eb7d675f0c54c3c98
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/bovo/bovo-21.08.3.ebuild b/kde-apps/bovo/bovo-21.08.3.ebuild
index fec6c34ff122..74ce0e3b461d 100644
--- a/kde-apps/bovo/bovo-21.08.3.ebuild
+++ b/kde-apps/bovo/bovo-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/bovo/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bovo/bovo-21.04.3.ebuild b/kde-apps/bovo/bovo-21.11.90.ebuild
index 7c11d0eb1be8..2daf6bf8c894 100644
--- a/kde-apps/bovo/bovo-21.04.3.ebuild
+++ b/kde-apps/bovo/bovo-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/bovo/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 473e3c03e1fa..039e54e221e3 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-calendar-tools-21.04.3.tar.xz 236956 BLAKE2B 96ff649f343c240dff36c80dcf538a2d8f6dcdca678ca8b24a13e1fcd95f513ba1066ceabf8aefe9b5ed00059b797e1944155e8ff4123c29a5d92d681409ce49 SHA512 c2c7d856aa3805b44beac964212fe20a8c63f0e2950e9111d93270a05e48b37ac39339b94067bc3558d2651d5617c82d34433f0741722fbd16b8661e1f02ef3e
 DIST akonadi-calendar-tools-21.08.3.tar.xz 236480 BLAKE2B 52d684780d95dc0fd957195844ab1a190018a47b62dec05e8bdd3adf565961e6c2b229c46b3ed6cb42e9a81b59800559a1049051eb69ac00cf7cdc98a40f3fb7 SHA512 1f2dc20a9b0d2d8ad35327ebbdf39e382f687120245b346d6b9e03d3c2d521e57208567c5edf6a5552515f62ecf25e0da43fae5bccd41d47114207a30afd5d4c
-EBUILD calendarjanitor-21.04.3.ebuild 1085 BLAKE2B 1618bb77b47e9a71378ab1bda6b37292aef2b5724e026f7b467e97acf682fd6f1d45692c16041794a732a429640c30d4d01119e2c4acec15fb1bf8b60944dc84 SHA512 68fe50d27866633a9ab313a93c90fe178df9993c76d0bd5235b139a0d751621f80cb9e1c2460a892bc88b5d46ff0963016c10d1d16f40e90246430c0c960b730
-EBUILD calendarjanitor-21.08.3.ebuild 1088 BLAKE2B 1289ee54b40a1e7dea3aa330e6d043170c2fcaa6213eb52573f652f027fe1a52dcab1cbc4246c8a27e7038f76d14fa5ce57cf8a28fe0019d000a486432a497c1 SHA512 a6d8afb4094146b7c9d3a1d98b80c1543c8dce689397099eaa3972662b70753762af40f2ebe8f4183aa46d3c526ca4fff4d06215093a3b7d9e91896539062565
+EBUILD calendarjanitor-21.08.3.ebuild 1085 BLAKE2B 50a0c996b9f89719ac04d2df7f610a5f2ba809f1b566a8757651b75be2be9217938a5e2389487a708c69846a29369937b47aa6693ca60f373f306f8751528887 SHA512 d340750c9551137e53744b4caa149dc894b8b7b46f06da00cb2c9e1f5dc81ae9150d5213815ad0c09dbc8dd17e6f2bfdbeb6948c0e1548065fc5665a9bd72680
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/calendarjanitor/calendarjanitor-21.04.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-21.04.3.ebuild
deleted file mode 100644
index ac7d34a290b6..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-21.04.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="false"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-
-	# delete colliding konsolekalendar translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/konsolekalendar.po || die
-		rm -rf po/*/docs/konsolekalendar || die
-	fi
-}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-21.08.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-21.08.3.ebuild
index 64c760520099..ef38699dbe85 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-21.08.3.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-21.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Tool to scan calendar data for buggy instances"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 243b1e3c5c66..51e076a57f82 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,3 @@
-DIST calendarsupport-21.04.3.tar.xz 755748 BLAKE2B ca30c2f2a991c3fe4989220d59c9eb2913169c0dffd5fde1c009bb771882c2440a76b868c907ed41f6a7a01be07e79041d813da6d12275a7ea34591cc5654c78 SHA512 10ed1bfc953483b0af1cb6e8cb5d35659b0400cb5e61723fdc8a22eba7c5205c8c944fb2c3ba7b07907dd673111cc7bb12db2ac3e04f3bc27c824cdfde401cd2
 DIST calendarsupport-21.08.3.tar.xz 764564 BLAKE2B d8d81150b053ad39048e8b265088c4f0bec68816cf8306f775a55b681a263b8cd05b1d6908c4ce64a322e81f7c920d103d6932fc8528293910a3bdb834c65f1a SHA512 96b1bebe72c514b0888311e66a587994d3e7409e6cac23bf812bc4307927fabf75bcf9330474edf52ba15a4d913f8227c58a5abb1f6f821092c5349984965a21
-EBUILD calendarsupport-21.04.3.ebuild 1261 BLAKE2B 0306e01abc0e135f8d5ff3e273f4d6c8994bc29e4c91573355e1a2b892416e231166bc20b93bfce810b8ec11f9ffc0ac451b2a512e7182f9abbb37b6cdb0f20b SHA512 de0c7d1dd73c4a59bcda213b34a861674d3accad2dfe3f78092d3b26106567fb8ac5ca79b6e4aa0d800804832d21659b2fa91a039864857cd6df30e9a15619ad
-EBUILD calendarsupport-21.08.3.ebuild 1264 BLAKE2B 4a1f127488b55cc2cc0c41d7762c00187abc85d85dffe4ab43a92c197e6e8aa6bd83ad3b59e4ed483028e62dfa1bed41df353e3a69121a19d0ecb4a47d37291c SHA512 f2eb4b4af202a4b1854748b8601c94fe40b7fbd5760d34f1f29ea2990e5cd2d5046d724ffc9ab6d88733b5d4a6a27ac2d7647e4bdfcbf3d52336b419f7fb4e0a
+EBUILD calendarsupport-21.08.3.ebuild 1261 BLAKE2B 36a4ebb946228b9c87e0f9706b5f454727dec19a8beab0c2a464e4d8720cc62aa70c64452d8b9e15e50ec2496f5bcd4ad5db1793c00aeffe6f1d650fb1241e21 SHA512 9e8672731c4b9374792f941ac37a8ba039a1f8d46c0dca9f75783de44042677d4d31a7f39f8ee97145c832125f7eb7bd5dbd47f0d70b0f7e9c96a6550006585f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/calendarsupport/calendarsupport-21.04.3.ebuild b/kde-apps/calendarsupport/calendarsupport-21.04.3.ebuild
deleted file mode 100644
index 3295a043f4fc..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-21.04.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-KFMIN=5.80.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Calendar support library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libical
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/calendarsupport/calendarsupport-21.08.3.ebuild b/kde-apps/calendarsupport/calendarsupport-21.08.3.ebuild
index dea79706dafc..9804a9e7d93c 100644
--- a/kde-apps/calendarsupport/calendarsupport-21.08.3.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-21.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Calendar support library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index b087719602a5..57de733dc8f0 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,5 @@
-DIST cantor-21.04.3.tar.xz 9146060 BLAKE2B da7e55a84df1bf8beb436ecb6b95c0289be1690f7662a6fdd398ff1895c814210f665640b5f617673ab4d557cc9d76016105f99c2431e181db3af14b6905d810 SHA512 9010bb70458296b2a29116e16d8be935d4d1cfe5a6b0554aa24247e3bd76cb97b27a2ffa70608402df588307d5f8c4605ad58ae2ac1d936620cfb2a53d00fadc
 DIST cantor-21.08.3.tar.xz 9190432 BLAKE2B fb701abadad15ca4579f54bb6d5504dd5d791c2090181c957493b001e61cd1ec6737c314db3929e7b2b6b4503e368235ce24b57a93bd5ceae572f9c555088545 SHA512 9ecfd88016138dc6e15afcf034f53907e706fb5eb972174198c22f061d3feb0b4ffa9698c5f6b4caafe3ef102e7554ae2ed125ac46850f509e35000f8ee02a0b
-EBUILD cantor-21.04.3.ebuild 3065 BLAKE2B d84179a1e39c38259e8d9d4e888c2da3bf123bf7dea39aa01af21ec6a8bfd69e74776ac9b7728455d49a4af2e9653a773f6ffce2a2d80f9735f0998fb725ef30 SHA512 73950c9ca4ecbc0c2d40055aef3fee9a66463e93b60ca2f9806e6c5d95524e2f9d0105b4303f82e7a44b6120d0f9601f06e56eba9a19475738025215c33f8623
-EBUILD cantor-21.08.3.ebuild 3173 BLAKE2B 042cb22852694f247af227703d32f2acef096d928f5302c3e76799f881207e7960623d7e7f5d6d8ecb564d140eb8c3c866bb38a884a32cd321f348a7765f55a6 SHA512 a1d7ced2925c35f6e5720b6c1589236e6d708a1319e12b95e66e0b47da72712ab347eabfc49594c9be70fe55187545faa58ebc90130db74723d39259f963022d
+DIST cantor-21.11.90.tar.xz 9184608 BLAKE2B 92de38f5273e15dc391004f355212b01fe192bd8897ca27fbef0bbd8a5aebea09c9d0494a655dbfad1e95c802deb760be2726917df17a984d90dfd4aa3f36957 SHA512 bba01f8826d6df15115c8bd90204b99ca402cd7865a0d5d7a1050e5715c90b6900ea9e644a4bafce07aa4ac6df6ee5df0cda506ab2aa2ea7a7ca3315b054a04e
+EBUILD cantor-21.08.3.ebuild 3170 BLAKE2B 5e260aef0b71f0fcc9ade354665c4d055a0baa7c5e5f894446ddca12127d105114ea9fbc660308d0369ccaaba97ed8b22f3fe17fc16bd47fc1ef376dd42d094d SHA512 fe3534798fc9f6f49afb99ffad0e3cbc8da413b5a8d692c4e470c66e1510d4dc428b02edb3c57f0c6a38c325e6f902ba3de43807dd63de92c730deda18e29c86
+EBUILD cantor-21.11.90.ebuild 3173 BLAKE2B 2264ee9e2baa68e29779fb3e72a30fbe2e4eed8571752207d0f7dbcfdb2a75e30c3bc832b128b3446bf0e92a72d96b9e27cfde09ede15c22889652df0748dac8 SHA512 9e1617cd0f367fb084f7bcc7429afb1c356232d3546915c64b080311b3dcaf405bde6a0f080b00049352b73a6a3867fd863db82361a3b6f8b3e8ffa733074f7e
 MISC metadata.xml 650 BLAKE2B 17e2c2450044a29836367e9865208517282c366a9389fe1d06aaf823378cd80e73e07e936f10a3b743fcc1cbc6a56f72c7a10863ad3bcc88ba814c3177758d05 SHA512 028a011e95df450d9b92397fcbb0ac56800e1b336c33ed96506c49fc903f6a4474e65221cdd8da3b9a4278830ca0c90a7f562da028088e32ff7e46bdb5b06ae2
diff --git a/kde-apps/cantor/cantor-21.08.3.ebuild b/kde-apps/cantor/cantor-21.08.3.ebuild
index 991ae506b3c7..99910c4a95b6 100644
--- a/kde-apps/cantor/cantor-21.08.3.ebuild
+++ b/kde-apps/cantor/cantor-21.08.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://apps.kde.org/cantor/ https://edu.kde.org/cantor/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+analitza julia lua postscript python qalculate R"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/cantor/cantor-21.04.3.ebuild b/kde-apps/cantor/cantor-21.11.90.ebuild
index af7ad1eb2c73..5bcdff52038c 100644
--- a/kde-apps/cantor/cantor-21.04.3.ebuild
+++ b/kde-apps/cantor/cantor-21.11.90.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org lua-single optfeature python-single-r1
 
@@ -18,17 +18,20 @@ HOMEPAGE="https://apps.kde.org/cantor/ https://edu.kde.org/cantor/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+analitza julia lua postscript python qalculate R"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
 
 # TODO Add Sage Mathematics Software backend (https://www.sagemath.org)
 DEPEND="
 	app-text/poppler[qt5]
 	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qthelp-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=dev-qt/qtxmlpatterns-${QTMIN}:5
@@ -71,8 +74,7 @@ RDEPEND="${DEPEND}
 		)
 	) ) ) ) ) )
 "
-
-RESTRICT+=" test"
+BDEPEND="x11-misc/shared-mime-info"
 
 pkg_setup() {
 	use lua && lua-single_pkg_setup
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 87ca8e8ae9e4..1af68310c9e7 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
-DIST cervisia-21.04.3.tar.xz 1911316 BLAKE2B 90400c96735ad0796e3e4a3407d303d1a3e55f05b4b999c23e042868d0f5be73f23f56e97df199b1d58fb359b787eebe79b236bd13bb8d17320495c1780141e7 SHA512 bc1e39adb48f24c4ea687871109a5c6eea8c389de4599a12e3489b523081656414a4f8cab42e1f0e077542c1fabc7663d7105c655f9aa1c50bfed55471a57b68
 DIST cervisia-21.08.3.tar.xz 1912392 BLAKE2B 17524334d797793f2029046a7914fbc6fb846a36cf675daf6dcb1205412c18268b72102290c8eb9cb61bce3977050f98715dcc84383c4a19555f6b6ea49d688d SHA512 6361ff9a3892d6245744e1cefcdcfc1dac534c649280c0c06dd3e53b31d5c87289ab183cb4e6c80a06f6df0f7859e226a7c1a424ec384e83fff4732482661f97
-EBUILD cervisia-21.04.3-r1.ebuild 1095 BLAKE2B 7b4b1b0226fdc8be83c75b1b308698ed0859aff42e9eed4249e016155b80902357625b5929eff4258c669886807efd934c7aa6f6769e025f11c4779d513feb5f SHA512 2dbae3e07c8c251a84f3b5bcff68aca69c4085467b450196a39ae00e862cddcb7949c88720953ad1493746a512715f2c8bb62931d998ed4c43b7ed181a5232c7
-EBUILD cervisia-21.08.3.ebuild 1105 BLAKE2B 182006f4fbc5b0f132ff24cfc5eb6f0094a799436e9eab234b13bdb697e9ffab0647665d194aa130544c6fb30bf1ed050b6b6ee83ee3d05db698e0a8595dd31e SHA512 ab948e0a4cd0bd19a9ff852c8d5fdef0a58f985b3c9fc728ddaa103441610703d744dbed2e064300d2bcd99f476f3d0a0872e88ca792d469598889b4a7ef24d9
+DIST cervisia-21.11.90.tar.xz 1912380 BLAKE2B b3105a0b3336a712ad337a6395877a7ca56166f8b3ee4fbdeaa5089d827314bedcd64b1e5b1b3d84dde1feb4819d8ab98377a543b692b6cf5a30f9c1a2ddc778 SHA512 41d58327dd1b05dc714e957c4dddfe404d0a90fa65c47b6bbe82f5e06545e13b400d9d52990241779999a9a1069c0eb6d703044c3ec293e0e43c770c6d6cc17b
+EBUILD cervisia-21.08.3.ebuild 1102 BLAKE2B 4855e2146d88638e28b70ab08e986832923fc7c4dd1421a9598c21253b8837f84f9800c382888f00a0d230db47b5521a30cd6e2827cfc443d897b7bf0f7bf5be SHA512 36afc6e69eeb744a7d470a3c98f51143ceed6e15cbdf6c9902c8296122664d8be6c6a97e71ac2afc2e2bd38926b9786e90539618c7e71be78a46c3446a2114e6
+EBUILD cervisia-21.11.90.ebuild 1105 BLAKE2B 2801cf8c2640917b6c09f481003dc324fa159594ee7ea1dcbda8d4bbf8e040f047f0060d6f80884e30d393ab965908d9bb4bef1f51748ce64c364cb0a9e83d6f SHA512 5ec762d5ce80699880f9b67a37547752d2f02b28c313d20c07ba0ed07dc5bd852175edb6b1c33f22b2f68103b9a37c4524a4e78f8bc9ce34300a52d2bd7d8e7e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/cervisia/cervisia-21.08.3.ebuild b/kde-apps/cervisia/cervisia-21.08.3.ebuild
index dc8272a685f1..7c20a9eb9b8f 100644
--- a/kde-apps/cervisia/cervisia-21.08.3.ebuild
+++ b/kde-apps/cervisia/cervisia-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/cervisia/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/cervisia/cervisia-21.04.3-r1.ebuild b/kde-apps/cervisia/cervisia-21.11.90.ebuild
index 756ac1ba47c7..9fc4d3cc3b70 100644
--- a/kde-apps/cervisia/cervisia-21.04.3-r1.ebuild
+++ b/kde-apps/cervisia/cervisia-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/cervisia/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index 80a5acfc108a..1f1dc2684484 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 DIST dolphin-plugins-21.08.3.tar.xz 254604 BLAKE2B 9a7a9c7a1cf82d458c1fd0bbce6b47c233b8a7a20bd1d1696bc75d6b04c8e4a9d6464025d8ad39b3bb96b8dd428fb880a5d318f7c0d13ef3bc8bf24a42c24169 SHA512 2fb7fbd6490d768f3eb7d756429d858337b8088a7c87836ed4a54fc3f863f50c4973bbe2ae149d53d2769d7ce3c31fbd737bc4afc74fd14260a158da83992076
-EBUILD dolphin-plugins-dropbox-21.04.3.ebuild 1409 BLAKE2B 3b045b7de049be70e0951a7be827af1cadfbb676ee61e95b035641ed8968129c5d4eba1cffda90fbd82591623a58920f93ac0eb6c5bf7d1191e3874e287a6d01 SHA512 ec32a3ec89e17bb7bfbc4ffd92ec71ed9c05681538fbf358bc2fe9dac45699cd6950fc68575b2bf81dc6a7260c896d4fff6f59830ac7124441f0f078554ed142
-EBUILD dolphin-plugins-dropbox-21.08.3.ebuild 1411 BLAKE2B 3ccb91e017893eda504d79fbd850e5b9f267752aa81377c5ca9773f5babd42ddec7dabc04e92640c6205e230ca427c3a4394460ab81309cbf838f725db36ccc3 SHA512 5085bd034bd49cc8de8c215949da70b70a37765c26f0e25127c0329fb2a29149d8b6391ab9a647976c6cdb777c99575d619df431a9c32d837ee780db2bcc280c
+DIST dolphin-plugins-21.11.90.tar.xz 254640 BLAKE2B c6755fc407b523759c0ac6c362311ee12322efd47e7a5ea4765ee08bc948e532b8e476d35ad2a16390be5150e2f94a5ce6d8cb185718160856bedc081cb4abca SHA512 7e2877666b41cf69dca6c4544a6bf9b6f0d6a09fbcc26c44ca0a3a4521caeda257af41a112ae6e26feb02d1ef7f63f7cd0f417b5b0f04367a65c83391f29dd64
+EBUILD dolphin-plugins-dropbox-21.08.3.ebuild 1409 BLAKE2B cc9f9cb29a67ccc954003fbf047a152aa33663a8895b761a15573a8ccb784cb5ebbe76ec0187f1fd25c181eaf7115aca1a4ae031fa1862cd71385819f522ab37 SHA512 bc7c76c826a280454af8cf477c9f6d3e41abf22280e639fdc507cae86b4581a29f0b04ab12b7d7a8509ae17624dbcbdc8cd1407e7301b7b352aad5c8a7bacd50
+EBUILD dolphin-plugins-dropbox-21.11.90.ebuild 1411 BLAKE2B 3aaf88fb5857c78a399e15a3da2295ea29d5c4113e85786232d56ff1f1316e14561717dd16d7267f4dd32a2056d1ffdaf3d4e06f1c9f939e6e34281c26989682 SHA512 441ce5b1fde88ec3a61e83df42e66dc7b3129c4b4007d6050ddf5b09d13207e608e052c9bfd29c925283c62242ada1065b32020da613d479743dcd48734ac060
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.08.3.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.08.3.ebuild
index 51c506b612d6..cd2b09c0da1c 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.04.3.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.11.90.ebuild
index 2df3e7ee3a83..0d9df94bf891 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.04.3.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.11.90.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="false"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="dropbox"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index 863d1490009b..42f54fbf10c5 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 DIST dolphin-plugins-21.08.3.tar.xz 254604 BLAKE2B 9a7a9c7a1cf82d458c1fd0bbce6b47c233b8a7a20bd1d1696bc75d6b04c8e4a9d6464025d8ad39b3bb96b8dd428fb880a5d318f7c0d13ef3bc8bf24a42c24169 SHA512 2fb7fbd6490d768f3eb7d756429d858337b8088a7c87836ed4a54fc3f863f50c4973bbe2ae149d53d2769d7ce3c31fbd737bc4afc74fd14260a158da83992076
-EBUILD dolphin-plugins-git-21.04.3.ebuild 1521 BLAKE2B 5725bf5733960bca71d3575a5e7fb4339b5f8761c3220426872cf169db45b3fe4bb8562d0067b4d2ee9c1440b79b463d5cc09672b9d1acdb9220ae6e78e1c7a1 SHA512 9335788fd713de8de4acfc1a4a4c422439cc7c8882b97d72b2a52e0fadf4266aa81f069606284f0f907460ac0edd3ea3653874ff402a95ff399ee618e88a1f62
-EBUILD dolphin-plugins-git-21.08.3.ebuild 1531 BLAKE2B 57a809a305cfe7cb7eb782a43694e69d90f63f754609e330a04fed3470c2482874a90addf085ce953bf2d775db514bda222ef47228188e8131b66d55df404cf9 SHA512 16de9cedecb82e370a9b7d3ec0481702a6b4b0673a3da76ec3a35316236a3e4882babed9edea1ffae8ff24d62af71c5cf32231ceec889bdd2e072a62d4555caf
+DIST dolphin-plugins-21.11.90.tar.xz 254640 BLAKE2B c6755fc407b523759c0ac6c362311ee12322efd47e7a5ea4765ee08bc948e532b8e476d35ad2a16390be5150e2f94a5ce6d8cb185718160856bedc081cb4abca SHA512 7e2877666b41cf69dca6c4544a6bf9b6f0d6a09fbcc26c44ca0a3a4521caeda257af41a112ae6e26feb02d1ef7f63f7cd0f417b5b0f04367a65c83391f29dd64
+EBUILD dolphin-plugins-git-21.08.3.ebuild 1528 BLAKE2B 487443122d554bcdb3dcba61c5bcf5038bd605e469ec1240852d21a8183fac0fc49692a4cd15ae313e6c3441f7fb76ea017a6e10eafa72ca9f05b006d8902932 SHA512 1641fbfda4e275a3eff59da5c06013c4d0434471b6d712d7645ca7aa3824b08f178c50008926cabcd4b2cf112a7dd0eb6c638198ebd32b56391dc9b51fe0026f
+EBUILD dolphin-plugins-git-21.11.90.ebuild 1531 BLAKE2B 55700b01da874a91b775d279e59018e64bf9405d354fdfc89fa04cf0b49744a3be0d5f3305e386803f99d4f8223ad342562bbf74545325d2714f0e1151623a1d SHA512 cfd1929676cc474191f6f94072fe5787ab7196ea652e32d852ca19dc0b729f1b8584cb20025838733f8a6b73753c01d7b025f50460433e490a61074685181730
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.08.3.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.08.3.ebuild
index 736df8e98190..c4b03479f54d 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.04.3.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.11.90.ebuild
index f59715c3f8bf..4362fa9a52ae 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.04.3.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.11.90.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="false"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="git"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index 988aea0e1324..8db3a0b72102 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 DIST dolphin-plugins-21.08.3.tar.xz 254604 BLAKE2B 9a7a9c7a1cf82d458c1fd0bbce6b47c233b8a7a20bd1d1696bc75d6b04c8e4a9d6464025d8ad39b3bb96b8dd428fb880a5d318f7c0d13ef3bc8bf24a42c24169 SHA512 2fb7fbd6490d768f3eb7d756429d858337b8088a7c87836ed4a54fc3f863f50c4973bbe2ae149d53d2769d7ce3c31fbd737bc4afc74fd14260a158da83992076
-EBUILD dolphin-plugins-mercurial-21.04.3.ebuild 1649 BLAKE2B 05bdb6e39624be94bdef2233d4564619f412dce4db60b9ce3f59f696dd9ca4cfd55ce5e1cd5ba89cfbe299c9b26d64d859f8ae54511ea202e12eb3bd2ebaaf57 SHA512 e5b6de55e30583414cdcd50a225e0e3fc657abaedf2375616fe7ffe3a82be697b6282687c940b58c52426fa703384cf7a5ed973d7e5b4e98b282a92a06eb247f
-EBUILD dolphin-plugins-mercurial-21.08.3.ebuild 1659 BLAKE2B d99c33fb0ab0a2e8965ed8e7919d1a6c856595966d7a01e86f2a3373757b514632f572ffd9616d6c76b2604454af3b6943a39dd82f3b9b80fc431ab8884c95c0 SHA512 ffc6c159203ab37c46450032b0fb7579f3bb21bc1ede8f1776371a0787a309f6f5e3a25913fec2142fd72ec08556bd56fd74b31c42e778ef3c7b473c37f8a58d
+DIST dolphin-plugins-21.11.90.tar.xz 254640 BLAKE2B c6755fc407b523759c0ac6c362311ee12322efd47e7a5ea4765ee08bc948e532b8e476d35ad2a16390be5150e2f94a5ce6d8cb185718160856bedc081cb4abca SHA512 7e2877666b41cf69dca6c4544a6bf9b6f0d6a09fbcc26c44ca0a3a4521caeda257af41a112ae6e26feb02d1ef7f63f7cd0f417b5b0f04367a65c83391f29dd64
+EBUILD dolphin-plugins-mercurial-21.08.3.ebuild 1656 BLAKE2B fd69b390539604bcd59a98f9cf49b5ad69e85fddebd898456d8a6787e2117b699638770bbfd6eb3e76ed96d6730674d2ce13e2fac66b6a04bfd1d88d831a05fa SHA512 66b92f702495ec172fcdd63a455ae0700889184db2995fb5e0caba7e88e6f71d15dd880f7cb6fa1e029835bd56eea01994d239f2c7f4518e1a098be232d52dd5
+EBUILD dolphin-plugins-mercurial-21.11.90.ebuild 1659 BLAKE2B 73760b9ed7336b3af74d866ca9039963cc7f4f7a5a9c7929646c533d1c868ca8ac3348a9719de1b147cf6472031c358cf2d28c9545060521997bb5e38666be3e SHA512 e21627632ec5a7aac16cd6c77e86d5dbe6d0edd0d0cdf72c9ea954e968051640db3ab9b611667f32c6a43b6288331e2c22b2c66f549902a1ac559197daf0cb2e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.08.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.08.3.ebuild
index eb5f9463efc1..3ac8509e36f1 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.04.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.11.90.ebuild
index 4780aedba340..d3fdb5cd4d85 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.04.3.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.11.90.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="false"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="hg"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index 578dfb0af7f9..f736ba8eb98e 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 DIST dolphin-plugins-21.08.3.tar.xz 254604 BLAKE2B 9a7a9c7a1cf82d458c1fd0bbce6b47c233b8a7a20bd1d1696bc75d6b04c8e4a9d6464025d8ad39b3bb96b8dd428fb880a5d318f7c0d13ef3bc8bf24a42c24169 SHA512 2fb7fbd6490d768f3eb7d756429d858337b8088a7c87836ed4a54fc3f863f50c4973bbe2ae149d53d2769d7ce3c31fbd737bc4afc74fd14260a158da83992076
-EBUILD dolphin-plugins-subversion-21.04.3.ebuild 1481 BLAKE2B 082f39f169e8d4e5e04da56184c3614110838219c0b52189822552a50135c1c5fbed9d0533fb98da24c7550b3467e6f1cc5d5cd3ede6a948b5579e35e0b495f2 SHA512 fead999386142abde05ecfcc12d977111acddd930cceee04cf68214254effa713db83129e4b8d87465125dfed8058977892c69f507fc9bc9b09cab547a38a167
-EBUILD dolphin-plugins-subversion-21.08.3.ebuild 1491 BLAKE2B 1a6b68ca3ab0396e4212c4d1a957e886983382268683ce04adeaf6b64c7fdb21aec88ca90626b79004503434ad17b3c6ea6b0c0c02a4d7a6f1cbb7068d0debc2 SHA512 eaad98b36dc6367233eba7ccc81188caffe01e59a7853485ae1e0f7adaa33e87f313feadd15702b2782c5de729f1b47e04f2ed38e07afd6baf169347f1c4c73b
+DIST dolphin-plugins-21.11.90.tar.xz 254640 BLAKE2B c6755fc407b523759c0ac6c362311ee12322efd47e7a5ea4765ee08bc948e532b8e476d35ad2a16390be5150e2f94a5ce6d8cb185718160856bedc081cb4abca SHA512 7e2877666b41cf69dca6c4544a6bf9b6f0d6a09fbcc26c44ca0a3a4521caeda257af41a112ae6e26feb02d1ef7f63f7cd0f417b5b0f04367a65c83391f29dd64
+EBUILD dolphin-plugins-subversion-21.08.3.ebuild 1488 BLAKE2B 8dd924e4f24fcb093afad67325ef04b96f28b8c1fcfbf76b32e334f9ce5280ab57d8d231653653460751676fd9cba2a36f5335499ab70ab720ddffcfa543d4e1 SHA512 70034ede5a08018e3dee5fa2360c5b05da9d6b5d4aded7f9d0bfa14bc3068c64875a4482419b666e8e199110b7032af9bb12bc7082192339c9219fb6feb5bd4c
+EBUILD dolphin-plugins-subversion-21.11.90.ebuild 1491 BLAKE2B e4c22a2548779519ee927f4eec8c84bda8c3c39da450018bf0d457cdd0d8f50e3fcb3b67fe77619dac5c8cf4dc96f580da67206a21d3edd43e531468ac76da67 SHA512 0be92d8c6a17c23ddcb291418d5a46c8bfba2ed78bf1df64bb1eb73f4489cf2f6fdbba7d74370892e678859559268c183f983f1e21859c730ed6d2260532410d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.08.3.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.08.3.ebuild
index 41fbd3d275b4..6082e08a7f75 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.04.3.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.11.90.ebuild
index 883156f5fa63..6f6842984b82 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.04.3.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.11.90.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="false"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="svn"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 20fc59c5f574..b7783012a35a 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,6 +1,6 @@
 AUX dolphin-21.08.1-port-to-KTerminalLauncherJob.patch 3579 BLAKE2B efcff49c7089d419f8c62b93fe0a5ef6459055a1a761b34c0bb40c20bf3c5a17daa1c1e77974158733573f479125f0c53985ba38547d07090f15f65907fa41c2 SHA512 35b21983204583aef7dd980faecb8c33eb88f50841f8b9996c3f2784393cc1d9cff85e57581cd3c380bd62dc51802979be9882c4d4d1102799a0038f734176f9
-DIST dolphin-21.04.3.tar.xz 5228312 BLAKE2B cdfbde0789b5c2dfc31d61e8c37b47e82a31877da9437770c463149b33ee46d4b5b1866aa38b1991f12e878ea27f4424c6b162113d87a865e0bcd815941abd4e SHA512 bb7d2f342aecae3b424aef93591124a5ca041e5e75909ed43c6202bc7cf7ab0e34a883050194b6e71f71425b2116ee579e67016205a648de6d5e5b0d01bf3ea8
 DIST dolphin-21.08.3.tar.xz 5327496 BLAKE2B 864016bdb3b30c181eeb158ad0b418c27556f8e0d1bcd2da495cc387667a99e655abcd320a352157156443ab91bd2b1820dce7cb10a4b8d226b5b07dcb46b167 SHA512 918be8ff9ac01ce9e9f0f575a31e70687b24edc08f022cc991922a136bda5900f5cc431b056d2aac8349858e3b9592c365b1cfa8e4bbf01f86eb7be8cbca751e
-EBUILD dolphin-21.04.3.ebuild 3135 BLAKE2B 0e8fdf0027fc4ab4e65b69c6dd5d8a244e4e6c1e296d98a68fe66bdb2fd089de3d8e6342321284c00ba7955ba325f6e799befe15b8dc95e0444e22a09160ccc6 SHA512 3503db26e163eb777b07dd44df6fd4e249edcbdcf006b41ad21e387a46e4d858af57adba4cd70ed9ae7d524ea780a444a0546a6f8a3fcedb4df4bee0d697fcdf
-EBUILD dolphin-21.08.3.ebuild 3199 BLAKE2B 04df843816ff89734e2d3181f08d1f0a3b5f61d780d4d411be198bcf0b38d0c238905508580f44ac9c7b88345c8e2f590071ac2cb4d590d816f1ea9e783b17ae SHA512 ba82d256213dec853fe700c698065a499bd6b14d05486bf27d391af086bf8841498b3633ea72bdf0adf18ff21a05a2f98c4e0f2e052f22b7168cbdf32ae3d42d
+DIST dolphin-21.11.90.tar.xz 5320224 BLAKE2B f79416229f2f6afa09e4b4ce377a40cd483219a28e426db202ecb80530c1f61115aad7445ddc52ad0a29ea1e895f7ee4d470c53fa6a0f213117d83ac568cfffa SHA512 a86718bdead1c5ae7f92e6bd4a8b51d4f41bf4b94ae4bbc577447261a1a248207695ee6a9fa5b297d64a8f12ad08a5b287a35872ad720705cbc56d22e09b0257
+EBUILD dolphin-21.08.3.ebuild 3196 BLAKE2B 3fed89ba33ecfb9ce3874d7744cbbba87d60a9791b9696c9b1520cc3704e5e40f76e2982ed34dd45036fede9ca8453fb1ea15b2ff6b7d3601627df38fdc8ab70 SHA512 0e33f63b889672fbb955e4fe7a8bfa1e9b76fbd887f82bfbcecde0c1a990f9de0ed2d7846115afc4d843caf9e28c1c13336679e82a5814aea6d2d6e4a8a4ffa3
+EBUILD dolphin-21.11.90.ebuild 3105 BLAKE2B 14f12b269037ebd1c3e614c574234bb7e6c1858a933440d7f728b6fdb71928f2171b49052ffb27c13f9d996aedfb0302ae13cdabd542f42da5c92f7be34342f1 SHA512 6dc795b4e7a2e42ef77226b970de91b91d311e940845eac4b30a4126d194da6d661524d2db6e09947cf101d79b5ca8a8a14a594290346025bd4f833df185beea
 MISC metadata.xml 430 BLAKE2B 4e7f2312a9ff5828bb5090867a1cb3f8e80365cf7fe92e45973ee6d1fbf1bafaa9427227b6cc424214b4892c92188918c36e25ca346a89e44e2b2ea25d2871b8 SHA512 cd3e017e0c9259940450a1b7a6fa5b8c81e82963b3c4d63b0921474f42651076a0fd7c3dd90d8a23b57646ed6eb2ccba8fbd41944d4e874a4e2ac58c981a68c0
diff --git a/kde-apps/dolphin/dolphin-21.08.3.ebuild b/kde-apps/dolphin/dolphin-21.08.3.ebuild
index e3ca21e3fc62..9160d9e3ad2d 100644
--- a/kde-apps/dolphin/dolphin-21.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-21.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="activities semantic-desktop telemetry"
 
 DEPEND="
diff --git a/kde-apps/dolphin/dolphin-21.04.3.ebuild b/kde-apps/dolphin/dolphin-21.11.90.ebuild
index 4eedb5305071..f2d7a4d2f119 100644
--- a/kde-apps/dolphin/dolphin-21.04.3.ebuild
+++ b/kde-apps/dolphin/dolphin-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="optional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="activities semantic-desktop telemetry"
 
 DEPEND="
@@ -36,7 +36,6 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5=
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index cd1c38eff3e6..232d5f167f52 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
-DIST dragon-21.04.3.tar.xz 1665740 BLAKE2B c19be546a60b22e54e8d7734d9bd2b704e6540b520882e48bf90c7b470ba11059b9b8a24ac0627bd550c3971f409d1e8b9adeebf2d870cab376a663fc2ecb19e SHA512 b3d55168fae08617f2733407f199e1389eb088a6f82d6d3acae52c434a2f9d100fc8a183d76654ce305eb95991f2b82d01eb0f76a443bac59ddfd0133b14389c
 DIST dragon-21.08.3.tar.xz 1665620 BLAKE2B 9c4db73f58b66a26a8ae7fe8afb417272b582acd9154156aa1000729668ce203cc165a382fa61a3ec5c1870ecb967d57a4664c7d90d59014d9aeabe9e67cbb66 SHA512 171282fcba4fe89d9fa91500d0f7aefeb3f265fd77f3bd497135479f3ce3a5068ee2f2099a75b76a0b09652bf09fa1703748e445ac6d40f29c30c2b828519307
-EBUILD dragon-21.04.3.ebuild 1141 BLAKE2B 275fef4877c6d72b59396fb0ff5a646de4056438faa445c490f7fa8481bdc16d9fba5d478e84f9df81a3cd6760cb39650b745af5a329ad16d422f924650ed528 SHA512 e7a59e7d5bafb2bc1b8950a2e8bba17368d0eafa1605b4d44b658e55eeca8405cf48031442b1fe68fe2bc98ce1feb0e5476b1f43906c1aa7885f5c9c64d1cff1
-EBUILD dragon-21.08.3.ebuild 1151 BLAKE2B 50fbb7100da376c32fa36121778165bc40393c5c8bd3cc69dc87b887492f0f7b4f5673530ccb3df4edad393af92ae1da414e8a070155ba9e6fedd5f59add6881 SHA512 2147c0377e7e1ec052d782e67e468838f5aec2f567b503df8a68203ded3b03ab2465ccbec576e8c87e7cdecc1a8efe9fc8fae9a170db6ed6b7740d498855f61a
+DIST dragon-21.11.90.tar.xz 1665356 BLAKE2B 30b1b8cd7770c80b68e7509fe5aed3268316628b2851176ea1b8392ecc9687e49508ca900b8e0bceaf072ac8cc948e7d3fea5f581bc55b751dae2b5e1409fd48 SHA512 c72426d06d65b3783b5eb999eb0ef1797008281202d737ef69ddd546b67d5f8709a05ee8ebd00cf97c2efbdbac0036454b204023161843417ec52ef98e18cfbc
+EBUILD dragon-21.08.3.ebuild 1148 BLAKE2B 67fca317d00453e9597faa7849b3f472fae7f568df0fa7ab6514c156308b18903b4ffe58486262f832b7292c21809b9dac98d79218545be3eabc17ca0dfd72c4 SHA512 dee2bec284d1a1bca04f8f3aa120ab769ee5db34430e10d26a6d6bbdd89c4e0c0852df82d6a50f0cd40150ceaf53ec2778aaada23a1ebd05eaa57b82335ef508
+EBUILD dragon-21.11.90.ebuild 1151 BLAKE2B aef04716d0e687f2f41c3463a4410c58fb5c922b272e6ec0083644b0d8160b38421a5e9e910170e433eec8441a85371f8d0ad1babbf8dfe081133acb09c6ecc7 SHA512 b577f769e30dfec816555d3d03573b755629b5a95e789549eeff7762fc108f01a7c0558ac0440cc31dbfd65081be0b22fb7aac1387911d979aa584d422146a9e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/dragon/dragon-21.08.3.ebuild b/kde-apps/dragon/dragon-21.08.3.ebuild
index 0ec9850b24ed..9d02f3d2ce9c 100644
--- a/kde-apps/dragon/dragon-21.08.3.ebuild
+++ b/kde-apps/dragon/dragon-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/dragonplayer/"
 
 LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/dragon/dragon-21.04.3.ebuild b/kde-apps/dragon/dragon-21.11.90.ebuild
index 04c83dcdd1a8..a844b7e832db 100644
--- a/kde-apps/dragon/dragon-21.04.3.ebuild
+++ b/kde-apps/dragon/dragon-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/dragonplayer/"
 
 LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 0d11e80ae22e..8b8526cd7d5e 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,3 @@
-DIST eventviews-21.04.3.tar.xz 452428 BLAKE2B 3d82e1596a25b024e9583eb9d0294e2e9f931d531d0163ee4d77f42d1ac1df30703ef1636028d06b3cf15c3bcca2aa901ff2e24c9c7ea86c3228d85ccc5b70ef SHA512 f8c7d9cb2993163ebaf2707b35afb346900405464666b71835a4b365377a4353a3b53af0301f870aa2529b071be0a46a748abc18db84b46cf3b5027882e08a36
 DIST eventviews-21.08.3.tar.xz 452628 BLAKE2B 70e29d146d20cef9c9012fae3fb4f8b108769c57514eb4ff344f63ff4a4104af00255e4363b286ad5524240b984880303d0a4d5d85bc85021b72a4be4c8c3686 SHA512 1666954dc7eb89c4905dbfbd205af5bddd169d3232c87825f14e31363f658c84904afe67b057d8499637c446223f3270327142d7515fe9697f413cae4db66e45
-EBUILD eventviews-21.04.3.ebuild 1201 BLAKE2B 4edc9a7ede0c6f9544b7cf3c2ff0bed6152a667a6fcbce1058fcdc6fc164d4b9cc85c5f8dd37851b678ed8e1a407b3c9a45ee456ec0149bb88b9d1d5e288370d SHA512 526be71f409802b4982648d0500c75d1ef12800b668627fcc3b787d4156afeecc5aa9aa2ab6a5e5557c3f9019cf8a4e1494397d4292215abf7c0a8e89887d592
-EBUILD eventviews-21.08.3.ebuild 1204 BLAKE2B 853eae550d67cd9a198a804e5e38cee6fceef49c8d8b2100dd1558d40b009266235dccc7ca8e141b4b420b767d1b5dad31a8bd2094cb97bd01f4a893d6177f3a SHA512 eb60cfd0370a9298d569a58116797773b3d6db52625d5e3b9125900eb66c16efab7ff07ce754069866737ef9a2a3163bd0876f060f79b58efcb324aeaf2abb8a
+EBUILD eventviews-21.08.3.ebuild 1264 BLAKE2B 779674e81e68ce15c0df81b6a3393366282783259378413862fa2a1ff5b1c224b3a365185734b132b1e5d72861ef8fafe2ad85d6dfc56fe269aa8d1eab19972b SHA512 a47bd9ab105659c1a4a8ce9c33f3f100ff64eeead04bcc1a4792f07a07fa7ee22d41de1a6497efdfae3061fd59124e4fe869d14b26d2495c0fc2ac121ca985e2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/eventviews/eventviews-21.04.3.ebuild b/kde-apps/eventviews/eventviews-21.04.3.ebuild
deleted file mode 100644
index 8656e08558fd..000000000000
--- a/kde-apps/eventviews/eventviews-21.04.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/kdiagram:5
-	dev-libs/libical
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/eventviews-21.08.3.ebuild b/kde-apps/eventviews/eventviews-21.08.3.ebuild
index 6bd1f17a61ce..60ff974f977b 100644
--- a/kde-apps/eventviews/eventviews-21.08.3.ebuild
+++ b/kde-apps/eventviews/eventviews-21.08.3.ebuild
@@ -7,13 +7,15 @@ ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.84.0
 QTMIN=5.15.2
+# monthitemordertest requires a display
+VIRTUALX_REQUIRED=test
 inherit ecm kde.org
 
 DESCRIPTION="Calendar viewer for KDE PIM"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 87292f553ba8..2b24a82a173c 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
-DIST ffmpegthumbs-21.04.3.tar.xz 33620 BLAKE2B a20fc3791c5a85fabc6019b5467ff105a1de84d32a17337b6b956e4259175ce06c8f0f6782def58bc76acdbfe1130650369a61b51dc1e7064b5b3122bac40690 SHA512 a52ae4b51611dec6822c9817e90f62379ee0a7bde1c00733dc49533b0a189e95efe82a8316d098419435d4b3d8ace92c33f4cd19923cb1e136f9137789eba29e
 DIST ffmpegthumbs-21.08.3.tar.xz 36996 BLAKE2B 0c0f214ebe3a420afbf486de08916bddfe752199bd01ff11f2ca346ca40fde41bf6704b9d05ab35b03c92a3c689d8de8adadd524222c0d6ddbbb0c2da79ed771 SHA512 b1e232f0ab9f0acdca6307fa0167ab64b2eea97725bea81ab1fdb12a14c3ac3001b2906ce289afc00a7a6bf26b7c905cfa14afc62e5bd0ff45edcc94f1c70996
-EBUILD ffmpegthumbs-21.04.3.ebuild 560 BLAKE2B 3172682fae508fa88a08b9e0fd87534781b0931a94c04cde6e35a9616857e6fddc8d864842475493bab5c0418facf141c735b1b1ffd009293c43f57bee13be06 SHA512 9cb845238a6a84caafa99fddf136285bb63414eafe3cdd52935ef5f3807dacec3ee67591aaac8931eff299babcf91da167b271b9c442f528d031879c13d09e3f
-EBUILD ffmpegthumbs-21.08.3.ebuild 570 BLAKE2B ff03cf030fbf839d0979806010082dae7bbd9f72dbb91b2d8d74ef0cbddff383416bd909386bf62c14596d08296f784e3ad9f512ac6321488af299dc6257cc8f SHA512 3a2bd97ea73bf6c9b9d1e0b5ef0aaefbba0f9d397afb104cf9f159f9592451daaf6fec48f389f7daabc866fd8e0042ebf1abd6e5e8539c748ddfe9f3477aa9cc
+DIST ffmpegthumbs-21.11.90.tar.xz 29956 BLAKE2B 97268aec90d77998a933c837fcf83a88c84c20fd42135cc87bc8b4738a7f6f98df51f00049aa8992b1bdcdaada3f6c5f01b42d501e82e9e7ecc87ee6cc44141d SHA512 8112177e8f723fadc20dfa15c7dbc5ce84cdb21b98b2f5dbae6a5a39aa661fe8915d2cb175bd368998f70101f8c27f674b8de9f5031e45586c9941129432ccea
+EBUILD ffmpegthumbs-21.08.3.ebuild 567 BLAKE2B f90758159b1adaba34dc66d030b4c23b8cd22cb116ca88688493f0727318088ccaf7c4f0f53bebb2d286e47494bd6b9b0b5ca9d293ee9d4b8b6e0d74f80571f5 SHA512 6dafac8202ebe04a4986ceb641867e3e60f0bf20f133a98d7454720714cc0858f5a67bc9018beb25eac6458e9aa2409f7fbc3ee1a5bd11e49bd24bede2776545
+EBUILD ffmpegthumbs-21.11.90.ebuild 570 BLAKE2B 678131888a00a9a7c5fd07a73640e3540b9abeb90d95c3734e4e1c41ccfd435499f5c7ebf460e0d9f2689cc155e995bf59a83bd0e7caa279af92792cb50dae6d SHA512 ee23c2d90644b8e4c905c853567ce6c45317a99f4adee23df637549af246ac28920625ab123d431b619eb7684f8d55bb99e3f9678739cea6670be869fc6beb1f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.08.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.08.3.ebuild
index f967178ca354..a259b82a2569 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.08.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="FFmpeg based thumbnail generator for video files"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.04.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.11.90.ebuild
index 7ee84a2ecba8..b1b7faf70764 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.04.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="FFmpeg based thumbnail generator for video files"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index d2d70d1522c3..eca4c9a0f9ee 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
-DIST filelight-21.04.3.tar.xz 680804 BLAKE2B 5d90c567752923d89f0a896cd9180e19e834674c0f10471ca301cb004b1cb56aa9946799a34000f94834fae7091ee58aac871c336fbca8e36d81015051eb86d6 SHA512 7f239b0bbef95a111407d85cd7da6f9523a3b12e8ab13a29b4a7f661315e47866bf04a9863464124edd14f4e35b4d45e23cfafe059bd325b7f9f6ed3fc416a7d
 DIST filelight-21.08.3.tar.xz 683604 BLAKE2B 0ddd8c101b38598787d1c78cdf098830158870e1ac9aeba1a8cf86f38ad32a05f3fd5c2f91d1cfcdb8dec4b402ca3026cedf1f51da89046c0d696801312e7a32 SHA512 0495ccf3230a77098386399ee9b08b4a581b637c267d94229fabe949e166e757872a548382b3b03f109cb95c7bc48b8359318a48f7a34f24e4fff61dfe9cf118
-EBUILD filelight-21.04.3.ebuild 930 BLAKE2B b056461314afc5f72ed4209498d1fe8681b102aa8d8369f9753667a191edbe167546eebe852bbeeda92a1ca03567fa7a7ff69c85bf1d89c45520e01ddadda8ba SHA512 36c4abe2400eb0c301ef3b8f6c53a5296009f28eb1f78132a482a199aef0b95511da42697eb1fdc701d4b3445e6da4970f4bc29452da4bb0a182573f08dafe2a
-EBUILD filelight-21.08.3.ebuild 940 BLAKE2B f920532b4947be3769b7b70d2caaabdbf5543f70bdb74d09e2c0e06a0f842827908fea70e41b9e49476fe04d80f6b9eb2c758752ac6086fde62acfc6bf1b85f9 SHA512 7602890f1bf7f31e3a80e4d726d030e98cf3f88c63cf6057dd17e333f13815cbce1da0342a4dd13f2b6c3d566f672691c95134285de346727f4478b88bdc3a34
+DIST filelight-21.11.90.tar.xz 684252 BLAKE2B d56d5c46d60cf6cc19fc4ccfd6130051f980b1422cc1744f6992663a77957e152b08f7ade8094101bd1063d29a38a50deaaea3652a373b1b0325e4d91bafc78a SHA512 d5208b8fbe28e289957bdb7048e0b7da201f1f9aa7d6a1d4f641263ad8085a648165816d0a2d26c3cd924ad2d2cf47a29215332f55105faf4cf09ef2fe1015ff
+EBUILD filelight-21.08.3.ebuild 937 BLAKE2B 719388152723ded073b73b8495260570f73adce63c7a93b8d3f2eaf48111dcdb4b49986b5add22904a9c333a43c5db8d1f56e0f619162fd547163791c27445d1 SHA512 ae0d75017cc9005c1363e6d51b10acac32b17177f507370df773fd4f163503c2a0bfc9d58e2f307096af7cb0a275f7d0926e4c2f92e56f0136a22b312f3323b5
+EBUILD filelight-21.11.90.ebuild 940 BLAKE2B 6b5f7d851da5405ae08cd654b8d61fe115466a82ab644f8903924904807f43a51b1e1033536679ac987c9c9b77967a795914e2214d9c6aa3792507a002ed9f94 SHA512 4dd33e86451ed2a6bd1a3b9d94fd1a1eae2a89b27bf116d4dfbf4e1444c68b8eece81912f8623b84f0e212fc6d15f9cff8d0b5674ca06dee6e2e5bb018a94ab6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/filelight/filelight-21.08.3.ebuild b/kde-apps/filelight/filelight-21.08.3.ebuild
index c76f9379dda6..df16bb3c6fb8 100644
--- a/kde-apps/filelight/filelight-21.08.3.ebuild
+++ b/kde-apps/filelight/filelight-21.08.3.ebuild
@@ -15,7 +15,7 @@ https://utils.kde.org/projects/filelight/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/filelight/filelight-21.04.3.ebuild b/kde-apps/filelight/filelight-21.11.90.ebuild
index d00603d9f8fb..dce4f6c68308 100644
--- a/kde-apps/filelight/filelight-21.04.3.ebuild
+++ b/kde-apps/filelight/filelight-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ https://utils.kde.org/projects/filelight/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index 8a3daccae1f2..d0ead1b000bf 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
-DIST granatier-21.04.3.tar.xz 1953060 BLAKE2B 0367f09e7189a690cef2c37a30f0623b826f1b25c4e6bfdc645ee35c4f83d40d7e6af91d1baaacc25c1c894d0f957e561024f2ae81153935869a1d3f66a32f58 SHA512 06dad7fed7c0f51fc9c9263eb6cf9b80aadcef9850596cbddad31c4f769b09dabdc4789a6ca6c6805e9dbb35ab1fb23e165a4902f0b4fa2c8ef11efcd25325d5
 DIST granatier-21.08.3.tar.xz 2095268 BLAKE2B 9064b4784576b568cf992653d347efcd56796897064cde676b24d155e7dd2824c83f9d673d8cb497fdf0f3fa3f89272faa2d538b06c355e933df4673e20bcc47 SHA512 ee5e9515868343b5b7cf892f9378b99f7b074d226203a9dfcc18ba0171f13a7cafb68993e9dca1fc8b0aeb2761bb6e62fa8e781f8e145675e2972873a47959c6
-EBUILD granatier-21.04.3.ebuild 855 BLAKE2B e82966a2b2b90f88fc505af68dd8972e3ee96edea390b10185a83d4ac12d201d8df71b2cad0a97daf642902cc050fd59345ec310f2a764f0cdaf4fb75aba7a45 SHA512 1b83ae5a690a7ad60b6ac869a39bf4791b6599a31128c05efea98538fca6ffdc81d335d2a78678f60976987d243332476723bc3b78a516af33e3cf61d4d2dd2b
-EBUILD granatier-21.08.3.ebuild 865 BLAKE2B 99081f1a49094e969aba24680c8178c7fb3e75c9d2b2e6d0f0ebfebefc0a36e3f31446e1e80db91dfbc0c1da76229b1d95b0eb1ca932001695108a5ce393d1a4 SHA512 f533481bed5a30f2b784ae22de24fab2985179895b7090a0efb26da2fa3bef4d01669a6139b69aefdfbedbea901c9f7de4456b7ac0721758e63c90a5b832f43c
+DIST granatier-21.11.90.tar.xz 2097420 BLAKE2B b252b8439ee4fe97c3ff68252fb1aa21663b622970a960f4d1338b54818e0577e5ac26763a410a56c6a8c7a45f5175e3e7d31ae6f866f0dd3dc7f0d848ec4822 SHA512 15c92ecf49c0e28a42d6da691f2f1a66a95212af3adedf7898f0b4b3a1e6b3ae93a907c941e32b4d5472309c2f3a2191bfc280fe88de2beb9a46fa8be3868d35
+EBUILD granatier-21.08.3.ebuild 862 BLAKE2B d2f5692c01df91ecbdc02a12ab0491311daea2c9fa27eb537ed21f9c39cebbf7cccc0b20ad7d7da7bfff7e9744c5bcda5b44e806d0de0d4cdadc3a37577596f6 SHA512 421732c28349ab4ca4a62ade1747d2ab9d2e6fbcd57deb0f444371a093c67a49c08dfd81df7deffa0ad6f836aa34211edeedb1ee7d0c034ee083c56479a6ffc1
+EBUILD granatier-21.11.90.ebuild 865 BLAKE2B 51af6af22714ee33fdd1af10c4ccf551d63003dc2409274435e508a20fb757db9961ca30647276955a31f51b9e655a9505be187ec6b178238e9755bf79518234 SHA512 b1b086c674715f3d28b77ba0a66407ebbc85c57691e79c0d02a5ddd7a48854384b7873b5f87121fb9bf898524fff21541ed9b46db152ab7a2fdaa32f48d1e67f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/granatier/granatier-21.08.3.ebuild b/kde-apps/granatier/granatier-21.08.3.ebuild
index 17b42e7d2362..45e66364558c 100644
--- a/kde-apps/granatier/granatier-21.08.3.ebuild
+++ b/kde-apps/granatier/granatier-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/granatier/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/granatier/granatier-21.04.3.ebuild b/kde-apps/granatier/granatier-21.11.90.ebuild
index 75648b6f7443..1367e5bf4c20 100644
--- a/kde-apps/granatier/granatier-21.04.3.ebuild
+++ b/kde-apps/granatier/granatier-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/granatier/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 96fafdec8726..aabef54d1053 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,3 @@
-DIST grantlee-editor-21.04.3.tar.xz 111744 BLAKE2B 53563fc1b03b5f984d9d6c595cfbbb906928bea00a91729025e2e39980d565a25a05b60e122a171e20fa391c98db008b8cf0212a8116cfde736d8b87548b6a0d SHA512 4e1b0a74b4115f3f4bbebdae82dedb21ac8093f7d327c77d45b3b8794d74a17562f288f022cbb11bb790a3acf4e700f9f30d7f637813bc56ac02353c0755b20b
 DIST grantlee-editor-21.08.3.tar.xz 110700 BLAKE2B 6c072f96c53e60b84044e2b5dac7428370ead55f5189955861da30214ef331ac1995224cc68b88e16c89202179f81839ad41ae2dfdbb22dbe578780d0426656b SHA512 548778314e6831dcc7fcd8be81e6408bfd66ca97d2239ddf98739fba9694826dc75a65f1b1b4ba4408c96409729f6746c2254af17da6322e025fa7014acdd4ef
-EBUILD grantlee-editor-21.04.3.ebuild 1227 BLAKE2B 72eaa0d0764042334ea2fc5d43c93d22c0b1f2a9ae5033c2b49d79928c85f1a1e3645a51e330a43c26c929f14b6f9ea4a32315fa90d6445586e5728ed34e4b9f SHA512 d8c1a0d525b056782ca79d9717d9081567cf1a5271b36f22340b04d229aeadf3b16909bb4c70b63062115719dc065a508f02335df91c309e8f01ec1f7002b4ad
-EBUILD grantlee-editor-21.08.3.ebuild 1230 BLAKE2B 8cc2a9af23ec491b98ea5d2a3dd655245b060b58b50fd3136d9a93036b92213006661bbf8020d9e87d7bc919d751039ad743dc7eddb26da6d3d01055e7f31e10 SHA512 e194578dd1878b60036f69b7db833072518cab5f99c4bfcd26fefce9d62c69f453ef8d0e2077cf9c6b25ca3aca1689d97fc5caa06ac115eedc0ca7dbad69dc49
+EBUILD grantlee-editor-21.08.3.ebuild 1227 BLAKE2B 24fba3a6ac25bed7d1024dbda7273b86f6da0d8dd1bb7f78d4eb22745b1deb34c2140ae9d33caadff3d3404d1cc8adc32cb1793f677ce87c1bb1a88c38e33798 SHA512 b6b367570fff8561697a68d24ac1f2179476438c395b37e1092186c15f6ddb663278ec5d332bc95f8fb2a4bdd8530abc97260bba2f9eda7651f5452d61bc333f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/grantlee-editor/grantlee-editor-21.04.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-21.04.3.ebuild
deleted file mode 100644
index 491fad4c283b..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-21.04.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-21.08.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-21.08.3.ebuild
index d8879fdd2cea..d63fc938f013 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-21.08.3.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-21.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index a909ae912062..805ccbb4e976 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,3 @@
-DIST grantleetheme-21.04.3.tar.xz 60808 BLAKE2B 4106d32b9374019a84fa802bb016813f6c1b5b9e07fb6d4d10dcbbc0dbd088dade489c1415e80011e5c72da55c74d3d116b05c4924e48a2f1b93f2978bd76343 SHA512 040c539212ee5247953045343a128f636aaf2c0fc0d8af1b7b3d8c1aeae9378af41f00ff7eb55cec07b92a806efa4b5b219beb9215280b6dac235cb95b9f7cd9
 DIST grantleetheme-21.08.3.tar.xz 59976 BLAKE2B 674a6918e952a61f38d0317b2828c9afa3b6e7a73c0d5c30c3d6d06880f8931c41efcb3ae1d3a9c8e7a0f33b4523967fe760a28863e6694ec5fa6caf75de31fa SHA512 96715dc50345ba319871d67dc6081736423840420c10a8bc770827501d42446a1a0a83f1001c765a972f1099e86dd06fed5feb8aed5b38959001744dfa3606e7
-EBUILD grantleetheme-21.04.3.ebuild 825 BLAKE2B cabc812eb3d4c2d5ec4e09baf97e4279ea5d69ef7f50b853724d8f93de938de6b2464b9992e178f768b80395592f23aedc6aa01679ad3a432568b682fad68cec SHA512 183c130373d549a7f5040a92823bba74f4cf151afdfaa6a7b584fa92783c9d4e87681aa6eaab1c86579696b68844b81a668ee108dd879590a312b51a2e009668
-EBUILD grantleetheme-21.08.3.ebuild 833 BLAKE2B fde97ccdcb30caf530d7955debd4f9ff3003d34f536d6a0c51bbf72bf53930b85f3e07781c9099592b1f576fdf0aa346c669d932cb4af71ce79af4c8e5ba5497 SHA512 2fd3a90abd45732804565cee53604ed226aa4f7f244a01a4f8526556c241703378e3d7732cdea0c587b62b52d2bce6e126502032cba3b21d3faf2ef3b26036ef
+EBUILD grantleetheme-21.08.3.ebuild 830 BLAKE2B 2978451447c9f906421a639c4f9b6ab35c9199aa00d976be42011515eee6fa61a0c7c380429f0abd2cf81159b561cfeea9d17378f6b70d598ac52c9381e102e8 SHA512 5c991c3e9539279db0dd9117ceb0942155520609ae5782b1b85388188579897dd65f7062b6e3e9b7c4654e8de5c75fd55f21e9d5a0f298f6456fd598636b39ff
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/grantleetheme/grantleetheme-21.04.3.ebuild b/kde-apps/grantleetheme/grantleetheme-21.04.3.ebuild
deleted file mode 100644
index fd4c4cf9f4e7..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-21.04.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for Grantlee plugins"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
diff --git a/kde-apps/grantleetheme/grantleetheme-21.08.3.ebuild b/kde-apps/grantleetheme/grantleetheme-21.08.3.ebuild
index f1dec5488532..d07ff93dd398 100644
--- a/kde-apps/grantleetheme/grantleetheme-21.08.3.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-21.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for Grantlee plugins"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 3267481bf6cc..9b7ee0cc3400 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,5 @@
-DIST gwenview-21.04.3.tar.xz 6772236 BLAKE2B 83310fd6f290b4980dac774fe46ac8455b0cfde1987ffd76a43f313e8a185381b1eb10186fcecb1a198fa0872266f28aa3d1803a8ee92c0910b488392db12c6e SHA512 83caa2da3afe552a5c48955136a54e5c53b2ffd83ee68fd5f7caee849d9d7547a566941c41f7b13973e8f292a31ad9ad9d9ccdea7f44b76cab8b2f97efe160d1
 DIST gwenview-21.08.3.tar.xz 6819364 BLAKE2B 1282c0724a539b30efd1a6c7785e8d4be4c575ab3708e3ed00ef296dad3721626ce33fd48703c5069d4ad0bce9c2c0c7b76cd3af03da44203c1fa02571040e62 SHA512 09b3ac01a456c689fe901a11002cd05e677eb4ee6bae61d18a92ded797cbf3424b0ddb28589a534c0543c38c81629925539b32502082d3b3e1ad587db5b7715d
-EBUILD gwenview-21.04.3.ebuild 2900 BLAKE2B 9a0195166f0e1d7733d0b776b3ce2db5f021f9a8807c90593d648c7202e4ce7346c7fd343c6be078bb05df9f296c405426afdc7794fa3e307e66921bb3545877 SHA512 e73dcd7aface8f9901184cc99981e900249eb73fc0d88d41f4c1cabd0fffab8043b4510fe041b97ffbd7cccf0060c874dfc9fcd38a5adced3772db63f1bd1a73
-EBUILD gwenview-21.08.3.ebuild 2857 BLAKE2B 82e4829ed46fa8573d0d31feee230ce8fbacd7bb32d35642ede8bf34af6c2485f868ded73d8d486758f0641f42ae0f29de197ed098a01bac5e8e563e8199de80 SHA512 9ebd6cb3331c0311901a4eac15d40d46d83e7a74b15e68550beb1ba3223f3567b335146a7abb21f7c25ca74a77f8ff4beac193d88066973eef1083ebf3f55e47
+DIST gwenview-21.11.90.tar.xz 6791808 BLAKE2B 33191e7edcfefcc9b8f050f5d4ea9fdc9661b92500544b35897957929c7b0a36f4d156061071419e05e431bf7f2e175b0c781c0a6850eb217928c3af0e649f0e SHA512 bd6fad3de88581052d7961cc149e904a53eb5c3ab85bb195c2d675d3e158b5f5f9837a6f83cee67b8fd50c36f3f77aae30f9646374f075086aed5d0599877b2b
+EBUILD gwenview-21.08.3.ebuild 2854 BLAKE2B 23b475f583cebb1e4192e0f2593c1c03614f701ddcce5c3144c064acee36c77287463e5bca640fccdedf6ef98e6d4221f49ddafdcfec7948193b315bac4576aa SHA512 97065bf6433de19843ee25c8c9f4b404c36fbdf2872022c8aca28f4dc784fb8f93e2dcb1be7f2120e67973f636d656d9a81cc40d44dc2ec08a707c79e5e2977d
+EBUILD gwenview-21.11.90.ebuild 2857 BLAKE2B 6b23661b4fb704f5b70badd1a426162a1095497ec678f68dc2841aa5029e631eacaf024b624340af92a30daebab5652c7c5d1f115fba5ab89827aeac7536894b SHA512 d1c3cdfd0d522e60143f3286ef7beba14055c2127b3728bf34bcd1548681f373f0e33e830d6273584aa73fab3ca24a196c2ec5a4bdec89736139888c76eeffee
 MISC metadata.xml 777 BLAKE2B ef3fd58f9e50d8bf96226373e602e9d1204e1a5a771689e46fe898d1ff2afc0a5c37efff5855e0297fe6cf532cb3e36b6417aa77570e5df62d53c2569337638c SHA512 eeeaaf6e3cd4ec8f0924517bc60b02b81badea2cf38e5fd90550b92317033ce34bb08a3636ad25eb6d02b62147bb01d6649cc4991f287113c6a90a043b010692
diff --git a/kde-apps/gwenview/gwenview-21.08.3.ebuild b/kde-apps/gwenview/gwenview-21.08.3.ebuild
index 015f3e661f38..f4dc891c5edf 100644
--- a/kde-apps/gwenview/gwenview-21.08.3.ebuild
+++ b/kde-apps/gwenview/gwenview-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 
 # requires running environment
diff --git a/kde-apps/gwenview/gwenview-21.04.3.ebuild b/kde-apps/gwenview/gwenview-21.11.90.ebuild
index f6e2a0bc9e88..054d84b5a424 100644
--- a/kde-apps/gwenview/gwenview-21.04.3.ebuild
+++ b/kde-apps/gwenview/gwenview-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="optional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org optfeature
 
@@ -15,11 +15,11 @@ HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 
 # requires running environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -30,6 +30,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
@@ -87,16 +88,10 @@ src_configure() {
 		$(cmake_use_find_package fits CFitsio)
 		$(cmake_use_find_package kipi KF5Kipi)
 		$(cmake_use_find_package raw KF5KDcraw)
+		-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo None)
 		$(cmake_use_find_package share KF5Purpose)
 		$(cmake_use_find_package X X11)
 	)
-
-	if use semantic-desktop; then
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
-	else
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
-	fi
-
 	ecm_src_configure
 }
 
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index cfd005b01b5c..56eda5b3f93c 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,3 @@
-DIST incidenceeditor-21.04.3.tar.xz 540124 BLAKE2B 044d0ece5f9ac83ecf0dc1c4cb08afc46ed6473b4fa88303f80cf8446a04608cf262f88b2b70160954607672e1ef3e2edb8d29c0b93d2f95e4a3c83f4063fd9c SHA512 65dc9257d0d6c238093b59cdaf76512938aa2aaf795e0a8e17c1c64afd75ccbb37941178a9295fcf240791e8daa9ca187184dcfd68294bd553d4ed5b9a9202ff
 DIST incidenceeditor-21.08.3.tar.xz 545508 BLAKE2B b2fd75e0830a56f5b81468e3f4796c2c38d19399c2a5d53d4d1f24420856163281d7d5f1c49a18ad19709dc914390ab5895dfdbafb5da3b99a8c3597118d0e78 SHA512 1ab847bdbb14b68ad3d3dc65a43006082fb0bddefa10048c9f7f909976d6cf975d69645a3d81e2018850679fa963c619eb92d41694cf6104495e341dbc8f972c
-EBUILD incidenceeditor-21.04.3.ebuild 1878 BLAKE2B 5016cdfe6cb23c9ffe6af174583c781992d9b156ec7bb01277204b59fda530c9b09f40c980eb86fc7b59324bca6460f28f5e2ed17df5faf69a249caca53aaced SHA512 ffbde87cdb0bfb6f20a4681c54dfe1411d1f926b7f1bf75002330169f133459502e66ffe3d40f59d4b2c321b6517ae2613f758abce3305fc670408187522ebce
-EBUILD incidenceeditor-21.08.3.ebuild 1977 BLAKE2B c703209ec60eba7f0da8e343f9d60dab24c8ed8ab51cd08c9a4d72e066d715a8d4f7435128b3b8060b86ac5c182ecaf5e07be876fb44056ade06409e2a41f461 SHA512 35135566cef6ea063587d1acd306befc193b0e22a93a7100ecd241bd042f3bbb7d28dc56aced7f65f342523ea0bc5eaf47755be00fe979bd259f4b16281db7d3
+EBUILD incidenceeditor-21.08.3.ebuild 2048 BLAKE2B 80ad2e99e9b88c64e0df37e7c89e4c771d83a214e5cb33974d31c5645a76ace04e931ce4e5ccc95f1e4d4240865f305b7ad1aaae29aceab2f8ea732e1dc3860e SHA512 1bc7d1a3f95c4225554a627b34f4ce2b763dfe2b36865cbbca113ed4d37d6aa698b55a3a4685745047b4bc755b78cbbc40bc6ddd26773188744de38ee4713185
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/incidenceeditor/incidenceeditor-21.04.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-21.04.3.ebuild
deleted file mode 100644
index 71360435dd44..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-21.04.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Incidence editor for korganizer"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/kdiagram:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[postgres,sqlite] )
-"
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-
-src_test() {
-	# Paths exceed unix domain socket limit, bug 770775
-	local myctestargs=(
-		-E "(akonadi-pgsql-incidencedatetimetest|akonadi-sqlite-incidencedatetimetest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/incidenceeditor/incidenceeditor-21.08.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-21.08.3.ebuild
index f90316d7cb4f..925e7831d79e 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-21.08.3.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-21.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Incidence editor for korganizer"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
@@ -59,6 +59,11 @@ BDEPEND="
 	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
 "
 
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DKDEPIM_RUN_AKONADI_TEST=OFF
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index c0a337e291df..01f0d4c44721 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,5 @@
-DIST juk-21.04.3.tar.xz 2010508 BLAKE2B 63251dc3bb0c5363868e789b1d5017e55067b2114e16cfbf25b89ef751ecccef12cfc59acb4ba1f14b9d5e12762c0a65eb3cb6fc8034fc82eec214cbc8bd10a5 SHA512 ef0f1b72d03fcbe6dc5a92bcebbe34687a4cfbecc4f3209a5d57a032fecbcff18914c6a7ac710f9e6897ff3188fff193e276bacb873378d867b130c48ebc81eb
 DIST juk-21.08.3.tar.xz 2013884 BLAKE2B 1c1fd256092c0711d662c87efd3eee07e65cd3a093b9c8588edfb8dd195b9119fe81acebb0e8acd16be5e4666b53e5885a5fdbb5f901e2df710f78da2169cd1b SHA512 68d36965ba7b91e348cad228c10ec9d5b17e1a0f53da2921dc659b27daa60a060faf798d0f89741bfb972c654f7968dc3e2636176080a799d93b9663568d4c2d
-EBUILD juk-21.04.3.ebuild 1310 BLAKE2B 99f6d4c854f87881137383f82c2fbfb7d25557edf08e5540d033d9086f267974ecd4cf601ff1a2d32d718c5bc1490477649ba6a3ea269e8dd1279a4d025625dd SHA512 1ae9a8d15b303628c99eff07af2ac6cb3999832ca908412e3ef52dee787fce9ee995eeaf73a12d2a1b3b3371b13cb10080125fa3f102659fd22d5278c3321ec5
-EBUILD juk-21.08.3.ebuild 1320 BLAKE2B 60a8a55cd729a6cdc9e7bb46cb3bed5589fa2e76df1ddb67f18888c03c6dd74b97ce228d6de15ade275c3fcb8b3f1e563cbd2cafaa5f3c825afd66840c4e1d5a SHA512 b6a9b7fa1390880eeffedbe3baf2ffea542ccc2ec2684602578aebc9dc5529d3d678900da407f2479f8e07403bb9fa7c01f23aac4f15ccf5fcdf8b13faf58cd0
+DIST juk-21.11.90.tar.xz 2014004 BLAKE2B d42d492219846f74e5b359787983222061e8b66cf6a4ac19a372eb293a9ed7eb7b4b7ae869855e36e45853b286d57350e966202cb5d1e48a0c9cdf3416cb0f61 SHA512 71215fed594b8e3810bbd8203a29f60e88157177367995f79b61a5843f3a7eb7687cc3f86458f8b71b5ca7fd094f5f51405776a5fa4e460411afc65847e75736
+EBUILD juk-21.08.3.ebuild 1317 BLAKE2B 7930e5d0b49f3bdf315b89c13c5e03bc84f64467c44bdba5e36129c578b5b8a2d2b1f5db0e6c185334ca5bec38d6686d37c5a4d427cfa7861193bd48bafbf960 SHA512 3f702310603de77b7a162b6e9637d95a4c6d018b996ec1161d3d9ba1a473cfa7b77fa94fcc4b0ced53086ad7594c28d2b5f380c05750040f8603d9712cb05db2
+EBUILD juk-21.11.90.ebuild 1320 BLAKE2B ec2078571bea67f704b14a9e4e9bf184d5c92a821e65c7d9afd53348e7c6286dde8053b57a9e8d21c54613054c97ac04ecf3b0c5a5d6d2015614cfd5a208c7ff SHA512 13fbb7aa3d073ed1ce73ace3396dbfc6d39133263cdd047d419031da865f1a4e50a88310d4764e47f19125e6d1463f47e11b892c24b6148c828b70b7e6acb544
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/juk/juk-21.08.3.ebuild b/kde-apps/juk/juk-21.08.3.ebuild
index 42f747065d8e..3d37b340a2ca 100644
--- a/kde-apps/juk/juk-21.08.3.ebuild
+++ b/kde-apps/juk/juk-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/juk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/juk/juk-21.04.3.ebuild b/kde-apps/juk/juk-21.11.90.ebuild
index bbeb5c19116c..b3e1fceeab21 100644
--- a/kde-apps/juk/juk-21.04.3.ebuild
+++ b/kde-apps/juk/juk-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/juk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index e3e0a5751676..b7661abe7882 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
-DIST k3b-21.04.3.tar.xz 10743696 BLAKE2B 22b58150fda55a0da3c20cd7ce85a3460f5aa195e7198e8ecc916dd3457718136648717fe2e80e37abae1d2b9456105fd1387df4afb112c8683c411304917ef0 SHA512 2bc61ebc26c73513d25a7b54e43781e5cccf2a140a74ffeef0e37a9c3a1bc823066b65c14c902bc3de8fa0b83fe620be4cfce48c880ddb271b8e399d659f4e9e
 DIST k3b-21.08.3.tar.xz 10746704 BLAKE2B e2049e5d55d49af087eca63dc6ac62dd6097a5c7937185384c5c0c9e9b86109aad68944040817c889d2f4261ea99816afe5d8343e96e597a8e29aa9d503a8dca SHA512 abd4073e8fb09d4556614d624fa32f1914abe627defea5756969edaacd334c3d6ee4cfffc7a9f5b0edbe911b4ac3ec2113547589b49a50f02e2d521eca550643
-EBUILD k3b-21.04.3.ebuild 3436 BLAKE2B 1900cfc5fd6ac949aeacb8dac4f0da00d66ed2cdb8cec7254ab47ad741c1410bd2b46f83f8d321a50060695f60d2be032587b65a1e5ae8c516de76c7c9c5fe13 SHA512 558b02bf1e8dc9ae7405ac50f8ca03544d36ecac08e2e2b87cb577bde4bc705c9dfd1c55bdcd2383fabff18d35c729d7fcefba0df199e056f2dc2677c70bbd30
-EBUILD k3b-21.08.3.ebuild 3446 BLAKE2B 8e87ddd907bba39b6c8ca2152561202dedc9c5770e070a7cc5e0765ee34defa054ad9cd44b3fe674d272b2263d27e6a0fd86c0833eba6599ac4fb1156b64bfa8 SHA512 271864debc95cda5c7172aacd161e38e29b21ca5346c9f10fe04354f82be1170591fa91b93c2c5b212997034dd1b98f8ecc587278578b0e388b533a3ee48d4f6
+DIST k3b-21.11.90.tar.xz 10746632 BLAKE2B a569722fa307c71a1d940718c988e3fcff81d834f264676e8291af0f464700552915d84da3dce5792b8fd48cef325dcb54c2ee250a631285c03684fdaae6c0f3 SHA512 1b7ab78ddbf4eb0aa8bdedfc6a2c250963957977de318183ddca230596c1dd8cbccf713021e8ea373c4e7c212e0574106a45f2ab4d1e9bdb9dfc2fea9a7fb01c
+EBUILD k3b-21.08.3.ebuild 3443 BLAKE2B a89cb1749e39e6c2c8e85327d2ba71cbdfb1976d343e63f6abd326cc5d9eee99e999a3485bd425d08de65662f16648da7bc142fb7802941337f32267b23b7914 SHA512 9d2acb4046ca9a835b983066025dbd84c47afdd179a227f18b7e03e5f2180ed1e9eb0970a842e428e7f1070af47a0237fcb95330e34d841bf937e4dbaa98d11c
+EBUILD k3b-21.11.90.ebuild 3446 BLAKE2B 08342794e61f31b51a788222262ab3cc035093d6ebddc5c988cf1cd4d4b7811a51ac941f37c310b29f0b0fa97855a2f033eddff04392645300d3520ab465426a SHA512 8202aa1a405b68cbd54007352fed2f4f898889942617a90aa27be9dc151a6869d62f77fd55aef7b004acb63733e82015d2642352fd9021d2af28985384adae54
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/k3b/k3b-21.08.3.ebuild b/kde-apps/k3b/k3b-21.08.3.ebuild
index 75c6a9253a39..df9d0a6002b6 100644
--- a/kde-apps/k3b/k3b-21.08.3.ebuild
+++ b/kde-apps/k3b/k3b-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 REQUIRED_USE="
diff --git a/kde-apps/k3b/k3b-21.04.3.ebuild b/kde-apps/k3b/k3b-21.11.90.ebuild
index 63cff503d743..94acdc00deb4 100644
--- a/kde-apps/k3b/k3b-21.04.3.ebuild
+++ b/kde-apps/k3b/k3b-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 REQUIRED_USE="
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 0e4da8dc29ca..fbf650a37895 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
-DIST kaccounts-integration-21.04.3.tar.xz 85184 BLAKE2B 4672f9b8e0d9f376d0d602a443aa6b60da93bde3427d33d2b7380f48978ea6a65c032f0e65483d1a715ffd422dac92840cc2e0186fff2eabc40da1d8e9995a2e SHA512 0552ab2da16b8ab85632f458827a1c16dc0b7e4a4d3b97266249430595abe11f0b76dc2dd7f59dc7796e795855bce122915733b692d9270b6da8b6cabc2c2ae8
 DIST kaccounts-integration-21.08.3.tar.xz 86408 BLAKE2B 83892e89afea01ca4934445f68d59fd6f6eebba66d52a8122ea296006d306d66cfaa46c90322cbfe52442e9560cc4788f2bf3d25a901e140cefd58c64ada7a83 SHA512 b98b5932c061760c44eecc9c49c8c18e3a7f43f5bd7c7d055d9f7ed66a0ceea46d21046c8dd63422299b633baef352b031725c2d938f8745b38ef06c35a6c09d
-EBUILD kaccounts-integration-21.04.3.ebuild 1203 BLAKE2B 416226a8cb572c11392fe1e3d3b3e33765a394e80f6b14d97a16e386c9a661af334e46a3fcd0a6dc3766e269594368f42fccd04f7aac8157e459ad4b77a97a5a SHA512 1bc3a7536ff3de197addf6c0e1a2bae650ed70170145733334c9f71ff9252c10f6d7289419f5f20543678d301b0cff624753d5c7298b48acaf591bf49c347bad
-EBUILD kaccounts-integration-21.08.3.ebuild 1204 BLAKE2B 8bdc0bc0812f5c603b2e93551e96d73db724c62c3ec1c4a406f34f51b05fb22aa1b4b965b1d4a15438fc50028d232078f3fb43c24ff80bc0ac42c29db16802dc SHA512 9b5a58ff50e85ca6042527d4728a2076e1c016f3d0b4db160953a1e06fe6dfd12b1cf86d0f1436a23937c349dccf669b7973a5e6286a1791acbe61094a3b5338
+DIST kaccounts-integration-21.11.90.tar.xz 87872 BLAKE2B 33161f06039bd866c4e28068e59bd5c525fc213419755a6c2c5f339af9e3244c22c017f0ebb516307ba761e30a6eb124ea73dbbf44e81fc053f96b32e48d611d SHA512 7b2deacd4deb2eee0748f84df47c78085cd2e61be82b2119a561751dbb453929d0bbfba7c1c15313a4767d2a64c612fa99d933c1f6a90fd8131a8d5ed45898fb
+EBUILD kaccounts-integration-21.08.3.ebuild 1201 BLAKE2B a61df62d693876a7b0867891a1f30b16aa122bc17c81483eb6685564ba01c677757edca317bf2f97e022dd3a9dc7b6f9e1b0544ed455d0e562c71f01fa342601 SHA512 dfbf76672142bf42acf123b9c8d2ad979e065dcbc8167e7b82d23cca31b940d58840d8a0c17443fb69c1968e6e59898028e012555309d43860b3bc71f4b0e24f
+EBUILD kaccounts-integration-21.11.90.ebuild 1204 BLAKE2B 86ede3e028a2898c6c88803858b271f1b2340f34c0c64adbc5984329fec12a3f210138ec2e28fe42bbe1b187232caf2f2861ae4b602cfba44f859d191756c87b SHA512 b2ba555fb90ca602f39d77f54d859ef254e673918360abc3940b25b2141f60216c4f269b6d3c611305a6b3149a10c95531b2c3c41f45fd8d9bee9fb59caefe05
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-21.08.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-21.08.3.ebuild
index ed5ac838f8f5..b5c318af305c 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-21.08.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-21.04.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-21.11.90.ebuild
index 3f47b7ad68a6..f2ed1b07c8ed 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-21.04.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 PLASMA_MINIMAL=5.16.5
 QTMIN=5.15.2
 VIRTUALDBUS_TEST="true"
@@ -15,7 +15,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
@@ -47,4 +47,4 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 # bug #549444
-RESTRICT+=" test"
+RESTRICT="test"
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 6cb34902e535..a5e0f7c47409 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,6 +1,5 @@
-AUX kaccounts-providers-20.12.3-qtwebengine-optional.patch 2822 BLAKE2B c303be4a5291ab18945e73a83167fb563daef52aebe68c3ec94f98327f01d3fbdcae1390cf51a1334c950d7f04cc7d8de17dac388340d15c773ed2a9d1275c91 SHA512 50dee13af1c01df73bea1d7f3f36588f415c959e1d7bcd84d73f17c88808df9b0fcd434b5a9a0281c9dbfaab416e852627f68a4bfeef41451c2a1d4560a10d0a
-DIST kaccounts-providers-21.04.3.tar.xz 62920 BLAKE2B 6f399fe0bc8127f085e8e8b3071b048f5c9dc52b6cb81d5ecf8e7383ef120b9954fe616f55564b06d7c189301bf9d7874338f6f2fad8274254c71a410a5838a0 SHA512 429bbe610c2613da430b3a641e374eb98d81f874c63a508a30f7acda2774a0dc31bf5fbf26a142dee15f4ec8556ecb2a28d78d67b6378177ec00d68204512055
 DIST kaccounts-providers-21.08.3.tar.xz 63488 BLAKE2B 6ba3d6d093048fd4b71210ce207788288bb753f432805dfa1ea690e2e5a864f8b52bc09c1975936f7b31ca067891574c7453e7887a757556ae7ba28d95bc3ed0 SHA512 5cfd92a8b1c57745c349b6f4ceb4d0773d94129be3ab6a96fa489737800ad76514dd35b8bfe42ac6432179ed21d2f6761fc24471dacebcf64a98dd65cd4e7a88
-EBUILD kaccounts-providers-21.04.3.ebuild 1015 BLAKE2B f9098765cb2df3fb3f956bb2e3e9d4af61a9f440d6e0e9f92b4c173a217b1035c1983d7749adcbe3e81e20a4b8f01ff875890762983501fe53cab9a9736ee0f4 SHA512 fa4b4a3e95988ae9bdbe021bfdc95e1ae33bbf45773dfafd8c1e2866c13de0016f13562203c30a3713d396fd145db27d8b7bd643c266b40d59e09799fd121dab
-EBUILD kaccounts-providers-21.08.3.ebuild 937 BLAKE2B ec72f060b7bf8e56c8dd7a6f220ace3f48dab893f52ac719a1e6fded6389e08be2076231d20737f63751a80d45fa1b803d3caf4a6c60154f4d74b7d35e021519 SHA512 9873323019c4d77af71f97def5be23a710db174bf63fd7c4201593265aea7c35bd71ab07c9a21bc1613ceaf762fe7cc097fbcd538bd0519a85187104a7e758b0
+DIST kaccounts-providers-21.11.90.tar.xz 64044 BLAKE2B e643a91cb321b966dc0ae44c9271400e7cf26e94887e1488b109807d2a483984dc3163754fad4eaa707a543f92b09be1b813faba0ca1c898c5b30056dd12e4b8 SHA512 30ccd8cfbddc91d778d303c2685fbec2f6bb8035160c8ef120e0c89fb57a8e5bd29c9efdee2731f4b00a97820d5dcc0e532bd7269c92d77129f2e17558d661ad
+EBUILD kaccounts-providers-21.08.3.ebuild 934 BLAKE2B 2c0f9a8bc3947668ff4de32dcabe56e177c175511ff3807d5d327d02734b2d02faa06872aa77fffef64a00a801502824dfe7ad7b634b6af5589654f866260fe1 SHA512 0ea24fe45fe8446f7bafc13ea0de0e3f54df2402f85446e599d1d122e1e8c3a6ef010ca0205c89552163d1c857edc45c91f7291e1140d39b0e2b04097751c3da
+EBUILD kaccounts-providers-21.11.90.ebuild 937 BLAKE2B 198f1f17daa8e57bd120884a9ed1f76f241f9e7e7a0a2b2839852e3f3d11b1e0dbc6ef7df24c4ba81a85efd5fec34c8ed00c301814b66cf5350c0f9afa6f5796 SHA512 a3232bbfa1fdeae8de6fc2e3485c602ff2fc7e71956e59ff00d7581be7f903eaddad9e78a05a934ac1476f466c81e597ba90a0f45efb88cc358e88e4dc3edd37
 MISC metadata.xml 435 BLAKE2B 7500606054feb92f23fe39021ed214b15e2e3bc434a19d70a3aecd79b2cad8cc41d0a0d59f85f75ad7503a7f41ae2e68de9a6982f88f44edef213418cff04998 SHA512 154aa6b34b5798d87b3c2f2e7c048df1a05bf1f79e84aea0ec21438a572e999fdb14a5f962af97ad803606374dc56625eae673fde563f33715c680e213180e23
diff --git a/kde-apps/kaccounts-providers/files/kaccounts-providers-20.12.3-qtwebengine-optional.patch b/kde-apps/kaccounts-providers/files/kaccounts-providers-20.12.3-qtwebengine-optional.patch
deleted file mode 100644
index 02e5c9ee1d93..000000000000
--- a/kde-apps/kaccounts-providers/files/kaccounts-providers-20.12.3-qtwebengine-optional.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 7a22a7fb85804c834c4597adca4a69dd5a82ffa4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 4 Apr 2021 17:01:12 +0200
-Subject: [PATCH] Make Qt5WebEngine optional
-
-Qt5WebEngine is a very big package and not easily available on every
-architecture. It should be optional at least when easily possible.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt           | 9 ++++++++-
- plugins/CMakeLists.txt   | 4 +++-
- providers/CMakeLists.txt | 9 +++++----
- services/CMakeLists.txt  | 9 +++++----
- 4 files changed, 21 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c7207b..906893e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,10 +16,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
- find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH})
- 
-+include(FeatureSummary)
-+
- find_package(Intltool REQUIRED)
- find_package(KAccounts REQUIRED)
- 
--find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Qml WebEngine)
-+find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Qml)
-+find_package(Qt5WebEngine ${QT_REQUIRED_VERSION} CONFIG)
-+set_package_properties(Qt5WebEngine
-+        PROPERTIES TYPE OPTIONAL
-+        PURPOSE "Required for Nextcloud Accounts plugin"
-+        )
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED KIO I18n Declarative Package)
- 
- include(KDEInstallDirs)
-diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index 3ea1817..f87b8f6 100644
---- a/plugins/CMakeLists.txt
-+++ b/plugins/CMakeLists.txt
-@@ -1,2 +1,4 @@
- add_subdirectory(owncloud-ui)
--add_subdirectory(nextcloud-ui)
-\ No newline at end of file
-+if(Qt5WebEngine_FOUND)
-+    add_subdirectory(nextcloud-ui)
-+endif()
-diff --git a/providers/CMakeLists.txt b/providers/CMakeLists.txt
-index 987fb6e..cff3420 100644
---- a/providers/CMakeLists.txt
-+++ b/providers/CMakeLists.txt
-@@ -1,4 +1,5 @@
--file(GLOB provider_in_files *.provider.in)
--foreach(provider_in_file ${provider_in_files})
--    kaccounts_add_provider(${provider_in_file})
--endforeach()
-+kaccounts_add_provider(google.provider.in)
-+kaccounts_add_provider(owncloud.provider.in)
-+if(Qt5WebEngine_FOUND)
-+    kaccounts_add_provider(nextcloud.provider.in)
-+endif()
-diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
-index 93e14fc..cc58f91 100644
---- a/services/CMakeLists.txt
-+++ b/services/CMakeLists.txt
-@@ -1,4 +1,5 @@
--file(GLOB service_files_in *.service.in)
--foreach(service_file_in ${service_files_in})
--    kaccounts_add_service(${service_file_in})
--endforeach()
-+kaccounts_add_service(owncloud-storage.service.in)
-+if(Qt5WebEngine_FOUND)
-+    kaccounts_add_service(nextcloud-contacts.service.in)
-+    kaccounts_add_service(nextcloud-storage.service.in)
-+endif()
--- 
-2.31.1
-
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-21.08.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-21.08.3.ebuild
index 11f500fd94c0..29d90661a923 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-21.08.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+webengine"
 
 DEPEND="
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-21.04.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-21.11.90.ebuild
index 1fd67a2841a7..9f5fb8a4fcd4 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-21.04.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,12 +13,9 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+webengine"
 
-BDEPEND="
-	dev-util/intltool
-"
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -35,8 +32,9 @@ RDEPEND="${DEPEND}
 	net-libs/signon-oauth2
 	net-libs/signon-ui
 "
-
-PATCHES=( "${FILESDIR}/${PN}-20.12.3-qtwebengine-optional.patch" ) # bug 753274
+BDEPEND="
+	dev-util/intltool
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 1d0696e3482f..7bae9daaf1bd 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,4 @@
-DIST kaddressbook-21.04.3.tar.xz 3329648 BLAKE2B 44b489a613efcedd9e0cbd4c23f3a1b69a5b5e144ecdb9cb485015a441cb18945965a4cb6ad15ca4bc195ef0359b08f97304cd130cfd388440aa4eca801e67d0 SHA512 8325642b057df2489bde527be71691ce54668e13a3e815727c77051f6e7d1b76e7a4195b6f363c78d7fe6bd4f67af61364810b2fe4cfae62988d383f86fc7a5d
+AUX kaddressbook-21.08.3-unused-deps.patch 2408 BLAKE2B ccb912a26284137ac8831457b31454f620349b2f791abeb5711a5ba856493baa03ddc8a581a5766d0776afdc41a726d26c17db89d8d05d21432ba46ab6751168 SHA512 bac692fb1fc376161077fb2e24f6e0a5e4bcf0cdb49fd8023f81239410259e6fedfd8a02f9f210a1cd6f98ca3ecc08f75da3185f95c89c15c4610eddb5edce45
 DIST kaddressbook-21.08.3.tar.xz 3347684 BLAKE2B 7d6ecfe4ed729c77c1df8345131eb2dd4245e13166b1ae6f839a28da18362d50071ece7fe6400c60eb32691121f5020ad3b4b1fa00e1119c568b51623624c7f3 SHA512 e8052322cb24ca55575e4cea3c2b6d452392d33fe3e21981e6b9fd56d3a717e835250db99d5b845d4cad71978ea74c3bf335c100bbaad02db56e43e8d1de3570
-EBUILD kaddressbook-21.04.3.ebuild 2008 BLAKE2B a4209084dcbbfdf1c44b065caeae824cb23bef61a4f6e3a2b26001f2ecb97c4ca20957402574e541276e1d6cbee4978cfe9b4caa962fd12343f83dadc6bd9959 SHA512 78d43d9532126787598dc2ea7e53984e8ff88dfe4049ba045db5d98bbbe2abfcfef7c941f7b0dc2a46285d9744af64a536b9a8eebfc470b49d982af2c4eadba6
-EBUILD kaddressbook-21.08.3.ebuild 2006 BLAKE2B dcc9e490495b069ec5b1d8f8250d0dcb671c871b4b746fd3b27e0bd1d05a25809ad46f2274bd9808dcf66384f737e1065676e7f689f1451a5144e37d56442bc4 SHA512 d9bd730c798973391cebc6729e9c52f4e5961fa8cd4c6fbb1f88bf2b2cec49eb66b4608145408c7683aa6d0266e6eb66701c1ac6c9a422bc3b60ff8204a60a48
+EBUILD kaddressbook-21.08.3-r1.ebuild 1987 BLAKE2B 5a3b8ba660e7ca72138639c51585089486c842cdcd935632199dd880fd58f631241eca716a6c1cb9e8eead69ecb2c45cb173f01b3f4b5d9a7435870d83ecc6ba SHA512 6d147fe58d8b2fb1752855baf959ec194eca24479f3ed5bee62275ef7f0357305ef1a730afe4c3ee4d74466e66f666a15f5870aab37449e3ba4fb21ac171ec8b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch b/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch
new file mode 100644
index 000000000000..0f13513546b7
--- /dev/null
+++ b/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch
@@ -0,0 +1,61 @@
+From eb9dad153f199c925ac60c0a33eca6ff0c1f9f44 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <sknauss@kde.org>
+Date: Fri, 8 Oct 2021 17:56:50 +0000
+Subject: [PATCH] Remove unneeded dependencies
+
+---
+ CMakeLists.txt     | 8 --------
+ src/CMakeLists.txt | 4 ----
+ 3 files changed, 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c5e3e336..aef0ccd9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,7 +53,6 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus PrintS
+ set(LIBKDEPIM_LIB_VERSION "5.18.3")
+ set(LIBGRANTLEETHEME_LIB_VERSION "5.18.3")
+ set(PIMCOMMON_LIB_VERSION "5.18.3")
+-set(LIBKLEO_LIB_VERSION "5.18.3")
+ set(AKONADI_SEARCH_VERSION "5.18.3")
+ set(AKONADI_CONTACT_VERSION "5.18.3")
+ 
+@@ -62,7 +61,6 @@ find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5KCMUtils ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5Crash ${KF5_MIN_VERSION} REQUIRED)
+-find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED)
+ 
+ find_package(KF5DocTools ${KF5_MIN_VERSION})
+ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
+@@ -79,12 +77,6 @@ find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED)
+ find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
+ find_package(KF5GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
+ 
+-set(GPGMEPP_LIB_VERSION "1.11.1")
+-find_package(Gpgmepp ${GPGMEPP_LIB_VERSION} CONFIG REQUIRED)
+-
+-set(QGPGME_LIB_VERSION "1.11.1")
+-find_package(QGpgme ${QGPGME_LIB_VERSION} CONFIG REQUIRED)
+-
+ include_directories(${kaddressbook_SOURCE_DIR} ${kaddressbook_BINARY_DIR})
+ 
+ find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3e756aab..ac2f5774 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -98,10 +98,6 @@ if (TARGET KUserFeedbackWidgets)
+     target_link_libraries(kaddressbookprivate PRIVATE  KUserFeedbackWidgets)
+ endif()
+ 
+-if(QGpgme_FOUND)
+-    target_link_libraries(kaddressbookprivate PRIVATE QGpgme)
+-endif()
+-
+ target_include_directories(kaddressbookprivate PUBLIC "$<BUILD_INTERFACE:${kaddressbook_SOURCE_DIR};${kaddressbook_BINARY_DIR}>")
+ 
+ set_target_properties(kaddressbookprivate PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION})
+-- 
+GitLab
+
diff --git a/kde-apps/kaddressbook/kaddressbook-21.04.3.ebuild b/kde-apps/kaddressbook/kaddressbook-21.04.3.ebuild
deleted file mode 100644
index 1f699f259a50..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-21.04.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/kaddressbook/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kaddressbook/kaddressbook-21.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-21.08.3-r1.ebuild
index 2b1f4b0def20..95e20ab6da37 100644
--- a/kde-apps/kaddressbook/kaddressbook-21.08.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-21.08.3-r1.ebuild
@@ -16,11 +16,10 @@ HOMEPAGE="https://apps.kde.org/kaddressbook/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
 	dev-libs/grantlee:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -33,7 +32,6 @@ DEPEND="
 	>=kde-apps/kontactinterface-${PVCUT}:5
 	>=kde-apps/libgravatar-${PVCUT}:5
 	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
 	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
@@ -58,6 +56,8 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package telemetry KUserFeedback)
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 665a24416a38..ac2c419fb54a 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
-DIST kajongg-21.04.3.tar.xz 4473068 BLAKE2B 240ab96013f0a0eff469c2fff6a80f852010563390cfac1ebc9c80f450d63169fd7e7b59ac9147fb67cb2839ee31caac2887c31c584e0ab7fb8c69bacc9c44ba SHA512 1eec0c3dc0f0bbdd8f10afe0d701eb83a6cc8ae4116776f123319b0949cace331476196d80fbd1b81aeee8757644787b3e842386472350486358774fa6358178
 DIST kajongg-21.08.3.tar.xz 4558208 BLAKE2B 0f92104be52b61ac107d6530078fd669509d40d39dec2a27f9bf22230e3395e756e7e58f809d8536d98d0d5fb2b2312c0f26ab94de6e216a27fd2408167a514c SHA512 017f687822e5de18466333e70479bfab12b7d22f28ba69479adf16cca99ef102106c2b6aa55dea801edb2299fb2ad5de379bb30942314ff2a195beb54695ae2f
-EBUILD kajongg-21.04.3.ebuild 1007 BLAKE2B 19894eb2e24c1d07e6c5dd89a8bd4958750ce9670af12550f1a64e1f22abf312341a373aed25f5f3f3ee3c1798e4f4280f23fd5fe9bb4706ba0a2085a2b7fdb7 SHA512 b4f049a4c3e2a50d50dfd0d739d9803d25472fa168916030e8c41e57a64bee03a3a5b65499a98a4fe597b68dbc403e38e56707188666fdea6000f786861d114f
-EBUILD kajongg-21.08.3.ebuild 1019 BLAKE2B 69e55f4bd97aa9d16869cc146633e7b7171b607a4234aad7c6ad4e521b0f302a7e88002ef2b074ea8f0d0dbbf5fcca3801a8d86cab66100e91559074915dc2d0 SHA512 cfcf3934fc170ac04179c071158079acf22ce69f0af4c6f2a6874755480dff039890d997b54650aad638bfaabcd2161bd795faf7ba3a2e60d15a927e7ed78ae0
+DIST kajongg-21.11.90.tar.xz 4560512 BLAKE2B d441b259a0c9351ff477a90b758d8f287e49c116a95d74a37320f41ac491bc05c66c523d3e17debf73e37ff501438facef0c75c6bbabf4ddcfff43c863faeba1 SHA512 b9085b8cd47f3f0ccdd62eb49b5fffba9890e218a09df900837957765dd6271782100e46852a9d36f2dfc24ef8a2c9197a861bac36663d9b43fbc7cd901b5168
+EBUILD kajongg-21.08.3.ebuild 1016 BLAKE2B 9b12f817e923616ec2af5ea4d4534efe53a53e3fbd345e3377962ec82a2443d70bddd996d0ae028757c99d22e7cc1ebed67d34fe07fb86f8ba4b2ce5ce48b49c SHA512 fd62b08cbec3f5f57a6d2c88f99ed44e7b0d777ceecf5157ee4fcd7ab2407a3b77b180ccc86072c856ff4ab6f7a9c474469ec26d68cc4ba0aa31b4459847f10b
+EBUILD kajongg-21.11.90.ebuild 1019 BLAKE2B 0dcdd3b463d4623d8c5c018072c6142d9727ed5e355ed870dbc7adde80203a721bcb4df8e7a8c0fbfc050a3a57f4a5b7ec92d83134ace32707f4592cb3468195 SHA512 7c2f35769e7685acd3fdb706ccec27edda01f7125dfe949fa7b460f4565b1319ce92bbf9b8cfd5cfa5922b4278866ac7e63a3e38c9af019178e1e119840ae20a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kajongg/kajongg-21.08.3.ebuild b/kde-apps/kajongg/kajongg-21.08.3.ebuild
index dd1cc1a5a68b..7bb25ba3b606 100644
--- a/kde-apps/kajongg/kajongg-21.08.3.ebuild
+++ b/kde-apps/kajongg/kajongg-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kajongg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kajongg/kajongg-21.04.3.ebuild b/kde-apps/kajongg/kajongg-21.11.90.ebuild
index 64554517a85a..e6e07170fdd6 100644
--- a/kde-apps/kajongg/kajongg-21.04.3.ebuild
+++ b/kde-apps/kajongg/kajongg-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit python-single-r1 ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kajongg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 7b4e5f60d18e..54cbc8938f88 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,4 @@
-DIST kalarm-21.04.3.tar.xz 2137400 BLAKE2B f5ecec13b3a0b7895cb1f815cb8d6dec828574e890ab26a2dc9410ce1fca63dd46a7dda9e6ddb8b690cfe7563b517b5673553a28c91c44f3d3755f30d712be75 SHA512 19a9bb6e185b86fe4710d04a8dc4985b8d0c0e49cc53c5fde24e23e4c0cfa4587aea4400957190606122db1363be7a705c5ca0a716631b0eb3a496b82b550f42
+AUX kalarm-21.08.3-x11-optional.patch 1112 BLAKE2B 8cb7f6794c89a7eabe29bcecf78ef00eb9e6a82039309494d7117125f67f2c6f37c2f395d71c7700f487f03a3bb745bff1eca19a3663e79c89542efca24a54d0 SHA512 8e8cdf5325ea45e759a13e5891250b9106715e029113c16bb8319fca7caca92e063fc94e9ae1cab89a680350605a649375db8305fae21d818b5082fea77b5c42
 DIST kalarm-21.08.3.tar.xz 2158988 BLAKE2B 45e544bc518a0640760a0af329983ab6b052fcc0cbba43beff5963018cdd4992053aec6fac506784fe826b626591218eb24bb654402e7a00ae009b5234b54d83 SHA512 690c89006598e8e87e1fd4b0f9b5d183280efa3f5f2d1fcda01607498b03ffad75a60e49ef4435f8fd66357231446c187a77d9976a6c04d98519f8ca3747a1b7
-EBUILD kalarm-21.04.3.ebuild 2412 BLAKE2B dba4ce8d51277f75c401c0f20a082d2b8ef4a0d36e388d58a984ddcc39d2dfe9b2716675c9c49a94bfdce2d321c3220674fb431724e358cf8bc4cf1ee7ffb6d7 SHA512 74eeb309fb5e306b58eb63f92867b7a9057f684ebe1e5afe2da05466dd92b56398109423f68852cc7cec444b2a85122c1a36412ce333c926a80e9f3d0c36d998
-EBUILD kalarm-21.08.3.ebuild 2410 BLAKE2B 3dfdc95c23bce2d821c64a1f4cc69c51e5cdc35621f9c6b710ab92526190bb1b5b5aaac2b9a1cafee67300ee9c1aed8f3286e1dc0e067b5222344953e6f41df0 SHA512 2a4febdc1187a518ceee4842b808402f205d7ca2f43b5e974198e3db25b6e2915c6a9b872178b6b5cf6ef5d598e70c3d260f5db2bf830a39b0bd9c4d35bf3cfa
+EBUILD kalarm-21.08.3-r1.ebuild 2290 BLAKE2B 0a31d1b55e5a5ea91638462e84754312c3d7f4dd59182540dcfd16070c2592c3f9efc171ae1f15f5e82c2a7dcef020cf7abb6b912130af247c7261c4e071a097 SHA512 12529edf2f111366f3624b958a97404524ef6809f2ef91bcb273053a10b4f44baf3fb93b75b77964ab08749c47d575d23adfc0e7fee284aad06204696e6f056e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kalarm/files/kalarm-21.08.3-x11-optional.patch b/kde-apps/kalarm/files/kalarm-21.08.3-x11-optional.patch
new file mode 100644
index 000000000000..0b92c6fe5803
--- /dev/null
+++ b/kde-apps/kalarm/files/kalarm-21.08.3-x11-optional.patch
@@ -0,0 +1,34 @@
+From 1e5edd84cea5cac4dea2c488cea47766c1a33745 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 25 Nov 2021 18:33:30 +0100
+Subject: [PATCH] Add WITH_X11 switch
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fa699213..f928bf8b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,6 +58,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Gui Network Widgets
+ set(CALENDARUTILS_LIB_VERSION "5.19.40")
+ 
+ option(FILE_RESOURCES "Use file system resources instead of Akonadi resources." TRUE)
++option(WITH_X11 "Build with X11 support" TRUE)
+ 
+ # Find KF5 packages
+ find_package(KF5Auth ${KF5_MIN_VERSION} CONFIG REQUIRED)
+@@ -106,7 +107,7 @@ find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
+ 
+ configure_file(kalarm-version-string.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kalarm-version-string.h @ONLY)
+ 
+-if (NOT APPLE)
++if (NOT APPLE AND WITH_X11)
+     find_package(X11)
+ endif()
+ if (X11_FOUND)
+-- 
+2.33.1
+
diff --git a/kde-apps/kalarm/kalarm-21.04.3.ebuild b/kde-apps/kalarm/kalarm-21.04.3.ebuild
deleted file mode 100644
index 63ca4da95106..000000000000
--- a/kde-apps/kalarm/kalarm-21.04.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE="https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="X"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kalarmcal-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-BDEPEND="dev-libs/libxslt"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kalarm/kalarm-21.08.3.ebuild b/kde-apps/kalarm/kalarm-21.08.3-r1.ebuild
index 1362a1de19e7..da40a5771bff 100644
--- a/kde-apps/kalarm/kalarm-21.08.3.ebuild
+++ b/kde-apps/kalarm/kalarm-21.08.3-r1.ebuild
@@ -14,18 +14,18 @@ HOMEPAGE="https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
+IUSE=""
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-apps/akonadi-${PVCUT}:5
 	>=kde-apps/akonadi-contacts-${PVCUT}:5
 	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
 	>=kde-apps/kalarmcal-${PVCUT}:5
 	>=kde-apps/kcalutils-${PVCUT}:5
 	>=kde-apps/kidentitymanagement-${PVCUT}:5
@@ -62,21 +62,14 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=media-libs/phonon-4.11.0
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
+	x11-libs/libX11
 "
 RDEPEND="${DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 "
 BDEPEND="dev-libs/libxslt"
 
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
 }
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index dde9949912a3..8f9a5495e222 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,3 @@
-DIST kalarmcal-21.04.3.tar.xz 629092 BLAKE2B 7e3e8ef9f123943ec1b8ec1a48d9f141495ed95a338fc528cf0cf9dd634b58a1c3ead0df1a04e8cad26883f8ca70dff3ef27fd3dd80ede5cb525afe862358451 SHA512 3db4c4d3e8e1d3b552f5f094a87d0b283e85328990f992783e93384a02cf2247a8042c8447500e1e238feb32b405f977a0bdcb5aebbd9860ea47872e9ee458a6
 DIST kalarmcal-21.08.3.tar.xz 629416 BLAKE2B e6712b6bcf29898f385b5879833910bce2fa624cb9c3d17b3aa4fb7a247cf9fa26ed7b5cba07dd737078cc42a4c6d76c3023c669beb710772855fa9d604bf031 SHA512 06c8b8a94c078be86f52774d691792d9f6212a79f91730ae7e783b15a951248e575426de68706c7562da8e26f188882aa2ec20ebd1a0d4abd0c1b4fde4ae047d
-EBUILD kalarmcal-21.04.3.ebuild 766 BLAKE2B 59a6acd2332ce4125d169f4397f04ff52aa7b92698a144c39d6b3eec1c851ecb0cf7cd3d5275725c945d7e0e37c8d41ca6324a140cd86ffbe29031275c7bfcba SHA512 eb84a2333df402530b1267893700bba2bb4cf2fc8c198d4dcbc52a715c63575dcf75bb8e9a52013a8ea5fb9aebb4f4527d04c4ebdec290b787f194b17f9c73c7
-EBUILD kalarmcal-21.08.3.ebuild 776 BLAKE2B 0910d667f764bf120868c71378b43232ab0ab1a226bde45caa33ed125e310f10d66bad67c7eeae43e82275ef94fe334550c8d0679f73d3e29e1dc3a38ee8eaa0 SHA512 9318966510836967826a47e78c0e35e4b7c4f616a336820ec16fef89c399009fe9756104a5f13d29621577af0364ac9c8b89aba2919eb0a524160b66f002e920
+EBUILD kalarmcal-21.08.3.ebuild 844 BLAKE2B 85e1bdc17c4e1f14db209e0cf022cef8f63d77f8e6f418bf085ec4b9c2e48521fd4f8634640212daea30671b0476667ad247ad9c7993da35d18017c64542c93d SHA512 3dc0e7795c65e598d19e81423ac413ee7c8e96294e902f6e68e1dfd07a0945adcd7b4590aece51e9e793fe18ec88d4a94d47144a739be55d7e0657db59468490
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kalarmcal/kalarmcal-21.04.3.ebuild b/kde-apps/kalarmcal/kalarmcal-21.04.3.ebuild
deleted file mode 100644
index eef4f4f42ac9..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-21.04.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-"
-
-src_test() {
-	LC_TIME="C" ecm_src_test #bug 665626
-}
diff --git a/kde-apps/kalarmcal/kalarmcal-21.08.3.ebuild b/kde-apps/kalarmcal/kalarmcal-21.08.3.ebuild
index 2d6f9bc10c13..bd8c30141040 100644
--- a/kde-apps/kalarmcal/kalarmcal-21.08.3.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-21.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Client library to access and handling of KAlarm calendar data"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
@@ -31,5 +31,7 @@ DEPEND="${RDEPEND}
 "
 
 src_test() {
-	LC_TIME="C" ecm_src_test #bug 665626
+	# LC_TIME bug 665626
+	# TZ bug https://bugs.kde.org/show_bug.cgi?id=445734
+	LC_TIME="C" TZ=UTC ecm_src_test
 }
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 39c5853f71bb..033108e77c93 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
-DIST kalgebra-21.04.3.tar.xz 1025464 BLAKE2B 69169eede2ea15f9fe5b48f909d42bbb75aab2f6d3086c3dc1dc9b28358cbe18bbf898b09501465c8a0df26b704eb0dccff590e40f895ba8020b5efa739c677a SHA512 1b849712c003219ef037c4d17d7ade635460438ec8fa9e192f1c9c084e227501efa00c0b55a57b240018edb089d30279384de860e6ad2fe9956b8b99bb2ff552
 DIST kalgebra-21.08.3.tar.xz 1026536 BLAKE2B badf47e57b57559d2d9339c58b895c2acfbfe8d8293c47a26aa3f47be94f47105061b0485088f851b9ce4e7fb1633f626a351b516fd476ef33ac6b3e68b405d5 SHA512 8e5605c36c396d89e895f0c5e193ae911cd0f9b6f88a0ac7893231db5f506c8a6def31b5b45df9863d18d9d0173303f9f02cd0b5b70297131f1766c601433250
-EBUILD kalgebra-21.04.3.ebuild 1175 BLAKE2B 0cbf6bcef91c83db3d2cc9c1461ae97f520f69ef273ae461b6d8c5b1344b0808893c27c6b7b931bef09c6c857a65dd6c271d9787f00b1cc4576dd9b6817d73e4 SHA512 3057296f1b760fe1b1fa45fffa70fc5943e57c319b94b81ce5810a32aec1cd12e7f9d895d985dc563b30e89517590e0e54f82d3b1e6e277104c7b50240ee08dc
-EBUILD kalgebra-21.08.3.ebuild 1178 BLAKE2B 491159db62325816b0250746553eb566be34ab27a005769374de18414737bb9fae86043eb290208f55e0c7ab817f245f653ec91c901230402b932ea36021cd8f SHA512 ecfea6544d9f523438ca57b8c37896cdc86949db63f4a53e45a10fefb77b0c20ec0b6bb4fff8ebdc36ea5e5e452ad96b506fd0667f53ded00413427585710393
+DIST kalgebra-21.11.90.tar.xz 1026468 BLAKE2B b62f9a5802c8aa9c409c854d66228b8c576acfb8f7e3961c7af8c92005d8ce61f84e22770dd1694c6ed26ad2e776f5bd06c8dd3409d0aa0f9876f88ad4c1d302 SHA512 b7a38eb80fbd65f9b96e85e3544804dba62d1c97eb9830a1065c1d0c717b5e8fbd220565e1d202a0d283afe46425a0ab5759664d33564d8dac5699211bb8e917
+EBUILD kalgebra-21.08.3.ebuild 1175 BLAKE2B 479eeb89ee52b24e204c0959fa112429cfd9ee26ff21f6a17d248fdf8094c622b8c2bd1516c3ef344c57fce283dae9a18b9f6f91fd37e6516079b8643f06251e SHA512 f2ae5f395b951e24eb64b8cfe198d36039d5739978dba2f106e03a7f2af58f8e815f1d69ddf4bb9947c6797907562d76b479220e44ef8e0b674116de41512523
+EBUILD kalgebra-21.11.90.ebuild 1178 BLAKE2B b572860df2e9b397fd9ea2250110ad4b70c6813b3b23e0717c9a4ebe9532f2d8c9f01482bd7470d5d146ce3e3afcf3493fa7649b961274dad2f4870fcd30b2b0 SHA512 dc70b8aeb0e43eefc34f6e9f26a7c97021244f495122e42de606d3ed29ca38d0813cad98f114e107ff2b59dfcbf56706d1dc4805c6abfe5a76f428e66dcb6679
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kalgebra/kalgebra-21.08.3.ebuild b/kde-apps/kalgebra/kalgebra-21.08.3.ebuild
index 9cf5a4479845..37f2f0dd4717 100644
--- a/kde-apps/kalgebra/kalgebra-21.08.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kalgebra/ https://edu.kde.org/kalgebra/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="readline"
 
 DEPEND="
diff --git a/kde-apps/kalgebra/kalgebra-21.04.3.ebuild b/kde-apps/kalgebra/kalgebra-21.11.90.ebuild
index 819d80279fd2..768b5c64d90f 100644
--- a/kde-apps/kalgebra/kalgebra-21.04.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kalgebra/ https://edu.kde.org/kalgebra/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="readline"
 
 DEPEND="
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index e9137f69c827..b95c978e4522 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,6 +1,6 @@
 AUX kalzium-21.03.90-cmake.patch 815 BLAKE2B ba13821a0d50f1120e37d73b30d13b7597a67342b74c710155429b3880bddaafcef665f44acbc93d63dc7ed894b5b906a906bfef7a0a587554cea278c4c41553 SHA512 3b188578152cc399b13062afceb6e5a0e006f5e42810c09dec45ee7d8388a4177a98a076fe7789d1aeba49236e70f861f6a9af6907a5c06db3405db383cf83c9
-DIST kalzium-21.04.3.tar.xz 24590252 BLAKE2B 8418e1f7fd298b9a7ee04765bdbe3bcbde94acd09ad02d9befdd88b72139f08028fd996d9048323b2c34b3e9f6519c33d209fc186e097c427eab5124565eda47 SHA512 8c19954fc1fbe70b866769d89ec7cf85afeb71a1c0bd67783808fed59375acbd7f86484b36aa0e724450e4307cfece86846023dac77a24fa82df229007244a35
 DIST kalzium-21.08.3.tar.xz 24592108 BLAKE2B 8f9428557222d45a20b390f2e93abe4523e92e6fbc4e95f48a881b3b365a426396d57e4e46385041586ffdf213c92315fe71c05bd2ab39b203db3f038fb54983 SHA512 52d43df0d05c78172dfb8f3082ad1b235d488151813e02dedd2be1e81ee24a30bfb78c827d00c59a42bc3be49ef45c6ca338706ec2c3e1d0d4a5bcecd35a2bde
-EBUILD kalzium-21.04.3.ebuild 1833 BLAKE2B 379509580511e67e538412d5e3eae1ced2912e74a2212c30e2e9cc8e2a55aa3bfdf17e45cdcd2a4cd7a5eb883da0859b22c4448731d8132c75c3b7005b1f9ee6 SHA512 a8be805bf7f0fa9713df04c871022d0338001613744543a52dd124d24a1e0906ad4855fd8fd73878615075d18b7611321d36eb784304c6692b5340c89ecf2f3d
-EBUILD kalzium-21.08.3.ebuild 1836 BLAKE2B c6326f5debbaaa0d66bf8ecda3f807db49a055288ac7de0a99dc2a02d382927715ca29e40701b98f1841d8a0207510dfe83284f354c68721197541764a2d475d SHA512 8f859e9dab2645109e75876a9267fe12a19efb16e88c02c23349e31795f10e7d82e00dc1b8f6b5b73290bd1c8a1d6e89514d40ea9d0ef45d7e6f6eb0f29a8c1a
+DIST kalzium-21.11.90.tar.xz 24592676 BLAKE2B 7fd1c5b1ee99c49a6e51b635b530afe63f232123644c4948c463314b5097a17b28b056c5b89bba373aa1fe0f1902a7af0a42735b521290db60d2a1cfa9108331 SHA512 0f95369b2695f4c9dfea4f31d628eaa0458e32348b91e951323790fa71ff3cf9b93257c0e4bdc025fa7f83d0b2be2d212629001ae7b16c1319eee0e090556591
+EBUILD kalzium-21.08.3.ebuild 1833 BLAKE2B 43cdb47a3c6f09f14d9cc72a1947db14fc73309820adfc79964334b21a95fc821665163ce26c41ff72d26d70d2d1964ee6b3433c271ffdcc5e3dcd5912c13504 SHA512 7b7eade21bac326f73c6a72ddfc2984a86a5b62eea0cd673ca5ba71e12cf53aa51849fabaa80ea56af38d6e69b9f859181d22a812bc84d94505a7098b6bea1dd
+EBUILD kalzium-21.11.90.ebuild 1830 BLAKE2B 44e7eae857acfccbd10888016ab60396b46591d39fd615ee39200d4cff61b6a6944aa3f42785a630d42faebfe7eec804c2160c3b8e1b7ffa9418f700e1785e0d SHA512 b2a24f19d7544c71f3b2862067170f5975eb7c0064fceac2317c52256069f6c5e7bc1a7ec0ed6c859e3cbdcdccbaa4040b6b7847fec675a732f27534245b5e4f
 MISC metadata.xml 461 BLAKE2B 3f1c0869769225696ffe1f2d97ff7544d187cfc3316f72a2623806e499a418234655173ceb4932c396c8b4cf970ac2f72534cd3474a2c52b6e062b3228ba99d9 SHA512 c33c0d637690649dc2da606da08cdd489596addc9b51dad827e3ea2f9fd6558d66512452303364b3bd3a33a4d1e274d0598aba1db31e1d5601baf3b290051485
diff --git a/kde-apps/kalzium/kalzium-21.08.3.ebuild b/kde-apps/kalzium/kalzium-21.08.3.ebuild
index e715865c6c1b..10d7b291e583 100644
--- a/kde-apps/kalzium/kalzium-21.08.3.ebuild
+++ b/kde-apps/kalzium/kalzium-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kalzium/ https://edu.kde.org/kalzium/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="editor solver"
 
 DEPEND="
diff --git a/kde-apps/kalzium/kalzium-21.04.3.ebuild b/kde-apps/kalzium/kalzium-21.11.90.ebuild
index ec0bec14459f..14dacad9dc90 100644
--- a/kde-apps/kalzium/kalzium-21.04.3.ebuild
+++ b/kde-apps/kalzium/kalzium-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kalzium/ https://edu.kde.org/kalzium/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="editor solver"
 
 DEPEND="
@@ -55,7 +55,7 @@ src_configure() {
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
 
 	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON # TODO: not packaged yet
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON # TODO: bug 823101
 		$(cmake_use_find_package editor Eigen3)
 		$(cmake_use_find_package editor AvogadroLibs)
 		$(cmake_use_find_package editor OpenBabel2)
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index b06a6ab56446..a3ef87b4c9ac 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
-DIST kamera-21.04.3.tar.xz 115580 BLAKE2B a7af7c27837ac26c2dd461783f85b895a34f0305f30565f00dfc131ac0ebbb57ab9ab6885cb49b1905630cc5ee9090584721c7a1590b7ac46cf28cc6ebbdc955 SHA512 629f1de8cd94900b8ac247f63a91634613e6f8d3b3889cb289e2f7d926cc58f9eeb0d3b0466d0d963798ea604538485c7409d74dd957398bdc47031e597509f4
 DIST kamera-21.08.3.tar.xz 116536 BLAKE2B 06b707f01f53c3152efd27423cdb34437649ee0f058f04cd8b7bbdb7f078986236f5d6ca8665b1d94ec8afda1b3c09220bd3e2f51e1ca1b8fd65980e670b44e5 SHA512 048260fd228fe52e376e8b4016d6571494782bb78e612f9e67a93f45d5e9626395480d3eb886273d7cdc23e63d0e31c2318993206ee268223495120b508cedd7
-EBUILD kamera-21.04.3.ebuild 790 BLAKE2B 5dd330d66178292cc1fa8bd062737b30871d12b57466a2010c884f025ca5f64576d8faca7762296465ec678bc564069346831e3d835f7f47a34f4dd59472ac09 SHA512 f4731bb0e0fb6a9414542f0e28bc4d0876346c41a8849fd5ef32a59bf1d41f60a04406ffcf4bb8bb517abdbbd683894a43f7def09fe48f1c99b1f24972a7c880
-EBUILD kamera-21.08.3.ebuild 800 BLAKE2B 3986e8f4ace26fb40fa6124729b6c7416ae7ad74253b4a1630a72c3c596c49cfddf8100b902b8ea7908b605c2f567eb86e274c9ea78267a4e2225608e98ded44 SHA512 067448295950034d8adacd6bfdad245d3e940bfd79057206f9ec6ac1eaad75ebd00b50fd46499509fdd309a9520d5dff4d576f4101529fe86e771523102542af
+DIST kamera-21.11.90.tar.xz 117000 BLAKE2B 2e2097f625408f525b1c693796b049b0baa2b745e10f7fba1495f2d20dbdd7506969c5c0282cfde03df044906ca1e52ed42bbba0f62227a2f9ef7212024cd3d4 SHA512 fc7ee2b2f0dab8ce4572505bc5c7679fcc9d44129d2863a94de034da4e72e213715ff460b48a16619af49bddd74df1b5406525c01afaa183f5c94caba8b8cf40
+EBUILD kamera-21.08.3.ebuild 797 BLAKE2B a0f2e4ba746332f70163cbcc2e89aea67811bfe5b0837684745b6b54b4a58561897f6bd02ea8053e3328adad8a1ae34070ea031694f9a720cbbe66a15a6e9c95 SHA512 e654c0550c00544d05f7bc3d7aed5e10042e307eb84ed2f4b5dac1502c3b32a4984d37ec7a4f669539b5ab3725b4a7588eeca2b8e3848e4b12469795dc3e699d
+EBUILD kamera-21.11.90.ebuild 800 BLAKE2B ef7e734a36581a34ea010093ad78e4f152aef59960b4578398a40a8ccbf3cf47bd769ad5d1910b379c064718dc12ac256cac4d0020f37c39150b8ad4a4b718dc SHA512 2e3ea29bbefe6a80f1d4cdbf079f3616ff2d3fbefb2da0e45bb1c32ec67b65c4faad5a6746900645a74d791ff1a846411617e44c90b399219deac31976e80f52
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kamera/kamera-21.08.3.ebuild b/kde-apps/kamera/kamera-21.08.3.ebuild
index 092fc31269cd..a4d16fa34131 100644
--- a/kde-apps/kamera/kamera-21.08.3.ebuild
+++ b/kde-apps/kamera/kamera-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kamera/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kamera/kamera-21.04.3.ebuild b/kde-apps/kamera/kamera-21.11.90.ebuild
index cc08b930d911..da9d9ca5a575 100644
--- a/kde-apps/kamera/kamera-21.04.3.ebuild
+++ b/kde-apps/kamera/kamera-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kamera/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index af77f952470c..be339ed59a60 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,5 +1,5 @@
-DIST kamoso-21.04.3.tar.xz 212040 BLAKE2B ca11ae524f736af7591dbf6c54116f55ba12f0ab5fd80591a0c7b4461ffd979ca93afd9c1619d173868f0ec1a30e84389b252527370d68719f29d9b3d4dc56be SHA512 e15e703e0e3f189cf065e1709914416a0a1e51f58e512fdc816e06ec9af58c84711b33eda17883ce30074da4b5dd4b924ad402b07899ddf2491b4363bcc8ea9d
 DIST kamoso-21.08.3.tar.xz 214788 BLAKE2B 6b612d8e21cb7e8de2964c791006af6097adf594864bf4c29b24aa9cd56ad2c172a2d29d769a21d7be75a37e1dd5cf2ffb3b96309ad974067864718d908a6d10 SHA512 197a088b2b5cb15c27b023c7b00a220aeb704d4e261b7d9efdad50c91ac3b4c5a0dca287709793d280dc762c73941837133f8caba7ad12aecd8c3b3c25466b97
-EBUILD kamoso-21.04.3.ebuild 1090 BLAKE2B fc3dfb658c45a9fccaf7789cd476ba12bdef4a872c9ae99733839b01780f03b684451d2ea5536083a8ea4afcf1957cbd2a23d8be8513a96f849983ea56f24522 SHA512 736d5e3663b9bc53b42f7651d84edaa8ace4dc9d5194736a5d7215ccc077c4f594eab1d113a8430f8e49cb8c50d56539e9b724662b561598a291e797d5145b7e
-EBUILD kamoso-21.08.3.ebuild 1126 BLAKE2B 888da664f43a4c4b7c6644d27046b314b9d2e89605defef038ff4430a2d7e4b9dcab307863b3d64b295e16bfc41f76dd115795c7dcb07f974ef116ce38929242 SHA512 ec9443a27a75423110c9285dc0204c886b3699615655ddfe24c2bb6a2f80cdb9969560aad0c3be582ab8cc0fa7f6bbc5e60ff2f41653933f5aff2879e51f33ee
+DIST kamoso-21.11.90.tar.xz 214816 BLAKE2B 34c385a6bca17e589e4da5481e490ba464874c614ff8ad1dcffc01bd8e5b3c953157e3c6cdae08a309cd534eb3503b19822b2a7fcbf0597d3b583b1ae1542cb4 SHA512 e96e58f0290593ea9b5485eb2da332825d0e5cc571730c55f12565866a99fa8df9b5538005ce84daacd5796721f0dff7ed6b2b0113ce1844e1ceba371b3efe05
+EBUILD kamoso-21.08.3.ebuild 1123 BLAKE2B 6bd172e8edff1fa268e617fcb3c712918bbb0eef3cfc72a8053d92644cfb57a45bca8fc5bc84b24f805b794153783e0a0f98bec0a9fc740933f8dc3d087a9597 SHA512 903480c9a905a7ff7320624089960d78dd8e8b9e4c64aaa00b0ca66863add996cd6f338a4f30e8fdb58403d431097209bac721d16bae1012433a6f51d6a64c93
+EBUILD kamoso-21.11.90.ebuild 1126 BLAKE2B 42b26f48b095fb28cc2606a711e97a68284f4166f51c7d87e62f0ebf78532c3109023acf7c41c6eb644f82aa037346e581f77419cf61602959ac9f75e999a9e9 SHA512 76289364737d0af5390f8e3cd1733ae9bd98add3d2de495eb5a9c61b9ea59b8086586a396de84b21bc27ff9e49bdf4e29dbec44d3ce357af00debe52468fee1d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kamoso/kamoso-21.08.3.ebuild b/kde-apps/kamoso/kamoso-21.08.3.ebuild
index b2aa349da35a..1bb4c622ed77 100644
--- a/kde-apps/kamoso/kamoso-21.08.3.ebuild
+++ b/kde-apps/kamoso/kamoso-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kamoso/ https://userbase.kde.org/Kamoso"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test" # bug 653674
diff --git a/kde-apps/kamoso/kamoso-21.04.3.ebuild b/kde-apps/kamoso/kamoso-21.11.90.ebuild
index bcd8a71f4218..d7dc33e83d94 100644
--- a/kde-apps/kamoso/kamoso-21.04.3.ebuild
+++ b/kde-apps/kamoso/kamoso-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -14,9 +14,11 @@ HOMEPAGE="https://apps.kde.org/kamoso/ https://userbase.kde.org/Kamoso"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
+RESTRICT="test" # bug 653674
+
 DEPEND="
 	dev-libs/glib:2
 	>=dev-qt/qtdeclarative-${QTMIN}:5
@@ -38,5 +40,4 @@ RDEPEND="${DEPEND}
 	media-plugins/gst-plugins-libpng:1.0
 	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
 "
-
-RESTRICT+=" test" # bug 653674
+BDEPEND="virtual/pkgconfig"
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 3681e0cef354..2cbe7fd36eef 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
-DIST kanagram-21.04.3.tar.xz 8039740 BLAKE2B be7b164348037e961f9780456eeffa1afbb12b526bce7aa947d41f6516dc1c31b38f5818b199b2f8a9703075123a752aad95cb01be297dab6bf6f31a91d654af SHA512 33f0d4f1f2521b057674cc1a870c014716f1acd60bbca5d0b8afdcd1353bb46af468bda307e3c6a0a8e0945997c2349c3e95408dfbae9176e87d626056b03929
 DIST kanagram-21.08.3.tar.xz 8039704 BLAKE2B c080d1799a1b6473e516325f43c5092cae08559ccb08c0e5b740529d15f9aabd5908ae0a9b7523bc8ff8c1d806e1ce841acc5fc79c001723be5df1b5c58d0589 SHA512 3a7f4f2e41f77ce5c3544ea22124f048caf0019dc4073a21fdef8f6e734fdfefd7279c0b511a9073df1cf3dc6b0101f9686fa1b0bf6c166118801c2316ff0fbe
-EBUILD kanagram-21.04.3.ebuild 1223 BLAKE2B 4c805497a49270b615b72324e36185a2a9113cdf8790a30ca0aae9e74c6d52a98f3659c4467f3dae32529e787e74fc507b94f923d1a3c3b0e62c9040076c7933 SHA512 f3cff4f250ca700417e3afdfe98ed50ddbe840a64c013fcee268aeeb7d832ae6d913832c5382bf4fc03d0715a51d55ae591c5dabb7fcbcb747769dce91cb1bae
-EBUILD kanagram-21.08.3.ebuild 1233 BLAKE2B 2fd0433dc747d9ee74272f7f04d459ce06c8e5c3d92fe5360be9859286f77c316092caad5bf3b0980cfff70990c9ae4cebcb387d254a619994d3a3a1cb0e76e8 SHA512 80e727b5fb129d8d805025de12bba54e9c772bfec72726391ca72e35827c8caeecd48bf8c0c789239fdafa8d7e1c507b6da7afa4817669dce43da40ee5bf3bcc
+DIST kanagram-21.11.90.tar.xz 8045048 BLAKE2B 16df80bfe704dd90a65bf5d3cd766e82bfe1b69f5c19f321ed2d01510e1b4e1290f5a20c9d41073b3e9a22b6a29c9998436e0096ba4bfc39c7d8bf4cfa5cb60e SHA512 02512f482d595914bbc1343e9967575e3cb2d8d4d6bedcaae6a33c341882bee51be234727215c19e2d4f9196f5c8bc1ede156a29f215728b565907635f6acb4b
+EBUILD kanagram-21.08.3.ebuild 1230 BLAKE2B 97bb3ba8aa967b3e65d9fce2c8456500eda9b2487363e65e82199a4650d5d7b55b63c70af24b72a6769d8b052d2576c3ef75508818aa147e360b8d206396f887 SHA512 470bae8aee90c4fd7ef148324ba3ec85942b198992db3df95ac381ef4893d62cc4f26683db79f7814bd6e18ae02a81151c84108b00356426e019222aa87799d7
+EBUILD kanagram-21.11.90.ebuild 1233 BLAKE2B 54b8024ddf5a000610865924ae5a9973439e8effb27b57d5ac78c4d5f7a85e304c8ef04a9bdcb1a1e097deaf8adb8feeffd7d82fca88ddbc138c0f515c2717f2 SHA512 4196b8f4dec71f25fd6dd2a3cb035d969976b23c57c8c7d09de93ea0f6344bd5e87b8a086ad4893f35059ab94e9dc29b1f3d5b9378527d97c37135e06c98f2de
 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/kde-apps/kanagram/kanagram-21.08.3.ebuild b/kde-apps/kanagram/kanagram-21.08.3.ebuild
index d7b01cca65d3..db52da6c1189 100644
--- a/kde-apps/kanagram/kanagram-21.08.3.ebuild
+++ b/kde-apps/kanagram/kanagram-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kanagram/ https://edu.kde.org/kanagram/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/kanagram/kanagram-21.04.3.ebuild b/kde-apps/kanagram/kanagram-21.11.90.ebuild
index 78cb733f8c50..95aeb08d2c24 100644
--- a/kde-apps/kanagram/kanagram-21.04.3.ebuild
+++ b/kde-apps/kanagram/kanagram-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kanagram/ https://edu.kde.org/kanagram/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index 4b08a720a6c5..a7ad51c5a8d4 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
-DIST kapman-21.04.3.tar.xz 2531848 BLAKE2B 99f99f1af115ffa947d36e6f6120b904d11b4194639b1ad0302b85216b4edc5748b81f67ac5ea7e8805fbec824bd4845f059819a0925d57abc3253cb4c8252a9 SHA512 1925b9d05a29e59b4dfec7d8dcaa57fccafcb7e7cd11667bdecc0490ae8c95d2f9b2b2099905343fd6e7b0fb77f17352654116e9952d8d20d1d2b805f7c86858
 DIST kapman-21.08.3.tar.xz 2472152 BLAKE2B c98e5e18290f285e6195fd640b4405b04159b4d5baf0046eb68acc9744795471462f85e4c16d261872bd109d906d2d70ffa9dc3b14a51658ab3d280d1437046e SHA512 498e3d27a69ddbb3e87316857ca90724fe1d8d7b4a794a8ddffa1aa6d2bb2c50a3c90aa0df3b96ef5d892c1d4d2ff3e7d50a52f8184d52a39fd4a37ecaa1e0f1
-EBUILD kapman-21.04.3.ebuild 854 BLAKE2B 27303a4b900211c79889d93dd7eca78a2611182a077c7c9a784749bd2258ccbac55d02b3e6f40edcbea90cca119a3794c4282df133ceed634f245eb96da3303f SHA512 437aeb9066e7d16a968c3c0c732900c8424628122ce60cced57abf059c9443131626563225c99d06fbf91820abac8c0d83d5c2fce9ab21546b68acf1e54d7337
-EBUILD kapman-21.08.3.ebuild 864 BLAKE2B 118bdd9bd2241fc9b943f326be3536c14b3c81f6deef6e850765bd75204a9a7e4a9619477d0c07f34ccf6ea9b331b24c0315d740684d9f0f3e4e6df121005383 SHA512 5fadcc9ddbdadd6f28d5551f9b09f15dd88a69cae2e9bf32ef3cc924e2b18e319b1effd695df58fc468c4fd8e3e9e587ec6ed28c01f4530e21a4f7298e56b115
+DIST kapman-21.11.90.tar.xz 2471816 BLAKE2B 2c22c7d570d61112cd2466840080c8f2f8d691a82029905fffc63d7dce1ad9159913fc9f7aedcb3d94e3d249104a38ba1c51052921f7ac74fe6d446c8dbca339 SHA512 a1b720b62bf0e2245609f1ec1da0d87c1327882f3b9e3d3b299f5f3867ec1b736facf4e482d90adc9b321092fcfc6e009fc6022d4f4840c32e55b5e6c45ee5c1
+EBUILD kapman-21.08.3.ebuild 861 BLAKE2B fbb597418b8c38c75740cb4301e8c6d96e8e35d1fa0c5501ef5160c7b32ebcfa81d8ce615fa9d17a604e2d6fb449722f99d16b970bad4ddbc0f591b9bc125e71 SHA512 7e9a12876e2b585c6ab1be76729b37ee8122a9286126885efcf1efeff272adb76b4e879087791faacf9f847409a7874e6036640071f3481951069eeb1939897c
+EBUILD kapman-21.11.90.ebuild 864 BLAKE2B cf23a8561ff44782c266e6e8633b0e621ed129d3cf8f1c62988ab9fa3b167058fe8cf1f7faad4c15f0c6abba8eeb599793448eb42efafeef93e1e0502fe41c1c SHA512 a9020336625d479b5d0b8f374188eabd155da115782b7b7041e5ffb769c7e0e2d3158304407288e657aaa56e4ac09987f47b94aeb2335940006a75c237a36e87
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kapman/kapman-21.08.3.ebuild b/kde-apps/kapman/kapman-21.08.3.ebuild
index 3c85a46ea0e4..9e15926a9329 100644
--- a/kde-apps/kapman/kapman-21.08.3.ebuild
+++ b/kde-apps/kapman/kapman-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kapman/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapman/kapman-21.04.3.ebuild b/kde-apps/kapman/kapman-21.11.90.ebuild
index 04f4dc50c6ce..1b000d3bd374 100644
--- a/kde-apps/kapman/kapman-21.04.3.ebuild
+++ b/kde-apps/kapman/kapman-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kapman/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index c2b94f9218f2..ebc2861db77d 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
-DIST kapptemplate-21.04.3.tar.xz 334000 BLAKE2B dee8618b3e4e6968c1f1a243355a3f20abd82d20d31b0b9750b0515535dbcdf3823d32332febac00989efc27a27290d5dc235f67c36662287a3ed1d157a17377 SHA512 15a5a8b143ac58300f9f01ca0c37889ab6498b214fdd77c8aa50743015e6ce40f93578b0eb1cbef39fed8505851db2a170eb8f3850a126a2c38a8e4f49984ad2
 DIST kapptemplate-21.08.3.tar.xz 334020 BLAKE2B a06de0cfa85046d2936b02f971ea0940db2bea03f4b200e4e6d4db256e12b79c923f655d2402fca7a8625ab116bfae24bfed153ca384b19af0649b12759286af SHA512 433160d8fb6722eaa78483a4665855dd1d3f268f5fb8aaae98ca25f556736ea9b9a07eabaedd41010719e4bb37f85369e6ff8cfe61664ba2eb831e387c05fd0b
-EBUILD kapptemplate-21.04.3.ebuild 827 BLAKE2B e45a98ce1b2042b415789ffd86c4871a1abee86da8d3789a6849e9c14023744cb43281c37e83e9395100bbeddad84cab80c618a3a8ec967075854edf6b315024 SHA512 90185ce4a04ffa91fd04f0a6c89759dbf12a1baa2db2b6007352d0323c2020c8a54587f4786b2c179db3b5520aacadd05951d09a449b7e8640d7cf47bf244e8e
-EBUILD kapptemplate-21.08.3.ebuild 844 BLAKE2B 169415f21b7126338a11287e335c79f84b70f3e2211018104f5cf31d507c9d944d161c57c2083ee6a838ce4f4e70d544f23bfeee205b48e1139b4324e06d0115 SHA512 08feb22408a9b61fecad76e6ba98166bec96aca6d4e44c36860d4c5b8b9342ce4565d4b4ecd0baee8ec8ec7fc5ce219b01e981dea71b89f15b1e07c5dc456af7
+DIST kapptemplate-21.11.90.tar.xz 334148 BLAKE2B 41d9340b16f2424b23e7bf689f08ac8507e761fa68c6efb991c21c24b9d5bd7baa1b839d6f3f81279006c7cc75933def6177a0c72820abc398cb2f7191e09c1e SHA512 f0a7643ccb64426727a3704a9eff9ece2c81421db08874daa91e6eb8181e494b35b39948d571fa5f9a9d48e530ede059530fab6c7ab1c27c6a6c8f1db538df8e
+EBUILD kapptemplate-21.08.3.ebuild 841 BLAKE2B 1ccbe2a28fce7f346d0cafb6ca0e63791d2bc5e7034c5fbbc4fc1e943e2752140179c91f5911695f85e4a4ef78bd90537b3bf2c89d2717fd2bf3397cdc5bdae4 SHA512 01c3dafa9dc0eb9f89bd44329e4a6958927ff175652b8393861d8095c22370267463b170c23537a1e284ccdb2fbe828dc5b58aaf114b848d9997253b806e30de
+EBUILD kapptemplate-21.11.90.ebuild 844 BLAKE2B 29ba1e6e688bc30aa4606468b6645d268ef51985ffabb4e4c67e53f8d3a64b4fbd4b41059ff160ce66800a4623be316e1a9975d2f8fc3f8a164dcddb1ecf4bbb SHA512 eaf5536994df1d6ed631f3177c7645faff22ed524660b4ee6898196df568bbc8acf5759f17e2f34f258dccc69735c4e250d36a19f98989f2ee5919d860b15ea1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kapptemplate/kapptemplate-21.08.3.ebuild b/kde-apps/kapptemplate/kapptemplate-21.08.3.ebuild
index 1510ac23717c..84a3907dc666 100644
--- a/kde-apps/kapptemplate/kapptemplate-21.08.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kapptemplate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/kapptemplate-21.04.3.ebuild b/kde-apps/kapptemplate/kapptemplate-21.11.90.ebuild
index b22629800650..1ad99fc63f86 100644
--- a/kde-apps/kapptemplate/kapptemplate-21.04.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kapptemplate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 75daca4ef327..1a0b72882666 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,5 @@
-AUX kate-21.04.0-implicit-dep.patch 2160 BLAKE2B e184cbf456f45e15904e17213813c935b548d1fba6cff98b162dcc4619d0ba166ae1db0c726a637c2b41bd95ebfe75d114259b5d7bcceccdf09141532e893d78 SHA512 23d56228dfdbcb419ec6ecc3353659efdc604f0786ce0ddff6dddb63a990a7086a7d6d777e038567fdbf049c14013d77fdd99f1b01022627a235ce597ca05140
-DIST kate-21.04.3.tar.xz 7283360 BLAKE2B 9520b6cffb284581aaa9bf70daad08fe5ab4570d433ea785a24d0c9122470c9d9d362026c3ea430924c453828001455a377e05537a83a2a81814df4de5e3cf72 SHA512 51c4023f3915edd348c1aa7ce448475f39c3401649510f89c7e17f9943739b67b09330e52b912794b31d4bbab1f94ed322f96bb45d450f016f84efa010d694bf
 DIST kate-21.08.3.tar.xz 7291244 BLAKE2B 190f166be207b513f3e2d723b08886fd70711ef1e409f6d52b7fb4ae8a748ce7fb279c081e1a758884622b05243e4bc0044c757a2bb5e17a141823009b8fa9fe SHA512 2977db9224fb5b49b3a210d8789fa5d644614f2a6ff72fa504337718f017f30ee209dcffb990d3aee8e1f322184e62195ca98668700a2d9becf4de9d9dda65b3
-EBUILD kate-21.04.3.ebuild 3166 BLAKE2B e3c3f161e2749c5b0b8e9b869aebd598f58961dd8c90601cffd9a03ce0e592eda40e8bc4cbcff9bd79d3ce126a3af9213261dafb9c0ef92baf724c514feea4b5 SHA512 baad229af96f7dfb9b27010036bab6d957b8671e7ae08dea451c1d88157ca7f52793d74474b8706cb72f2cda979b16ef44afca884fa377418c46152b55502562
-EBUILD kate-21.08.3.ebuild 3087 BLAKE2B 957746670c3462d9eaeb294716486d6802d8b4abd2f52e7dd2a4cc56150400d74f5a4d376abb6accefd9f5152386c1bd95a92438e59580897e415b64fad213e8 SHA512 b63cfe8193ae5a4449368bbde9ae4fe5a25ae727f364042c2ca7ed76b6ddf89674c6e526a33fe592730e362dfb52c3d80e8e196c5bebddd6d61a9ff5aa0c88da
+DIST kate-21.11.90.tar.xz 7377248 BLAKE2B bc8df04f926662a08fb5613a231686aeab6ac6f1b28a3677dc7c7af1dbf5aa53191019039927ebc64ede5ddd97a7d00814075d373b52d2031f9a08daebed1662 SHA512 b173d6327e4efbfe0c259596188e960edb4589a86cd34db0b53040533f5a5ce8ee4232834ea8e2a347ddc0a80aed96267b46974e249b4012e22553924bd9cdfc
+EBUILD kate-21.08.3.ebuild 3084 BLAKE2B b42508ab801a85caeb0fd71ea72a192ebb9269c42ca97fcca5feabe869187f1ed6b94932e8347d1841326594a048345abe8559a74dfe8307d22bd3dbacd41260 SHA512 d8e0b070edbc6d0b461080d8fc1daa1b9f7417ceae36b5cf23b9605ca3bb0828ae2bd7d07ad6bdeaf0ee1de03db6ac1d758d024dded467768ee1999a5fee6f8c
+EBUILD kate-21.11.90.ebuild 3087 BLAKE2B 91d8fb51c23e56f75baae7012286f08467e21ffe8d153b7c689b073748e331a55892cf630e4b500f0fd77f510bf5cb2b77cf67c0206658f04d1ce1e4be1cb0df SHA512 ae5219368072c28a34f5b04314e0de39a0f06cf6ae1fded1d33b42c4e372c18c0cbb45851c4ce5caee24fcc794429677f03cff57c821d53eed8c9932f35129b1
 MISC metadata.xml 931 BLAKE2B c19c14170c006897490abd974bdb13e6b3deaea6194aab5c5e370ef06aa05eda6848549618854a89d2711676191d9192eb35fb87fbfd5e367b06cc92f8ccc035 SHA512 7a7af87fb546dabcbd9fa834fc1521db489b45ca3a293a2439912af1921092956ce397dfdaa4c398eaf3f7cbeacd70743f7f083ec3306f79d48bb987b677584b
diff --git a/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
deleted file mode 100644
index 482d9a872cd1..000000000000
--- a/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 93d8c2a1887ab70455f471d8e05f346921497a36 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 24 Apr 2021 18:08:33 +0200
-Subject: [PATCH] addons: Add missing Qt5Concurrent to project and search
-
-Implicit use via KIO.
-
-See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- addons/project/CMakeLists.txt | 4 +++-
- addons/search/CMakeLists.txt  | 6 ++++--
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt
-index 16487f6cc..b1f66ada3 100644
---- a/addons/project/CMakeLists.txt
-+++ b/addons/project/CMakeLists.txt
-@@ -1,3 +1,4 @@
-+find_package(Qt5Concurrent ${QT_MIN_VERSION} QUIET)
- find_package(
-   KF5 ${KF5_DEP_VERSION}
-   QUIET
-@@ -9,7 +10,7 @@ find_package(
- set_package_properties(KFGuiAddons PROPERTIES PURPOSE "Required to build the project addon")
- set_package_properties(KF5NewStuff PROPERTIES PURPOSE "Required to build the project addon")
- 
--if(NOT KF5_FOUND)
-+if(NOT KF5_FOUND OR NOT Qt5Concurrent_FOUND)
-   return()
- endif()
- 
-@@ -19,6 +20,7 @@ target_compile_definitions(kateprojectplugin PRIVATE TRANSLATION_DOMAIN="katepro
- target_link_libraries(
-   kateprojectplugin
-   PRIVATE
-+    Qt5::Concurrent
-     KF5::GuiAddons
-     KF5::NewStuff
-     KF5::TextEditor
-diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt
-index 9bbe2c1c9..a541f78b8 100644
---- a/addons/search/CMakeLists.txt
-+++ b/addons/search/CMakeLists.txt
-@@ -1,7 +1,8 @@
-+find_package(Qt5Concurrent ${QT_MIN_VERSION} QUIET)
- find_package(KF5ItemViews ${KF5_DEP_VERSION} QUIET)
- set_package_properties(KF5ItemViews PROPERTIES PURPOSE "Required to build the search addon")
- 
--if(NOT KF5ItemViews_FOUND)
-+if(NOT KF5ItemViews_FOUND OR NOT Qt5Concurrent_FOUND)
-   return()
- endif()
- 
-@@ -9,8 +10,9 @@ add_library(katesearchplugin MODULE "")
- target_compile_definitions(katesearchplugin PRIVATE TRANSLATION_DOMAIN="katesearch")
- 
- target_link_libraries(
--  katesearchplugin 
-+  katesearchplugin
-   PRIVATE
-+    Qt5::Concurrent
-     KF5::ItemViews
-     KF5::TextEditor
- )
--- 
-2.31.1
-
diff --git a/kde-apps/kate/kate-21.08.3.ebuild b/kde-apps/kate/kate-21.08.3.ebuild
index b0fe1f5e3c3a..72d30bea2b89 100644
--- a/kde-apps/kate/kate-21.08.3.ebuild
+++ b/kde-apps/kate/kate-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
 
 # only addons/externaltools depends on kiconthemes, too small for USE
diff --git a/kde-apps/kate/kate-21.04.3.ebuild b/kde-apps/kate/kate-21.11.90.ebuild
index 6fadb90d1b8e..319af807f297 100644
--- a/kde-apps/kate/kate-21.04.3.ebuild
+++ b/kde-apps/kate/kate-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
@@ -15,7 +15,7 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
 
 # only addons/externaltools depends on kiconthemes, too small for USE
@@ -62,11 +62,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	# bug 785412, master/21.08
-	"${FILESDIR}/${PN}-21.04.0-implicit-dep.patch"
-)
-
 src_prepare() {
 	ecm_src_prepare
 
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 7b36414f269b..f1278d7799c3 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,5 @@
-DIST katomic-21.04.3.tar.xz 1433720 BLAKE2B 36377b88d1630fa278a47e2096cdf42d41dc78ae98dd3b35909ceb7db244f51c24c76b88725bcd9c7ec2a0f69f7f45b3776c2a721b28cf1da1145686a8995a86 SHA512 04ffa027e189b5ec10f538dfa4b51ffa2a124b0f5262c1563fd606deeba981f91b7209e89c4ac09de7371870befd56f2a1ae4f6cb656162a7c70f4e2f244de0c
 DIST katomic-21.08.3.tar.xz 1434348 BLAKE2B 2da96f77bd8cd22637ff91b6a1b3a39fc2df578d5a3ddf8c6984d9e0551aca875a29ffcde1b3b158741d484e2dc13d8e2b2577cbe3680bbbe50c795748e3b10d SHA512 9d7608ec2d0ebda4ade645ac0d35ec408b7b9cc71e7479e7131695f540ebc01a366e95c6e2d9ee9fbc56e497654b8db0533c4de6f91eb040420f2b84023cfd58
-EBUILD katomic-21.04.3.ebuild 869 BLAKE2B e340784f1d7bd716de89d28482bcc82caec8657f6118c6f7f1adee4c858bbc91385a19f5f4da54f908da6023da8567b7feb0ffc73375c64cf687e42e5d24f653 SHA512 9c3d6a5d84d85886a6a07363043ff1297e2bc16d4207917698009345d4fb0c119269ea77d3ed8ad69b540ef65218d54e04206ebca6d0d57938979ce9e7634dbf
-EBUILD katomic-21.08.3.ebuild 879 BLAKE2B 42c6ff2a033d03ecbaecab28b8b7b6ec6d0b9026e8a56468eee72df4fbd372d6467d5c6b596cb0f576ab7ae6c189c8cddde9ee517d9fc11a9eb990b751ad314a SHA512 9be73100c9e8d67b6f38fe15681e3282dc3f626c00e31bf3de024dde148ef324390bf574a6aaeb8560dc1f03ea5973ce54b6feecf57b7d9171d5cb5c139ab603
+DIST katomic-21.11.90.tar.xz 1435120 BLAKE2B b3a484f2ae1336f3045d309f86db87802549c7d935c913e33a0d1c0bb9d8a5656e73376aa724440968c003f47b37d3b6948d8e3e87fe1e1655d30aaa38628640 SHA512 f42e16ee7c684de70f0a364d06bc61926e98b87f4caf813ed73d0d1b80940ff274faa5c38e3cb904e03f8dc030fbc831e9f3c5aa2ddfb0441d24ad3ad8eb46f5
+EBUILD katomic-21.08.3.ebuild 876 BLAKE2B 6bb6c27d1a68a4f3f14dcd275f2c1693f933915a93a5bfea8d7a61d28217a84c5f8d150aff7fe792cc346a9f6b625daf648664ef8c112d718835586ca92f77fa SHA512 f64c314e60fe05f9292f4466f7d9d4ad4cf555f61858db5a17536f90b27a30bfbb741cc6f3d837f4008f03e1bf0ed982f280339404b44eafc5e3f9909bbbd865
+EBUILD katomic-21.11.90.ebuild 879 BLAKE2B dfc764a00a52fb35cc1d40bee6c298ab4dcafe3e72f66db49f7616a46018f2dfb2dfe32ea0cfb9e938779215ae49c571feb94ead22acf5ef0cedf4ae64a05f74 SHA512 b7ba80b92f82f289b85fe8a63a59d450da1a665198f192c6fdbd62a76721b6af19bca2d390676fd52be6c581811de291de809287f91df41482bb05a853b506ef
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/katomic/katomic-21.08.3.ebuild b/kde-apps/katomic/katomic-21.08.3.ebuild
index a7722b7691df..a5f9c551de7e 100644
--- a/kde-apps/katomic/katomic-21.08.3.ebuild
+++ b/kde-apps/katomic/katomic-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/katomic/ https://games.kde.org/games/katomic/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/katomic/katomic-21.04.3.ebuild b/kde-apps/katomic/katomic-21.11.90.ebuild
index 6f27ca86ecea..d9870aa335a8 100644
--- a/kde-apps/katomic/katomic-21.04.3.ebuild
+++ b/kde-apps/katomic/katomic-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/katomic/ https://games.kde.org/games/katomic/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index 53678f6cc341..0167356b4033 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,5 +1,5 @@
-DIST kbackup-21.04.3.tar.xz 383704 BLAKE2B 15dc6890fa5fdcc9400906eeacc3abe43e15c2293c0dbcd0b94ee74cfd93a0befaf699f3a66688c324fa0a865d377a261314a31653d3272904e9628a203089c2 SHA512 749c7611806ec78542cf1f6b56229121d584ef492646fce7a3d50b85024520701e9b61a08b56b3979326bfe823130665552d79ef01dc3c2b95138a6fdb49e8dd
 DIST kbackup-21.08.3.tar.xz 388912 BLAKE2B e6899b5a4adf3ad3c08a4f2acbbd9268a969b96a41b306f664dd39b80b254f236474971686ba695b54be4704e68132ba79262502f3e219a6323a713111bba5d2 SHA512 9e22a8d99c67eb0de712abcff5c2eea5abfccc4aee855ce6eaab48fb0d905b5d02a3a605abce1cae24127f2585906e25f9eaf4a53074f48273ddebbb59f8391b
-EBUILD kbackup-21.04.3.ebuild 930 BLAKE2B 5460eeef7fdaba5597dbf627328aefcf7383f482f5ad6f41887aa6a73116ff62484fd44302f5c297ca7cc5e51ced85938178df9aab9216d85544a66f81a8171c SHA512 1b9d2bea8fbe7b30c33a22ccb46f83d50e5f936b595c709c4f2ea9ce988c466642abbc832a7894bfa3cf3c4c68daec486134715fbb7b45a83a04bb6021b1ff3c
-EBUILD kbackup-21.08.3.ebuild 980 BLAKE2B fa489f2e13edb0ea7ac5600ce0619f292b5e16e6bf914991cdcc90cee601867f3a28abad368a31de91ebba42e9dc5fb0cccf4cd8c2ad3c42cc29e95c68a1036d SHA512 1a6533cd26422d6c52994310f991378a11566b4cb6d23759d4b048a3f20123eb08173b3b25a70436ef2d3693ad76b1672bd77d34e91f4a18c33c14d93c7e20a9
+DIST kbackup-21.11.90.tar.xz 389096 BLAKE2B ed040fa4a07ee45af8bbf2b53eae4b12577acfafd15e7f22ca105168beca1aeceb449c2b841808d79e12dc867db27ed99bde5e0dbfae4a4c590aa46649d1dd19 SHA512 56077e1dc36af630cec007e65a9e4b8e1f681c4337f8cd0faf8c9c056c5f422bf689fd549d30a14f79b05bb6827b54533aaff54487a384f4cbe95645fe9b8b2c
+EBUILD kbackup-21.08.3.ebuild 977 BLAKE2B e115fc96a5ad95fe2f60c6c2b59d3f48c5a1886cd8d151db09d49c222960e3e9b30a30bd86a186f067c297149dd6aa08e5c07a8bc71bb01c91435958cfe784e6 SHA512 6dc3fa02b0f30f9e39c7f6bb73062f26f1d9c63c20d8604210f84f83c4e5eef1c1875d36ac4a07b83c7b8cd7a1eb144ea2b9a25dac68578b18136cfabfa6b468
+EBUILD kbackup-21.11.90.ebuild 980 BLAKE2B 7e448ed371583cb5efc7574937fb0e01023dbcf757e0d33301535972fcfc78f490a6397260bc461d87bb2ff89853643d58654c48ef3c6c7014315bf0141f3934 SHA512 56378a83089222d7eebaff82c2a6a10e024ae574c97d9fb2c38696befe9a72f8642171c0a027b2c30a91add8af40c6803bf53c805404af2f4cc3464553ec711b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kbackup/kbackup-21.08.3.ebuild b/kde-apps/kbackup/kbackup-21.08.3.ebuild
index 186cd4bd0082..6c7dde1ce646 100644
--- a/kde-apps/kbackup/kbackup-21.08.3.ebuild
+++ b/kde-apps/kbackup/kbackup-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kbackup/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbackup/kbackup-21.04.3.ebuild b/kde-apps/kbackup/kbackup-21.11.90.ebuild
index 01126c3136ca..5a5e911c534e 100644
--- a/kde-apps/kbackup/kbackup-21.04.3.ebuild
+++ b/kde-apps/kbackup/kbackup-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kbackup/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -24,6 +24,7 @@ DEPEND="
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index da565921c922..19280305a9cd 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
-DIST kblackbox-21.04.3.tar.xz 455152 BLAKE2B 0d6238f22a8d28d7e28418f43ce7b0f860cecdcd969e093e1bcc391322e526996fb291d6e1a9bdf91d2a5ccfdcfc8af8709982392c0efcf87f14e5f6f4c37df6 SHA512 b42076c4dc5a5191c8bd4d6584e70361aab6d32e98742a971311f58c6a302dcfa0b706bad5f62cb5751e7a58e60d6788cebebeef7912fe4878d165d758f03b0e
 DIST kblackbox-21.08.3.tar.xz 523924 BLAKE2B 136a5042dafed806af46d5e8bd5b53027537c84f8dfb3dcc75cebb964a3cd5ae57dafbbe160b92864b53b82c51c28e5f7458e45559c76005ec5bea5651c39243 SHA512 078b1fe5c502f00ffe1ea6e3635ea77e8493c14c56799951302987279555adef30b2090cd76c4e903082f987ad08525f3e974deea37998b0c61420c3fcffbe3d
-EBUILD kblackbox-21.04.3.ebuild 991 BLAKE2B 94682c431082f013a2d12129100910af17c7669d16c2dbdcdedc988c23a2df584b6b8de3ba8f76645b6787815ed9929906ac2aa74096bb37dbe1eba7d1de0a37 SHA512 b644b01dbb254e208dd3ac1935afe7390a726eb004e7fdade9380c3732b337124fbb7631e128c7f85efa7e368b7804c6658956550370bbcf7a2d655550fb16ec
-EBUILD kblackbox-21.08.3.ebuild 1001 BLAKE2B bdad417ff6659ec35de0230af556fa50d2e6f3b55d3ba09bdecc808c06f783445938ac91ad142c1f5fa5f72c514e4fdd9b2e9a2ee0d6efef3d7c1da5ffcef551 SHA512 6f477e3acdb371f20af5c50a50eaab30770c0475cb71c30091c3d893bed9ff3fd1439267d65f8116ab34d7f80037881a0368a3f70dadf2dd5369969b1a524d6e
+DIST kblackbox-21.11.90.tar.xz 524184 BLAKE2B 6493491c2c7b545ad8689231fe5b6e286d6b82829b0819cd7e8cadd214ba62d6c860230451bdb85d09cecdb86f76eb6ff7ae74549461accf7b117176f9488d51 SHA512 e673dde7fcdebde9807214821e09e47936a40a19548481c42fba13d22b091849f733d95ed50f97665b38d594070d161ff375add9927381576fddc25d46598772
+EBUILD kblackbox-21.08.3.ebuild 998 BLAKE2B 77e773e8f9dc10a42e2f986acc7341df83e9bcadd678036348532019de797a4b2c6d516a17c1c7a5f88fc4eeb4d860a2fe313224629e145fe750866ef6b9926b SHA512 ef3e69bd1e56f765310b9c73b1845a4646218d08c325ab5bb84dcf264d92018db8dee2730c925a091d3fcfd72b3426601482f88aacd0c78eed46131067613cc0
+EBUILD kblackbox-21.11.90.ebuild 1001 BLAKE2B 256f64dd202066f46264a5f6ea624d406ca23b3a876c0df6c48a17440b4fc5a0c3c07e6b5fd75c3309c6050662000ab1ace6dd6b68b0afa4f98ed27d66a634f0 SHA512 7dbe72586c96e6a515114892a2e2b2f6d8c94f8610b71398fb691a5284c5143e7a4e1e77539c4b3ddfb662e7c458c06832952624ef9fc194f9d240630e53d739
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kblackbox/kblackbox-21.08.3.ebuild b/kde-apps/kblackbox/kblackbox-21.08.3.ebuild
index 89a6fcfd82a0..bb569ad0eabc 100644
--- a/kde-apps/kblackbox/kblackbox-21.08.3.ebuild
+++ b/kde-apps/kblackbox/kblackbox-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kblackbox/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblackbox/kblackbox-21.04.3.ebuild b/kde-apps/kblackbox/kblackbox-21.11.90.ebuild
index 34e95b983f46..ccce1134cd76 100644
--- a/kde-apps/kblackbox/kblackbox-21.04.3.ebuild
+++ b/kde-apps/kblackbox/kblackbox-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kblackbox/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index 45f5190c39ca..162b97bfd29f 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,5 @@
-DIST kblocks-21.04.3.tar.xz 1912336 BLAKE2B 645d5bb20db8417631acf57f83fc57acb38a089a9033deb852aaa9d06dcf52426d8bb576f4360fb8b47f393f3c90ccb944092e0ba732e97cec5513691c7aee94 SHA512 3356063a7d7b20363482e51c0c174a40bb3b799df62593fa4c2564299b649faa008f1ea4b5e2f0c60d46055ea2e77daafe5e7c7ad83b46cbbd0285851e27ce3c
 DIST kblocks-21.08.3.tar.xz 2099716 BLAKE2B 08beb489813b4f772828cc7e5ea0e385f78aee48175c84ba07c4026c1be7be9621e96a944d30e4bce848941d9011433b642883f04b679ef5b3f584128a3dfe2b SHA512 88e7eca4f5dd07b4f1d0190db1cadcf795f7b4b372451f8352fb1bc7f2e97ab2f9e38a85a192b358489132502837496a604c2484e2cda32eab87a5e4997fdb8a
-EBUILD kblocks-21.04.3.ebuild 882 BLAKE2B e588475b3adf7cb491a74b5b40d9f1ca27decceeb35f6120199ad53f7cb903ea5444e5a99431154fe9d789ab10b0c5e3ac0af6911deae135edfca3416cb10312 SHA512 4f3ce0fd85d5618fb7440f5916f0993cff0f3cfd8898b44fab3ad5c1e98be8dda293a634f89a714065589a4ccf4cb0f9d174c7365279f8f8adae821fed58fee7
-EBUILD kblocks-21.08.3.ebuild 892 BLAKE2B 67f48d33e78313bb98048b231b696718c23cf0c66a7d463f1d4de37b7b18cd4d601cba3383c9387e00d7f7ab6e222cedabd6ce5e995776437ceba7755c279c3d SHA512 ec9cbe096721c3a1d0838a1bfab672504fc1f4b5fceb3469b47355ee49a7191a97d679e3628430a35c31aff324a0b94c3f75131ce497c4eafa2d0c7417c634d8
+DIST kblocks-21.11.90.tar.xz 2100676 BLAKE2B 008e96943aafd3b3c27e942fd634637243217b0dfa388a7ca315351909beead54dda02937d49b2c2b4a43d41649825edfbcc101bb237923a72486b47164c414c SHA512 0b2268c7438ec7ea3f391a5feb6b17f9c9ab9bb0ff5e52399c997e87add49625b49d122c953d09a6e858ac7cb14dc17b5e741a8899df9271aa12e0b799d82608
+EBUILD kblocks-21.08.3.ebuild 889 BLAKE2B f4617be844285a27d0aa15c7f8d0d01813d20a12f99f7150f52b53e11d4b30e2826c6971766ab177b60443d77bcbddd546ceefe4570bfc897f5c0efe9cbe4648 SHA512 37075a27034500741c1025dd180dc7ca86529a3df2e6c0cdf8ac11d56b2b09bba9c5dfe6df017d359f6b5fea8431cc1e4a8de0d0ce5ac3979cd61acfbf68b9ef
+EBUILD kblocks-21.11.90.ebuild 892 BLAKE2B be695740e89d25d934e6b218a049d4c9d29ce5b319bb8a2ff67e3462e9ebf3c95df51a570c0859b7318389f7c760fe4c662639af91cb89f5dd93f95200aa42cc SHA512 6582d052c00879b9962b819dce945162ba193fa8fa90e69661c3fae26ee23a8709283b589d29e5394d0294e0ac135222d6a780629862e3fab3c9a861c946f958
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kblocks/kblocks-21.08.3.ebuild b/kde-apps/kblocks/kblocks-21.08.3.ebuild
index e5de3006e107..3e83b910cbc4 100644
--- a/kde-apps/kblocks/kblocks-21.08.3.ebuild
+++ b/kde-apps/kblocks/kblocks-21.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kblocks/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblocks/kblocks-21.04.3.ebuild b/kde-apps/kblocks/kblocks-21.11.90.ebuild
index 6c17ba0544c5..3b58d3898cdb 100644
--- a/kde-apps/kblocks/kblocks-21.04.3.ebuild
+++ b/kde-apps/kblocks/kblocks-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kblocks/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index f414ad9a8574..8b4a06986345 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
-DIST kbounce-21.04.3.tar.xz 3447648 BLAKE2B f06cd15abb43f0f95395774ee65992b2d93c861e4e4784f322044cb0e341c1d4fabecfe69d8f4fce6fb4544843df9f2710595a16c3f47a04df0dc9289c7ac4bd SHA512 abd045e3af6e6b65d125e863b9d8814b30a0a0e99137820b5dbc334ff172479c0d67a023bd97c323d2764ebaaa0ebcc6e3d4f8e0b2d4c0f29dbbc85b95b2a3e0
 DIST kbounce-21.08.3.tar.xz 3527684 BLAKE2B aff347d2fad3a0e0ef1c773b7d5a049657a25b51e5502e63ed496d42964089873d5d55dd86f5148f7ce7bc3101dd459ceab8c20e7d11796bfc445be0cd690ae9 SHA512 4724b0bf01ef5206da5e981e29d2ebc9a1a4d5c4603df830a7c99124d03433f290ec8c297f24b1311290cc41afa98a4ab2c32b350642128dabd8e4d4710cbe60
-EBUILD kbounce-21.04.3.ebuild 966 BLAKE2B 2fde17025061178a79a7ae4ded9f325d741b8d99788999e6d4a3332448581050fef24918b47f5e4f8aaff86fa79778e7411040df8f1447222c1ab5bb2eb067ed SHA512 05fe40c0d0383485bfa0f9a446b01f6d4eee4bebe2b697f600145ff8d65aa103623ce38b7606ff62b5da2a31daa9fd4459ffe1ca962b451eda01f3e185250af0
-EBUILD kbounce-21.08.3.ebuild 976 BLAKE2B 58fd495dd980d146a860a49f9b32aa61dacdc000534a410720b0319e5a0e388c4b6f759f9bf4df54455b3954711991496614323c025dde9d3973e8e9f80b637c SHA512 8922ed4f7f70b163e1e4a4f755803adf97db9f0736e29a6c271df2a88e0e24bf79ac7b382c679baf8eb75de510586dd37822de68ff3952dbdf3c5f1cbf80a406
+DIST kbounce-21.11.90.tar.xz 3527060 BLAKE2B 10136eb638c598a1e445052e07af988df5e0fd5161dccf5423fd9b110c56d419389680521810c64d62b6da0e30e4c2ad66b59ed623a562e7030810663972bd3c SHA512 db7234488cb8c3f8c67f3c155c82f0730805fdf05b651791c6e51ded47e9433baa0809ea360baa985f82f5e74c73c4766d566464b56b8ac59335e6b54bfbd1d1
+EBUILD kbounce-21.08.3.ebuild 973 BLAKE2B c771bc91f13626554d1b2a9b254acb6b048dc517959c39a54999c58f9b0d153571674b29447f0a8eb3ab892e4911dabc889adf50cbbeddcc8eece8c4ddf55205 SHA512 4228cdee2452e6b91f9200a5fb9354eec4af7f83318aa1237993e47f18b28452a68992a24c9275697de25804ba98afd0404e13d24dc8189ce09c5359150be85c
+EBUILD kbounce-21.11.90.ebuild 976 BLAKE2B f1062317d1e370d14d696c9229a145da3becc34646cdcd362e087bff8edc701db024116071165182750c8f687be6ce86b413d997454af647a9eeeb069ac0e125 SHA512 3e8acfe807cc52cd5775855252f79f5ca5c892baf7cd685b4fc6916ba8afdf8a5eab87ac92f8d052cc50a94ef8f0e6283ef4541409f5b26ab6477d225545a093
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kbounce/kbounce-21.08.3.ebuild b/kde-apps/kbounce/kbounce-21.08.3.ebuild
index d41f3275ef21..e1d9b5814082 100644
--- a/kde-apps/kbounce/kbounce-21.08.3.ebuild
+++ b/kde-apps/kbounce/kbounce-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kbounce/ https://games.kde.org/games/kbounce/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbounce/kbounce-21.04.3.ebuild b/kde-apps/kbounce/kbounce-21.11.90.ebuild
index 09c8f7ad540c..cb63acd77102 100644
--- a/kde-apps/kbounce/kbounce-21.04.3.ebuild
+++ b/kde-apps/kbounce/kbounce-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kbounce/ https://games.kde.org/games/kbounce/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index 146810e8078d..79846540009a 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
-DIST kbreakout-21.04.3.tar.xz 2282256 BLAKE2B 09c585e91a1323fdbb0abdba61b3cd38df565b05ad185ad39b41eb79f527b250e36eb41400aa113c09f392434db6a4c2e0cc91bf16c639210facb0e0c7576727 SHA512 0f72faaf376a239c5d107dd4b45c0d0bff9a8710fca018e1ed0e519b087570c5b3679c00556b2a21feddcba8b3a182d2209b42fc8b3ff5785e0dff863b53942a
 DIST kbreakout-21.08.3.tar.xz 2554304 BLAKE2B 749da8c8d6b28c478d979b57156298fc7bb4bd4933d7dd34347b6831496aca00bcfe6030f38911897e58f4aa76edd789b478e6df1f4daa499248534ced5820b1 SHA512 67a6e87bcfef647fc92b1e937a7ab5222ba114a8fb87722abf0eb4bb79108158f50b9ce8b1188ef28d3397a67cded035f59351452a00d423ee9c239f5bd6d313
-EBUILD kbreakout-21.04.3.ebuild 909 BLAKE2B 12455f033e606fdd1064ecd54fa8df5aad7ae46758fa183b554356e98237213a89bcaeba7827601200027efa42ecc8a6102e4e1bdf7a246f7e5d1a93092d5130 SHA512 96945ff2c35f3138961b7a657114f673673eabb3ca222f9a8c6446fe6c4446b61685a47004c73c4b2a3021d366045e0c13e4d2235e086ce09bb61964b7a18afe
-EBUILD kbreakout-21.08.3.ebuild 919 BLAKE2B 997a66da022eb05f0550927b7f378f0e0d0d1f969d3a4433d2abf126ba3a4035181451739eb7ed798c864a48ddc36cdf9fc20136a1a1add942dd018a5ae3a808 SHA512 ec4c837432d7ed6f67411a327f53c0934a2700443b10784a078baa62653c4a47ae6353216b86f48da01680b7feb5b76d57f1a9c0ca449921b8b46b753a29f812
+DIST kbreakout-21.11.90.tar.xz 2554696 BLAKE2B 216fbe35f1b1b797b4a28c60b7f71c030b43db8d4bb4ae6c043c129d889a058a1ed30208652c1ba1f2fd2d2af3726b903b218aef309bd9a8610bb34d0fb305d7 SHA512 8decbe83e536cafac4952cf781770266c9f62be6978d04075528b6f64183881df3e044d3dd85f4cd0c01009a83aff3583e9370d2f84101d94c95ab996c2f7adf
+EBUILD kbreakout-21.08.3.ebuild 916 BLAKE2B 1aaecb74635119f5fb0cc5eebcfd3b30c3229af369dc5d290b2c344ec0fdfbe52a60688a34eb3669858ad8d689e69cc866ec3b55fbdb885b34cec84c9c351892 SHA512 b031e5d92d0c87b88130d0ec52792f068df6efecd981fb033b159886df6181058f9c478f9ae349f8ff1d1a7b908eccaea5452813afa3814c4b3c8ef71aa6eb8f
+EBUILD kbreakout-21.11.90.ebuild 919 BLAKE2B f2ba4d53c50590313e2085d21ca241fb9fe5bc6d51d0fda139ffd568e6185bf116eee054b84839ffb1ab420481db029b85f665320415d8f7edbba2d5a7b63a9e SHA512 dfc4dce24d59d0686f545c1a8d2c4af40a4dc22cf830be56e171bc3894660cfe3b513ed0d258e3df8ad2823aacf3a7b3ba51293dfe8d70d535f03cb39bbe39f3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kbreakout/kbreakout-21.08.3.ebuild b/kde-apps/kbreakout/kbreakout-21.08.3.ebuild
index e838fcf24e22..03c0386d3760 100644
--- a/kde-apps/kbreakout/kbreakout-21.08.3.ebuild
+++ b/kde-apps/kbreakout/kbreakout-21.08.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kbreakout/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbreakout/kbreakout-21.04.3.ebuild b/kde-apps/kbreakout/kbreakout-21.11.90.ebuild
index 6bebab898a22..3aa88b5c105c 100644
--- a/kde-apps/kbreakout/kbreakout-21.04.3.ebuild
+++ b/kde-apps/kbreakout/kbreakout-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ https://games.kde.org/games/kbreakout/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 53283b543e28..1f289d01ad7d 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
-DIST kbruch-21.04.3.tar.xz 5627384 BLAKE2B 1c87c0efcdadca11e7e56e7b4dd6d5c43fa8fd98ff70e5b8076a32f8d5e4e595d1d966c1303ec91d427f1286e4dbb65b17911db4dcdf96be7caa7548c7d6ca49 SHA512 9e7b9ed8314554f6decf184606d334de87f472532ec7e44d296316884f112382b1f7eb49de275c83dab51048d7211f337b0718cea91fda5df6a1f43aaf0ab09d
 DIST kbruch-21.08.3.tar.xz 5628336 BLAKE2B aeacbe500d612ba25c4028c0a61d762b729e829c6a76cc2924a9d2554ae37b9553f8fb2c9e1c956b785da27af0ee0ccbf0b04f35274cb0183a4269cb2ef6106d SHA512 b08ec3dca39f80712ff94b51eb24a79033333ba6546d6199b623ec0a5ba3d835fad441ef59ca69a6f450351e3c455c402302bdd7434b16d6eef54b78cedcf83a
-EBUILD kbruch-21.04.3.ebuild 734 BLAKE2B 71502fa13fa6c57425da514c0d73af02aec05418920e7c7d631f27cfe833ea7950c783d2b648564563431d962602a33c21f8caf7b2b0d6aa753980122f73e3af SHA512 59ab97ad625832f367c568375fb8c35f2779ea7a500337787e3c5d73fb09f0e914ca4deb40105a1d89f4755d7eb5395a433103eb5ed38344ad28c3f6c3f74706
-EBUILD kbruch-21.08.3.ebuild 744 BLAKE2B d4da0d99d4d12a344d7be6992ff239da085c81d9c3555b66283f847e731338d009487de0bf73d7bf146309b01f5ee95bc6d30a8977d4332910b808ed33f4f823 SHA512 8310a431adc7c11ccbf5fd8e1d567be021a57aa5fd42098ce392e571f94dc42d8e3ddb995546daf9db86002a9b0ca6515e986aedd525dd6094a115682b150ef9
+DIST kbruch-21.11.90.tar.xz 5628584 BLAKE2B 0f2da883b54d863eb309d855184881ed45c926757b4303a712afc6b757244edc82497e88a87d8984c358b6b807a37305d385c88a7fe4e1cac1634691bce803b4 SHA512 400df10dda81dc71a226a7842edac7347e166ffeea78a6af9252786a4fcd22b42cf3b28d3053b535ff5ab7f382a3a98fd7095ab61c3c7772efe0dfbb81104380
+EBUILD kbruch-21.08.3.ebuild 741 BLAKE2B 5ff2228f42d6dc5ed0f5cceaca503cb879d56bbf3e2daa8263be9e530954bf636ea2609788a93626a3685e378cb6c5a869efdf7ba9eded008c84d42181e32864 SHA512 eec0e31456ee49066cc69c8fcaf3b483204686650afc57bddc6127067542b5ddf82ed51831ac62b1cf1768764df4d2ca0276ac9135d9bf2db0e5efe48f5dad2d
+EBUILD kbruch-21.11.90.ebuild 744 BLAKE2B 62476561b80901732d8f93078ae838e5ae0757b2c6c8b8230fabfc1398b8cc737c084f61f76ec00600b36d2e3c35f4ac52dc86ea24daa62b7b0b468ed4a4c426 SHA512 a9aef62a53e1ca349c1924b7aa7acf325cf600ae805d19e59bf567db1fef397fa651cb5c0726c9e3de6136304cc9a2abf161067f5a099c3c927a41aaead462ff
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kbruch/kbruch-21.08.3.ebuild b/kde-apps/kbruch/kbruch-21.08.3.ebuild
index ac9fb7867cb4..3c23cc572714 100644
--- a/kde-apps/kbruch/kbruch-21.08.3.ebuild
+++ b/kde-apps/kbruch/kbruch-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kbruch/ https://edu.kde.org/kbruch/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbruch/kbruch-21.04.3.ebuild b/kde-apps/kbruch/kbruch-21.11.90.ebuild
index f8393779ce8b..55994dbdd924 100644
--- a/kde-apps/kbruch/kbruch-21.04.3.ebuild
+++ b/kde-apps/kbruch/kbruch-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kbruch/ https://edu.kde.org/kbruch/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 11cda7e9db28..a40c150bd79a 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
-DIST kcachegrind-21.04.3.tar.xz 854044 BLAKE2B 5453bf99c11740f6cfe90f4c0051613aebf1fff832b492800ef9c2e21fefd86c8a8becd2e91d2e82a3a56e1e88450b5f9498dd85c73ceed53d49de00efc9ad95 SHA512 b2823ef28686e4e3f25a0b45d163be55899297ec3115a6c984e361c859eb94d537102add9f630abe5182eec097747355cdf259b7eb1ab9de644414cf7dad92c1
 DIST kcachegrind-21.08.3.tar.xz 854848 BLAKE2B 31520ffb6a04139de7a83f210990e08b65162d3a50fd813c5189f0a6c2109cadf22d022c896b4abc161d488474c38357963d46e32e1676f9f9c74be76edbe527 SHA512 ce4d1f94b6f96ebc6455adaed47208327bb6e09c312085864afe335e6cb5250205bb7f515b13748bede49dc96e333b2c8230e822f8145caee0fc8dfe6ed42440
-EBUILD kcachegrind-21.04.3.ebuild 975 BLAKE2B cebe4e0f58e6c99b46be5e885df0683948cda5667da8088068eef312b1c84ce1363df3c84d2579ed64b07c90c7a65e5fb037dee9a8cd37de2d7c366334b8a798 SHA512 df7d8a09b6647b86f6f84dc834e0072cf85e9eafb86a2034db5907c29e628d36c4300e51149b0a65777ad49674a6e4542cc2fc840df5f039ba8b385eb0938197
-EBUILD kcachegrind-21.08.3.ebuild 985 BLAKE2B 2c0ccb13009199b1c887e425e40ad8a440db4e61bf2ed769e11af1535c1326a8910281166b61a02ba1381786a19d5c0c95ee5e9af323d4e264c46cbecc100898 SHA512 d1c314f422c668d0e58ffa203a9c4e06e84a83152fa4a99ed7cb7356895b3b5cdfcd76d5a4836828f2ed4e13c49cf1dc25c4bb2e14050a7c330b8b0d44e099b3
+DIST kcachegrind-21.11.90.tar.xz 854812 BLAKE2B 4cf3bfff0b1333b19f39759701d8961baba3cbde20bc619278bb1f2740c1428025fc71c98c36e5a458f9ace53adb6efb963ca8bb9f50e83d87b2d8424e1d2316 SHA512 10bd467fd5b466e0d4e5e4341d3122837e5d13c465ad0ea30b152fd4510c11707179bf286845803c04f1fb8d3e48bf78fc6f3b69562ac85c416aa2d606255de0
+EBUILD kcachegrind-21.08.3.ebuild 982 BLAKE2B 3be9cb4cd6f50b6d2c624e3040a4c484e2d14c7d0e9b4538e575dc03858685324e0433481a1e9d1db8290fd49dd64f440ba57267c8218184002c328837743e71 SHA512 377406658751a8f5d29b788080a53a311bbd7019092b73d0953ede512ae06a05967f5daa99992e221dc2ecd271dc653ebeac4a72c51b37789c2cfab8b5c68c88
+EBUILD kcachegrind-21.11.90.ebuild 985 BLAKE2B f32675794331a7774760de4016ea42e2533f13c631092801bd1f03bf5cfc5729026c359662d9fb494c4fab3792221da24cfcc270ee18de3c17847127e222d0fa SHA512 69eba80968b4709192f3c688a2f858221a006458c41d68c32e78b5a8762c8ddbf23dd522c917115209fea4922206bca1ff09d391386aa722d6c11b3ad3922f48
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcachegrind/kcachegrind-21.08.3.ebuild b/kde-apps/kcachegrind/kcachegrind-21.08.3.ebuild
index b0a90a53f169..28b5f5308127 100644
--- a/kde-apps/kcachegrind/kcachegrind-21.08.3.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-21.08.3.ebuild
@@ -14,7 +14,7 @@ https://kcachegrind.github.io/html/Home.html"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/kcachegrind/kcachegrind-21.04.3.ebuild b/kde-apps/kcachegrind/kcachegrind-21.11.90.ebuild
index 4249446f8672..d36674ee2c0b 100644
--- a/kde-apps/kcachegrind/kcachegrind-21.04.3.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ https://kcachegrind.github.io/html/Home.html"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index ca43aa96c4a6..68b65c45ec29 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
-DIST kcalc-21.04.3.tar.xz 372240 BLAKE2B c7fc9a7bc0092dfbd2177bac52599ec01bbed56a6e428528ccfee0c5ecd6a6bd83e1d18496c96fd79a6e10d5a449186353fcea71aa900c6d97be475588da8d46 SHA512 5a5cf142d2a54a4a587a19fae65b93e08e356d352c0dee477e9258a730b659baeca956b47d59001822f0ef3bb3ff3e127135f61ee0a1b9edabb07fc2457f5f3f
 DIST kcalc-21.08.3.tar.xz 379348 BLAKE2B 6d497ab54fd72cbb53a6b8025fab9d958135fe9bf11635519c55801ab8801839805f8af41c0dbb4bf91db7417f547184d7a2fdaff48bd781908873d8eb6007ba SHA512 d9fa03aabd471de4052cbf70209420634f1fdb18b533c55207b1a363b14e77a0078ccdf42515c5c2c49c5f87c4d230a041ebc8fb7739874721b83caccf83a0b3
-EBUILD kcalc-21.04.3.ebuild 969 BLAKE2B a78ef1319e6bc2a5588aec7520a5c8280fc969620f46705c786dae02aeca7a5b7bf08dde8356b102a0a64ecc431a7c543144dd3e8ea73cb4c041cd0e8ccd4b36 SHA512 f30f6c765e979e84cbb676db8ceb90c1edd9405efd598a1c088aedbc35c1db14386d72ee6d5d6168e9e995ee8c12c3cae2e2386f62c85b67f806fad1e7204a14
-EBUILD kcalc-21.08.3.ebuild 936 BLAKE2B d585af7cc65dac08ca3a4eb62a5585e1deb9884222371b42b22c80000fe12d98e3eb7511818e086b153354b03048af56bc6cc643004747a545c2e7a520dca353 SHA512 5959cebff94e8e73395a898a56e7dcdf916c9b4208b4811b7c47be57ac6b67d973af2c22a3813d9c8da3cdfc7a01e4e8f916078662f776ccf7095933f5d530f1
+DIST kcalc-21.11.90.tar.xz 383980 BLAKE2B 61078892788bf4adb382d141cef1275da35641008bf732a878e8cdc79c3120cd562363866df92ebc6cfd8a4e018be42174a535fab5694001534c64b73c5dea93 SHA512 8a63df3e09d3aa23b6b400ffe807382aaf8d48c222698ca1d1c81d75bc974691609dfac9167692168b487aa0aee98d72fac8d9c81695b2853fd68de6007d959b
+EBUILD kcalc-21.08.3.ebuild 933 BLAKE2B 94e06e2d66c04d0a6ba7392c5cd18fa95d92c42185d707dfbe54e77e61a9ade081410bc1bd82a0c71833b2531463b333e67a723325133962c95deab5624cec6b SHA512 bd2711d4a03c4003799275313e30cb44dcf004c88045165affd23321a3f224e6ece83d7ce93fc912fbcfb7018c86099be52b61b74b4fd6cb2a3cea58a8fb4313
+EBUILD kcalc-21.11.90.ebuild 936 BLAKE2B 6ab649bc691722761d8b437f67c3aeaf3cfd3f73a34ec933f92ff240448a3c42cc2cece1d866b0256ccf1cbbcf2a464660959a0f59c8c10fb124c31f691db745 SHA512 cdfe297d2586a819e53fcd04877754d1df591a0255b1398fac76afe73e9214e0647cddbdc36feb2635dbf4d373e3de377641f57c72ef58a3b1748f2db2ef304c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcalc/kcalc-21.08.3.ebuild b/kde-apps/kcalc/kcalc-21.08.3.ebuild
index 207c407ea47d..9ffaf18a1afe 100644
--- a/kde-apps/kcalc/kcalc-21.08.3.ebuild
+++ b/kde-apps/kcalc/kcalc-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kcalc/ https://utils.kde.org/projects/kcalc/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcalc/kcalc-21.04.3.ebuild b/kde-apps/kcalc/kcalc-21.11.90.ebuild
index 0abf11c9b073..399195c6655a 100644
--- a/kde-apps/kcalc/kcalc-21.04.3.ebuild
+++ b/kde-apps/kcalc/kcalc-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,12 +14,9 @@ HOMEPAGE="https://apps.kde.org/kcalc/ https://utils.kde.org/projects/kcalc/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-BDEPEND="
-	sys-devel/gettext
-"
 DEPEND="
 	dev-libs/gmp:0=
 	dev-libs/mpfr:0=
@@ -32,9 +29,9 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 06319ea7334a..c52bb7bbdebf 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,3 @@
-DIST kcalutils-21.04.3.tar.xz 334160 BLAKE2B 76d4c74d0374a1d4d82385a433d246d935bd25b83e142984383f402290bfc026782ead1d2e353e85e0fe55c7967cda7a80397240ce5960d138d806764b41f0af SHA512 0f0cd2112fd014cf824b0c419d952c7e6b41910307d0f6abf9c121029e6754b903b773f92a5d3405344ad58d9fc1fa7fcddcbf4b58aa02e07797b2ee1726aecd
 DIST kcalutils-21.08.3.tar.xz 338016 BLAKE2B 6a8700cb3c29ccb808479d7664a053bcf8eaccab4e902fc0529a40feeef6874ae31165c31ffef84e37310f7eb0b02c08e0e2a1a8b2a29c262cda7a843341e88e SHA512 8f006faff5101ca776f6531250fd232674514d81febc9931741fd87b49a05d3f5b3f997a97551e5c57ad14d38e66697010a3e6751c9cde5ed8bae46460912878
-EBUILD kcalutils-21.04.3.ebuild 974 BLAKE2B 4563c7d786b2280694a3ceba3cdedcfa333b628ccc6aa82c3c1b991ef3dee381ac201d81e79b4107309e977f1ecf1bcbcb8b66da14cb93a2e1ad4a260ae6b710 SHA512 80ea70c248ed9d7ac2d3fdf10e43533fc1b700d54219dfed61f3c3c48df7e0c78a813ce3c2b1cc2c69fe52ddec1b2902f61b8345e1fd8017fee2c09e25b9bbe7
-EBUILD kcalutils-21.08.3.ebuild 982 BLAKE2B 73d8abe68cf7f6be6b703b7e7bfb53df3f9502ab12ae1702357bda792ef4939038a80280de5056f060365c7fde8c8360ba2043bca952a2789e78f48dac2cece3 SHA512 e47f2815f86019cfa6bd6924e7ceaae96412b144fc0ee7ec552689e1d0bc43b919c47faa785218171a0c176aaeb87f2336e5e1b19a0b3e75267d3424c1485a7c
+EBUILD kcalutils-21.08.3.ebuild 979 BLAKE2B 4e8516f60a74347461afbf947d6240618add6d92fddd0a6fb1777173b680370a857a79973cf69900a94e451f13c4d736bae25742ad49dfb3604087ef9ff0e7ae SHA512 a6db67510ee279a0189e8c4c83578813eeba422b9490f897af91136c2b19a211c39b158953d927cfc9da943a2f0df165f15a8b89dae8c1c23d8a2b91f138c22c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcalutils/kcalutils-21.04.3.ebuild b/kde-apps/kcalutils/kcalutils-21.04.3.ebuild
deleted file mode 100644
index 4c69dcee56d8..000000000000
--- a/kde-apps/kcalutils/kcalutils-21.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/grantlee-5.2.0:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bugs 653616, 711666
diff --git a/kde-apps/kcalutils/kcalutils-21.08.3.ebuild b/kde-apps/kcalutils/kcalutils-21.08.3.ebuild
index d1a55321e66d..5d9104b4ce7a 100644
--- a/kde-apps/kcalutils/kcalutils-21.08.3.ebuild
+++ b/kde-apps/kcalutils/kcalutils-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 3f9ae1651fc5..40a616556db8 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,5 @@
-DIST kcharselect-21.04.3.tar.xz 368456 BLAKE2B 4a3126a3e5a1383fc2c247fb6b308cbb1e1182d28f01951b60c2e6a03de3ef53fde8c4da4d057b77bb356bbd8af567bfe7706c8ad9e3869fd0618c74cfd2876d SHA512 fbd94b178133cf66fd57894147cd13a3cb48d1894c65330f94c661d52c51444b19f4e24d7649f484763ba5428105eacc7f83d48b56fe18d04ad26fcc0448e219
 DIST kcharselect-21.08.3.tar.xz 369208 BLAKE2B 605e2d0f425602ed6ff7a8798ccfa21ed7697b6004db7618913eae789d05c307c816007e809c1beaecc85d13910d99bb47fc95bdde692b09847a87c7eb90a1cf SHA512 39c53cba81bcc8cecd37873c148e6a4948e16d0c5dbdee15c4dcee9681ec1644e2a9ebe897b06d7af16d467f1c46f3e32e31b0fea7d210a78500759589fc809c
-EBUILD kcharselect-21.04.3.ebuild 774 BLAKE2B 0a75d30a70c282889543d20e106e80c73fa2a21037d7cc780a2deae59a1efe3100902c25d50f70edeb35f3370026f6223e625a6d79f2c2c4e177d1ecac1046b5 SHA512 f390c4bfa2b6dd9c71be13ba9308e273134feca0ed4762c14a2345c26c0ee1d0e052856daec9888a47b32637402d1ae7ac3badc7355b9429b63ab4992a508f16
-EBUILD kcharselect-21.08.3.ebuild 784 BLAKE2B 89aec9b077a7693b320d04d72e11b2be75bde8f3f327d053477918a913ac93028a774b4ce725d6c9a1c13f2d568947f9e432606d33ebedccb3bef6c39d3cb149 SHA512 2bbc38293dda0b443ba2ad54c71f418415165bcfab5546dd6b813f4367c7762d48d0b8ed81853baa82bc05de6db862f8a5f15a85b61b5301afbc2cbfeb5188a3
+DIST kcharselect-21.11.90.tar.xz 372856 BLAKE2B 88d18b7633680750e5caa6233c9b2a706e9a1d5422160925f2b3a793961712a286494c8949444c88e1ec782b35605d0458f352d1dc32f5dd54bc6863dabb177b SHA512 e817b7e0eef5306aa5b7c885cd86572680ff170acb42c5c3ae5b3ae2df3f3d88bd70e758ce2f39f94c8126dd2e3c7d8dccea101875ced65e9c4b8e3965075ebc
+EBUILD kcharselect-21.08.3.ebuild 781 BLAKE2B 6a33df598b279beeb1c5d200e91d49b5b3de1e0dc9eadb62da7e17273d92199592bac1d16c76ab0982886322b3b53718a48ac2910b0153dca97f5bbcaf15ee85 SHA512 274eafd781aeb173371753a73e0d6c534f7d23a82eab92404a898130b4a0bcc4c156c5ee3a3aa7f9ba02f0d64679c6cd7b9a66b62e475d57fa2920438f524f8b
+EBUILD kcharselect-21.11.90.ebuild 784 BLAKE2B df81bfe5546cd37d1866cf64211d7f23052a6e0421d55eea000de464bea7021bbb6a89788f9b497c0a57805b8ec0c0a10ac54207b848d6f819bd91abe5e2ee35 SHA512 6dffab84047b3e80e95db643d7597555a91925c4603e31a4fe7f99bb9752e71661851257ef7a5f4371b4f3122d3c9d3f9654e4d88c3e754ed205ecd011e38c2f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcharselect/kcharselect-21.08.3.ebuild b/kde-apps/kcharselect/kcharselect-21.08.3.ebuild
index 7c7a4d7b53db..7e84a6554fd6 100644
--- a/kde-apps/kcharselect/kcharselect-21.08.3.ebuild
+++ b/kde-apps/kcharselect/kcharselect-21.08.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/kcharselect/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcharselect/kcharselect-21.04.3.ebuild b/kde-apps/kcharselect/kcharselect-21.11.90.ebuild
index 95d8188e5e2f..9bc44bef93e0 100644
--- a/kde-apps/kcharselect/kcharselect-21.04.3.ebuild
+++ b/kde-apps/kcharselect/kcharselect-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/kcharselect/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index 5e0b6a47640d..3530ac8a09ce 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
-DIST kcolorchooser-21.04.3.tar.xz 28776 BLAKE2B 26186c4fc2f3af8f68916871e58235a3abde288de200cfd0e8802bfa7ebeffdf9f74e25415272bf88e54aea559527c03c6f2cb9ff1bfa9302ed04ea136322717 SHA512 3d56a4640e3c5dbfd1870b5cdcd16794ae3a4d0553af69f79ff8d3a2c205512cde388cff9db5006152fe579c43aa25a7fc51eccc7aa0794f8ff45c95fd94c208
 DIST kcolorchooser-21.08.3.tar.xz 29488 BLAKE2B fd55f2246ca2e61539d23df72cdce21d0fe7f33881993456da4df4dd7b30272bd911e095748f90bf1f5b731d935d2e81d888f0635a559679b41612ff242d55af SHA512 0a27633300650ed88e288846480532dcccf7053b6dee1afdc87a9880c5e53e0f4b32870af6c06acac2557399bd4561f84975f3175c3c9faa94c9aa86654528d4
-EBUILD kcolorchooser-21.04.3.ebuild 516 BLAKE2B b91b71ec01ae7ac2ef9104d0aa865e4b5618db4fcfe776f9d58d78504e583c3a0d9d26dbb4df49046f36e8fed6e66f530b52ecae82f0ebb030112417d11ded1d SHA512 031f1bd1ce41deb69dfbcdb47839d07d713dfe974c8e5067abb30f697025e2e5d4e64e01d3e1c73123b4dab52913b01e7eb8267342c7df1f0d97009eda172392
-EBUILD kcolorchooser-21.08.3.ebuild 526 BLAKE2B e94bc82bde42a0843b9dcc504943b3e51b9232a91f7b9bc2cd1a37f3a9f16f728649555cd9862172426858ac5d006a952c04bd7fb379aac959a1915a14b4be51 SHA512 6c61b011df4124f49ce7396cea7c8162bf7554a5ba20b6f6da7c8a9a3f75f46f73e430cb7faea2a6c9188abf930c1dc7daf466c16aef05119752c94a6d0f0534
+DIST kcolorchooser-21.11.90.tar.xz 30132 BLAKE2B 20f2da6a165e95206897a13a1700500776a35ed762f59cf9838950e88c6743f2a15b612de4ef280bf1197b5c111b7e6f59f78868b694240bf0e5eb5fb161c8ba SHA512 dc7bab183d843329fe11098f9e9f7df62c92146785e3741d8bc7e8ae6a7c08af083bd300250055be9c7b9788cb21b906a968bd7a78b2d84f5171b9ef501261a2
+EBUILD kcolorchooser-21.08.3.ebuild 523 BLAKE2B a56010fc46c6e5455e74b138465173ffb75fd806dfe86479599201704f9da240099ed95e5fb2ee3bdcad5765c7803b9ba9fbb8c4f9c00c90bc8293d2d5c34209 SHA512 c62a8dea39cc4c87ee499732cac707e22500e8aeee8436c0157d4932c8d049dab8d89982e5ca3b07a493fad1dd41a2f87afb78078b7721d457db0c7cf6ab6655
+EBUILD kcolorchooser-21.11.90.ebuild 526 BLAKE2B 90d0674c472dda7d8243a6b999db4d5bf430112ddadcc94532683b1761ba25d9c6c62336389340265fdb9ec9334e2f0a6a8cb09f370130c74382e23b6ad04445 SHA512 9b053b19c31dd6cda13373c257852d46010be0197a8c7106ebce5e2aba3990b08df598b78c4a54ec5c3b3a8dd477be0a35f71834e32a04de436651b1b55dc078
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcolorchooser/kcolorchooser-21.08.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-21.08.3.ebuild
index 877d788d4266..23026a2e14b0 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-21.08.3.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-21.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kcolorchooser/"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcolorchooser/kcolorchooser-21.04.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-21.11.90.ebuild
index d15d7e71d8fb..678592d3d71e 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-21.04.3.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kcolorchooser/"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index 4620e792ddc5..5f2f89daacab 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
-DIST kcron-21.04.3.tar.xz 911684 BLAKE2B ceea13bd5766e361f43bf95a39d692bb91378dca222f532a85cb8c558fdf5d128fbd132961adc3182eb01935e34b771714619fe830022cb6f0531c82d73a2743 SHA512 1c5645bdda1ef79dcaeb06ee66c5faa8f02fcd7e94e006b88ad2fd435b28ed974a402a6b5ae3b94a729f738de1a2bc4766c48d2295d4d0e442d211c3849be7df
 DIST kcron-21.08.3.tar.xz 911480 BLAKE2B 65dedd83aeaddc03a275d609545b1d1a0645d2f8a84c97c903a96376bf1e7895c941dfe8c47253237dd44114effc612ae48938d16c5341758b7ec7b4dc628c7b SHA512 0d566d7a045d505646c1d705e555b3d608c6245190a6854e9361fe6845669610b6399d47ea86f0746a8ca2c9ecdcc9641c801ad162814357e54fa137d5848478
-EBUILD kcron-21.04.3.ebuild 722 BLAKE2B 91583cc65b6f0b0e51eec7ed618946854126293224be287eedfb7ebff5f0cbbc3a17effeadd851d2f7597034ae21f9d7770c0d44c7108b81a13ce270dee0455d SHA512 2d9a8da3e4246429bc78b3f279444a90fc189cbcfef5283c1f1afa2dfd553e895b5dc7b1bb2d3a6a095115deda12f23787a8ed1e9aa515346d6c9baafccaf0a9
-EBUILD kcron-21.08.3.ebuild 691 BLAKE2B 15dca0dde135d0e29b1463d073ae6e7444fbca641d038b33ba592a4a0c786ce8458d36744c94b52bcb51bdaa5309bb7e1aa1016e5acfcd4abedfabd429570f01 SHA512 c47bb9eb4ac1390743b57e9f2019039eeff10cc843cd02d4f2128688aa31d8849048ee08ae319d9008fafcc91d49d095ade840e38387d22eedcae9fc45d138b9
+DIST kcron-21.11.90.tar.xz 915332 BLAKE2B 04d0bba78e270e67be5901657947cf8483c53bf2ce1c4da9a8c686790ac58e09b0a7fcadb73ac19a481008f052b147ca4abb8c94c276fa3004f1d31c9998e60b SHA512 90032178f608d0ef0155380b86396d623c67fc4fda4c23013fe042c89e5b6fe82df187f17c386aac67bf42c406ca131ba32c07b388f3cddb24e1a4dd96273d48
+EBUILD kcron-21.08.3.ebuild 688 BLAKE2B 645337993ccd3b00f6d37bf9ab59c69dfa8b48285236a85b29153b35236862360f415461fe8a263a81da011124eec0ec3af39b30760d67bc9cb6c219f3d4529a SHA512 aa480eb22fdc9e067191d78de91402c36b70cd695e9c67e23ed3a09f6db1933e9f504263f9c84192758236cca48824647211c42d9ee786737dd705355eeef4aa
+EBUILD kcron-21.11.90.ebuild 726 BLAKE2B 1dcbb5f7f63bccae4dcc9b12ff8de9688e6c374ce43ee84e3b33c68e93f692cc0237c34172b922f994a13d61eb56b6f6591c614157c9d245dcab8e05a9f75767 SHA512 598a3eb38a9b9f1e1272902ccb0b9c597096d6b467d5d940b6306cbf5eb8a46bc98b43dc7dcd8d9aa6d58d3742be71f112af904032671327953e8c00144b33ba
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kcron/kcron-21.08.3.ebuild b/kde-apps/kcron/kcron-21.08.3.ebuild
index 56d9560881fe..9fab2ce39f41 100644
--- a/kde-apps/kcron/kcron-21.08.3.ebuild
+++ b/kde-apps/kcron/kcron-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kcron/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcron/kcron-21.04.3.ebuild b/kde-apps/kcron/kcron-21.11.90.ebuild
index e02a7828cfcf..ece897a309e9 100644
--- a/kde-apps/kcron/kcron-21.04.3.ebuild
+++ b/kde-apps/kcron/kcron-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,17 +13,17 @@ HOMEPAGE="https://apps.kde.org/kcron/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index 0116d6f80a7e..0eca09e51129 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kde-apps-meta-21.04.3.ebuild 950 BLAKE2B f72c901956e376de586e5d0229babcb6b1bd229a13a354a0bdb04fb198afdb685d8de5dc129d9fb74fa959e3a0ae86d3ce5401a468dcfca284d5a5ccad6070e5 SHA512 42720bb05eebb2dcedf71aaf50cf479047075298e606039acad28ba918062dee750f2aa953764d6d1a99dc088258580b3f1f2f2ca683ef2673344c81a981062b
-EBUILD kde-apps-meta-21.08.3.ebuild 953 BLAKE2B 4bc5f4679855b482f7e0014d4867db6b392e1ae7cd3306baeed4079c224147da97732286ec5ebe7ce36b871ecc03165523faf5fabc90820dff5fde67f0f66b77 SHA512 c10050bf490b585e3b6487e94490ae8882da4d9ef116af690bb463bb5482aa4515b00341047fad78fb0ba28ebcd010c5bc2e478456c46ed10169a8ced1207d00
+EBUILD kde-apps-meta-21.08.3.ebuild 950 BLAKE2B fb3cbf249e277c334ef0aeecccff2f84c221ab610be9e9266fbbb86395af9a31ac44916e8227b25a0b2e5bfe7c04f6b1d325c15cdaf8206a96d46e25ebc463c1 SHA512 ff78c9dee93c7099c2d7e2c6566dbe2c902bebeb96cd8f33dee22a71cd36898f2c4f18c2ff5d7283a305c4c06080ac0a9f02ec543f8457e16410ccc0544b0ad2
+EBUILD kde-apps-meta-21.11.90.ebuild 955 BLAKE2B c8c24533d916e18cc9c4827c22f5c5b06302e79ce815cf1c85dbe0c91204b089c63bf94fb9fa81a4e163c8e5da5771d98238507ed100d91e8a3a7418ecfd361b SHA512 b1765903ba49652cc324dcee533a35dd8d3c251a81251a2e2b7d15d8ab7c9a30f61d8e8138fcdfedf90b487a4126931643369f0a23b77825bc2fecb91a47aae1
 MISC metadata.xml 1118 BLAKE2B 627925a21a6fc6c289a2fcb9bba60051bb22340b42ddcfcbb91a8532f433d04e5ae8978879e4a503dd858056a0d561b90b5d002526fe4b0004499283197c57dc SHA512 e3dad2aea389e1463460d58ac18e016ca7fdbc9a5db1f4ef69b9638531799b08d9ff4df2f3f8b541c727fc4b09d166f4fe23804cde5c2e514d4a5007c04b5519
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-21.08.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-21.08.3.ebuild
index 0231ebd995bd..21f6cf01999b 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-21.08.3.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="accessibility +admin +education +games +graphics +multimedia +network pim sdk +utils"
 
 RDEPEND="
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-21.04.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-21.11.90.ebuild
index d6cbbfe7c929..7cc88a36827f 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-21.04.3.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-21.11.90.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Meta package for the KDE Release Service collection"
 HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="accessibility +admin +education +games +graphics +multimedia +network pim sdk +utils"
 
 RDEPEND="
@@ -20,7 +20,7 @@ RDEPEND="
 	graphics? ( >=kde-apps/kdegraphics-meta-${PV}:${SLOT} )
 	multimedia? ( >=kde-apps/kdemultimedia-meta-${PV}:${SLOT} )
 	network? ( >=kde-apps/kdenetwork-meta-${PV}:${SLOT} )
-	pim? ( >=kde-apps/kdepim-meta-${PV}:${SLOT} )
+	pim? ( >=kde-apps/kdepim-meta-21.08.3:${SLOT} )
 	sdk? ( >=kde-apps/kdesdk-meta-${PV}:${SLOT} )
 	utils? ( >=kde-apps/kdeutils-meta-${PV}:${SLOT} )
 "
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 9587953e9461..44a1b06b83f7 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
-DIST kde-dev-scripts-21.04.3.tar.xz 366364 BLAKE2B 27726f6fbc727d2f42fa5ad7f3c6bc7eebcdc0db825c7a0723b00082eb3d6a153f1d894393268a90392d8edc6afd80e86cd8e802480a5828b95ca53528a4a704 SHA512 dd35c0b79b7ab6f4dff36b91281a3e4dcd4b5d27d1de5b33d3c4db995dbc909a6d70897f2460659efab74097b95e3ebb1c2c0f08ece07a6fdc5bdba87fdef93f
 DIST kde-dev-scripts-21.08.3.tar.xz 366220 BLAKE2B 601cde525650a0d06cef323cd6b1a3b8c8ee891757a0c87bd404cfe52a5ef283db679c6bb37fbc1ec1d1a533eff1968e522abe7b31e470aaf9dbaf31ea610a9d SHA512 d799599cda4bad1e4c5cc095cbf3b5cb9fb2602e1f48578f8cb68dc110d1ff4b900a8b4c8e878b0bb629f001af6fe80d7b852dc4528af473793a6926c3821020
-EBUILD kde-dev-scripts-21.04.3.ebuild 633 BLAKE2B 67b448190778b2e6266fbfa6fe2bcfa78018d7e97218c754fdfcba1abf00cdfe1095ef67a8b3a9c0091641218844d9bbdf16db4c1f48dc4cfd628eb97d42b7af SHA512 6f96d6e54446be65fb937c86b83171d56d5bdc199bc1f0bb08c35932beae5e9d386bff078185998a06f3ce17b91e14d7cba11179a6940758235bf09ec0c221ae
-EBUILD kde-dev-scripts-21.08.3.ebuild 643 BLAKE2B 38cab1e7612668637bed3d31770076b245665ae43463165050f4552d09bfec2d610ff8e66d96da97c7c82391ac1bfd70fd53607852be7c2509c970307b313ca2 SHA512 2d5a71df75a14ecd9541221dc6943db6492f31fc76fe8a15acca71fc89199208e01ae942f71184480370f7a7a01acf9c28a15080d26cf2e3b931ff127772e0b5
+DIST kde-dev-scripts-21.11.90.tar.xz 366236 BLAKE2B 1a0d59bf3e30692d142b4eac319d2956681cb217c7fa9a29076d16a99619c5dd548211cca1ba2b995d9063d86d850f73d8d463b9ba320121838c9770713d2718 SHA512 73ac59948ac6696fe9a8cf193643b8c000990d8a9db17131d7fc4783634e053b8e01606a291040596f15c76ce332d9212cfc9d48d1cae21badc05da60bf3b5eb
+EBUILD kde-dev-scripts-21.08.3.ebuild 640 BLAKE2B b489ff6c5add67d31112e93f0e93b773bc2660fe66c95274d36a0ebe026c52c77da29814f5ec884aae5ce34b83754f2fa26ad68d7e6d9d31a085e36bacfd00fc SHA512 d4e17fa7892a9456d944590ec00d164798fbab359ea602786252f72791ade3d1eb4978758e4184c8455a75604652f91fa2c1ce553104be11ece9bde663fdc9df
+EBUILD kde-dev-scripts-21.11.90.ebuild 643 BLAKE2B 9c4e65da55696b70c26e24568c5a63712079217054118ec2b4dea2000bdc0c73da5e570720c9a5d23da3ff3323175edb0903423bd850283a053346fc4f6e5aec SHA512 60ad84ed8ddf54bc75be95f21aa16ea4401539391dc9b87cf7d32ac9da9305bd37bc55f511f9949a45096a82c7ff9ff480ddaa8c16024c7a5e5a5646d3f90a7b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-21.08.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-21.08.3.ebuild
index cecac9391e53..ff89f1e926cd 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-21.08.3.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Development Scripts"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 # kdelibs4support - required for kdex.dtd
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-21.04.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-21.11.90.ebuild
index bfb621ddfe7f..671316c84153 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-21.04.3.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-21.11.90.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 inherit ecm kde.org
 
 DESCRIPTION="KDE Development Scripts"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 # kdelibs4support - required for kdex.dtd
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index fb65b048a2e2..5622945ad7e1 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,5 @@
-DIST kde-dev-utils-21.04.3.tar.xz 68048 BLAKE2B f8b2775d21f227b5c2c48e8fdb38a1e78064dfc4237ed2dab72fb9a7c29a073d34db61ac74c82617f5b9ae08ee4b7aa6b763b2183ecb5d95015a4f6989700e76 SHA512 5cc7fdf44779852bed67d7321d6a4918dd1973dd9868fe1c4cf0c275a0ae06c21fa388f027a0b15b0839be1c9d482f78db06c96285366a0530f58901353572c6
 DIST kde-dev-utils-21.08.3.tar.xz 68692 BLAKE2B 801107fd164c287cba68638265dfb20e8f972590222d13a0d75c3155e3a09d6f2b099b3b71cd74f70bb9b47098c774b67747a34b3eada8af2966edee08d6287d SHA512 8066388b5bf58e49f4f78092e022c62261a924d717bbd887c9f96092862205116b7382094aaa504f9479b6066d058e2b5ca2df171abc042ccef4a013b659b05c
-EBUILD kde-dev-utils-21.04.3.ebuild 730 BLAKE2B abd601063b36d7e3029853c935cce648f4b727ed7f16a54b7c723c2149d01b415064c5564838b2c5306c00c27f23a16266619505712b32cd7d02dca60368bec9 SHA512 c906278b32f88220cfe84f889ca7565f94ed21a9ea51cc124b2c64b3e302e1614e09a189d723b08f94c0d9a35dc28d0b2c4698b82bed71451014aa5a4180e6fb
-EBUILD kde-dev-utils-21.08.3.ebuild 740 BLAKE2B ceeed7547f65199a56926d6602332fb9091bbdc67902e37219b1ae2dff544ebc3c7ae7b082ce6b8f5d91bf53c1f82262d75b21d64c1d34c12d756daba12e84c7 SHA512 d50c641f223247a99d46da36dddd3d8208410e6de29f48bc3b4f2f900a0fa46354f90085625ce46ebadfd57b0d34e27e03d40adb2eb18c98d1ab53d4ff68c124
+DIST kde-dev-utils-21.11.90.tar.xz 68148 BLAKE2B ce2859fed901be0a61f98dc2544830a257703781e6599a3495f6b26ebdc229f574b38aa67f731ad07f7469148c46a4792d5f3b0c19adb21bfc1b0342c489666c SHA512 5ab532378868e21697d581b3283f63b951eeecf74752f42644b866b168bf1e11a1be14c319f8af7d78579468fee2c4bea945f901ec5fbc9b2f4904ca4ad79490
+EBUILD kde-dev-utils-21.08.3.ebuild 737 BLAKE2B 781428c127e69f270fab689a7a22c83ac4dfeb10c957b4ad77de268c42982b85b3c5bb0858bae3c1d2cde02b398a999e86760ee1bba0b56431655fb2ee9a7d79 SHA512 78b3b04eba91ac48ae0a88ab06cae0b45f11128e3e6a3eaaa9c55dc7c7ec0c74152d7ff682c8bd504c7c1656b6ed6b05c126c0494e72547aa5efed9486777a61
+EBUILD kde-dev-utils-21.11.90.ebuild 740 BLAKE2B 3a1b67f984bd1c0541591ae3afde2a06b06f49796853a60291ade76428aafa809ea1f542142e81909896cacd2583d49b847647843d03d5937103c3f2010480a3 SHA512 29b978c92f569a6cebfa5e4c10a08abdab2bc70bbb8b709b5eb01da09d7f3d02d43e1cf0b7acfe4757fb8db41ec85d957a717c92317604e91e8dd79d5fe4a23f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-21.08.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-21.08.3.ebuild
index 0c475025395c..bb16967cb68a 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-21.08.3.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Development Utilities"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-21.04.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-21.11.90.ebuild
index 3470eb7e5508..f278e88564ba 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-21.04.3.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Development Utilities"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index 5b12e67a64cf..d178274be0db 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeaccessibility-meta-21.04.3.ebuild 458 BLAKE2B d406ec105431b43460050a5ded74658ec77b0fa3ecdfb5dcc8555f82ad0c064a457180f66fffee415ae5eecfab1bdf0501134998b33ec57dc2ba8eb03e090e1b SHA512 f87d0076f181a680f054b2cb05ef311eb4b3dc32643a7963bc81d3b6b848dea1678dc0d91446500c7090edbba5f5542115c17631351737ecf5262c707c8ac4e9
-EBUILD kdeaccessibility-meta-21.08.3.ebuild 468 BLAKE2B 4f9b6ebb0da286d54481cae05c4d6f585baa7c28c1f5084af8a4a3bf1272dba767ba79ac1e52a99688dce2c4c8e4967448f79c43248de6a7a53a430f9588e84c SHA512 7e22925b7730c09aeb3d31ebbcb59b4e4368ae7005381206acc76f0b7ee9c4c9d3a1fde1cd8271d0c4ab5e2ac36265ac40a0a35864e9675ce6d01f4212d09af1
+EBUILD kdeaccessibility-meta-21.08.3.ebuild 465 BLAKE2B 8f79cf89b174aee8f5360dc7508a56509336b65c25c2b6fc0f6ede8f937246df91d0d4f532b6d37537065d5caa1c3f75c46c0235ca59428f44b7c769ebe0a4f8 SHA512 736f338c1cb12048a40e0d2f7fd181bded906594817f1a6bee18c1b3ad15fe6fb5bfeb44ca51f5fa3972ae88947bae9ddbf54c76295b444405c9be67c8050fe1
+EBUILD kdeaccessibility-meta-21.11.90.ebuild 468 BLAKE2B 4f9b6ebb0da286d54481cae05c4d6f585baa7c28c1f5084af8a4a3bf1272dba767ba79ac1e52a99688dce2c4c8e4967448f79c43248de6a7a53a430f9588e84c SHA512 7e22925b7730c09aeb3d31ebbcb59b4e4368ae7005381206acc76f0b7ee9c4c9d3a1fde1cd8271d0c4ab5e2ac36265ac40a0a35864e9675ce6d01f4212d09af1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.08.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.08.3.ebuild
index 5df0d3d2149d..f561631173d6 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.08.3.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.04.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.11.90.ebuild
index b63ee5a52e52..5df0d3d2149d 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.04.3.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.11.90.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
 HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index 47ab6a526e66..83d345681a5b 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeadmin-meta-21.04.3.ebuild 405 BLAKE2B c82262c889d94bdcad917f43d818a389607beedb3be7f0eea60dd645ad4e0230967e3edacbfd9655284ed19583a04149b82ad13aa99aeb24a51d0c30f68a3893 SHA512 d03f901b4d8a2b41aa6a758cad59d04a59886e960e495700ae4cb223df2404d09e6fa6f3934f80b52a90c5148ad7dac1953709757eb73d59da7f942f7ca44c57
-EBUILD kdeadmin-meta-21.08.3.ebuild 415 BLAKE2B 5c591eee3fe6ece1c489560b6504247a9c659c422fe8f6f2a8f975ce22a519e57083f31ab6bd8b5c758c212fbf54a38a18d7e96d29514da003b1851aede52f40 SHA512 328b6914fa60928b656cd966f445d86cfe61f79389dd3a782ac744f084585f46580cb96c2e11235f939651f0373f5a26ea52f43a82b0e2489dae4186ed7578c1
+EBUILD kdeadmin-meta-21.08.3.ebuild 412 BLAKE2B 6efd3e8478da79033b0283256b123f7854c2046687828944ad428353a43eb8eab4a7f324cfd069db8b86bd71276bd9c63d623f6b37e979ccb5bd1a6be90dccbd SHA512 e774c4d225768698d0f1125eccefe23ab398197e7ab023512d291e0beb0c9988a844ee5476fc225eef4a15b551149d4ffe9ecfc0e3922734cb73daac7cbb3a3a
+EBUILD kdeadmin-meta-21.11.90.ebuild 415 BLAKE2B 5c591eee3fe6ece1c489560b6504247a9c659c422fe8f6f2a8f975ce22a519e57083f31ab6bd8b5c758c212fbf54a38a18d7e96d29514da003b1851aede52f40 SHA512 328b6914fa60928b656cd966f445d86cfe61f79389dd3a782ac744f084585f46580cb96c2e11235f939651f0373f5a26ea52f43a82b0e2489dae4186ed7578c1
 MISC metadata.xml 427 BLAKE2B 0a3a1f3fcb5983cea786182bb60fae6f769a8c8c1c008acd3857814bedf317e6a1b5309a7c8bdde9575ff0bd4a426bacd1f3b9e75cf12bd5b161a33a562f4eb4 SHA512 bf9cc9414fd8ca26ac16d0edb84ab353a279b6d04071a34226fa962afba14bfd3e72afee80eb963d849c31818dd6e10542353ffb057d0a295000e5351e4ae2a1
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-21.08.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-21.08.3.ebuild
index 4b0cd72ba05d..43d84c6eea7f 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-21.08.3.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+cron"
 
 RDEPEND="
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-21.04.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-21.11.90.ebuild
index a22d5210f3ee..4b0cd72ba05d 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-21.04.3.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-21.11.90.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
 HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+cron"
 
 RDEPEND="
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index b4301034570c..9d8c634b7943 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
-DIST kdebugsettings-21.04.3.tar.xz 88104 BLAKE2B 86acbab14797946f6561e3b08e8880f51d78201cc4fec6e71c6f47a01da149eced6a73ce9e5f2fc5c5278e74975636f6476fef46fbc5a9194b396362600bf77d SHA512 371f07e896381a21233c4967c9b0f9b7380356edbfceb491017ddc7d985de4c8e685e508762abdaa394adf3796ca734af047411da276bc578f0512b4b633c5d8
 DIST kdebugsettings-21.08.3.tar.xz 90340 BLAKE2B 8c2702b4ca6f699463f26b707242813613221d050b27f32fca998a0f5a8674355d969c515500cf5d0c60c96ec605345c2b91781ba9be4b3c7d8e3002b69f20a1 SHA512 68b59ba85fa28a72baf5f15fb51ebdcfef86e38ce79ad95c383ffbb004209b65b31c70a80f176eb9f09384cb283a16ba4537faaecdf2d40e46ac760f5512b2e7
-EBUILD kdebugsettings-21.04.3.ebuild 780 BLAKE2B 6696769007aed493bb56da49cccd1d50c71b67440c58268fa68b966daf8b09d79a602ae3a7b5df7b80f03d34eb722e273fd157f348dfc90574d1e0331a2c1459 SHA512 719b93c545d48b012b9d600cd39af888eeb02bfb663ae308cba23570db1269d67418eeb4eab21114bd80ee8d670e600f819f93104d5b681bf4370ede867751eb
-EBUILD kdebugsettings-21.08.3.ebuild 779 BLAKE2B 7e09d6304216458c15345c4635b451d2cda0889be96af0806306371a6f375326bde96005358425b1c2ba3ce0536530eca0290a59514a35414a487b2a80c1006d SHA512 bbb037540ad620f18951a75eba0738c66920f9071c35b83b48b2244aa6b487157cdd0f6ed25ec97075a7971fb36b55c8ec0930de13d37a758c489dcdf928c7db
+DIST kdebugsettings-21.11.90.tar.xz 92308 BLAKE2B fed5e5865c352be90b2eebb7073086d46c967aff7de9d36b4e6f118de43b9a5da3a0fb14bed9c11dccc9d5ff9fca7446850e02e8980451cff7de638f45e3010a SHA512 4a7e00a6068461245a85c1eec2b26dba9ab428ee1cc2293b4ad2617f90de812dde5f5ec9771e81ec8b011c1760ebdfb5765f3dadb8c8c34752e64b27cad17d73
+EBUILD kdebugsettings-21.08.3.ebuild 776 BLAKE2B 3f082a8632132901b12dae6c0cd3d33c9c9f64d157b2535ecc2a287b14e283724881e920c126f069d5a5516b2ed757c5bd11a0cceda36c5d2f8f5f4218131a87 SHA512 39b40f6267a799734d9ba7ea95ea275cc629d7547162d762f8ccda1d33afee5be64da25dc55ab77b6a1fd53d90c4ce1be5bf0541567ae38e8442d4dff18a0530
+EBUILD kdebugsettings-21.11.90.ebuild 779 BLAKE2B c6c132f7308fe8142e2dd6cd4725f1f8f47efe9a6a614cc16b941d94d9a98f454b672180db4658b447731867911cc31df4d24e9a8051df3d5aefe457958d37ed SHA512 09e142b76266bc489a212502dbfc1d726709e70a763f2e608df42bbe544ea331706cfa6a82c0797326dcbfee536b67e6d3c28a56e6f648314d7c3f3ad0bb183d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdebugsettings/kdebugsettings-21.08.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-21.08.3.ebuild
index 7e73ac50353b..00850502df6b 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-21.08.3.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdebugsettings/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-apps/kdebugsettings/kdebugsettings-21.04.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-21.11.90.ebuild
index 16a95d3abb98..33df89db633f 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-21.04.3.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
+ECM_TEST="true"
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -14,9 +14,11 @@ HOMEPAGE="https://apps.kde.org/kdebugsettings/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
+RESTRICT="test"
+
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -29,5 +31,3 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index 836f7b4b1839..a938fd788af8 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdecore-meta-21.04.3.ebuild 885 BLAKE2B f5573ad359941896a2bd7fbbfffdae42c0db84d8b737268d9e67454f90b1c3d8acc0dcbe2fa095142fc8827ca7f50f8fea5d91dae0077a61d9f76db14684e35b SHA512 ef662757048eaf848da0e67a2229256bb0aa25d20fb060d7edd7e9a0ae61114d697718778d4838d242489f8ca5556fb27382bbacfd7321cd64db674ff7d9c8d5
-EBUILD kdecore-meta-21.08.3.ebuild 888 BLAKE2B d2b532275e4e16ccd34a183bbb69eedffd9432a13e8b1367157993ebfcc7078ca5db5377ed541fee12b30ae0c83aa3a5a49665d2a16675260af508726421a79d SHA512 18c22dd51a09cb8ace1cd0df590daa881f6f29a30d549d71d56479033d341bbb1fd00e0a19e4177da7f8f67633b51f920da5d4aba021ec9a1ffa110ebef0908e
+EBUILD kdecore-meta-21.08.3.ebuild 885 BLAKE2B e046751fc1c1484bc30d2c173654b46992b4fe18d8834e533957ca647612cc2047a79ea97349b6d307ea3b82378e828ec88df25061fdc5b5ea9974233c75d11c SHA512 4cf65766b8bdb438a8164fba575eedf30347b7449efa02e07c5ec6b85de588720cb0276ef067d8e37418e66eb59605f4d803d1fc92adf50be05604a417ab5c7c
+EBUILD kdecore-meta-21.11.90.ebuild 888 BLAKE2B d2b532275e4e16ccd34a183bbb69eedffd9432a13e8b1367157993ebfcc7078ca5db5377ed541fee12b30ae0c83aa3a5a49665d2a16675260af508726421a79d SHA512 18c22dd51a09cb8ace1cd0df590daa881f6f29a30d549d71d56479033d341bbb1fd00e0a19e4177da7f8f67633b51f920da5d4aba021ec9a1ffa110ebef0908e
 MISC metadata.xml 751 BLAKE2B 6550fcc8eef87eebefc064a082de31c27bc8f47acc010b0f79e3131b1fdfc6eedb628f547b44ad20ad8c6987ba35582b5f6751b71567c10eb27c46500e77a6fe SHA512 50801e5b9be74755db674a918499abd395db5d2e872f6080e4996c0ed6b96ad6a75a3a13c9c26b6f0f19724eb3fa1327e6e43fd7c9d4e672e635478ded8d2c17
diff --git a/kde-apps/kdecore-meta/kdecore-meta-21.08.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-21.08.3.ebuild
index cedacb4d10cb..7344174a9e47 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-21.08.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+handbook +share +thumbnail +webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdecore-meta/kdecore-meta-21.04.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-21.11.90.ebuild
index 8d22bd722458..cedacb4d10cb 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-21.04.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-21.11.90.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="kdecore - merge this to pull in the most basic applications"
 HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+handbook +share +thumbnail +webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 799f9e702b22..e76919619610 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
-DIST kdeedu-data-21.04.3.tar.xz 335780 BLAKE2B b6ed4e4c221df442154121a87f3208f46050bc9d3013916f4cb6a2b17cb176a6ab607e5558c0375e55877ad653087772d7c9ba6f92dd44901223c75e085a54ec SHA512 987c5d65be467837e458d5d74540ff6ec2d6a47f59043d7a41517642deda5c4645b76ae9cbf8d5f299841b13e4034aedf9ef9afe30b2453e782a6056656885fc
 DIST kdeedu-data-21.08.3.tar.xz 335600 BLAKE2B f338a138b93b0500cea23d49293766092216412a621802cb98dddece31c892bae99f0701b6787fe18938b1528532a5409d4ba97aa57a217f6811491650dd4e62 SHA512 4409311ae12814feac0ae447ff23b05f084ec057f956eca482a2f0554878e0202cf4031a01154659c3e1bae29d6b93a166f2d20ff043062f83905c0e8a21e396
-EBUILD kdeedu-data-21.04.3.ebuild 345 BLAKE2B 316a4a729327f22630b07b69ea3fdcbfd79d379ac7b839572c3c2b9c51b578c61c2fc42dab521cae492a3fbdb7f3968c75a745174a7c54505ca10209093f6165 SHA512 abb4b66376f439d879d02a6b9b19b84a800b8c9e4c866730d7c325d8ba4f124b4068ad7e1df0ae432a24686b9e6defad3d16e004e65a60ec04cd0c17b92ea3af
-EBUILD kdeedu-data-21.08.3.ebuild 355 BLAKE2B dfe87f8c2d979a421c8fa5c282638e3f0451f634ae110e3be2959b28472ec421f88f616a91abc6a0e02599ea3fb071db57c714d7b7652502e100f86575480fa1 SHA512 39a9b576666e341a4bba42c5124769e10da4b8e7c851027dcd672c4005565fc916141b0c37d81543bc08cf605e9e2b3c7f87dd92a87be4d69224203f4b92c3c0
+DIST kdeedu-data-21.11.90.tar.xz 335592 BLAKE2B 78d4d5fec6f3c3327dbf2364699ad6f9a9f1a2a72641a2a28c15fdbf00cc5f99474531b886f5316b456e23851a79ebdae062c2dbbf1a246480c1efc6d63eb5e1 SHA512 82a6b448eb82c81dcca076355ca06160350cae8c3d3f86b83a880ca665acc2880d4f73dc494991dd03e2e94d8951e55e77f96aeec4050ac29fa55c8e9f19b4ba
+EBUILD kdeedu-data-21.08.3.ebuild 352 BLAKE2B 941c61ce04c96075eed5b7f412102e731cf897a6ae9e5e609318e1dec73c0b413b5c998fab0c2b9ef16439660df5a910276b4ea233923a001d53a36db0c8824a SHA512 5e9f76a9cf0b7e0a2d9ac67c3923a16bc0b04c292681bb0d0735f13799a5207a404a060e78b6b787ecf6a6e438e4a7df8b17c23723dfd784b863d0a27b532d0b
+EBUILD kdeedu-data-21.11.90.ebuild 355 BLAKE2B dfe87f8c2d979a421c8fa5c282638e3f0451f634ae110e3be2959b28472ec421f88f616a91abc6a0e02599ea3fb071db57c714d7b7652502e100f86575480fa1 SHA512 39a9b576666e341a4bba42c5124769e10da4b8e7c851027dcd672c4005565fc916141b0c37d81543bc08cf605e9e2b3c7f87dd92a87be4d69224203f4b92c3c0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdeedu-data/kdeedu-data-21.08.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-21.08.3.ebuild
index 184c5419aadb..cebe7b1b90e4 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-21.08.3.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-21.08.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Shared icons, artwork and data files for educational applications"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kdeedu-data/kdeedu-data-21.04.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-21.11.90.ebuild
index 99a4e22a198c..184c5419aadb 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-21.04.3.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-21.11.90.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 kde.org cmake
 
@@ -9,7 +9,7 @@ DESCRIPTION="Shared icons, artwork and data files for educational applications"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index ed68b4b986bd..eb5f8db51f9f 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeedu-meta-21.04.3.ebuild 1206 BLAKE2B e2f473e86877baf0ca717580f22a8a5e8049e3642fcdf761c7082388934e4858c531745ec7f81874c3238fbc968db5cddcafaeaafd5c5bc3c624a71a62cd6232 SHA512 510a5f40b16442a91cd7fb7f0bcfb62ec8e90b070e9f6dc4339fe86351feeadd205de4727c740b67dd69004d145f4192844917af682400596c569e68082bfe45
-EBUILD kdeedu-meta-21.08.3.ebuild 1210 BLAKE2B 98807179ff18472f54fa665c8324b6fcc4893312f66222ab6f11c15bd25ac25ae1cb7f3a794877fece4314f1ce6f74e56e109ffc52eb1e22502bed8dc0bef0af SHA512 234dda0e3456a4f4e7fb84aa1a65654fd4d3f5f73050c9a9b6d028af1a65e8c5a8c644e8db76f07154c2d5ee2cc36ac3b6a29d58f7aed618d59f5a28c63ce97a
+EBUILD kdeedu-meta-21.08.3.ebuild 1207 BLAKE2B fdd2505307e31a8bd80080a7ae672ccd6a2b7bb305929133d5c4e1f0376f4bf7758226c31f87936180b2890f131d94e7b6da10299e3fba84574144b5a106349f SHA512 4928fd4fe7e99af55d07b19b830f19672a6384473f69579a4a7362296b827648168cccb3a5da2fe9c3236338bfe7fa5a0e230f47b72b968c5badbfa6dc89f331
+EBUILD kdeedu-meta-21.11.90.ebuild 1210 BLAKE2B 98807179ff18472f54fa665c8324b6fcc4893312f66222ab6f11c15bd25ac25ae1cb7f3a794877fece4314f1ce6f74e56e109ffc52eb1e22502bed8dc0bef0af SHA512 234dda0e3456a4f4e7fb84aa1a65654fd4d3f5f73050c9a9b6d028af1a65e8c5a8c644e8db76f07154c2d5ee2cc36ac3b6a29d58f7aed618d59f5a28c63ce97a
 MISC metadata.xml 421 BLAKE2B f6cb6b55a61018bdaf40c71e3cf39da432e2b528ec0acde7d21e4e0b9878f12692fd24e108c6578a21ba8920582ebcf80a765a6949dacd22fb090918cd2dbd0f SHA512 50e68907fbc1591aaee8a6a8c26f955a562b9b5690aca87f388847b27e29168ba6bfe981ed268365928de567fa065e8f93d330bba3d1ac0dce2e5d947ce70a87
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-21.08.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-21.08.3.ebuild
index 62c0ddd84ac3..e17b10fc1a02 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-21.08.3.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://edu.kde.org"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-21.04.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-21.11.90.ebuild
index a224f735883d..62c0ddd84ac3 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-21.04.3.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-21.11.90.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
 HOMEPAGE="https://edu.kde.org"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+webengine"
 
 RDEPEND="
 	>=kde-apps/analitza-${PV}:${SLOT}
 	>=kde-apps/artikulate-${PV}:${SLOT}
 	>=kde-apps/blinken-${PV}:${SLOT}
-	>=kde-apps/cantor-${PV}:${SLOT}
 	>=kde-apps/kalzium-${PV}:${SLOT}
 	>=kde-apps/kanagram-${PV}:${SLOT}
 	>=kde-apps/kbruch-${PV}:${SLOT}
@@ -36,6 +35,7 @@ RDEPEND="
 	>=kde-apps/rocs-${PV}:${SLOT}
 	>=kde-apps/step-${PV}:${SLOT}
 	webengine? (
+		>=kde-apps/cantor-${PV}:${SLOT}
 		>=kde-apps/kalgebra-${PV}:${SLOT}
 		>=kde-apps/parley-${PV}:${SLOT}
 	)
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index adf3bb23ddfc..155941a1229d 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdegames-meta-21.04.3.ebuild 1804 BLAKE2B 1ea9c4228ab62ffcfcd645f55df6d5db7005078139d80c8ee75f5e20b0fef76bb0eefdeb09deae26fd3fdcf7decf33f262eb91d7d9e868055023c4ca55b71680 SHA512 b9be0ccdd464fc18681a1838fc90ed55c2309f06cdc45a898ceef0defd42f528dfda22842fd819d2d643966b757b25af05b596fd9fe5ece840e638bd6c7e6570
-EBUILD kdegames-meta-21.08.3.ebuild 1814 BLAKE2B f3dcb2b34bfefa7b943bfda1959b2264cccaeecdac4cb956dffed2404802ccc29c9f271edf4f5e826cfcb4e57ff629bb03f7787e88f5e414649ea3fafd2963dd SHA512 c5fa6a8d40b0ff04688b2b99e7c0b38ac58c51ab406542c56d4c728dee72f54ed4bdd6b06b61590e668641f1c50f6dac34eb5def42f97b448cd2839c5b2ae432
+EBUILD kdegames-meta-21.08.3.ebuild 1811 BLAKE2B 248e08b01f5559ad96787423b76c16850837bde53f3c1ef5df10aa581d53ad5e1617b9d7bcc4c4af1e985ebc81ac0bc43a0b5983a7b1a88c52a7e81894a635be SHA512 4067c8dbac3e689cd91e89d4a4c5e55e1d09405129faf40bdba16589b3455388597a750c4b78e87835fd8cf1cc56fa893ecd141b738ee1910c1f986125a7ee55
+EBUILD kdegames-meta-21.11.90.ebuild 1814 BLAKE2B f3dcb2b34bfefa7b943bfda1959b2264cccaeecdac4cb956dffed2404802ccc29c9f271edf4f5e826cfcb4e57ff629bb03f7787e88f5e414649ea3fafd2963dd SHA512 c5fa6a8d40b0ff04688b2b99e7c0b38ac58c51ab406542c56d4c728dee72f54ed4bdd6b06b61590e668641f1c50f6dac34eb5def42f97b448cd2839c5b2ae432
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdegames-meta/kdegames-meta-21.08.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-21.08.3.ebuild
index 29c2c26d187e..28004c776927 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-21.08.3.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://games.kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-apps/kdegames-meta/kdegames-meta-21.04.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-21.11.90.ebuild
index 6c9c14c5c343..29c2c26d187e 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-21.04.3.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-21.11.90.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
 HOMEPAGE="https://games.kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index b13d889949df..8102c722ab2e 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdegraphics-meta-21.04.3.ebuild 895 BLAKE2B 62dda55d2fe8e64f0d17f1284e8a69bc9c07c9912e8c0c8c76ae4d61521f5e73d4c8f8cd3d58e7a88cb8c6eab32ad71778e5c1810f364fdd7662908291648eea SHA512 91c6b1f82f61d82dc3986fc6acd6619a5aaf060d1615c419f255064585a6d3b101abe0329f1d40dec8692210d55d1b5e588ee5f9060d4bc80a834da143e5bbd9
-EBUILD kdegraphics-meta-21.08.3.ebuild 944 BLAKE2B ffe08e3b730c716d4e4971316dbc6e7211b3274086227520ea051472a874b783e69b58e436d8b8930d26fb193509c32ec1cfd3c2a487eb797a697752b7f19e4a SHA512 e1d83b0f65f5d892ebe72aa5e05b2529d06835e8c6b78e10536a579350e686c823e8c7ce67a44de280628ce06b7790e85679f6e500268247824c6891448c48a1
+EBUILD kdegraphics-meta-21.08.3.ebuild 941 BLAKE2B fd113ef78cfff52ae9260f46f958658a6c1adde9124602396403e87fe1ae3e7a2372d478055fb03a30f54020fdb3fecd7463ce57c2c8709f5b8a1950bd2146bb SHA512 eae7ebae18a470673952f446452ef6d7099706188817e990700495e9bf0e037e12a896dadd775bc6278a794fb52adaa3bb9644fd05c09d4689fd503a1002ee00
+EBUILD kdegraphics-meta-21.11.90.ebuild 944 BLAKE2B ffe08e3b730c716d4e4971316dbc6e7211b3274086227520ea051472a874b783e69b58e436d8b8930d26fb193509c32ec1cfd3c2a487eb797a697752b7f19e4a SHA512 e1d83b0f65f5d892ebe72aa5e05b2529d06835e8c6b78e10536a579350e686c823e8c7ce67a44de280628ce06b7790e85679f6e500268247824c6891448c48a1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-21.08.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-21.08.3.ebuild
index 58986824d30b..f730d62b382f 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-21.08.3.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/graphics/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="scanner"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-21.04.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-21.11.90.ebuild
index 9a65e9d6123d..58986824d30b 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-21.04.3.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-21.11.90.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
 HOMEPAGE="https://apps.kde.org/graphics/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="scanner"
 
 RDEPEND="
@@ -26,5 +26,8 @@ RDEPEND="
 	>=kde-apps/spectacle-${PV}:${SLOT}
 	>=kde-apps/svgpart-${PV}:${SLOT}
 	>=kde-apps/thumbnailers-${PV}:${SLOT}
-	scanner? ( >=kde-apps/libksane-${PV}:${SLOT} )
+	scanner? (
+		>=kde-apps/libksane-${PV}:${SLOT}
+		>=kde-misc/skanlite-${PV}:${SLOT}
+	)
 "
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index f77563101714..416b6df675d1 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
-DIST kdegraphics-mobipocket-21.04.3.tar.xz 17092 BLAKE2B ff2f227b31e2fa491b61f85fe38b2a9017c59cca9a649e79dc15ffb0cc7168aed77f4adde4d6621a796f2a00ed189cf1d0385131ddb8bd9a043f45ba9d84f8e0 SHA512 112b7b176ebf2631dbec5b621b34a1df7eff1ad0836ad4349039a539684aa7a7496ded50fd5d15fd3b3c6807bf2c3a6b9ad7483b2ab8758e72f4cd0bb6488224
 DIST kdegraphics-mobipocket-21.08.3.tar.xz 17100 BLAKE2B 60afdaa380a2ffe17bd739d83c4bfcbb9ded0d6d56cebacaf0eb827376349babe79c9c86209f39f5981410da04e6064f828f2dcf29144f0b15c2fbf5e19f5b93 SHA512 81e75efd4d8bab0303e23ece04d41fbca6ed0429153e4ff8e774d7d2a2596e5ab921d9f351d077fd9aab81f2c10dac7350f301c78be0bb1734347d695bf4f035
-EBUILD kdegraphics-mobipocket-21.04.3.ebuild 516 BLAKE2B bc2a1df12876a586b4610c9596fb9309e0943776a6d507481612b2509f6dd1183e684d1164d6b351a2d22099e2b053518414dd88ea71529a5f8c65413c66754e SHA512 400d960a4ec5f13e3ac773087d509025e3d631c2616cc85b251b69a6771beaa74b897c42b9556e236dfbf99073ba413708cd68152902a65423cce5e2d3ea88da
-EBUILD kdegraphics-mobipocket-21.08.3.ebuild 526 BLAKE2B 88cf78de799baab61106755ac34a3334be9c50fbcfbf3a1e8b568544900ec557a1055199486417f70a6933b434aff6ed463c6b46bb4717f871756e7533e3f863 SHA512 7888e557d3c1c0063b799e4a55c3dfb096fcbc848530b8165143eb8a788f16cc8f679db0f78afd77c70438f1a1dba47a77173c6805e30c73d91a2c52f92853dd
+DIST kdegraphics-mobipocket-21.11.90.tar.xz 17332 BLAKE2B e26357cdb191fde5503303344c2658d94c7d03e766f55621ea23a381cd4ab0b4bd7102b62d6cc8ae488378a54bad77f0a2f33579da9b79f140e172b1736fcc68 SHA512 1a278c95f07e7c41f3b281dfc85560134c15aac0ecbbe49beacf931e94560c324d1e4f55363ec5e3c4476ba3cf87e4de30f4b74050840e27851d58a01c3a17e8
+EBUILD kdegraphics-mobipocket-21.08.3.ebuild 523 BLAKE2B a064da5cb88119e56b5874a280db735a3d20941d43144b9185b1c53ee964de5c18ef7906a9f6990a48b77345e28f8c7be8fdc1d4d935108895b6deffbe214253 SHA512 a42ca2c32d85dd5d93f6b47bbe9aff141d9d042466a6b93f9584315bba93e598288130da2ba067b12c3e1571fb63da10959903587f90baf60b954f7dc056357e
+EBUILD kdegraphics-mobipocket-21.11.90.ebuild 526 BLAKE2B c45ecf20bba129b65d8da8ff9cf5dbcf0793846e446e6739e9967038a41b0d8348a7f0fa66b80a1d0c33f17ac3001778fd19e91cad94c8570cff884b94b56c5c SHA512 f16ad86f1c64af3ead1c7dc42afc352f09528bb52ab2235732ae7e765e630788acefc68efd090dbed341187fbd3afee0390f6621662fcd65589e46e0014b3ce7
 MISC metadata.xml 394 BLAKE2B 0a2bb8cb27c7f1bde68f8c46cf132c18ec1844707fee62c6f4a6b9b1d6b58d81960d7ab5c3e6d968c4595ba7c9b7ca8b49736c0d5256e2d7ae61a2024a3f7a19 SHA512 355eb6a3a5dfec643b735648fd0481acb8b005a6db808e67eecdf905c7271be1f8da26fb3e6900fa33b5979b62f647c00054c6db518dd209d4ecb4c0f5ef592c
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.08.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.08.3.ebuild
index cb96d7a5d25a..2c76ce861f15 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.08.3.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library to support mobipocket ebooks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+thumbnail"
 
 DEPEND="
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.04.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.11.90.ebuild
index caa42e4dd41e..8b93e4956709 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.04.3.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="Library to support mobipocket ebooks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+thumbnail"
 
 DEPEND="
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index 66cea73b3fee..00d4c052da38 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdemultimedia-meta-21.04.3.ebuild 840 BLAKE2B f860ebecc10901d6701e725d8b1e0565c6073d00919f5c1c7f09744e5ec99c28808fd9c47859405b3684820b0b0e3b5c5ccaf5b496a7be9c59f644bbd2aa5e30 SHA512 bb02d01fcd859173eb0819e39f1e252888bd58d6dd320616d5eafbbaaf5205e0cb9d4afc5eb532b4f937040645363f0a3047be502f09787f7585a12e1749ad7b
-EBUILD kdemultimedia-meta-21.08.3.ebuild 843 BLAKE2B e52f8227a88e8aed8f711ab424a59e0f21388a96cac15ba3a470dac1b3c2c54b4dddcb7e31b292a458b6692c73580828a6c9dafd328ff302d449195e6f81128f SHA512 f9a3231b1a05abb4742b9878a57331bdd98c8a067f98dbe50ca3ea1e51b46bd349a72fbff7a17402132175ae028037d8fbd0d24da6e2650c421ecb269e281512
+EBUILD kdemultimedia-meta-21.08.3.ebuild 840 BLAKE2B 7317c72e3b08ea6f99b0239564d114cf6889dc5ad7e44a06c6d03920729e39e961132cab2e1f84d7b369876337816d8d64e6c6862ecb88a5b781f2a4e30015ad SHA512 fe256362f6badb87f11d6f0066a453ee18f09b314fe72edb24bf8fd71aaadb1cc82eac443bc24f4f7f9f817ca757ea65d0e1a606be5f4caf3ee3fec263ea7797
+EBUILD kdemultimedia-meta-21.11.90.ebuild 843 BLAKE2B e52f8227a88e8aed8f711ab424a59e0f21388a96cac15ba3a470dac1b3c2c54b4dddcb7e31b292a458b6692c73580828a6c9dafd328ff302d449195e6f81128f SHA512 f9a3231b1a05abb4742b9878a57331bdd98c8a067f98dbe50ca3ea1e51b46bd349a72fbff7a17402132175ae028037d8fbd0d24da6e2650c421ecb269e281512
 MISC metadata.xml 396 BLAKE2B 1c8e4de9c200231320878631c34997b5d795b34ddeb2c7fea2c15f591ab1dfbe5e53f8dff5f9f491fdd1b93af5be8e682c370c0377c564ac5f56e625fca96e3b SHA512 e4f98eee41035480f44e861e2b4e69861636557ca21ff5ecd90d73d13a7dad6f8c74d3b213c5ee81cd095a5540b5837c3e1449e9657edfd09b19413498d63406
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.08.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.08.3.ebuild
index a51a7f6c0e6b..6fd12359b3a6 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.08.3.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/multimedia/ https://multimedia.kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+cdrom +ffmpeg gstreamer"
 
 RDEPEND="
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.04.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.11.90.ebuild
index 26101265b5c2..a51a7f6c0e6b 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.04.3.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.11.90.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
 HOMEPAGE="https://apps.kde.org/multimedia/ https://multimedia.kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+cdrom +ffmpeg gstreamer"
 
 RDEPEND="
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 242ac55077d9..ed3f702787ad 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
-DIST kdenetwork-filesharing-21.04.3.tar.xz 378280 BLAKE2B 345ef38b120de2f1ca6dd256d579995a60c4e5d41b2b2e53aa6de1c051c1deec251cd3943770640445b7c3074105a4584d8144b864bc2c9544ed55a638f4edf3 SHA512 7b8b0d0118829d64d46acfea666a4c274d5c6e7f825624cf02cf7e74558af1f2f2d152cca676ce0da56ed01cb74511c1b20c3940118f2dda129b40551e2ce4c7
 DIST kdenetwork-filesharing-21.08.3.tar.xz 378680 BLAKE2B c3fce11dcfa3fc4781a2f34d1028de71f6df48c93b9bc6a8b97ddb784c3b158641ce902d158dacce277842e78504eb6500bb61591e7145470bea0b1983a52e86 SHA512 1abbd8b16e99f42d432b81061eff21200aed3f82790622264e25cb8e50649b584ceb230c8aab488e3e40d9e1327a325eda2648785a0a2e768b0572f27845f474
-EBUILD kdenetwork-filesharing-21.04.3.ebuild 922 BLAKE2B 20627251aa4946bf2fc4fc5ebe37f9a991dd9f89bb9e7f344f86f7d481b033ea20ddc9140b975af7e8c92f135acb934198a56b3a9117afec2da21ddbfd0181e3 SHA512 d4dd75dfb9339746e575a9395b2c71a97aee74b15b5371e93b886b130712ae395b2e37675a9504770c1a0d7331e6d97efa2ad3b76aaba3398aca8878630e40cb
-EBUILD kdenetwork-filesharing-21.08.3.ebuild 932 BLAKE2B c56ef0bf1ceabb3746e489fd4a03075f56e22833846fd5cb4cdb9da2f3acb00f6d6ffd247e4e91ff5d6d116593b503a302378934759dfbebaa7b44b105971d4c SHA512 4b875ac763981fae01165d5c8ae1e982f9d09ecfe70fbc86d30876363f7664fe85ce07ebb40fb606e66b609030d53aa7f54dd4197679e490a1aa468631bbf51c
+DIST kdenetwork-filesharing-21.11.90.tar.xz 378740 BLAKE2B 0dfb59bd7e461ca2300a6898763186602b93a87b8db9ed61eb9eb5732f4976a4adca7a6a6c0edbf93fa88c2281a3e68e80a9ea12000c0bf8c36141b8781f6d3f SHA512 12c4f7d798c2f24a01c62e396e9c3240f5d7d9b341401ea0061f2b0097a97b6f537e1b07007f89d28ac33496455dd34a99e5ca7487411099bbbe7934bc1884cb
+EBUILD kdenetwork-filesharing-21.08.3.ebuild 929 BLAKE2B 7db8ad864c76a1ac8841f65d09fa714f6de55b13fe58ed7e0f88f7841a47e6f6d89401078fa616af2970fd857d9db1e8b044329396af0b38273762c0f2bc6cd9 SHA512 413f04ae9f535f591288330636bb08631e763e6e99839b7b0649f24ca5641e7d3d710b2dd6fa23a27d03f13aa67c0cf149e35273841895f70e629b3b8eb2f70b
+EBUILD kdenetwork-filesharing-21.11.90.ebuild 932 BLAKE2B dac3cd5f6cba271e9bcba6ba7ff3ca2b0e8baaa5639e65e72fa8b4317e1350bcb7f221bea986618d4e1d23b3673cb5d2b073c560663841aef1af36a47b57bad7 SHA512 ea61856c20c2f51c326fc73a137402c6a057b1fe81ae7a1604f64c88a3df32a3d672e676919a2af6de63bffc2ce5644e0fc0cc36a9ec3a29fdf3d6fd3defc02c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.08.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.08.3.ebuild
index 71bcd0617034..920000e8d42c 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.08.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kdenetwork_filesharing/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.04.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.11.90.ebuild
index 3d300e6cb1e2..51ba80afbe88 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.04.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kdenetwork_filesharing/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index e511873ce37a..79d069261aa5 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdenetwork-meta-21.04.3.ebuild 904 BLAKE2B 710ff9e513a359de7038a3c7fd84e09fdaba495176a712d483340dc9fa71c1bb72225433e1ea175d7fde5adf93245f6d9afa5ee327d4443aaba9cf413971aec7 SHA512 fc26677b0372968f53020895ad27918d449f18364e8d48d1f94dcda75441ad4a472facdef4386235d28910de7dc821fc6736b2d5e9a10a82178af97d0e90b9d4
-EBUILD kdenetwork-meta-21.08.3.ebuild 907 BLAKE2B de4d095781fbe7bf51d79bc779202d58f9f74f0225eaf4a8b64a237bda2bbc9c91d96bc0dc854e37a012bad215dc3c127db5f6ab360372ad8a6a8a672e5fa7b4 SHA512 8f89ae61b8d478a77e390e904f015b85979159e1753b162469dc57200a7d64e61d4301a0ddb3132bab791fd0aa0261ff65766a714994e418aa9a810892852247
+EBUILD kdenetwork-meta-21.08.3.ebuild 904 BLAKE2B 9b3922b1cdee17f79f66e8354d046c127c017bae92537774d8577142386362772c0da94efd202bd3ff8fc048534685f07bf68c8b5dddb7835434814945a02ce6 SHA512 12f576a3146515c126ad421aa07c3b9e4beee490faf5bca9d0721558014e1221bc7deab2151e7d1c6d9cf05b24c64bd033a5a0cb07691644fea39426581800fe
+EBUILD kdenetwork-meta-21.11.90.ebuild 907 BLAKE2B de4d095781fbe7bf51d79bc779202d58f9f74f0225eaf4a8b64a237bda2bbc9c91d96bc0dc854e37a012bad215dc3c127db5f6ab360372ad8a6a8a672e5fa7b4 SHA512 8f89ae61b8d478a77e390e904f015b85979159e1753b162469dc57200a7d64e61d4301a0ddb3132bab791fd0aa0261ff65766a714994e418aa9a810892852247
 MISC metadata.xml 835 BLAKE2B bae1ffe0702c7f4de6e13b52e5da9bde0a57c284f4136368986d34b54ac2628b5e3c13435b7360e34b698e371ad66acd83de6db3bd1962c9fe4d9b6210116c24 SHA512 c4736229321f0494f5b898a03750792c0f87001a5a6b6751e1aabf5291c67165305c094459d37b0cefc5a30dfe425d07412bf215e4909d96a12b7523fe21e36f
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-21.08.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-21.08.3.ebuild
index cbd43d37c2bf..f26c1e043a54 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-21.08.3.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+bittorrent dropbox samba +webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-21.04.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-21.11.90.ebuild
index 43505127fbc9..cbd43d37c2bf 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-21.04.3.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-21.11.90.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
 HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+bittorrent dropbox samba +webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index f56944e98190..8f0459bba8f8 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,5 @@
-DIST kdenlive-21.04.3.tar.xz 11774932 BLAKE2B 7ecf010b82261696d27f1e94f80902b124474e8f3de94d13efc494eb703b073f05047ce17e45a9e161e505eceee046ff3e5ba1b11cc356c1d83a4b3a7e086ae6 SHA512 9ab5e3f93d0423a0bd746b4bc981a1b9ac14e8440b002d76e44b68597b9c8a16c1f2b498e53755fc5399795d6716addb87c75a58053f7560b108d5019282679f
 DIST kdenlive-21.08.3.tar.xz 11785448 BLAKE2B ca3683e6f4aa6096b3d679c3ac3e0c9ca97ee042e42d307c2752d61611f9013ae634c4cb659a10bb496385be7852a8db92b24d9be9b7341615cce1e58c076dc8 SHA512 e299606fcb258d6d7f71348231d1b860e49fc80847ec08811806d1c94a63661c32a8bff6a5ba4d19175bf76b2ea5b81059172f8181708e3333d94f92b7935cba
-EBUILD kdenlive-21.04.3-r1.ebuild 2435 BLAKE2B ae0503cafe1f257dc3392eee6b830fe49309470f3c06311fc30cdfe2cb6e099825c515f693418f3c8c62be15dde0d0095788f27ba2d77e9413e8a51fa58b0d55 SHA512 77edda6a1ac86e2346f8458241829a9dec5823ba6fb6028dc4df6d4521e749f37f425136d2e2ec925d6f9a59637e4f97797d9e3356d251f22e337a30648d1f44
-EBUILD kdenlive-21.08.3.ebuild 2434 BLAKE2B b614ae66066dbe4a6eab8387a3734332e78f43e098e81414e6c9cbb73bbaec109b5dca02a32276f2bfa894f0cf3c59ccd6b86e612e5172aef118fe7b700ea986 SHA512 8c024a9b6d81d6d93e282fd7baad9fea245d42172e20405d44e4dad12140f560aeb73b7d2e81c3cd3a752069bad6f66547941650e8afe393881ec4e59b95170f
+DIST kdenlive-21.11.90.tar.xz 11818280 BLAKE2B f259ccc5b913f5f4b16afe26a6f5b5be444997e7e79f3215c536962717dc7602cb154ae11ad60e8f72a3b579b991486f0121a5cc27bd160485c09bb50bbbf7a4 SHA512 bd62fd09122173daf0183a02729f79cc875e31ead4473c55f9f76d1671364ba859d307e509625510f829fa1434b06bff553451a4142c4023d7cce669b14de554
+EBUILD kdenlive-21.08.3.ebuild 2283 BLAKE2B 8616eb7179fa9cd21650dfcd3ee198c4204f8f28d9f2fa4d9122673cb1f3c69cdbaa0e41d28cbfcfab6ccb55201a6cc932c95f09ab3e0f91ef894078ca2868a6 SHA512 5c9fc2c90c14a0d9d70a837f01f508ad03f1dbe1cc71eb5ce09da88bad88383d23bb83bc059e51a4fb23f823816a80099783e1e78fff2b6e684fbf1806751eb2
+EBUILD kdenlive-21.11.90.ebuild 2286 BLAKE2B 62ac47735c8742eab19654fb44438b3a4d382cf7400d49d75382379b77b72a40934af4f55fe04be8c8849753ea875d620a82b08cbcb39ae09ad15731fdfce61d SHA512 d1ea879afee032dc8d3bb642e9b931c060b82023ff287764bcf0eda52025e7c1469f293187a61e7b6313ada153408c40d37e3f6c8b4ca89e6b661443a65e43a9
 MISC metadata.xml 433 BLAKE2B aa15f0a819a00c6b039f74d707659bf6beb6ee9c2ac9cd5a1c69163cd684c46d928105e832d93ac8096f128cb479bc30a85866979773cefc5a800ade4a7fd254 SHA512 2df906f333d8f522e66d7977570f8fd35efd329fb797cc4998a9eadfb7405748207f895e8b741004fdcde5dddff58a746337a33edbb7e4a748106fcf366675b0
diff --git a/kde-apps/kdenlive/kdenlive-21.08.3.ebuild b/kde-apps/kdenlive/kdenlive-21.08.3.ebuild
index 648f739f7cb4..7572e7dc403d 100644
--- a/kde-apps/kdenlive/kdenlive-21.08.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-21.08.3.ebuild
@@ -9,14 +9,14 @@ ECM_TEST="true"
 KFMIN=5.84.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
+inherit ecm kde.org
 
 DESCRIPTION="Non-linear video editing suite by KDE"
 HOMEPAGE="https://kdenlive.org/en/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="gles2-only semantic-desktop share v4l"
 
 RESTRICT="test" # segfaults, bug 684132
@@ -75,10 +75,3 @@ src_configure() {
 	)
 	ecm_src_configure
 }
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	# Gentoo bug 603168
-	optfeature "Crop, Transform/Rotate and Shear effect" "media-libs/mlt[fftw]"
-}
diff --git a/kde-apps/kdenlive/kdenlive-21.04.3-r1.ebuild b/kde-apps/kdenlive/kdenlive-21.11.90.ebuild
index e7c4aceeeade..7f0dc2cd43e2 100644
--- a/kde-apps/kdenlive/kdenlive-21.04.3-r1.ebuild
+++ b/kde-apps/kdenlive/kdenlive-21.11.90.ebuild
@@ -1,24 +1,25 @@
 # 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="true"
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
+inherit ecm kde.org
 
 DESCRIPTION="Non-linear video editing suite by KDE"
 HOMEPAGE="https://kdenlive.org/en/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="gles2-only semantic-desktop share v4l"
 
-RESTRICT+=" test" # segfaults, bug 684132
+RESTRICT="test" # segfaults, bug 684132
 
 DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -55,8 +56,7 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/mlt-6.26.0[ffmpeg,frei0r,qt5,sdl,xml]
-	<media-libs/mlt-7
+	>=media-libs/mlt-7.0.1[ffmpeg,frei0r,qt5,sdl,xml]
 	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	v4l? ( media-libs/libv4l )
@@ -75,10 +75,3 @@ src_configure() {
 	)
 	ecm_src_configure
 }
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	# Gentoo bug 603168
-	optfeature "Crop, Transform/Rotate and Shear effect" "media-libs/mlt[fftw]"
-}
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 8f3b9b185601..fbddd183f01f 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,3 @@
-DIST kdepim-addons-21.04.3.tar.xz 2271324 BLAKE2B a5cea9b75d9614dbca933fdcd8512c67ac921069cae4f128da704956bf80237309b5cacfc588ac1ba39890bee1a15903bd5773f035982342fb27af51ad0b1c45 SHA512 3813f3d9dff60158ca14f4afb8b904a5df9f1d54d180767846be2085869ceeb60ce13b6b017cc8297d8d1bdbb4d0fd7e155701c6babaa7c4c8cfb44d658864e7
 DIST kdepim-addons-21.08.3.tar.xz 2278564 BLAKE2B 866a63c15854129ebe030b0b5f1ed4c41ca0262d700d7f9d38b440402ab8792a0e8794a7c8360d94783d45cc2df15a67711019d13036a41cd50e4cabf51d1d58 SHA512 e8a53347f209340883a41ff2fcc3d046ef0291d4352f3408b154ebce61833d8d76ed428da18368ec8c61a743ac5dd812cbf6871f6a0a0419b3ea9891919c7aa6
-EBUILD kdepim-addons-21.04.3.ebuild 2470 BLAKE2B 414c3eb05163f70f2a08b52882df205c2636c5d413bfe441ec2590b6007a662e9aa1f2d5df288491d22c3e71693a945c19f54f54dfb02e42fad37e027e1619ef SHA512 50249ac0a94c031d889752907d8238effed702ce325fda93e03f715c4abd590a86f755a7812828043a3cced8d805f1db811a6626d4a78fae2cc30559dc5cfa89
-EBUILD kdepim-addons-21.08.3.ebuild 2471 BLAKE2B 4314876ce684541e98570902f030f907183a6ac63a5d0c70e0950ee137f3974b9958da0a566bcd1d549de3730351bbefc60d292ee2d707ac9fc265af0cd080fd SHA512 1533f5fc027da762d7379d4f1983d6f1f502f7381cce96504070a4b64a0e4431e0df5bbda0727982403bcf8afa3c947b4ef69952a63c02deffb97f2e157c8d4d
+EBUILD kdepim-addons-21.08.3.ebuild 2468 BLAKE2B a7b395ff64607d757182a2bbd174588e8453400d5496dc4ab3e5969a56341d65b434307d4257495a848942f8e6b061156faf8ea5153896a898997185b4329ada SHA512 cb3fc3cbd0d2bbe63c5ef250130109fdb602e5e16d679421d3f5bd7416ab5b6aeff81e877c1e2469304e70d8905cbfafc4d426855450dbe6b2befcfa29026b96
 MISC metadata.xml 535 BLAKE2B 372b4b81f73cab00c89c12fb43fbb4edeea2521a7f443c70bdd68269780b82ed98e71d5a1b16cab55827f11fefbd70c65fbf860e3d6b73b39647bc02256edaf1 SHA512 a4a82c962488e785ecc5b36711c5730955f0352d7fcc184facfc351668dd22ba82247b9608ca39fac48f6260f29283b3c95e967ab0d887421f5849b425aa7b4d
diff --git a/kde-apps/kdepim-addons/kdepim-addons-21.04.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-21.04.3.ebuild
deleted file mode 100644
index 55ecca3b99c3..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-21.04.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="importwizard markdown"
-
-RDEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	>=dev-libs/grantlee-5.2.0:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kaddressbook-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kitinerary-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
-	markdown? ( app-text/discount )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package importwizard KPimImportWizard)
-		$(cmake_use_find_package markdown Discount)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-21.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-21.08.3.ebuild
index d821820e0eb5..c29b5a495b81 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-21.08.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="importwizard markdown"
 
 RDEPEND="
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index 1fd4b2feb5fe..bd82a852f2fa 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdepim-meta-21.04.3.ebuild 2519 BLAKE2B 2e2ca5b0939579c49ae5ad49ca02b412e875aa617b988f05157677a3c8eb850529fc567571bef6830802d76d97f3a7ea15e038be86e6ce91f3998f551590cc01 SHA512 23b624bebf33729cb83b8246acb6e33a5abb33917cc10c235aceb36b14e1fdec3fac875ecd01cf80a3f342869948d85d47234b8801bde803c6dc9469fbb76516
-EBUILD kdepim-meta-21.08.3.ebuild 2522 BLAKE2B 15bbcd5c1ef0e7bdda264e04fde6204a15e791c555aafad9820d43cdbd0be8fab0657795121e7a3b72af156adf7c51394f28ad2048d9276db15fd3ccc4d37104 SHA512 ddd02c8af67caeef1f1c85d7f95a2a6e58ee933d02c546cec69675cfd36a84d752404b019154fcdc6e880298176d16fbc0bb0ad3ca67d069c4276b7a022bf2d2
+EBUILD kdepim-meta-21.08.3.ebuild 2519 BLAKE2B 99bbc09a5ea7b43e2a8ad589e73e6d72a96d6844c53969ed2e036d13029fa2b3a52a254ce5a53febc71e2a647d24e21d2b404df1768245102a42d368a065ec36 SHA512 b00dd1757b5f5ca315a55b35c70a71305dea79b16df3816b51e8c4f048c3d764b73a85bf50361e30680a7fdce77285fb5cd81d197f808d242995be9190199cc6
 MISC metadata.xml 719 BLAKE2B 5738f59b4f5659b529f74f7f35fc8773408b45baf022e0b4e55656e45246e4217e130566dcb8ed0fe8f51d2198802a71cdf81ea7b1740de2bba3f289fb94c949 SHA512 5f9cb7928079b28d9125665f25c90c3bf3acc51d65760ba93ccda918fac56ba399a501fbe8d283d20aba5d83ffb9aa0ee5d7a2ba37e613d5ae7ab680a04cfe1a
diff --git a/kde-apps/kdepim-meta/kdepim-meta-21.04.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-21.04.3.ebuild
deleted file mode 100644
index 99e207a8f589..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-21.04.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="bogofilter clamav spamassassin"
-
-RDEPEND="
-	>=kde-apps/akonadi-${PV}:${SLOT}
-	>=kde-apps/akonadiconsole-${PV}:${SLOT}
-	>=kde-apps/akonadi-calendar-${PV}:${SLOT}
-	>=kde-apps/akonadi-contacts-${PV}:${SLOT}
-	>=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
-	>=kde-apps/akonadi-mime-${PV}:${SLOT}
-	>=kde-apps/akonadi-notes-${PV}:${SLOT}
-	>=kde-apps/akonadi-search-${PV}:${SLOT}
-	>=kde-apps/akregator-${PV}:${SLOT}
-	>=kde-apps/calendarjanitor-${PV}:${SLOT}
-	>=kde-apps/calendarsupport-${PV}:${SLOT}
-	>=kde-apps/eventviews-${PV}:${SLOT}
-	>=kde-apps/grantlee-editor-${PV}:${SLOT}
-	>=kde-apps/grantleetheme-${PV}:${SLOT}
-	>=kde-apps/incidenceeditor-${PV}:${SLOT}
-	>=kde-apps/kaddressbook-${PV}:${SLOT}
-	>=kde-apps/kalarm-${PV}:${SLOT}
-	>=kde-apps/kalarmcal-${PV}:${SLOT}
-	>=kde-apps/kcalutils-${PV}:${SLOT}
-	>=kde-apps/kdepim-addons-${PV}:${SLOT}
-	>=kde-apps/kdepim-runtime-${PV}:${SLOT}
-	>=kde-apps/kidentitymanagement-${PV}:${SLOT}
-	>=kde-apps/kimap-${PV}:${SLOT}
-	>=kde-apps/kitinerary-${PV}:${SLOT}
-	>=kde-apps/kldap-${PV}:${SLOT}
-	>=kde-apps/kleopatra-${PV}:${SLOT}
-	>=kde-apps/kmail-${PV}:${SLOT}
-	>=kde-apps/kmail-account-wizard-${PV}:${SLOT}
-	>=kde-apps/kmailtransport-${PV}:${SLOT}
-	>=kde-apps/kmbox-${PV}:${SLOT}
-	>=kde-apps/kmime-${PV}:${SLOT}
-	>=kde-apps/knotes-${PV}:${SLOT}
-	>=kde-apps/konsolekalendar-${PV}:${SLOT}
-	>=kde-apps/kontact-${PV}:${SLOT}
-	>=kde-apps/kontactinterface-${PV}:${SLOT}
-	>=kde-apps/korganizer-${PV}:${SLOT}
-	>=kde-apps/kpimtextedit-${PV}:${SLOT}
-	>=kde-apps/kpkpass-${PV}:${SLOT}
-	>=kde-apps/ksmtp-${PV}:${SLOT}
-	>=kde-apps/libgravatar-${PV}:${SLOT}
-	>=kde-apps/libkdepim-${PV}:${SLOT}
-	>=kde-apps/libkgapi-${PV}:${SLOT}
-	>=kde-apps/libkleo-${PV}:${SLOT}
-	>=kde-apps/libksieve-${PV}:${SLOT}
-	>=kde-apps/libktnef-${PV}:${SLOT}
-	>=kde-apps/mailcommon-${PV}:${SLOT}
-	>=kde-apps/mailimporter-${PV}:${SLOT}
-	>=kde-apps/mbox-importer-${PV}:${SLOT}
-	>=kde-apps/messagelib-${PV}:${SLOT}
-	>=kde-apps/pim-data-exporter-${PV}:${SLOT}
-	>=kde-apps/pim-sieve-editor-${PV}:${SLOT}
-	>=kde-apps/pimcommon-${PV}:${SLOT}
-"
-# Optional runtime dependencies: kde-apps/kmail
-RDEPEND="${RDEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	clamav? ( app-antivirus/clamav )
-	spamassassin? ( mail-filter/spamassassin )
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-21.08.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-21.08.3.ebuild
index b192de4ec0ec..9be8c9ad4f6f 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-21.08.3.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="bogofilter clamav spamassassin"
 
 RDEPEND="
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 088281312cbd..2c78a55d4b7d 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,5 @@
-DIST kdepim-runtime-21.04.3.tar.xz 1822120 BLAKE2B 6eb8ec1d5feb136b31c8122db28e586cca6fee2ae29aa89ee9d7050fdb8088178b262935b80e2f213f6f96594a3a83d48df4670700e0acb20306845fad33cd36 SHA512 1830cde921bf6f0e7a772c60a8bf30db1333f9172596843b89c5333ee7a289aec0670849b88adfce4a451ac46c4f5e43dac715d4e42e4df36cb1b5ca711b0afd
+AUX kdepim-runtime-21.08.3-CVE-2020-15954.patch 3482 BLAKE2B 055f2b568348ba9443f84c6d24a0da8ead918e7b1f67f73d6645e887b003353cdc297d25d5a2e42d00dff7e80133451e81417337fca7c6023b1747a12eef0a5e SHA512 a86881edd2aaa9a1cb8a1ef23eb2c549b0b8b9e2d7dbdd2d992bab7b6f2b947244746c781108914c27ee5863912f8a1717a23bf153b2a4fdff3846f70f16fd70
 DIST kdepim-runtime-21.08.3.tar.xz 1824164 BLAKE2B c1c367b45e306891e581b493b550061dd7f765299246baf170119f35e3aa5baf37bf595fb184e0ca74c72e6640829f6b6739c44bcd3ddbfe60d04a2d9194002b SHA512 d13bb98663372aafeaa34dab785ed1f09d9a3974cdb680c123978bbbc22ee721b5ff26332aedbddf638c0cb5847b94e9d60d24599210e1cadfde514b7a7c6454
-EBUILD kdepim-runtime-21.04.3.ebuild 2500 BLAKE2B ab20431cfee7ee21c9738f628fb336221b4eee89f4f226bd7104a58fddc9ea6daf91ad58e0068eea878a930a2ab9e45f79549c4d6dfd0082d82e3042f7a42eed SHA512 21abba19191c96ecea3293d79f3c1af2470e79e7349ecc13bdb83c8bd91eca2a97736843b51e6d5f44483d194ae6bec2b18c4b7cfc0b905a166c9e04eedc893c
+EBUILD kdepim-runtime-21.08.3-r1.ebuild 2559 BLAKE2B 5f33099e32f243f5b4eaf07eae5303ea891cc734ae3672b4fae014591848ddcad72939d1fe239c7af086d2155a07551f528febd522e9ddc817c59e9029fca519 SHA512 32ff7d171a0da855cf48938b5e05d92a920ff36212737c868921146e7bf506de2445bec4a8a9942a9ed6fbcf84506754aab05fe50698c1c19a5365e0b9cef278
 EBUILD kdepim-runtime-21.08.3.ebuild 2496 BLAKE2B 9a7c5ec7a6e2dc0035ab80aa45e642743e85c93b5ef32218b53042ecf5ccbd6ae8f5adbd242f76a6b2ceeafa48ee83ee1967ab27b56dd7c1187e2fd77055effd SHA512 e7cdd3853a5ab226ff425d9642d9c9f84c91ce4a2f01e3a54cac73f014186cc5b4edaa7006cda6cfa8b96387c6239ada05dea230604fe1ab4d7e73d6e3188b98
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-CVE-2020-15954.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-CVE-2020-15954.patch
new file mode 100644
index 000000000000..14ba90537025
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-CVE-2020-15954.patch
@@ -0,0 +1,110 @@
+From 35447bd04e8c12afac524e1c4556ef3db088e014 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Fri, 12 Nov 2021 13:09:22 +0100
+Subject: [PATCH] Fix POP3 setup wizard defaults to unencrypted connections.
+
+Now I check encrypt support when I create resource.
+So if resource support starttls it will set option for it.
+
+BUG: 423426
+FIXED-IN: 5.19.0
+---
+ resources/pop3/wizard/pop3wizard.es | 73 ++++++++++++++++++++++++-----
+ 1 file changed, 61 insertions(+), 12 deletions(-)
+
+diff --git a/resources/pop3/wizard/pop3wizard.es b/resources/pop3/wizard/pop3wizard.es
+index 5864db5d2..6bcf9a1dd 100644
+--- a/resources/pop3/wizard/pop3wizard.es
++++ b/resources/pop3/wizard/pop3wizard.es
+@@ -1,5 +1,5 @@
+ /*
+-    SPDX-FileCopyrightText: 2009 Montel Laurent <montel@kde.org>
++    SPDX-FileCopyrightText: 2009-2021 Montel Laurent <montel@kde.org>
+ 
+     SPDX-License-Identifier: LGPL-2.0-or-later
+ */
+@@ -30,21 +30,70 @@ function validateInput()
+   }
+ }
+ 
++var stage = 1;
++
+ function setup()
+ {
+-  var pop3Res = SetupManager.createResource( "akonadi_pop3_resource" );
+-  pop3Res.setOption( "Host", page.widget().incommingAddress.text.trim() );
+-  pop3Res.setOption( "Login", page.widget().userName.text.trim() );
+-  pop3Res.setOption( "Password", SetupManager.password() );
++  if ( stage == 1 ) {
++    ServerTest.test( page.widget().incommingAddress.text.trim(), "pop" );
++  } else {
++    ServerTest.test( page.widget().outgoingAddress.text.trim(), "smtp" );
++  }
++}
++
++function testResultFail()
++{
++  testOk( -1 );
++}
+ 
+-  var smtp = SetupManager.createTransport( "smtp" );
+-  smtp.setName( SetupManager.name() );
+-  smtp.setHost( page.widget().outgoingAddress.text.trim() );
+-  smtp.setEncryption( "SSL" );
++function testOk( arg )
++{
++  if (stage == 1) {
++    SetupManager.openWallet();
++    var pop3Res = SetupManager.createResource( "akonadi_pop3_resource" );
++    var server = page.widget().incommingAddress.text.trim();
++    pop3Res.setOption( "Host", server );
++    pop3Res.setOption( "Login", page.widget().userName.text.trim() );
++    pop3Res.setOption( "Password", SetupManager.password() );
++
++    if ( arg == "ssl" ) {
++      pop3Res.setOption( "Port", 995 );
++      pop3Res.setOption( "UseTLS", true );
++    } else if ( arg == "tls" ) { // tls is really STARTTLS
++      pop3Res.setOption( "Port", 110 );
++      pop3Res.setOption( "UseTLS", true );
++    } else if ( arg == "none" ) {
++      pop3Res.setOption( "Port", 110 );
++    } else {
++      pop3Res.setOption( "Port", 110 );
++    }
++
++    stage = 2;
++    setup();
++  } else {
++    var smtp = SetupManager.createTransport( "smtp" );
++    smtp.setName( page.widget().outgoingAddress.text.trim() );
++    smtp.setHost( page.widget().outgoingAddress.text.trim() );
++    if ( arg == "ssl" ) {
++      smtp.setEncryption( "SSL" );
++    } else if ( arg == "tls" ) {
++      smtp.setEncryption( "TLS" );
++    } else {
++      smtp.setEncryption( "None" );
++    }
++    smtp.setUsername( page.widget().userName.text );
++    smtp.setPassword( SetupManager.password() );
++    SetupManager.execute();
++  }
++}
+ 
+-  SetupManager.execute();
++try {
++  ServerTest.testFail.connect( testResultFail );
++  ServerTest.testResult.connect( testOk );
++  page.widget().incommingAddress.textChanged.connect( validateInput );
++  page.pageLeftNext.connect( setup );
++} catch ( e ) {
++  print( e );
+ }
+ 
+-page.widget().incommingAddress.textChanged.connect( serverChanged );
+-page.pageLeftNext.connect( setup );
+ validateInput();
+-- 
+GitLab
+
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.04.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r1.ebuild
index 269dc680bd4e..6fb5200ce177 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-21.04.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.84.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -19,7 +19,7 @@ SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 # TODO kolab
 RDEPEND="
@@ -80,6 +80,8 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="dev-libs/libxslt"
 
+PATCHES=( "${FILESDIR}"/${P}-CVE-2020-15954.patch ) # bug 734126
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index 460b47f01e50..2bb3511d78c1 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
-DIST kdesdk-kioslaves-21.04.3.tar.xz 38424 BLAKE2B 02e24505e22e8e5cbe965302ba51ea3d174f1220b5d779416f267dbebd2c2b0207dc06fd0602669845d803d657c985b8662ba67dab4e434599fe7c2b61525058 SHA512 f0e6354b1bf5fa0dc851e7a90b71a548790903484dcbb7b31b419d33e203ba7f6e8a632ba96c3131a4996b0553bce66d5ba945ade6820c78d7ae6a7495460a3f
 DIST kdesdk-kioslaves-21.08.3.tar.xz 39144 BLAKE2B 1af82fd6403635464959287b031087561fa807bda34f25d595c09ba7b3c2d1042ea9b52e9da31a4cfa7d56ae47a71ba9fb3db5b876bf4f24a3eaef51fae42269 SHA512 318787a06b14bb4cd6021c035872f1c5cf6a49e5794185c16c6f1351f9627b129eefba92f30b880f8b973a6665618025e0d84331b926e50b74342549ea07308b
-EBUILD kdesdk-kioslaves-21.04.3.ebuild 422 BLAKE2B 1f4d40b2a3eb684e934eede233879089380f968d0135c444830ce0d339cba237113ba09b8487fee3e945f2b70e357f8d7f2f8440326039a778a1c008cfcda52f SHA512 568d2afdbb252413edfb6f19b7cd445a8f9827c01bef2848cc010e3f70b787b8456a938056fc782e34f53c5de20fb6f82c99633f427464a942a363fe1b07119e
-EBUILD kdesdk-kioslaves-21.08.3.ebuild 432 BLAKE2B d0ad02f596b6521bac4290b5909b1042ebf5f4494351a2caac947260e6632766f8b76c2f8183c4b2b0a0eac03773eaddf53ff8dbce5ca864f2038c180f8f2ecb SHA512 586747817ffea96569d7b58c1b36a0419d95ca7cabb5e0448e0b40c95428d28d9c52fba3afa0ceda1150fbd2bc9185ee413bf3267849526cc36fa385545894c3
+DIST kdesdk-kioslaves-21.11.90.tar.xz 39056 BLAKE2B f19dd3057d71cab04490f12a91185522eedfa0d17d4806839e3494fb9a9265bbb7aba77d6210c633c8eead28ccff144222286d1972acf43c025cb58b67eb2f43 SHA512 2c41b3130d3ec0e5c38985bbe8e93cbcb92a63b2c6a1e5bba2f5c56a0b560f867b45982c9804c48dea7e78bb65b2657576c62d11719166db4c1dc0688d121a8e
+EBUILD kdesdk-kioslaves-21.08.3.ebuild 429 BLAKE2B b4df7792bcf72f7d6aea8518a522beefb51843cb61663c6f65a43ea5330c391b4d08ce78eac4c37b886a94974f459f49498f6c4fff0ee9610d9826091b921271 SHA512 c0f5eb6871abc5b6128fe46acc19a0b3870ba2664dfd8e55f02eab9c4c4f9de48df2938748f2373f099abc83463253f6a7d53099b632d52500c87fbb4dd5d769
+EBUILD kdesdk-kioslaves-21.11.90.ebuild 432 BLAKE2B d6a37e6e2dd4866ba358b73a8c3063af3925f6289c337c61756ae5f58c0be569dc4bcb3e2b06359a5cdfc064d431a94070bb6acad4fafbec39aa756a4321b856 SHA512 a242431357973c5249af7c868adf2266d20353c738aa0d99823be98005a61b58fe0bc50e1b0268f4b9064644ba2342a950f0d6880c3d79b6081ef7891285d9ed
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.08.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.08.3.ebuild
index 78fc5dba3ce3..79a9e926e8aa 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.08.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.08.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="kioslaves from kdesdk package"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.04.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.11.90.ebuild
index 733e4364b141..b291fc49e00c 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.04.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.11.90.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 inherit ecm kde.org
 
 DESCRIPTION="kioslaves from kdesdk package"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index cffb21832d86..83e1e0f442a1 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdesdk-meta-21.04.3.ebuild 1080 BLAKE2B e120cd648304038f1cf119bad0702528f083450e5f0a932fafe340e7f70a61ad64a56b4ed266d713578fc46038ef20c17692a15b678488fc11c60c898281a9df SHA512 56f8338b8724ca941903c306a21f1034789dc9aab8630de4c2d95578d01a6e1a08c24f1a60aa0cd555f0481072a4ae51c2d056185c62de9e1475b8ca9d400cc6
-EBUILD kdesdk-meta-21.08.3.ebuild 1083 BLAKE2B 40d8d29318c2612b65eb3d4556e3433f43d34892ba09bc9391fcca1a3503bfef4e8437981c2aa2e9089f822fb5c9b5c82e43a91199f163a0f032b7416801d3cb SHA512 9d551d1c1f0a5c64610c16008e99db696fc531fbcfb60def66730d35066baad9f11d5d06af8218ab2f34834ca5d283b71b04280dcb9b60c38d32978416ae3a48
-MISC metadata.xml 763 BLAKE2B 7e590fcaeab3ef36c0a55ed40ac0262499b6c28579406a778c0508f250a6be62dac05aaf9ade2f3a76c494cb595994ae07e30d3cb5b9e1661e9256a241f04a33 SHA512 ab42d1e5cce8abd8b88dad80ed3c23717b90059a63abbed00843ab749efa28ea8079ff780e3a2ab75fc47222fa458ada4f3ec4b7faec9a6897999654d0eb87dc
+EBUILD kdesdk-meta-21.08.3.ebuild 1080 BLAKE2B 680741bc479e7a514216d1ea9380b0d5494af1b3183a8397881206228faf6f31d1844af4ad0a9b0d199b5d1c228cd2a0ff21951e25582d1068df51beca45dd70 SHA512 4e5e948901eaedd0741e4629f60a3a22239809a942061a7fad29cf4cddb251baf9712bf81f1b8fe08c7fde7ded345ae9755eadd9a4d0672b1875bee6f03b778c
+EBUILD kdesdk-meta-21.11.90.ebuild 1254 BLAKE2B 2ad119c34cb19d6d654f0d018b26b0a88b6ca45e1d867ea4f9cef8835d184b604b5ede77c15f8ce29d9fbd7661f8a385074e657d9132ab5dbe4a123c4a7090e9 SHA512 9223d6e286069b45f2746f0413f525be9c25a9ae13b0ce9138e1dc44b0617f7469a0cf1f5daa4144ddfeb29b99ea27f68825d05224a588c4d7cb17c772fee99c
+MISC metadata.xml 872 BLAKE2B c9da9727644c8b008fa18846ffabcc3942ee38adf9b81eb3d29c492565b558a092a163d0e3944e13db314a997af75578d6eff1e22bb3670defe07d012694ecf9 SHA512 c8a7acb4b1b9022aa89fc1ad0bed5a84896194794d50737b13480dba049a8d9b57cba17fadca2c2cb8f67b7e8f609c7a1328fd1ca30ab2ad0c5826f5b2e1d51d
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-21.08.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-21.08.3.ebuild
index 5b0a5e0eae0c..25a85cf29ad0 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-21.08.3.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/development/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="cvs git mercurial python ruby subversion"
 
 RDEPEND="
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-21.04.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-21.11.90.ebuild
index f3dacde76931..c74b783f38f1 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-21.04.3.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-21.11.90.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
 HOMEPAGE="https://apps.kde.org/development/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="cvs git mercurial python ruby subversion"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cvs git mercurial php python ruby subversion webengine"
 
 RDEPEND="
 	>=kde-apps/kapptemplate-${PV}:${SLOT}
@@ -28,4 +28,9 @@ RDEPEND="
 	python? ( >=kde-apps/lokalize-${PV}:${SLOT} )
 	ruby? ( >=kde-apps/kross-interpreters-${PV}:${SLOT} )
 	subversion? ( >=kde-apps/dolphin-plugins-subversion-${PV}:${SLOT} )
+	webengine? (
+		>=dev-util/kdevelop-${PV}:${SLOT}
+		php? ( >=dev-util/kdevelop-php-${PV}:${SLOT} )
+		python? ( >=dev-util/kdevelop-python-${PV}:${SLOT} )
+	)
 "
diff --git a/kde-apps/kdesdk-meta/metadata.xml b/kde-apps/kdesdk-meta/metadata.xml
index e85d4c4bef8f..c7d537c9154e 100644
--- a/kde-apps/kdesdk-meta/metadata.xml
+++ b/kde-apps/kdesdk-meta/metadata.xml
@@ -12,5 +12,6 @@
 		<flag name="git">Enable support for Git VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-git</pkg></flag>
 		<flag name="mercurial">Enable support for Mercurial VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-mercurial</pkg></flag>
 		<flag name="subversion">Enable support for Apache Subversion VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-subversion</pkg></flag>
+		<flag name="webengine">Enable <pkg>dev-util/kdevelop</pkg>, requiring <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index bc13bf0040bb..6c25fc3c12c5 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
-DIST kdesdk-thumbnailers-21.04.3.tar.xz 17872 BLAKE2B 88b7a166855708e0ca70460d4c2886cb2f8dadf3d4bbd7caa7947987764a5830e43aa473c43d7a540efa10eb1ef8600e034178d53902e68437c72199118ce130 SHA512 bb23b8ba412919e926d07bb3ad0546d8b9828617de01e1922c694e1886f9cc7ace096367beaca1487c1f91b178ab2503955d985debbd98c0fa388fe29326789e
 DIST kdesdk-thumbnailers-21.08.3.tar.xz 26084 BLAKE2B 9d46afee2160300b36a48e388bba4c2900d71512f7e55454130a3abefa317efd3fdc36b5f24edcd2c2823948d722a3fff06cd58faf93008554a0522625d3df21 SHA512 2b50d1dc391e2585bad3b2b97b93738a1945b0e36b49ae6d5fef8124c6bb0fa66d1c4d72d9bd577737a13777247f787a8fdb71e2897da0e0e08b73e7125c45b0
-EBUILD kdesdk-thumbnailers-21.04.3.ebuild 540 BLAKE2B 61e01ee4f62b86f3ea0cdf08177409475aa894076424a7fd4e179865855f96cd8db6168f453bf20203c47c7cbd17f14beee3f38a6f6453b3b74be035c71808dd SHA512 da0ad9755b59c9b64ef6fc35412ede18c2cf0f8bf7335e1cc986745671795c632dd65d3dd01e9ad0ed972f52333524e193cc1077553cc69352880b41d1cc7fd9
-EBUILD kdesdk-thumbnailers-21.08.3.ebuild 550 BLAKE2B 7a49987b2222b3692e12df214c34af7d15c990147f883cbaa8f24ae0027525ef873110bebdd34f36123014f9151e923f3ae5f2074c216810fd47b861b35419f5 SHA512 cda9d2be598cb2a65b25a284a7884456510b6e1ce271cc25e023a429ef11ee920158840a036d0c5dbac07e88e22cc4bca8f70e6a04436ebcbf05a99d797b9309
+DIST kdesdk-thumbnailers-21.11.90.tar.xz 26016 BLAKE2B 0c359c7aaa205c5a1f9dc01cbac3d9a8348e0982ffe43e44c0b1edca03552ec2363c44f34cc7d4c03dcc99d4c06a70cb9642d1fef10e1ab8cb2df179a4e6e2e9 SHA512 13c57d5eb0c125e9f5998a2c4142dbb410ad31094664b93d7c267689a769f4f85440b818b6e59a728c1137e6f38c0c3d6750806fe924fde4c510d34fe31ce793
+EBUILD kdesdk-thumbnailers-21.08.3.ebuild 547 BLAKE2B e5553593c2ebbfe30d2bbc438cc0f301747ccdd1929bd419c9636b86d7a67916b1532292ee62fec4c92c4ac28f5a135be8b2602435cbade694918875fe1b6c7f SHA512 39402efeee819fecd576e5ef5f2abf6c2b146f1206a73bd23258ec2442147e13f9fe87d7b57158b141921cf760632eebbc39709fd51923a3d70884f85b7d2fc1
+EBUILD kdesdk-thumbnailers-21.11.90.ebuild 550 BLAKE2B a0dfac59c2086a03ecfb75b3300eaa047ddf9ab24fe4a48ff48388ae38d9e91fdbb1a0d8513c9c0ea4645c7c9fcbd2887d1494ed930e936f1c9b693fb51959ec SHA512 07740a815a6df27933665ec959505a908af546ef6369a0dbe954a6d048d23e87e17a8ca45d010325162f1a2a88cc24eccc5cf9bffb61ff0fa8027169f8d7bd6d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.08.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.08.3.ebuild
index 8e346c2a2b56..5937cd9d4c03 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.08.3.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Thumbnail generator for PO files"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.04.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.11.90.ebuild
index 8d893d6d8dde..99c21b38004d 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.04.3.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="Thumbnail generator for PO files"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index 1a02e1a6f0c4..dca12332d16b 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeutils-meta-21.04.3.ebuild 1367 BLAKE2B d24d95bdfb41526dd290b8a629333203fd0eebfe80bef4b78a920415b630c525c4f1ae8ddfe278f6c915af776f58f6fe515afe9513be8ba4a9ba94774dd8437e SHA512 5b5649e9fe80f71aac7b569cc9f25bec7c71f850205dc4205daa54a66dfdfd67d13de88437e71c78f76e4a909d786c78825e202a7fe139dc6be31035f274d3a7
-EBUILD kdeutils-meta-21.08.3.ebuild 1370 BLAKE2B 16a5e2adf3e76981e26ed26d8dafc262eb4fcfdb9d05fddc8a0943e1a4abe0227086cd4ead7f99f8a2e17135446eeef5372d78443923b94db4c1ad0edf447432 SHA512 f823386197fe6dc807b820a6ed36263f1d1de2321638c93485d31bc81c4fd25099fead9cd01ca7f8afd07a85897a85f280d8b09b2cf50896aef39e6965a6ee4d
+EBUILD kdeutils-meta-21.08.3.ebuild 1367 BLAKE2B e866956d8814a6ad516bb342a98003bf72d7a23b2b5e5ffa901f7a1a0834a5a902ac0d664730f67d6024c55bc0325ac796cf6c97ada5aba1319fd478919f3000 SHA512 04cee5ce995bf1a5339da09acd98887e308f661921e8f4ba54d49b6b4b887eccafbc731a926ccc68eafa9b410bc2676683ee4930d6d85433c34ae5c9e44652ac
+EBUILD kdeutils-meta-21.11.90.ebuild 1372 BLAKE2B d3162684f2cd4c51449108a3788d410cfccb07e4ba7160e202172d8dba01a9bac834d6fdb2d69f27d92324b5d9e808ebfc564ce8a2486c525215f7a956bada2e SHA512 b67ff35cb893a7d8aec299e7a26871577b17a6c699672450bdbf5934e65ea2331f15b5a0904e63607370a8bf14ef309137ef50f282308c39226d737d0d30406d
 MISC metadata.xml 1073 BLAKE2B cb3cb4c564b84d39f573e505733cf04c800ab5f5b6f1434a2f257fb78753f1f722070ac49cbb8e10717f7cfb87f836cd376c0dec5bf9b954ec2a7a4fbfc6e8d7 SHA512 a6f6af742bf68a47648008bd669601cf504b5d9d0321fc81c44311cf04e338351470161d901733597f7530009f3426e98a3ec03dfa259a10ef2a1645867003e6
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-21.08.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-21.08.3.ebuild
index 6db816caa058..1a8a6f2dfb12 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-21.08.3.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/utilities/ https://utils.kde.org"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="7zip cups floppy gpg lrz rar +webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-21.04.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-21.11.90.ebuild
index ba64e719368b..07bfef1b4c98 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-21.04.3.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-21.11.90.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
 HOMEPAGE="https://apps.kde.org/utilities/ https://utils.kde.org"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="7zip cups floppy gpg lrz rar +webengine"
 
 RDEPEND="
@@ -31,7 +31,7 @@ RDEPEND="
 	>=sys-libs/kpmcore-${PV}:${SLOT}
 	cups? ( >=kde-apps/print-manager-${PV}:${SLOT} )
 	floppy? ( >=kde-apps/kfloppy-${PV}:${SLOT} )
-	gpg? ( >=kde-apps/kgpg-${PV}:${SLOT} )
+	gpg? ( >=kde-apps/kgpg-21.08.3:${SLOT} )
 	webengine? ( >=kde-apps/kimagemapeditor-${PV}:${SLOT} )
 "
 # Optional runtime deps: kde-apps/ark
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 57d41fbdfaf3..e0454a033c04 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
-DIST kdf-21.04.3.tar.xz 472424 BLAKE2B a11b644ed4b4cd3ce841412d0b1d65eb2d5a863936b0b7d6cecb42beb1d1e2db2dbbe7d029a75cd72b81451040471b74cf526c4c657668a75b78f5bb28d2fa23 SHA512 985ec37fade53297e8bbe03aae78a560ec1f69e0c1b093c431e249de340e14e0f372bfe51d15dfdb4c7e0f4fadf3e81aa0b53a6649ce5ce891a837f96fe9e755
 DIST kdf-21.08.3.tar.xz 473076 BLAKE2B 9975ba64c59a7599ca6d419ebcdac75a25aa4df9d9b025f7e2e388126c9bd6e8f55efe47b1be357878a1841b64b67f3e9a6df8a9014acd7167dba01a536d2399 SHA512 ed27320f2d71687c01e9ec2eb077e0a5d58ba2771a8a3290b412ce667bb9d9e2898e1c52b561af045088c067c0ba79092df17c1de325816a90f05ddf961d5e56
-EBUILD kdf-21.04.3.ebuild 911 BLAKE2B b319dce8fc413605fc509292675ba1536be6c0a8c60d6be33a01062a8d5e899e71e55c7bb3e466ae1f62c606416155957e960160999cd013ad06fb6f2278d784 SHA512 5bc08a1ec0f9d81deb3e9fb72a1a6536c6e7220ae9928f99e69b51e01c748de32150d6bb5547add4321befaa23da2cbeceac93998b8f337ff30d49b6d23238dc
-EBUILD kdf-21.08.3.ebuild 921 BLAKE2B 6728ea3458570cd0152cd6597c340617dd1c63a2438799a8ab179db70a473be19610aa8f5f13dde0cd719119137e26ad4299157c0ec4cd0f34e3cc64d84db00d SHA512 1e0a0bfece7cdbc70ff4074668f58d9a9dfaa09d03b8919182af7d4e79674ea441c56e11fef7d877a6c1a39c0a83939db4e73916f645b5729962adbdceb981d4
+DIST kdf-21.11.90.tar.xz 474824 BLAKE2B 09dd52565dfa5e71356b74610659ce15d3375d70418dfcdff38bb4637a5f3d56a74c83e8be68454756e50e1ec494ac1d7e1c86d426151b78b43590e2408fb79e SHA512 618012a1dd3c4a738c6cb3bbbff92bef1c8af7d71c901a12f0983c6882f121bf8b606361346e94501bb6b6e14f8e50201c7b31ee581042dde1d96a64d98eaeca
+EBUILD kdf-21.08.3.ebuild 918 BLAKE2B 1e749fb1283eede099333f837f5255fb3d02edf3efc5deefa4bfdb55e0e73ca285d9edc56d007e3de6a646c5832c45e36f096e17da1ac3753848b180f3fec75c SHA512 dec44354c3174c366d19d958b88c7cb58ea1d1edef9ae06479db2b1bcf072b9eee7e2ff3bf2a86a72504229750b0dbd3b8720d47cdffd9e321125346f2cca254
+EBUILD kdf-21.11.90.ebuild 921 BLAKE2B 0748ea835d43fb3dbd0aa387ea4e4bfd469cd229080c38951938c37c1f90b7b98dd156dd04ded6a11268b8b1192ce162669804c65dfa07bff96d8cb62e089362 SHA512 7fed8e90bcbf80fca0311b8e0136390d172a5aec05b790417dbacead147c654708daee62534a7c1d0be323d7d83115a4a5617e6987f7804375ae61e2382b4040
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdf/kdf-21.08.3.ebuild b/kde-apps/kdf/kdf-21.08.3.ebuild
index 68193da5f072..b59cc46a00b9 100644
--- a/kde-apps/kdf/kdf-21.08.3.ebuild
+++ b/kde-apps/kdf/kdf-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdf/ https://utils.kde.org/projects/kdf/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdf/kdf-21.04.3.ebuild b/kde-apps/kdf/kdf-21.11.90.ebuild
index 30c21b48edff..97c98e0a7197 100644
--- a/kde-apps/kdf/kdf-21.04.3.ebuild
+++ b/kde-apps/kdf/kdf-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdf/ https://utils.kde.org/projects/kdf/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index d81e01df7b6d..76532dabde75 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
-DIST kdialog-21.04.3.tar.xz 114572 BLAKE2B c983944e77e92b6a2f4794294533e8276460fd229b64321fed49b45e69622eb2f11c5eb2a212e6882dd72ea656a476f37573c31e146843298b485bcd36beee50 SHA512 019dd95dd56881eb84f3187fe623e55df947f2ec61eccd57bf2731001f7e7594234b2a800cbc09526bafafc8b2fa78c29a445b578e52c7405936f2eb1bc4dfb2
 DIST kdialog-21.08.3.tar.xz 115448 BLAKE2B c39e565b066d6cc632fb48efd956775f8720aa99d558b0ca72c93053d0ccf07986e00de4045df24e7224825d5aa47f138d7fa451c73c1436c302445361cb4f68 SHA512 4effa107d69b69cf908b3e9e8952aad8f9d39e452f5c8ecd6be6064018464f3976ba2ec1ab757aa6edca94991c6420928170ab5fd90a9424324056f31be9c1d4
-EBUILD kdialog-21.04.3.ebuild 1036 BLAKE2B 4cf4bf0fb51a2c1fb6bb79f7a5fe0aa1b5066bbbfa0197e48c3cc9e49f6fc7356a970aa7b74fcd907d709ce33b72c9280cd3a3014ced16ba15974dd73a9d8fb5 SHA512 8053eeb38e00b80e05a4e3ce6ffd1002d7e814c50f97e6936b623eb2c76851c10443f73f0bfff82422231a030f20653fccd317db09417a208337313dda955f39
-EBUILD kdialog-21.08.3.ebuild 1046 BLAKE2B baee83252efdc392b110ef31968ad7c22d557b57819998d96363ecb92b022f54792c134c9d9036fdd25beba18eea9502f9c4f5425d69db733b7588330469f2c5 SHA512 0d78e7a6086ec53c87f50977c5d3edfdd5d5c7789fb364519598e2828ff89131873e7d0d02f5b0c01773065ec1128bbb1ac3d4b61c0c2c01fa6fbdcfea99ec38
+DIST kdialog-21.11.90.tar.xz 116388 BLAKE2B 22ec6a4ccb24a676583ccf23d5260d044e023563f875a901a07e31671d76c9f7c9b1aec6175e36ec7ccc844374adcf580c27e4a804660470719d66c1ca765de3 SHA512 8798a5f107e693293d03ba00043f2dba2c5d8a15c724b84fd6b4c68712610604c53f22723590e25a68bf33ea595f0a9e0d25dee86f1f25a5abc710f79584ca91
+EBUILD kdialog-21.08.3.ebuild 1043 BLAKE2B d848346303fdb51ab0b7fc0cd7e266cd42fea505f85a6025d8d29a11ef12a0212308395df76aa67354e5ab31e8f5c800e38a0276ad0a3b0eccc4264b2722dabc SHA512 044bf84960b314a1328fa299e48921f959c4bb73b359109e5788187c461e191c80c9c786cdf6e6f50ed23f26440c312f9fdf6827f5b3ddc63958d5f19967ac14
+EBUILD kdialog-21.11.90.ebuild 1046 BLAKE2B 7f24d0b063c110500dc03df2b1b62bdac680db2afdf413baa63c24a1706899711155400024220e7ffcc1cdc521a288e460d1fe6eb5c2562645438e1f083dca11 SHA512 db634a376d740e5405b8ad2d01c64cea19b49629e83687d9bf59ce9bc67d3f79d9041907c55d39510a57566d7c5bcef9482f4273141a6c6e48af774926498b2d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdialog/kdialog-21.08.3.ebuild b/kde-apps/kdialog/kdialog-21.08.3.ebuild
index 0ffc9c5756fa..1e5cb01526b3 100644
--- a/kde-apps/kdialog/kdialog-21.08.3.ebuild
+++ b/kde-apps/kdialog/kdialog-21.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kdialog/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kdialog/kdialog-21.04.3.ebuild b/kde-apps/kdialog/kdialog-21.11.90.ebuild
index 4265b1c174d8..4c9b9a226c91 100644
--- a/kde-apps/kdialog/kdialog-21.04.3.ebuild
+++ b/kde-apps/kdialog/kdialog-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kdialog/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 4142d2481757..335b7053617a 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,5 @@
-DIST kdiamond-21.04.3.tar.xz 4697872 BLAKE2B c7950cba2906649988fbad4dc34b670a39aba9dcd49f4087c9df41c7f85adec9ae5a44e82541d442a843765d312920f2119e45ae8be1000af1e63691158c227b SHA512 a4d3d308ba6529b3bad47cd9d4c916c0d4960e963d7fd9aaee95fdf2884fbcec7e5cb3c9c003b65e2441a8d5190efd05cdb6bae846efa9a4cf355fdd3de941df
 DIST kdiamond-21.08.3.tar.xz 4700076 BLAKE2B b9c4758d63f892c50966554fb59859d1132c3ed35dad7348939d2fdcc2d0753dcc364792b376b5b27fca993aa1c74a1c038be8dcd97d9791c6adb358b0ddd54d SHA512 13bfaf1b490d155a88c5f9a88e6fb371398a3e7784c3e1cd42d3d40725a4ef241749a33e3cb97fe72a1865bdc37a81fa4e50d9b5fc095a4a88ea022dc7199ad4
-EBUILD kdiamond-21.04.3.ebuild 940 BLAKE2B 926c5b1a679aee6a778199e8aeec5f05c6ffe2b05b9358571904f3c0ec525f2d549afa0eb48daa98b6b708589cf6e3fa124eecbd4d8dcef02e4187bf7d9ab532 SHA512 2ffdf7625c93b1c3140acd9796e121938a730d9caf38757d8717afb6e603f5fa396ab91b543784d14f9902e82d8e30c1c3e06e7aa1ee088ba458b385ecb879cc
-EBUILD kdiamond-21.08.3.ebuild 950 BLAKE2B d39537e0ad308a7dab8735f7585f257be91649fdf4d43dc1db3ebed08417943ab8197b2ef707438b4979b69649081ddfefa82b094a8e6411f7206bcf05d0b2f0 SHA512 7e9e4580fa93892eeb707943a3b4a26df9e6886aa1afbd54fabcea6d8ce5db2e9eeb6016d4c58dc4b1d8d17c922479becb454ae4262c9b53b3e9437df33435b5
+DIST kdiamond-21.11.90.tar.xz 4700276 BLAKE2B 555ce8fc4d9c582e9ac1590273eb00484d1997e48122ec6331f22ec579b6d3fe39f07da77017b6aa73f1ece26df0bdc4eb2454663affe466cf1f6852b2bb3a9b SHA512 00710efdc9df047e852bbd74a1e1e0c698a6ba8922d6572a0152eae9ae8f4a80d45fa5037cc515cff5273869239c8d91e267bf940d127d897fd51bf8943ced43
+EBUILD kdiamond-21.08.3.ebuild 947 BLAKE2B 9dcf2a0444ddf4d436e67f726fc275ef5bde4daf96f677e6e3404c8037dd778859a21987ee95c6ba10f362d7f1f2441363e42309cf5ebae6d439a6c184d44167 SHA512 c2c2d7f56b770fd8eb328a505ee255f77e06c045623e8472b63f44f4778c038f8e6f4a31a20757db9e6eb56f0f07f8173f2d7a52e2a81f7caa13b3a0257f5e19
+EBUILD kdiamond-21.11.90.ebuild 950 BLAKE2B 8045522ac812010d00b9b47c23ddc6a1806b1d74dc72e7b458e601a858b9eeadeaa226191bd5be9700af02a39a8c574e0aeba29009c89e4ac11f78e290759c9f SHA512 cd6ac063d41898397c6305a3c7a0fa2395960661d0cae4ddeed12245617d23d498c6101f462f8f77dac6898193f2a597257b89cf11fbfa5440721c9d61674a9e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdiamond/kdiamond-21.08.3.ebuild b/kde-apps/kdiamond/kdiamond-21.08.3.ebuild
index b948bfd0117c..6e39a8cb96b9 100644
--- a/kde-apps/kdiamond/kdiamond-21.08.3.ebuild
+++ b/kde-apps/kdiamond/kdiamond-21.08.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kdiamond/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdiamond/kdiamond-21.04.3.ebuild b/kde-apps/kdiamond/kdiamond-21.11.90.ebuild
index 531d475495e3..5ad353e55d71 100644
--- a/kde-apps/kdiamond/kdiamond-21.04.3.ebuild
+++ b/kde-apps/kdiamond/kdiamond-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ https://games.kde.org/games/kdiamond/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 5fb3eec1b5f3..41e03a8a2d53 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
-DIST keditbookmarks-21.04.3.tar.xz 200720 BLAKE2B a8e5ba51e7c602a3792f13a999e353875577553a3844f3871cb40f89f0c0b35d3d32bc84b9b1bfbbf16743d32ce05cb50a87ddcbcab6bf7b6e24e5d597a259bf SHA512 1467e909cabeec95e235317333b601731daf44866df4106e06dca02c41b647527552e7307bd8ec0762fc2cf31d21a40dd7592ce9f64f8628cd89a886ee292b13
 DIST keditbookmarks-21.08.3.tar.xz 202384 BLAKE2B 465089f51151aa09af8f1a0f38ecf01ed98ed8f47a8ba609f1a69d7441f1cdd68b27763ac4fafbabdad612662a8b74f5486a3ed0c3b8d94648ef55318b54c794 SHA512 71dfdec9dafbeba71ba7b1f2abbd1a89dc88a9ea56bfd06862da52e33c40913c161a16698dc2a52802b0bf9d3e54023456f13fd0c2c85c93ecb5afe916123255
-EBUILD keditbookmarks-21.04.3.ebuild 1162 BLAKE2B 4d3a7647dbdb9bd2393339c9311a2660d974d0f911e61222cc1f90d9d9ee4ce682422dbcd6d058168ea4ecc298b208024830cdb46ad9a32edd66defb46d4c794 SHA512 8c5be01dfde4d91d43c36ac886aee2a7272c7462667a2fb334e9e8d9b1e4c54cf8d196e2c3f601c5274b5743a02215aba7ed1410a05e540c52288d24f78b8c88
-EBUILD keditbookmarks-21.08.3.ebuild 1172 BLAKE2B e690548fb864c0d406d8a21809a5572512c414d85f13e04d2d4c68ffd00bfb8ea32fa01d53edfbe2d7a762c2fea11a1590d6df9f96b85aaa7350df028c4d8e34 SHA512 2af38b274b41cc718641ee0d6912e023bb2379ca35d3be3e4436aceaff7cad88d6dde77ec944ec6b735e2c9c89af80e2149ccad57b0dd7740aa172900e993aab
+DIST keditbookmarks-21.11.90.tar.xz 204024 BLAKE2B 103eeb6789f18718f31a5c1dbc78d16179af965b6633f4bf0af5e589fef08b961f1001def069f63e07bba46a4d289dfe443cd060b49befe175893e6a3bd6c651 SHA512 ae786e867c973b12d457a93fce288b1d87923dff313971e41178fc80f8b1177e7f8450295d37dc46ca2d47ccb44c4c5bcf48fe8e8dbe45cd0fa9ca15537ecc90
+EBUILD keditbookmarks-21.08.3.ebuild 1169 BLAKE2B 267c849e66f55f27baed7062101938dcb141f3eafebdd84a77ed9294983019a2368fb7f4f256dc8d159cc621de60c0c4af95f8836b3d7d27de0ab704029906f3 SHA512 12babd8617c45a765d819ecad0b2eda7abe5827edc3c6a381c891ed34bea0c23bc9253adc6ebc34d6f62474e71d4475a071a362efefe554457a2c306b9e8f5bb
+EBUILD keditbookmarks-21.11.90.ebuild 1172 BLAKE2B cddbefcefb7380db2e5db41e9756c46b3ec7a502d2019445959ab9fa0b48c4aa6c50c4c4cc4008db9d9e7c9370ba75f89bbd32437634f9e10a50166272f3411f SHA512 62800fb7e152894a0818614088c753275c64fa92051365545ff5053599d3bfdd5135b1483caa8534397430cdb0be7b330b16f895046277533e17aa3610d0a02f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/keditbookmarks/keditbookmarks-21.08.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-21.08.3.ebuild
index 020b658b1e53..97c9b865d047 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-21.08.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-21.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Bookmarks editor based on KDE Frameworks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+man"
 
 DEPEND="
diff --git a/kde-apps/keditbookmarks/keditbookmarks-21.04.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-21.11.90.ebuild
index 0c77d1fe68b1..7ff856a53e0e 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-21.04.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -14,7 +14,7 @@ DESCRIPTION="Bookmarks editor based on KDE Frameworks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+man"
 
 DEPEND="
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index d80fc932bb89..6d513acdc984 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,6 +1,5 @@
-AUX kfind-21.04.3-unused-dep.patch 9231 BLAKE2B 35c67d692f8920008758bf0b4a586c2cc711f8a819a7aea4f06e70cf7f4671ec7898701dc9dfeb6cbd84e0187ab05f4b9d77d38a2986d6474b2d44330e116a10 SHA512 5d80bd47d116199ab8138fcd53cbbc2f1ff992c6017d3e8d2c10696c7b4ad5db4a4a6b72984665309086bde791284725e8d44039838f57bd334c42208077d20e
-DIST kfind-21.04.3.tar.xz 284312 BLAKE2B dedca9757ccde97cc3446c73fa0acbf53303edd2f03be0ef236d12c833a10eb0a19bf138d209e85a8d1c50872bfb848758114f73f5da2e613c38b60a776ec1f5 SHA512 bfb985228e7fd96f6c88dff8792e64a1ccf9e999155acfce76de6cb434b02aab92bcb4c8473399a9de59049138809149f33b423bc46d47abc8b7ea4966bfd61c
 DIST kfind-21.08.3.tar.xz 286704 BLAKE2B 056ffd601b4093e08ad7494b6ddcce38f8a89000721ad014a73db98db2e032fdd29c613a308d5d18f3e0cdef7dd6ee83d7f81650119df75dfa7ae945f2daed82 SHA512 014455514d2da8d3fe4b1c2a348c73a6ad3ac1b7e125b9a57fc57df10ec3c4f3afd1b1998ad0025400ee7039bdbd695cbed04bf967d64e8b2ee33bf12679a933
-EBUILD kfind-21.04.3-r1.ebuild 1015 BLAKE2B 1400636cf99f44448fab80517704f614de197a5faf4e9fccb2fac978618f85ca4b52cc332294ef792114d5ea1332e6607d0f327e8073ad0d2e6c44637e840809 SHA512 8d78806d5e6cdc5b9399432d7ad22472cb943de63c817c0e5fe42dae4c45708026d3eb35017608b424c925558f43954c99545a01793daf873b50d09270689058
-EBUILD kfind-21.08.3.ebuild 976 BLAKE2B cee7589c954889176ca7ec63d17154ad11d33b803dd096975395c4f10a092674db19a2cf6407ba88f5d4eddbe8bda206608a04a8718646309f404aa359a36064 SHA512 429bca4aa29dacb4ede67d739230ccfdb0ea58a0e47eaf4d0afebcc216110d85d7a54f483e13851c230f93457c8281bf7a9ddbb56933de4595bf60741527bd2c
+DIST kfind-21.11.90.tar.xz 286772 BLAKE2B cd729299327fcd4d0d5fd2f57b94a24fb234c41f28baa03277472f4e790d6143ef186ebda74bdd10128e4ddd3929fc8482aa21416dae26d32f4c750c283d381b SHA512 a8403e15df97b25ca4c82418147b3f98e409a764f0293d0487644a9894d31e51702cd6dcecbc4ca96cce85551b997483d3a0f707438bdab1755c6a222769d892
+EBUILD kfind-21.08.3.ebuild 973 BLAKE2B 725f9b3c3f0cb1d9cad2dfb4706ea1aff3bf44abda8a3fa100b88785d17aaf6c9e90cf50605ff25eea3d29f603835b9db946074239ef45e7fb67764d431db41c SHA512 2b72ac81f1c947c981f90d7864a90764c0fb580d489c46382461fc507fc2a7b09cb6e79ff4eeee090aef09bb3b28b533c4230456b1e99213207b2dd7aea56ddf
+EBUILD kfind-21.11.90.ebuild 976 BLAKE2B c59818feeb4cbbcd2b46822c62b939b3ee4c19655aa302afea25031d61a0effcb867d0391c8e563f4d603f68cce875f75920b7afa9e7de5c0702fc2f2d649b43 SHA512 f748ee839a4e43b4ddb119d79bc3e4d0cfa54e0a3aa9ec4649d02acf8bdae4f7bbdb251b7f3db2508e821ac87cf94c590d5b638f84e852a93e44b6c8fee512f0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch b/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch
deleted file mode 100644
index f348bf39b5d6..000000000000
--- a/kde-apps/kfind/files/kfind-21.04.3-unused-dep.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-From b23e8823d7c950b43259b8750f0d14c19fa5f31c Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Sat, 22 May 2021 07:15:04 +0200
-Subject: [PATCH] Clean up defunct KRegExpEditorInterface code
-
-This code is deprecated, defunct and partly commented out for years.
----
- CMakeLists.txt     |  1 -
- src/CMakeLists.txt |  1 -
- src/kftabdlg.cpp   | 48 +---------------------------------------------
- src/kftabdlg.h     |  4 ----
- src/kquery.cpp     | 31 +++++++-----------------------
- src/kquery.h       |  3 +--
- 6 files changed, 9 insertions(+), 79 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4587dd278..1c867f5b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38,7 +38,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     FileMetaData
-     I18n
-     KIO
--    TextWidgets
-     WidgetsAddons
- )
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 97d81a963..d24b5f4b0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -22,7 +22,6 @@ KF5::CoreAddons
- KF5::FileMetaData
- KF5::I18n
- KF5::KIOWidgets
--KF5::TextWidgets
- KF5::WidgetsAddons
- KF5::XmlGui
- )
-diff --git a/src/kftabdlg.cpp b/src/kftabdlg.cpp
-index ddb9c7be0..f2c6cbf7a 100644
---- a/src/kftabdlg.cpp
-+++ b/src/kftabdlg.cpp
-@@ -29,8 +29,6 @@
- #include <KLineEdit>
- #include <KLocalizedString>
- #include <KMessageBox>
--#include <KRegExpEditorInterface>
--#include <KServiceTypeTrader>
- #include <KSharedConfig>
- #include <KShell>
- #include <KUrlComboBox>
-@@ -55,7 +53,6 @@ struct MimeTypes
- 
- KfindTabWidget::KfindTabWidget(QWidget *parent)
-     : QTabWidget(parent)
--    , regExpDialog(nullptr)
- {
-     // This validator will be used for all numeric edit fields
-     //KDigitValidator *digitV = new KDigitValidator(this);
-@@ -307,7 +304,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
- 
-     caseContextCb = new QCheckBox(i18n("Case s&ensitive"), pages[2]);
-     binaryContextCb = new QCheckBox(i18n("Include &binary files"), pages[2]);
--    regexpContentCb = new QCheckBox(i18n("Regular e&xpression"), pages[2]);
- 
-     const QString binaryTooltip
-         = i18n("<qt>This lets you search in any type of file, "
-@@ -315,13 +311,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
-                "program files and images).</qt>");
-     binaryContextCb->setToolTip(binaryTooltip);
- 
--    QPushButton *editRegExp = nullptr;
--    if (!KServiceTypeTrader::self()->query(QStringLiteral("KRegExpEditor/KRegExpEditor")).isEmpty()) {
--        // The editor is available, so lets use it.
--        editRegExp = new QPushButton(i18n("&Edit..."), pages[2]);
--        editRegExp->setObjectName(QStringLiteral("editRegExp"));
--    }
--
-     metainfokeyEdit = new KLineEdit(pages[2]);
-     metainfoEdit = new KLineEdit(pages[2]);
-     QLabel *textMetaInfo = new QLabel(i18nc("as in search for", "fo&r:"), pages[2]);
-@@ -387,15 +376,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
-         watcher->deleteLater();
-     });
- 
--    if (editRegExp) {
--        // The editor was available, so lets use it.
--        connect(regexpContentCb, &QCheckBox::toggled, editRegExp, &QPushButton::setEnabled);
--        editRegExp->setEnabled(false);
--        connect(editRegExp, &QPushButton::clicked, this, &KfindTabWidget::slotEditRegExp);
--    } else {
--        regexpContentCb->hide();
--    }
--
-     // Layout
-     tmp = sizeEdit->fontMetrics().boundingRect(QStringLiteral(" 00000 ")).width();
-     sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height());
-@@ -405,7 +385,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
-     grid2->addWidget(textL, 1, 0);
-     grid2->addWidget(typeBox, 0, 1, 1, 3);
-     grid2->addWidget(textEdit, 1, 1, 1, 3);
--    grid2->addWidget(regexpContentCb, 2, 2);
-     grid2->addWidget(caseContextCb, 2, 1);
-     grid2->addWidget(binaryContextCb, 3, 1);
- 
-@@ -416,11 +395,6 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
- 
-     metainfokeyEdit->setText(QStringLiteral("*"));
- 
--    if (editRegExp) {
--        // The editor was available, so lets use it.
--        grid2->addWidget(editRegExp, 2, 3);
--    }
--
-     addTab(pages[0], i18n("Name/&Location"));
-     addTab(pages[2], i18nc("tab name: search by contents", "C&ontents"));
-     addTab(pages[1], i18n("&Properties"));
-@@ -532,25 +506,6 @@ void KfindTabWidget::loadHistory()
-     }
- }
- 
--void KfindTabWidget::slotEditRegExp()
--{
--#if 0
--    if (!regExpDialog) {
--        regExpDialog = KServiceTypeTrader::createInstanceFromQuery<QDialog>(QStringLiteral("KRegExpEditor/KRegExpEditor"), QString(), this);
--    }
--
--    KRegExpEditorInterface *iface = qobject_cast<KRegExpEditorInterface *>(regExpDialog);
--    if (!iface) {
--        return;
--    }
--
--    iface->setRegExp(textEdit->text());
--    if (regExpDialog->exec()) {
--        textEdit->setText(iface->regExp());
--    }
--#endif
--}
--
- void KfindTabWidget::setFocus()
- {
-     nameBox->setFocus();
-@@ -771,8 +726,7 @@ void KfindTabWidget::setQuery(KQuery *query)
- 
-     query->setShowHiddenFiles(hiddenFilesCb->isChecked());
- 
--    query->setContext(textEdit->text(), caseContextCb->isChecked(),
--                      binaryContextCb->isChecked(), regexpContentCb->isChecked());
-+    query->setContext(textEdit->text(), caseContextCb->isChecked(), binaryContextCb->isChecked());
- }
- 
- void KfindTabWidget::getDirectory()
-diff --git a/src/kftabdlg.h b/src/kftabdlg.h
-index e2a4912d6..336835a06 100644
---- a/src/kftabdlg.h
-+++ b/src/kftabdlg.h
-@@ -23,7 +23,6 @@ class QString;
- class QDate;
- class QRegExp;
- class KDateComboBox;
--class QDialog;
- class KComboBox;
- class QSpinBox;
- class QLabel;
-@@ -60,7 +59,6 @@ private Q_SLOTS:
-     void getDirectory();
-     void fixLayout();
-     void slotSizeBoxChanged(int);
--    void slotEditRegExp();
- 
- Q_SIGNALS:
-     void startSearch();
-@@ -112,8 +110,6 @@ private:
-     QSpinBox *sizeEdit;
-     QCheckBox *caseContextCb;
-     QCheckBox *binaryContextCb;
--    QCheckBox *regexpContentCb;
--    QDialog *regExpDialog;
- 
-     QUrl m_url;
- 
-diff --git a/src/kquery.cpp b/src/kquery.cpp
-index 91e45ed07..c6c7327bf 100644
---- a/src/kquery.cpp
-+++ b/src/kquery.cpp
-@@ -35,7 +35,6 @@ KQuery::KQuery(QObject *parent)
-     , m_recursive(false)
-     , m_casesensitive(false)
-     , m_search_binary(false)
--    , m_regexpForContent(false)
-     , m_useLocate(false)
-     , m_showHiddenFiles(false)
-     , job(nullptr)
-@@ -458,19 +457,11 @@ void KQuery::processQuery(const KFileItem &file)
-                 str.remove(xmlTags);
-             }
- 
--            if (m_regexpForContent) {
--                if (m_regexp.indexIn(str) >= 0) {
--                    matchingLine = QString::number(matchingLineNumber)+QStringLiteral(": ")+str.trimmed();
--                    found = true;
--                    break;
--                }
--            } else {
--                if (str.indexOf(m_context, 0, m_casesensitive ? Qt::CaseSensitive : Qt::CaseInsensitive) != -1) {
--                    matchingLine = QString::number(matchingLineNumber)+QStringLiteral(": ")+str.trimmed();
--                    found = true;
--                    break;
--                }
--            }
-+	if (str.indexOf(m_context, 0, m_casesensitive ? Qt::CaseSensitive : Qt::CaseInsensitive) != -1) {
-+	    matchingLine = QString::number(matchingLineNumber)+QStringLiteral(": ")+str.trimmed();
-+	    found = true;
-+	    break;
-+	}
-             qApp->processEvents();
-         }
- 
-@@ -484,25 +475,17 @@ void KQuery::processQuery(const KFileItem &file)
-     m_foundFilesList.append(QPair<KFileItem, QString>(file, matchingLine));
- }
- 
--void KQuery::setContext(const QString &context, bool casesensitive, bool search_binary, bool useRegexp)
-+void KQuery::setContext(const QString &context, bool casesensitive, bool search_binary)
- {
-     m_context = context;
-     m_casesensitive = casesensitive;
-     m_search_binary = search_binary;
--    m_regexpForContent = useRegexp;
--    if (!m_regexpForContent) {
--        m_regexp.setPatternSyntax(QRegExp::Wildcard);
--    } else {
--        m_regexp.setPatternSyntax(QRegExp::RegExp);
--    }
-+    m_regexp.setPatternSyntax(QRegExp::Wildcard);
-     if (casesensitive) {
-         m_regexp.setCaseSensitivity(Qt::CaseSensitive);
-     } else {
-         m_regexp.setCaseSensitivity(Qt::CaseInsensitive);
-     }
--    if (m_regexpForContent) {
--        m_regexp.setPattern(m_context);
--    }
- }
- 
- void KQuery::setMetaInfo(const QString &metainfo, const QString &metainfokey)
-diff --git a/src/kquery.h b/src/kquery.h
-index 285b37214..2e581765c 100644
---- a/src/kquery.h
-+++ b/src/kquery.h
-@@ -38,7 +38,7 @@ public:
-     void setPath(const QUrl &url);
-     void setFileType(int filetype);
-     void setMimeType(const QStringList &mimetype);
--    void setContext(const QString &context, bool casesensitive, bool search_binary, bool useRegexp);
-+    void setContext(const QString &context, bool casesensitive, bool search_binary);
-     void setUsername(const QString &username);
-     void setGroupname(const QString &groupname);
-     void setMetaInfo(const QString &metainfo, const QString &metainfokey);
-@@ -93,7 +93,6 @@ private:
-     QString m_metainfokey;
-     bool m_casesensitive;
-     bool m_search_binary;
--    bool m_regexpForContent;
-     bool m_useLocate;
-     bool m_showHiddenFiles;
-     QByteArray bufferLocate;
--- 
-GitLab
-
diff --git a/kde-apps/kfind/kfind-21.08.3.ebuild b/kde-apps/kfind/kfind-21.08.3.ebuild
index 8f4c42fd9fa9..4209b7a3f664 100644
--- a/kde-apps/kfind/kfind-21.08.3.ebuild
+++ b/kde-apps/kfind/kfind-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kfind/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kfind/kfind-21.04.3-r1.ebuild b/kde-apps/kfind/kfind-21.11.90.ebuild
index 072159c8561c..7d80d377e663 100644
--- a/kde-apps/kfind/kfind-21.04.3-r1.ebuild
+++ b/kde-apps/kfind/kfind-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kfind/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
@@ -35,5 +35,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
-
-PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 0aa419c929ec..c99a48948751 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
-DIST kfloppy-21.04.3.tar.xz 210652 BLAKE2B 0523382affe56fc7fa114222a4594d819fe613b7c80d0a6b80abc8ebe4c961dee830363cd9a6d20f32a435fd4e507d57936a5653338749a8f588771dcbb7a9f0 SHA512 daba93610e07a49487d1570b270846a942a4ddda363aa12ef93697816f08e8a60d66830cc8b520a86d27d45a8e8a951422c099dd6454cabacad305b5cc2664c3
 DIST kfloppy-21.08.3.tar.xz 211072 BLAKE2B d42f45a190bbb0af6e729e2a4361c4df94c2da7f475046d4fbc043043e6653d353e84342800405ff110b3119384d882a594c5a712ab35b5dcafd5be1a088a96d SHA512 78c56acbbe552adcc8802c27dfbaf64d61deb845c654b52316d760dd9bdee9c58baed3089a1af80ea01ac6eac6d02cf8a0579da6a124462f2266ed57dfe1b7d5
-EBUILD kfloppy-21.04.3.ebuild 871 BLAKE2B d73688c489f37efb5ae89f9aec3e69b4e44c10c0135963f2583bc92813c7543ae605bc13e4dd65d9d3947b7d77275d9a07da6cf8ee1b3b5ef13258414b47dd24 SHA512 7668922ea41f0e125ab110a140e21a5f877993624a27a966f04bf90e414afcb9147d90320b83ab5fe1fe4db5875f2366b2b7aa04a2ac00b8c651d5c6f1a52214
-EBUILD kfloppy-21.08.3.ebuild 881 BLAKE2B 6ea734a495c8e97b3b6a76df3d4623a236294c92b0e13f466f79fe496b01d64dedbe9028a855fcd3a2c6e3c74149d0ac3a8298ae56c295b876ce2d76ef0be285 SHA512 b02f13991d375c52fe3daf87c27bc3663b077347b66a5dd24c17ae423411379f0f868860d5c692371e0729b37b6a942ad58cc78e8092c7f3ad3cc5efc3a95761
+DIST kfloppy-21.11.90.tar.xz 213784 BLAKE2B 682a031ca756e2c522eb29c9963afabcbae2762aa11a1862b5b8a6108a7cc6e11d1fd07deb5392a9ac73cb2a89e4201f964d45da3d6109d3aab3442ab6a01298 SHA512 1ae60f487db55daf3124fee6b6d36307bb46f4f3ded3e247a323347b59d1acd59268e72095fec14be7e9cb1a3981443ab4eb04b0eadc3746fad6d01f1e3eb433
+EBUILD kfloppy-21.08.3.ebuild 878 BLAKE2B 0b9698c0b3c1c773a68de30dee68649563a621151240afa0cfb8b57cc44b3834506c604608211ce53e2f04a5f4f9121bf7c6a977d3aea6c5d2c60c39310c452c SHA512 742590394190a844a937d8f7743a5cd6761328287542c6ff4cd4000338987ae7d4475ef1b1eb9930d45ac7542e621809444f52e458c48a28e716309c6629f7db
+EBUILD kfloppy-21.11.90.ebuild 881 BLAKE2B 543d9baa0925bf25a8ae998275e1c6b510a193e72ceafe782dbf8114979e0bc900f4b4a79da09615178ee3e0b74ba61833108fd5dcb182001db43261d79ff5e7 SHA512 fc58dce97f4f114aa52de540e15d3dd260ec1228a3d412eb8ff1965e8b90f67203a33a4d59af0895a74a90e5d97041f36292fc609d24e5cd18ef8b7e8cb15598
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kfloppy/kfloppy-21.08.3.ebuild b/kde-apps/kfloppy/kfloppy-21.08.3.ebuild
index 09df0748eaee..ea90dfe274e9 100644
--- a/kde-apps/kfloppy/kfloppy-21.08.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-21.08.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/kfloppy/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfloppy/kfloppy-21.04.3.ebuild b/kde-apps/kfloppy/kfloppy-21.11.90.ebuild
index c5f696d84859..c2571cd95b38 100644
--- a/kde-apps/kfloppy/kfloppy-21.04.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/kfloppy/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index 6bdbf862f7ae..249ab2ee8d60 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
-DIST kfourinline-21.04.3.tar.xz 650648 BLAKE2B 1c1c43fa677a3c3ad4a84d877ea9a3f3db8f978104dcf696ecafcf80696f0835a8f40e41db8e7c1c650d0d1c3933e05d17c823153344cbd57dab8e14471934bf SHA512 29460df6c7f0529d4b82a1e30256bb5629bbeacabaa78b843837f6b4c084f07a9748ca8dd41e2a41acb3a5f81662ef224f0ed508714f9f4e53ca33bab64099fe
 DIST kfourinline-21.08.3.tar.xz 718836 BLAKE2B ede5443d80cc9148572bda4a9b7cc71c74de4bce242063ee2bd4e702bb6dbfbc644d610aabf6e69b0ee919e71f360a59fc60fa63724ae2e7f3d927049f2e2061 SHA512 fbf8548c236a8c59f60ae5083967c4d3ac11f25f8a203351883f441896c66918ce8b9dff3a8d9b58d553fddfda808c05b5cb197057e82d1c307974a9650c8d7d
-EBUILD kfourinline-21.04.3.ebuild 870 BLAKE2B 23e4502f592f2087613b4b97993b128b7538264544b4ca9e93f490f6a6d7d2b2c06bc9190b28fcc2d83de6abc0cfdbc06d4b4120e0f65dce0ca0dd570207b6f9 SHA512 0da7b244f50202cb6bd7efe3929c3e2606aea4ca40c888e200f1f407de20e249f69b56429804d04966205c5953b1833ed709ac44fb2d83219fd4f2b67734330e
-EBUILD kfourinline-21.08.3.ebuild 880 BLAKE2B a3df81978a2d54513d9ad8c9e1cd626ac18442befbba83fc5cb0843935b17018464068756f9adf0b691e77bc2b325a660a895a71890547a3d06c9b2434c61dfa SHA512 fa53181b10c1641b4b06b0f18dd2f0b042c7b04b81068f86c3c7ffc1e6250c4765b205cd0cead63b596d8b1d7f4e7a10e196e85af7be5a5354769a1968dcafa3
+DIST kfourinline-21.11.90.tar.xz 719032 BLAKE2B 25764efb7a43b72ed4a8c36f8437f6fb98f343603e526ac506454c78620aa212cc1cb2a53587dbd4bb6e592392af2f9cbe465dcf79cb02fdafa2ae56028e2587 SHA512 273f162e2d49fe0f50932bac9ac3491b326bd3756df91f980b60d66108134825682b157513f9e7e2f53ea18de83b6a54cb8d7ea2cc965caf4250373cf6dfa0f8
+EBUILD kfourinline-21.08.3.ebuild 877 BLAKE2B 1256924b9906489fa282c880937b0168f3b58f03ff49a672c917063abf69ed178bc1a5879396ceb0e4480786f3bd14b17c3b6ee3d21fbd1851ac4dc512826577 SHA512 fd0f01ef38f0bd363604dda84d692178c1921a1decb4068a4970806af8fa4ab4e0307d840e0aee2abdce466a9c7c6e40dbda763e0996356065467eb6e12f00a0
+EBUILD kfourinline-21.11.90.ebuild 880 BLAKE2B 46a42bb132ff794ebc6b20bfa2996a3c394792fa85e1e83c7116a5b50dfe87a88c427db2069d0a6a799b1d511396112ffdde0c1a91290c140e0cbb73ae201097 SHA512 fce9f1b81d3c179182f16e12a97eaed009b13ef3630c1f447325af8310d4b7b246516f46eae5a4cc12461048b5801cc3f666a04118c9c3f0d30172ca2c587e42
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kfourinline/kfourinline-21.08.3.ebuild b/kde-apps/kfourinline/kfourinline-21.08.3.ebuild
index 5226b86c1bb5..07f8ea579edd 100644
--- a/kde-apps/kfourinline/kfourinline-21.08.3.ebuild
+++ b/kde-apps/kfourinline/kfourinline-21.08.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kfourinline/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfourinline/kfourinline-21.04.3.ebuild b/kde-apps/kfourinline/kfourinline-21.11.90.ebuild
index 026f7352dfb7..43a0ad69ab83 100644
--- a/kde-apps/kfourinline/kfourinline-21.04.3.ebuild
+++ b/kde-apps/kfourinline/kfourinline-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ https://games.kde.org/games/kfourinline/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index af46c32e40cb..b3ccae8f8c95 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
-DIST kgeography-21.04.3.tar.xz 11001764 BLAKE2B d8836df12e469c5e3ffe8ce32956eb17bb51d4f6d0d9df4173e944edc7c0d1e0ce41b8ac67d5a0675d8b3244aab063adf91a193b8a27be909a2201215fbc811d SHA512 92be1d653d4b7019bff9018cc9bfe4550326ff4aebf1d63d5b5752cc6b0169d34a8613837ed7e8c27dca827cfa27ae1035de96a2dd1cf0346a3bd2aa4f0126f3
 DIST kgeography-21.08.3.tar.xz 11001792 BLAKE2B 606c3bd87ff28731337aea882add2a00ececf88d474950226f508a9cbd59e76287e1aaf6a5b5743c10a2f8543ec0ecaa303d9daa5d9beff0d32bdd99edce0f8c SHA512 d6e9fc6736082fcc79f7e7c442e8c331991f221b54849c13b050703fd4808d221d684c59d5f0d0e132525b3d9307964f43f62dc3ecbc6289916e7a528aa0db75
-EBUILD kgeography-21.04.3.ebuild 818 BLAKE2B e4d48800c3632d0781876dfc9b7f2d859ae4c8d0f31629985fee8b8926ed82838cfe765610eb6ebf1a87d9954e3cf78b906d06c156e566c9c234dc34d78f5c38 SHA512 2896c9ea08b2bd9d4da32c4a8caaf1571ab4fe205ca061fdd768d1da8cbb215734b2b877236b57800e00609feb2eedc1f391123989dac30ab5efa6ff22781664
-EBUILD kgeography-21.08.3.ebuild 828 BLAKE2B 89f72d8dc5dc96bd92a2d2cc75b73b527e43b9ef55dd76f65204fbe11713c4c2dc5d7e6ca6c7119ee8c79e9de62745b0bca9f4c54813b4c3cd16603604a862f5 SHA512 b871c2fdceddcbd590fb466f8616d9f088585a36d3e025c349abd218c46e46e0d385002eb8b25fe263d4611e1effbd811b84ef192d4dc09f93d13d5f0c7c58aa
+DIST kgeography-21.11.90.tar.xz 11089052 BLAKE2B aae1902f35e96bfd63cd6364442b03a8492a24d52d5b332f37f09fcfebd1ecd40de4f5a8a9f152efa5cfd38e47218b4038996f83ccd6635ea015f63d49c4c38c SHA512 31f066104833e6dd76a79c0a29afe1561d84e4bb5a8929c731b2d2b1e70e29e70f0d970b6f0674473f2a623d40e8297e989bae254851c70c3a772b78be0ef881
+EBUILD kgeography-21.08.3.ebuild 825 BLAKE2B b481d46d5a9ec8b60f32a4604945f78d9b859b7f4046d802bb85b22c652d155f19c79c76be9af59c803663b6fd0082948512d1ed71c77522fddb54e015a9ee60 SHA512 a882ac259d07e970b3ee05e55291c8ffa529b97ccd3aeb1f921946a37d12aac8e80923d0c1442030ec818dc9c0a7c9ed7cef144b346f0f31089281d613d2fa23
+EBUILD kgeography-21.11.90.ebuild 828 BLAKE2B 7b84fa80e394341802616ccc6ddf260c704ba6495d363cbb7dfb47116028f1b096e47f1e43ef05c8f2739610a7e2fa517186691428eee7d9b95998aa9d194f5c SHA512 a59396e28d33f64745d4ee20c0593980fc4243a18e9ade0745a447434ff70485c4632c7a1f2050dea845226e7d9f1e394b1ad74649aa424be00880309ed4b04c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kgeography/kgeography-21.08.3.ebuild b/kde-apps/kgeography/kgeography-21.08.3.ebuild
index 30ffea4f111c..a0663fb2fb47 100644
--- a/kde-apps/kgeography/kgeography-21.08.3.ebuild
+++ b/kde-apps/kgeography/kgeography-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kgeography/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgeography/kgeography-21.04.3.ebuild b/kde-apps/kgeography/kgeography-21.11.90.ebuild
index 69a5d32a550a..a7c0a5e6cc7d 100644
--- a/kde-apps/kgeography/kgeography-21.04.3.ebuild
+++ b/kde-apps/kgeography/kgeography-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kgeography/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 3f62df2daf5c..99fc7aede0cf 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
-DIST kget-21.04.3.tar.xz 5636204 BLAKE2B d0f5576ab4dd755825f4482de1ce3362197f24181e1e8c922acf039c6b72eb65f205658e34320645cc8a2f40e8e4f19cad09202bbdb478ffeb38ebbacc1c2a28 SHA512 58d2a18d7f918ac161cd19438a4aeeec86e0df85245903cc00fac1cdebe2dca6bf471d12f54301ff9b60899471726c3e410b870ef3aa251f3994e3ee1fb6d30d
 DIST kget-21.08.3.tar.xz 5634648 BLAKE2B 096171a0240d3aa5bbf7c1294542a560491c966090ce694f4b8d447e8d49ee5bb0fdefc064dd62fe9c19c195e0778c1a44c6804a3d2aea4d78f88d16a01a8f6e SHA512 54a529d5b8ac25b17448072a9c00bb73f287d8aabaa74273477d0f6de21e3419108cf118b4736a0010dcbebcb2718819c6df5cf62e73c8ee598b8e329d2c764e
-EBUILD kget-21.04.3.ebuild 2153 BLAKE2B 73938ee4a23987d5bf6d9b38a5e6116fe19b20e1bd3920c27e4dc001a77fb20d6700916479ae852925119275d69cd1447e9d78abfcbef426a00513841e7535e1 SHA512 f1f68145a3cb793f967fa23f9081cbbb7658ef5124b8352bd2ec99b93bd988f54a66ef26d545d68698f39ff9b81ec0c27d8f0dc5110063dd4d65b0fb320204d1
-EBUILD kget-21.08.3.ebuild 2174 BLAKE2B 15dfea689cd3669abc8ff899c9150b0d32091286ee0bb13b4f6e023ee15e77c31dcac88bf463c031a96e7be3eab5d76aab93aee99f5098fabf87e230c04694e2 SHA512 2c1bb3432da34f11cbd5a47796dd2ad2e67af4deee365a02a4e2e34f1cc3e943217943f44e3f27958b5f34b2fd26986581c5c6cb54b3419259edf258fa21a2a4
+DIST kget-21.11.90.tar.xz 5634612 BLAKE2B 840a04249144792e484288cdf42f686a2adab38cc9f46563dc11bca4036e7031c823278ad528c51d11909b1c6cc02c0cc0c9d7b0ca477ec0a32514051af103a4 SHA512 9ae00b9fe928b564e86ef1d4e660ec4b3c5d45c2e259e2b3b446082e3ce2ac38ac98824d799920fb76525e5cecf78ccf0c597b1bfd132154f76339ed90817ec1
+EBUILD kget-21.08.3.ebuild 2171 BLAKE2B eae9ddfbfe893909e78f7df3ccaf3fbf99dfa683e42a1999a9d15b70c1f84dee9b9959900941adc92d018e25eecb5aadb5baa328263a238258c7b95e0d6a28e0 SHA512 e814e62ccf582115e2a67049de64f139393673225244cc1019e1e93d973bf48b0ed1da3f12ff8cf7e46c6808b9b3d34b7d6f51e24b54b79e18033910701b48d5
+EBUILD kget-21.11.90.ebuild 2174 BLAKE2B dd03a00839abb72556ea050a7ced907824c05f48a090df1d65acc80c97a23ea1da367d476aa289ec3d2e5b6dac15536d573ae16815927a69df9ddca4f4d4718a SHA512 8a1808be0ce9cb15e00567ee0ea73f6a56a791b27efb4090a73b8d5586181f4e40dc69ec0b3824fe30a1b77880bd1aff0342cbcb93b24ad183a5c1a35b7e95f0
 MISC metadata.xml 644 BLAKE2B 1035e680d0837bafcb6d4fc1e3663d9f59e5804e9c42ded3bdb0669847dbb272f8505271335249b6539c93de0b4f8cc0de39fa2541724117106d78c5000db1bd SHA512 08cce2553d94bbc5094fcac0c9a6e0e188656732af8c8c787bea3bd775c3402d07f1ec21512ae91cf3b7bc4f579f731b9a0fcf9e1db63b0fe6e9d41f28a207fa
diff --git a/kde-apps/kget/kget-21.08.3.ebuild b/kde-apps/kget/kget-21.08.3.ebuild
index 2ce8d955424a..b2780ba12da2 100644
--- a/kde-apps/kget/kget-21.08.3.ebuild
+++ b/kde-apps/kget/kget-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kget/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="bittorrent gpg kde mms sqlite"
 
 RDEPEND="
diff --git a/kde-apps/kget/kget-21.04.3.ebuild b/kde-apps/kget/kget-21.11.90.ebuild
index 95d56a9de33b..06c96d2c6835 100644
--- a/kde-apps/kget/kget-21.04.3.ebuild
+++ b/kde-apps/kget/kget-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kget/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="bittorrent gpg kde mms sqlite"
 
 RDEPEND="
@@ -47,7 +47,7 @@ RDEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
-	bittorrent? ( net-libs/libktorrent:5 )
+	bittorrent? ( >=net-libs/libktorrent-21.07.80:5 )
 	gpg? ( app-crypt/gpgme[qt5] )
 	kde? ( kde-plasma/libkworkspace:5 )
 	mms? ( media-libs/libmms )
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index 92115901d320..d49da8a209bd 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
-DIST kgoldrunner-21.04.3.tar.xz 4488216 BLAKE2B 1ef7a78897181046fc7950c7e36f6e1791414299e7013b43480bc90a119eebff04f76d32543e2d903e1258a61cfe0770f06411ec842a4bc0c8e559e5dbb6219e SHA512 5a4dc8d12755cb7401b9d4588177dec5e8b21ebcff68857e4064c287571255e5e67af8b4996b7c81ab96cd56cb30d6ca25d36265c5c8fe6cd89724865251cdbc
 DIST kgoldrunner-21.08.3.tar.xz 4768676 BLAKE2B 8c4ae51682cb3c8e50fd810618289a1abc0294e6c6ff53c758680a9b8319d099cb8b524ada571ae5a85e89dc0050c3fc5ff208af5f4eca7470d02360f12477c6 SHA512 8c26ceb44f82a6467dbeab94959622ff06abd6adacb9434b49b4c4421c0f48e297633ca57582b1d42df154a86146aa946d7d1d19e62f20ff2f9a25cf1e1ca853
-EBUILD kgoldrunner-21.04.3.ebuild 996 BLAKE2B 7a0ebfac749d51b7ede9baca7756012a2390488d411a5e62c6953213bb810eb6eb71fd94edb5a7dde6edf9e61464676b8e8d435485d1da49d5b8c977f80934a9 SHA512 ffb68ca6817e1b0ab47aaffdb796ed97907aef46bf8c846de0a806c094a1527bc603f26fe178c5af8b23151817eae578418a81891acdbfb810c0c1b2e48051cb
-EBUILD kgoldrunner-21.08.3.ebuild 1006 BLAKE2B 1f018acdc74281dded412359f32e17751a2d163fee752f7e095591a0d51b98c2dc57e86289888455a6d5b8462aa22e966b3641fa7a66b8d66b2d4994aa17f83e SHA512 ea9e67e6b57a63b0434324b4cf22675297cc33820e3e2a959cf3a9ce6f391097f96f041b0a778969f4f97b5ef61a1ca37999a23931c472a96130581b185ce798
+DIST kgoldrunner-21.11.90.tar.xz 4768624 BLAKE2B 06dc780f862f829753d00b72081b0ab6958b6cd6c12d71871ff438a6fa52203117f245106a1ddda693b4495394f24ca9d7b5162b8e4aed68d31e5a04c8b2d692 SHA512 cf136b604329e02aeeeb0bd2e86ad2b62aa12e38e7d5d05dde4fb56f6dba8c3fcb5ad94656c9f00bc8c1a55b05c75cf28420e7bfe2a70d5f19c12d5a3ee96388
+EBUILD kgoldrunner-21.08.3.ebuild 1003 BLAKE2B d59e79ef07e8565584e4ee00cddc8af435c4e85ea47208270ada87b35257c8aa6383b95aac6965aecd808fe40889a9182aedfbd6319aea081c51534be69e49b6 SHA512 03f6d3188cc7a4d30413f4739bf7f2e213343ec90c092218c7e3770806494eeba2cdf1007b2b0118beee9df86f84ab6e11f75189e1724aa72a8e96103c4552f5
+EBUILD kgoldrunner-21.11.90.ebuild 1006 BLAKE2B 174bc1259b5395a1b7961741d220f5581bde85bdf6569287768547c497f0844af4472b1b1ac625f8a5b39aafebd70d29d4f082980324732c1dfb37035e52c3fa SHA512 5ffa746c0a665e53d41eb83f406040c8848146eef264d4dff819194b8298944044244068ce7c7021d9fba0e9d74a79bc8de58a0515719660bd75186aeaf21284
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kgoldrunner/kgoldrunner-21.08.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-21.08.3.ebuild
index bd2b667241e1..c3493f7bafb9 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-21.08.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-21.08.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kgoldrunner/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgoldrunner/kgoldrunner-21.04.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-21.11.90.ebuild
index a69fe1489095..46fb79e7efff 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-21.04.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ https://games.kde.org/games/kgoldrunner/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index e6da265b3983..47a54fa093ac 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,3 @@
-DIST kgpg-21.04.3.tar.xz 2937292 BLAKE2B e1362b6dc04d907b6071e5253cc9349b8ae169d138d81ff022e1de17db122f53cb6089aa5e8b6b004a6b677982462248b9250dbe34e0a0d3cb9312f61907814b SHA512 ec59b8c4286e3fc48f4dffa585fc2fcb03c41d0aeaea1da7a861c70b181d84e33c4df0fb5862a2cbf377dac4d9eb6d8b58e817210f663d57e2c704e39dabb65a
 DIST kgpg-21.08.3.tar.xz 2954296 BLAKE2B d7d02874f77b6a3ab635928f2fe6f73403abc40ceb6725b77e6196916eb60f64c026606916b9995855dbcbb1b15ae424953a355fe10bb4dabe601fed43203159 SHA512 1b95849adfa48302346e48603423393092dfa9c1e033670bf75288dff38ad7bf8c8a453718d9dca049eede493fb316e3b789b4b44a7eb018de00a10962c8e9e8
-EBUILD kgpg-21.04.3.ebuild 1465 BLAKE2B 887fa20e3c2b41133f12ebb156610e96cee55befeec7cb733a4b1438a64bd0d888fc26157fd36bfb8730ec09e5e4ed11d426601c30e9eb52e76509f47cff8dd4 SHA512 5518a159c1c25623ddaf60dea88efddc3ee55fee629eee56d1877d1f8bc13cd622d5bf56830c03d55d640fc506a22e39718e36580b336bb34c1518b6b640ca11
-EBUILD kgpg-21.08.3.ebuild 1468 BLAKE2B 57a94b270f65ba186d3e809fc334d43dd087e344cbf643329fbc91208932a9ed2e2e91896e9a7767dd71c01a0db5ebc7cee0ac8dc73c4d48048e8a5192f90ca8 SHA512 f8a9acb0fa809ee354070b132eb4f1a413753e132a2accca1e8d6f1a804a3c8ccfe157f40ee3182f37018a0a5ebdc2adc7e562d954b40a5c86d83de91dca7933
+EBUILD kgpg-21.08.3.ebuild 1465 BLAKE2B 0c193e0abe7737ef2ac418fe0d26a9150264c771f46c036524805dd55edaca5de9e7d8e1737a817d640c5980c41b73e60594672d0a8fd13f70611f89adbfc73e SHA512 17f8a4614d53e1053e7137123f06a09182d0bd62de43e587248d6e348738268313e35d3a2e0110dec2da95f58b68c9764e847d293a42ddba01da445d40f738f6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kgpg/kgpg-21.04.3.ebuild b/kde-apps/kgpg/kgpg-21.04.3.ebuild
deleted file mode 100644
index e0de280f35f8..000000000000
--- a/kde-apps/kgpg/kgpg-21.04.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="gpg"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
-HOMEPAGE="https://apps.kde.org/kgpg/ https://utils.kde.org/projects/kgpg/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	app-crypt/gpgme
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/gnupg
-"
diff --git a/kde-apps/kgpg/kgpg-21.08.3.ebuild b/kde-apps/kgpg/kgpg-21.08.3.ebuild
index 0e3f4ec2703e..26d9ad55318d 100644
--- a/kde-apps/kgpg/kgpg-21.08.3.ebuild
+++ b/kde-apps/kgpg/kgpg-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kgpg/ https://utils.kde.org/projects/kgpg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 3c57c0e42451..1908af67286a 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
-DIST khangman-21.04.3.tar.xz 7429172 BLAKE2B a32054dd415282f8ebdbe79ff4014f894db5de4f9a5e5ead3618dbaea98066fff8c052ec275e15e2f8d6e3a091a273dd017ec66206a27606d67cc605c2136f4b SHA512 9b5f719d1740484fcb30492f03c6e88f0306932bcd581425f6c6cf8d85868fe11dfd7b5fbd1bef5cc81c113d8e209961df0147f4d440ed6f6106ff1b215532e4
 DIST khangman-21.08.3.tar.xz 7428176 BLAKE2B 9082f3f58427ce5072c805d3a49205dc6cb2ca01636e9bcb03b4584a332b6f715e9e3ff21c17b9c59ad44df6387c54f25f34574c698dc97b0d3d4bc24b7c9976 SHA512 aa7004075dd4b9c6dea3971be27ba805e4b21a65fc985e8d308a2477fb1b87c5ee5b46bff1701ad2ab9e8d23eb513bc773c07e24a78fcdc8c963ff32b64d94be
-EBUILD khangman-21.04.3.ebuild 1195 BLAKE2B 237ab70f2f348f1c3f143a99edd0142c99b9a5f2e22a862402ee6ff00c8b1bec22fa5af43a3768ae31f7ffc316bdd5214bdf5677d3b4a3ef65f4b1a4b8b5d522 SHA512 83a85e32c652ee689ca0b8b527a188011e53af2fe43744ea48de8e28292fdc2e84d840c62ad1a54f0331eccfd25f97e8d71b07926cf180b7f39ad2d3875d3516
-EBUILD khangman-21.08.3.ebuild 1205 BLAKE2B 6b1a33818fc4debb78f99c1191f9c02b1a8e0d897c034d45b985c51892cd4db134edba2b201d69ed57f4f08959d45c26b59dab740b47a82029e792177df64d3e SHA512 8ce0c906e3661b3fb10c5548939c14cff04e6716533db9417054ab21dc8cf27b21daf473675c3c6c182928b2321652259b4f98d5fe0850b4a7aa9bd88c2b427d
+DIST khangman-21.11.90.tar.xz 7430664 BLAKE2B 0a10f76d1feca411ab3f898767ebb161d18d7f7fa84d2ad266a255faee7227ea0132361a7eaa7bc9e8085e707c4d74d09547d17f7bef4299d4ce06de8575a662 SHA512 2624adbbb69d33e648b13bd7b7be483d6fa2c54bef30b191b41f34ca6cb5e8202568359896b508b7c9a8f3eafe04f3f5a873cc3b3964c1811c1a6520be627fe5
+EBUILD khangman-21.08.3.ebuild 1202 BLAKE2B e1e3b7f484b13e0c5c2cd84e1f36db7b3ff853edcb8fa5bccde1d00e9f3a083a77d9a76d544b79adb7afe27f6b8a2b3766aaadd5e974dc329b80ac5144e389e8 SHA512 6d6a3d914935de29daf58ebdb4e33309c6c25d8006d287e79ce18a8a165084e9bcc804304fd067160ef1379c5bbd0d0bf3aa17d8fb944162b5ad062f970e9853
+EBUILD khangman-21.11.90.ebuild 1205 BLAKE2B 607f922a26713e465c2ca0f9f4fd46bb7f4a39be6ba26bd28d52f4a1de0977ce76917cd853aa78314be7ef85faf81b5e3829338b410cef59ab25d8d0338a5a95 SHA512 631bf87e9c1031283aa3902ca3fd7b20b1cf38f3ad6df46894118a522ae77bf85bc1750ef639bee0e872702d1da9114ff00b3d374766151773a445ac22c90e38
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/khangman/khangman-21.08.3.ebuild b/kde-apps/khangman/khangman-21.08.3.ebuild
index ce5027b10320..1c96f2137660 100644
--- a/kde-apps/khangman/khangman-21.08.3.ebuild
+++ b/kde-apps/khangman/khangman-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/khangman/ https://edu.kde.org/khangman/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khangman/khangman-21.04.3.ebuild b/kde-apps/khangman/khangman-21.11.90.ebuild
index 17d5ac40785f..ffd42d633680 100644
--- a/kde-apps/khangman/khangman-21.04.3.ebuild
+++ b/kde-apps/khangman/khangman-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/khangman/ https://edu.kde.org/khangman/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index a01c68d015ff..6086f51ce0d6 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
-DIST khelpcenter-21.04.3.tar.xz 4279056 BLAKE2B fbeda2c982f7aadd280278a199ed4954199b193fe80e5c7fc88409c61d09f4c59a28a5df386abb1f33c357b59f86dd2019d533b197e864a117ec26e2850cfa83 SHA512 59d3b701074dd5ac4c75df6666a850ebbb694b6f4f8501fe70606eec49d2c89a3dcbbac2ca35964a2f830bdb8df430e00b360bfa76f9d467fca4e6fc41cf3844
 DIST khelpcenter-21.08.3.tar.xz 4306884 BLAKE2B 672cead9a41fdbdaa2e5d0d5df8320c53c74a2b3704b727b722169f719bb74218d9fdf2e6cf45ab2fd04780583029e7187c3c585c5cc513c15dbf2dc1254daaf SHA512 7642a8472ac27381b54ab61d07e5a8c47d45488622630e05a0d41b1465102dc0aa1a64f77df8c2084753875d85400a805932b23b1d82d75f7bcb5eb7c9102998
-EBUILD khelpcenter-21.04.3.ebuild 1493 BLAKE2B 19f57d43481aef30409e4e284e2e7accd102928d43157fa7cc049b5bdff45401184a58160e67a7b2e683450b35b4d1c8964173d777e6e1f59b0794c0e0ed15b5 SHA512 3cc0c4f75d25ff3adeb2368bda82dd7a1e9d3299f7f1d5592965100b771e2b5c8711e058dd0f24b6dee3644b8166c4e3bce4e1465ea341defb0710b4850fbc20
-EBUILD khelpcenter-21.08.3.ebuild 1461 BLAKE2B 4664a727bfff991eb1e8b01fdba95ca5c3c3783af9f75b30e0bf800721d9a99b06ca7d091d50edaf253462a2c9c3a20a894f4200f2b7926af0670d3bb02ad3be SHA512 55f2fd40f815ac5725754b933e8cc3c1b79f83a20c5fa72e15c31875c78b39752ccf5297c9232af43dece7fc708cd954d75d76fb3175652cd7120e3286597083
+DIST khelpcenter-21.11.90.tar.xz 4291740 BLAKE2B 2d2a35c5bd089907ca4fa99d6ec34aef772e8cf694143576d6c8f4ffa7787bb0890e26274a177fd429137791e2ae6aba33e5f6761d9abaeb7358f353e1106f41 SHA512 88b50f00825aafa6e5477c12644601a12926bf0a35a33a95c84b1d9c5d3df6b7bb613fff6d2c5fa16bed993e612bfd0ca5d469c542dbe9aadb283efa4b408168
+EBUILD khelpcenter-21.08.3.ebuild 1458 BLAKE2B 9b546dc8ec20aee629b340db52ef11a8f5737e2536ed906fffbd01338cd17ceeced674d4d077a4c6bf3b3565e8ee76bf3a0a4f7b2675cc75921b3e70d69d1a7d SHA512 9ec0b163d05ffabe5792a2bb19cf884c9d018324a74d8bf7702bba15d13dda23be13bb8542e722cd38733cdd060e390a58abb6f055afb45288daeda36787a168
+EBUILD khelpcenter-21.11.90.ebuild 1461 BLAKE2B b7b3c7dfa5187567067f9acdb448efa9ce943bef6c57c57721141b44914af6b15d736152df9608949bfa4a0e2a8c47e22415ed30cadac43cd8cbae0a25852cb8 SHA512 f442fbedce911c9786cc492e0f301b2fa2b29e223ecd45349c5103820c22c0793484079d5761166b3060a8c2f910235598c2d48b1ceebde9ff88b79973b14425
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/khelpcenter/khelpcenter-21.08.3.ebuild b/kde-apps/khelpcenter/khelpcenter-21.08.3.ebuild
index 3e88828dc6ce..ad10103f02cc 100644
--- a/kde-apps/khelpcenter/khelpcenter-21.08.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/help/ https://userbase.kde.org/KHelpCenter"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khelpcenter/khelpcenter-21.04.3.ebuild b/kde-apps/khelpcenter/khelpcenter-21.11.90.ebuild
index 8853082fb2ec..68e9238a133f 100644
--- a/kde-apps/khelpcenter/khelpcenter-21.04.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 PLASMA_MINIMAL=5.16.5
 QTMIN=5.15.2
 inherit ecm kde.org
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/help/ https://userbase.kde.org/KHelpCenter"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -35,7 +35,6 @@ DEPEND="
 	>=kde-frameworks/kdoctools-${KFMIN}:5
 	>=kde-frameworks/khtml-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index ee4f80fb965f..96044b9d1573 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,3 @@
-DIST kidentitymanagement-21.04.3.tar.xz 157172 BLAKE2B 6c38baa3813b478a9db56f0f3dd7482539c6126131dc9788e22d583ef4071b4a427bb2cab9fe10e35b27752f8bbd31ed1727c90dfa72e1a13c623991248db8a6 SHA512 f1f8b2bf314165fad19d6cca60e2df265cccb8839de7d1ece4f6ac9567117cee72b4496fdadb6280f26d402a09a9bc8600c49fe4eeb4ffb91536cf0a83e8430c
 DIST kidentitymanagement-21.08.3.tar.xz 157392 BLAKE2B 97a5b535723091063a4fe356f8aa94efd550405b6d13c332144a3af56e5492bc8ff9455fffc80661fa33b07d59c1c26988d6dff3661776056e3337877844c55e SHA512 dee3cbc245988de782d1502160eed9b284b0e4a2272fac6969f241e1905321197ec480f783ba1fbaeca6a86ec36e630093efdc2c26e4f764b386d2bc8d342dd8
-EBUILD kidentitymanagement-21.04.3.ebuild 858 BLAKE2B 10a208835d0aa39a7031b286930d5ce7fca17f175b240fb83473f52861539481a928425cecb5d26e316273176bb0216f7cb49f48c470d90e3f113fb64512528e SHA512 99e5a0897ada86969d5cbf79b6001b5010a3fec9516926f9902124fd9aa70247a958e9a72b19f4ae937193deb10cfcc0b54bf6051b6fb931f63750b514447f85
-EBUILD kidentitymanagement-21.08.3.ebuild 866 BLAKE2B 87477cf18872d30fa50b01d72b730be4a10ea733fbf99bb1d0cb480d4b1329955082721f0a6aab1e19a735ab1270771cdd45537a83f9e9ffe29262b1a5164529 SHA512 b115c5c7e8cac8c937889c31608edb494f566e17a08a945a4cf1262999d136eb9a747dfce19c9b637a19a1af89ba381b7788bb20f1a9ac03f56744b239f04576
+EBUILD kidentitymanagement-21.08.3.ebuild 863 BLAKE2B 2355d0263b8a6611c3f79735cd5260d5c772937e31e3af3e64ccfed2bcfd69e069c895972fbb33974870c5d1ed083bc33a4a6ef6c607e332983dd8d9e8b38658 SHA512 77c7eb98d1ae87896a23d1dc459c1597812e360c7a5003c72559a2271aa04b105f5c68517d851c2d61a73b5109983833ebca33f7e029476b784df487026266ce
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-21.04.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-21.04.3.ebuild
deleted file mode 100644
index 05c3b1c63cfe..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-21.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for managing identitites"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-21.08.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-21.08.3.ebuild
index 95043982f697..9cfc924a5206 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-21.08.3.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-21.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for managing identitites"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index b94925b87a72..d1fbd62f38ae 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,6 +1,6 @@
 AUX kig-20.08.70-cmake-boostpython.patch 2660 BLAKE2B 51c473dd8733f44214571772b2249abe730087648d962ebab12faacaebaa2e1bb0788220faf2a03b110477a1112fce771d1b269d03e3a05670a35ffe02c82c86 SHA512 0abd06e611f90a8f73ecf5599377df45ae350c4352ff5c0cac47918d4938142bce9677a0430aa3aaf8d6f0edd5241f4751fc2187410b7287dd399caef6c8e7ec
-DIST kig-21.04.3.tar.xz 3166572 BLAKE2B bbd64b51cc768de9baeebb3b66906d8e0d8ff133a63ddfe19a9e360e34d6c10b9e08a55ca8aca88c7e723a7af29d5882d214e72db1c7292364631817e6ccc399 SHA512 f82695722fb66a707abaf120b56e0f0977a63065a21849e72f178ee0eb653b73bd5ceb651a92085a34ad7d1c98da08611138a7d52b491c7caa9cbca47b7ff19e
 DIST kig-21.08.3.tar.xz 3175388 BLAKE2B 7c515b80a7334680e40777cc73971d3cd9f595f038c02f9862929cbdfd88d4d8b287a3694561c1b3ab8fc6cc5225e47bd68c7668e5e89dccb00d5d4596422a2f SHA512 73d348b81be9eea6cfef9b7e266a86a115aa1d05236ca55b4639782465b0b4550d041645fdf1d37908ad109f6d093ffe21b1a1f73fda6b9b590473ef803088f2
-EBUILD kig-21.04.3.ebuild 1738 BLAKE2B 8e6217cbeee1ba13976993af25e90d3380ce0fc69913cf62aea3d0287fa899d5876f404dde95e194da8ad669c38a2770fdfc4e19a34e174b8abbea2191b176c0 SHA512 2fb3f5db8f0385a66453e8279cb61d548aff3239c237d48e2900a0bce92b29ac9b3033f7c1764be7d04c51b9518adf9c66927e88e8d1c669a2b7687401f82a58
-EBUILD kig-21.08.3.ebuild 1750 BLAKE2B 60efb5d09102b0b679eeb02e6712d6210b8b46f14e884b4802f4778e51ade59e0c564a05d13d74ac84daa9b0fdd7668a860f1dbfc2b41221261c93233eeb248e SHA512 da3ec778b9ec7c4a75e5688415e59239cd44c79618fd9b571a7a2ba4f60d29d98a774f5c95461ddee90ce9228b312eff70ca43c47266186e879f5b1eb5f18556
+DIST kig-21.11.90.tar.xz 3175224 BLAKE2B 96289d639c9d7c487b9676a90fa85d13f5e045b0e2f4fdbac9dee5e5cfdc092cf602eee418a804dc4db9f9382c659b7b42c96dc5304523f48cbedf92cdf9134f SHA512 d1f7b98205b9d4414a77a0e01f556772f21501b628e1eef9d7b7658f0ac2345693596c8c0621d865d3065fc36754b6788827c271b64595606c9bfc8cacc7c189
+EBUILD kig-21.08.3.ebuild 1747 BLAKE2B 8de23569296650c0c4c31fac95b45a421aa8e726c6d265de94a76bef5cc773f8916fe7bbefe7fbd5046b5b3508cb192509aedda489bfcb7a84b09b6fbfd88344 SHA512 727e60da5d6ffe1c99ce3c1332584e904288e02736bcc336455169a9e706de3d58d5a2c3796c08b7216e67c4b788eac949ac930e71eda1dedfde25c7499f1d60
+EBUILD kig-21.11.90.ebuild 1750 BLAKE2B fd40e5125e6e450ae6edc704da46f39a7e907a9300ca3ca20d11db7adf9bbd1c5e6737a58ca072c45e13cdc3e64949b0e3cdff1829299b3de5e92eefd98c9270 SHA512 c3d802cae6c8576d7ca618e341ab7e3e7bb1585e247e547788058220d135abf30de0be17d04030676e62c73117910183432125b46fad1686c9811a00ed63237c
 MISC metadata.xml 486 BLAKE2B 11cf086271c289ac0e3f1343ad70021b4b847e7be0ddb8f1dfb2630a4d7ff026456e2ed1c2f303bc8d9a4ec6e062c923bf809e14e814ca8dd653d9c2fdbe8006 SHA512 b4a4b83cd44c29cf1f194f5c3bdd1e48f9ef08c02d1b33dcb25fe36d243588f5b83753c03826f1cb74df4ba225553fdd65263c047362edfca5709944cb24e08a
diff --git a/kde-apps/kig/kig-21.08.3.ebuild b/kde-apps/kig/kig-21.08.3.ebuild
index aae87d00bdd2..bcb55fcc9f44 100644
--- a/kde-apps/kig/kig-21.08.3.ebuild
+++ b/kde-apps/kig/kig-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kig/ https://edu.kde.org/kig/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kig/kig-21.04.3.ebuild b/kde-apps/kig/kig-21.11.90.ebuild
index a63f42ae5db6..333ed3b8f50b 100644
--- a/kde-apps/kig/kig-21.04.3.ebuild
+++ b/kde-apps/kig/kig-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{8,9} )
-KFMIN=5.80.0
+PYTHON_COMPAT=( python3_{8..10} )
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit python-single-r1 ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kig/ https://edu.kde.org/kig/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index 33a6b1edd1de..7be7c655f7c4 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,5 @@
-DIST kigo-21.04.3.tar.xz 5245744 BLAKE2B 550c51ae8a798c16f04fa15c8bf2e80f061d1f405ea81338ddb53252ec875bb88182bc6e6bce574c33af2450ea4907c409974d4668abb753e6ae388daf4ffc64 SHA512 2e92750125ad644c52f0427d4c39d8ae4e0c0e70588e686551181bdf41002bfa4fb9529c99e717f7a96adb610408d27d946547b98f3715a325ce68c0d4f9d302
 DIST kigo-21.08.3.tar.xz 5252068 BLAKE2B 2e604668303291a65b27246484901db54dcddf3d286914377e6c083b29c46327ced466108b8e2a9fb915669164442a8beec4d656217e5a3a14792f4732f655e3 SHA512 435255e42559ab572adc0c0eae8933639930bc15dc019e310a32fbec5b39b3e6d0985947d7570ba1a4e990d2b679ccafffb52935d57b8b62f27a9813c83bd32e
-EBUILD kigo-21.04.3.ebuild 994 BLAKE2B 24e74ecf6bfcf5383c51efb0d41d53edc9c4cc09484b7ccffbc6a2ec8eb5543f1feb95635b195af92ad83cd66466fae045edf59de35888762799a7e9cfa70f30 SHA512 4fd7eef26dc10107ca671ab7584b8df252f275744e9e9324d1c10da147fb2ceb114d9037a01124906d5d2189a76dd2c82ca631775a2233af9ea9ced93afd2433
-EBUILD kigo-21.08.3.ebuild 1004 BLAKE2B 2a65249ea89c9692a6b2cbbac3b0bc67df40725e402c89ec27a947951d0bc2c7404841d2055ed76e67ac1ae03ef344e9031d4e054d0f617f5d3cead83d50f358 SHA512 f2eda18d8319f649cee934c70ed6126d244dc1f75b2c8fcbb82b1fed60cb23353b7ad0090b9001d7e51859669ba8e52f00f2e2adfbe09af6bffc3d5f91ce4b3d
+DIST kigo-21.11.90.tar.xz 5252416 BLAKE2B 97efb9a74cb168cad39adabb87fcf48529eee1b529c6567c1560d7e29e70579e00d64317caea9b7e5d2abad55688b3f172b501ed5d7afb1d74ddd598c26803c0 SHA512 8439ce9b21fdc228a49ff62503a7d93a5ba4d6e707ad448724b2df0cbe5a4a38ac5738f891e00efacd3c1c55dbac2ca9ecdacf2ad3188ef5b368d609a3c47100
+EBUILD kigo-21.08.3.ebuild 1001 BLAKE2B 32f70d7443c76f0379113a60fd10223da1511972b91c7c8b98f0c15a55463430d258f6749c6784ada88554c788b75a4a08bb5664ab4211d8984d4942c43ab825 SHA512 321a9614a2b1a862f55359c53ccfd205421ea669e2348bf4058f70072f060d13af599562cf217e63bb18836afbc6d5ff3406c65853c41cee12130b741dc7e2f2
+EBUILD kigo-21.11.90.ebuild 1004 BLAKE2B 5350d6ea76711243730d061169190b37bd293dfd33494a38576017906ae165b477265a3d8e5abdc01faa9f89de7591ccc54f62c36c85c7a0b37e7c0eb6663c8d SHA512 4439d462963787a29b77f9877ee4168ccc03b7e152ed73134a292a4a309c873af7d73bd176dcf3751fbcc85c8b9494f7627bb594e397a5628f5fc1f550d9137e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kigo/kigo-21.08.3.ebuild b/kde-apps/kigo/kigo-21.08.3.ebuild
index fa43802a30db..68d05f7c1b96 100644
--- a/kde-apps/kigo/kigo-21.08.3.ebuild
+++ b/kde-apps/kigo/kigo-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kigo/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kigo/kigo-21.04.3.ebuild b/kde-apps/kigo/kigo-21.11.90.ebuild
index c5c146d1226d..6556d225d650 100644
--- a/kde-apps/kigo/kigo-21.04.3.ebuild
+++ b/kde-apps/kigo/kigo-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kigo/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 8e7503921ddf..374ac1d06e30 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
-DIST killbots-21.04.3.tar.xz 1186432 BLAKE2B a9d958148135d2b6d6fffb4979aab47f6efc6da0ebdaf4abb81d628ee2284e2f5e5b2e1055cfda149192721794e6f1bf6efb8baac9645f7b2d45982f3195f379 SHA512 01b57889dd9bc3ffd6d193206f87fa7fd69078fdae217c3f6bc7eee8e415525383b1c794d56992750bb0a74227a6fc4ee4297abdbffb14954d8bdb4236447fd0
 DIST killbots-21.08.3.tar.xz 1192472 BLAKE2B fc52337d8064a4049b000b3735efe995cbd9d3583b6dff03f8eb78f14e55fc11e83542437a7ef69eeac6b3215118bf091f2525c5978c605eccb7fad47e69d5e2 SHA512 457ca06542df0c45318a6fcf273997393e19dda3e4b64472df21b807da48e14d737095f26c2986d3e5f2202990feaa169220bdab8fb8dcf1117781921bfad634
-EBUILD killbots-21.04.3.ebuild 863 BLAKE2B 5b3cd58ef88c425f9f170c90416be1a9d7d3c0881703ae8b3922504ec84299862f8926a07bdf7e65292e13a84f2101b04529066a46258f0d996738e098fdc132 SHA512 4262232b02a7904cc3a01a3f1af73349fb407036bc39b628de276e3bf9e013648f4e897e485c87757cc4d97297420970cafadc838df75b16a467546b339b220a
-EBUILD killbots-21.08.3.ebuild 873 BLAKE2B cb562a6fa849c7542fdc8e1eea9567d0d4534a03899a7c374e2a5e0abc7e3e2b1d188e6e5f9246b3e09f2a06c850453272f4e8495f13d3de4f70ef037208b9a4 SHA512 19d9ffec2cf4e6a257eb70663816208c22f1dcb5c08d6cf1d93906965a2f33b9d73f40052e448ae34e26e6d7d7b0c8be1edbc1a4b99d846c91bfa8960202a7ca
+DIST killbots-21.11.90.tar.xz 1193804 BLAKE2B d97eeef98bc6a7e9cf9ad55606de6d722f9aff52ed52fcaf6eddfcbca0a38bf7fae634c6b1db5c761565eec8955d0533ed44c3a28fbb1dfdaee6ec845eeadcbd SHA512 4870f98de860bcecf85ed511d8886f78c231a255111185109f8326807a59d161d1eef03f95023ad3f22bdcd57e48cf248d90a6e3f087c1b3e5af2e530ca01b84
+EBUILD killbots-21.08.3.ebuild 870 BLAKE2B c4b3b1208c60662b50cfed0b111a87e4b0d193e90b3ebabb3e0cedc32269e4bd62eb4ae0e2d20139e4cdb651da831949bac83e61520fd5f3f7c702be4e299e78 SHA512 559187c0b88dde9fe84b0fb42c07d7f27fc30980ef54f60da3298045a4d2baf187186191033d262ec7fa20000d0cdc1903f8114b06bc335c65e7e07aadb1ab23
+EBUILD killbots-21.11.90.ebuild 873 BLAKE2B 5e0f05baf6e5c0d87df3131d557e207a49c17ac0720321548a68be007b7e4fc7eb45dcf201ff034a337932c627cf1a5f95c879884a66ed4052d8a332e4a72634 SHA512 466853c0590e2be42b9e4d4892f3234e36c4589428fe46d46537cc8ee09802120d4fc7987c3b3d2201e514f73ff202431625b3ee3ef0f81288bc7da5dd4cdd2e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/killbots/killbots-21.08.3.ebuild b/kde-apps/killbots/killbots-21.08.3.ebuild
index bd7f8c9ceb14..43ca06ad28fb 100644
--- a/kde-apps/killbots/killbots-21.08.3.ebuild
+++ b/kde-apps/killbots/killbots-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/killbots/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/killbots/killbots-21.04.3.ebuild b/kde-apps/killbots/killbots-21.11.90.ebuild
index a7086e392d57..d1e3d1fe8f47 100644
--- a/kde-apps/killbots/killbots-21.04.3.ebuild
+++ b/kde-apps/killbots/killbots-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/killbots/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index 46fe83e6c42e..846cc1f3bc69 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
-DIST kimagemapeditor-21.04.3.tar.xz 1088644 BLAKE2B 489db08c580c85f912c1674aa7f56cd6c1b2b309ced1c32a9cc713615a7ffa15f26af87dfc473a42cea1acd2db13a1b35197b840972228b78c8449485362c9dc SHA512 8dd80e4df949a8716f000edb2b8932de36913b9d577babf6e19a5de9f67e30509461847bbbd4fa571998510e6b4857dfc30ae92e49ea3924b5e7759917186b27
 DIST kimagemapeditor-21.08.3.tar.xz 1088844 BLAKE2B 7f65b88e4e680185e43c18a582c31a6854d4cb604a70ddac2acaa58afb42341cc9c0c56d521c3384e184003791b53688e116641a1d08b427144839998a7eb07a SHA512 5a72639c47ba42ca044581e278bbff9acdc6b271ffc594021c29bd1c8446e08c01b6d71238bf461b06fc17ae4ae6cabdb8c31485af5bcfef43e20fda87e9adf3
-EBUILD kimagemapeditor-21.04.3.ebuild 927 BLAKE2B 6737b8af76f9e812fa62ec41de390f6a9962f4a5c32d432537c22155f3ad8d68a702f2e2ec054f9f606c78079b61132b66c075bf37c220a5e2217d973100110a SHA512 1000f3f2ba2693cc46cc4d1965fd74c101260720cab90900c2fb32ea12c53f5c158a57b31a2bd57926dfb4242eb9ed21bb5fe39db1d68a085a64580c4ae0ae7c
-EBUILD kimagemapeditor-21.08.3.ebuild 930 BLAKE2B 306021fe45d1fc910db3f76534e15b99681c39a3eda51c547c8ff4f0f3d0987d96a8b9fda3ec3035ba4115740cabd1dfd71fe66b0cad98beea15b33d680ab9cc SHA512 c8593403808124ee5403d7837b599d1195c88a65928110d4ff747da6128aa1201ba6b5226c64ae0494cd42aef25e0dbc295621d8a265790dbbb699075520f670
+DIST kimagemapeditor-21.11.90.tar.xz 1088852 BLAKE2B 88d66ee01dac9d0a65ef4fee333f0ea9843e60ea0ee9e08502e01a625910843ce0d334f8d19c99af42623a399e0ef247d062ef88a64e37bc26687a09a3b3fe60 SHA512 134d4f975436b72a3205aa4480ed2255d975b1db445df9f05cd59a6be017dc6046d86f19b89b31a9f7a40f121bb89de9f25bb36889000f6515172e5cf216ef49
+EBUILD kimagemapeditor-21.08.3-r1.ebuild 886 BLAKE2B 84aea393c4571d39c161057f6e05405ab07a3490cb24358147bae71a75d7157873dcc00d2fd20921e084b9cacc537ad5f4c93919d8c17d4c401c1f624e9de55a SHA512 852c816f36014da6d863bf88a8380f333bb956d51b38235463f32f1790ae5032cdf21bb864555a3ae150886eb902c6ea0f56e4c465d44357791b63111463924a
+EBUILD kimagemapeditor-21.11.90.ebuild 889 BLAKE2B b96a55b3f9920166146da3f8c3ccd4fe0ffb12a6670af620fd1c5201f065ca6bd58346a33fae3996d11c8c96b4ef9aa79025b04d2671038907c365afea1e87ac SHA512 16cd061b78a06e50570266853c9a28b820efd7f39a5578c5300645b75aa95d78be53531c3dab3709d421eca5501d723a0725a5a1db6d69b6bb3bf714dee11de8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-21.04.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-21.08.3-r1.ebuild
index 3b5ae84646f2..9c8dee1644d1 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-21.04.3.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-21.08.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.84.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -27,7 +27,6 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-21.08.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-21.11.90.ebuild
index f16e28857194..a95dc6ddcfb7 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-21.08.3.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-21.11.90.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.84.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -27,7 +27,6 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 9ae4f3a87517..29e24ade7a03 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,4 @@
-DIST kimap-21.04.3.tar.xz 128564 BLAKE2B 11b775fbb697989e27e1b3c2c41520b8be0745730f3d6a9ee2d5e3cc6f12734a3f527600dc376c26b00719981ef8c8fb37559432662cc5a192541a5fcbe486db SHA512 4b8cb4d2268c7e03dd8aaa1ecd6ce45f3c2a4ec2594585238102d0933d2540805f0ede1763f5e68ee156498870b402af3556e7b5509a406651dda674ad7aeebe
+AUX kimap-21.08.3-CVE-2021-38373.patch 1878 BLAKE2B 9eec46fab80e30fd42eb20f7fc130890d0a73548effa31656f3e1a4f83cffc8095affa30bfafe10ddad12f872c41e4bd6046f3754b957c8921402b59f3c74bd3 SHA512 c1150bf87a9f1abe75a3b6c56f3b2f6f8c6b88beed5f8158cea57a5cef1ffd16498c6ea761d22ee0a776d5c570dcc4184264770e9f8e16cc772860c20092a719
 DIST kimap-21.08.3.tar.xz 127416 BLAKE2B 688ae70e9b4c280798b42cfed5cbd5dc6afd7ad48081294d0b66a2712fb420bc2b972527dfd5c128b826d97b6b9f75298229c357cb4668fc32720e731513a24d SHA512 65feaddd6ee0a965dda73036c4adf2e20e56a4abf4bf93f1ec5da03c53701991126ab2d65647c92048c56f1bcd45ea8b429ed99ddc08efdd54846a0d1222db83
-EBUILD kimap-21.04.3.ebuild 850 BLAKE2B d21a6f839d928aff0dbf04b8b0228f67a6aaca03a68a7ef57548b52679ddedad5bac0fa65dac9d9748e6f17f35e71252a240cac8ea7b32e0d5711d6f69a8ecee SHA512 03bc27c0509a42a6bd89286006c5f1e1a2c27ecbb237b752c4db6941febe8b209a52afff3bf3a99d2812e9152d4655bd6755912cd2b5bc966089974209976d33
-EBUILD kimap-21.08.3.ebuild 853 BLAKE2B a96661475af4845d09438d0d94a85bf697580bbc0d38857f1636c45bc24ca786a280befa326e11254fd8bf1f0052cca04460f2628b96c3f9938e9a4f7c4bfdde SHA512 d66638c8b805b02b97f6d2fe8a51c8cd358e8fd10d3d26f0ab30d561e8e6897f27875f8cfeea5370fa5d24518adf62b7e908dcb79ff51c746808fde328ea4ee8
+EBUILD kimap-21.08.3-r1.ebuild 903 BLAKE2B d95e50888cc0bbc37b96a290aca69aef96b3f3d9f533e89306bb5f7f46cdec52d2e91f21c4b1aee43929d6c20b6a8a2f322e172692e0a6cbcba5fa345ec1bb3a SHA512 c4c20a09ec7d885c4251c42a62197a5d901b4ccd4cff510733bc2090856927189350abb83c33caed884b08203db459da0c1a43643c2fd8ff2db172e7f39188f2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kimap/files/kimap-21.08.3-CVE-2021-38373.patch b/kde-apps/kimap/files/kimap-21.08.3-CVE-2021-38373.patch
new file mode 100644
index 000000000000..90d216b0b846
--- /dev/null
+++ b/kde-apps/kimap/files/kimap-21.08.3-CVE-2021-38373.patch
@@ -0,0 +1,51 @@
+From 5aed4138567934c3be20cddb60fe6d7d4a10da0f Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Mon, 15 Nov 2021 18:18:28 +0100
+Subject: [PATCH] Treat SSL handshake errors as fatal also when using STARTTLS
+
+This fixes the infinite SSL error dialog loop also when using
+STARTTLS, the previous fix was only effective for direct TLS
+connections.
+
+CCBUG: 423424
+(cherry picked from commit cbd3a03bc1d2cec48bb97570633940bbf94c34fa)
+---
+ src/loginjob.cpp | 22 +++++++++-------------
+ 1 file changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/src/loginjob.cpp b/src/loginjob.cpp
+index 7d53187..b5fbede 100644
+--- a/src/loginjob.cpp
++++ b/src/loginjob.cpp
+@@ -552,19 +552,15 @@ void LoginJob::connectionLost()
+ {
+     Q_D(LoginJob);
+ 
+-    // don't emit the result if the connection was lost before getting the tls result, as it can mean
+-    // the TLS handshake failed and the socket was reconnected in normal mode
+-    if (d->authState != LoginJobPrivate::StartTls) {
+-        qCWarning(KIMAP_LOG) << "Connection to server lost " << d->m_socketError;
+-        if (d->m_socketError == QAbstractSocket::SslHandshakeFailedError) {
+-            setError(KJob::UserDefinedError);
+-            setErrorText(i18n("SSL handshake failed."));
+-            emitResult();
+-        } else {
+-            setError(ERR_COULD_NOT_CONNECT);
+-            setErrorText(i18n("Connection to server lost."));
+-            emitResult();
+-        }
++    qCWarning(KIMAP_LOG) << "Connection to server lost " << d->m_socketError;
++    if (d->m_socketError == QAbstractSocket::SslHandshakeFailedError) {
++        setError(KJob::UserDefinedError);
++        setErrorText(i18n("SSL handshake failed."));
++        emitResult();
++    } else {
++        setError(ERR_COULD_NOT_CONNECT);
++        setErrorText(i18n("Connection to server lost."));
++        emitResult();
+     }
+ }
+ 
+-- 
+2.34.0
+
diff --git a/kde-apps/kimap/kimap-21.04.3.ebuild b/kde-apps/kimap/kimap-21.08.3-r1.ebuild
index 7ecf4e28e606..8d37f8edc147 100644
--- a/kde-apps/kimap/kimap-21.04.3.ebuild
+++ b/kde-apps/kimap/kimap-21.08.3-r1.ebuild
@@ -1,11 +1,11 @@
 # 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-3)
-KFMIN=5.80.0
+KFMIN=5.84.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-CVE-2021-38373.patch" )
+
 src_test() {
 	# tests cannot be run in parallel #605586
 	local myctestargs=(
diff --git a/kde-apps/kimap/kimap-21.08.3.ebuild b/kde-apps/kimap/kimap-21.08.3.ebuild
deleted file mode 100644
index 195787a96ec5..000000000000
--- a/kde-apps/kimap/kimap-21.08.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for interacting with IMAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-# TODO: Convince upstream not to install stuff with tests
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
-"
-
-src_test() {
-	# tests cannot be run in parallel #605586
-	local myctestargs=(
-		-j1
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 0a8b302f4ef0..2831e4648ba0 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,8 +1,5 @@
-AUX kio-extras-21.04.3-kio_filenamesearch-crash.patch 1507 BLAKE2B e6472583bdc2818fda320073d70c20117d1242457ae7bf229cf41c2437576fd79bd798fb4046e91269029ce664e073f8778cbf1ccd1b43f15d5fc49066ba0f62 SHA512 7cf8f5713e3023f5923db0907fb2f47570be9eadded5ba4ee40ac8817e4d31e55aa704ec6b34442677cbe34032299746e8f11a39fdefde4e5356121d6d658897
-AUX kio-extras-21.04.3-libmtp-0.1.19.patch 1038 BLAKE2B 28b5b6147a194ecf3af0e11a02868e42cdbf1156e0532e6ea97cdbffd30f55ce04bce4470c89a10cef0b6724f8d43b5f388c54517582513a06a4dcb15a382150 SHA512 1a225a11f90692a91e3034863da32c9ca080c2f4aed2155203a843281496c2df93bf9683117d14c24b18b559a6fd276deef2d05d708d3e425b403060c1b87466
-DIST kio-extras-21.04.3.tar.xz 663328 BLAKE2B a509513732dbacc2f63a162cef49f297b5ee83a1d4bcd436aee474571d4aad8ff5b34710ca23d590b87c9cef8b58add2be507692648e61abc197befc478effb7 SHA512 98cdf33a73b9321c127cb3174f5ffc243e51222c2c4572afc7b51a949a41c85e8758aafaca5db613b11109af693eb6de061d78bcf1138c12fbaebf3b5dc82da9
 DIST kio-extras-21.08.3.tar.xz 627412 BLAKE2B ca6ccebc085b34dc7eef031b504fac50436381502338752c2e8371aeac8a2f24e7e8782a9061a154cf95ec9c8cdc24630d0fcfbc141e7ed541547eef63cc0fb9 SHA512 404eefda445391c2e20f0f7ce6103aa787af050fe6419f65c0153f69c19ed81d62479c2296c5e4b3abd8c0b4971ec102a94a858f7085f5af20eb75cdacc07095
-EBUILD kio-extras-21.04.3-r2.ebuild 2709 BLAKE2B fc6450f5f2126ea41c61c41c5ac9350ff21558be3c5458d3977dbef848fdd5b00f65ed64cb9575a76afa21fa66a6bced0e47cc7b8762c28ff3ee0fe2cf1f4671 SHA512 a21f924472095a84ee25647f7aa841b68ae7d024b4c18028079f7bd01e1a8b37f109a66f7f6970e62ad88437f99046c3f46ecad6d49c97ec01cf9e5928f15fe2
-EBUILD kio-extras-21.04.3-r3.ebuild 2827 BLAKE2B 6e527bd37c9bbbb675eca5c7c207a0d5a13045c0a3f316d563688c20e9b4a95a6285de71361c3ba9d060bfd0a419e03aefff8b8de99e8a1f267a696ca72a3279 SHA512 788f782f55961c9e207adf06358502709305a12b7b431dbbdabe005c9c852d21946415fdaa3d2d754abc06c1df49d4cbbc9a59427fbe7948757acb7d9c6996ac
-EBUILD kio-extras-21.08.3.ebuild 2637 BLAKE2B 59144dfda88717f72bdafaa4313d4bc7e5b990ed1b46b42f4e336f16fdc8a6b41e66f32c3043fd9e497807fd84c7edd75d2af6c7311c97ffed6a7974067514b3 SHA512 e0df0c4a59aa298cda92ccf2de0d11457e9a03e3d6be1b1ac6afd65ae0feddf3f883a55cf47038ae6554fb8879de1993785287519e9ef7ab191ccb2f9129ef3e
+DIST kio-extras-21.11.90.tar.xz 633576 BLAKE2B 28c1c04491036def3f59f0926f0f3a4c68cd595666005ba34dd15c912e6117fe9eb76003e5beb33c5add4f40abf2278a7219aade1064b8a8f53625171f265d46 SHA512 ca53ec85b1b1525fd9bfc9fb8ef3022340617cd8a646e6aaf6e0809780b7d3cd453aa6497b4809eee853822fb49709d79e699d5ef95aac3b9fafd7d5b48ae40c
+EBUILD kio-extras-21.08.3.ebuild 2634 BLAKE2B 9dbb55dd217d22f4f82ebe21545490dd7f71517d5ad562c8f9d2b88231f6f43dbb667244a865059761b47b95149865402e4c5b0956c763e92b471eb8fe84840e SHA512 57cff1c8139236875f32f389df77f82ad67a826e65ace97f2886ffa389de5970ab8fde0c5339384428975f80f4d9630370fcf3486e1b37b4ce24e00788cbeabf
+EBUILD kio-extras-21.11.90.ebuild 2637 BLAKE2B c5de5267a665a827fe8b9b7a49213bde048d326f28cf15e80256023c0d414229f71414b79378324e9c42653c39245f7206611b7d8249f4a44254cfb324d9f4be SHA512 6d48408200187cdeab87d6f648e4b5221bd9207b84f0d1656e50e56d89dc7658d512241b9ebea4e4d1d2c6149e6a8b1b2373d0f12d44739f31eb0014157f7c95
 MISC metadata.xml 909 BLAKE2B cdeef268795d77b28472f57e9d6ed422fca8102c9760b2a274557a0af3b279a7844b73041eceb9b63c2f4a8dbc3f20ae51be7706a536c100be8504d213732fd0 SHA512 a2cbfeee2cdf9e8b55cd16b88c834697f4431fe6c1fe3c323c7cc78d9c5968e5bcf9750e11bcc49c2c0f638eb2c69bd7840afb2982515f14e49c9bf0dfaa6ddb
diff --git a/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch b/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch
deleted file mode 100644
index dff398e68a25..000000000000
--- a/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5dff395ecea2977cf149c293c16c4d4a5151493b Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Fri, 9 Jul 2021 17:11:02 +0200
-Subject: [PATCH] kio_filenamesearch: fix crash due to KCoreDirLister changes
-
-Error reporting was changed in KCoreDirlister, to match the original behaviour
-we need to explicitly disable auto error handling.
-
-This fixes a crash while searching in Dolphin, kio_filenamesearch intrenally
-uses a dirlister, and a nested event loop, if there is an error while listing
-some dir it tries to report it using a job ui delegate, but the parent job
-could well be dead by that time, which causes a crash:
-"QWidget: Cannot create a QWidget without QApplication"
-
-Note that this crash only happens if KDE_FORK_SLAVES is _not_ set.
-
-BUG: 438187
----
- filenamesearch/kio_filenamesearch.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/filenamesearch/kio_filenamesearch.cpp b/filenamesearch/kio_filenamesearch.cpp
-index 4d15aac2..5651a025 100644
---- a/filenamesearch/kio_filenamesearch.cpp
-+++ b/filenamesearch/kio_filenamesearch.cpp
-@@ -102,6 +102,7 @@ void FileNameSearchProtocol::searchDirectory(const QUrl &directory,
-     QScopedPointer<KCoreDirLister> dirLister(new KCoreDirLister);
-     dirLister->setDelayedMimeTypes(true);
-     dirLister->openUrl(directory);
-+    dirLister->setAutoErrorHandlingEnabled(false);
- 
-     QEventLoop eventLoop;
-     QObject::connect(dirLister.data(), static_cast<void(KCoreDirLister::*)()>(&KCoreDirLister::canceled),
--- 
-GitLab
-
diff --git a/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch b/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch
deleted file mode 100644
index 400fdd859652..000000000000
--- a/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a6ecc8855a0a2a8f76234f77422940b863960944 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Sat, 2 Oct 2021 12:53:27 +0200
-Subject: [PATCH] Fix kio-mtp with libmtp 1.1.19
-
-In libmtp 1.1.19, an empty string is returned instead of NULL for devices without a deviceName, which breaks accessing those devices with kio-mtp
----
- mtp/kiod_module/mtpdevice.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mtp/kiod_module/mtpdevice.cpp b/mtp/kiod_module/mtpdevice.cpp
-index 8fe4abb2..f32cd1a4 100644
---- a/mtp/kiod_module/mtpdevice.cpp
-+++ b/mtp/kiod_module/mtpdevice.cpp
-@@ -40,7 +40,7 @@ MTPDevice::MTPDevice(const QString &dbusObjectPath, LIBMTP_mtpdevice_t *device,
-     const char *deviceModel = LIBMTP_Get_Modelname(device);
- 
-     // prefer friendly devicename over model
--    if (!deviceName) {
-+    if (!deviceName || strlen(deviceName) == 0) {
-         m_friendlyName = QString::fromUtf8(deviceModel);
-     } else {
-         m_friendlyName = QString::fromUtf8(deviceName);
--- 
-GitLab
-
diff --git a/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild b/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
deleted file mode 100644
index 7e0c4123eb92..000000000000
--- a/kde-apps/kio-extras/kio-extras-21.04.3-r3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://invent.kde.org/network/kio-extras"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
-
-# requires running Plasma environment
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	activities? (
-		>=dev-qt/qtsql-${QTMIN}:5
-		>=kde-frameworks/kactivities-${KFMIN}:5
-		>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	)
-	mtp? ( >=media-libs/libmtp-1.1.16:= )
-	nfs? ( net-libs/libtirpc:= )
-	openexr? ( media-libs/openexr:* )
-	phonon? ( >=media-libs/phonon-4.11.0 )
-	samba? (
-		net-fs/samba[client]
-		net-libs/kdsoap:=
-		net-libs/kdsoap-ws-discovery-client
-	)
-	sftp? ( net-libs/libssh:=[sftp] )
-	taglib? ( >=media-libs/taglib-1.11.1 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kded-${KFMIN}:5
-"
-BDEPEND="man? ( dev-util/gperf )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libmtp-0.1.19.patch
-	"${FILESDIR}"/${P}-kio_filenamesearch-crash.patch # bug 817008
-)
-
-src_prepare() {
-	ecm_src_prepare
-	cmake_comment_add_subdirectory network
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package activities KF5ActivitiesStats)
-		$(cmake_use_find_package activities Qt5Sql)
-		$(cmake_use_find_package man Gperf)
-		$(cmake_use_find_package mtp Mtp)
-		$(cmake_use_find_package nfs TIRPC)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		$(cmake_use_find_package samba Samba)
-		$(cmake_use_find_package sftp libssh)
-		$(cmake_use_find_package taglib Taglib)
-		$(cmake_use_find_package X X11)
-	)
-	use samba && mycmakeargs+=(
-		-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kio-extras/kio-extras-21.08.3.ebuild b/kde-apps/kio-extras/kio-extras-21.08.3.ebuild
index abe5cbe7a5b9..b456225da046 100644
--- a/kde-apps/kio-extras/kio-extras-21.08.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/network/kio-extras"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
 # requires running Plasma environment
diff --git a/kde-apps/kio-extras/kio-extras-21.04.3-r2.ebuild b/kde-apps/kio-extras/kio-extras-21.11.90.ebuild
index 60397a2cd841..c47745ea3cb3 100644
--- a/kde-apps/kio-extras/kio-extras-21.04.3-r2.ebuild
+++ b/kde-apps/kio-extras/kio-extras-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,11 +15,11 @@ HOMEPAGE="https://invent.kde.org/network/kio-extras"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
 # requires running Plasma environment
-RESTRICT+=" test"
+RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -70,18 +70,13 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="man? ( dev-util/gperf )"
 
-src_prepare() {
-	ecm_src_prepare
-	cmake_comment_add_subdirectory network
-}
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package activities KF5ActivitiesStats)
 		$(cmake_use_find_package activities Qt5Sql)
 		$(cmake_use_find_package man Gperf)
-		$(cmake_use_find_package mtp Mtp)
+		$(cmake_use_find_package mtp Libmtp)
 		$(cmake_use_find_package nfs TIRPC)
 		$(cmake_use_find_package openexr OpenEXR)
 		$(cmake_use_find_package phonon Phonon4Qt5)
diff --git a/kde-apps/kipi-plugins/Manifest b/kde-apps/kipi-plugins/Manifest
index 9b87d192a2e4..831072f0cd2c 100644
--- a/kde-apps/kipi-plugins/Manifest
+++ b/kde-apps/kipi-plugins/Manifest
@@ -1,5 +1,5 @@
-DIST kipi-plugins-21.04.3.tar.xz 1654288 BLAKE2B 32660d84e939f54ff95a9076d2d92fef2d2896139e37b52ab4cd6f78dfb7aa3ab786d20f17494c6d0aa7751cf96a3ba7c3af085ca2a72da5e547e41f404e228d SHA512 b845c94415409f21cbc95d6d4f16a8a628e8ae217c180148d8e0a259a8f15f00b7cffbb6bf75be8c35efe180049feac46f0a2549cc89a263f1037bbd0866f675
 DIST kipi-plugins-21.08.3.tar.xz 1546764 BLAKE2B 918851af0a4cf912a3f49208b7a9123177d769738f7e0042f393b2dbf0373ae753968c2b2770881d62ff4a0d94258282ab4ef8bac4447f079b1d6b4130a09bb0 SHA512 7eac4aa2dde9ab82e193c48e34f2a7c376b273964987083dc9958520f8395d1637635e25702cf8932b2ec65b2bff40701ac2eaeddcecd3884d124e31bb8cf391
-EBUILD kipi-plugins-21.04.3-r1.ebuild 1346 BLAKE2B cde26a85003a23775e43d065d24660d9b602efce37263796f558d9bfaee282155ef916183a792fb4f7bc8ab5473b6218dda1b064a19897e202893c84a25c6f87 SHA512 31e8936d74efd1c6036861131fdb660536c4b0d89f586cdd96b05c38ddc758848dbad79eae698ea42fbe440d5836ac34a404a2814753bd6ea831cd749e33edad
-EBUILD kipi-plugins-21.08.3.ebuild 1356 BLAKE2B a3fcb6b71d370cb0c2575f7e799a8f1f8024ba96b2c7965005a67018d71407cbc1d23bdd30acedcd692924ed643330a3ef27a09f8152857d75764f982f39631f SHA512 c128b7c3bd6b6e41cb6d5f141203efe0fc5509ceb53f09d6c00e7f1299a0378eb96175ff6b8daebfbc1380eef104ebcb90370d3fd09da09f491690e1e0ed7a57
+DIST kipi-plugins-21.11.90.tar.xz 1546756 BLAKE2B 16631205b8213e5ef7c4d2757a8ab3401f2b4434628f3919e3431704c962364fb5ce2e7821b0a9aab1b258040a74f8cb13077fefbd443e56489dbc8a7f64dc54 SHA512 e7a9fac7de7af62bfce539e2c0ccee1cf9ebe2b794636e8800a38fd49c68e1cdfb2d8212e7309c9dea7535ca193f46a96d8364e6d4eacedba579041a70df0068
+EBUILD kipi-plugins-21.08.3.ebuild 1353 BLAKE2B c019ec11e87a4386b9e167bc0278f01ca7d62eb740c441d06aa6bf8b09bae51f0eadef1fffe109d3ece7ea90a5d19eb7b08dc0009d2210f41bf405b194f0a5a5 SHA512 ba5f90f99e2f2127d59cbf65eb93dc611d383ac084bf918a8f1c7e61e97a3923fdc5a033d5b10e3829628fb8d2f05706ac5249249696565b250ff4f962f92e4c
+EBUILD kipi-plugins-21.11.90.ebuild 1356 BLAKE2B 9b9813e409361642cfed70b9f2c80ea1ae00a3eb8381900b451b9a36d3fc9af21fded748f66389048a145523a55f60272ae2cfe761ed0b68e1bcdfcdf8dd4f2e SHA512 bbbbe9cd3c5bedf5c1090252406a5d00e9ee8fa5aed726bbe613b2d03af18626e741c4f81fbd55e4ac948e184532b747d68ab4f8025e2e66ff2c2e5ab69fb342
 MISC metadata.xml 630 BLAKE2B d347c71da82cb4ea53518169a3057a8655b848237a90a24bbf97cd3d941c80c078597036f0702b11120944359f3b8304cf2dbf36747c00cbf1fe84121cf639d6 SHA512 b49115f94e3e806546bea4cf351b6cf02e319cb252ef6c676f59df88dce8a567e667256527e4dafa90371960560dda47e9991bcd187eabb8106cca4f9aa299f2
diff --git a/kde-apps/kipi-plugins/kipi-plugins-21.08.3.ebuild b/kde-apps/kipi-plugins/kipi-plugins-21.08.3.ebuild
index 2f620532a977..07c0bc8ab8b2 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-21.08.3.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kipi_plugins/ https://userbase.kde.org/KIPI"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="mediawiki +remotestorage"
 
 RDEPEND="
diff --git a/kde-apps/kipi-plugins/kipi-plugins-21.04.3-r1.ebuild b/kde-apps/kipi-plugins/kipi-plugins-21.11.90.ebuild
index 57dd2db1b293..9b65342757c0 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-21.04.3-r1.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # 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-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kipi_plugins/ https://userbase.kde.org/KIPI"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="mediawiki +remotestorage"
 
 RDEPEND="
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index ee7ee4bd9064..344cb6ff644a 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
-DIST kiriki-21.04.3.tar.xz 379640 BLAKE2B 26f1afe922c5602cc79d55653bf98fbfee03e579d51d6a0b25944f671ea1beeb38b4c8cef1fb0ca3789e234f1d707ecebc8a2775ed979ef93aaf9fe7457c62da SHA512 92e29859d6037b30605a3da54ee2e780c81c5515f28e0a03270812eda6597181ab5e413e02c1b0bb4710e9a4c3404cf7fa3c87cb991841b0baf991345556fb4f
 DIST kiriki-21.08.3.tar.xz 365160 BLAKE2B 1073e636ce07c91b4c714480ec229c2a639d71def8aedc095967e5b6c4152e66ee4db9173aaa385c4ae607c59d9c6d563ce41582212d1d0e0aa4cbfd7dbc0f93 SHA512 e55da0216781950fa8bbd1be81254d0797f2edff0188df373e9475f175108edca721ce0cc75af15bade705820703555fa104d1ad30b4245ee5ca50dd97118a22
-EBUILD kiriki-21.04.3.ebuild 923 BLAKE2B 8d8f9447fcf7db90acff272a49b66c16ad6d5ac5750d5d7b43ae359a8bf756c5ac5b8b67c20f1de38b3d492282e0f96ca7afc6c0ad0112a8e0b4fbe941305463 SHA512 725cb02f9f43de26a4ea5f3ff0e20a185ce6d845826619e238fd1f139cefabfeea7a506dfb6fe0c906207949523383268ae0e9a761cfe7a02fc8459f72b2670e
-EBUILD kiriki-21.08.3.ebuild 933 BLAKE2B 247d31951ff7b2be59ac38a6d488c35af3608e258951784087fdfe218cccf7be26be71b2a5df6b9074f978a49f48b63556e02bd75379ca4f6aebe8a09bc7d485 SHA512 1eff29a966dedf081b9bb6082e73a555549878e1b87699c6e848cf4752227db07dfe1308ab7d2975701c99225e7eaa7ffda4dbd2347a22da2650b4cf50cddab3
+DIST kiriki-21.11.90.tar.xz 365512 BLAKE2B 39765d8992454f10aabe339f7a67788702620053c71bedd169345ade69ace282bd9ad22dd24fd3aff7d252186470ae472c6325e00ca1d3ef6d23f8d5e1591489 SHA512 66c093689dd5c6b8d5c8964d5b7f8b8b60909c4212cdc64d96c1bea9705c3172ebd79fd74c67c29a935b08140b76c8e45f7ff6bfe69d2928e8cefa0a2233b6a9
+EBUILD kiriki-21.08.3.ebuild 930 BLAKE2B d1d85f1505aa26a3929d970caed29c485b935df30359c272f124cbc9eb61f72e0a732f9cce74038180b3e5734ba3ad2d1048b85329f929265ffe37bf9e194c39 SHA512 1ff153f2e91dd5f5022789207bc2fef93d5a1391ba59a0f17f76112c76da728ccc2b6f6f4e020e9ec4ba486b1fe3155a9686813bf3a31add461e9fb349906b55
+EBUILD kiriki-21.11.90.ebuild 933 BLAKE2B a804ab5ae2c40f4d5484a7b37d22865d1da690b3b53e96057d3e1dd35736d5511ee639f9a68342911d48e6a64a2df9730c631d4c2342c2eb7a2dff604dc2524d SHA512 b5ccd861d0df4d5410d9b68af3bf4bcfac47b245cb93bdfaa3c702a52797e3bab1519ec733eb21c048798cc0ecc16c22d740e6483038dbff45cdc8b2a628b8de
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kiriki/kiriki-21.08.3.ebuild b/kde-apps/kiriki/kiriki-21.08.3.ebuild
index 20928c6f6359..bbab9258657c 100644
--- a/kde-apps/kiriki/kiriki-21.08.3.ebuild
+++ b/kde-apps/kiriki/kiriki-21.08.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kiriki/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiriki/kiriki-21.04.3.ebuild b/kde-apps/kiriki/kiriki-21.11.90.ebuild
index f26de4727fad..63a6faa3a79a 100644
--- a/kde-apps/kiriki/kiriki-21.04.3.ebuild
+++ b/kde-apps/kiriki/kiriki-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ https://games.kde.org/games/kiriki/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index 493bcc5f6371..d3d7ba44300b 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
-DIST kiten-21.04.3.tar.xz 11312220 BLAKE2B 4d1a781a37cae93f088c49b4a5a996921b9c742feac8e4ea6761c544880243462d1b7d9db076a7ea62ac9dba556bf7a42d7aa92ac295b42e8955a37d987e1195 SHA512 22ae9b0ead5f6a8c30cff5fd5d29c7273c5e0844d0494b136d82245dc60d0d4635f9a83b61b94136554f545a7c3ddd51342c4072def2ba8050ef7a73f60da695
 DIST kiten-21.08.3.tar.xz 11313572 BLAKE2B 8e4f62c837870da509c53d60c217e59fc968f0a98c35182379c21f4ecf0bc61d076e07e1b74c3b9a243ea598686bd62bd4819015377c3ad6a7d956a6c07b0759 SHA512 2e923fb3b430eaf06e84afd6670fb5e01b0a31d82be08c3c70aab8d3afb9c1a01df551f6f8f5b02eb0e508a2c92d5f0b92e307598a8ce794c1bbe80986e60b7f
-EBUILD kiten-21.04.3.ebuild 1076 BLAKE2B faa6ba7aeae469fe96ee12ef2e0d796d13be0159e29cb234646f3cddf5d24c6b81b64a679575cf793774a7494fca8fc500a8b45f12208f8fadd901e54d02d44a SHA512 9656bf1d976d7c9c542c47b856df3df6dec372aca30d40cb49d4615f2ba343936c7f86677ee59b0b586da9f486ac1308016a5b8e6b74b1a439812027ea81fe48
-EBUILD kiten-21.08.3.ebuild 1086 BLAKE2B 2444a4e0d19e385a6a732dab743cbe4f17a91692d9d5802361e858ff535bee969e49f07d071d3d653a6d6568fa026a7e2ad95cccbe448331fcb4a04528ada2fc SHA512 5093f0f8d47150ddc8835bcea7b3e27dbe5cd38d6d928cfd23a02c52032bad4e1c7669ee4cb428c744680bdd1b713576ba0163cffff2f2ded82ade76f41d05fe
+DIST kiten-21.11.90.tar.xz 11314380 BLAKE2B 606d4eeb8637eb6a580ae7a76def5b64f081aed66e4981e34c326139663ce99b5d18e0f1c7e9f3674b466e4a5d5d25f46cc3fd805da8556120a43e6bef6a6aad SHA512 a7c1f163ddeda62426e60bd54e010ff722029ca98a42edaaf14c79c1c9a1b525105f3d52508ece759deceb1bbfffb3a0f63dbf4b3aa36d62d91844dc33362e2f
+EBUILD kiten-21.08.3.ebuild 1083 BLAKE2B e575cc44caf4eb653db6894ad08f37eeba221444975cd9ce844bd08fedf1c6e92b6f20689ee6b9a2d0347f20654670299bdcc8df517f561f876c191a31dc2791 SHA512 811864088e3051577becce4820f2b685f71de16937a745fda2a0499fd88b9ebd65bbb19af7963a327e4cb7592e86170ab9a1cd7fb37021f50175dbc36cb0b489
+EBUILD kiten-21.11.90.ebuild 1086 BLAKE2B 0e334d85bcca4098177301fed7fca9bb270439504d88b1404e069578835817596dba09b4d479a36a146a69fc034f796e1eab0a22c9b3906157791d625cbb3fb3 SHA512 0ba389886e1ff216677998ec9c441e8e7f20c39b3425c48a4f6bee900ac7fde88cd5e4cc6536a2c28a678954ccaab742345cb34b1cd95c25fe31bfe3442e1ecc
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kiten/kiten-21.08.3.ebuild b/kde-apps/kiten/kiten-21.08.3.ebuild
index bdf90c68f7f6..c0197e79c217 100644
--- a/kde-apps/kiten/kiten-21.08.3.ebuild
+++ b/kde-apps/kiten/kiten-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kiten/ https://edu.kde.org/kiten/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiten/kiten-21.04.3.ebuild b/kde-apps/kiten/kiten-21.11.90.ebuild
index f920dc8d91b1..ed0a8a17057a 100644
--- a/kde-apps/kiten/kiten-21.04.3.ebuild
+++ b/kde-apps/kiten/kiten-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kiten/ https://edu.kde.org/kiten/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 3ebe3d4aa659..f348387a9b19 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,4 @@
-DIST kitinerary-21.04.3.tar.xz 1823296 BLAKE2B 0c572472cbec27b0fa72042114c231a5e014008c1e51be1882ab68596e6260421b2831a169b592a998e9130ed0afe337de3cecfc42723fc531ba8d3223c0b430 SHA512 9fd0270c7c4f423e90aa103e2347e0a5caa2d60ee06c86ef245a83adf58ea22259d683472af5416c10e67245d65b845abedcd1e807c9981349adf5bb0df6a10c
 DIST kitinerary-21.08.3.tar.xz 1844012 BLAKE2B ad5ac81475c1f358d18c3ca967669799dd09b00749be74f539114940b1de9b0d0e7974eedf32789a5b6b0955948ef99cc5558201b168657029eee1ddcdbcea28 SHA512 d1fa4fc7d2c5205b396a83b63b21d0d6de578984e8c3d02d18f8e96c88c0ea636b20dc3415e16dd1fb82584fb5591a010c7d774d28544813f6321562f157608d
-EBUILD kitinerary-21.04.3.ebuild 1006 BLAKE2B 544630c04c5559a14dcea8a16f0876d28bae1f38c09224ef792d0a5237ceed6fa36efc9f039003cb01bfc062cc3b78c200d553459cd17d9ac6ad298f12b0227c SHA512 a5df89568b40f3a96f6cd14073c0d9d6986023f39f2efbe81ea0db64dcabeed2b4abfb91cad061e51f0a7cb0b49f4da9d724a16d6a92e5de36ed63814e8f6abe
-EBUILD kitinerary-21.08.3.ebuild 1009 BLAKE2B 2141863ebebfa44a43de2a0679ff3f8ee69a9415c6d034150889c5884e4d7c1db56e6b60a8920cc2a588533de7d5cbeade7b6f33e3a55593f0c4419c635550ae SHA512 9cd329ac1bfaab22ff87abd95e03c096881b1cba2cc9393e414f9082da8f3483a38c046fe50faddc183e4d6868b82094151cab7a08eaf3cce56bf84e0497b0bb
+EBUILD kitinerary-21.08.3-r1.ebuild 1191 BLAKE2B 0a676d1ee22ddf46b94975607965751772d5112c67916d1c9b361a8e118981069f802cbd574f7387e9e8bd4a6c4fbcb44d98faf928f083056e6d141f939cfb69 SHA512 53fa1668944576c02557a296a26ad5be425026803fc22129518dfdf0c0ef6ebde6cb4f0d56b3ddf48924046164de056c12d3a77b35efebdf649003c16b75701c
+EBUILD kitinerary-21.08.3.ebuild 1008 BLAKE2B 16831bd3ddf9128ab107eb3bd9e7d58e4ae9b0eadb7616cddf6d5f46f5324a8b3bc4ae64cafc45f8b1d41c735c1a64b654f318fcc9b71e08eb68b96cd3b733c3 SHA512 10618cf9b55d008f7261fbea93e4532b31adf59370a9005305bd4b89c73ae73bcc1c47063eb0cf8f978e902dd994581d7d34ba233a08652c2a86c9503bf5cbac
 MISC metadata.xml 454 BLAKE2B 47c8910a8a5d54d2ae4242734dd99c24bfc2aa9a753dc4732433717975dada407d62f2487f6ac57724087e73a622dd9056ab0487183cd411b971200d40736dc4 SHA512 e23256862ef83d5b99bfe3bfd1bedab7b1c1a50cb204e5aa1d431a17afb1450e0caf6460c804dc1f907f3ce9089d51d4742192e668a01408a7b4d2b332b6c00f
diff --git a/kde-apps/kitinerary/kitinerary-21.04.3.ebuild b/kde-apps/kitinerary/kitinerary-21.08.3-r1.ebuild
index 0ebd9e95ab63..c34d6ce900b7 100644
--- a/kde-apps/kitinerary/kitinerary-21.04.3.ebuild
+++ b/kde-apps/kitinerary/kitinerary-21.08.3-r1.ebuild
@@ -1,11 +1,11 @@
 # 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-3)
-KFMIN=5.80.0
+KFMIN=5.84.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,12 +15,15 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64"
 IUSE="+barcode pdf"
 
 REQUIRED_USE="test? ( pdf )"
 
 DEPEND="
+	dev-libs/libphonenumber
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=kde-apps/kmime-${PVCUT}:5
@@ -34,9 +37,12 @@ DEPEND="
 	pdf? ( app-text/poppler:=[qt5] )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="x11-misc/shared-mime-info"
 
 src_configure() {
 	local mycmakeargs=(
+		# sci-geosciences/osmctools; TODO: useful at all?
+		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON
 		$(cmake_use_find_package barcode ZXing)
 		$(cmake_use_find_package pdf Poppler)
 	)
diff --git a/kde-apps/kitinerary/kitinerary-21.08.3.ebuild b/kde-apps/kitinerary/kitinerary-21.08.3.ebuild
index 658f63ca1f28..a7f1430dee4b 100644
--- a/kde-apps/kitinerary/kitinerary-21.08.3.ebuild
+++ b/kde-apps/kitinerary/kitinerary-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 IUSE="+barcode pdf"
 
 REQUIRED_USE="test? ( pdf )"
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index 44348d36c3d8..88822cc27d60 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
-DIST kjumpingcube-21.04.3.tar.xz 295460 BLAKE2B 7ea47f5899c5f0bb9775edc9166b8194cc9434ad54529fef362c1324dbfb6f6cfdd5b43813484aa93782d2b19d9d3ea94a819d498a08bfecada0cdcbded46ce1 SHA512 5f82f9debad4b0136166a8427b3c58ca39658f194edbdcccadb47c848082e5c7364fc5f80a93628ec30f4cdaa2c127dc3ce5023bbb3aab9f3314972d7cb68588
 DIST kjumpingcube-21.08.3.tar.xz 322508 BLAKE2B 1abea08b11732806557ed9775f201ebeb8eb79c850c626664ffa8c2b2f1618e3ee722bbb4b2ad1432689c523e1d0500481e7f51ed5a94a5ae2bd96b1b22f810a SHA512 a5bbf57574c1a787c1a841e5f43105ac9f412a0e3f30545007bd3b424ae7f854309b7f77d5edffc853cc44741252ded342b0cdfec12d9dcc697c33a1b4f03270
-EBUILD kjumpingcube-21.04.3.ebuild 913 BLAKE2B 1524a93398e5d149cdd663a8c4906cd8747f21168c4a1a1ffa113913f8a6402436cea2b075c44924ef31c6dac16c6e0bbf99027d24c879960e23f038f4d37b33 SHA512 adcf72cd2651e6328741c38a30e6816084072e82c04518f960154e96832a2ac76db3b74551f1d66b7f251a5b08017705cb75eeaf1044466635d557850604b046
-EBUILD kjumpingcube-21.08.3.ebuild 923 BLAKE2B 4b51abaad238380c3a61efcb500dd21c39a252ec6cb3f67c06fd795735ecba0a6da2d867a07fa69cf9e9f8b60f8138145bb74ec233fbc23922f8bcd2ac9035ae SHA512 0b6e97ee4970a2800989ddb8c8a3e3637653cfe4cb6343c806d01cd6bb51764bf76400dcf56cbb5cc03a1478174c76c847d9adf4028de586dc554be12f0e9f21
+DIST kjumpingcube-21.11.90.tar.xz 322948 BLAKE2B 60eae65a36a2c6b0e49186f63a738b6076803e5bb254d3346395408bfb4a5c1c1b80740bdcf37a423a02e622b27d8f263607afb634dedc091f4274d1a771362a SHA512 e4f6f4f09956827754b775e0d323c05ac125c5f69afba3550e7f4c494225747b79b8dac965cf622c36138ee4ac568c4db8960daaf4a8d6b35f5614191fc94a96
+EBUILD kjumpingcube-21.08.3.ebuild 920 BLAKE2B a34e7a2272401d5581b2a4c2709bc84e74e7fd57d9af4cf6b8dd995d1e955833fc26e11456bd3bee7f26a68ff7bbcbf46bb5ae8e7f046755a6caa545f7bdd58f SHA512 a0c59811134eb7be87d650c533fa4eb0b64b12a98ed90ca36b05cc457ce01df8a0f0ba6a1e4b09f9b6d473b3c138ac11f9fcf533976ef4b1d4362d0102f8d111
+EBUILD kjumpingcube-21.11.90.ebuild 923 BLAKE2B 38f69686f308968380de79a9522c571128270a3b8e942a76bc1c506566846f5079b2f01b3e1a4faa531d32b36c4166bb2dbdfb4b60b26e3d3891e1ddb9254ecc SHA512 815d5cff113f1ab18e81ed7098b910a6ad9c52ddf7f72ef6a37b4944c585c94bd4e3263512570287c0b6d820ff1c0d0b83685fa381acd95aaef0f05cb75dded8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kjumpingcube/kjumpingcube-21.08.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-21.08.3.ebuild
index a403161d91bd..e3abbb2cb93b 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-21.08.3.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-21.08.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kjumpingcube/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kjumpingcube/kjumpingcube-21.04.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-21.11.90.ebuild
index 6d45c6e7ed15..190159927d68 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-21.04.3.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ https://games.kde.org/games/kjumpingcube/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 9cd40632246a..f35c009b70bf 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,3 @@
-DIST kldap-21.04.3.tar.xz 172864 BLAKE2B 50ebba423914a59fb48535890d58196fd12a15a7c7022a4f8465e1964d79c16d217ceb36808502764171fd2f9827bd0a841d0acb3f4589520df4bb4d83c8547c SHA512 01e9a36e212d912f86c43c1a6af9b56f48c5ae041b17e282bd2b3d913257a757e6b43bda756507fe50068b3ded17506e3427df0bed2a9114d327fb808dca3e15
 DIST kldap-21.08.3.tar.xz 171916 BLAKE2B 000dc5f94e55ad392258b8f67fdac276012e05156aa9fb264bbbce5d5b7a6e214148335fb57df08e8952cb27c8657be71e6771ea37ef7afbba2665d2c30884d0 SHA512 823ad11108ce9944d5d1806480ef87f1e379c0cda582cc489a392ef176a43196a0dad62142ac2b208c7b9f3aebbababcc24f97fb301b673eba6021055a9c87a6
-EBUILD kldap-21.04.3.ebuild 649 BLAKE2B a751a9ba9681906f2cb2da1cac7748220b3fb3d7aa56b91f3bb1c58a27dc5b9df52cb5ad06cb3ed788b01f62a4077ef5d9260d10ca41887960e1d4bc20940c8d SHA512 f6d0acedf17c8e6b95bec9fda6a8561404992850c0ba15ccce67bda0cf4b7eb8ab6eee3db8032ddc1bbe26f3b2628c86189aedd931e4f11f3cd84bc3c80addd8
-EBUILD kldap-21.08.3.ebuild 659 BLAKE2B 5c16c623be4f382a10fcff5cfd4fe7f2476633331bf0ea00b3624f4ab174fbbc22fd51bcbc5d340b9f13255f38be96de6b3f2c6ab260f768d5ea33cd4380c300 SHA512 44dc1b532a11579216d19dd223b31c42630f67b30003cfae1e165a98ed9b96f44a640efe88b5344e5dcd2277b0532fc497a2c64470470c6a79a03ee5518c3155
+EBUILD kldap-21.08.3.ebuild 656 BLAKE2B bcaec712fa0de1a8efb0ec81d8792496cadf8f2a900b4eb0b269ce678809f8db9a98d0271c65b5f88d422ce23fecd2f5272a95da0a63bcb428c26c168e7874a4 SHA512 ff487e0a69da9c92a06f293a0d83d7bd4964c83b807f2da2f3c1e9e4138ba8c5e34d935c9f3be0238a39c615a2c4c76b1f701e747c0cff5685943e133c5ffc2a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kldap/kldap-21.04.3.ebuild b/kde-apps/kldap/kldap-21.04.3.ebuild
deleted file mode 100644
index ed7c2e8ec10e..000000000000
--- a/kde-apps/kldap/kldap-21.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for interacting with LDAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	net-nds/openldap
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kldap/kldap-21.08.3.ebuild b/kde-apps/kldap/kldap-21.08.3.ebuild
index 005425aa7109..aee819a0f663 100644
--- a/kde-apps/kldap/kldap-21.08.3.ebuild
+++ b/kde-apps/kldap/kldap-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index e10fe9c9f8f0..163d1852ecec 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,3 @@
-DIST kleopatra-21.04.3.tar.xz 2119036 BLAKE2B b4690d2760ab814e36a80ef36a0584fde1c2edd97e1dea1f939ac7d3cddd4c8b7b9210f0ba58d83cd680a080131c6d61cad2bdc5eb66bbeee3aa365b6a547d37 SHA512 4cc6298b992d1c917226caba4f3e6592cabd33eaf9164e94fb58ecdc6c939417fcf88e018b0867e6d5baa8eddc5de6b64d9a7bb137ad641085ddf8b8511bb5d3
 DIST kleopatra-21.08.3.tar.xz 2132720 BLAKE2B 8be23be27cd5b1154dd18a268aca4b1277f580b684828b50aae3be1bd44caa88e475049dd1c0774f71a876c65a7f2773c4ed0fb34e6f4b2ac0512ab6d832409b SHA512 b29333dd8d9f47b550b553e487ef1cf854cfd8ee18cbd77ffeaabc68c7314e3f06a013037a109dc03d4ddf591b894478d05f35598332c094731a725c80e69731
-EBUILD kleopatra-21.04.3.ebuild 1473 BLAKE2B 3858a0b284fdfdf406cab5020404430f9b2979f4604e49d3d696e4c2dac1cdea0f33cb05a657c16aa4a25f72ca0778e0a56277c95f987e5c0562127b725708eb SHA512 124548a95a2ea45c02615c6fd42b37331db5ad8cde47ff48167cffc11656ac39d1adb4e3b4a3460966cc2158ad64a9a34b52ee6537aeaf109a82eaec2d96b4d3
-EBUILD kleopatra-21.08.3.ebuild 1474 BLAKE2B 4ca2bd0e61de84f3f95f7ee54c75927ac3648f06e6fb39dd0702710ab4622f89b9376c5f7e7494b898a5344ecdfa97b566ba2e1245b3c810827b5d84026da5c2 SHA512 e0790b9dcfa39457409058a6f551ac663d211ab005417ee3bbec7231efc1ae1367bc4906867978fde1258d58d614ed5edd91a2b97480469fb27f123302b41839
+EBUILD kleopatra-21.08.3.ebuild 1471 BLAKE2B f0be1405f00f926ec6428e2551bb6975b71f0ca82c018f9d7a3c0b7d92e4afc5652280ba7b10bcaa3110a90a0ec192eb27a3027b4b05a5ec4b30c864a3f4dc47 SHA512 6df54015cdbc35b0246fc3f6c3e5f134e6d385d4a03fce840df1a4f133dafc59ed45cf288b18f4a559a091e6659e789793ff011f2bb9ac072e778a538c9f098a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kleopatra/kleopatra-21.04.3.ebuild b/kde-apps/kleopatra/kleopatra-21.04.3.ebuild
deleted file mode 100644
index ea27d33017e9..000000000000
--- a/kde-apps/kleopatra/kleopatra-21.04.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://apps.kde.org/kleopatra/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/gpgme-1.13.1[cxx,qt5]
-	dev-libs/boost:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
-
-# tests completely broken, bug #641720
-RESTRICT+=" test"
diff --git a/kde-apps/kleopatra/kleopatra-21.08.3.ebuild b/kde-apps/kleopatra/kleopatra-21.08.3.ebuild
index 80d79585fbf9..1eee262f8dd8 100644
--- a/kde-apps/kleopatra/kleopatra-21.08.3.ebuild
+++ b/kde-apps/kleopatra/kleopatra-21.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kleopatra/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index 789963f6af2c..5036fe038ac8 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
-DIST klettres-21.04.3.tar.xz 47137188 BLAKE2B f62f524b5987428bbf1d65fb73c57150749e3f5ff629f1f9a80002c6e67a82e48e8af5a5fc3c0b599fbfc9b821a5c5eeabd9b27381d7be71fabc78f5c00be3be SHA512 33cf32acf0be7e62429e36f12bb84e04b67770bc07a238de8959c719c0fd6aba9515c56eada2e6004144e2311ad3f899040f8775d494c6434fea9482cada104d
 DIST klettres-21.08.3.tar.xz 47138552 BLAKE2B 70c6700c39977aae0ce9876aae1fe3fb77be76373ef6ffb2e1ffa7afaca352a7e73a8d0f57b76a727097d5d8f744b6fc99c95d3a90a68612fe69c18e72023a46 SHA512 aac66aa6e8b87d186b7f72c32bb924292b42396b594a18be4bbd7a5c57803b8ee5931f618f0085212b200e17e172124f1e804d84b408fee8c00bbaf843cd730e
-EBUILD klettres-21.04.3.ebuild 865 BLAKE2B bfce527ddcdb489bfb2ee2928f558b876f58a20f69d6bc7a5f637f116b15467d9a34622b65a5f9cd3fe1db8fc9bfa87d82f0d6cfedffb58c3cd24a1cf9019837 SHA512 ad81bac809cd6565ae23e1c9c3bde51c2cbbacbfe7be45fcc54a6e8dec049a2cd2c6582fd2f5656dd3b7dcdc77815762117100d7525bd3f363b34fdbb79facd5
-EBUILD klettres-21.08.3.ebuild 875 BLAKE2B d669b24684fba7ce9e2a6e0394de4e02957b09965bdb6c4713882582fddeec933d1beb6d55d52e5bc4bbcc4180dde26875441378f16933b94ed40782bb8368f1 SHA512 87c200565f7e18535e3a789fb3e821917e64b8a69f82ed0b44c3a8431ad457482ecc95a73639a1a8a799a6b8cfaa7ba45d5fe2392e0f162ed5817072f292fae8
+DIST klettres-21.11.90.tar.xz 47139952 BLAKE2B a9fa95c6972ccf1c30de86a7fd8a50fd1b833ed30108e9d63c60c3a2af291acb8b3092601afc4207bc20d4c4ef806a99d07c9dc7266c83b83f21956ca6f6bf08 SHA512 7af918c79904d280ed6b1dd2021a58d0808a3802448a5d58133803438fd695282562a4a8923e5b59a81ab6625ad03290e9b719cef32be0afe3d3b111bbf09a79
+EBUILD klettres-21.08.3.ebuild 872 BLAKE2B dd51bf709b885a77f9e2e107aa259cdf0a1db196ee07c9e5d42e5df12038c854645e1a28a803bed36ca048d3ce8c57f5d7178db2fe1f5a0d4196d393b95deb72 SHA512 9c95c57eef4f1418bc24543ccdae0d39b4659ffe6cddd27b7fab15cf6cc368ad2373b333f07548956a39985afe8ccaa11b089567ddd001a18fb00cad8b2be410
+EBUILD klettres-21.11.90.ebuild 875 BLAKE2B af5bf5811890ad807039cebcfd348f0e92f4db2f9528ccd33aa87d93d2983dde4deaffcfa673cf98e032e2aabf1247bb01189e36a4aecd3685ee4669745a7a01 SHA512 4537d9bfb3d85231b1b00027a0626d54abbf2255a5466693ed3e0fd54a053af37eb64d18f680c31aeda1ac0f9ce457f6756f5787163e861d5b79c27b8e2826b7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/klettres/klettres-21.08.3.ebuild b/kde-apps/klettres/klettres-21.08.3.ebuild
index f663978de59a..bf6d7036ffb0 100644
--- a/kde-apps/klettres/klettres-21.08.3.ebuild
+++ b/kde-apps/klettres/klettres-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/klettres/ https://edu.kde.org/klettres/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klettres/klettres-21.04.3.ebuild b/kde-apps/klettres/klettres-21.11.90.ebuild
index 4f19b3ab793b..40df4bc3c05d 100644
--- a/kde-apps/klettres/klettres-21.04.3.ebuild
+++ b/kde-apps/klettres/klettres-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/klettres/ https://edu.kde.org/klettres/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index 6a2913fc7171..19cd1a9e8e0b 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
-DIST klickety-21.04.3.tar.xz 1394232 BLAKE2B 6f8b255261734bbcf3d5958309239b083ba5751eaf75579ba1f350ae913a7c30c3d3681d9ef7c7529a49fcd6922ca2604fe8ed5bbc36276e3ed260165dc0f592 SHA512 115d6aa0ffeb0d606c746f5cd9e4f455335c12250663a034efd00fa4d08abca547ba4de355bc79f70bc7accf8648d5c155cfeac4ae0c50e6d338118125b55422
 DIST klickety-21.08.3.tar.xz 1491556 BLAKE2B c02202c56226fd6cbd10acabb524b94c2d1b68ba3099c898d001283db88e2bc402f75a12690b04e96fa884e8cc90a3c4558aba843b82574da6ed64ef437f00f4 SHA512 8037f68d26691f906db71d7970da0e1d183ab008d47b7ecb6efdf48a6353eada3b7d348a98df64faf32ad2a7bdb5376bdff09e5fb4d83bf4106d45c48ec43078
-EBUILD klickety-21.04.3.ebuild 1013 BLAKE2B e6ff4e7a83250a3f0863934951435ce8359df6f0382d43cfc78f432cc4968bda25c60c12a0024b27af5a1f4ff8680dc8ca340f087457be63b908df99b51b93d1 SHA512 c33917aca09c950f58e58a7a618955b8dd42a1732b54242f3a1b4920129b052e21a5937dfb39c51a70a296b9da810ca80292724be7e4e33d40ef37da84f3d81e
-EBUILD klickety-21.08.3.ebuild 1023 BLAKE2B dbd54969214a0bd4d43d35a20cac73e99dbcfe2e7ac52db3e54f3554f51bc7465a5ab9da35d77fd40713bc71aaa6bb88abe76d26ccff3060786ed32e976231c1 SHA512 3c653d04920f9abf4d98e45f45244414f55f5fd65edbcc36c2fcc130310c4a2508dd8b6247f6c07edf625f86ef9c4d2a5fe5ce03d9271fbdc1dcd6a639a0e9e6
+DIST klickety-21.11.90.tar.xz 1492316 BLAKE2B 1da7f578cf33c9e7b468a1a3366dd09d786693939a05cb38145cd4de33d77e80dc27a11ca818a1dbf2b6b5c7a5592f4d44a77334d599a5c642d9fd1b2b3b1868 SHA512 9f8bac00ded1aaeba28b7bfa7ca6730ae7ea115042a1d4abf8fd5ca18c2a8de21fbdf6e008e867b5d727405c2549cd08a4ed095768011c89f4a93ea730e52c59
+EBUILD klickety-21.08.3.ebuild 1020 BLAKE2B 3cfc30ad221119d779646e98b5f1b372626049609d86ddb2e2757b36c0768267d7cf4cdd8a8ad0ada459784c82786e31eda8b36755bd4dd773679cc1e741ddc0 SHA512 25ea362977184c7d779462d533ab21ca28eef4a74cd27df3edf9e1058f8c8ba271c5cfca0f589f4e7097b1f93c346d83dff515a2e2283a5eec833aad83a849c9
+EBUILD klickety-21.11.90.ebuild 1023 BLAKE2B c47713f76194876598efc8cf8c80f4098cc93c11218587e7b295659813b98538b9b443dee4f2b5d9b841a66fac579e9353b53a3a300f0e79eb03db0618a1d42d SHA512 fef767ccddd092fe7652d1ba0fefe67539d3516a6460d1dcc9025d1afb40ff040344e15d5535b44bb9fc58a22e3d52185b85e0bdd22ddcf888134281a41023b7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/klickety/klickety-21.08.3.ebuild b/kde-apps/klickety/klickety-21.08.3.ebuild
index f1ec0312c9fb..ae10faff1a76 100644
--- a/kde-apps/klickety/klickety-21.08.3.ebuild
+++ b/kde-apps/klickety/klickety-21.08.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/klickety/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klickety/klickety-21.04.3.ebuild b/kde-apps/klickety/klickety-21.11.90.ebuild
index f50f706a36bd..2dcb08a06847 100644
--- a/kde-apps/klickety/klickety-21.04.3.ebuild
+++ b/kde-apps/klickety/klickety-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ https://games.kde.org/games/klickety/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index 528956e2b0ff..180c623d5705 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,5 @@
-DIST klines-21.04.3.tar.xz 1794180 BLAKE2B 848edaade703f411936ce644b29790a3f9ee6b19f36c676855d3f0d78e15b3fcff06bb51a6cb2e6d055eb585373d6e511113bd6b7c002cada5dd1c392e877080 SHA512 1d7d04c1e11b3e33a95749ec8516459bd6c6399e6d08f1065aaf50499b8a778256c826ea9c8107c264acc08622834aaf65d817e90ca12d3fd4b4cb033c2e4b0b
 DIST klines-21.08.3.tar.xz 1723744 BLAKE2B 3c7ae796f33a97679c8110789e29a82467b1efc970f568bc7522fe2a8de0413c3cbbc13f4f9354621279df486b80419275f0308eaa3d91726d3af284af448791 SHA512 1ac5840038a43a437cc44d81c1960e441ec627e0b72546ce65961fc1aa6c5b3eb561cce9b0f129340f9d25ac8e9277b1e1e42d328677ea76d9e5b5885bf13724
-EBUILD klines-21.04.3.ebuild 917 BLAKE2B 65a44c78fd48899f5d03df165bdcf8a5e20aa62ec94831585b82cf1a05de524a7afd8ac606c7e34d37da557da3ccda08ddcf27850471cd2ff16f63af75544611 SHA512 ec5914d54bb5a4f0f59277d6c4c986cab187b6edc407032dedd64e924d8c8298bed94b14ef6e12eb0208d529fb0d6f931402132651bd1c895105b4e084f725f6
-EBUILD klines-21.08.3.ebuild 927 BLAKE2B afc10e9eea94c0285142f96773f34ba0ef6fec78affb8a7b12d286159abbef7a06cbaea10d068de8e8bce4aeee4242c0d97ed80365b2ebc337f0281354e80844 SHA512 50d00c10b6e2b925656731843ada052e80621a29bf2d61efbd992b5b133916f2532a892c17744e92a96e0636367148baa91e8526b48ecdf75dabb89480d4b4a7
+DIST klines-21.11.90.tar.xz 1724292 BLAKE2B 63919d468928b28a162414abfb3b6545a6da51826a1872080c61b4489dc5afe6bd18b4990c2c3a9b4d061538b2348f077fabd7bb39adaacc51c8e3349b60143c SHA512 350aa4b81947c82eea11e7a3e5493cd54fcc470747825351f15e6d9224b59f69348ea4eb1625fbe0e142ecb7b9a0eba42047ded8646df9cad67a17bd8e464489
+EBUILD klines-21.08.3.ebuild 924 BLAKE2B dd848b87460962eb1a12fd40b4039ed4f041af3b5b360fd29910abee295ace2abec48ce3832426bf2a04dbb3f9e7fe2a37491aafdc0381780406566186350c22 SHA512 a2b6154d5d34ae9c2aa6291c95725766240ce12a47b5d7fb876b463db7fa4289e399df18886efbb2afd86dca96fcbf4854a094846b6fe919be168acda98931b5
+EBUILD klines-21.11.90.ebuild 927 BLAKE2B ee3ddc1c5119eb593d9e0ec7a6c438bfd98e4441a64df49e38664f5b15fe48c5a7b3cd6ccb4bb85eb94389ad21d0d843bbaae0f8d5cb53dec81ce562e8c6018d SHA512 7f62178613ce9618c6a0a6d3376ebc59ed0646da656384243bfbda0996792d8dd1ee04291b663fb44695eafcff6ed90eaed0a58eda3a2ba5e34db58b5e7e5e09
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/klines/klines-21.08.3.ebuild b/kde-apps/klines/klines-21.08.3.ebuild
index 402a087a60b4..ade0c45b69c0 100644
--- a/kde-apps/klines/klines-21.08.3.ebuild
+++ b/kde-apps/klines/klines-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/klines/ https://games.kde.org/games/klines/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klines/klines-21.04.3.ebuild b/kde-apps/klines/klines-21.11.90.ebuild
index 8fdaf865a02e..16282c96f5a7 100644
--- a/kde-apps/klines/klines-21.04.3.ebuild
+++ b/kde-apps/klines/klines-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/klines/ https://games.kde.org/games/klines/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 3ef1375ee9f5..6984580f522a 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
-DIST kmag-21.04.3.tar.xz 705548 BLAKE2B 0a2c353317189e41e09d40ea091e6f075a6145a7090ca3da8bda379ef75ec9905aff7f0f7c146fd1650662b95e686de58935293c8f7bbc09adbd31554219910b SHA512 b8893a9ebae7c0c2f15b27e0219f51992a3670783c5d84caf9b371b72cf0ec8d80580e067d2dd0d1b6ed86b80d71cb5eb383cd45f31dbd27809e6d73fa5668fa
 DIST kmag-21.08.3.tar.xz 706224 BLAKE2B f5e61c934ee26a49732291e69fe23ddc09bff22eaeabcf3375c8872c97c913c10026593a8f500a19b20f844c4d2cef1620150d87b3e72e9fde3511ebd6cba99f SHA512 b78d211b147134717f7f29ca2f4beade6f6b74310c8a1099befaa44f43cf4c3503cb72050cc5e41d8ca6dff366c29b7e80056d8e44a530cd2213987849cdfbbb
-EBUILD kmag-21.04.3.ebuild 938 BLAKE2B 484f0370a931f030085b73668c3d4899aa2f46d44c681118f4d4c93f9f3f727c168b770823cbd2f04230c469c43a88fbc11b5d33d383ed72f9ff56d407e2e578 SHA512 051cde4ff9ad39a3b800045aab604fe11bd07d7d287d667125201b474d346f08bc9de80dd2dc4fef97411c70e34dc6479b44e3efde889ebdc8752995689652b5
-EBUILD kmag-21.08.3.ebuild 948 BLAKE2B 2783190e25a3d7feba5a1d6738a4eb31b575e57f1142d4a9a449c921bf5265a4a65b0e0c2dcf8a092e3a2e5139d93db05f96a3f159f0c383d57e4186007da8e7 SHA512 3f1c39d23850bdc93868b94d9ef0d2bc95877d63027de6000a615065dd0e4226d88743104acfa6bf59f483672a0e9e21c695e51efb30d762257c6db19336c39e
+DIST kmag-21.11.90.tar.xz 706156 BLAKE2B 2bba0306d85c44e5feeb36dd79640df4fa5c068662f5ae39e1d603b6c44ca208f82e7b9f4558cbf57d6852e02709c7e6fa2e48d2499c75a152767f79bb4b2472 SHA512 e95759150f160d4761c7e1477671fe69f87a6fc690d8f34d2f4ed1c71231a07e862178cbab27200873cce38aa6df6f060219ae89c5ba271bdfc17a72a2d74ba9
+EBUILD kmag-21.08.3.ebuild 945 BLAKE2B acb9430ad4e9a905482b31f042019d71d86907ae92082110cb61087d5201f655a7ac3d5482a072699719ab7feecb17ed7cc34364fdec92784979020e88020d9a SHA512 5e21456190dd7da7b4adb6993cf515c701bcc0711e121e0317e091feb3d60edcaa0037a090168318fada4b9bd26148ea196a139a1009441748dc07ecfe2ec667
+EBUILD kmag-21.11.90.ebuild 948 BLAKE2B 6572931db92a4b92ccdf6b4a8c2767cb81a1db6cc30400bc77c7bdb391222c3fc13c4b92e61fe00700dfc01bdcc7ba95f96eece3aa04fc4e8141385fc13afd93 SHA512 d51fadfbaf89333712af94b6798f374203c12af57767ee65a236d39fa84833f392d44f361406810c375a39d96de2cdfd5d6b222fa410846c3d884bce104fa3e8
 MISC metadata.xml 400 BLAKE2B c475c15863f12df6a31b8bb59b12b1dc8d66dc6651bfde77f73b1d546db577593a3d33bc9dd1434a5d16baba61c1cda5d22b3b31648b5601dc8c6e7746090c8c SHA512 bca2129e14ba53dd116f7404127deae59092bd6b4ecc239c0f9f4dcfc8076d22099439d491c6ceab9033318273480902277530a83bace4d54cebb2ef854edc51
diff --git a/kde-apps/kmag/kmag-21.08.3.ebuild b/kde-apps/kmag/kmag-21.08.3.ebuild
index 14aaf36e3c8d..bbc2b10c3b87 100644
--- a/kde-apps/kmag/kmag-21.08.3.ebuild
+++ b/kde-apps/kmag/kmag-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmag/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="keyboardfocus"
 
 DEPEND="
diff --git a/kde-apps/kmag/kmag-21.04.3.ebuild b/kde-apps/kmag/kmag-21.11.90.ebuild
index 292f51a41607..4f55f2cf3847 100644
--- a/kde-apps/kmag/kmag-21.04.3.ebuild
+++ b/kde-apps/kmag/kmag-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmag/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="keyboardfocus"
 
 DEPEND="
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 8b71ee676a38..55c128fe2228 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
-DIST kmahjongg-21.04.3.tar.xz 3440632 BLAKE2B dd700d9bd0d3a7e1211df6abb63d829058e52e88c0f965048511abf16fa1820606d42c7dc9be9cf8a4fe1426bba3db79c007a284b5aa393d9a5003289f5a493d SHA512 bb485cf00db8fe910dcc8784949b2320d58b0d6ef0f9c22f4367d15959369172bdbfadfcb869b2fa62815004d5da9acb97fe661c39af697fb5b12b90c0ebe41f
 DIST kmahjongg-21.08.3.tar.xz 4068148 BLAKE2B 9c2d4a4259df66bafb9641980afcb0c8292fe491ee9edb840f235f697f7e4fdc070691a46a3d4317ec67ad83e45296e7e25e559cf0938822fba7a1e9239ec117 SHA512 7516e2c8adfa40c2ad18c511794e28bf5c623fa53ea7fed33301ed9d22bbc152f2cf9c2851ba8e54d02878ce05ca774a01a3dc3c1cbc1c83ca4174dd530b65fb
-EBUILD kmahjongg-21.04.3.ebuild 1077 BLAKE2B 709bd7986d2baf40eae0308910137272c1c944c2b90666003402c5a73b40d76cdcb1b5738d996444a65a2d46307baf31b8158258f31b139e3846dd04d5fe80df SHA512 290a819a4412b2a417d0b7535ba72732abc520eed65bd4e50a2abd630f79d8a505abfa6c6c9565e6d9db2d968d30489bcfb04844a5d71d2384ac11f8aaaeb537
-EBUILD kmahjongg-21.08.3.ebuild 1087 BLAKE2B b84720dd7d244d386b0c8826607b666a06e8c835e41f7f95eee4637e779869b90646f658a4fb5c1ff106ae3d29602b6fb01a6a4fb10c5c1995cd9fe9c9f6ea05 SHA512 5fa082d2c28c28c7287e2d1fb180a46d22faf1f7509ce7526cb02d5974b38a1cefdffb230a81b6466d0aca838d7faa2881736ef43599df1b49a2715d54c514d1
+DIST kmahjongg-21.11.90.tar.xz 4068284 BLAKE2B 09a17587f334fae2ecbe11f43e0df74dcb84cfe5aee2a6bc0be4fddb8116baac950eea438e691711799bc7fbeca2b3a769e4c9f03a728ee3d365cacddede9655 SHA512 c659c43e4e9185ba6cb0b03ff7414522be4b8c4a01b0266f99b611c5d779d92ea2435e3d4acb6ceb9678f0bc90122f9943316c40ed617ed0b16ac638337b0d9c
+EBUILD kmahjongg-21.08.3.ebuild 1084 BLAKE2B 6617f52ac5b94482eace9793072fc0ad2c6e0f5e4ad028897865742f25b61a0be7b0c82f6cc882127221a0421c805f2d8fae323af47a0e8cc436a7ba7881d8f0 SHA512 d71eae8016625ad5b66c7d9e93366ed015ebc994a91ccc447dada129e33a5920a00695e2f48be57880294834486ee736a870d032b7efdaa864a17506cb068b19
+EBUILD kmahjongg-21.11.90.ebuild 1087 BLAKE2B f2d864bad107889882de017b987975865a5433269d2785d25063dacf493785552a613546ed18d66f19a21880daf2717e736b4f9a9b04edc679109304f6a86fab SHA512 33260226096aba44242106e970cbd19fe31710585a19cda5fac888e55dd6661114a8800d9374b0dda44075b66b0103892f7612ef29f16a41b56f4fc5f28b2cab
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmahjongg/kmahjongg-21.08.3.ebuild b/kde-apps/kmahjongg/kmahjongg-21.08.3.ebuild
index 6fb280a2973b..a9ac5caf49c4 100644
--- a/kde-apps/kmahjongg/kmahjongg-21.08.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-21.08.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kmahjongg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmahjongg/kmahjongg-21.04.3.ebuild b/kde-apps/kmahjongg/kmahjongg-21.11.90.ebuild
index 5e3ff51c5b91..20ae53c03eea 100644
--- a/kde-apps/kmahjongg/kmahjongg-21.04.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ https://games.kde.org/games/kmahjongg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 07f76a479bab..372cdd08e3ba 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,3 @@
-DIST kmail-account-wizard-21.04.3.tar.xz 166524 BLAKE2B e57c7dc5d649d491b7d4105e32bcc90f8db3cbd1c011c639a044c6de512c2618b03a4567251f308a237eed15cfc70c2a6fa639da1605730df7bbe30fac49e153 SHA512 075131a68dd02d61311107a8e3050044e095188b52915f493a2038fa384855de22823aca284f3aa856b388bf1acc03df2fcc3e4700581656925c2f079aaf3bc6
 DIST kmail-account-wizard-21.08.3.tar.xz 165948 BLAKE2B e4f91ced1630c21480576ecc825ba0c572538b04e2ee80e1e8bdeee38852c306bb03d3fb82add2754d866e36b5ca0a9e221b2343fab41336e73c09d5aa4e8c0a SHA512 6070d8689f5c521662d74d1f9632ef50bc63f9387fd8e7b38acd73fa678d30d18122012fa8e6d8b57e3eef978b6f1339d00d9ada36e9b179db52278df77cc5cf
-EBUILD kmail-account-wizard-21.04.3.ebuild 1609 BLAKE2B f6c6a738dcb803a7f7498522f54222ef29bf12ba4c54901ba75b2ecf0b80b99cf16d901ee349807711ede4d8a5239c76ac3a7148c4544b1b73518710de118cd5 SHA512 140f21b59ada9bf0c5e7df46584993a244bcb263915ea67758b9a61d033aac0666e98912069d792146ce370e144cefee40e4502e1e3d5a49baeae7c7f2d72b54
-EBUILD kmail-account-wizard-21.08.3.ebuild 1612 BLAKE2B 7eb2fcc24704474e4cbdbbab6ffa63fe836fbdbb0675be06dc849ab779ee71b6feccfaaeadbc27bba88292706ce9c855991b1700905457f3909346e3e9c81e9a SHA512 c93ca43b3ce92ef6910fa6620f65d26b87c36eaf72f896a7e07d214c3d8b3dd793e0e1cd028c52ff31f08c0105340e4e90ba852d952a1d803dacce15d16c6e1e
+EBUILD kmail-account-wizard-21.08.3.ebuild 1609 BLAKE2B 016ec3693f568b6fdc6cd738c26c811314f596b7a7b75db559cb06bf93930ebc287dede729311303355095ad4b37109e5348755938a19ac416e8c738377d7272 SHA512 ddf619a5506a9eab07eddc2f86074c9a5e6b13ce5aac1eb8eb1f74f4cc5f625f6c2f14ced8c8544bc3af0199a3ab5107d24496727d0c68371830a33d7d4763a8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-21.04.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-21.04.3.ebuild
deleted file mode 100644
index 42e8bbefe668..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-21.04.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-21.08.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-21.08.3.ebuild
index dfbe756440af..48258907ceaf 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-21.08.3.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-21.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 66be05238b80..0e4cec89cffb 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,3 @@
-DIST kmail-21.04.3.tar.xz 6485408 BLAKE2B f2c1a1de707dbd9c8c2d2567670d9abec49378d847128ca1465e251ffb5e25a5a054247586ad33037925dfaf9ea014db01b7a1b1baa6b35fd689e7fdd0b888fa SHA512 348d67ad825b4e2a4066736a58b71301353258be5cee1c2252ce0789866f294e4145c4556f79f918c47ffea015e4cbed42270964b7cd1002feafd54fed8a9895
 DIST kmail-21.08.3.tar.xz 6929860 BLAKE2B d6adc4cd78c880dc61aaa6b9e443b658d49513d24f472877f2de3a6f8c383c8dbe7db11614540e00dc01a0e3de918a0df4b11c312287892a1ee66faf64d825b7 SHA512 f92ecb2a3095e5a2f3fec67f476ebf8c7cad38d5e6f23ed6ce67fc6244e5a3ec590aa85cec847bda50b47896a1a77079727980deab5d58e847a0e4b1e224e113
-EBUILD kmail-21.04.3.ebuild 3403 BLAKE2B 05bde189f3de3f0c7e785d4c6a0c210a6ff585978bf889e0e9988d63a5d754b7890bb63f2d9236c97b197aef5bcc9e2bece5cc68def8d6225af399ceb0541c93 SHA512 a60aa5c94064b548df242ee9997f3e26e61b809994669bfc40622a7bd0da4773e9cc70888d0bf3fe56512b821a04a3256ab8e6d1237dd9a66e673668e671d98d
-EBUILD kmail-21.08.3.ebuild 3399 BLAKE2B a6bcb260b9b89aa59332708aa824f8da497225f260e14be39f77eb8d1c526ac6b7dcb2f3d0885c71b57413525ccb6f68a34ba441c1921474c99e97f04752e35a SHA512 37b266eb7bc483dbdf27f308304cd7858da5f73ef5845cdf1c92ba00b69e558af5fbc4634f9f779c075762d7809938ec420fc904e5af0d940983c616d37e47d2
+EBUILD kmail-21.08.3.ebuild 3396 BLAKE2B c4ba4e8bea2a71233fa62171150b05d69e8be0830322ebe8958a9d1fc34afef5f3e0205080a4f28f319ca20c333b37c14b2febaa36971cb2b532baede5d84bcb SHA512 8731b2bdfc8ae6b264033edcf40b1058bb82c23c1397de133fecc12a2ca4c092a9987470a47121edbdbb1313d78b36fdfa3b6818fdc8d9611424af4d2ebf339c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmail/kmail-21.04.3.ebuild b/kde-apps/kmail/kmail-21.04.3.ebuild
deleted file mode 100644
index 6ae82f477ef0..000000000000
--- a/kde-apps/kmail/kmail-21.04.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
-HOMEPAGE="https://apps.kde.org/kmail2/
-https://kontact.kde.org/components/kmail.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="pch telemetry"
-
-RESTRICT+=" test" # bug 616878
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-	>=kde-apps/kmail-account-wizard-${PVCUT}:5
-"
-BDEPEND="
-	dev-libs/libxslt
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_PRECOMPILED_HEADERS=$(usex pch)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "virus detection" app-antivirus/clamav
-		optfeature "spam filtering" mail-filter/bogofilter mail-filter/spamassassin
-		optfeature "fancy e-mail headers and useful plugins" kde-apps/kdepim-addons:${SLOT}
-		optfeature "crypto config and certificate details GUI" kde-apps/kleopatra:${SLOT}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kmail/kmail-21.08.3.ebuild b/kde-apps/kmail/kmail-21.08.3.ebuild
index 03bb1645d36a..30253db073be 100644
--- a/kde-apps/kmail/kmail-21.08.3.ebuild
+++ b/kde-apps/kmail/kmail-21.08.3.ebuild
@@ -17,7 +17,7 @@ https://kontact.kde.org/components/kmail.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="pch telemetry"
 
 RESTRICT="test" # bug 616878
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index d71b21d74ec1..6bf7586e1ade 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,5 @@
-DIST kmailtransport-21.04.3.tar.xz 174100 BLAKE2B e356305570376df2c147e7c2e768f427237c05b56f2325d89774a067620c9d5162dfddeb7d50f7c5cb84b7270d338016967541c2fc67a52d06716cbc990a1228 SHA512 aa4afb187969faee3b6fc5567595232ac5aa74aebfa2e407e0ad10245f4bb26da4fb8beae17b2a2a3d3d8b676198e1eedc694f4ba669927b3a6eb50be6703c30
+AUX kmailtransport-21.08.3-CVE-2021-38373.patch 2459 BLAKE2B f2bf0a072134e50d963ac180eb56cc39b3ce87cc1656b2fed50c949f17c8cf28fcfa7defdd22f8811a79142cde08b4c67583a340d58dca1d434b269bce678720 SHA512 e6c13c7ae6ee92d73aa010398642b932b840b0c95036c18a19bd22083ae28a632208b181d6b6465bfa986e3a784831420b5473abd46ac0eaba9d0dffbca7decc
+AUX kmailtransport-21.08.3-fix-crash-when-response-empty.patch 1134 BLAKE2B 12d52676a6cc6b7b92ac08c593e82887195ae1ee237a0de73e250399cb74f129d7f307b959f1f62220787f6d8d660dff8cd6a66fc32ad2c7029ab4bb5d61af7c SHA512 34ffc2c911ef339b437dc79a31396eb5b58782d3548ee74479b3bf2a44bf92956e5ca86f96ec4ece0560d1cac4bd09a28655540e9cf316be5d57c9328f98b241
 DIST kmailtransport-21.08.3.tar.xz 172708 BLAKE2B 4c6faf8a4ba6d94af0f67a1785410dd5ae761514249d9a6fe4ac192de48ea38ba20427e33dfc0b7b626e2e896df6e042f7aa6521f3ca8d85670311db8ef3f9bd SHA512 ae00304aeb391603ddd30db93548f0e14f35e364c32a44ada1663bd38cf921d095fb2804f337cba9b47f7e0daa4d462caffe41c0bd18d8cffddfb75f51854b1c
-EBUILD kmailtransport-21.04.3.ebuild 1154 BLAKE2B 13b3b1d69fc40dd7a805b5c0bafb45c7d6921276ed5692b32ac8b57e640a6688ccff6eb769cfbc3fd3e393d59f34e0db2a003c4eb70a0bd901d8a54518148cd5 SHA512 87d2cc08aa3d69ce8082e10b1051f983b418f0dd20cf06f60f9be2f0145762de4444dc2b978085b670228724d00d5a8b7a54af0b522adf9c72a606a221d29033
-EBUILD kmailtransport-21.08.3.ebuild 1059 BLAKE2B e50926aa80f850a3c4355d49e1b2cd7168e3e1e7f7130040ab4575eba829b8a46e057eb6ef034aa5e372e75feaf0af32225bb1565ae8511d35538daae202e244 SHA512 6ab34857a07b3bd0b382853136203e5dbd31d4dbc7b91e4f5eaea24489ab57f1d807b02f30f4a57bd7296a6cf20113343d4d7296a0eb5645e243819062f19b20
+EBUILD kmailtransport-21.08.3-r2.ebuild 1175 BLAKE2B f2bf4a7d0fea201e823e724d4f80fbfc13675359010fc0c59880ffa9d3a4d4c74f55583dc59c04f1ba17fbd8a976988bc16bf6f0795627dc2f366591203bfbec SHA512 f3dce79effaf81f31d336ed66d6e91b2664ce896d6736c769fef6fb35f3000df32dc895b19861c17cfde7bf82890eefe7fe3d36634f0692886e7d90d28317c7d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch
new file mode 100644
index 000000000000..e83449e4e32a
--- /dev/null
+++ b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch
@@ -0,0 +1,63 @@
+From cc4907eba8e16c319fb837b5ec85393b118c4ab6 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Thu, 16 Sep 2021 17:07:08 +0200
+Subject: [PATCH] Adapt to KSmtp moving encryption settings from LoginJob to
+ Session
+
+See https://invent.kde.org/pim/ksmtp/-/merge_requests/5.
+
+(cherry picked from commit b49ee72009620f152aaab1f592704e56e3be01f5)
+---
+ src/kmailtransport/plugins/smtp/smtpjob.cpp | 29 ++++++++++-----------
+ 1 file changed, 14 insertions(+), 15 deletions(-)
+
+diff --git a/src/kmailtransport/plugins/smtp/smtpjob.cpp b/src/kmailtransport/plugins/smtp/smtpjob.cpp
+index 7ad0124..5a08dfd 100644
+--- a/src/kmailtransport/plugins/smtp/smtpjob.cpp
++++ b/src/kmailtransport/plugins/smtp/smtpjob.cpp
+@@ -134,6 +134,20 @@ void SmtpJob::startSmtpJob()
+         d->session = new KSmtp::Session(transport()->host(), transport()->port());
+         d->session->setUseNetworkProxy(transport()->useProxy());
+         d->session->setUiProxy(d->uiProxy);
++        switch (transport()->encryption()) {
++        case Transport::EnumEncryption::None:
++            d->session->setEncryptionMode(KSmtp::Session::Unencrypted);
++            break;
++        case Transport::EnumEncryption::TLS:
++            d->session->setEncryptionMode(KSmtp::Session::STARTTLS);
++            break;
++        case Transport::EnumEncryption::SSL:
++            d->session->setEncryptionMode(KSmtp::Session::TLS);
++            break;
++        default:
++            qCWarning(MAILTRANSPORT_SMTP_LOG) << "Unknown encryption mode" << transport()->encryption();
++            break;
++        }
+         if (transport()->specifyHostname()) {
+             d->session->setCustomHostname(transport()->localHostname());
+         }
+@@ -298,21 +312,6 @@ void SmtpJobPrivate::doLogin()
+         break;
+     }
+ 
+-    switch (q->transport()->encryption()) {
+-    case Transport::EnumEncryption::None:
+-        login->setEncryptionMode(KSmtp::LoginJob::Unencrypted);
+-        break;
+-    case Transport::EnumEncryption::TLS:
+-        login->setEncryptionMode(KSmtp::LoginJob::STARTTLS);
+-        break;
+-    case Transport::EnumEncryption::SSL:
+-        login->setEncryptionMode(KSmtp::LoginJob::SSLorTLS);
+-        break;
+-    default:
+-        qCWarning(MAILTRANSPORT_SMTP_LOG) << "Unknown encryption mode" << q->transport()->encryption();
+-        break;
+-    }
+-
+     q->connect(login, &KJob::result, q, &SmtpJob::slotResult);
+     q->addSubjob(login);
+     login->start();
+-- 
+2.34.0
+
diff --git a/kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch
new file mode 100644
index 000000000000..84589d4908a3
--- /dev/null
+++ b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch
@@ -0,0 +1,25 @@
+From fb2ce5f1115ede2c782cc0e1095584eb07cf032b Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 1 Nov 2021 09:15:31 +0100
+Subject: [PATCH] Fix crash when response is empty
+
+---
+ src/kmailtransport/servertest.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kmailtransport/servertest.cpp b/src/kmailtransport/servertest.cpp
+index 6e8d711..35079e1 100644
+--- a/src/kmailtransport/servertest.cpp
++++ b/src/kmailtransport/servertest.cpp
+@@ -236,7 +236,7 @@ bool ServerTestPrivate::handlePopConversation(MailTransport::Socket *socket, int
+     // Initial Greeting
+     if (stage == 0) {
+         // Regexp taken from POP3 ioslave
+-        const QString responseWithoutCRLF = response.chopped(2);
++        const QString responseWithoutCRLF = response.isEmpty() ? response : response.chopped(2);
+         const QRegularExpression re(QStringLiteral("<[A-Za-z0-9\\.\\-_]+@[A-Za-z0-9\\.\\-_]+>$"), QRegularExpression::CaseInsensitiveOption);
+         if (responseWithoutCRLF.indexOf(re) != -1) {
+             authenticationResults[type] << Transport::EnumAuthenticationType::APOP;
+-- 
+GitLab
+
diff --git a/kde-apps/kmailtransport/kmailtransport-21.04.3.ebuild b/kde-apps/kmailtransport/kmailtransport-21.04.3.ebuild
deleted file mode 100644
index 3aa1c505795c..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-21.04.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Mail transport service"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RESTRICT+=" test"
-
-RDEPEND="
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/ksmtp-${PVCUT}:5
-	>=kde-apps/libkgapi-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep KF5 Service # fixed in 21.08/git master
-}
diff --git a/kde-apps/kmailtransport/kmailtransport-21.08.3.ebuild b/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild
index c63c9a180094..8b14d213dc76 100644
--- a/kde-apps/kmailtransport/kmailtransport-21.08.3.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Mail transport service"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test"
@@ -27,7 +27,7 @@ RDEPEND="
 	>=kde-apps/akonadi-${PVCUT}:5
 	>=kde-apps/akonadi-mime-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/ksmtp-${PVCUT}:5
+	>=kde-apps/ksmtp-21.08.3-r1:5
 	>=kde-apps/libkgapi-${PVCUT}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -42,3 +42,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
 "
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-crash-when-response-empty.patch"
+	"${FILESDIR}/${P}-CVE-2021-38373.patch"
+)
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 3cd5e4fc4a57..7e9042fb523d 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,3 @@
-DIST kmbox-21.04.3.tar.xz 28472 BLAKE2B 6c00164df8631306af367a508bb42881cd62c0b94fb4634989c585159e9f2e947ac36052302b8a1f145f131573e206ba2d1dc018a2db1137c42fa15b88d2a4c1 SHA512 272a0bcd99ce38ca57a0f33a0faaa691f05632ff00e6df04be2890b2352af12d7a6c81bb678d37d2cefd84ebd51b6ba1f247f337f764000eca98958b709f202c
 DIST kmbox-21.08.3.tar.xz 27792 BLAKE2B 56a371c8ae7c1969ece671a896208a74a20d554172b992fa5a1070cc0bc7796ae3b9f5ac6f73030252a3df31e5af945b29f42b78c3c8b54a28aae2ef668ef19d SHA512 b91cb7b1930a099f81f4a45ab2d9b671ca8eea397d2bfb0e44a8cb670faad124c30f0b51f898b4c549577099370e5b0828861a2ee6c8f99e4356c52e70f26ef3
-EBUILD kmbox-21.04.3.ebuild 360 BLAKE2B 4c2888b908bb267a9d28ba6cd701e4a6d8f8c3c46bd7890bbc5ec006d59ce451d125f1f60efc548c6ae7b5ca789c06b918aec8177f18d1b65b392fc2e39646aa SHA512 131268e0cb8d89323fe3b10dec5594ef60436bb1b3e65fd929f87fa92a58c007b3c8a92827dfa96605b3b690c0b772cd0f3c97ec504732fd8296d45084ea1733
-EBUILD kmbox-21.08.3.ebuild 363 BLAKE2B 45e46394d24505e0868cdb79dcb3995bb248935dfdfd5283521e839d3c341a13b70951298b5e6b36f8e759b93f5371e98981e82e3f664746801b7345aabc36c8 SHA512 dcf40d914469359d2ce4cabf4c415e4cc46cc039d037828c99d5e001f6b83378b4c1a5e9a2acc4fc5d6e083c6bb1196ecaeed4a25b74f60c1776ce65a31c4341
+EBUILD kmbox-21.08.3.ebuild 360 BLAKE2B 3f53a79278c59f7dbdbbda0a0afac2857e1dc4494f192f22552895545451e3da137656b1083f7222f549943ccb888fe310202c1e8337159779fb65ee4d784f37 SHA512 701dc5fb868e114b1eabf2f6e24c125be2ff10d6cea19da763876b0fa3436f703cc8d571d2b0547345da40d89cb85348fe552d00d1b7ff0d0131804c52dbdb23
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmbox/kmbox-21.04.3.ebuild b/kde-apps/kmbox/kmbox-21.04.3.ebuild
deleted file mode 100644
index 9fed4aa0ecb7..000000000000
--- a/kde-apps/kmbox/kmbox-21.04.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org
-
-DESCRIPTION="Library for accessing MBox format mail storages"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND=">=kde-apps/kmime-${PVCUT}:5"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmbox/kmbox-21.08.3.ebuild b/kde-apps/kmbox/kmbox-21.08.3.ebuild
index 0e950376f065..1ab9df7f19e1 100644
--- a/kde-apps/kmbox/kmbox-21.08.3.ebuild
+++ b/kde-apps/kmbox/kmbox-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library for accessing MBox format mail storages"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=kde-apps/kmime-${PVCUT}:5"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index f7e7aa35e0b9..9998cfe87c4e 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,3 @@
-DIST kmime-21.04.3.tar.xz 155264 BLAKE2B ae0d257a7d0ad2f1aaa0f76e5f09af2b7e80d6263ead74db026fd6b5bce3c62c8474d3a2a91a8e1e57230c88b62c6f6d521bc142dfe5e562f1db539f3f2f7cec SHA512 4b563a50ef19434310bf717cf585423ca2324432d388ace49df43e24e70158e4b9280084a7bcc2cbcf21fea6a7b11df4789cfbd99bb9dcb559a38ea7cb60d6c8
 DIST kmime-21.08.3.tar.xz 155188 BLAKE2B 094dcbda57f34c881452e33025b9432f2b1c9fd1b312ebed8da2d1c2a091352edd25343c377a4b9bce9c102edd0712bcb52a6306f919c75c9484c47699f9c7cd SHA512 a57ec1b09a05ac2fcf5fb00a7beadcb4015b7be5463e5259e90bf421fd9c47986662de809d2679c8e980f521bf5258190560416b13c89f594bdae3dd299d4f08
-EBUILD kmime-21.04.3.ebuild 407 BLAKE2B 7fc67b7463af786376b5af1a9a38d7cbf8dd37d86b42266be1487ef3f1200d5dad5f5def6899ad28b7e0276b371dc5685071c471fe7e91d1c2e7dc2c7f55b8b5 SHA512 1c79558e07ab41e20b32db65feea7435d5d802751c33a27db033b0aefa5ddf9319bd6f8e126fbcfd1a44c613cf0b2315b4aad849bcd46b53d60bb6fca7c9bd93
-EBUILD kmime-21.08.3.ebuild 410 BLAKE2B 6d679590df3e7fef81d4f6afc038a1e6e7609409c77abe26165c394d0a47091ddf613d3d8f9ae4f74b8a93d7114c16cadd405fc1cf536abce92b85376c5ac4c0 SHA512 2077470ddb0bea3b5dceb33d92399966f2a0f6eee0915260c38ffc99763279a34d28c701e38d1e414461e5c814387f9f7b44cbf7fbb9c39d4da2652fdb99b8b1
+EBUILD kmime-21.08.3.ebuild 414 BLAKE2B b74b433656ff123a1bf3fb26a7da42a6b0ef4bcb3cc2adf910d251579d65674776e584d25dfa6bc860242fbece10c53bbb58e8d4d4111479428389a6334b93ba SHA512 795caec37373a6134446c8558d1c361be6b1ea72c7dfa9285aec82e76b988271a11da7e5387aced34aecbd2c337d0644adaae45c9e9fba02c796c90442c5a472
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmime/kmime-21.04.3.ebuild b/kde-apps/kmime/kmime-21.04.3.ebuild
deleted file mode 100644
index 6fb84c366abc..000000000000
--- a/kde-apps/kmime/kmime-21.04.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.80.0
-inherit ecm kde.org
-
-DESCRIPTION="Libary for handling mail messages and newsgroup articles"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/kmime-21.08.3.ebuild b/kde-apps/kmime/kmime-21.08.3.ebuild
index fb3acbd8b1f5..ed3154575fb6 100644
--- a/kde-apps/kmime/kmime-21.08.3.ebuild
+++ b/kde-apps/kmime/kmime-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Libary for handling mail messages and newsgroup articles"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index ad6d8390dadc..461ffb6ce720 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
-DIST kmines-21.04.3.tar.xz 965464 BLAKE2B 6a059e71bba7b76dcb8904a0264037fa9d15c5892724878b6200077af096087b31429a91a4e3bb3c4f709691fbeb9e3513f95a0a9092f45f0c669dce26271353 SHA512 25c73e9a578746e3f449bde1b77479713e7bb4a52845d975962e7c1a4d4929f1a97a0be5f6140c701e06749794564a1076d81e291a7536f91880e7cd6088a45b
 DIST kmines-21.08.3.tar.xz 989944 BLAKE2B a49ede32212d3f5d3ec75a686c7add451a8631a0ed72f976652b8b021d60e52c0a25489a2bc94c8195d1fd0d14225536f6436dbe31224cd4d1bf7c6b6b64829c SHA512 28beb935e2a536e13a124d2d121b09af7ebbde39704560608c778ab41762a2a151c9b9eb8d04778fdd144454e04e470b702423c16d0fe0d87d73830b20409aae
-EBUILD kmines-21.04.3.ebuild 910 BLAKE2B 800cee1df469bfe51860551fdfd25f01237820aa88ab3690e8be13ea19a78a28f8cb989d02447839bff0b3e0bd077fbe8553cbc4184ad235e9589963d451001b SHA512 848ea01be8f529815482ab2d677cf3dd8e12e3fc9801450ef527329f56970011b09edf64cd7e9b13dbf7d9b5b32f4f5c7b4df0f514c3201b076fb131c427767b
-EBUILD kmines-21.08.3.ebuild 920 BLAKE2B 9efd5537d66596a3d0a621a1650cff25a96e051c6d03a837b94985402573fa4eba27f41682cdfe4360897efdd5d8cb1bbd2ffe47b9ffc25e4ab9ff827f995530 SHA512 1fb26a2bf35a08332568ff6f911ed29de4bb711525d6154adc41956a98f295bb1cb5142022f95e9b00db06635509dbc6853208dbcdb5fc3f7d3176b70c5936dd
+DIST kmines-21.11.90.tar.xz 990748 BLAKE2B 5a7a56173d922c0e12494c90fd6dcdfd1d497189abcc7d08dc2af4db7c7af28586ef19aea57de77a5df59c4c81162720fb00b0a9cc0d32614c03eafb2e89a846 SHA512 8ee7f9ddfe2cce58c1120a1f4ec2a82fb027033a315c0e50c52bb3b6f78816bed9433ffe1a324c885b512bdd39280db0713421483acce39481e304d875ab59cd
+EBUILD kmines-21.08.3.ebuild 917 BLAKE2B a19a572c8a245447c88af3e299cc1c3e32a7af069b950ff714f773cab9aa4f6226363de943a7f8891597c4455deb4fb8d99d48f7e26ce1aa6ffa6547e7d09ab0 SHA512 0f1504c99a75b5783b163c5fd4c3c50c04fe185d1ae78ef7bcd370abfc1401dd7f0047d44b19c647cbaf1c779e6e796673eae56f6ae16e52aabc02b8e5af5597
+EBUILD kmines-21.11.90.ebuild 920 BLAKE2B e97ac096c9ed156ed237c1d672d60f191d8ee5f101a07d6086dcd198f9769593f391e5eb274be1466f33d2fae15bfb37cf9ca542f09fa1b6b244987e274b3387 SHA512 8180671bca8ac03a3c4ac73980f2273c95888d0d2c215e1d3dc5c610b61a2dead06fbd3cfc8de24b8f5690304c057e9bea5cffec7731b7cba13770ad8fa49ef0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmines/kmines-21.08.3.ebuild b/kde-apps/kmines/kmines-21.08.3.ebuild
index 855ed247cd9e..648125496012 100644
--- a/kde-apps/kmines/kmines-21.08.3.ebuild
+++ b/kde-apps/kmines/kmines-21.08.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kmines/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmines/kmines-21.04.3.ebuild b/kde-apps/kmines/kmines-21.11.90.ebuild
index 7e7aed0ecd06..252d6fbd4575 100644
--- a/kde-apps/kmines/kmines-21.04.3.ebuild
+++ b/kde-apps/kmines/kmines-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ https://games.kde.org/games/kmines/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 75d07ac25f54..7f4ebc5359a0 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
-DIST kmix-21.04.3.tar.xz 1161920 BLAKE2B 2b59ed9ae41daedf1a3e581e98bee02cda4b6499cbbdeca3431f68e79119b6cfe88686a02af06009e24ad1894c9e49aca00415b5beee784211c6caa45b106971 SHA512 9577c5e9de3dc34e9301d52ec1ec436fdf4856d89fbb5ba735f83d3ea2af57ef308884ba5e18e7b989b503e3f73bb87428d9873d9034778d6d7fcbf47750b8e6
 DIST kmix-21.08.3.tar.xz 1163772 BLAKE2B 4855c3837694ddff6cf74eaf2d598659c4267902acebe445c5902b233dc3de5fd8287e77441079a9bc8e3bcc1a6ba065ec9b2a5c7543d00985ba62b2cafe75d9 SHA512 833026a027b4f131aa73969c6c86c79fb61a382707e1f53865c623d77a2a7eb8199cbd4e3a178574fd40a5c9f1ede179da5bce1a82bcfd7685c8278847f3fe48
-EBUILD kmix-21.04.3.ebuild 1425 BLAKE2B a2651a42d35589c58e57954d2ac567d1d614ae035163e7803e9582b4dd1272ff7efd982762e68d5eab323540e3d520257b882b0b6814cd2e576ef7b7571ac120 SHA512 7692e8e4720bcad08e762becb61427db3c7cf11d7e6a074577f40139ad34398c3b9afaa639a12ef126f1028cc3a504e2a9fd3a89ee4d6abaa515dd1f99cc8ccc
-EBUILD kmix-21.08.3.ebuild 2048 BLAKE2B b41cb5a73d0c52bd2c473e2ad836ec2846284f09add26309cd9d71f6dff810aa1bfcbaf21334c508ff3e4ba897b0536ac950a3706244b3d6f91488566c678b8c SHA512 07aed19b980974cb92a0e8e0bb6c0bdbee8708e40d5640a52f21c93cbdb309de63572df5336a680ab9258e40f56ff571ad46ffc785c85b2a310959ff20aac0b7
+DIST kmix-21.11.90.tar.xz 1164184 BLAKE2B 4ec7af96eac3d3b478b932074396d23d4ab706292cef9b0409f81434a18c6703106c11a52ec850b4998fc79689cc1d50aad1f04800a1b7ee8d7519d04cb7f34f SHA512 fb40491eb7dd3d7c3eabb642143bd2c4d3f3cba644ba2d0f834333a1e67734d581b9235df1bf406e567cd551821482730897071011649a9e0c4c6111ba748473
+EBUILD kmix-21.08.3.ebuild 2045 BLAKE2B 3aa3a0c27bd3054bf50b8b404dfd00ada27f530d789d5377e5e8f9823259fe32dfe80c39943ce9c76b786343e9820faca0e2de181b13ebed44380d3ae9ee389c SHA512 04bf32f113c2a1629ad681ef4a4e221750ca1472f68ae6b83ff7593e824e6beb60a217418e98bd60d5f95fd02089570655854f9b9bd9571fce039c38c2b6462f
+EBUILD kmix-21.11.90.ebuild 2048 BLAKE2B e566e174ce1fbf8dd6781ffd4f680c97a4fffbde5c5b34fe07044718599a821e909a86a2b10255f520ee9fbca65a33900019c21640685717f94c9cbe1a57e1b0 SHA512 02730c0255644ec017bf523d6f452c7ff813767945667b9c9945141d648ba3c8bb8435ba1f81d3be03ad5c3cf82c415d8b01c8362bcd7cebe09de6325a526b92
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmix/kmix-21.08.3.ebuild b/kde-apps/kmix/kmix-21.08.3.ebuild
index 23e704872886..92ff3de5c780 100644
--- a/kde-apps/kmix/kmix-21.08.3.ebuild
+++ b/kde-apps/kmix/kmix-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kmix/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="alsa plasma pulseaudio"
 
 DEPEND="
diff --git a/kde-apps/kmix/kmix-21.04.3.ebuild b/kde-apps/kmix/kmix-21.11.90.ebuild
index 5b427b30ed6b..4d3d3706b0bf 100644
--- a/kde-apps/kmix/kmix-21.04.3.ebuild
+++ b/kde-apps/kmix/kmix-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="false"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kmix/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="alsa plasma pulseaudio"
 
 DEPEND="
@@ -42,6 +42,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	kde-plasma/kde-cli-tools:5
+	pulseaudio? ( || (
+		media-video/pipewire
+		media-sound/pulseaudio-daemon
+		media-sound/pulseaudio[daemon(+)]
+	) )
 "
 
 src_configure() {
@@ -54,3 +59,15 @@ src_configure() {
 
 	ecm_src_configure
 }
+
+pkg_postinst() {
+	if use pulseaudio && has_version kde-plasma/plasma-pa; then
+		elog "In KDE Plasma, kde-plasma/plasma-pa is the default audio volume handler."
+		elog "Should you prefer this to be kde-apps/kmix instead, do the following:"
+		elog " - In system tray, right click on [Show hidden items]"
+		elog " - Select [Configure System Tray]"
+		elog " - In [Entries],  search for [Audio Volume] and set it to [Disabled]"
+		elog "KMix will be shown as [Volume Control]."
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index e221006e13fb..4d47531a7bab 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
-DIST kmousetool-21.04.3.tar.xz 120804 BLAKE2B e66aa46e1681aa234fa7be0a754fb90e48f678570598d09c7d58fdea9db0abbca199a25478c59f88a772c1de9a97cb3da33981bc6ac6e1bcce1469f494712808 SHA512 4c9f4530f61950fe0bc94dc20baa3d9d958c677139f3b8d06248fd071ccc1d9b2dcf1de69bf2a434c4ae634f46062c77c5041407afe929dbdda9fbe3e11de42d
 DIST kmousetool-21.08.3.tar.xz 121752 BLAKE2B 2043c7f4f5061d7496f609a1c6c19045ec32c12c965391f57962025dcd203518434725e6ece35c28150935313ec7bec2cc627b87edeecb2a7d5def1455c40612 SHA512 62c463d20102b22fb105800f6971cc83edea3beca2d53919aafdd26c5826c14d9a3d1b18493127d2ce77a41fad70386c4dd44d7c26592750d3e4a1af2e522472
-EBUILD kmousetool-21.04.3.ebuild 857 BLAKE2B f614fa124a1a4c9a6f0463ab01642bd24b75dfc6bd09e9a9cc768a2de9d96f72ef39a8834a7011ec97e9e51515e2ea1116aedb026b3789995527d2f4ee3dc4d7 SHA512 779341bd1abb29af6ac849473817cee89e96dbb30332037fc9704f4e3f81d53f3f2cc5b78a0a1d47047986b89f29d5cc99f7937735198e9dfe7dac165cf595c8
-EBUILD kmousetool-21.08.3.ebuild 867 BLAKE2B d1971393539a1cd37e8dfc7b41040fa0adc83010976f5a759681edebbd771c8c140422bcbb6ba8e6dce5e2321bb6d29920fa90c0341d9cf713a0d4ffe8158b06 SHA512 05fd55587de2e7f45ba2da2609d7ec82ce65e75c60ffb7a38bf5d5e79aa8547747746d07976735381639441bce96758b9b512b6ea22eb7c4c14e3d19635d66e7
+DIST kmousetool-21.11.90.tar.xz 121500 BLAKE2B e354102226fab8869424f30b165d383725bd329c1425cb5045a07a29dfc5a5b609bf2e5bf6c501b20aac77aa9f63dc68a3afd7b6a274c990180f8908daf6b688 SHA512 6202e548b2a38bc43b4a2fd5435903bed473a0c0beaca34d56df2e161e1e219f5336ef638dd9fd342654051442c3e84f074926b593a8055859dfb949adce5714
+EBUILD kmousetool-21.08.3.ebuild 864 BLAKE2B 95bb35280a2651bdce89a7c87f2540e005139de1f147eb41a4732079b723ffbaac0f7b074be7ce76e08da2dccd9af63d45eadd091cf1c700a3a6f9bb8850e5ca SHA512 90424c366351c34041d11c51b0dedb9d32316c67c058d230f3abfa5006a8fd9ef8f203f077d33fc3faa8b4ffa66e81ca76c844002cfb3aa38b9371699aaaa6cd
+EBUILD kmousetool-21.11.90.ebuild 867 BLAKE2B 9a30b277dfff303d83fc240d47be703333676c993ab6bf61218c2cca996d60255baada498301add44fd3ee976cc5abfbe18029ce8eae4ae4ad7f463004ff8967 SHA512 04338f3cb43d4dfa7899e492e7d8d36c99189e1ed387f4253990336d1b53183e94d5dda9ad615e5fc901031214ccf4cf3679482589437c3e3dd9dc8fa17552d6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmousetool/kmousetool-21.08.3.ebuild b/kde-apps/kmousetool/kmousetool-21.08.3.ebuild
index 850a8a06de27..e3f86216ceab 100644
--- a/kde-apps/kmousetool/kmousetool-21.08.3.ebuild
+++ b/kde-apps/kmousetool/kmousetool-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmousetool/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kmousetool/kmousetool-21.04.3.ebuild b/kde-apps/kmousetool/kmousetool-21.11.90.ebuild
index 1954da7f126c..48814c390452 100644
--- a/kde-apps/kmousetool/kmousetool-21.04.3.ebuild
+++ b/kde-apps/kmousetool/kmousetool-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmousetool/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index faad72a1e49d..205ddf149500 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
-DIST kmouth-21.04.3.tar.xz 2100112 BLAKE2B a1ec149775757575e571737add5e74e2a4ccb72de419a27a3936f783b6f442c5b99c2b02fd90677e20156e7ba319aa76d1842acbfca8f7f9f560ed130e0ad217 SHA512 f4d807ea015ed03240acd2a031ecfaec613c74f6f0939bac74c8b48ccc82ff5f6a7ce0be6789bd8dc30cec8a6958b1b7cc1f7a6aece4910d394f6eb8b36313c3
 DIST kmouth-21.08.3.tar.xz 2100844 BLAKE2B 6be97d79629b29ce603106471bf36cae6efaabc0578ce6a5445ba5a502232ebad870addfd51c3eecd39cf18d9353feb147381f1e62972ed57bb86c3250e53c66 SHA512 9dcbdb8ad7e58f0320554d859ad43cab2192437efe34014e9ee4f370356ab52572b4929eab7ddb2f1a661c635965329117649636657bf9e2ad1ce960bfa72917
-EBUILD kmouth-21.04.3.ebuild 886 BLAKE2B b4f25657eb34e773f029dec36efef755bdddd32ef5a0b183f4217a47662bbb70f87514150f85caabb73acec95898bb8445322f48728281e5bfdad1d718cd92e9 SHA512 17fa0f1b9ddfb1522200482f7d0f13f88df688bc4d41200c27c65e319306a0dc484ebe04105b121ac28be26d710e625d34c8e35879b5b9cd43e0b84246d22795
-EBUILD kmouth-21.08.3.ebuild 896 BLAKE2B cad9341be7827171b353d2b892d430a2ef47f458c073328b53e696b53563f74a6be143d6f139b591a4329a66d666a91ff183c6629e773ec7e375062f03f3ea9d SHA512 5d5a216cba5705ae763473e1d3b967ac4729cbe2dc164504818bcc0eee71f585b189f5fdfb5cc77e126d5c4927ff6c954d59de8fd4350c2be483838d8d1f78ed
+DIST kmouth-21.11.90.tar.xz 2103416 BLAKE2B 3e7e0c68c7fc118bf0dd225fd77fde89dd4101cb6ed11a20d14f5abf90836cb21fc047651e8e3760182a43308924857f847b99aebdaa607050e0641a15078cf3 SHA512 cad7b96f074061c9df94126c90a5322d7535102060df6904a1aeca1ef5acd56d15c67d732f572edf32216285998c432a7b11449ae0fc81e0a6cee74e9b24e4c2
+EBUILD kmouth-21.08.3.ebuild 893 BLAKE2B 5c8498fa822a000548ade704da736dc108dbe338dcbf4aceb53efef24b1ecbaf7e194ad1e6bdb44a60fbc00bb8d91f84390c301994cf2552b901270a6420af42 SHA512 dd7a96ce724acd2b94b06e27f04d70160b0b0f671887e02e5bdfe5d77f6211e99f26b66e1b4e7ab95806badc3e6b6ae2f2bb79ebca121346a72fd3e12157e2ec
+EBUILD kmouth-21.11.90.ebuild 896 BLAKE2B 79944e6ccb043fd921554d651503a84905e91125f3cda09276fc4227965373e7e7a4a866c4213325de8a4f2592dda42a40094639a7f3c9ee548fce134be19270 SHA512 0fc3899721e3479958a23288f6f1e7a144967f1d653990a5dba8d8c9e235e1cc5270f9f38ad53445d22595e94a022061d3a811f1e456344673a3833d289e08b0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmouth/kmouth-21.08.3.ebuild b/kde-apps/kmouth/kmouth-21.08.3.ebuild
index 85eed817aa6b..26ac3ee08c6c 100644
--- a/kde-apps/kmouth/kmouth-21.08.3.ebuild
+++ b/kde-apps/kmouth/kmouth-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmouth/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmouth/kmouth-21.04.3.ebuild b/kde-apps/kmouth/kmouth-21.11.90.ebuild
index 9110a15dae10..11d0b702e1b3 100644
--- a/kde-apps/kmouth/kmouth-21.04.3.ebuild
+++ b/kde-apps/kmouth/kmouth-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmouth/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 8587a58867e3..0cd28b5cf199 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
-DIST kmplot-21.04.3.tar.xz 3043960 BLAKE2B 2123ec11b1ef05bc9d744f37095a7df4d5171cf87609eac45e405b7b11323c7ca4788b19ea092a15042250a35e01ec877b26ba06091886674585395d31590252 SHA512 80ceb936b6cb41ff3976fd7b4859ff9e54d0ab24a6d8d90690751b114749d55b70e2e1c07a7440addf8bc88c6a9fbc42d8cbab9aff49b70e808edeceaa8ee8f4
 DIST kmplot-21.08.3.tar.xz 3043432 BLAKE2B 5f6027e0627f55fd434efffc2f9d0717e18a6d493efeac69adaec5727481ae61445d87bb94a45f000f93715cd275597a73a294a33ca00dd1fd92af4ab2314218 SHA512 f2b427233582962bb195788ef390bd155f554fc7b7221c1bfc4e07af4837a977b906e589f2d606b8347b413149e8245d61933c4f3c4c1a3ab0c2f35a565ed136
-EBUILD kmplot-21.04.3.ebuild 1055 BLAKE2B 3f3e27c73ecec595a43e3f2e7aa7b5f60bccc7ffed8e5a591013a8f236dbee293559af2556e3917d4d85661576198744cdf0734a003662125c321bf4cd2f1b6a SHA512 5accc42dc27ebd55339dcbd7538c26fc366f7670d25425e6352d6bd67d95c4583692420cc65b9d5f800d42412783662189df6be5b304e68106020b8c0e7c4c73
-EBUILD kmplot-21.08.3.ebuild 1065 BLAKE2B 4b80fc974c274044678dfdeecce09e2fb85c9b277dafef62f64ac99c511dca5df382cc40aa8dd92689bcf982cdcb047f470e5dfe89200c77a1d4978e7a7ffdbe SHA512 040abf8a727471e8bdf6d916b0ec4c87e00427690546c6f6af91e63e0dc58e525d8c271593350d90986cd9f014ea17ca86279dc9c6921dcb2a8ee7ccb8cd5164
+DIST kmplot-21.11.90.tar.xz 3043308 BLAKE2B 1a22f6ec8989c32010a1226e8f47f0bf81d7bc25cd36b018e5ce1740c498fec26ae2d9cb856e506c4c6f5f1dd86a8d80480f6c4982b4531ce687dc0d90ab057d SHA512 5f7a80313c0cbcba43c992d50c33af3d9c8e0d10d1fedc5e7906db44c960c0301b8cc052326f6f3976b691e6a47e2ba805aa94047fc4a3dfb99e77f683813c38
+EBUILD kmplot-21.08.3.ebuild 1062 BLAKE2B 6110d6770f4f76dd6cdbbd868cc2907d772730cceaa2e33e3699858cd615893f24ff9c975cea2f4e9e6499fec3cbe677ca3b181cf0604e3e1fda0e06bb4986e5 SHA512 274efe57bbcb24e34a96af6950b88c637de5443bb8527ff1a16f33ed8517d370ed2342e378b764e02f24f9ca558ffd0e3ba4c413bdefbff521712a0e2c8fc941
+EBUILD kmplot-21.11.90.ebuild 1065 BLAKE2B 71f0ff764b44a65603bc97fbb791069da7cf93a1d19cfb387cad94fd833211513bb0fd02f6b6311b1f4186d241b2240aacf84118018105765361315c797c82c6 SHA512 64356a4210583acdac3d3a4d67ec6b7a0db367926a43f646e9bd51e3ee73be2bc99ea71c64b961064b603313541f9e8bdd4d71713b5261cfcaf32e50097c1f44
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmplot/kmplot-21.08.3.ebuild b/kde-apps/kmplot/kmplot-21.08.3.ebuild
index e3606ad71348..13fec20afa1c 100644
--- a/kde-apps/kmplot/kmplot-21.08.3.ebuild
+++ b/kde-apps/kmplot/kmplot-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmplot/ https://edu.kde.org/kmplot/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmplot/kmplot-21.04.3.ebuild b/kde-apps/kmplot/kmplot-21.11.90.ebuild
index 79c00fd2da2d..9c99a3a6b8c0 100644
--- a/kde-apps/kmplot/kmplot-21.04.3.ebuild
+++ b/kde-apps/kmplot/kmplot-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmplot/ https://edu.kde.org/kmplot/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index 9b0fb65c9df8..b831fbb66be7 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
-DIST knavalbattle-21.04.3.tar.xz 1376012 BLAKE2B 9c03729c90e9a77bb53ffbca8709d8d61f92675c76134410da12301de8adc50df604e7846f524b7d3e9477572d2001a1cded0b9d15f5e9c56658e68dbfdad5c4 SHA512 db33484ea656badda4bd95e3f47618c50e5a6e4cb91433f9958024f8f6b3bfb874133096f68dc7d060aa7a56a6d5dab495ffbf4903038d737e5c8a8fd565b7e3
 DIST knavalbattle-21.08.3.tar.xz 1376024 BLAKE2B 8e35ab13989d0bc5936543542541051fcf1ad43c41db20e992b3a887fe5e4bcc12bfeb3b64422e3ab324cd7a6a6b05e70b82953c41fab897d4d0dd6507e03fdb SHA512 e02d6d97b2c195ab00ca59423e6b37cea5eaa5524788c15a65676f5a7d43acf1b649d80b251ba70669db20b17ba9d3f13fe91726a7b3ee02cbf4cac6a4b26388
-EBUILD knavalbattle-21.04.3.ebuild 1028 BLAKE2B e3bf295b2ac4210c9265f95636effc6c013f409f8929c775737b07bf2bdaa5309b5703d8a8f89d83fba177bbed5d654749b62d2a84f16f9508b80bf051c01f93 SHA512 6fa1fc53b89f67431ccad209100b75a2d2c69405ca32751395ca8347a10a4fd719158b63d0e994c0b6cf75011d99e0722e8246d6a2c6a5362c387f294747216c
-EBUILD knavalbattle-21.08.3.ebuild 1038 BLAKE2B cfe70ffcb026821b6e4e4d9ac49fe3bb3e056cb411f2569c5f603a02351aa758455fe826523bf2273228df612b2fcb875269e6f7f553c905cca02c3620e63ec1 SHA512 987927c2918b80390fae4ae2627c7ca9eb7862d15720c26f0c1f547e4e258f3b583258385a8f27aa387c353c10e7a868d05849422f600a0e49956e3a2650427d
+DIST knavalbattle-21.11.90.tar.xz 1376144 BLAKE2B 95bf4fe32a45859aed46aba688d2060b6c3701bb0a54fa82dbca9857ddc832a211b1a0375da545a072faed0e767d4bfd576b69f4cb623120c9c7a96f471e5d53 SHA512 f0f440accc522aeeadd70feeec8973180604139c2b5d28d3749c1f05338e480c6a7217975267165a28410b16ff90a8c8558a0ad712f952f15f43029182dc9e67
+EBUILD knavalbattle-21.08.3.ebuild 1035 BLAKE2B 096ce827dd52256c940cd2b312826db0506ca14fcb01b158598911201d9ad14c3c186ea2a4c125fefe73747a5d43f56d3d60ead6d63300754672a1c3358206bf SHA512 892c2b85ee579654462d05f57b2ed52e16ae392b67c87cb5a58df3c0eebe18138d61bcbd5662b0be2b54e7433c8b0ea9b4e0e4838c2b8f5c93353c8f308b91a3
+EBUILD knavalbattle-21.11.90.ebuild 1038 BLAKE2B 0887118a2fad9efd160995dc36059d2226249c1fd6f8be9760bc8a8f4e58c3b55facb32fc718ae8e74a11fdf8f687f810497ab41635895404d43cdab25b006b8 SHA512 d70daca0ca2d27b315d1b393476ad6f2ada884ae642c10cad5c2e44f3b170d6f8d2963121bcb3cd3d2f017e26a38ed0c62fc5080f2daaaec7d36a56cbe41f8be
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/knavalbattle/knavalbattle-21.08.3.ebuild b/kde-apps/knavalbattle/knavalbattle-21.08.3.ebuild
index a19ca3ea2b3d..e1b2f28ae267 100644
--- a/kde-apps/knavalbattle/knavalbattle-21.08.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-21.08.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kbattleship/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knavalbattle/knavalbattle-21.04.3.ebuild b/kde-apps/knavalbattle/knavalbattle-21.11.90.ebuild
index e3b8e8c70c7c..4b6bf2f3b7ed 100644
--- a/kde-apps/knavalbattle/knavalbattle-21.04.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ https://games.kde.org/games/kbattleship/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index f22e7add7e91..a6ee2cc9e922 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
-DIST knetwalk-21.04.3.tar.xz 1270964 BLAKE2B 19b54421be0f7bb7a812518f8794d1500fa8ba7c9718858b9db265dbd09e26c619d026e72fbf2a3597bd490e2395e954c00bf61d4766f89a219f2ae125b862f9 SHA512 40ed5e31d458f1243ac19215fd2b22d87a811ace7e9cf8dd443efa334225e2a12a54865d3fc6173f4879a58520b9d486d50eacb1b86c2c66898659ec46159791
 DIST knetwalk-21.08.3.tar.xz 1271332 BLAKE2B 292c5a3bd5cf7948cbee95780979b7aec77a6d056ca704c4e4b3bcca7fcf3ff74d8c142a4569e707511b3aeb4c14691e1ed1073db70a36660e4e067f30082ed7 SHA512 238c27c9628e304813b7d9848dfeea9644ea023c300a3e7e412bc23765c5fc7ce290b22c7884b99c0f937dc032c045645484d60bca98971f88cbab0771a95b36
-EBUILD knetwalk-21.04.3.ebuild 1007 BLAKE2B 0850192c0ca01b6f785f31f4f6b0cdec25d42253563fbafd5c40092f0c43961e3160ca83d73a26bbdad133e8f5aceb7b37ee9f8075b86223c64cb285f7441c03 SHA512 58453236c6ed64f2fab6a7ca22a13c4b790d36fb48a5b1de5281eb27f55c9f5643322ff2db51b31b2746af6aef1f19fc5f34764633f2a2b23833c34e5d150a46
-EBUILD knetwalk-21.08.3.ebuild 1017 BLAKE2B b15074baf0198487be0b4294c30cc5f4ef221d5a731edd726db4a955ffbb25a7425845be406c9d4f476458ea6ff2d2bf7c1dc335d343690babd638492b5f3b6b SHA512 e28f8b1dc44305822b063d7e8923ef16c464587f0594d04235dc3ce419f5328839ed86ff14e74acdb36423cb6ebffa65610dd06b2c5993abaff597d24c27494a
+DIST knetwalk-21.11.90.tar.xz 1094420 BLAKE2B d00cc597dda2970717caa0f09875e7207078d47275c88a6e1002dc0820b884dbbbb034eef062ec5e48e68f667d5aacff5b6604132c16a202524281dccb983bba SHA512 ca2a1d3a8a34835f513e8e184eef440043931bf2ff8165a5f7930b0d0dfd5d2c7b0c3ff749f4e9d157958ea4ec3a9f03138c189eef25658842ebead3dd41950e
+EBUILD knetwalk-21.08.3.ebuild 1014 BLAKE2B 5f4b324c535752d39b2e367e10393200e1cc48ad99cb28f50cbf604a6136792be5cd040b727135b93eec39869cc294ad3a877a1af93ebc3225ca088c9d019131 SHA512 880072ff30d3d00eeddc6bbf2f2ceef5bdb85ea20c1f299c76b67175b2f06b9ad8755737eaf805de08192642b3afc4c11f400b033f784995b3a79fa4d3f75b77
+EBUILD knetwalk-21.11.90.ebuild 1017 BLAKE2B 2ffaf39354d65b3a2266a18a0ba09d7e54601ee963043cfd88de850c2503c75adf168d2ecf5bb5a8a5d51f780ee78ed806fdc1f820c2140d67f0d8a66908962a SHA512 f425467603eccc3a8fb66c139a73005a4f94e1acd18f6c194f1b40b6cb86b1e79188223b73eac22c8053e52f550c50edb07762612e2561ee51705bee7a4d56b4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/knetwalk/knetwalk-21.08.3.ebuild b/kde-apps/knetwalk/knetwalk-21.08.3.ebuild
index b5dc3271824f..6189373d33b2 100644
--- a/kde-apps/knetwalk/knetwalk-21.08.3.ebuild
+++ b/kde-apps/knetwalk/knetwalk-21.08.3.ebuild
@@ -17,7 +17,7 @@ https://games.kde.org/games/knetwalk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knetwalk/knetwalk-21.04.3.ebuild b/kde-apps/knetwalk/knetwalk-21.11.90.ebuild
index d2bdbe801119..a183ac601f4d 100644
--- a/kde-apps/knetwalk/knetwalk-21.04.3.ebuild
+++ b/kde-apps/knetwalk/knetwalk-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -17,7 +17,7 @@ https://games.kde.org/games/knetwalk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knights/Manifest b/kde-apps/knights/Manifest
index 9445c1b9105c..bd14372e2c9f 100644
--- a/kde-apps/knights/Manifest
+++ b/kde-apps/knights/Manifest
@@ -1,5 +1,5 @@
-DIST knights-21.04.3.tar.xz 3536384 BLAKE2B 1d0aaa50d0b1cce7968db0bdafb8529f19b172742a316c6ec3a1074009c018677509300c54b092fa4a2005d57b4319185edf25c7edc082bab3267b5a88639fe8 SHA512 1f9136e85730cae9085b152b720475dd64dd53cec98f9d20eb67f1b68aea851b86c6781f87127bbc0ff3f385db907bd1566534bc05f3013317f33ea0b35b438b
 DIST knights-21.08.3.tar.xz 3536676 BLAKE2B 1be44e1446989c7ead22caa4a22cd7539d28929a91f122dd9657a5887286a7a3f6b9c7c1fea9490154f594f872f9bd2de16df634b14fa7ac64e35ae8c1808460 SHA512 61d5a840b62a6dbc9f595e724ee7450f599d1c30da509855aa977bf5f7b280df50419e73b3f6278e61995aa3a7eab1e31c5c86bb99a29adfa8c292efc2454d59
-EBUILD knights-21.04.3.ebuild 1446 BLAKE2B 024740c6a4e648984d4ac1520f9de8a43f1af1e01033fd170d1db48bcf9f09546396d1f158bfcfcf78e04ea16c674407bce38ca264b1c11c11bdb3b92ffaf3b3 SHA512 0914526ac0b3e16fc987908f7245bee435297ee93982829fe3a119743e759b89ee325dc2a0c804f27583200d4285976ece92926a2c42dfc2f738fbac9de3e73d
-EBUILD knights-21.08.3.ebuild 1456 BLAKE2B 14780bf5478a36ddb37f38147bbe736a46a3204f9f8f0b22cda552d905f6b4c77c864e0d783f5029cea8b7b304b9c4efdfcb0c9ac76482f1d4f358bef755e3db SHA512 46484d45bed5a499651cda8be4455d2aba42ca08fb437a005e7ca0a78227ef839126247330edf7dfe7fda30c7f55287b9be63a1ee154d196171772a714dd2e5a
+DIST knights-21.11.90.tar.xz 3320260 BLAKE2B 7471f89aba29aac213ff6820fa90e6e5422cbc27ea3e832544d147e72d820da402cf39e8fb22a67393f552b0849cb93b2ea5b663cefc083ffe4d1dc250ee6833 SHA512 9396289793446b0238c780d5dfc9fdb46f53f9fefe1705e7b4f66f3db906c740ae5edacb67122bebcc5abd67e724d7aa110b026ed8c9d1b438ad74b98972e0e0
+EBUILD knights-21.08.3.ebuild 1453 BLAKE2B 1313b26c4d69117ac999221ce477b71a0d787941aedccfa812028f13e6f3b0752d13fbe6dc7ea0fcb4c5949f47b7bbdb70c66c62ae516a13cad110a492b72113 SHA512 057b78fd48cad2845e026a4e6144fc5c8836e14e53c0fe9b1ec09551f01312c075c45d759129f39a7bb10dc694c97ae7c594a13d42f33ab33502e8a0399c7bba
+EBUILD knights-21.11.90.ebuild 1456 BLAKE2B cab9cf140258680fc1ea4a3afc717a737b378683690d50b418621b7b42c2efec8db3acc511afbc6d703b5759370c90a844cf2e47c97847cfc4e38a11ad6883ba SHA512 82a860c63f6f0316547db3bf265315b4bea526a083a98bc6b40a9476831f460db455518bb1bfdc0cd53e858ca085ff1fdec3985e98d184ede743693ab583603f
 MISC metadata.xml 506 BLAKE2B 8aea9c44d69f185825bc42a6c59db26506185bb6e85425cbe877f023b2768cb216ff36b2a0ec87e8c6f63f533a01e9c9966da848e0331ef6b932b32e5e136bfb SHA512 29dc634f5ac031759260edf426d92aa1ac85ccad0cbb3bc62c073b3825fed7ca8f7988ebb4e7835edf7a7d8116fe8badc62d1c3cabe64369b07fb8c9e452c5ee
diff --git a/kde-apps/knights/knights-21.08.3.ebuild b/kde-apps/knights/knights-21.08.3.ebuild
index 5cebd46c11e4..0151e773462a 100644
--- a/kde-apps/knights/knights-21.08.3.ebuild
+++ b/kde-apps/knights/knights-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/knights/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/knights/knights-21.04.3.ebuild b/kde-apps/knights/knights-21.11.90.ebuild
index 5cc41e347a24..055ab517d6f2 100644
--- a/kde-apps/knights/knights-21.04.3.ebuild
+++ b/kde-apps/knights/knights-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/knights/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 5267219562b5..0d52c3bcedfb 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,3 @@
-DIST knotes-21.04.3.tar.xz 343488 BLAKE2B 3d4abcc0d9e13da80e3b438fcd7f7744ea2c60ed464353dd297c3d2df60979e9f4ef839b433e94b1d9e743e53151324ef10cf79d6dc23db4ad4969c2a2118ca2 SHA512 e01a26ef6352466226e944cc502f54889999417e1b6f1f0195643222ff8aee067d59aea44f2593a2290dc8f6ca7bcb526c372730a6c257405dd86eef7931d15e
 DIST knotes-21.08.3.tar.xz 342056 BLAKE2B ecec226c71d74ce6033d86707cdee1dae5cee823d7d3417d54788fdd1fbbdcaeaab3ea6ad95ef9cc9f631ae325966c274739cde6f133450a98e7962597bb7f5a SHA512 30950ce787fe015d5da4a882f76ea16d33016c118a80fdd0a31b64e9eafd7c7c9eaf9fcbd35e272806a45e825c8aa79189e1bd2d24f89a538f6bef2bd09c7d67
-EBUILD knotes-21.04.3.ebuild 2139 BLAKE2B b90d72916b3b569f1697fd16f9d2644395bddaa9e7711e0b4854d2ffaf07850621300c7d25d0e940abdc7ebe294b864e94b31b794879325b38ed6351a1209c72 SHA512 c58ad9d6aa3849f8764d7f822182f41c3b0218928a05d3e13e3d2dc07c90e985cba7dcffa0f83c75d040f276de6343520a4dcd2db158227f2d33593fc63580a4
-EBUILD knotes-21.08.3.ebuild 2087 BLAKE2B f3b6e0eb7306608ff36571ead8f981f530418087d48364ac179d15b423aa51ef3823bf96510d15ae29aaa80ab890831ecc20d9eb119f29fb78a6fc58fb8d2311 SHA512 aeaa8c05e186d3ffa4306f6ed0fc60f21aeffd0458ede445cf76b110ba5a10184bcc0db4d012382891a4f5e27fe907f84e2525428aae0e46cc878fd4af6944de
+EBUILD knotes-21.08.3.ebuild 2084 BLAKE2B 3d404bed2404efe591c53e0526b884dc98d2c2d3754ef762a20a889358e6aadbc7654a467b3d97adc2ccbe9a25596ac411bf320940d2f83713bbdd9bbed714b9 SHA512 34e5f2aca9b34ba92470195de2660d87d13ce9e00a12faf973dcfe6bdad86f3d308c1066975d5c82e4883d07f2e5c6df40238b85d3315e75e0b30385991d43cb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/knotes/knotes-21.04.3.ebuild b/kde-apps/knotes/knotes-21.04.3.ebuild
deleted file mode 100644
index 7346bf51be3e..000000000000
--- a/kde-apps/knotes/knotes-21.04.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://apps.kde.org/knotes/
-https://kontact.kde.org/components/knotes.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-# 	local mycmakeargs=(
-# 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake_use_find_package X Qt5X11Extras)
-# 		$(cmake_use_find_package X X11)
-# 	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/knotes/knotes-21.08.3.ebuild b/kde-apps/knotes/knotes-21.08.3.ebuild
index b001489d1157..1a14914eac67 100644
--- a/kde-apps/knotes/knotes-21.08.3.ebuild
+++ b/kde-apps/knotes/knotes-21.08.3.ebuild
@@ -17,7 +17,7 @@ https://kontact.kde.org/components/knotes.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index 9abfa3d05c88..e1c087918897 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
-DIST kolf-21.04.3.tar.xz 1040508 BLAKE2B bf79a31795d26bf3ae5c5a8082d0ecb6901aa74f517df68bfcc1e14dbe8184fb8a2b1dd0122562f9c36bc61a8bad8207a9cf16a80ab46d67ebf42206a955d575 SHA512 cc242339776a2d891a0dba5ff1e92226d2db425251ce3643fca146fb20e17ab124ef9f04bef4c3c21f2fe547cef32fc2c10915acfff0eb4c1c21cd237032370d
 DIST kolf-21.08.3.tar.xz 1042940 BLAKE2B 57477ae24dee7d5dcb338c0ffd44bb49734521d1c241bbb57df86e272f561bcb1d36c8fc3599b6c8ea9e91d1c8e00b93d1205fa05eecad481194553a05368d2d SHA512 009f039927a16bcde9d8d6e65799e8c0d87c609013052535d829905f312daee88c7d84314e2407811e82cd541c4c13fd3addc81a441fb445449b88035e21be44
-EBUILD kolf-21.04.3.ebuild 983 BLAKE2B 3695e315d32d31a7396d08d73e4e90f172edb3082a5985939e4f6ce1c6dd7a3dc799f586ae0b22725337196da0e172fe1db94f09c99153497b66c33788f58224 SHA512 99a2aacccf237c359a3be452ce610b3fa36abc34933cdd2e53240d7f5f3442a3d7946df631217e0c58172960581a82323bbfcc51184e48c18f08795d41834ea4
-EBUILD kolf-21.08.3.ebuild 993 BLAKE2B ecec9110eea33bd1ddbd75a71f904ed744bf9addae54956a2f22d15abfb983ef4b1963a92f8fec0ed81ebab3b498bb82aafcc855b7d15b39d808d26daf106d31 SHA512 60658b33ff0543490f470981d9133b8605ae7829b8f9137890d0892f446dc926faf293ec09e8c5e5df0a7842a52144255bc7493f9eb653d61729e0367d879013
+DIST kolf-21.11.90.tar.xz 1051324 BLAKE2B 04f8c11866453eb7be4361e06e14c600b77b67ff7c6f4e418cdd79608afaf502027e6ecf230e55dd1bf1c4bcf1d848d90b443307ebf95e3d1a930ce5654cdfae SHA512 4e66f18610de21c749bc4e7b797c79d73460da1ed5bd89243771794b05a4528fdb79373bb6f2f5c1d192ab4cc13f5184bfa547d0eed3578fb2b2c4b89583622f
+EBUILD kolf-21.08.3.ebuild 990 BLAKE2B 616e88f1605c4360915c1013545a84efe48b01aef1b0d3c79656f4556e314bcdf510162d3c2009e5ecd6a4f2834f2ea4c208f6af600c22046eedaf28bdb7812b SHA512 6917b7712a5280163ea78121bd71e24aa082d40c2841e1a21d246379f5fd8eb3537d48027799edf4f08911bedd7205da3cb60d45ca88bf28d77d94035c7a5676
+EBUILD kolf-21.11.90.ebuild 993 BLAKE2B d42f527466710ccaab170425e8681ccba0e82f396a2235cffc7d4b713557a93e45d94767c5a68914fa74293977b50e2b69af668ea1d74aa07c5aabdf89722ea1 SHA512 cfd5219727af4118be5a027f68a77fdaa9e5903481907fec519d8b1f7f0f579815ab9b9f2ecbcd461e84c77d693b35edc43d50242966acb2f43ff91ad199585f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kolf/kolf-21.08.3.ebuild b/kde-apps/kolf/kolf-21.08.3.ebuild
index 7c048c7995d7..69537f41552b 100644
--- a/kde-apps/kolf/kolf-21.08.3.ebuild
+++ b/kde-apps/kolf/kolf-21.08.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kolf/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kolf/kolf-21.04.3.ebuild b/kde-apps/kolf/kolf-21.11.90.ebuild
index c996d4642775..1c51b5e23822 100644
--- a/kde-apps/kolf/kolf-21.04.3.ebuild
+++ b/kde-apps/kolf/kolf-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ https://games.kde.org/games/kolf/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 362c410f4135..fe45f5248645 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,5 @@
-DIST kollision-21.04.3.tar.xz 290640 BLAKE2B 4cd2ef55162967ad959e62f04f52ee0c22fec7419874912c49a1fa612b7b48edfb195973c8d06ab820732e18af589f57c0d5e48be9f606192c2bd4ca48b49d7e SHA512 cf7296b0bc725c5fed42b34ce7ac3a5abd5a5c00d18b2f5e4756eeba9ff229850f4d6559f32289a05a661084babf29e4404ab62708c24d5be5e7b32419ea5530
 DIST kollision-21.08.3.tar.xz 291040 BLAKE2B d303dc995537e8bf5ff84026a2001bdfe35675c73d10d8aadf782411e84b2ea1606f7c76d18c3441de271746913c57acb5906015aaf6144805dc4fb245df36d7 SHA512 1b753783897625655132d3eefb334a93203aaa2d57d6ff8d85de0bee0c237489c63f9e42bedd865f08c9962e969942a3b137c00c399efa9487234dee91b3b86c
-EBUILD kollision-21.04.3.ebuild 802 BLAKE2B 96bb00c45e35c52e8fef361c8517d64cbc49f7c5df8414731b8320520c550f7643fbcc15325116c45c40fe9a759adb64c1a691a4ac787226eaab1094c5894355 SHA512 aa6d57cbd39e4d932f0c076817c2141bc35e466f39b888bc226a7469aeae1b792f6d43ab648edd84d1982e95bfce24736fe2de18d6481baf7b9479bd850cb43f
-EBUILD kollision-21.08.3.ebuild 812 BLAKE2B f22d82120bd533ea1b0c1219c24c3e66015b4ea84e0584c760774a916ba3ce930cab060d91d2ef73798150f69167f9afccfccbfcb6d59ac93a46cf94a6ba40ff SHA512 e94dc8ee4c2774e7d03e729ad25af60923cbd1b7d1312895088cd60b904e11ec7c7a077e5f8a51109a31a4377303cab758e62e8baec59012a041f902d4eb2687
+DIST kollision-21.11.90.tar.xz 298832 BLAKE2B 3b492ea63a74e4de68092f6354b12ac966d0bb20fd83e40556936d7d56a171e950cbc356c6b2539fe5938298fe065f860e0ffab92d11c9a58acc06fcfa7e1332 SHA512 a8b0846d3e14bcf7f4ddb03d194e380bf045f6e0aa8104e986025c2a69e9e269c4f4735f8d8c5d452ee69dbbac537612f67618153e84976091ce39c547d040b6
+EBUILD kollision-21.08.3.ebuild 809 BLAKE2B 26090dfc1f1d6fa8f6d614cc5ed391c6744afe269d04e4f62c0298923b8bf10cdc772e56859869380e4f109986ad5f5bfd2753019f19f73ba9747e544d6f0bc2 SHA512 c88f056f28f62e2edcc40d7fdae40693aa1eb891b1bb9351140896bf93566c9fa00c0e2b34b87471c1d65fb233107bd68429f31e734b96f83360b9a6c82a122f
+EBUILD kollision-21.11.90.ebuild 812 BLAKE2B 5beee645183628f0b1a28ed07766928bbe8c3a63af1db0e0338f4cf119fa2108119515fd715e953347e66f5a2b416e3151ce2ea2da4216bbf6b3cf8798041af2 SHA512 093edc0634e5beda71821dd3f084788688ca98d538712267bb70dcb6f7489337bf4407cb5cea88c7d7db45348e286e3018504d36ed29ff361bc40e338a3859eb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kollision/kollision-21.08.3.ebuild b/kde-apps/kollision/kollision-21.08.3.ebuild
index 0bccd1827345..1b9a480b53bb 100644
--- a/kde-apps/kollision/kollision-21.08.3.ebuild
+++ b/kde-apps/kollision/kollision-21.08.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kollision/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kollision/kollision-21.04.3.ebuild b/kde-apps/kollision/kollision-21.11.90.ebuild
index e4273d8b3c41..357991e2acc0 100644
--- a/kde-apps/kollision/kollision-21.04.3.ebuild
+++ b/kde-apps/kollision/kollision-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ https://games.kde.org/games/kollision/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index 2697f26a8a93..d51d1299e684 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
-DIST kolourpaint-21.04.3.tar.xz 5714920 BLAKE2B e8fb4d34ab677eb1dab5c8fd80a7930a30f42aea79626daa67abea9fa4fa688ad5ac60c5e2cb31c25942a695a8848827b73efb7ed0089f10acaffd6986f355d3 SHA512 9ab0242752bc051d12413772c2d4a0a38525c5b98283c58ea64802b649c6887ddd865dfc9a19abf93871d08d0017c7dd1daa1c555741e61b777340e6415cfe81
 DIST kolourpaint-21.08.3.tar.xz 5715232 BLAKE2B 64ebabd2e29776f723c65326fb978948061d53af2476985892085a822a2e284434b3cc5157b509090dcaac142a4a38cb163c8e5e5fc623d82c061a9f13958e70 SHA512 db459ffdf4d8b6eadee06a134d07c3bbc957112aad261acf0361317ba00ba3c05dc2015ea4b5e91bc244a4ebc1c4548750d5c6be249e2a415add1a1a198af28a
-EBUILD kolourpaint-21.04.3.ebuild 1143 BLAKE2B 2bf523676681b90dfca88220b572e166dee39787cc9afefc09652748e4a438b0944bdfbb00c916051b68c21a0febe5c876ca28ce6cde49147eb424a058eff303 SHA512 54ed2685ab9c886818767d8a251a129aa91a9bc27b29fca238d8e567229078be3d1bfb763b43c2bf8d74f9fa9190f6a00322b9706776806007f7caf36f1b50d6
-EBUILD kolourpaint-21.08.3.ebuild 1153 BLAKE2B d124a9c31084a8a3479b9978910a44a75f4568c42dd91e3b9dad0d122369bffe06c55165b9446829bd9574fa704a114656322a9b388a0c165816d6b39edccbcc SHA512 f400765386cbffbb2f278dff02ec41008e8173f9ddde624f4f87a820407c014b7ff478bb5b7a51ebfb913dc1faebe1c8052d71fee7b4923037e63a53ccb2ac8b
+DIST kolourpaint-21.11.90.tar.xz 5716268 BLAKE2B 304b965634569b05ff9c7340d0167dc86b44744e29c01dcf36c574dddc70d2786b10e396acd61622fea470e92a52e48258e8c9ff6175e005959d12396aaa1f52 SHA512 f8665416aa743422db94db069d3bb1977d770334e1e6287f143c981c1aebcd8c7f8b42746d3887aa246924a194967d6d50b9aac2e629448a0880dd5c0c1f7248
+EBUILD kolourpaint-21.08.3.ebuild 1150 BLAKE2B 9ef8f29e2f36c26946a0d763766c1c94cea13677f590141f5d41e37126549623bc8a9508c2ba5c2adc3c841ea539966c33955b91b5efb58ed047ffc232abce2f SHA512 be0f326d27a21dcae6778a8210beb4070cc6b9f4781a8658e6e15ae2ab2ea38b1a2cc951648212ddad7d682db4a51e05f6bbc26a7c5fefdd1dae81d84c407201
+EBUILD kolourpaint-21.11.90.ebuild 1153 BLAKE2B 16e728811c4af65f49b64681138eba4268de81341b88ea4881e6bcbcd2e6c0a533b70604cdace6949ae514602ae7dda64f8c134ebe84892e73deca395b753c48 SHA512 03b13a4fa266fb173f583126e150219b87f1c93f1dcca98a6235fff992a8bb02700d4089bee955bcfe13fc135a85e14eac1b00fc560c39e0861100c5b2ae013c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kolourpaint/kolourpaint-21.08.3.ebuild b/kde-apps/kolourpaint/kolourpaint-21.08.3.ebuild
index 5a6554f4df86..e37911b2d415 100644
--- a/kde-apps/kolourpaint/kolourpaint-21.08.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kolourpaint/"
 
 LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="scanner"
 
 DEPEND="
diff --git a/kde-apps/kolourpaint/kolourpaint-21.04.3.ebuild b/kde-apps/kolourpaint/kolourpaint-21.11.90.ebuild
index 1e0316d8543e..089e07a52a8f 100644
--- a/kde-apps/kolourpaint/kolourpaint-21.04.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kolourpaint/"
 
 LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="scanner"
 
 DEPEND="
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index d54d51fe7648..9afc23b6c9ba 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
-DIST kompare-21.04.3.tar.xz 950868 BLAKE2B dec23547a505ca487e55ccb1f2fc7c91b95f43d8d5c20c77a692b1c685d3e86d5bf7f2666c64967ff9f89278a935a6da3a90a7de1f922248e1f089c03a676755 SHA512 762a2017f942933fb25a264a9291e455b3de24aa4879b4600096c80ddbdb75b0423596ad7ddc10c0d60df337c4bf18b9bbe3818a5c66997672f8b21fd353e44c
 DIST kompare-21.08.3.tar.xz 942616 BLAKE2B c4c76f94ed253feb8eb4427c43ce400e7b9bad7d3831282992dc4141ac2465054f9d63ca6a8789995646d8b6c237f2e9783efec26790f9b02225675e4fd020dc SHA512 67beec08d25e80b0add44cfc6314248d3654a163a4e1983f57adca4f0faa8aee8ef98c232ca2b10f28f47f3da92a12053114fd12968c8d64a2791828a87845f1
-EBUILD kompare-21.04.3.ebuild 1099 BLAKE2B d85eb521ec5495e890055c10cf62869aa74953b9862cdab7b75eb69cd16faa28d83f225d0146d7b5d369ef195054ba11b04aa6cd6c6e53e891bd7daee7d6c74d SHA512 d8b1742c7f92621bac7371c2f85606a54f49e8ce908fa70d118e3261d9359b5ce3a6cb222f69d1e1fc0c4f862361c90dc9d34c8eac4ad959eae1f2fae95896f0
-EBUILD kompare-21.08.3.ebuild 1109 BLAKE2B 65a02f871c386f8adf6f58ee62699fae8930bf61a23fba79d1a2d1c94c213935e574c707d23b28f83d577f42cde7a86d1ced62f539aa684ebad0b3cc8e3a3457 SHA512 0c874bde57abcf11492669d58f46bee64d5e4a191821a6e1d17d8a9f6d0cdbd35cbc0353c0ea353c629613f30be26088b94d25dfb9b177cc057c1b2b501731c0
+DIST kompare-21.11.90.tar.xz 942524 BLAKE2B cc0f31c265ad81046a530168090189d623205581b12be75e924948a19cf15cc56ce76581cc9d8efe089f63140a261d88ba8f5d59ab1bbc1e9147558594f56637 SHA512 1c40b608c2bc1dae904bce26a1f66aac75d419104c5666742603974e7bf4e30dfa368020712504c2c7a7fadf77fef281b4bc516e463b7d420e67d81a62993f6b
+EBUILD kompare-21.08.3.ebuild 1106 BLAKE2B 9d0ddd00789c40d333741faf6f7cf85d80eb8127abe25aad0922981d838ec91dec160b8946324fff9efb8f73f23b682d827c288cef58db638893419b5ed88571 SHA512 6db944fd6816565e90967f7fbdf9df7878e9b216deec6669e3f3314f7cc2169d454a94938ff3e9125cdb85c0d49d8ebe169f51f56c2b9d435e65acdc1c84e866
+EBUILD kompare-21.11.90.ebuild 1109 BLAKE2B 240225665c46552aa9a4d35c9efb775134a10a3325af7190a7724af722596cb3fdcfd8c6cef8fcdfc0e0b3cfd2b9d327ee5f5c717a1bda00eabe7a11733970fd SHA512 7bde61159367346b46b14ff82b6cfdad90efb5392968db3a400d15f4d95fc0ae45dd0d347a60d3647e93e1ac7758a4fdcfda1429bfc9cb7597f8fe61670f66bd
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kompare/kompare-21.08.3.ebuild b/kde-apps/kompare/kompare-21.08.3.ebuild
index 03f92bdd6bf6..c37e39a125d3 100644
--- a/kde-apps/kompare/kompare-21.08.3.ebuild
+++ b/kde-apps/kompare/kompare-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kompare/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kompare/kompare-21.04.3.ebuild b/kde-apps/kompare/kompare-21.11.90.ebuild
index f3a8e39d3d28..a59fd5ecdfe0 100644
--- a/kde-apps/kompare/kompare-21.04.3.ebuild
+++ b/kde-apps/kompare/kompare-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kompare/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 9d3e6cedb2ea..5adba0650734 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,7 +1,5 @@
-AUX konqueror-21.04.3-kf-5.86-compat.patch 9809 BLAKE2B 0e259dded1f434f8702a8a30781cdba0c675cd5055899ab40aeb44c04003d615cec570155fd0855fb9fb421e0ca1b38dd2fb83a1f271e1b25729f61b618cd239 SHA512 8f96ee1225e0da36e7e41d057dd15ebed3b66100ba5e9f23831aaa2ace61b074081a7760f3333faddadf75e97b45c9c0eac6cf44a875561f455eb9c532b151c0
-DIST konqueror-21.04.3.tar.xz 7410612 BLAKE2B 0640bd4d7c8cc877e511652e4ab35885fee88a1558d1c9d4f7692b64c4f6929876f437a7dab5da457ff76aca11774c9d60952243548e90f43307ef19353da03b SHA512 60a396633ba87605225e2e791d8b8a429ddd8081fc0db45227d31a550b00fb2197735f110eb0d9ea48199dcbb19525890d04470beb20c1a49bfc3fb545125104
 DIST konqueror-21.08.3.tar.xz 7418888 BLAKE2B f9e2902d77871ffc2a093e5b62751bfe5845aa6a86a2b507f01319311d3ea164498c24c5d5637f73c98e146b2453fa8a47606cfcd7e0e6693bf178b52b60f498 SHA512 e9214fcbd4fa2a63660d6d3e5af777cdf3311a059e2ac36cb15373c4944aee310cd3e6eb19d357b13e9154ba6879451e49441c33f88aa57b5c95ab2350f27d21
-EBUILD konqueror-21.04.3-r1.ebuild 2476 BLAKE2B 7cd1951907194c11fddb55ed37064e32c5287d3e55bdf08b0ced8327dfe590cb7e75dcd12289484f5acbd46ca9e807a5d87f290c6be7c4c3fd35e93535f57335 SHA512 1b336f57e7ce9eb1766553a52d5ffc7c06a50c31413ae16de9eee2fd9b904dbad2dead8298789c2b7a28878069770f4bf66f703c64162e65029c50c002582c01
-EBUILD konqueror-21.04.3-r2.ebuild 2543 BLAKE2B 1a1f9cc9c75066435b621f11185269623a67dca32278444346a077f12962f9585cd47c2db17f81a22770c16f19226071facaa7dc0ffc774fb97f092ea0ce83b7 SHA512 41ffc28e543f0ff6a45dbb2e9ca077143ee77c2108a42e1ddff3d1b6b557d98a9b040ebd1c5027a68a572fe0bcdf2208d32476d3a71612fe5d31d6d8c5ab07d4
-EBUILD konqueror-21.08.3.ebuild 2549 BLAKE2B 9d339770210cb34affbdf5fd988fd16353ec0d260db70488c33f3d015e5aad921f3c2ec86439e1814480f2cd8807190ef66a705f7ae7a3a5ec78d5059668063d SHA512 6a43d60bf2bb24de7f5fcb80db9bee912a5eb07e9a5dd2db843e28d7afbc2baa3a874c8599222428546f7469d85d2389322eb8e3e38b8febadddc6eba52073a9
+DIST konqueror-21.11.90.tar.xz 7427416 BLAKE2B c377d29aeedd76c07ff82b58f1b30007c3b459d494253990baf8afe8cb22ce39adb8b2cf3add19f63d4dd5eef0398842eef7f836030c43fdab48b51624be13b4 SHA512 20cd6c7b9304d47578b6fddd8f7039b46167e2b7875ec576a4a69240311aea8f4947f65c358982ec01d3d36774a00dbbccef257c27e1e18e5852c91f06c743f1
+EBUILD konqueror-21.08.3.ebuild 2546 BLAKE2B a6d0deb270d49d677b38434a932b271761333730381698aff2600a03de0065c68e1487e749b0cb8a428b885ee7def62ce39055f6780ba0f249f307cf8d9f3784 SHA512 cd3c36628ac42508c38d021fad240b774b549196982d70af9e6d665f152ff406d8977c11cae3646f19f2d83addda692b0ed99a18c96204d9c1876f67d4b6d289
+EBUILD konqueror-21.11.90.ebuild 2549 BLAKE2B 90dae9892266cea9475bb96c4358e07200790cb5a0592c9bf58b5ccda7e2ba4c0fa38858934254fc8800f1e8a75352a70ffcfa79bfe720f337db02eb4ffb116d SHA512 7a78d2e35ed1c9383fde55d5ce6a607542bbe72c5a224582d3c8bde82ac65989ac800822b99775cc0ba6e5b65907f355aa95f830c5cf1b67618be02a324d7c99
 MISC metadata.xml 450 BLAKE2B 61e83d89cdd87f5f0ec0acbf294ba5be5388be70e35870ef0c006775e0975244997dd59952ed4a8210d3395ec07e1abf0f2054175edf37d54be761e5a61b702c SHA512 d8558586a678dff640d2d4b66c2f3a3cdba71689e768690427752626ded385c7d1f9f3ecb0ca0c432d7557a62320c1b57f0c89e94c0be528b65c63043f9bc543
diff --git a/kde-apps/konqueror/files/konqueror-21.04.3-kf-5.86-compat.patch b/kde-apps/konqueror/files/konqueror-21.04.3-kf-5.86-compat.patch
deleted file mode 100644
index 0814c335a734..000000000000
--- a/kde-apps/konqueror/files/konqueror-21.04.3-kf-5.86-compat.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-From 6a46c0c8701fbde143a33e4be61f198e98f53c10 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 19 Sep 2021 12:03:46 +0200
-Subject: [PATCH 1/5] Don't open HTTP URLs in another browser than Konqueror,
- from Konqueror
-
-From 8506c585594d9d0cfc0ebe8b869ca05ff7610fa7 Mon Sep 17 00:00:00 2001
-From: Stefano Crocco <stefano.crocco@alice.it>
-Date: Sun, 19 Sep 2021 20:56:38 +0200
-Subject: [PATCH 2/5] Make Konqueror compatible with KIO 5.86.0
-
-Due to a change in KIO::DesktopExecParser::hasSchemeHandler (commit
-5fa55a2395cbfb6504e56bf71c869c8e49902e13Q) URLs entered in the
-navigation bar either were always opened in a new tab or they were
-opened in another program altogether (for example, man and info URLs).
-
-To fix this issue, it has been necessary to copy the implementation of
-KRun::init and KParts::BrowserRun::init in KonqRun::init, making the
-necessary changes to restore the old behaviour.
-
-(cherry picked from commit ba1ea2b74f77832d2a26bb74fed18970eeadf301)
-
-From ec995b8091e97750c12e8e543d298a7a56045d41 Mon Sep 17 00:00:00 2001
-From: Stefano Crocco <stefano.crocco@alice.it>
-Date: Sun, 19 Sep 2021 22:01:30 +0200
-Subject: [PATCH 3/5] Fix signature and avoid calling url() repeatedly
-
-(cherry picked from commit 0326d9b8553a7c33d0c1498ca4c0199cc2344e15)
-
-From d368615b28a97993ce53691731f5152f044f98a2 Mon Sep 17 00:00:00 2001
-From: Stefano Crocco <stefano.crocco@alice.it>
-Date: Sun, 19 Sep 2021 22:47:03 +0200
-Subject: [PATCH 4/5] Add a comment explaining the interaction with
- WebEnginePart
-
-(cherry picked from commit 5c4b0456af2a534c65c60b16add4012566309fb9)
-
-From 036fdfe1666294e5388803eb8877971362347428 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 30 Sep 2021 13:58:28 +0200
-Subject: [PATCH 5/5] Replace handleInitError with KParts::BrowserRun::init
-
-Avoids breaking string freeze.
-
-Thanks-to: Stefano Crocco <stefano.crocco@alice.it>
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-
-BUG: 442636
----
-
-diff --git a/src/konqrun.cpp b/src/konqrun.cpp
-index 8bfc22285..4415c67c4 100644
---- a/src/konqrun.cpp
-+++ b/src/konqrun.cpp
-@@ -27,8 +27,17 @@
- #include <kio/job.h>
- #include <QMimeDatabase>
- #include <QMimeType>
-+#include <QHostInfo>
-+#include <QFileInfo>
-+
- #include <KIO/ApplicationLauncherJob>
- #include <KIO/JobUiDelegate>
-+#include <KUrlAuthorized>
-+#include <KIO/DesktopExecParser>
-+#include <KProtocolInfo>
-+#include <KProtocolManager>
-+#include <KApplicationTrader>
-+#include <KJobWidgets>
- 
- #include <KService>
- #include <KMimeTypeTrader>
-@@ -48,8 +57,9 @@ KonqRun::KonqRun(KonqMainWindow *mainWindow, KonqView *_childView,
-                          // Don't use inline errors on reloading due to auto-refresh sites, but use them in all other cases
-                          // (no reload or user-requested reload)
-                          !req.args.reload() || req.userRequestedReload),
--      m_pMainWindow(mainWindow), m_pView(_childView), m_bFoundMimeType(false), m_req(req)
-+      m_pMainWindow(mainWindow), m_pView(_childView), m_bFoundMimeType(false), m_req(req), m_inlineErrors(!req.args.reload() || req.userRequestedReload)
- {
-+    setEnableExternalBrowser(false);
-     //qCDebug(KONQUEROR_LOG) << "KonqRun::KonqRun() " << this;
-     Q_ASSERT(!m_pMainWindow.isNull());
-     if (m_pView) {
-@@ -188,15 +198,124 @@ void KonqRun::handleError(KJob *job)
-     KParts::BrowserRun::handleError(job);
- }
- 
-+//Code copied from browserrun.cpp
-+void KonqRun::switchToErrorUrl(KIO::Error error, const QString &stringUrl)
-+{
-+    KRun::setUrl(makeErrorUrl(error, stringUrl, url()));
-+    setJob(nullptr);
-+    mimeTypeDetermined(QStringLiteral("text/html"));
-+}
-+
-+//Most of the code in this function has been copied from krun.cpp and browserrun.cpp
- void KonqRun::init()
- {
--    KParts::BrowserRun::init();
--    // Maybe init went to the "let's try stat'ing" part. Then connect to info messages.
--    // (in case it goes to scanFile, this will be done below)
--    KIO::StatJob *job = dynamic_cast<KIO::StatJob *>(KRun::job());
-+    QUrl url = KRun::url();
-+    if (!url.isValid() || url.scheme().isEmpty()) {
-+        if (m_inlineErrors && !url.isValid()) {
-+            switchToErrorUrl(KIO::ERR_MALFORMED_URL, url.toString());
-+            return;
-+        }
-+        const QString error = !url.isValid() ? url.errorString() : url.toString();
-+        KParts::BrowserRun::init();
-+        qCWarning(KONQUEROR_LOG) << "Malformed URL:" << error;
-+        setError(true);
-+        setFinished(true);
-+        return;
-+    }
-+
-+    if (!KUrlAuthorized::authorizeUrlAction(QStringLiteral("open"), QUrl(), url)) {
-+        QString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, url.toDisplayString());
-+        KParts::BrowserRun::init();
-+        setError(true);
-+        setFinished(true);
-+        return;
-+    }
-+
-+    if (url.scheme().startsWith(QLatin1String("http")) && usingWebEngine()) {
-+        //This is a fake mimetype, needed only to ensure that the URL will be handled
-+        //by WebEnginePart which will then determine the real mimetype. If it's
-+        //a mimetype it can't handle, it'll emit the KParts::BrowserExtension::openUrlRequest
-+        //passing the real mimetype. Knowing the mimetype, KonqMainWindow::openUrl will handle
-+        //it correctly without needing to use KonqRun again.
-+        mimeTypeDetermined(QStringLiteral("text/html"));
-+    } else if (url.isLocalFile()
-+               && (url.host().isEmpty() || (url.host() == QLatin1String("localhost"))
-+                   || (url.host().compare(QHostInfo::localHostName(), Qt::CaseInsensitive) == 0))) {
-+        const QString localPath = url.toLocalFile();
-+        if (!QFile::exists(localPath)) {
-+            if (m_inlineErrors) {
-+                switchToErrorUrl(KIO::ERR_DOES_NOT_EXIST, localPath);
-+            } else {
-+                KParts::BrowserRun::init();
-+                setError(true);
-+                setFinished(true);
-+            }
-+            return;
-+        }
-+
-+        QMimeDatabase db;
-+        QMimeType mime = db.mimeTypeForUrl(url);
-+        if (mime.isDefault() && !QFileInfo(localPath).isReadable()) {
-+            // Unknown MIME type because the file is unreadable, no point in showing an open-with dialog (#261002)
-+            const QString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, localPath);
-+            KParts::BrowserRun::init();
-+            setError(true);
-+            setFinished(true);
-+            return;
-+        } else {
-+            mimeTypeDetermined(mime.name());
-+            return;
-+        }
-+    } else if (KIO::DesktopExecParser::hasSchemeHandler(url) && !KProtocolInfo::isKnownProtocol(url)) {
-+        // looks for an application associated with x-scheme-handler/<protocol>
-+        KService::Ptr service = KApplicationTrader::preferredService(QLatin1String("x-scheme-handler/") + url.scheme());
-+        if (service) {
-+            //  if there's one...
-+            if (runApplication(*service, QList<QUrl>() << url, window(), RunFlags{}, QString(), QByteArray())) {
-+                setFinished(true);
-+                return;
-+            }
-+        } else {
-+            // fallback, look for associated helper protocol
-+            Q_ASSERT(KProtocolInfo::isHelperProtocol(url.scheme()));
-+            const auto exec = KProtocolInfo::exec(url.scheme());
-+            if (exec.isEmpty()) {
-+                // use default MIME type opener for file
-+                mimeTypeDetermined(KProtocolManager::defaultMimetype(url));
-+                return;
-+            } else {
-+                if (run(exec, QList<QUrl>() << url, window(), QString(), QString(), QByteArray())) {
-+                    setFinished(true);
-+                    return;
-+                }
-+            }
-+        }
-+    }
-+
-+    // Let's see whether it is a directory
-+
-+    if (!KProtocolManager::supportsListing(url)) {
-+        // No support for listing => it can't be a directory (example: http)
-+
-+        if (!KProtocolManager::supportsReading(url)) {
-+            // No support for reading files either => we can't do anything (example: mailto URL, with no associated app)
-+            KParts::BrowserRun::init();
-+            setError(true);
-+            setFinished(true);
-+            return;
-+        }
-+        scanFile();
-+        return;
-+    }
-+
-+    // It may be a directory or a file, let's stat
-+    KIO::JobFlags flags = progressInfo() ? KIO::DefaultFlags : KIO::HideProgressInfo;
-+    KIO::StatJob *job = KIO::statDetails(url, KIO::StatJob::SourceSide, KIO::StatBasic, flags);
-+    KJobWidgets::setWindow(job, window());
-+    connect(job, &KJob::result, this, &KonqRun::slotStatResult);
-+    setJob(job);
-     if (job && !job->error() && m_pView) {
--        connect(job, SIGNAL(infoMessage(KJob*,QString,QString)),
--                m_pView, SLOT(slotInfoMessage(KJob*,QString)));
-+        connect(job, &KIO::StatJob::infoMessage, m_pView, &KonqView::slotInfoMessage);
-     }
- }
- 
-diff --git a/src/konqrun.h b/src/konqrun.h
-index 591b91d19..88782ea03 100644
---- a/src/konqrun.h
-+++ b/src/konqrun.h
-@@ -26,6 +26,8 @@
- #include "konqopenurlrequest.h"
- #include <QUrl>
- 
-+#include <KIO/Global>
-+
- class KonqMainWindow;
- class KonqView;
- 
-@@ -69,6 +71,14 @@ protected:
-     void init() override;
-     void scanFile() override;
- 
-+    /**
-+     * Displays an error page appropriate to the given error code
-+     *
-+     * @param error the error code
-+     * @param stringUrl the string representation of the URL which caused the error
-+     */
-+    void switchToErrorUrl(KIO::Error error, const QString &stringUrl);
-+
- protected Q_SLOTS:
-     void slotRedirection(KIO::Job *, const QUrl &);
- 
-@@ -81,6 +91,7 @@ private:
-     bool m_bFoundMimeType;
-     KonqOpenURLRequest m_req;
-     QUrl m_mailto;
-+    bool m_inlineErrors;
- };
- 
- #endif // KONQRUN_H
diff --git a/kde-apps/konqueror/konqueror-21.04.3-r1.ebuild b/kde-apps/konqueror/konqueror-21.04.3-r1.ebuild
deleted file mode 100644
index b1f660798722..000000000000
--- a/kde-apps/konqueror/konqueror-21.04.3-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic ecm kde.org optfeature
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/konqueror/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="activities speech X"
-
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	sys-libs/zlib
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/kfind:5
-	kde-plasma/kde-cli-tools:5
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	ecm_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package X X11)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
-		optfeature "filemanager component" kde-apps/dolphin:${SLOT}
-		optfeature "SVG support" kde-apps/svg:${SLOT}
-		optfeature "Java support on webpages" virtual/jre
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/konqueror/konqueror-21.08.3.ebuild b/kde-apps/konqueror/konqueror-21.08.3.ebuild
index 845797349d9c..f90929f710c6 100644
--- a/kde-apps/konqueror/konqueror-21.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konqueror/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="activities speech X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
diff --git a/kde-apps/konqueror/konqueror-21.04.3-r2.ebuild b/kde-apps/konqueror/konqueror-21.11.90.ebuild
index abaf095e12ce..cec785b5cb95 100644
--- a/kde-apps/konqueror/konqueror-21.04.3-r2.ebuild
+++ b/kde-apps/konqueror/konqueror-21.11.90.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit flag-o-matic ecm kde.org optfeature
@@ -63,8 +63,6 @@ RDEPEND="${COMMON_DEPEND}
 	kde-plasma/kde-cli-tools:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-kf-5.86-compat.patch" ) # bug 815022
-
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
@@ -73,6 +71,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 634122
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package speech Qt5TextToSpeech)
 		$(cmake_use_find_package X X11)
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 429ba6c7bd98..cb76dcbb18fe 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
-DIST konquest-21.04.3.tar.xz 671704 BLAKE2B e4ab1c0685063a8028a9d62e3bac65b80865e6a404150886b8d2f7eebad0b929a4168fb925bc71bf14d12361e8741de28b632330ba128e8eff0126d43202a385 SHA512 27221b09a8f5f57c481d95fbda90550998bf1dd8d94283f576403b438cb094ed4984893541fa2d252a2b9eb05177eaf292339f8f812867a1879d3b9036d62bba
 DIST konquest-21.08.3.tar.xz 671276 BLAKE2B ac2ac1d131557528b2286f5327ead539d08c0d4e515e3eba96f413f0b361014e402a16ccb43d54c2d6c2121be28d5c291f372dcca695ec8ff77fdc3b30bf73cb SHA512 9505de6a614464dc55a4b6e19ee77047001ac774f6c6505ac93ce73b50c02aa1514432679a639fca40a337ec008c073180340bfd36915d73be81ee847676bc77
-EBUILD konquest-21.04.3.ebuild 896 BLAKE2B 8c7af606d5a77019df6062515616f040b0745425406213bcefbcb6ca4c2ca08f86bedbef210c8267e9b271316494caa01602f92157a03aac9651bfb8d6cf8d34 SHA512 a3954ec4fed94891a1b7601db2c3823a18b35f81cfbc27dd11cb28ac787396b31fb45f07201032f38f7e1e2128f1ba311e382264a34f31795696a8a9aa662b1c
-EBUILD konquest-21.08.3.ebuild 906 BLAKE2B 14115aab37d6595b40af12167ef6cc3e5b899dc5a8b8f992b0a1aadad68f1ead05afcaf5adf7e5721850782b2d43a295efb4c4a3a860105ade7e5326f4421e17 SHA512 61aa46ec01a2a2c4804c2a3b8784f630e06c26855a1ede2e658cf6f0c81ee6c65a6e5172a04f661ae03cbee114d5afc42192b6ee93571711534f57f6b215758a
+DIST konquest-21.11.90.tar.xz 860584 BLAKE2B 46cb24f476cf74f8bb7a0e3b48445d69d0915836de78b8bd135fb240790b7beb44ebe31621b3cc9085ff3abcee66e7edb5a2e2ac47fac544bc478caab5d4e23b SHA512 fbac8b23018a048462311b2bd3e8caab4d6bea79b86e6e6db70f20c668be8b7fb26f5a58270d7608cbe91743f77088fc82f098ea69bfbf053811ead28c4a80ac
+EBUILD konquest-21.08.3.ebuild 903 BLAKE2B a3d5aafca111d766b300e94bb83645e1ca7f1688dbc54a5c012317dd42771a82f378c82a1f43a0367e33cbd82e655bf778ed14b245da8d19f795e14f5bc026ee SHA512 0f6f2bbd7b00efac11e0ea60b60df1a3cbe0ca609a1df339026514cab1d388a30c250b3cecc74ae3d68083ecbb964e8ff0ee00c64a4cf83f71eada0bb16194bf
+EBUILD konquest-21.11.90.ebuild 906 BLAKE2B 8881ac4cab9ba22d97bbb89a4c9c7e6f4803a7cb91c5545b006c1e03568c5cc24f9c5fdd42f1dd30e726c357375f2f3279b41cd828a1141ff31bde0fc4b8e8f2 SHA512 420f2554cf41e1c6a2bf5d151aa689520cda411bdba24c72a3e3845e5dea8b876e7440185436696cc6dfb9ade94a137e8e282c43e6a62cf71a8564b41a7b07e9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/konquest/konquest-21.08.3.ebuild b/kde-apps/konquest/konquest-21.08.3.ebuild
index 764c4fd60d3a..ff24c8137441 100644
--- a/kde-apps/konquest/konquest-21.08.3.ebuild
+++ b/kde-apps/konquest/konquest-21.08.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/konquest/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konquest/konquest-21.04.3.ebuild b/kde-apps/konquest/konquest-21.11.90.ebuild
index 5fdb8823de24..acc8c5d32f57 100644
--- a/kde-apps/konquest/konquest-21.04.3.ebuild
+++ b/kde-apps/konquest/konquest-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ https://games.kde.org/games/konquest/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 4bcab4df5a99..e9cbf60e5a90 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,10 +1,5 @@
-AUX konsole-21.04.3-default-navigation-be-TabbedNavigation.patch 1164 BLAKE2B 86135101dab8a96f2c621ca2f326fb3ec7a630fd446bf30ed63c13fa25835d72b68230c1f7a368e13f78a550f50d8ece45ff7303f65569c9eb170f798afdc2de SHA512 a0d0d5e02b2333add47e68e0540ab2c4fcaa2446883c1a740d1721fa22fb28afe97f74913a2af4c345edf20499eed4c72d253b9e59fd6984de3da99eca53c10d
-AUX konsole-21.04.3-dont-close-window-while-split.patch 2592 BLAKE2B 22c438734d6e3959f965b54dd76fc683566ed17ef8d368984c5d54b9ec6f95612ab2c993f1266367933b2327e937164eb655d386dce9cd82178f229a136c5789 SHA512 641eb0010bd320868538ebb3254e5883b84e4e17d06bd0ddea961e49b00eb3f811c0a163fc50096ac4d194a53a22db5ad9d3b6c007a85a40299eab03f36ba394
-AUX konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch 1960 BLAKE2B 8c13a8f2e200c07d0cb036257aae342e3b1046e55a259d2161cd2af24f788e225f661bb27e917b90081998cd7e2d290ecb609366e11bd22b0a70ae267c862356 SHA512 ad6de009a9f2d0ce39fbe13e32d4b821c5f6a96840173e26cf89e9f3b03f0f9b09bc7891d2efa457532926a3aa0f721655d549ca75d93ab5a91fed05ce07d543
-AUX konsole-21.04.3-no-flash-on-session-close.patch 2711 BLAKE2B 0a50eb56a282be8189cb6c0c54abdab9d674fd2fa01842786af558671e2a51d752298ad084e285e1bef96a99ab28cdd5714f28cf9032238e8e172f497b9ee92f SHA512 577b3ebfc91543a3e4a5eebc9fed4db9414daab630b8e31c6530ea5d5de3b8944738527627ba7f47b9ca30fe4d428cd3d98beb7e73d7dd1097b09867256e774e
-DIST konsole-21.04.3.tar.xz 1336960 BLAKE2B 2cbcdb3edaae0fec913d82dd0eb2ca80aca70e2b9d749ae1c22512946df8bf5e99aa8444996e41b7bc162727119c8f9216b28b5b15051dd0c6a89221fcbbd355 SHA512 490271a51304d5a64111f6ae74422a6b3143a5349359e55af0845c04a6e6d405fadd1f300dc4d866b7730c0cb852bebfddbb33b0ca9e68d22f264e379d1868e8
 DIST konsole-21.08.3.tar.xz 1386972 BLAKE2B 37f29c8827e60c43eb7dcf7324d15a96e065259f32314fb5bce90429920242110aa26f4e88708b1e1fbd6dbbd9e87391241dee52b426eb63a41f62473235a4b8 SHA512 9a01678b609ca0a9f74327bb315957c2d395f80d4da14442ee0b58ba3eef54c5c4ac49b5c4d6a8ef5914502395e8d0b730472b93dea7eaa7b69cc526d2feb6c5
-EBUILD konsole-21.04.3-r4.ebuild 2121 BLAKE2B f80e85ff25f9af9427d11c4a4bbe897f26dd0c05255343f819150550ca92a9f74f78f67248479eee77b498a4443b6897657e3e5f554a01b5f3640eb7dd0adbc0 SHA512 37438811f7283834b7256de430e3b2e6c3a1ce59283ef512e586cd876869a8b482fb7e42cdc6b3ac2165b5308932fc0644ef0a637513132cae9248c8496b65de
-EBUILD konsole-21.04.3.ebuild 1796 BLAKE2B e7db09011bb97c8aab943455427555f3c6058969f80ff517c8e8176a53660e6a30e6a7820a32497715d304c5c5f3c18d26460522c778f57fd653144ef1ed5141 SHA512 c06b7598f239d43263bf5dcc5741bb9c0c2eff6b741b44fa925097fb63bd21496950c87d7035b71fe1c4932cca3fe252f02f7bff5c060e26cc33903b617d7991
-EBUILD konsole-21.08.3.ebuild 1700 BLAKE2B adfc8f43c6e020d42cb76d127136531acb8d3c0ba5ec97d957ccb7c9ebcab86077c13b0028e19b18c39b7650a4a089fb2ee40b0da0449f43bcd7b3ea6f3f6d29 SHA512 1156c87cc9634828795fd9b6fddf9e65b74183e54f0007f4bad11d666db374e457c82e973b2b3e279c665dfcf77f495d1c7ef2f7f98d11013f31d929ac47f240
+DIST konsole-21.11.90.tar.xz 1386432 BLAKE2B a6cdc6756d0dade915e87f6502be26ac4aa46413ebc4f7b3e0cc37c0e785bcf43723ad18c50611c25f6eff67e26b0a18e02315777d131f92a5026b31863071bd SHA512 a1e01e640bee399d6ce9d33255cd582b0827b8066b952adae5fea48746f737e7cab1205bc3a2628fd14d4fe3a4fc9495131f1c69eba8813a9b6b579a62dcbbaa
+EBUILD konsole-21.08.3.ebuild 1697 BLAKE2B bddcf8c28a392df68384d69244e164a1392e1430bc99a2bcb59dd003c8743f34a319b4576a0568b53f615588b04ef1dbd1432dc723a133caeb98988c92d7e6c6 SHA512 e1e789d94daee358a367f59a3f6ca7e3b9afa21fd3e4b2cbd7c46420e979067ea4f857cfda4672c979951da409260b6b7051fa4bb4a7dbbab4b0d55554e3d75b
+EBUILD konsole-21.11.90.ebuild 1700 BLAKE2B 5251b36024d381896076806c351edb255fd20627262864a221795ecdb7d85cbcfb13daead6f633433f7b4b349c60c6a3d46888db631e792435d5b9a0cf015723 SHA512 cf6ecdb7a896872b2b2342ffe3545b345f991f3cba3ccb551847e50eb35fbc66e6acf46c997d963d569bb63bca56b081657c1465904ab26c7b3f58bcb224d5ac
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch b/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch
deleted file mode 100644
index 0eeaef378990..000000000000
--- a/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e693f2d7f1977ca227589154a5cd8c18d8ce44b7 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Wed, 1 Sep 2021 11:38:29 +0200
-Subject: [PATCH] The default navigation method should be TabbedNavigation
-
-TabbedNavigation is when we have a MainWindow, i.e. the typical use case;
-whereas NoNavigation is when using Konsole Part. The code in Part calls
-setNavigationMethod(NoNavigation), so things should work as before.
-
-I made a wrong assumption that TabbedNavigation was already the default.
-
-CCBUG: 432077
----
- src/ViewManager.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
-index 2ba77e9f0..3ffbe6ba0 100644
---- a/src/ViewManager.cpp
-+++ b/src/ViewManager.cpp
-@@ -52,7 +52,7 @@ ViewManager::ViewManager(QObject *parent, KActionCollection *collection) :
-     _pluggedController(nullptr),
-     _sessionMap(QHash<TerminalDisplay *, Session *>()),
-     _actionCollection(collection),
--    _navigationMethod(NoNavigation),
-+    _navigationMethod(TabbedNavigation),
-     _navigationVisibility(NavigationNotSet),
-     _managerId(0),
-     _terminalDisplayHistoryIndex(-1)
--- 
-GitLab
-
diff --git a/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch b/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch
deleted file mode 100644
index 20762b109574..000000000000
--- a/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 2591a9489a4d3a43c7a7f00764e9f84822d4946c Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Sun, 15 Aug 2021 15:51:33 +0200
-Subject: [PATCH] When closing a session, don't close the whole window if there
- are splits
-
-When closing a session, we check if that is the last tab, and make the code
-close the whole window, but we also need to make sure it's the last view,
-i.e. no split views.
-
-CCBUG: 440976
-FIXED-IN: 21.08.1
-(cherry picked from commit 4a3cab03f5d853f4dd48531979fc3fb57dde5e2e)
----
- src/ViewManager.cpp           | 6 +++---
- src/widgets/ViewContainer.cpp | 9 +++++++++
- src/widgets/ViewContainer.h   | 6 ++++++
- 3 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
-index 9c006e2bd..426040b78 100644
---- a/src/ViewManager.cpp
-+++ b/src/ViewManager.cpp
-@@ -494,9 +494,9 @@ void ViewManager::sessionFinished()
-         return;
-     }
- 
--    // The last session/tab? emit empty() so that close() is called in
--    // MainWindow, fixes #432077
--    if (_viewContainer->count() == 1) {
-+    // The last session/tab, and only one view (no splits), emit empty()
-+    // so that close() is called in MainWindow, fixes #432077
-+    if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) {
-         Q_EMIT empty();
-         return;
-     }
-diff --git a/src/widgets/ViewContainer.cpp b/src/widgets/ViewContainer.cpp
-index 2d7bfd13b..b25c00cdd 100644
---- a/src/widgets/ViewContainer.cpp
-+++ b/src/widgets/ViewContainer.cpp
-@@ -145,6 +145,15 @@ ViewSplitter *TabbedViewContainer::viewSplitterAt(int index)
-     return qobject_cast<ViewSplitter*>(widget(index));
- }
- 
-+int TabbedViewContainer::currentTabViewCount()
-+{
-+    if (auto *splitter = activeViewSplitter()) {
-+        return splitter->findChildren<TerminalDisplay*>().count();
-+    }
-+
-+    return 1;
-+}
-+
- void TabbedViewContainer::moveTabToWindow(int index, QWidget *window)
- {
-     auto splitter = viewSplitterAt(index);
-diff --git a/src/widgets/ViewContainer.h b/src/widgets/ViewContainer.h
-index 3cbacf2cf..8e0a0986a 100644
---- a/src/widgets/ViewContainer.h
-+++ b/src/widgets/ViewContainer.h
-@@ -135,6 +135,12 @@ public:
-      */
-     ViewSplitter *viewSplitterAt(int index);
- 
-+    /**
-+     * Returns the number of split views (i.e. TerminalDisplay widgets)
-+     * in this tab; if there are no split views, 1 is returned.
-+     */
-+    int currentTabViewCount();
-+
-     void connectTerminalDisplay(TerminalDisplay *display);
-     void disconnectTerminalDisplay(TerminalDisplay *display);
-     void moveTabLeft();
--- 
-GitLab
-
diff --git a/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch b/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch
deleted file mode 100644
index d02846ace5aa..000000000000
--- a/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2684bc7fa5ac0b740b3e8661c3a0ae0136fde0a7 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Sun, 22 Aug 2021 20:02:52 +0200
-Subject: [PATCH] Only emit empty() in SessionFinished() when in
- TabbedNavigation mode
-
-empty() is emitted so that MainWindow calls close() and we get rid of the
-colours-flashing bug when closing the last session/tab in a window, see
-commit bbec72250d080. However all that isn't relevant when we are in
-konsole Part mode, where there are no tabs or MainWindows.
-
-This fixes a crash in Dolphin when closing its window while the embedded
-Konsole Part is open. The crash would happen as calling
-ViewContainer::currentTabViewCount() would end up in the ViewSplitter code
-path, which is no-op in Konsole Part.
-
-To test:
-- Open dolphin, make sure the terminal panel isn't open to begin with
-- open the terminal panel
-- close the dolphin window while the terminal panel is open
-
-BUG: 441206
-FIXED-IN: 21.08.1
----
- src/ViewManager.cpp | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
-index 92d2951fc..2ba77e9f0 100644
---- a/src/ViewManager.cpp
-+++ b/src/ViewManager.cpp
-@@ -494,11 +494,13 @@ void ViewManager::sessionFinished()
-         return;
-     }
- 
--    // The last session/tab, and only one view (no splits), emit empty()
--    // so that close() is called in MainWindow, fixes #432077
--    if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) {
--        Q_EMIT empty();
--        return;
-+    if (_navigationMethod == TabbedNavigation) {
-+        // The last session/tab, and only one view (no splits), emit empty()
-+        // so that close() is called in MainWindow, fixes #432077
-+        if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) {
-+            Q_EMIT empty();
-+            return;
-+        }
-     }
- 
-     auto *session = qobject_cast<Session *>(sender());
--- 
-GitLab
-
diff --git a/kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch b/kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch
deleted file mode 100644
index d8b14f2f1660..000000000000
--- a/kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 302c16791935cc3cf262aee355afce13d694b00f Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Thu, 12 Aug 2021 13:58:20 +0200
-Subject: [PATCH] Prevent window "flashing" when closing the last session
-
-There are two scenarios when closing a window:
-A) clicking the close button on the title bar (or Ctrl+Shift+Q):
-~MainWindow()
-~ViewManager()
-~TabbedViewContainer()
-~TerminalDisplay()
-~Session()
-
-B) closing the last session/tab in a window:
-SessionController::sessionFinished()
-~Session()
-~TerminalDisplay()
-~TabbedViewContainer()
-~MainWindow()
-~ViewManager()
-
-the issue with the second case is that the TerminalDisplay is torn down
-first, which exposes the TabbedViewContainer widget, the latter has the same
-Qt::Window colour as the system colour scheme window background colour, if
-you're using a dark terminal colour scheme and a light-coloured system colour
-scheme, you could see some "flashing" when you close the last session with
-e.g. Ctrl+D.
-
-To fix this, in sessionFinished() check if TabbedViewContainer::count() is
-1 (i.e. closing last tab/session), and emit the empty() signal in that case,
-which is connected to MainwWindow::close(), then the order of tear down
-becomes:
-SessionController::sessionFinished()
-~Session()
-~MainWindow()
-~ViewManager()
-~TabbedViewContainer()
-~TerminalDisplay()
-
-BUG: 432077
-FIXED-IN: 21.12
-(cherry picked from commit bbec72250d080ce286a6762fb9beee4b6e7981c9)
----
- src/MainWindow.cpp  | 2 +-
- src/ViewManager.cpp | 7 +++++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
-index cc38b3990..0fae334de 100644
---- a/src/MainWindow.cpp
-+++ b/src/MainWindow.cpp
-@@ -102,7 +102,7 @@ MainWindow::MainWindow() :
- 
-     // create view manager
-     _viewManager = new ViewManager(this, actionCollection());
--    connect(_viewManager, &Konsole::ViewManager::empty, this, &Konsole::MainWindow::close);
-+    connect(_viewManager, &Konsole::ViewManager::empty, this, &QWidget::close);
-     connect(_viewManager, &Konsole::ViewManager::activeViewChanged, this,
-             &Konsole::MainWindow::activeViewChanged);
-     connect(_viewManager, &Konsole::ViewManager::unplugController, this,
-diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
-index 751684dc8..4d33a4cf8 100644
---- a/src/ViewManager.cpp
-+++ b/src/ViewManager.cpp
-@@ -461,6 +461,13 @@ void ViewManager::sessionFinished()
-         return;
-     }
- 
-+    // The last session/tab? emit empty() so that close() is called in
-+    // MainWindow, fixes #432077
-+    if (_viewContainer->count() == 1) {
-+        Q_EMIT empty();
-+        return;
-+    }
-+
-     auto *session = qobject_cast<Session *>(sender());
-     Q_ASSERT(session);
- 
--- 
-GitLab
-
diff --git a/kde-apps/konsole/konsole-21.04.3-r4.ebuild b/kde-apps/konsole/konsole-21.04.3-r4.ebuild
deleted file mode 100644
index 0a2128895e36..000000000000
--- a/kde-apps/konsole/konsole-21.04.3-r4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="X"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-flash-on-session-close.patch" # bug 807933
-	"${FILESDIR}/${P}-dont-close-window-while-split.patch" # bug 808510
-	"${FILESDIR}/${P}-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch" # bug 810598
-	"${FILESDIR}/${P}-default-navigation-be-TabbedNavigation.patch" # bug 807933
-)
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep KF5 Completion
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# drkonqi process interferes. bug 702690
-	local myctestargs=(
-		-E "(DBusTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/konsole/konsole-21.08.3.ebuild b/kde-apps/konsole/konsole-21.08.3.ebuild
index 85e60971ebfe..aacfe2b35b4a 100644
--- a/kde-apps/konsole/konsole-21.08.3.ebuild
+++ b/kde-apps/konsole/konsole-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/konsole/konsole-21.04.3.ebuild b/kde-apps/konsole/konsole-21.11.90.ebuild
index ba5b2d4855ba..817d083cfb91 100644
--- a/kde-apps/konsole/konsole-21.04.3.ebuild
+++ b/kde-apps/konsole/konsole-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 DEPEND="
@@ -34,7 +34,6 @@ DEPEND="
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
@@ -51,11 +50,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep KF5 Completion
-}
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package X X11)
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 1f9c1fad7f9c..64c9e6b33d5d 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-calendar-tools-21.04.3.tar.xz 236956 BLAKE2B 96ff649f343c240dff36c80dcf538a2d8f6dcdca678ca8b24a13e1fcd95f513ba1066ceabf8aefe9b5ed00059b797e1944155e8ff4123c29a5d92d681409ce49 SHA512 c2c7d856aa3805b44beac964212fe20a8c63f0e2950e9111d93270a05e48b37ac39339b94067bc3558d2651d5617c82d34433f0741722fbd16b8661e1f02ef3e
 DIST akonadi-calendar-tools-21.08.3.tar.xz 236480 BLAKE2B 52d684780d95dc0fd957195844ab1a190018a47b62dec05e8bdd3adf565961e6c2b229c46b3ed6cb42e9a81b59800559a1049051eb69ac00cf7cdc98a40f3fb7 SHA512 1f2dc20a9b0d2d8ad35327ebbdf39e382f687120245b346d6b9e03d3c2d521e57208567c5edf6a5552515f62ecf25e0da43fae5bccd41d47114207a30afd5d4c
-EBUILD konsolekalendar-21.04.3.ebuild 988 BLAKE2B d3f5c060b04e5da75896613a3bdf18a36ce06fbc987eef34ffe5eb9f9a04c8e0d5c3a3332b0c4785594abb80c5f05b7d309560759bdcff36bfe2194236152248 SHA512 a742550093632e3c4e47615e39614d2926d919d581a6debd100f6562ddba26b934362861eb94d20c47af31c80c1477128074b74d59e1af9494c7b3a4f9b0ff4b
-EBUILD konsolekalendar-21.08.3.ebuild 991 BLAKE2B 5c591256f7239af57078adff3cb69d6a8f721b27a73e788df272aa40dfdd8289c62a42a8d1b572f31d1302ad50c48c7f501d843de9a17aabd80aa01c45a39914 SHA512 69c3f209816cc208f022ef202817b9910b8f6d5742fe000e632e6b50128cabca16dd43a4ba665aa056e65e4b533d0b8def516b42a7bed84dd2fca7cca122611f
+EBUILD konsolekalendar-21.08.3.ebuild 988 BLAKE2B 14b93013d16ffd12b8fa2de076cbc23be33016767624f6059b0d4fc281450b5bd2e13c513ef47d83b584911b0ffc95c1d0a00689976d5079aa7498ae19904720 SHA512 93954c58de90934e33f0e4c99a015bbfeb618c4a004f8c267a487e70b3386aac5c01bb9db8372a1324c731884f538da843ad848fb5f33896cf80c1ddebb3b10c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/konsolekalendar/konsolekalendar-21.04.3.ebuild b/kde-apps/konsolekalendar/konsolekalendar-21.04.3.ebuild
deleted file mode 100644
index bed5e2507e77..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-21.04.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-inherit ecm kde.org
-
-DESCRIPTION="Command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# delete colliding calendarjanitor translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/calendarjanitor.po || die
-	fi
-
-	cmake_comment_add_subdirectory calendarjanitor
-}
diff --git a/kde-apps/konsolekalendar/konsolekalendar-21.08.3.ebuild b/kde-apps/konsolekalendar/konsolekalendar-21.08.3.ebuild
index b37284d2d8ad..5e7845249126 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-21.08.3.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 4230b9a9d1e9..6d3174b47440 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,3 @@
-DIST kontact-21.04.3.tar.xz 810052 BLAKE2B 4eb66bfa6dd21ad0158d87d9165e65355167727b6194acd929ac76413d7607ad39fc887729f34856cef8caa2bf674d9b70eab7acf1ad34e140be41e6ab0775d0 SHA512 18b489ddf4c79414eaee8a5b2a3f7c3739999f97138ac9900c095dd35571ced70fa4aa3d197057d74b2591e1b8a08b84e553bbca3b223015642e4bb48eb9dce0
 DIST kontact-21.08.3.tar.xz 809532 BLAKE2B cf126d5c1d620e3c2e74fe6020da6d7d8e41e97b9620191e3c3488c0d114f6e21f41a0e86fc6e8fb12396c863777804db3b556e26bf25805bfd5f63c471225b0 SHA512 eb14b4642c5bc22209fcac6779e7491d2c0a56e52c4eaabe412e1d69e4bca09a5d238e696fb898d83ef1d277ec82cf02f3b94d65c50596212ae301d28e88d973
-EBUILD kontact-21.04.3.ebuild 1444 BLAKE2B b3f8412a9abd3d3571860534ec5dd77054ff81f6c64ddabd374f4d51dbabba4ec58eeb2e287f8e7c14cb02e5b3fc1616a551b4def56d621ecb887c2d9e23e0e5 SHA512 02b74ad0282ddda05c1abbc5e4130717725242da85addb5081686afc4d85e045091ad068caba96862a0b4d00a421ba7c595b8444f28e61b0502f5a4eef06c2de
-EBUILD kontact-21.08.3.ebuild 1482 BLAKE2B 90a68d9b73e4c4f2e2da25eaff13e720441181d2f1ddcec19414b72a1183767e2a4ca93c09cb73f993edb87c2b4e2b69cde94ea04c3e2f82a303d670492bbf5d SHA512 2e67353095b730d7838c33b2ff1cf232f4dadfa34b6cedee765515d617559f849bd3113c3ead1050f43d9c7727f37d923dcfa99c6ffa839b418d92e7cf4e1fb1
+EBUILD kontact-21.08.3.ebuild 1479 BLAKE2B ad21a8f5c56c7f6efd1ea5b1815d9f6922bee16ab0f4efb768baff31ec5ccb88f3a31fcfa4dfab03cc0e57cd7c5356393f55ad0a086926f1432e715e3c9993b5 SHA512 b35f5ce50e0ca600ac26ac83a75cd4dd7ba607ae48b327f1c5293e5f4ed0c1a8f9c67462fb3742583741b30001947d1368fac06ee1f4387974a87a5f37f1bcf6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kontact/kontact-21.04.3.ebuild b/kde-apps/kontact/kontact-21.04.3.ebuild
deleted file mode 100644
index f0b7d4798d4b..000000000000
--- a/kde-apps/kontact/kontact-21.04.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/kontact/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontact/kontact-21.08.3.ebuild b/kde-apps/kontact/kontact-21.08.3.ebuild
index b48b05717fc0..5691aa9f80aa 100644
--- a/kde-apps/kontact/kontact-21.08.3.ebuild
+++ b/kde-apps/kontact/kontact-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/kontact/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 4a6090648b36..8bcee526197a 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,3 @@
-DIST kontactinterface-21.04.3.tar.xz 40136 BLAKE2B 8d2775ca21d400009844772134d059b50d28a3797f373aaf392fc0d127e88e9d1cb97e3601978ca1faf0eb66de12c44906e986f6d652542b287e7340715ac516 SHA512 e01fce2675cce7885f9167aab9fc4ae6d167e8c58aa6e4cb8fe9f714f35f02ee81700d5b86663f28fb9db802d877d2aac546e25ab9d23358a5e6c8ba3bf1f18d
 DIST kontactinterface-21.08.3.tar.xz 39620 BLAKE2B 96f798f8ccd4ea79e6422bd16619badf7c2b0ebc8a324ee2489fbf746e6933d2cf312cd83dd663c6f763bb58f3a8f38670b07ebbd99c465a96069d7ca3530a07 SHA512 a56f840b3bccc26a0f9bb50c5bb16e7b2fd25442136e7852ee101169f4c3746b64a64e1910cd6780f63a7c5ebaa901d7fef7e8cf6adbeb8b3df662fbb93c74e6
-EBUILD kontactinterface-21.04.3.ebuild 711 BLAKE2B 18c9e964baaf4eee9f2ddb5bfe8cd555760678718a75542ea35e649d3fdbedaacc164ced47981606eed961b47dd524ddd39f3673d840ed277357d7e9989598e8 SHA512 e708c82d245a936662a62a57d923deffe7fa372fb9593bf28d5b49136413f1ebd3981c5c2a8a41f9778650d3c4d81aa5fd89d62940be0b4a308656c815d01836
-EBUILD kontactinterface-21.08.3.ebuild 721 BLAKE2B 74ffd5caf46ebb098e5f932add34fc7270cae8e7d06ae06a482d7cf9eb3b60c633fb25a7fa5c75956b2ea9fe249e3ed868e38d526e6ccd023a039f7872ce3970 SHA512 985e76cf6a53f4ac1522d40504740cad007480a08aca0c0f12c83a82f47ae7092e0edf0a97ddd980351c0abbe22c20df9b9a8d162258b8557986c942b261706f
+EBUILD kontactinterface-21.08.3.ebuild 718 BLAKE2B bc9869d401d04ad8a5ba2297cc9df0a4349c676389a560b9c7d12b6838577d9da8b20ec3477d6e51186bf722c08565d7277ebc08b9656c938b68ce7964298d4e SHA512 1c305a642d323af8cb54ae5d2eb5ca1dfc1e2a1b4235b055c1485af66a79f8685390c6b9526525a5893ff7fdca6a56df3356136363a589cac5193565c81ebb20
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kontactinterface/kontactinterface-21.04.3.ebuild b/kde-apps/kontactinterface/kontactinterface-21.04.3.ebuild
deleted file mode 100644
index 094c346f6413..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-21.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for embedding KParts in a Kontact component"
-HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontactinterface/kontactinterface-21.08.3.ebuild b/kde-apps/kontactinterface/kontactinterface-21.08.3.ebuild
index fd166f525089..a90edfb0553e 100644
--- a/kde-apps/kontactinterface/kontactinterface-21.08.3.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-21.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index ee62aef21dc4..72ab8102918c 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,5 @@
-DIST kopete-21.04.3.tar.xz 9663696 BLAKE2B e76dc4c38ceebd7433eb75d1c04a0d137dd7e38f1ceda36446d07d6585bed11af07106670b53df9f7bb01454d1da967498000b997d9529c72b3be8320ac79780 SHA512 fa6ec2a8f40278061d3d07aa5bd82b6c36ca302bdf30b27cfb3271c66a27422f0df964b3e15e72ba8c7699a1459ee7ae23d8f0193d1cd395ff6ea27aeeb08656
 DIST kopete-21.08.3.tar.xz 9665164 BLAKE2B 6c780d571b39a838c0acb44244a44575c4f3a4f5e5e8b818e6e3e1e42bc250052969c2f5730f2bf204f7b523b31bd18689055cbd77d84971b699ff530e290866 SHA512 f9d21c2e3e8c88875e56ccb202f67d06955e979ebf2d5fce3b8972cee69f66b26190844ed1348403399651d76bcd10b16e02a74071294d981a7359952f59e164
-EBUILD kopete-21.04.3.ebuild 4382 BLAKE2B 3c5dd4c5f51a4753dfef82015408bd0383d3ae8ad53fc634376a584991151605c6af62df92ca846861a87c5b0212b94e678d9fee5783785d92c4d0b24b9bb4c6 SHA512 331e0c8f7f8b6ba3a8a153f1e81edb1fc25807380edbf72384022167f7c79cca48b30364b7384e732a339c26e8ce3133c6dcb995ccd7266f7a5266b01f62aaec
-EBUILD kopete-21.08.3.ebuild 4390 BLAKE2B 94a64cc6d1f0964ef70a8cf8ebc8071a2902f8c9b5a94ec341ba9d6db0ba2bb3b35b948d6a4b0f3f0eacbf8cff1f67ccbb6761d49592368e7920c17dda75b50f SHA512 e433bd21b84425f043ab2ea4066b8ede9b02e85428c00fa0b632753dadf024c60f1ff260ad66fa778db6b5b55c8e1c2a03ace37e6561ca37137ee4eba53b0332
+DIST kopete-21.11.90.tar.xz 9665796 BLAKE2B 6556b73b3a67ccb3d3aa958f57b763f8a284f751e6b6161016b80c53a41050a6dc381b9397ab46627bbe904389e435bf7287cc1db9e04f40e9225c2b1c8073ae SHA512 909a0ec0ae08fa6e79453610bed64550bb6ee00ea49b0c0c882d545361e7731440a0ab24d3f919a0a7f248b036ae81856b3dcd3811c902bd2ea8bfc976041e4d
+EBUILD kopete-21.08.3.ebuild 4387 BLAKE2B ad47c4449d3804d4713316df6b1f3aa6e58b9aa7426cf63c26231bf1e660e1f815cbbca3577f42d5ec82f0045f3e6c8a1150050a5412cdaa25b32300af79ad3d SHA512 19d4ddaf3e20e60b4b5dddf66c297275ee8e4b1667f0126bf31868d741c92073f68749f0356672e8ddd9325015a756f1c6c7fc7d805d9019f6a81afabb7a3ab2
+EBUILD kopete-21.11.90.ebuild 4387 BLAKE2B 3e96abd82a964bdcb82385523265a8557ccf74e9f6cb11c1538d61b849af552f702a894075eb98d30a953ecf9dd1a7eacc825dad9a82563552796a38bf128aaa SHA512 e2963128b61a57752b324000274df32091d5de30853a8957a762ace113c626c715e732373efc60acf23697a29f976f3e1b30d513b1446020a3ce36c436145522
 MISC metadata.xml 2171 BLAKE2B a24f78af2393cec96b84ab4b3ef359e6d2f36791e43ddcdf4583b2559a38b559e44d2f40eb956ceccbb4c26f8533199cf3f2e4c33ed16e2bd9c851f72746d9ec SHA512 4d67c61f2d0fd6e88860cab42aa901e230d64fbbfff7658c7097f6c1f19724896bc77d54b3e18781eda1dc3f566cdb24ff5f814a72ed3c88b56a2c51d9fef3f2
diff --git a/kde-apps/kopete/kopete-21.08.3.ebuild b/kde-apps/kopete/kopete-21.08.3.ebuild
index e38a78710b24..72e480bb375a 100644
--- a/kde-apps/kopete/kopete-21.08.3.ebuild
+++ b/kde-apps/kopete/kopete-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kopete/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="ssl v4l"
 
 # Available plugins
diff --git a/kde-apps/kopete/kopete-21.04.3.ebuild b/kde-apps/kopete/kopete-21.11.90.ebuild
index 0ea22f2a29db..096a89bd414c 100644
--- a/kde-apps/kopete/kopete-21.04.3.ebuild
+++ b/kde-apps/kopete/kopete-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kopete/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="ssl v4l"
 
 # Available plugins
@@ -69,8 +69,8 @@ COMMON_DEPEND="
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-21.08.3:5
+	>=kde-apps/libkleo-21.08.3:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
@@ -103,7 +103,7 @@ COMMON_DEPEND="
 		sys-libs/zlib
 	)
 	zeroconf? (
-		>=kde-apps/kidentitymanagement-${PVCUT}:5
+		>=kde-apps/kidentitymanagement-21.08.3:5
 		>=kde-frameworks/kdnssd-${KFMIN}:5
 	)
 "
@@ -134,7 +134,7 @@ DEPEND="${COMMON_DEPEND}
 #	jingle? ( dev-libs/jsoncpp )
 
 # tests hang, last checked for 4.2.96
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_configure() {
 	local x x2
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 507e71791d30..75ce0f73572b 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,4 @@
-DIST korganizer-21.04.3.tar.xz 2408368 BLAKE2B 084c118b0502f7aee7cc6b016eabf0410974c31ce2b79ad36611896b1de6c850bf57fe55f4a323e7d672c3166f639be4e9b4e5eea3eea153bb672c297d0bc25e SHA512 fc57dc668bd2aa96c4b2668f7d4a232ef277601c5ce54f452fbb0174cb099dfe75b0416b9728bbaf030c72f588446fbc98901879631804861936ede1e8edbbad
+AUX korganizer-21.08.3-unused-deps.patch 1349 BLAKE2B 03f94970efeae4589686c645875e3678539e521b9767c2b398ca61bbdd3011a271054ff050faefdc9069ede3746d9f26871a5b6adc8392b0c84348a394c27fdd SHA512 d64f3371c0c12db919a16cf56484c5ec5c8b78a221294a011a0ceeaa6bb7115c87c86582d8cabee9d56046dc9d90341f121daffdcf41a9827a12638374c3c5d0
 DIST korganizer-21.08.3.tar.xz 2422856 BLAKE2B 73cb7ef0d87f3f51edf96ecc7da481e62ef03fbb8f1610a5bcf603998dbd3178a0c0254939772f050a0d3f8b15c829fcbe53532734feb23ae69ce23290922e8f SHA512 8453ed342b8d5e950a27d46cee7d9e1096834db55814b6e2607ce2fe435c6f49bf5d75d0cf8dc6ac872a81c64aa158bf6c0337bf7d63eb2b7ef5b6ad9f4da5b5
-EBUILD korganizer-21.04.3.ebuild 2795 BLAKE2B 0765334ff0ded5d226ad28711196ae042d2e068fdc1fb468c39c83d8fd75352eef8eb61f6f14cd98868c0d3f48cade6a9247641521862a59720e235e2859d58c SHA512 d69a6db13515bdb39b20c4931434cd3a918a4adaf58fea15acc0a35865882d4ab50d3e244a28975b546787db90fbca2d4a516372b2459f48ef5935548b1aeac8
-EBUILD korganizer-21.08.3.ebuild 2791 BLAKE2B 01c194ff061bce1fb381648363793ff48a4063bd601ab17d9bcd19d131cdf016538f7de9973f852fa28348c9e79ef08f2cfec9024b71c3ca236d649df512f647 SHA512 af8c8e69fc9eef4dbc994321c98ec554a0d4566077d2b9b2b2559a3800ea6389ee12480dc9deb6c9f7284353a7f255af93e1d8bd33ace7032c9f5241bed37245
+EBUILD korganizer-21.08.3-r1.ebuild 2837 BLAKE2B 1448c51044279881fb82f9dcba861f53d236ef27bec2b229a9d38822fe413d8148d5a40ab1a84c2ffe6abde63289e5498d1440023c1da3a8c9be0cd334164b74 SHA512 246324774f1aaffc45fc5d552cb36bec27e202da374424aa9b61f0e75084f89d8c5e251869f12c3b425699574f4168cd7dcbecc823fedbd598e3baa9bd784b71
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/korganizer/files/korganizer-21.08.3-unused-deps.patch b/kde-apps/korganizer/files/korganizer-21.08.3-unused-deps.patch
new file mode 100644
index 000000000000..96df720f0c98
--- /dev/null
+++ b/kde-apps/korganizer/files/korganizer-21.08.3-unused-deps.patch
@@ -0,0 +1,39 @@
+From 1b81f7493d446449ee3d44332f8fbedf52b149f3 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sun, 3 Oct 2021 11:48:52 +0200
+Subject: [PATCH] akonadi-search is unused
+
+---
+ CMakeLists.txt     | 3 ---
+ src/CMakeLists.txt | 1 -
+ 3 files changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b393f911..a46b6254f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -75,9 +75,6 @@ set(CALENDARSUPPORT_LIB_VERSION "5.18.40")
+ set(EVENTVIEW_LIB_VERSION "5.18.42")
+ set(AKONADI_SEARCH_VERSION "5.18.40")
+ 
+-find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED)
+-set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "ttps://invent.kde.org/pim/akonadi-search" TYPE REQUIRED PURPOSE "Provides search capabilities in pim apps and Akonadi")
+-
+ # Find KF5 package
+ find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 72b5a9f39..ea90c2203 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -295,7 +295,6 @@ target_link_libraries(korganizerprivate
+     KF5::AkonadiCore
+     KF5::AkonadiCalendar
+     KF5::AkonadiNotes
+-    KF5::AkonadiSearchPIM
+     KF5::Contacts
+     KF5::CalendarCore
+     KF5::CalendarUtils
+-- 
+GitLab
+
diff --git a/kde-apps/korganizer/korganizer-21.04.3.ebuild b/kde-apps/korganizer/korganizer-21.04.3.ebuild
deleted file mode 100644
index ba11b5d0c949..000000000000
--- a/kde-apps/korganizer/korganizer-21.04.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://apps.kde.org/korganizer/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry X"
-
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	telemetry? ( dev-libs/kuserfeedback:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/korganizer/korganizer-21.08.3.ebuild b/kde-apps/korganizer/korganizer-21.08.3-r1.ebuild
index 02846257d72f..99002e60aaa8 100644
--- a/kde-apps/korganizer/korganizer-21.08.3.ebuild
+++ b/kde-apps/korganizer/korganizer-21.08.3-r1.ebuild
@@ -16,12 +16,12 @@ HOMEPAGE="https://apps.kde.org/korganizer/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry X"
 
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
+# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
+RESTRICT="test"
+
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -31,10 +31,8 @@ COMMON_DEPEND="
 	>=kde-apps/akonadi-contacts-${PVCUT}:5
 	>=kde-apps/akonadi-mime-${PVCUT}:5
 	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
 	>=kde-apps/calendarsupport-${PVCUT}:5
 	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
 	>=kde-apps/incidenceeditor-${PVCUT}:5
 	>=kde-apps/kcalutils-${PVCUT}:5
 	>=kde-apps/kidentitymanagement-${PVCUT}:5
@@ -82,9 +80,16 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 "
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
 
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT="test"
+PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index 5c59d1630179..7a994fc94a32 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,5 +1,5 @@
-DIST kpat-21.04.3.tar.xz 3657800 BLAKE2B a5481118c0080af0d0a68b280597f847550e736d6551737d300cda235c7035f669de6f4d2a570c623fcd9d32a6e8e36ec435297c2d0ed6c14ff15ceb1264dc7f SHA512 1e2f8eae3cac9877f9cd495c9b430070148188f99a759c0e4d22c900c822f944052bdbc7e5c7e86ce278afbf6351e2af100aa3482518c79e6d993f3954de375c
 DIST kpat-21.08.3.tar.xz 3728216 BLAKE2B 1e021560b94e5932bf60a3ea7afa8d566ee10e6ebb7416231f59d691a8fd0b54b57ab10e4d7313bf729a02cd1c172480f56ef31b8d09ec33fe9970d529d9a41c SHA512 6f5ed7bb6ed172c9da2a58cfb41c0662ced56a4b854d046bfa2d344fb39a642d9de0f693280c83092f3a10f9bfb4307a2b53bdfefd0b9ebc14a27189bba6664c
-EBUILD kpat-21.04.3.ebuild 1246 BLAKE2B b9ed48a53eaa9bfa60daeb40778e577f492cc80160f48333f42069c6d97e26e587fb40f074455ee4ece5eeb3d147399ef8e3a543f862f94a7a6933e162198db4 SHA512 cefb3106ef07696adc6846aa570eda1c96509a6966dc01fbfd159dd98ab86940be3ab1f345f453a26ba7080a19e360d8d265fe3aa0461480ce8ef2fafef7780b
-EBUILD kpat-21.08.3.ebuild 1256 BLAKE2B 61d07634930f4d2ee9b4a9880aed21b836c16fde8260adcc4c3422d50a6ba56c183838abf861c0b8df44d0d63143f229c1ccf6cb8e80d7b663e1ff84d9786158 SHA512 5adeaab9c002f4629836837e85cd2f8e694e6931730f57e2ad29e2c150e02f06bb009d3d3556cef3427179ac29a6e713cefbeec6480261561fc1d193362058de
+DIST kpat-21.11.90.tar.xz 3729652 BLAKE2B 03c24e966f2ee7ecf402229e1587423ccb31adbc0c96b4ea8c711500446981e446a15f3e4a6cebd158a84c141f8313dc8faf930d5de882009dcdb337d624fedf SHA512 f23af5fc56ac209840fe7e10ea2f9390b96834726469adb612afb880cb3c35def8cc88f9e3d67d38351a6dbb6305c362c1744e8e5c0c64772e986c2a403f583b
+EBUILD kpat-21.08.3.ebuild 1253 BLAKE2B c9327f131662ac1992a64ae31974ab188607705f383eb1dce7fdb64562082f5d23934d22d6c52148dc51485bb61a48468c4600adc75580bbb4d3da8c05f6f7f1 SHA512 b840d98d5a95bdd9aabdafafb29f66d3a5d4f5b7b23a46fc96bc5fe3461b38e8c6832350ccaf35d2c26a6a3b4e096fc3ea20a6867195b4ada52ee59fdfee8cdd
+EBUILD kpat-21.11.90.ebuild 1256 BLAKE2B e293f143cf402b8ed60a78dd9a5b58eeb06ebd24dcf555e228962d876254d88538abb50068878d58855b4cc2e010c023d007745eea444ec64894feafb0d6083c SHA512 f1ed241131a1530e52f5749f8318cab5723631824d19d0e432dab3bb0fa16b16f42701652863cdeef3da6916e9718eb0055ca26c7b01abb92f63bfa721cd1405
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kpat/kpat-21.08.3.ebuild b/kde-apps/kpat/kpat-21.08.3.ebuild
index b0365a454598..8dc4d1798466 100644
--- a/kde-apps/kpat/kpat-21.08.3.ebuild
+++ b/kde-apps/kpat/kpat-21.08.3.ebuild
@@ -18,7 +18,7 @@ https://games.kde.org/games/kpat/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kpat/kpat-21.04.3.ebuild b/kde-apps/kpat/kpat-21.11.90.ebuild
index aff231dae709..41ef56423000 100644
--- a/kde-apps/kpat/kpat-21.04.3.ebuild
+++ b/kde-apps/kpat/kpat-21.11.90.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -18,7 +18,7 @@ https://games.kde.org/games/kpat/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 9b47c14a6f75..13887fe12d9f 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,3 @@
-DIST kpimtextedit-21.04.3.tar.xz 206168 BLAKE2B 4fbe9798841d7f3bca7dd9dc9869b6ad464e1582fc0275f95985dc83b244463e9c773e1fe4bc913f748559d503b9e848413a30565d7dbcba590fbb81166d7fb2 SHA512 ebf436506faaa5cfb9f0eb5d3b18ea8d7bdb525e3a2bd0bba1e89ba81fdaf546cd8e92af1e012c549b2724efc7f350db44de946cff8d11775ebfedcae8dcd428
 DIST kpimtextedit-21.08.3.tar.xz 204960 BLAKE2B 1355f96646d34393177ac2b41b6bcb563840db9d97087027dab55cae3b9fa92814d729106a815d2044211db58a03282a2909da17784b9e1d02628b9f92d69ce9 SHA512 7cb07eeeb7c630eb0251f21de1aeaa8ac6b92bc5a5e951548544db2c48d01eda46ea1c546aef340044a26a29597d91189de1705c688d1b9aa4f9e06027e885e2
-EBUILD kpimtextedit-21.04.3.ebuild 986 BLAKE2B 3d3ace522f0e77dcea60ac78d76c649a87fecf7f2a7be61fdfd7f6ca42ade38289ca04a80e764990f6acb1e7674cf02abea17c37608e564dc8e02703a14e3657 SHA512 d89d1de5abae996f5f15dff5ceb5ffaa5a923d4d14087225dc0a29fabd2ec9c2dbdd5eade5f895c906e96b0cb9fe122a789ab495560902cdede9c1ec53425557
-EBUILD kpimtextedit-21.08.3.ebuild 994 BLAKE2B 9f0481820f13afe21ec70ce02f47732445d1f246f2dc2d48deb62124cd525d3889740ccd502578f969200525f45e65f8073a6f4a823e32737daa260d5ee769ee SHA512 6b97765c6a171564e3e0e577b90852ec8d17d41a4d7733146f03246f828c6d16a06fa4df9b2fd640f572e6727fff15b55a4f9c9e7b3bdfab6374aeffe3bea6e5
+EBUILD kpimtextedit-21.08.3.ebuild 991 BLAKE2B 86b5a2a70550cf082526cfa5a155b87eaf539c9131f8816914953a8c49102a016dca812360e5f163a79f991707b92e662b6cc7065e2419638e2b7cf26619d18f SHA512 b09d2c802aacb101d95493bb4c6d5ce5df7255bc0dca7f630257bfe443faaadf1316651135223a71adb88f69e45fb49e536ab9122dccdf9e870b9673c872782b
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/kde-apps/kpimtextedit/kpimtextedit-21.04.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-21.04.3.ebuild
deleted file mode 100644
index d79f39e7e2ce..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-21.04.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Extended text editor for PIM applications"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RESTRICT+=" test"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
-"
diff --git a/kde-apps/kpimtextedit/kpimtextedit-21.08.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-21.08.3.ebuild
index 9db77c7b3429..296b048393d6 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-21.08.3.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-21.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extended text editor for PIM applications"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-apps/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index 7eda35c32572..190662cb063e 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,5 +1,3 @@
-DIST kpkpass-21.04.3.tar.xz 27364 BLAKE2B 2563eb0d375e593f659214bb3aa3993c4eb7f8186d9437ab8b4f57f3e119c0bffed42f0c758517f47c9533771e9fcd26bc1fe2bfbf9594b424bda6a193b5cdc6 SHA512 c5bd2621dfee0e518e46fb7f0fff61594cabaa6ab5b3c58c682478f99ff85028729bdf03cfe41e0073d86b5fc841a10156d9817cf26b86dcc6ee7dcaa8547e71
 DIST kpkpass-21.08.3.tar.xz 27904 BLAKE2B 9111940f3f9f935468677cc01449c1bd711e813baece624df264d8966c449b24cc709124c62ab0d81515256b32c549cb4f4c4a5b2d35cbf3be8617fc43fb6efc SHA512 d7d0b594d823022e24c8ceb78c7667250bf1a6c96adfa520a908cd2e647104c7b709bd718d5460f425b8823d4c957ddb036b7f28aa6c97e9a5d2a38376dc4f6c
-EBUILD kpkpass-21.04.3.ebuild 470 BLAKE2B e953544bde981f5bb76dce0e441bbf6b87eac15040c17fbcaf70a7051315f65d014c71448e1ecd6f2a9033b2db3be0b6942fa1f0cb09cc04cb837cb95d73832e SHA512 b6757a707387c3b005b830100e0d499a54ea6266ab7602ebb9176939104d34b855a19549d423b6079ee453b489f3b6d1dec1f1d2179de01a71215625faa73500
-EBUILD kpkpass-21.08.3.ebuild 473 BLAKE2B 5b884cf16a3a44be4ce5a12caf2134eb6dc09bff3c10ab741f5b46e331b0b4ed246aef4522dd2671ec016d576862e2c225c57523ebcc0034692fc5d6c349d337 SHA512 12b16f9c595a4fb4d0a9fd8a7e16e64bf2b6c77a7a840d32ac2081492dc743de98d178a70cb2d7e5e65d870bffe31114b78f2f1d8054325959f327d43730dd2f
+EBUILD kpkpass-21.08.3.ebuild 470 BLAKE2B e9689851499ef876f241b8817a38b2d8df48d89ed38d0f3a97b0648fff96f2c98245559ef5a18e0c7ddf7d851250af41a3c0e175aebac78975528dd3004fad4e SHA512 24354e986820f0d04bfa1f93de1e9031e2e6071eabbdeed70c0fbce25f6eb8a89ee574d27a3bd34d0da71e5cdd5d3b29bc62654bd5a4d1dc623e95de8fe89a7b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kpkpass/kpkpass-21.04.3.ebuild b/kde-apps/kpkpass/kpkpass-21.04.3.ebuild
deleted file mode 100644
index 1d76610d1161..000000000000
--- a/kde-apps/kpkpass/kpkpass-21.04.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library to deal with Apple Wallet pass files"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kpkpass/kpkpass-21.08.3.ebuild b/kde-apps/kpkpass/kpkpass-21.08.3.ebuild
index 3edff560e91c..ca849aff1a01 100644
--- a/kde-apps/kpkpass/kpkpass-21.08.3.ebuild
+++ b/kde-apps/kpkpass/kpkpass-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index 419708028ba1..de84a6188f54 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
-DIST kqtquickcharts-21.04.3.tar.xz 29932 BLAKE2B 6fa241f9371341d62d7bf739e6e27c8568e425482ab5b71247784e368a4f98c67fd915aa38bda3551f11b2fff778797f3b1ee7e130ff49d374659c4feba82bf1 SHA512 5e6115cfb12aa1d1d376467b168ea171e4254dc66125e33c248e2bd7edcbe1a2d942190c800d8659c292cf07f7e824ff57569fc6e8e685c10eedb125f87b1bf9
 DIST kqtquickcharts-21.08.3.tar.xz 29912 BLAKE2B 824f24ab78c2bce235f864b0a59aff1f454412c5c3e87c623fc68ca2de2cd5851a88fd84b370bad68f09ab1fc845c487723d8a5388f8b3be8b0b4a76f9be2ca4 SHA512 ae57b7980392c0aa47a0fb7115a8a17f47cddc95d207e6fb0b8ed7e4ade1cdfd1e113924d6367cf4fc0fd5acce47b1829692650c11f13a53bf4f7e8b78b6d013
-EBUILD kqtquickcharts-21.04.3.ebuild 383 BLAKE2B 31a11a843ae6e87a5ec739efb0de0d319b67fde33781a981dcfbde59643cdc7ddd92c4bacea531f7d93ee477f30edcadf8098a1e228015f7f6e9256fb61c1009 SHA512 b70044f5f988742e3770929fea6e4eb32629d4bbb12d4efd0c86dee187e2f3d457d58d4964e1d7731c5f24ccf4536f2e77d9e75fc1198364efdb1ecb8e837beb
-EBUILD kqtquickcharts-21.08.3.ebuild 393 BLAKE2B b7836e1024624b96a1041c558e9eb3fce62a6bdaeee5a116310e19c80f1d21e40fef51cb79d2c12934c37f2c4858896137bbde8c89817ff6a0cf046465c26bdf SHA512 af27e6d13d91208c6ec3f91c511901954accaa3b0d0a70236b9340af6d3e055d8b86e9e2c493788b91edd2baf80dd513232d2842fa66f444c20075189893d4e2
+DIST kqtquickcharts-21.11.90.tar.xz 29920 BLAKE2B dd4df764b9a8990d72104b57b470ed92e6f1329bb42051369c7184f31d511c72c90ae70f85bf40e81b90c6da73d06710bdc640bc21e50cb5274d1d28b0815c01 SHA512 0eda4829b6d44d138d56289f4b8fe81b26d5ce035e98f34e642ca4a40f7822c8a483dbe102a44c4761af37cde2f2977ee242ce97c3941513ed6c1babc6734f61
+EBUILD kqtquickcharts-21.08.3.ebuild 390 BLAKE2B 94db646dedac982db94d7e831ff1eb7adf0b0f9b9801957be45fece0e310e5b434a61734230b9705a20ff4e742dfd4a7e5737e6801274729cd5b5a15df108e01 SHA512 59954ce5a3967e2d3b8cc75f987c973b18c16cfa5ffc2f3516660000e3487512807671293ef00da3a63d5d0ce8644d833566becb3275c8c24b58c441185ab13b
+EBUILD kqtquickcharts-21.11.90.ebuild 393 BLAKE2B b7836e1024624b96a1041c558e9eb3fce62a6bdaeee5a116310e19c80f1d21e40fef51cb79d2c12934c37f2c4858896137bbde8c89817ff6a0cf046465c26bdf SHA512 af27e6d13d91208c6ec3f91c511901954accaa3b0d0a70236b9340af6d3e055d8b86e9e2c493788b91edd2baf80dd513232d2842fa66f444c20075189893d4e2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-21.08.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-21.08.3.ebuild
index 6278e7dc124b..7f4f3aadc95d 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-21.08.3.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-21.08.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-21.04.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-21.11.90.ebuild
index 174e67dff4fe..6278e7dc124b 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-21.04.3.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-21.11.90.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
@@ -10,7 +10,7 @@ DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index 2e3094d8badd..7b3c67dd07d7 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
-DIST krdc-21.04.3.tar.xz 1585088 BLAKE2B b155432330257a79ad8e334eb9d9a5a23841c5e2284c379a0cfc7aab10648125a7161c63378b5430ae4f4f24f57e6b8ee6c4b4132e8fd02ec0e89abebc4544cc SHA512 f58c53a9bc851b27a2eaea9ca3119ffc87eaa832af52dd47539308d56ee853343ad4e8e33eb0a955c0d813a582725c8a00a9a35e2eca1626208ded241934a17a
 DIST krdc-21.08.3.tar.xz 1582296 BLAKE2B a74a3bd99026710af5d2c68d5f8009fcf0ce91ba76977b8ecbb056a2154992291ce99e9789843ab3b03985a10cd52ee670d78b3bbd8acf4fd993f2af85a9fcf3 SHA512 a0247b73e6b3f23261543f5fe4112f9918c321ea9aa6ee07f233f9f6ff710c474bb4e80998d41b830e287d2b7e379e500a4e1ca41d86f3d4a563c7841c046c4a
-EBUILD krdc-21.04.3.ebuild 1398 BLAKE2B 33cd5430b20993006275004c266df4e64c2a35619465cb51dc2569e90deb064f93c4381b4cb78278089ecabda8d8ab24b97c098c265c5a9280ab9a2275ed3214 SHA512 fa6a011023924cf762788eb16b45127adea44566d6416b07e118aa823a5fbe6c2b5be3dc85dbb461d3b24317c8d0d394b76f2e032e5db8eabd18894867f08a6b
-EBUILD krdc-21.08.3.ebuild 1408 BLAKE2B f46c374d568956c637038b16cb12c16029cadfd87a0885e674fb36c7119c7966f793a3937dee057907d2177b4695612ba05a828d9b6316c6fb4ee5ae1a24c66e SHA512 611fe16ebd8e645911d6db75b265e1a356e7eafe94c1721fcaf700defd2af420fe4d9e08a1ca3765bf645ad857c56bc103875e3cce1c2b7ca62554cdf9672c76
+DIST krdc-21.11.90.tar.xz 1583908 BLAKE2B bcaa6c1cfae19f2afdd602b9ad478d5a87ccc449289d583bb56344b956bf1f4610ab0e49857693517164b36209386e1bc1461e5e9fd635ce70667a8e755fbea5 SHA512 36c5e4464fae813167d18b116ae2a59038a20017b069618d679262534dcf3f8154a968932133533fb3bfb1d0149582e3a4cd08526645c9724e1cc67d01d41f42
+EBUILD krdc-21.08.3.ebuild 1405 BLAKE2B 906e67b69769e134f4fd4a7254ea7f12cb56d5df2139e87729325aee56f9902b7f24024bca37103043ca2cfddcb60c2cccdb6ce2a8aa9002693f57ea419532c4 SHA512 7cde4c874aae79c4701811f6a60791b1b61331cf97d73d48cdfb5e0ff6a21397e0982c40189c3e344f63023a9c374633445a8b7d8d740f4a4e5bf88d9db4a4c3
+EBUILD krdc-21.11.90.ebuild 1436 BLAKE2B daca782585c9468bd4c1f854b07096bb04e57f36f44bc6434fa18fffece831722b874a4760ca5db97d92c7f969286b58ac43e3ffe50cb3360c33033329b08edc SHA512 00118575898453decfb1685e90f567faa5f9ed84c1ad1f62a42b7ee95086b3b3903bf26b30a583f061710e9664e5661643a894856e0fec832c5a84be3ad66e9d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/krdc/krdc-21.08.3.ebuild b/kde-apps/krdc/krdc-21.08.3.ebuild
index ea6946acb53f..a29d8690a5f0 100644
--- a/kde-apps/krdc/krdc-21.08.3.ebuild
+++ b/kde-apps/krdc/krdc-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/krdc/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+rdp +vnc"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
diff --git a/kde-apps/krdc/krdc-21.04.3.ebuild b/kde-apps/krdc/krdc-21.11.90.ebuild
index bb2b70065887..9e77ec8dbf99 100644
--- a/kde-apps/krdc/krdc-21.04.3.ebuild
+++ b/kde-apps/krdc/krdc-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/krdc/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+rdp +vnc"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
@@ -37,7 +37,10 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	vnc? ( >=net-libs/libvncserver-0.9 )
+	vnc? (
+		net-libs/libssh:=
+		>=net-libs/libvncserver-0.9
+	)
 "
 RDEPEND="${DEPEND}
 	rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
@@ -45,7 +48,8 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package vnc LibVNCServer)
+		-DWITH_RDP=$(usex rdp)
+		-DWITH_VNC=$(usex vnc)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index ff3e0af31d19..79d73c8c0cb2 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
-DIST kreversi-21.04.3.tar.xz 961740 BLAKE2B 45f882d1ad08d6fa6d14f5c32bad438604855a1349afca84206ba1203949b3d8c112d1930007a3b3e4ca4d61929ea48cf8649d4300476679d6da17934226d064 SHA512 805d45bc80e7a534f255d2aaac77da3e3b521711eed7a8e04b494e81b6b255247b1d2b28ff5eda5defcbb40b98c668e8b47845d7eaaf16ea0f7e8293169e310e
 DIST kreversi-21.08.3.tar.xz 964264 BLAKE2B f36ac7a048571ebe8619da9b14ddc3bbda643e32dbfa9f7566e7e848390b8ff471690c035cfc88f1e9f573e715a5aa869f15a9d687d17a5a486e963d77aa7d50 SHA512 737592c0b9b72597dcba4c10504127a459eb7d6f4cc11bf5b5becd9bb835838b5efd5cb33137d902b9d75ad2988440be0cfcfe87e52ce2b7eb57be25ba7d71b6
-EBUILD kreversi-21.04.3.ebuild 1069 BLAKE2B e1753bc3e625dfcc0056085d4fa986b7897807e78ab865f26d05d4df07f14ece1bc97304fcbc48bcb7b7f2d1ebdb7924fccfcef96a80aa3bcd326a0237315c5a SHA512 abcfc4a26de63221d01d088e24b4e03f6822f41ff1f85181d66d206b876a5aa7324ad44735541733ec96f75275925f9f5f8b709d1e105553cafe088ae3b246ce
-EBUILD kreversi-21.08.3.ebuild 1038 BLAKE2B 1319ce08091a1bef15267eab63ed103a731fe4c0d74483f4dd8055aa59ac03bcb84684d7858ae2a55c611fbcf36417a27309d8b296c4b08322bef10f0697da6a SHA512 5f8b640e7e953502423f7fae7ae4b793146dd49d7a963faa381687f680c52c3bbdadd78aea9105c80a740622094d29c0d784fca61deb9ab8707d409deee53062
+DIST kreversi-21.11.90.tar.xz 1060684 BLAKE2B aa44699a8bfad3ecb906bc17515b1214f39ce38031656c46c6c250771db43eef63ff3c6380fbde47c0dcb37968679de58ddfcfec965db0c3f698e09f413f0eff SHA512 c32c105bbb26a70e0086e87544d457b1eb6a6f074fe2569c0b1d4d20bffbd1a9358d293571fb1bf78dc1f204cd3663dee5f2adb1c6bb20c7c05935ccec90e606
+EBUILD kreversi-21.08.3.ebuild 1035 BLAKE2B f8834589a5249c322e2f314d7696fda005de621bfbcf83e19bab6e6c074e408d2427d6bdd3af489e5975bba0b4380d7cee01dff28e8a5488f2734a33799d739f SHA512 e3b988fc32b452689caa887644738b651f49419372c911f7301d1204c2e01c92cd7b868e0452d66e0488b7eb24e35945c72ba706bbfb0ea1962f4b9559f2c761
+EBUILD kreversi-21.11.90.ebuild 1038 BLAKE2B abbb85b1a77de37ef254385e949b1de80fd8394d3c59c1304d626474fadf9d8c62bf23adfcd394cf0cba5164d07c597677883b8a347db7fd5ce28b18b02639cb SHA512 07105fa556f7280cfa146e77edad6cf608f2cfda975d3f657d2c61c510f49a84ba8dd01e33d8e438a5370d1df0818435ea510df38230cc613b4c892d1885a091
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kreversi/kreversi-21.08.3.ebuild b/kde-apps/kreversi/kreversi-21.08.3.ebuild
index 7b87a378c34f..948b83157db1 100644
--- a/kde-apps/kreversi/kreversi-21.08.3.ebuild
+++ b/kde-apps/kreversi/kreversi-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kreversi/ https://games.kde.org/games/kreversi/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kreversi/kreversi-21.04.3.ebuild b/kde-apps/kreversi/kreversi-21.11.90.ebuild
index ec9810bff9c4..3b65d666141f 100644
--- a/kde-apps/kreversi/kreversi-21.04.3.ebuild
+++ b/kde-apps/kreversi/kreversi-21.11.90.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Board game by KDE"
-HOMEPAGE="https://apps.kde.org/kreversi/
-https://games.kde.org/games/kreversi/"
+HOMEPAGE="https://apps.kde.org/kreversi/ https://games.kde.org/games/kreversi/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -33,7 +32,6 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 6e6920e0cecf..11743792276b 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,5 @@
-DIST krfb-21.04.3.tar.xz 1293036 BLAKE2B 351693552e19b0e173c2d7d3fa208866a6650df1ce110ead4aa505848d3ce917b9f504932f10b2a6e7e0d31710ee5b41f97887ca2e6edd5bd845759c495d991d SHA512 3066fa25a405195922d962d0906d48e69bbc93d1a17d6f84b2c0a584b48d3758ec39d9e302debdee936c81998a81a75fff9faf1ee823b9a39169dcd7cd51a6ed
 DIST krfb-21.08.3.tar.xz 1293896 BLAKE2B a7d162e087b1792e68dbd18ca047e6d50256f0c1103665bcd57c5f7e2171aeba610f06dd92ff84a437b1ca79c0e48e4e5c5555e4cbbc872dcfe84c5d2eed5573 SHA512 2386b5bb08ce6e45d5ea43043a3b73aff52f0b82e6f464a2c8f29a5e82a90f745ae59716747e5f977f1099fb655bb4427c51a3f3498a1e42dc84e1e5fef40728
-EBUILD krfb-21.04.3.ebuild 1385 BLAKE2B bceda2249ae1a53d6df2a6218253ece2be2a2102eb43782c8a1db2404d12d70c410fccb08ef79bff841da0884851031db7ed357bd27cda51260f7a6ba87e3a06 SHA512 2185649df19620f5f58fa0b14edc57b34a453509d4b6bc6f66bb9f40fba33705ee9ab08b59470780023b68cf2409aa848f562213777a06aa319240da1a6ac30f
-EBUILD krfb-21.08.3.ebuild 1599 BLAKE2B 10719a46e9c9519bff54775b22234f71ab20b1bc9c83f50c76aaee2f543dec05d8d9c5aebebc952e942c3ab899bd630145bcfd89ce3869314c58513401ca3c18 SHA512 a1e76261fa50bfdd9143104fa0e3366725d25067d9bd909533781c3eb6c72be546425052c8c9a9599e0242d9ce6a5731683e9901662aa8873851671e92652cf4
+DIST krfb-21.11.90.tar.xz 1302140 BLAKE2B 69d8e0765d5b6fd9017878e2dd813d264c53ba19325c3d52e9941788c36fe00374222e9949f28c52aab327cd8e29c0dd10fde8645b95ac4324024e1f6bdae5de SHA512 886dda3acc5416af145673615abaff7954295aafc4a81a5cd61b09dab6babfa8e47f8e960ededf7e5c3c4f3b29474e09e8a8a58568629269c6ab57a61898818e
+EBUILD krfb-21.08.3.ebuild 1596 BLAKE2B 570063b4fb1824b15b473ccc45604eaf193d958c2460db46d41b9fb872bb98b87430b38cbb7260511a8e563c614dd1c06070e32f4f4d30e35c92ae03022b266b SHA512 d807b381ca5d3940d49a483babd3a9a99645ccdbdd9252f1a63b00fe12b1354fb03da38bdf66a0b3505787697dba0555ac0e90864c9bb894037ebaa5a8eaf7f8
+EBUILD krfb-21.11.90.ebuild 1509 BLAKE2B 083412e459cd18474ae6bbc89758aa9a6fc72852f32d11a6d2308e7f637230dfaca1de3e9ff5f1fb34efc2667b24baf69c42748a84253a01aed0ac459cf67641 SHA512 49a0061a6da229e8de95f91da579262dcf28b3d4d3112fbc6ad51a0284a0e2cf132dead85a0a387ed25bd255fff5c541410f837fdd7dba1121bfecc4ce6f8646
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/krfb/krfb-21.08.3.ebuild b/kde-apps/krfb/krfb-21.08.3.ebuild
index 78b5576044c4..19c498033408 100644
--- a/kde-apps/krfb/krfb-21.08.3.ebuild
+++ b/kde-apps/krfb/krfb-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/krfb/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-apps/krfb/krfb-21.04.3.ebuild b/kde-apps/krfb/krfb-21.11.90.ebuild
index ce584c396531..c4e1a76df048 100644
--- a/kde-apps/krfb/krfb-21.04.3.ebuild
+++ b/kde-apps/krfb/krfb-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,13 +13,19 @@ HOMEPAGE="https://apps.kde.org/krfb/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="wayland"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
 
-DEPEND="
+COMMON_DEPEND="
+	>=dev-libs/plasma-wayland-protocols-1.5.0
+	dev-libs/wayland
 	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
+	|| (
+		>=dev-qt/qtgui-${QTMIN}:5[libinput]
+		>=dev-qt/qtgui-${QTMIN}:5[X]
+	)
 	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwayland-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -35,21 +41,18 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-libs/libepoxy
+	media-libs/mesa[gbm(+)]
+	>=media-video/pipewire-0.3:=
 	>=net-libs/libvncserver-0.9.9
 	x11-libs/libX11
 	x11-libs/libxcb
 	x11-libs/libXtst
 	x11-libs/xcb-util-image
-	wayland? ( media-video/pipewire:= )
 "
-RDEPEND="${DEPEND}
-	wayland? ( sys-apps/xdg-desktop-portal[screencast] )
+DEPEND="${COMMON_DEPEND}
+	media-libs/libglvnd
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/xdg-desktop-portal[screencast]
 "
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland PipeWire)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index d484c8c380df..dedfbb92737c 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
-DIST kross-interpreters-21.04.3.tar.xz 151580 BLAKE2B cb73044d83e31ed9937605263815d328a6bb86e7a72224dd9bf64a6491ed001ae9bc87aa079c0ed1f4836695ac8100fa7ee97f879948e90957a602dea684703c SHA512 cf289e923b0c212e0a6c973795c6afa264d0fcf1b126debf6fa738ab326e0e7ee50a487ecdf59155214ea075777e6fb905621f7784e1e3e61132e8856050a462
 DIST kross-interpreters-21.08.3.tar.xz 151528 BLAKE2B f9a528ae757bdcf3d0bbbc0f168e50478a46af105c43a8798ca5c4a974e0af342ae3704b802b283d021458d2344964330a6a2c32295caa6d5bcf9d4091b3dd17 SHA512 a70830ef63177974c0e29944cddc7891bebf28bd3734d49da2a985b6874012c923588a23eeab7c409389f7a3a9847e2a964e5d34f4df7082aabbeab5254e88ea
-EBUILD kross-interpreters-21.04.3.ebuild 611 BLAKE2B 2e693eb82ef74d03eb7c0e1477478346a6b73ee28b234a1242eb66503d7acc60768b84229b086dd5fc7fd0e52f9089f91baeefb7dc5dc6d0545d5dd3c605616c SHA512 aeb4249100e16aae006fd1b551a3d59323212fa7d8166a1a234879961c3880acf7119dc1161121e1414b54d90fe6934d78789103da07741869dedf2014e0923e
-EBUILD kross-interpreters-21.08.3.ebuild 614 BLAKE2B efaed670ccbc819224c083871a6885aa4e47d1656ee2b934a2437397c80e575442c26ff9fc439b9093285596229548eced4372c259ba996a3b81ca1902c7a029 SHA512 718864925ec09911691a84e87b03230390f706a5a7e4745af2737b6ac707df1ddee4414449024f8a15fba220c79bf08bc7c8e0036443b7716dcbc372dd523bd3
+DIST kross-interpreters-21.11.90.tar.xz 151520 BLAKE2B d6c2d60f667db888e301c388100a41ff75b872a70a888f998a62a0b03e5fbace84315ab365e87927062fa5046196afe926185a591374efc55d1a2d8be481355e SHA512 75f39ca2e0e8839d6dcffb78407144d5d7e8a5306c61feebec0b50759551fe4a91b3f8c1810f3d97259efc5166f15cbf242227821cfb0f5b4854f06f8fe74e10
+EBUILD kross-interpreters-21.08.3.ebuild 611 BLAKE2B 88492f0234baba028fa55ccdf2d6f75dca2e402c0ed72eaac42a109b44eed28579f65e81e6902a594d17104d460c66b782990d8964fa897491517fc16a2575e4 SHA512 77a26106d02cfcfa541bd9aafe95ced43c32004eb99e83392734cbd4a19872101a0727b0f53a171adcb6e3687ebd9f202dafc9918bcadb50e373c51a78b1812e
+EBUILD kross-interpreters-21.11.90.ebuild 614 BLAKE2B bc23ac00e993847ca8c99f68d96824bb6c552842885d7eba95db83ac6f721934cebcb90d86e762a1813fd74f8c46b2faaead77729b676e48d3f72a63dc2b303b SHA512 3064827b39db2b6f93a7ef90bcca2195be0c498feda8d7279e4d15b216653a26592e24822e951a1cc65a453df3c37b44478d9d6aa813a7f3e1e7f5a2cd8abc9e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kross-interpreters/kross-interpreters-21.08.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-21.08.3.ebuild
index 46b028220818..f6b9008f7826 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-21.08.3.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-21.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Kross interpreter plugins for programming languages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kross-interpreters/kross-interpreters-21.04.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-21.11.90.ebuild
index a86fd537af9e..565c01029ae6 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-21.04.3.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27"
-KFMIN=5.80.0
+USE_RUBY="ruby26 ruby27"
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org ruby-single
 
@@ -12,7 +12,7 @@ DESCRIPTION="Kross interpreter plugins for programming languages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index adad987413b1..14cca9d6a613 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,5 @@
-DIST kruler-21.04.3.tar.xz 275880 BLAKE2B f12f45353cb7fa9fc0253b94dcc302578c94d1fe2faa91451d13b065e6172e5a1065dd25492474383cd1666581f7126e9d2a8a28990a5b5d5889e21a111dd3a1 SHA512 e5ee427bcc1de89115eb7f8492c0da7c5d2dc0939b619f344c81ce79119ace6520565312321f48e584db5142dc5c7cb3d5ad05b1606ba060d76a54202c395360
 DIST kruler-21.08.3.tar.xz 277020 BLAKE2B b77c9fa3cf898ed2292d6a44f8b226924ae1e4e71dcb9dac0e3a644e0fe2b10526d608fa4718397ba9684c20be18e58b9cea17cc83dc9b858a1d2a070aba2525 SHA512 12017b32ac6be0b17749c52f1045e3b13edf3b6cb9fe76a2068ab8544ba27eaaab321a2d6b2b46df462c9d4f100a3820344d74b3a534e251d31d585be40a5a08
-EBUILD kruler-21.04.3.ebuild 934 BLAKE2B 5e29780b8492e5d6bd1ed1de1b68efa946a1f2f3b9b255e984aeb7f2439f6e4f6a53650b0ed72dd24bee4705bb46d95add08f530253e5fe3c00b52dd1dcb8509 SHA512 8e0660f1c929e1f4b57d0daf5037012d5fcc270860eeb996555b994441c0c18b69992f27f0583295a71a2ef10a67e9f4f4e38ac6fd04a17f21a0caf606441244
-EBUILD kruler-21.08.3.ebuild 944 BLAKE2B 0839cd4a59647c18f4f2d3b92fb30747cc1291c93d75f468a6bfbb2ccd80fa9d470b10284054a8a314fec0a1bf707b0986c4cb8b7c9a83acb2a3f639d8e9e24c SHA512 f985db3111628588a0a4e5e2c66ecba039c07bb0de5c82def894601276260774313b820b70ad804bf0c9147baed2bc2f10004880ac3dc70ae1c8dc65a2e0bdc1
+DIST kruler-21.11.90.tar.xz 276932 BLAKE2B b0b46728e870a30064646a85dcd40632b593cefd448c2e816044f89e5447c91c493154923ec305efc48e8b300d795c8449131e1338d2fe64d30900b253484197 SHA512 80994bfdd272e578bcce601b41d6bf75a962bce9af165490c0f1362e6462c778e065d12b570ce8247a2d48e6323ab20d9dd2073a097420a9c40390dcb8564386
+EBUILD kruler-21.08.3.ebuild 941 BLAKE2B 249fa29f416cc10d0e4294a8c290fb0099808fad675e56470213156134e0ef493896d1a175c4482ef773970f8337b52e0491cc30ef34b0e181878b7a96ec9b56 SHA512 b42c2647d1935940c981d0520c9aecfda7501fe1de1f49fbd3e46114498a3083b719971358ba8b2c2f53c736b410feaa05ab51235c629881a2c734bf5d713702
+EBUILD kruler-21.11.90.ebuild 944 BLAKE2B dbf08ab9b3285e90ed9eab30c39d5efac59670a057d271be6b3a166a8fd29a190cb1de25df4c5ffbcd623b526ec0caf0c306e39422a8733834782575f5b60dc1 SHA512 aaaf5af14aa46264ef6afe5f5bc5e45155b1c7e6248149de2ad65e257bd0c1e823c3f91df6a08d079ca0e33669b8ab848cbd05eeb1c26d6de5c547ba2e6ff508
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kruler/kruler-21.08.3.ebuild b/kde-apps/kruler/kruler-21.08.3.ebuild
index 70641aed6d3c..a2c2089a6274 100644
--- a/kde-apps/kruler/kruler-21.08.3.ebuild
+++ b/kde-apps/kruler/kruler-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kruler/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kruler/kruler-21.04.3.ebuild b/kde-apps/kruler/kruler-21.11.90.ebuild
index e8d0f429df2f..dc11055f2fac 100644
--- a/kde-apps/kruler/kruler-21.04.3.ebuild
+++ b/kde-apps/kruler/kruler-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kruler/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 8c42253b3af7..80dd37129124 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
-DIST kshisen-21.04.3.tar.xz 831604 BLAKE2B 3e0adbe0459259feb4ee626a3118019dc44248e66c5650851eb0f88071b846c1881088ba56aaaaddf537f014c4120ef4c45fcc54a150ce1776ff304cd852712d SHA512 e161efb845bed0b63b6ddd8ff1c1f9f8ed8518ff2caf9ff9aa9030fcc207494a167ce5b369c9f8ad0dc57de987363c59687c9bb9bc27923247e595ee60f5762b
 DIST kshisen-21.08.3.tar.xz 987764 BLAKE2B 1a987ed480c5f9ee69a017eeebb7b3ddf106bfefda58621e8a8f373f1937fc8774e957715d7719a16533b37cf5b1bb6f9b3d2d1eea65c00f0dab7c98b64a6912 SHA512 4b53b4fe24b66a0439fefddb355e6367cefbface4f489de672ba37af5cf8053ab5e0b51c5f7a62db4512dc394a285acd1eae8f317a167423a1fec00b76833c27
-EBUILD kshisen-21.04.3.ebuild 947 BLAKE2B 7307e0828acf02861f1bae767c9450d84379f67708a7c425ead6fe98bab24ebfc9b557b228380f0bab23fc484e2b4ea5b5c7d48ffec6c925dcbc4c981d3da933 SHA512 da237789895d95f432c0745f575a21a9b1b97a6609c4edee0e8326aa4bbf3e0e6c222cd033dddf8f4b101ab66d2ed7fb366b4d268b0a099416e63bf0e4a41f9b
-EBUILD kshisen-21.08.3.ebuild 957 BLAKE2B 01dfa4f0e4c2d8fe73ae4e197d2da2e54f74afedbf336703ca125d89b665a6458a92e4f43bd8e3baa3db3b2f01e56a14903a9905a6bba44f211d53824226733d SHA512 5373059136b96c11e8763ddc3186e70bfcf4b1238f5dd94b1e378417cbfad7a753664910b31b5b9cc1fd04a27b632849f96e61100beab97389adb76ab63178fc
+DIST kshisen-21.11.90.tar.xz 987804 BLAKE2B 4e2dd2fd47063e848a3536b89970ed62ba1ba70a45638e3beae0157a51120af6815c45ff9d9322c0b5f4527f3779a153d4cd35e25893c965c25fafb02cbb3928 SHA512 6590b36a3e8528fe0aec601b95520b893b1d9a8b448848c9b8355aea930132489fac3e1427097f38cf6d508edad4f52f8ea3b7b3c28bdab14595068eb5cedf03
+EBUILD kshisen-21.08.3.ebuild 954 BLAKE2B 89697eee5d9ec73ab99de43c75cdcb4f4d83db8c1b136fc19cd80a5399f4d89e8740026a80f382476946bc737c1e6b61ec6e690a41a98f44b06f511275fbd476 SHA512 f7583d445e52d556670545ef53e5af4a04f89a030a6e5e21a4133973d2a814952c272afe7eb2ce95fa53f08338529fad64191b0528dafdce32bbf7432415c0cc
+EBUILD kshisen-21.11.90.ebuild 957 BLAKE2B 7212d1d5820ae98e261acc9cc38127895fca8d751d7a9c25cb90c271a7011b12b21ecd032b2f993e069d5f879f6c728d7ca40e793cc5edc5ad9efbfafc5df7cc SHA512 b6dd1aeb0170d02dcdacc644adae1388b93872a788d4fbcd4fda612f1adfd7755b2c5e8bb7b69df7f64dec970e4a6530f12343f75b421de529f263118aaf5507
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kshisen/kshisen-21.08.3.ebuild b/kde-apps/kshisen/kshisen-21.08.3.ebuild
index 27712ef9f4e1..b331b8583d81 100644
--- a/kde-apps/kshisen/kshisen-21.08.3.ebuild
+++ b/kde-apps/kshisen/kshisen-21.08.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kshisen/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kshisen/kshisen-21.04.3.ebuild b/kde-apps/kshisen/kshisen-21.11.90.ebuild
index 1d80b21afef3..0f7c1ac3eeb9 100644
--- a/kde-apps/kshisen/kshisen-21.04.3.ebuild
+++ b/kde-apps/kshisen/kshisen-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ https://games.kde.org/games/kshisen/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index 93ebb038a945..ef2777ff4d25 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
-DIST ksirk-21.04.3.tar.xz 6997516 BLAKE2B 9659a07afd5d10efc61a7e26dfc6f9eefda7bab18a7384f34edcf07e55b5cb446a11bc550e64a4238ee3cade78f492f400d90c9be08ab8bd4eaa6ff596155ea1 SHA512 7936f9d6a633bc86666e04a4b971f5203acfb6f7db0a01419fd4ef064d16cce6bbd39d6278d1ab908eb1161269bef6c6e604e854573beecda45e1014905149a3
 DIST ksirk-21.08.3.tar.xz 6997648 BLAKE2B f7c5bc305f50e0948d5594217bb3fd810e5a3eff2fb3751492ca356f22b4d4469baef46f9412d813bedc84573118f7156db278ecdbafcb199e8836c4c1029de2 SHA512 1c583906981c7add25b4a4ba94abc8a6fae9c2b3d428a63ec003ee90715bb76c4be7b681c3d6a82e19544bf8853aaa01ec769e9362df2f211d4a7d479ae79c82
-EBUILD ksirk-21.04.3.ebuild 1103 BLAKE2B 24895f82cca6f240a937985fea50d012ad969e72f8e109e0087b14352a0dce88863dc46208a63d5f9e755a09b3fb90dcc3ec4030176805485a70bf562c5b6501 SHA512 4e788d916278f39dfd566d5976aefbdd0b17d57ef96eb0fbc59e70abbcc0a2fdbe51e9f8a84764b1142a815f78d39d6dadab364d55535ebdd900df5491522b5b
-EBUILD ksirk-21.08.3.ebuild 1113 BLAKE2B cdb6e67152519007be94c45f7f5987a8c1e8e77b1a78b8460acc0a285c5ec39ee7341d4ddf5c19e27ca7981014046b0a81ba124fb7ced0549e3467c9c8b3d55c SHA512 e1d1777b9287506185d6668b9187650831d9af6733f752868f0ae80eb453a56009e253c2b11608f69804103ea379d4e6ec78f1cd8d04b3c9951d66fb545ee55f
+DIST ksirk-21.11.90.tar.xz 7003064 BLAKE2B a4a87eb0dfe09bd755f7c9945cb93632af9c2eaadffc0ebf58bb5aba7cbc104ecf127bda496aa795ca497d99760084704f753d214523db11c39287c566e8a638 SHA512 867527fbb59e3e3194812c3e1f8b372c6e5d7bbf61b0b97cc2afc08651be2d02a921d52022cdb979fcc7c03fdd1d0231c79f43f8886fc48a5ac75c721b050920
+EBUILD ksirk-21.08.3.ebuild 1110 BLAKE2B 5ca86bbc5864e258b26bafc915ad658f92ac27b9e5c6c5ba2f11a104f23b571273aaa00825fc591f98f27a0363591b9dd8f0b5c0a9d0bd88068de91375b626d9 SHA512 979cc82b12ddf734603136d08c1cd42cd7e77b8d9bbf6b24cc95c4f3d9a497b7b48b0968c6ea746d594ba35bce2373be571b1ae3ce5b32f2be53e4b723b1db38
+EBUILD ksirk-21.11.90.ebuild 1113 BLAKE2B a4168066cf15e01c2dae27379fd0ad3e11fee8c19cc098312440f5e1322ef7f2ea80c18b8405abdb980921ece854d5c9b121be7eda26296365552c85a6da711f SHA512 3d806cc708c16026b59d1a804d2c68406bc416029241a6f45909991a9b361c4b9e0cbda1a1d631e82bef0a0dfcb02633bcefd50893d7adfe3b689e5e26311d44
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ksirk/ksirk-21.08.3.ebuild b/kde-apps/ksirk/ksirk-21.08.3.ebuild
index 71e4eabb21f6..fe3b7f948b97 100644
--- a/kde-apps/ksirk/ksirk-21.08.3.ebuild
+++ b/kde-apps/ksirk/ksirk-21.08.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksirk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksirk/ksirk-21.04.3.ebuild b/kde-apps/ksirk/ksirk-21.11.90.ebuild
index 0a0bc186b2b7..7a8fc3b820d1 100644
--- a/kde-apps/ksirk/ksirk-21.04.3.ebuild
+++ b/kde-apps/ksirk/ksirk-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksirk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 5078d57b951a..cd88c88d7d7c 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,4 @@
-DIST ksmtp-21.04.3.tar.xz 47680 BLAKE2B b1cea8d68e19c2512a7045231cd76b269f1b006278867770a1877a2707d01f06dbc5d5bced386baa412ad62ea49507b6245e2722cc5510a9450dc94049bc28d9 SHA512 b29e18e6b6b489e60fc100b8570ccc056babc2e6863e47d1f811e99bac1423b269939189763fd46b55ff8e8c31c9b219c30850e284de629a5b3bd6e61f3f9805
+DIST ksmtp-21.08.3-CVE-2021-38373.patch.xz 7924 BLAKE2B 0ddad6d49482121595b5cdef8ef9edfe6460cbe4b3ee136e24ed6027b4a96f31c916b614f358756fa9db7afa318ed56369a1ff1384bf670d42934dd1384c43cc SHA512 6278e8a67625b8674ac0e27176320642a9be16bc1e303b04424bec8ac77cec502f572d9e0b9b742ee667977d9fda15616f993600e4f96e83c95ecec14b89bd08
 DIST ksmtp-21.08.3.tar.xz 47496 BLAKE2B 5078fa15f3b248cb70fa813bc1295d90a738e9717a3f8d01d49167004669e8d80411fa7bd2fe7e228b4cdbdd6a310fc9e1d8feb2f6eedd04b385e47b1f588469 SHA512 590cc6c5036994c14e1e32a278c1cbac74b9a4322f50738a2d9652612f0430d7d329f582c152c80bac4fcadd34b62af0b59d613a0fe6778da377d007462c0164
-EBUILD ksmtp-21.04.3.ebuild 602 BLAKE2B 92dfffdc7fa470c5e4519848b23895272b1d0cbd89353b2773f002c07f4c9829335b1e9f64ae4a9e7cee6bf4774048805ce3f5fc1e247c0bcf1d25631a3daaad SHA512 16ed9163d9862141adc44552adf63bc083a17c1739045fd9789ce94de20e0f36e7c2875c67f2004e17eceab885929cf5cf6f3dc655390403a44f0ca79deaa40b
-EBUILD ksmtp-21.08.3.ebuild 610 BLAKE2B 1bcb74a8bac6645baf92bfaeab331aa422250ce1a84ab70addb374a1c3e0b80b1a51f92c762098a0f88da66a2ea8e96a4279202079dcfd71580a5e31406bb504 SHA512 13f2b842ee03e8672a8f8f33a8a796b71eefae48b3a3e6b646ecf9ed5cdde968d668b8740dc3df2c0c48152e826794b9809c22c6a286571189ba4b95c177c65c
+EBUILD ksmtp-21.08.3-r1.ebuild 741 BLAKE2B d4bfa0f49089482bca59e8965e9de735b3a637b01a8b29c648846fdd3cf1a49a4f1f3e2ae144273fe709a0dae27d8029fe67756a02b658f46e264a485786d77d SHA512 be026fa5e1e34d3db6a482fc0c1c85574f9d33ead18f3d6c1673a8ac381476dfb3ad1f49ded2d2256dc1ebf982fca90b4c37bc42e8b7704b532b53e0b7f4bc57
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ksmtp/ksmtp-21.04.3.ebuild b/kde-apps/ksmtp/ksmtp-21.04.3.ebuild
deleted file mode 100644
index 0be1ebd48bb8..000000000000
--- a/kde-apps/ksmtp/ksmtp-21.04.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Job-based library to send email through an SMTP server"
-HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksmtp/ksmtp-21.08.3.ebuild b/kde-apps/ksmtp/ksmtp-21.08.3-r1.ebuild
index 443ea92ebdb3..9ece03765b2e 100644
--- a/kde-apps/ksmtp/ksmtp-21.08.3.ebuild
+++ b/kde-apps/ksmtp/ksmtp-21.08.3-r1.ebuild
@@ -10,12 +10,15 @@ inherit ecm kde.org
 
 DESCRIPTION="Job-based library to send email through an SMTP server"
 HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-CVE-2021-38373.patch.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
+RESTRICT="test" # bug 642410
+
 DEPEND="
 	dev-libs/cyrus-sasl
 	>=dev-qt/qtnetwork-${QTMIN}:5
@@ -25,4 +28,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT="test" # bug 642410
+PATCHES=( "${WORKDIR}/${P}-CVE-2021-38373.patch" )
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index 5797badd2eb4..42d6010f42e4 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
-DIST ksnakeduel-21.04.3.tar.xz 544476 BLAKE2B b4983ae31c9c2fe2ebf61e9f4f5257dc47903401751f47c2175b0eb208e93932acc0c0a5121adf8de87acde90085130553a3fb718cf99495a7720b1eb811d84d SHA512 b5128f729ec5a46f808b6e623df7bfe59a988d8843cefdb0349b59578a256fef48211a4733b8fae3e9beb418a4e1227a49940b185db89a80488fe8f86066c831
 DIST ksnakeduel-21.08.3.tar.xz 545528 BLAKE2B 0b2300ca4b078c06fe2af1c69aaede629a05a930030a5b4656261a951f568ddcc54029bdc7a5e059667b210040f09767a4a79c72902ed9010a1aac785981da05 SHA512 ec361552b211524570ecd582596735fd12ee7b30c6f08b4f3bd209ef5d10c45ceb51239a639e881b5cd4ce896e60c3f40846fc1972737da1489ae91d8cc6afbb
-EBUILD ksnakeduel-21.04.3.ebuild 932 BLAKE2B fc1a16c60927067b0767b37e65ef1a3070f704e2b973b834dff6a9c2df2f29ef899bc2c847c3046453970cbbfc974488791bf75ed32ad42e551fc6a3dabf5c23 SHA512 35c57b3322401ef4248225a5fb65b20b0c2d6f94cb8cf224ea7bc0cc51a02cd3c0e3115e245fde42017fed00c445829e3d337747edff706855c0df604d637697
-EBUILD ksnakeduel-21.08.3.ebuild 942 BLAKE2B 1f0d0db9ec512f407ed70b444ec8a5c08478a77303254f1a342f45919b56c4163214fc4bd10fd26496ed1385c1bbebf4dba8dae55ceec003bcf68be6a29c2344 SHA512 687c450d1a02ba1a8ac9ea67024adb382d537b617937658c2dc01ed9d26dd88820d1206b19b6d6e95cef30989de4eb290d2dc7471969adae65e6903985fae68a
+DIST ksnakeduel-21.11.90.tar.xz 603124 BLAKE2B 229dcdb16650b93cda633c505f30f7330fa8b2bee1aaec94a4b1f6515e80d7e15a0fb57d40ea2e375bf2f1c7ca70d93fdb71a21b46311519a04ea64dce3a835b SHA512 4c201d06579afd1d5b25130ba3babfb3c69d49358c6806f2a9a80b74cbe7ed294f42ce0a945d08f8aa38a32998ea0e5e081ecfaeb91564a7e8290281cb19ba97
+EBUILD ksnakeduel-21.08.3.ebuild 939 BLAKE2B 8691bb8cf82ec600851fe9876672be04049a33a28281d9ab7ef729349d7e53de5db75e8040cf5ccb187546281c247a958b7b42241af6c845896c077323e61290 SHA512 072f87b5df22b5450d4b46c8f057f60ddf2705e889de14f4f6676cf52b205849fef2bf1e09aecff58fdac52d4c29b3e141ef7dfc0e78dfc7eb5e8212e5333bfb
+EBUILD ksnakeduel-21.11.90.ebuild 942 BLAKE2B 16a3ed704a5fc884c0a91db020eee908082925d1fa09d29ee2c6052f8d3fd67d9ba8d6fed4eb95b3a94ea67fb40ff39f32b2b982d2fb5e4ffd6671c235d5710f SHA512 c1c15ce393f9a30539b82b2d8ea86be035cd855a7b42ed2dc993f48c66e7396429801c8533fd32872ccd194e31b9ab17b36b37caa22bd782304759e00539da49
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ksnakeduel/ksnakeduel-21.08.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-21.08.3.ebuild
index f9acee88d3d4..c3efc6c91be8 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-21.08.3.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/ksnakeduel/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksnakeduel/ksnakeduel-21.04.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-21.11.90.ebuild
index 73679992580d..c4498fbf9f56 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-21.04.3.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/ksnakeduel/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index 2bfc61add1c7..ec571d27142c 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
-DIST kspaceduel-21.04.3.tar.xz 621660 BLAKE2B 989b63bab8eef5cfd72ba7f4d4c53f45896e85bf8fce82236383152009986a5bc0291f08cba1f0bdfdf982322f70a027a75b0c2902260717a316656afa823f64 SHA512 8288da4071439a22613f20877175c11042e5b0d589f08a0f0edf881ca8256b8ec2a3abce5822180af96f8d2ad25ca7119c4a658783ee70b37ccf1944b6ede86a
 DIST kspaceduel-21.08.3.tar.xz 621920 BLAKE2B 2ea3cbde05db2bf9cb342ec4bb15e97c3803b4fd3c935fdc10b184c7897db4c902842d95c0e32540e94ffac91073d51e5396da86a7cdfcf6aaf2f9a98eca5d64 SHA512 fa84ba2f39dbd5367ecba87e31b70eff1f0301ecd126c98d26445c5e1a480f33ddbc193ab62e62dd4d7e980f230f3e58352e498b4e7e8fd7e0989ca54cab18b5
-EBUILD kspaceduel-21.04.3.ebuild 851 BLAKE2B 8188b9199f1c79acb5e6ce35b9bda2dcdaad2d0fbd335c3624d2988618bedfd2efc2720d564c72c59e6c224b0e8172afab97c598f41b746273227b658cce2911 SHA512 9f0342828f0b4e68c860fea795dcb3513882c40340a96e7415d64d04400d8d81abeed39334ab8b957caf8c3d73510d54e85fe381689032a79542fd136ecb14d8
-EBUILD kspaceduel-21.08.3.ebuild 861 BLAKE2B 1ef38441b85e296e8cd63f8eba5256474afaa5495871c07cf4faa3b00e87c4768cf433cf92f9506e4e8fdfcf4818e275d8410f5189ba4e18c96995ad94a3c6cb SHA512 d00d32d8a956dcd517a1911c546217bc596095531466e896da9d50e1de039c6ed521095a7a45b305487bf44fffaec4ef463a47768dd3bb4f72c02f379adb67f8
+DIST kspaceduel-21.11.90.tar.xz 648920 BLAKE2B b98b0e9b24f5ecdce8f08127f90a01d024bb99806af1ca5cf7e8c015ef317b3f94b81a2b5196d7854e6af4d984e99aac5d496cd2d6625b260d15b9d48003d18b SHA512 eaa1fd47d4421d46cf3efaacbb1164be0c3bb3c26442ffa8dd92c3ff906cfbf7e02ee15209aaa50f915491c10cebd6370baf4e5ed7384a0f95dbcba8e5983fa5
+EBUILD kspaceduel-21.08.3.ebuild 858 BLAKE2B f9cd58b97bc8cfe9560b6f3e5cabaca4e4441657403db55cda9c18ab970d45ba2e0ca2ff2f590fa72b3e70fc20eb97631dde7bdda8d5123ee996e23ab17c2c9e SHA512 8e70b06df3e9e61ffe8227c5dbf67f78d1dc2390f751f3a9cad81febe89912bc1aeeed2692ca48b443c2de334463b95caf2becd623ce24839d71dc332c8668d0
+EBUILD kspaceduel-21.11.90.ebuild 861 BLAKE2B 00618ecf47c138d64ace0b1a2f1843a989ff49628a8d769be488a346027111962b92ea96b7ba9b4bc1c5f4687eb6fe5e99cdeff6d2acc45369f860c8c3cbae7a SHA512 fd071af274db52d5422f80590bde7c61d983de525cdfe6a289a40b050bd2b359a937f18e6f8cd57f44381c667e04c65ca9219623b521d627b0a1f0845f4c7d9a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kspaceduel/kspaceduel-21.08.3.ebuild b/kde-apps/kspaceduel/kspaceduel-21.08.3.ebuild
index 65e30a91bb72..896490934e79 100644
--- a/kde-apps/kspaceduel/kspaceduel-21.08.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-21.08.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kspaceduel/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kspaceduel/kspaceduel-21.04.3.ebuild b/kde-apps/kspaceduel/kspaceduel-21.11.90.ebuild
index 90c2a5e7c597..8f5d9f0f7435 100644
--- a/kde-apps/kspaceduel/kspaceduel-21.04.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ https://games.kde.org/games/kspaceduel/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index 14af98b8ca07..6d7085547f7a 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
-DIST ksquares-21.04.3.tar.xz 267464 BLAKE2B 025e5de4458a2e4ca6923148edaf0e7f12df9151cb59a1ffafff90e584f814dc828a43583940b42510dcd590a0ea8a30149a5c6af6feee3a5fe537bcf7c3b4a1 SHA512 14fb00ca7ad528d60a07415eb096f4e6dc9c06e6c1bdc2b358781a0f8be7339c6321c1245b829f9f81d0776d6ec60e93c5df3ca3445bb1566d5e39aaf1cf8e77
 DIST ksquares-21.08.3.tar.xz 268320 BLAKE2B 385e4bc93dea4a1daa32e327fc8196181bcd05ac3851a4540cb367c8e371b868501f222177c57683655c44d80c3cca385ba41f438dcb5ac16330f740aa53b4e9 SHA512 4904fc7d253cb83daa3da343091c23e6851a14f68f86bd943b734805ec33c713d8daf3c0bfc761391fe0253095e2b02698159245cbf65b2b65d0fea1fdda9e6c
-EBUILD ksquares-21.04.3.ebuild 890 BLAKE2B 3c650f7106c14444a801389d6ba4dfa69a97f5b31617ae3ce035b0d0a2606df35bb82ef16f718cb67178e4788a285cd4740c5ca075c672f40fcdedbdfa579d13 SHA512 29b8e1e0ae9e84354efb907f53be75f1473b6d403dfa92476e7c93f89284dfc3d405e13b20b8e12d20ce96911510aadf4538e07fb45bac49d6b5177ad32dfe50
-EBUILD ksquares-21.08.3.ebuild 900 BLAKE2B 308d5bf7931d5da4a6019cad4fb0c1adc0c1c1b1a3e6b9580c78b48079e696f1e9c490a66ce7c4ffedd1aa5b500f9646c3d49fb657ea9f743107fa882152732a SHA512 4c20814060e2b6794027f5491ea395cd3657c7249f931a68f0bc9743801b382d68dd5b6a53dcd914eb34b61d6c0efd808c87bf74213bfb5a9967a14482ef8b62
+DIST ksquares-21.11.90.tar.xz 304904 BLAKE2B 374b09b376c9f0bf27c44b651bda8824d92b001ca625f3ea444df175d33247d200c94457de8d60fc33f69c1dc92169305f768e459f974a049d2d95a148f2f3c4 SHA512 271f89d62077380658df7fbce68f7dc23cffbf8fc08e31eece211a2614699ede7cfde2f7049872f24e8ff28c19ebc551b8ec0da786bb5d6ea214561af82a7f64
+EBUILD ksquares-21.08.3.ebuild 897 BLAKE2B 06bf7352d28ac328791e055d332228b2f7608e0f951d9bfb9ed328e341200d5abd362e2ec61b641207472683f0aa763a1927aa457dffa8bedfa8bd10eb9e0b0b SHA512 135b166a39fe3435a9635b4250c625624e8af6a6d565e682f024f9ff90acec51de3c91d8f20364f8c856bf9ec4ab6e1f81d1949105105f69b686e34746116503
+EBUILD ksquares-21.11.90.ebuild 900 BLAKE2B 3c3c15a5080d782d4c48b857e2ef23f62299b9bfffd805fe7378154d044f5af8680033915cb1d934e3c43e40ba5ca5eb190a2f9a8769976b7f9f14032d7265b8 SHA512 0f1633c6ffe1bcacd2bf54f970ccaddcb5cfc5af0d16c855b8bf75e95a5815f55483822c3cd6aad245598fb5a7ddb144f378936ed5fa888f1b33ac9d0aee2647
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ksquares/ksquares-21.08.3.ebuild b/kde-apps/ksquares/ksquares-21.08.3.ebuild
index 414044bc2d8c..ae477c664cc7 100644
--- a/kde-apps/ksquares/ksquares-21.08.3.ebuild
+++ b/kde-apps/ksquares/ksquares-21.08.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksquares/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksquares/ksquares-21.04.3.ebuild b/kde-apps/ksquares/ksquares-21.11.90.ebuild
index ee04379321fd..9b497674f783 100644
--- a/kde-apps/ksquares/ksquares-21.04.3.ebuild
+++ b/kde-apps/ksquares/ksquares-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksquares/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 4ffae9312319..185f251fa210 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
-DIST ksudoku-21.04.3.tar.xz 1679420 BLAKE2B 2cbafa922d9eca71fbea9225b27e23a40317e97e02200380042152ac399aef65a5b3bd1ae031398a425f690f1a3a4115e232aefbb52247143fa4f5e9a4e3126f SHA512 0a1867e11a4210d1e7e49c532b7422bf4f0124b712ae9264ce4bca8c03e511c6c331da79a2947b8302a76ebb181fd3d1068166c907a44f57989b314eaebd6eb1
 DIST ksudoku-21.08.3.tar.xz 1682352 BLAKE2B 39c016a3c7124576ef31b0f06a5f3095632b27f0a37fd00f7e2dedea7f309eaf53a975707553080a2b6093a5000e691801e9159ffe3127c5e1c14cdcb95776a6 SHA512 d543138df1561c2b6a2dc1ecdb7bf71627562178eaf5fba502967a0da11570fc3b190c7e72029208c9ef48c9466ffa14d33364ca0eed69a988656e24a14d696d
-EBUILD ksudoku-21.04.3.ebuild 1318 BLAKE2B 7a2cbdee638ab6b93bdf359790fb4870f48862fb5bb51b05fbc8e4b4a5279895b0d0991f205b6cd68584164ba76d507a2852fd95a4136eb1750f1c6951dc07fa SHA512 ca60d0758d2e1acc86db1b5d6743c44b8b00744136ad2c71df9a75e32f1176f515956a2b71adf8bd14f874c0b963d83cfbada8a949a2c2b82b889e9c98b52b14
-EBUILD ksudoku-21.08.3.ebuild 1350 BLAKE2B d466785312521c93be23bec0317eb495613cbe40083e9101ae6240614473893d0346d272a6ae2503bf9632008033f6f917e9b93b50c4549d8a5cab3402f4fc2c SHA512 27f11102ce8ccd790459cc1604806d3fcf6cbf9e258de88cef4327c9a37a6389448876690f0ea1a5f318eb388ace377de61c3796c8bb2f579eb8fbe66c01f3f5
+DIST ksudoku-21.11.90.tar.xz 1682056 BLAKE2B 61a03b31593172c9158f24bada3d08e43f330414c39fd0cc85c4e926771ea3380cbed475dbc413ac08dfeb7e4598ec9d8594cd2302ceb46faa3cb5e618f84734 SHA512 67a475c699a89f24dd75985608c79d76f47fea50da3fd5e87ac0d87cd6aeee02c14534af7ccdab42e6a3dbfeddf0cb67e72351cba05b34015f2e34e1af155cf2
+EBUILD ksudoku-21.08.3.ebuild 1347 BLAKE2B 980b9a420a3ec8861d5ff851eee268ee199dbb6e8c12966c19627526fc9e2e9c3440e83859faf35547dda0942ac338e99f8fdaf449e7f4593ff43a3707a3f0d7 SHA512 5f192fcc4463c294fd44ea71fe64c66409c67e8d6880e992d9f314fa3376482e66c63fd22d920e4528b831e8328084d3f214c51e8d9db332b5e602473f416e23
+EBUILD ksudoku-21.11.90.ebuild 1350 BLAKE2B 21a025343818570f2f44c23da45b5cd955fd614c8589ba9b7a066c903899d70074932ba7dad2b65928e6ce0082273e5024e6f2ab91022770b33d3b4cf8d6f98f SHA512 31471bb1ad8f507752764a5d178e779740656c3f79b94c6f2b8b0efc02045a41841b40ddd44c587d811811b9e507949bea9dbb6097bf62a54d01df821de51faf
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ksudoku/ksudoku-21.08.3.ebuild b/kde-apps/ksudoku/ksudoku-21.08.3.ebuild
index 12180c6c2f0a..30a9085b0561 100644
--- a/kde-apps/ksudoku/ksudoku-21.08.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/ksudoku/ https://games.kde.org/games/ksudoku/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="opengl"
 
 DEPEND="
diff --git a/kde-apps/ksudoku/ksudoku-21.04.3.ebuild b/kde-apps/ksudoku/ksudoku-21.11.90.ebuild
index c8e7774bedc7..5c6cef079d03 100644
--- a/kde-apps/ksudoku/ksudoku-21.04.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-21.11.90.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Logic-based symbol placement puzzle by KDE"
-HOMEPAGE="https://apps.kde.org/ksudoku/
-https://games.kde.org/games/ksudoku/"
+HOMEPAGE="https://apps.kde.org/ksudoku/ https://games.kde.org/games/ksudoku/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="opengl"
 
 DEPEND="
@@ -39,6 +38,7 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	opengl? (
 		>=dev-qt/qtopengl-${QTMIN}:5
+		media-libs/libglvnd
 		virtual/glu
 	)
 "
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 04093209daf0..a38d63bfa2b4 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
-DIST ksystemlog-21.04.3.tar.xz 1958088 BLAKE2B 67a9be05e3525ca65be0eb10cd4bb1e1992eda8f55b487f64ef43691848c6a20ceb32be9585992dacea7cf41b8ef7c46d9ab25bcb20503e49c68eabf4d4f68c0 SHA512 c0af661b2898fbcb4cb81b46906bd09df86bebf3759a493d435b489500ee65b035207339340beec372e416485389ee093fd9187ab9c5f35cc71e1d94f31add2b
 DIST ksystemlog-21.08.3.tar.xz 1964344 BLAKE2B b07979b7cea394bf264c6a6c3196c87253057c619f0d30f4df58c67fe7ab19adc74dc57ff51e6e7135ea2936f061948973876ab9ffca7efbf06c43ef56661a29 SHA512 ed86c7bac5ce5441bbd5aef6b72687e6472f355cf0a26550e1fe5d1acea29d5970952f0e10b730b17d02f50b8e64a2c742cff8d93af1f839b02bd4512803cdd4
-EBUILD ksystemlog-21.04.3.ebuild 1642 BLAKE2B 60a6b63564728c53e4a7ea139eb12329c8e30057289cf405733e13df534a410326563c7f30461ebe09d9a63aba39bf0de1f7132982da9dd7f71c578029ed165e SHA512 d023bf263cd6ff973f2405a39ae9f2892e101267bba6d00412c67ee30abb951385d67f670296396ca89752e9a0679140a4530607e332963ff7a086af9aa25c9e
-EBUILD ksystemlog-21.08.3.ebuild 1652 BLAKE2B 94bfc045a500e03e15a975f2c5a53f08f20727685d4f28f226aa19f73097e4e211303d616b1fcf90e73a7dcd9aa7e170423a0ffebcaace02216731d07d3c4c19 SHA512 55a089a6d4175ae22b7f37bd13ff3a985b1d98a6db41ff26a30d308a1d4cb6e72986fc9928ec7545779986508206b63dcd2db65853e2418d60dc8638e76d73db
+DIST ksystemlog-21.11.90.tar.xz 1967476 BLAKE2B ad1c11854ff3196ce55189936f5c03fc90b7af02a6a9b3c1bd9d8653f2fe0dba052c9df7ae31df55d4cbfa8ea2eb86a618362567dc21d78d822fd98460f8e4d1 SHA512 6f2e68710a324b0de8a5f065d18ce743a79987a6843fda1397ef6d3590ef67b81423c71ee918fb4277e2c32711e94c826704b1081f394d3fbeda7196ed80636d
+EBUILD ksystemlog-21.08.3.ebuild 1649 BLAKE2B d037fcf7dd15f3c1726cb10d04e86388f8e3e173e3d3f5129ae2cd24aa58f717bc02e6a81138c77cb142542c75d3a75a60fe371e114d9b457a58c5a017c11a60 SHA512 98abce409f3c505b6f810ec40675bbe3eb257c023002ffa69546588d443a21032e615e756597d466673582461a74e21bfd680a294ccf80fd03a15ec434d8856c
+EBUILD ksystemlog-21.11.90.ebuild 1652 BLAKE2B 5ef4dae44da09d5d872eb54efba9f9a20aeb907f4af0d2f942fbb6ffb9873bf5a53ba3cc2d4622a7afa43d54f57cdb89c810f72bac9f5a29c7f6eeef295a350e SHA512 c268b37881be0a52756ba7969e35138ab48d9d2830cdc2ff95514bddc95888fc9542606318bade38d067d1958d5baddf4a69de54508b7d65fb7182df78fa925e
 MISC metadata.xml 426 BLAKE2B e441ed4b9e30f9cc4da23e5aee1ad8e799a6df18a4e5b5f623722ca8f6627eaf9df193249caa84cddd28823f69f093cb39dbd722275b764a2dfdbb3cbe7e27fd SHA512 1780c918ce9e47504a8627c3c544371f7492d8796615cd94e68459476c74fa474bc93ce678ca0261e246cea52935fd01879f6ebc786e1d355b762e460c0f0d07
diff --git a/kde-apps/ksystemlog/ksystemlog-21.08.3.ebuild b/kde-apps/ksystemlog/ksystemlog-21.08.3.ebuild
index 7e5ce2433ee4..20ca5f1d6491 100644
--- a/kde-apps/ksystemlog/ksystemlog-21.08.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/ksystemlog/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="audit kdesu systemd"
 
 DEPEND="
diff --git a/kde-apps/ksystemlog/ksystemlog-21.04.3.ebuild b/kde-apps/ksystemlog/ksystemlog-21.11.90.ebuild
index 2b416e734138..aa2c579164e1 100644
--- a/kde-apps/ksystemlog/ksystemlog-21.04.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/ksystemlog/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="audit kdesu systemd"
 
 DEPEND="
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 7c07ae27ef35..b53631a5f97d 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
-DIST kteatime-21.04.3.tar.xz 298404 BLAKE2B e5be1c1a3988947c7b5cc00b48cec815605e922092374ff1ca0ece66ff10847e5fd95d0148608ace48259a79da3edc5152c0feb218656f39945c9ff02840810d SHA512 68775870910e90d9c462fec3b10c79d5396ab0710296ea55651534a3f3f224463f29a2e7a61841c2dca20d2f778b178148acf12d30b762bd362a37a6c6a3eb36
 DIST kteatime-21.08.3.tar.xz 299248 BLAKE2B 6d99dbc6aebc429d8fadc61dbaa348aac2e2331e29183e71e445ef10f832a77e076e3cbf4f7f1f5ed474ab6509d5a820cdddc7d56c0d9a402de8eed0e6dddad3 SHA512 afd90027ea522089088335d1136340ed126bfc9e406a5ef00ace1678bc4836c024293910710e6ac2383d9a088a2fd315aadfa55ae7729cc250029b71c43b78c9
-EBUILD kteatime-21.04.3.ebuild 856 BLAKE2B fd93bb45e849828a4cc4918875251ee695a6b283c166647e54640ff60b866b563ec44b362fbcecb145430d7ea40f7956826084a8a4099c6dc11c1de948f8d1c9 SHA512 4f8d1284c54a17ffeb01f59d4c26f916ebc11f2ef6c63b5f23ee7defaea62381f897f40d7059236ddc8c43dc4f9eceb0e74aac862d8068c4bdb4c8ed6460b46e
-EBUILD kteatime-21.08.3.ebuild 866 BLAKE2B f2deeb27038820abaa9a9346dccfdf77ebc2e0136540e1d514ae08bd53b55ea497560360129001f7d184cd773c7c7702f453dda64d4b2df84c06c0e9c95f6bae SHA512 c81961ac4787f0d3d56e3113cb7649bd92bf5e9861021d64aa5c5e357fc023bf43032f1554b1b2ab21e4985f8b2e993977d06cf1881b29753f62991d4e040b73
+DIST kteatime-21.11.90.tar.xz 301088 BLAKE2B 869875f215b8ff76393a5b1237d5a0ac1b82f40c6996f5f48103197721a15ecccad4aec0efa7b7d5c3dc08595a718f86bbc662365c5a219436067b7778541ad2 SHA512 87988a5aed0b007924e778738484e6915de40ab73fb3702bff8f25a70032e09d5e5815b083cc8afcc6f8bb0f756e1eb0c505d9d5fdf0fb24c4d3c035c7bf365c
+EBUILD kteatime-21.08.3.ebuild 863 BLAKE2B 1d62d5e7294b59dd05fc3ea6eeb8586d318db0e944524098a7f1cbde0359283dc6e83a21164598593833770bfa6b6324709075a824a69518cea61dbb4b5a2a28 SHA512 449435913978b71d8bf13e8f6af389a2e806fa084fa57c924d2af091b232e81cd79bdcc41ac8b79c336d3238e8fb9dc79e2893be0ab52960a0a6cf384804848c
+EBUILD kteatime-21.11.90.ebuild 866 BLAKE2B c53504753a7bcd051ed5fac73347a3504dfdafa38c2bdb650f69f563dde8c6eb9d0affbccd903ff058087fd142cb52228c0a52727ef254a2a3170a0638352e7b SHA512 90dd7515ce21502ed365684e5e472fc75e4938bc2e86f6edfdbcb014e6879fde9ec06f03442c96d82ebf6e8b6c2bb23bfc5cd5a6070c7fb87e5dff8b28e930b0
 MISC metadata.xml 458 BLAKE2B aa5828711349e9988628ab78eecfa13c6715281c6f55121e5b2e635e06c1a31402aa71cc2db7f8f931646d956339ca5527308fdc9fe88fb2c78bae76f06cbcc1 SHA512 7f53b4308c3e9c8b4bb78d822075acd242f10199facd8bfbcd23558adcbb6d7f4e86d841aced3062c927943d3701a004050407a500f3a207f9afddadc467f501
diff --git a/kde-apps/kteatime/kteatime-21.08.3.ebuild b/kde-apps/kteatime/kteatime-21.08.3.ebuild
index 75557f43fb1a..e2942fb26ce4 100644
--- a/kde-apps/kteatime/kteatime-21.08.3.ebuild
+++ b/kde-apps/kteatime/kteatime-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kteatime/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kteatime/kteatime-21.04.3.ebuild b/kde-apps/kteatime/kteatime-21.11.90.ebuild
index 32aa0d240e92..e54b337eff96 100644
--- a/kde-apps/kteatime/kteatime-21.04.3.ebuild
+++ b/kde-apps/kteatime/kteatime-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kteatime/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index c09b876f0361..c48315cb1aab 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
-DIST ktimer-21.04.3.tar.xz 388044 BLAKE2B fdcb2780a8ecbe654c7438aa909c4d14ae338f04f3c314e5633c3b61e2838ee9dfcedc03a194d02696c8a7d2c370c8434c566dc648ed27099c446b6917a8cd83 SHA512 3cf8a0387174202ffaab9e901cc4e6bf851403b21d8b34df6b437f13d310a7bd657438fb1c10eb0b238d3d6407334987db4b94433d27187d1cfaacf23c09bc2d
 DIST ktimer-21.08.3.tar.xz 388772 BLAKE2B 6324641d6244dfbcaf2ed01d3b53ce963bd6e294cbb0a8a12f613ff6c1d26ae208193c0403dae2ea39c6fdff070504769c0e8042eea03449f1f5f0d5f7209d81 SHA512 bfd9583f6a89e6b87146c731f4fdfa51fcbb855566707574854bbf4b2cd3044cf886f74ab114bbc5027337c26a04fc7d901ac4630922a3e8958907f39c95339e
-EBUILD ktimer-21.04.3.ebuild 821 BLAKE2B 90773b1d0a354de6e343b653f039688635738c18645bdf52d22df18ecec2422c9270e3372685450ebca0ba19ccfe5568b7c2c5aff016bfb9373bf033809c87d1 SHA512 014300bcdd28a98fe3dbb797eb4fb4b16e51e677dc3fe02f90e1ab87c91bb760b8352dde7f3c8d92db45f688e1d42f6dd12fad6a5e9204a6f1b588bc2a44feef
-EBUILD ktimer-21.08.3.ebuild 831 BLAKE2B 763e305f28e1e17ec0a73f0bc6d8c5023e57f55fb36bb28560d64c48c2d9abd2682df6e134ca63fa83ec4639f4c1c6e44e63354753a0734eda10b973a1eb848a SHA512 1ad1c5ca403ac836b714f96f09c650eb33aa0af863228040e4efd0d430d6fc0591fca650ebf370b6c76e64dd3f7ef6cea9b762bf282a240335503033ffa2f335
+DIST ktimer-21.11.90.tar.xz 391732 BLAKE2B 01f117bde7544ef233ee433e84f31081b286d219d35888a655ffdbd5dbeea924a54d753f4aaababcf42c6026c5ecc09a3a187d2ebb617812899b847399ce4e0f SHA512 f030cb89efe8955702b8849ae74a37233b349c268aaf90c971a986592391fc6011082dffb6795e66b259e696ad56e073b7d1eab80d8265cbee3ca1609c1b62e7
+EBUILD ktimer-21.08.3.ebuild 828 BLAKE2B f17aaa0b665ed6806d213697ff07cceff0e92cabed01ba88fe129baaa8e9c72d14e9f3022981443ede77bc66761a433e4ce107d2cbbaca3c3d8dec2cb49517a2 SHA512 44ab9575bf61898cd878ff15d119ad0e4782f19ccc3438a7bb421807c19c798adf62db0f7829069a3362e00c9d252f03c83a43c014c583e85e648529add6e43f
+EBUILD ktimer-21.11.90.ebuild 831 BLAKE2B 056030cf92be9b47b44ea2010c1c19c014fee1ce9030edcd1a04c5ba680ff92d8026e5b6cf6902d58ae9330d1717806ef1e3cf5164ca40b8cdde5f8780b60911 SHA512 67e4af952eb638a70529707bc9d2a9c30973e2f70066dd6ccbb33cc4ba426f323e876aef931215f3eebe88251df324ced9ebaf2e72c02788c5e95985a1d8e2ca
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktimer/ktimer-21.08.3.ebuild b/kde-apps/ktimer/ktimer-21.08.3.ebuild
index 8ac360585de0..7afbc0d9a298 100644
--- a/kde-apps/ktimer/ktimer-21.08.3.ebuild
+++ b/kde-apps/ktimer/ktimer-21.08.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/ktimer/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktimer/ktimer-21.04.3.ebuild b/kde-apps/ktimer/ktimer-21.11.90.ebuild
index 7baffc834250..af3f8036e30b 100644
--- a/kde-apps/ktimer/ktimer-21.04.3.ebuild
+++ b/kde-apps/ktimer/ktimer-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/ktimer/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 2ab62c2000cd..9b203f9cd610 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
-DIST ktouch-21.04.3.tar.xz 4963192 BLAKE2B b17d75adef8d30bb0f1a27138e1397ee041bcea3ec046b9887e4f5333f75459ad578dc0b6f6a81f42e6c3f36c0d907d5c6cc4ef7148e3287df33c7c2b80d9432 SHA512 5d5cf00581518315736e5f52040f8487731e2899438ed5e78356755d22dfcbf890889a4510922cffa6e2b8460c4d092f86583060195eaf6214fcdc830da2bb97
 DIST ktouch-21.08.3.tar.xz 4962336 BLAKE2B 7696258873cc902c5a80d95d33e5f2f4b3960cf7381e2dde805a4e04126f4c02560f91021cd2f8c660290b23d611220e93d1c3fa46a8da95461cf84346318210 SHA512 97e86e5fab6a1f6fca2ac4b1edb82ea3a182a4f3d8e45d3467dd09f02ae1190345803450332b70352eced1c687f775dbeacae8335e123c02aa3006ffb8077073
-EBUILD ktouch-21.04.3.ebuild 1589 BLAKE2B d912cc5742d675ec55f1074463aa80cc46f640199d7fdc19025d3fb6c7f05b37d63e503119c8ab2736d89e8a773546a638769a6d368fc9d259b2ff35b1cc4b61 SHA512 926771fdeb442a20df0b78d1a895be7726e73c588a4a23c383a0f00d2e3f16c7600da6b9bab7198f3397c887bf79d1fd45fb8925526128ff44d94e5ee35d8b5a
-EBUILD ktouch-21.08.3.ebuild 1599 BLAKE2B f71886875812f53b4f71c6ac6a28b3dfe4a9c8bbddcc1b298085bce63591cd7d1a736a594700b560a4ec43581550b194f72c913288ec5124d8f32fddbbadab8a SHA512 f19a61c12c59073e7f7fe7b5e5fafc2dcb03466ba48019b6778d78f085ba0d8505b2734d1c58e6250dec3cc198b88ed9ee5fffb790b42c7b954d50013098315f
+DIST ktouch-21.11.90.tar.xz 4967740 BLAKE2B ec3ba7d6279af2f036c146e440aee788503f2d28c5811e99c934f29e48d54c51759af40bc9b116711aed517c328d9fe902a14a143e3e3f1b20e5a8a35713e681 SHA512 d97ba44fc104d56afbf3fb6def4bf1dcea65c44d23c2abd4c6b451b2e7d17e649d0dbcdb081740f555f0df0d4209f1e56a3125e585ef56c1e2b43bb65ebf4969
+EBUILD ktouch-21.08.3.ebuild 1596 BLAKE2B 9d28584fe75c7605031cd36177238732104cb610dafb2633f4e0f00b5c68b52d55f4aa0561196734ff197ed904c3522a52e1670c03b296640dad6805fd650014 SHA512 e13dd68742d4eb3e7ca9657095ddc10a753af79fb584a8cad8b8947665623418a44f074b0c53587a16b7b696703e40730968986c62bb65ee41e13af176ecb26f
+EBUILD ktouch-21.11.90.ebuild 1599 BLAKE2B c5095ac320442434f394907a3223c20ffd26e3e552dfdaaa6d56f6329ee5788efa7147d5ae09791773e5fa2cb8dae00794376a445b27744ea2e74a1aaf181104 SHA512 53094b45d0c5d345e8d0c2038b47e032a7ca39dffb83f4a45fd78a1761dce5b2231c6937a28554237e7d603a393bcec415f31d866680fdd04a81802b5c08762c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktouch/ktouch-21.08.3.ebuild b/kde-apps/ktouch/ktouch-21.08.3.ebuild
index 114419c6ef47..7ee2214d1847 100644
--- a/kde-apps/ktouch/ktouch-21.08.3.ebuild
+++ b/kde-apps/ktouch/ktouch-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/ktouch/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktouch/ktouch-21.04.3.ebuild b/kde-apps/ktouch/ktouch-21.11.90.ebuild
index 46f1da3192a9..b0c94c0f7211 100644
--- a/kde-apps/ktouch/ktouch-21.04.3.ebuild
+++ b/kde-apps/ktouch/ktouch-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/ktouch/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 2adf236e9a62..7f8f81519d25 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-accounts-kcm-21.04.3.tar.xz 266056 BLAKE2B f52493a6f2787d031d27ebe1f30bafa714d2fc086ec456e0566724b0ff012a481c295efa4d2fb906fe975a501f1a151247d66cc4f225c5e01351044f8e788ad0 SHA512 a69a19054e8f709d2728cc89ccb7e4dbb0ff1dd3dab76470945479aa405f3cc22991dd1d5ea95cee0eed6ad7e1fcda097b9f9225155c32fcba9ed9bad00058f3
 DIST ktp-accounts-kcm-21.08.3.tar.xz 266276 BLAKE2B 0cfb3f651c88f281823eaf405080f178fdba2155526fbf4f4dba806363fae911609941fdcd256bf0fdf148789cd22857503ad0bc45181b60c6c127274d07441b SHA512 af0fc4d6c488495c7a3bc930dc5751a6bae5fd60f3423d35b30b9036b6289ec2c9aa0a5d8c7b5eb242ea93a64aa6daeae31760bcf321f6bc4d8ba017f78a2e7a
-EBUILD ktp-accounts-kcm-21.04.3.ebuild 1598 BLAKE2B 74f2fc76070f53b7107b144ab5587b85a789ec642f20c42533acbe7f59aa838cf80741b83d063669e404b58881f62c7e0e904d45e7c9a1ed3e67d4538886684c SHA512 96a7b223a9eaa3ea2aef8d90761386d295b1db104c7d3f803420cb7333c9b79186e75e4a85bece546f98bf5983810bc68d387d9504755bbde65de6d8fb94b2c7
-EBUILD ktp-accounts-kcm-21.08.3.ebuild 1601 BLAKE2B 2c5dfa625bb17a4693d6550192bdfbbda1400d85dcda738c19fe8201f5a64d2150d75beea7c3c73d15ba34a49f4a7ad5112aa457027451c19e1c97589fb3770e SHA512 a18955eb3ac37eb355c2ec8f5b75a409371bec665b7c7df7280e35bd80e1f79e52d47692b62bb80690f440018eb9229f7846b7057d8ea54340439193069452d0
+DIST ktp-accounts-kcm-21.11.90.tar.xz 266348 BLAKE2B 81c2543c35b11a778e2eaf284f6b837d96e9bd0f1c961ce80b54379bad96fad13ea77015667afee41e82672852bb73718f82dbfa51a3c86d6c8a549a0ae25548 SHA512 28ae89ae4fb485d0b5f1159b6dd3040fd3b685347308620e26ff9d725db82bd2dcbe519b011dd4aa91548a9b8174c69e797935d797b722b442bb4443a3030357
+EBUILD ktp-accounts-kcm-21.08.3.ebuild 1598 BLAKE2B c00d799c289873443a7ca229dddf388c852ab9cf810ef942c99a640ed4425ff4f4ae90a05dc676170e949782aa6fea9f9841ac48b7a701eeab46708a527accfb SHA512 10d4d400266b27c7ca7217c2bc67c7ccc969ceea2179487a2ec51025117e60fb143c58a8c1fa9b7555e332f0080b55091cd3a7d65715d5546719bace9fb5a8e2
+EBUILD ktp-accounts-kcm-21.11.90.ebuild 1601 BLAKE2B 3ce8d461ed0bc6edd7e8254b378e86d3391701870a3aff5145152346b42ab35cecd1434a751221d9e2b3608114561b95d01d26e0d17ddd08b50faf5e04910725 SHA512 095644e16e7128ca427f3b206b115ed30ee497a7c4c8dd80cee878a44d6db8bb246e6694aee6e64adae9f21f1931c078f09492e489981f58e27d62fcae79f26a
 MISC metadata.xml 427 BLAKE2B f7e298b028ddfb6155c0162783c313b59991c125c940a917ba9db87dac988b92aa47d0583ef1a880fe03ea1b8dc04fd570f35c8b3a260a1abd9801dc464e6846 SHA512 9da0a8e62895266ad067eaf0c371bab751bd38a4a801b3041a625f0d88bb5e063356e1e2e096b7e570bc56e2ec7291957610dd36efe254f0361fa1c1a65cbe56
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.08.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.08.3.ebuild
index 3a9e9fa503ca..6b2962f89f33 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.08.3.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="experimental"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.04.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.11.90.ebuild
index a62c193528ce..648b4e78d2b2 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.04.3.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="experimental"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index 2c25398cab03..da6f456e668e 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-approver-21.04.3.tar.xz 38120 BLAKE2B 7ccb94e36f4b41f33da7744a2a468cf608bfc107d7e62fcb605b7d4afdf0578e1d3f6bc08e60ed996b56d71014f778384dc2a9a73a306cc0c723545667588e13 SHA512 44f13cc1b323f84848669f89e54bb3fb2439925a5cc7ad7523b0ed22d0bf323eae47a94f098465f4efc9ff0ee16f555fd4ad5f4af38583d7fac6cb88c0eb0f2c
 DIST ktp-approver-21.08.3.tar.xz 38144 BLAKE2B f59241d4ef8e8fe0ede38fc058a15488dd55141e5ec09ee2d0f765d54d5e7df7ec4e5cab13e0ff66ca90eed20b956e8a385416578215eaea09cbf44f2daef094 SHA512 937f50f5b4824a2928babdd1dc8661e05d26bc3a7d590c25f356364dfda3b2d9d905ae51f4b51e9111bc153d186c25e10ff1536aced2e344137baf791246524a
-EBUILD ktp-approver-21.04.3.ebuild 761 BLAKE2B 59a4679aaea7278850f80f23e33d1c7212aef6bb6b85ddda3d5bfe3cee3eeb57e3aa1768ed6412c6bb19c8032ea18b0c7c4adac2b80c1134c2a07a7c9ddc7c00 SHA512 d5a61e8c0caf66145ae9942d18af98b384e370893da5277c42f7f8515cf9c3d14f0fa5d1d6aff9a52207e1c0952e8ba8dbf8f9dc7d0b21ceacb33682629ef7be
-EBUILD ktp-approver-21.08.3.ebuild 771 BLAKE2B 9cea4d6d47e612041f414dc6f1a1fff4f36cb73f7d2c20f5beccf41accd9f208959a0dda35c536fd5018e17b97296f8b2d6adbe09668423777e731d791c2239d SHA512 5e29f8d715c4dd596005a5a575a71b3a630e4732c13325eb3d96215288a3b6d038ea355a44c3ed04293fa8ab366e261c081bea88d1357ad27b9bd839162eabe6
+DIST ktp-approver-21.11.90.tar.xz 38160 BLAKE2B dbb3775564355edd61bd93395a5c1b25977d594623863706e90bbd346378c3c71daa013f95cadfb51dd87e0c0c5e6a87ccd5ae48259e3a03e97e3426442328f2 SHA512 00520e69345a34db496b9f1a1013d695f05cf9467273630dd9f203b31e62680a7e672ed5d0e6c2de210afa97f4e2fae2fcb09b61d6219a48adf5ec46dbbfcb9f
+EBUILD ktp-approver-21.08.3.ebuild 768 BLAKE2B dddf5fe9760d86b64350772a2bba398b67f87fff9a63f610fe6666e83db1baa91c3773effe81d64e6864636c6152c7a53ee9b10db3c50930ed000287caacfe5d SHA512 a41b941705babc3ac6149017e00a799b43f51fe14f7ac90abe6093999e9c3079e6542655ef65b44444e34c5e82129bdfceba844a1f4fb7aecc11fb8c37912bc7
+EBUILD ktp-approver-21.11.90.ebuild 771 BLAKE2B f7c91a6875214b564b1263142645ed21fe477c50e2a3b026771ce5592a4e921a8668e58eaf585223e6634b81f5d2f5cd62a0ba5383853f1b5604231e0514c1ec SHA512 30ff5148484ef939b307b124d0e7b3e2ad1cff32246ef33677cbff8112021f8b2ca155982d46c92673d999aaab931b54d1a6e2d8e643c55025a66a31a2f40d33
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-approver/ktp-approver-21.08.3.ebuild b/kde-apps/ktp-approver/ktp-approver-21.08.3.ebuild
index 284b6c6842ff..01e8e7ff7352 100644
--- a/kde-apps/ktp-approver/ktp-approver-21.08.3.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-approver/ktp-approver-21.04.3.ebuild b/kde-apps/ktp-approver/ktp-approver-21.11.90.ebuild
index be2334e856a4..f7b869388d14 100644
--- a/kde-apps/ktp-approver/ktp-approver-21.04.3.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index ce44d04453e8..608831aedaa5 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-auth-handler-21.04.3.tar.xz 47824 BLAKE2B 21446323d72ed739c900a59a9137276ae5649615e3d5098a7ea7752296d362d41586e72ba3de80f581569d8b227c838710af266d9bf88404e337311c0120a68d SHA512 45fed49e564a98d6630bdb5aa13e0bbb641965241b0936c22b8ab9f7f5696a377a5217fdef3079f70008f4932ea0b00c8f857ab2d3727892ed180f7b24a1da08
 DIST ktp-auth-handler-21.08.3.tar.xz 47808 BLAKE2B a4029dfef8c66a04f01918bd1302d1f2375c8ca12492d31ed2d8f5c91d0e4ee0a6c78c4b51570bd43f89f54b538bbdbb46fbb2bd53d831f57620fc1ae2624528 SHA512 3f03389209ec09a2f9abc14204b5daa0554caef1e5620b73abc0af61a009fca15079d8571be7cb8551504798fcd88092e70d9dce4f9bbb5c7c5abb15abf7d1cd
-EBUILD ktp-auth-handler-21.04.3.ebuild 929 BLAKE2B 30467458b2a663755bece940575047669d08896101ae26784b739c85ca1994ddce655cbd954d0124ba0e923dd50892dd62bfc98b3bde811bb9f09b662063edae SHA512 a3486b6b1489c64e13d773ff48ddc912b4663c981b128abae5ab5e2bb1d907150ccc7bff0cec10d63b190a51a8cb11822ccd84dfb728b343615643590d9f9ef0
-EBUILD ktp-auth-handler-21.08.3.ebuild 939 BLAKE2B 7cba50427e11280e1a9f35f55374fcce3fc96282022e0ef4604b4ad96c9f561d47e34ac0ce21ce161bc0ad1090d5b405e90ba0bc0db70ea65642f014b2169e18 SHA512 38a309c254902b752935b26dbeda1751cb3f6ab4ddfbde246f4837ed4e62d25797c64fcc71ab91fa318cbdd7a2e23327d2b1608e6ddd87299d138b22400fd597
+DIST ktp-auth-handler-21.11.90.tar.xz 47832 BLAKE2B eb1a08e7eda2be0a066ec0d1da379f811746d97c89b7efc751bebac67ef59c1331af2417900a068c6824212b17a66ce5ce8cd7773dae70c065d4dbefd79d56b9 SHA512 30073cd91a789b6399aa9bf5a40d37d5e21a83a4799223c7a56b9e39b6e8df5e5cbedb8a4debac47c67745a805bfce91d485715eda7e08f4605bc13efcac9c1e
+EBUILD ktp-auth-handler-21.08.3.ebuild 936 BLAKE2B 0d0c55bf2de9ecc9c33219fca7dda45ccf620641d34fdc489d68da66ac308c0b05e3c28cf7ef31b2052a5d1b89d3c48a8079dcb56066b7068e26e92db96bf441 SHA512 82108fec114ec25b72b6973e4d3ec72880e7a7d709fcb3b4e151a7f25bb29f0364136a1fcff726b7338f7e76512a6ef9fd4b1c988f5c03e7bff64f853d525a6e
+EBUILD ktp-auth-handler-21.11.90.ebuild 939 BLAKE2B ee2920fc3469104a21f53709888c30776cabe490101a8eb330866d348817078bcbed2e74c727981ff527826609e8aa1ad868dc09655f2f44a88768e1eaeda9d1 SHA512 d83b87fc0831fb7343baa5609c901ce3191d8d458afecbf84c043acfd00db22b68747a0c90691f94799a8ae4145951678669803d763111e1dffbdbb7add7b458
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-21.08.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-21.08.3.ebuild
index 84333e3a907c..aa1a07b9617c 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-21.08.3.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-21.04.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-21.11.90.ebuild
index 089198d8517e..a3a2ebac6195 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-21.04.3.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 779769e3cd51..51be34d49bb8 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-common-internals-21.04.3.tar.xz 450692 BLAKE2B f4363ada9a971b3417f48e5750d02b10f57debcd653a652ecd65d646dcb40be5242b7f119beb534954e138ca3f4325fa5120f0c12c55ca39b9770da3e9aaad88 SHA512 4df1dd074f0e6330c28aedd8c9ef3ea1f17888de3f0dff63174a1221c4f08027179e282982f5e6f9e47b3e5ec34d1dc8d86a1586908267cf97dc0a51dcf9aaa4
 DIST ktp-common-internals-21.08.3.tar.xz 450644 BLAKE2B 9b704f92b55f0b0760c2bc68a940fc69b9c0555398845f3180b7db2d53b59be1c08331fe55b2e69c326802fe5f8c58e0eace87224a0e3843890d020ae4072a5a SHA512 ced09a1f7db1c016000a71957f1597809a46866382dc611127ba5e6b56a5746b06a41ade3a9d6d7cb4f50c1f8348fe3d3d2cc027fcc69a3301a0f83e72c96ac9
-EBUILD ktp-common-internals-21.04.3.ebuild 1711 BLAKE2B b58923ac5246fc8dea7dd38b46ddf4c0b599a81a735332bdb54c92b249ea703a568f272da7e608b452a11c286887353e7b05cb2b417fed092371e06857c20011 SHA512 0e98090ffc3fbc7cc22e667dd03a8e6ff2a59271ba12a15cdac75d116b560a03a5b64fe141d855098ddd80e9f6b301423a7249e063f0031dc88391dbed6cdfe6
-EBUILD ktp-common-internals-21.08.3.ebuild 1721 BLAKE2B 03302e4c8d52f839fa7dc4caa02c8bbca7da42205b199c6b4dc6ac2c743e78e05835f96c6e97120f3e65c7d86177cbbec256ca55654382d018d8424b886fcb4b SHA512 ffcddd0549993f343f193cab97a069b327c1c32ff1d8dac2b8100899c94a5dce304974e9ef75745d2f43c839a4414c5edf02b5635ec7a09f33fc2d6d37f919af
+DIST ktp-common-internals-21.11.90.tar.xz 450676 BLAKE2B 51f066ce6d756f8055bc9b61a2c8bdff1456ece79ea277d1150cba553de8a9e171331d27c8db79f59590eca9857a9a53f55c21e43f5b086136f7dbfdebf684b3 SHA512 fc0bfc6adb0a9d577337a358dd2d4fd3e90377b768d23ea783588cb7d7df6d12f9f1a2801803faf57c2b7d87104cab5aebe2336e41530f956a630ee7f11c7eb0
+EBUILD ktp-common-internals-21.08.3.ebuild 1718 BLAKE2B eb8adbd5b136f7222aab281f4daac6dae59e807b704e06497c595de5df030f2c99d54abf8958330e8ffb82f87dce08f29d227154e62384861bed39426831ea42 SHA512 825fb4012326cc6f1cbec540732bb343e13987f29aeb020bf8c0f03b43d7a54b99d85c06320081fe6e4806f5f71024b584ab061f6e0c9abc2101f92f5a9a995a
+EBUILD ktp-common-internals-21.11.90.ebuild 1721 BLAKE2B 4ccf93dc947459492944e57d2bd657f07ee3b26a4b25f919c4e776192c088e0b5b0d82e1638efcb804f63da1cf24df3c690ef15605029d6b8b817bfc5cb6c434 SHA512 d9bbac6947c617488755018638c4ff589e18cfe1500074407e9cc276572686bc63f91dc67d9bf20af9cc05094be4019f310213a45f2d076677cdf04a8e159c23
 MISC metadata.xml 512 BLAKE2B a846448a869b30b8862d5544448d903a18f697744694d3d57458a548ccd626b9fceb57655e1e40da9fd5c36a4d8a7eeb55de09e86ebeda92b3344ef4dc27304d SHA512 a43d8bc316192a40823a725b739e6a3a483018c3d4295d43c51c17153d333bc5a4c72ce7f75f2d86f5d447b7d05ac997d36dffef572f26793eed42f937196cf8
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-21.08.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-21.08.3.ebuild
index c576f4114fd9..b1a08675668f 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-21.08.3.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="otr +sso"
 
 RDEPEND="
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-21.04.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-21.11.90.ebuild
index ba1ead583f34..041e5bb1b895 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-21.04.3.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # 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-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="otr +sso"
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index d1f298ee1c4f..94a29975e9ca 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-contact-list-21.04.3.tar.xz 153064 BLAKE2B 117aacd5ea9f0aa051b37b7d3d8876696dc7fc9133524c7a960623aaef54c61f8ef5b2212ff8dbca7c75fbe2a2fd9dbb0def66799827dea61cf800a3131253dc SHA512 9d010ec63e53cba531896a855ccf7f50b5717da3b69543c6afba52dfa39e7cbbae4289b05245c8cdeff86cfbbe99ef83e7892e68b321d7cf90fe71cc8bafc642
 DIST ktp-contact-list-21.08.3.tar.xz 153708 BLAKE2B dc4cc5ed360830c0b572c2311a18db0bfab2b211bbc71ddb2161eea0b4f711797c4b06acdd0242534ba71e564a6808f18350ecb94b22d3c3a9a17f9ad13328ed SHA512 b3676111348848dd164d47e31270847d8ab57f43fc4ed620ea901ef3b18306c64b0b4c48bfb1cb8422f4769a0565ea35a1834297241efb0ba0c5379116d2ff00
-EBUILD ktp-contact-list-21.04.3.ebuild 1183 BLAKE2B 20520fbabfe0740a388a0f08756dd16d858b35cfbf871f90cb99b5bf8428bbf31557c07c29b642587b910ec49039ca1ade9970e2185bce0ffcf9bf469444166a SHA512 135a3f8aaad23395b6254a52faa6376fafb43912e09503ba624468dc4efc1a6eba887ba0d4a1b909104d54a26b60835c6a7e2cfc644aeef644559f538a5cbf40
-EBUILD ktp-contact-list-21.08.3.ebuild 1193 BLAKE2B c760a857fc5b19f6e7873a6b4ed80c1574af07779396cc3a717c46f2b5728aa47f48cce1fda56102e9d1bb75d99a2c7dae5894d3c7cebb08d2a51bcb63dd8c85 SHA512 84f8a67b070ae9029a367adba435123295df7e6ae35f422d8cab75397e5e8eff209142ecd6b3be95bc09513a1daad707582703eaa175ccf40e4f06a93f7f076d
+DIST ktp-contact-list-21.11.90.tar.xz 153656 BLAKE2B a92166a342fe9fba98a940751d835056d3e6bb928ef6f2b0aec350281e77483d8acc0832190335780eb40cf4e95a4c8f327a26212979f1f3090509484b01e55d SHA512 61220687fbed127df78deddf6c50abd92626e62f005f2adabcd09f1ee78a6cffe58071074beeb5e8723f4aafd9fbf1d04eb06f7d985433a3374dadea6bf379b8
+EBUILD ktp-contact-list-21.08.3.ebuild 1190 BLAKE2B 8be14b56941862912584482fcf360014c1364d405a907a2589a942775e362e9b35f98eaf814f2812bf689028d3c42c0a97df45c206f3c7b631e0c53428513ddc SHA512 f0128d465c774f304f6e4f47165dbae4d959dd4472dba6e1eb1a6349ce9f970737c0f6d8159bc677ca9a15776776e1e9a7d6c05f48c112ba7520556ac922b22f
+EBUILD ktp-contact-list-21.11.90.ebuild 1193 BLAKE2B f3e2c9e8419d0d0cf710b26a3e6b1e08ab3197bdfb486f00327e337c928eb8b0db353adfa11a5b4c69a4b05729e6b8f870233a32cadf3b70d1a42cd4401fda89 SHA512 02dd5fe1eceba714228b5d097153c7b987c4aac9f7b4c630e183fbd00c6f66c61d628c3b6f2096876c57df8b5b1c020ae05da3cdfb51d6d993c9b684b5ab598f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-21.08.3.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-21.08.3.ebuild
index 527ae527f56b..b9cf51e4878f 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-21.08.3.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-21.04.3.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-21.11.90.ebuild
index e1218a7b05fa..3223c1c36d95 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-21.04.3.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index e26d77d86046..1709433bb8be 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-contact-runner-21.04.3.tar.xz 43852 BLAKE2B bd91afdf1d7573a6ff5f3971b6544d218ad94a3db16185fc4a7b95567682988082e680694e224fee8f4eaeb5810842c609883cb6914b5295877b1a857ce75f17 SHA512 e48bbf85ed2022f539055b8518e216cddf64fda168fae1738c963ee7fe8920835df816354fa0741fea6152a42dfff289d12b0656b7a68ebbba275d63e2ae158c
 DIST ktp-contact-runner-21.08.3.tar.xz 43856 BLAKE2B 2fb218cbfbfc510fb5b96c12ef649e83ea682f6dfee182aaa205e70d9610435d41b56078fbc8546c04b8df01df18d4ee135ea87a23ea9d0633330c776a65e93e SHA512 7eac32e2975d6bdc5011bc57944b432809467f46f7b368b9e697a5d87c58d08d23a28d8c350cf648b146a19ab1b2c655f4ec4b190b15b66e3dc59c402b822568
-EBUILD ktp-contact-runner-21.04.3.ebuild 675 BLAKE2B 77cc8c9f7197128ac41ddcded246670b1d2682b58a91a5e64ffe8986f408b074c33d11e5ef77d654f88d5bbba8379bec50ae97d3f4d3ce20df5f93712da4c852 SHA512 4f4a1087c837efb66f8b34c7006b986cfa7d25bd58c4d37327055172479d89d2d9ad507b30fee470286ce82342c6cf17ad634348c1bda13e763c280132e9f665
-EBUILD ktp-contact-runner-21.08.3.ebuild 685 BLAKE2B 345928ef0b7389d8856c8f73309910d861a7c47c20ee601d2332b6224efcde417db24468fc7f62b9b85320bc10ed24d724993ffcb71fa1c55d8dcb89d2c1987b SHA512 142ef75684f0c4485e457536b89c15a1664abaf3c03efab814974b6988471b6da72351a9f7302661144fa1d935669373d32ca970f17b04724321721d18559c8b
+DIST ktp-contact-runner-21.11.90.tar.xz 43876 BLAKE2B e752fc031114f116800497abdb77ad28c750b66c670e3f277c0a6caf7b2328c24f40928c6475afe4801bab014ac3cfa3717e807e54d1ee9a80c7bbcdc66bb472 SHA512 4280ba990d4c0c65ed3d5ebbd49bc12a6fe838cf648b20ab2656ee670b0b63396797880429909ec36817ca1d1ccf7e02523b3095c6bdb6cbc0c339aa541355ce
+EBUILD ktp-contact-runner-21.08.3.ebuild 682 BLAKE2B 6287e99bfcec6c5d5e574caef67af9cc3b991344eceafb658f9277764bace701f9300a9b86106850e0ce2a96dc40ad79a1bf8a3247b7527bcbd02266f7ee876a SHA512 37dde0b48c35f22443ebcfd292634dfd6ed65051cd9bfc0ad9225efbcb3cebe2cd66e4ec26b01fd81b0e8825877e196b3dc334ef67f6ca345eac801f2d8b0bab
+EBUILD ktp-contact-runner-21.11.90.ebuild 685 BLAKE2B 7ff86d3c7449de259a0557055538f31b62c071a28543d63176cbd2243d2ac941949e9853d3ebf5f986b9951bf09860052e71ee79b0ee53f343d17ab211893067 SHA512 fbbffcc0129ec38156974be5c7750d747c99d60f75449c91889eb81512658cb2f00e24933839c1a1a90700d7f11469bc59f0ae0fbd501e06d48caa57b15a620a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-21.08.3.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-21.08.3.ebuild
index 0e413fe51448..8436be00176c 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-21.08.3.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-21.04.3.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-21.11.90.ebuild
index 78ca704dc45d..2fa944fc261d 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-21.04.3.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index 1424770a1f67..04f0eedd43f2 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-desktop-applets-21.04.3.tar.xz 44396 BLAKE2B 958cef9d866997a4313fa13e425248d511eaf2fb94043f86c1dcdcf600a5d09b6c2b8dd61bfe8e712c00ebb513961a045b3381b42ab7e8e0455550670e92134b SHA512 50802cd5176e85a440113920bb3b6103067009608ed4f0a9115647daf7297d17d37cd705c124165c3855bfc331fbc398dd07243c2e234de038a1394b7c4ac39c
 DIST ktp-desktop-applets-21.08.3.tar.xz 44504 BLAKE2B d0b77eb60cefeaa530e8e583347d6bb3914c042019d208da6f96983f2c86c9f8d8dce9e842bde3c9cc43433ed54f8b312d1b490353b467b2ffcb0c93c3999699 SHA512 9248f946360e5baa41fddc4c7ec83e465cc3e9458f812685685cf6e5639a0719cafe825e70ef6f9ab5dfd42c8e0bab871a7eaf858b6e4946376a425020c80a43
-EBUILD ktp-desktop-applets-21.04.3.ebuild 615 BLAKE2B e740a1cd9547742e7767748510394af3da7128be76784c7cdf383ef5bb5e6cda3294e8992e19688f1612aab8c91dd9a00339edd78025038830b1a602b596582f SHA512 c2de711661c4ccdc617b90dd95596b30d82e4fb3d82050bd6d4b8112ae567235cbed0cebde32e549ec07fb974ce690bcd4357ed2b2efc6685f41f83b39228538
-EBUILD ktp-desktop-applets-21.08.3.ebuild 625 BLAKE2B adc40cda3c1204c08e1e42387b69c66f2725dcf839b659115e58e541b2e951fd684c377ac6e5b8741a6cce5caed0de7daefc696de25b0e9e2bb02bdec69ae922 SHA512 176a2af62e37995389ceafcd8c06db72925b403ff23d5f46a0eec967ac1444689091086956716e2bc59956d40d4945cc0e9fd0c636f416612613a7bd8ae1a519
+DIST ktp-desktop-applets-21.11.90.tar.xz 44452 BLAKE2B f6d1aa3f2e73f8c2be8cfcc4485e85c7b893d4cc02b8fcfe2a5b3f4de74b1df299b1bed0d3e40bd4caaf0d729dad315e420f5cd8f051ed381ea1a4b1aeeeed14 SHA512 7c90a7f825290ff93fccef2ff5dbe9633d290fdf25bd81664a3c24c8f995db0b2c636f430669b75ecfe4b4860aa725ce1dadb029d37b9e3ca3c6fb2d1bbe6a33
+EBUILD ktp-desktop-applets-21.08.3.ebuild 622 BLAKE2B 2e12a37c04bde5597d2a260f34a5a418ce3319367f8f4517418522f4d8408494590406b2db3544afb8f6d393809188e31e87c3013652b6ae49f314a72a15d0db SHA512 53979e8225e4a0bc9349148eb0e6f92b0ec7868cfde6e1b3ac819296501bc8d395fd7358ee1c38c6260982bbb8451ed352bd5f048f34d954d81331d3bce2e884
+EBUILD ktp-desktop-applets-21.11.90.ebuild 625 BLAKE2B 6c5927fb234201ca3bbbc5821cad2adf7046be0ee10b361de78a1a98e526a2b7fd16c5f1dc7699909ae7d2f999fecddba81c85ff7e32f26ddb02214ab9876fba SHA512 74122fbd2469d2ce625137a1da707d76a47b7ca70c2f8a4e3f02cb88109f294d4b68e6cdb502bb0a28055a2beeba6647c6d53ea18147918825af2ad65de8d4f1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.08.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.08.3.ebuild
index e82371260bdb..1b8228e2d3cd 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.08.3.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.04.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.11.90.ebuild
index 36d9a83baca6..76ce83039371 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.04.3.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 1ba1d1f1cddd..4dfe97dbb530 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-filetransfer-handler-21.04.3.tar.xz 46436 BLAKE2B 6a52d84bcc8106946cfb839dff9871a3fa6ed082046e306b3041e87a517f638400cfb71cf419568b621ee27d54bcc9f5119bf2aed4a6500c9dfac730a3cf7fc6 SHA512 40811483b2e8748f259b7612bc40e978a5de931e37c10f3e494a3c048396298be70d1d5e82e75b6c3f44bccf8d5e9738da9aea2ba3c4ff5994667c15fb02a952
 DIST ktp-filetransfer-handler-21.08.3.tar.xz 46448 BLAKE2B 8cda72a27f29812e7fa1b51ed7b948224dff6af8d90397efb64ae942b5f1e9806b496ab9c8fe7bdc86fe367cbb1c8a65dda5875d32f439a17925aef4fd27bf7f SHA512 a6aec5b6aa3589b275b15a748f3eabaf067733801d6ba3ca5aacd5fdff14d67bb496a7c32f0a809a2f726a8b3d001f829690a3906de288829615e5664600802b
-EBUILD ktp-filetransfer-handler-21.04.3.ebuild 691 BLAKE2B a6824d9f5700e29a14bfe3584122e128f97c7db38f26d9a91748bd265ea8b8c00cfa1c4d728842557589c8c7bb58270eeec3ac8ede57b5a38d43e275f6328c9b SHA512 24a49bd2078395dda46ddec302e49c9d13a31405b21805ce318be566c9fc28ac6319da39a1773a224a01db909874ed30c74818ac7f5941ace3294e0b489cb1c4
-EBUILD ktp-filetransfer-handler-21.08.3.ebuild 701 BLAKE2B abe7f798e0a28911005b436bc2449c3c3f4c1b0ff22260e2a40e3b7672d772e3f96c8009a9ad4414b27a8385c9f4e9b37eb5e133ff15f1be9b9fcafff5d4ba13 SHA512 95fca6fb21ecc60b3f8ef7fb3dd94f4f8aa35f49b717d79cee8872f44ef815439e7d735a02dbd4016f433bb2fa5e0a9cebf89d9a22c6676dc64afa3f5aec76a2
+DIST ktp-filetransfer-handler-21.11.90.tar.xz 46444 BLAKE2B 7a24ccc06689b3ffdbc37f9d04cb0aea3d06824b095434e1bd25f1a7197fbad76e92561886030689b366f98190ececf1c4b0e3bc526a38bffb4d15949c2cee58 SHA512 7a8e34e525cfe46b1d2bef31d06a5187b93cfd003a449c1c121b8c1cedf062570417d5612761e1dd0faad89c9af0d38b923cfad7b109792a6df6c0b2661701a1
+EBUILD ktp-filetransfer-handler-21.08.3.ebuild 698 BLAKE2B c371628855ca60c81e1ec336e90699cfee979efa858ce45f22547131b7b2cb4afe1021b477c3389f6c12f70016be6fa993e495b3466fd43a6fed819bf6af9c68 SHA512 5d59880dc5e1f1ca6c3d93371f1b57ce6ea345c487ea6549356d1ef5e42e7d030a155681fc955b15f5763b7da6ecec681bfa8a330c44b5e362f5cfac4223a580
+EBUILD ktp-filetransfer-handler-21.11.90.ebuild 701 BLAKE2B 1f2c775feea4bed0049e2105461da31099f3baa3ce25f4016539e523d439321626883486aa067490cf38bb9868207a4d48a8571cb259a1d9d92918fe93db0471 SHA512 8362659d691e80dd9f4179a32b65b41ff649ecf581d29da30cb796b049cd1240c111a46833e6a667ff555fb52a54cee158c40c6b6f62a2b1d60cf9baa0e8868f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.08.3.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.08.3.ebuild
index 6c047dfc0c41..904e619c556d 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.08.3.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.04.3.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.11.90.ebuild
index 4c5417c0a27e..ca0a81e095b0 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.04.3.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index 7f60a3cb1646..af5c3c48423f 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-kded-module-21.04.3.tar.xz 99128 BLAKE2B 3e9bdee280cf476c81ea428c519c0183fe2a01cac7449f03d49146dd987c763bc56b5ee2a049192a733053df7b28f4bfd8af45ea38c0d7c1d7b56839491fc833 SHA512 f8ec2b4e55a7b78ae208ae9a2f8a77aa5bbec8eef52b7a7671975846858955a6ed84b3a042ad2d35e90c74c72b65ca251e7938145dc16332a8c397e0952f12f6
 DIST ktp-kded-module-21.08.3.tar.xz 99700 BLAKE2B e6701e658d29e90bbcb99956f4c4fcdee6a3ad703fb0ccb734adabda089579f7ee43f3f28fe2d019facc130293c0ba108d14e84459ff07e634826af86a112d3c SHA512 7f4df9cc3a9d7eb5c4d91b34467d68909bc6f10cdc7a126c5fe32417697d81652ff895ea85113cde606c905edc2692ecbf34588eb851ea8955c87cc54eb63220
-EBUILD ktp-kded-module-21.04.3.ebuild 1107 BLAKE2B e8a25f7d98d8f38c064a0917fce81acebef44cfccddec99a5b6dfa5f7f255867675452c68b649275e600556e4c2b7f3aa05a5fcab5f2ba41f65263de026a1538 SHA512 1b048c9e03fbc50253d2e68872baaa7f3b42e698f15c5b0755c3fdbacb96d6a48824d452dcf6bffffa8660337a814e680e1c0192e54e586c7470e0105b340502
-EBUILD ktp-kded-module-21.08.3.ebuild 1117 BLAKE2B fe80440112289acd492b219fe172e74734ab3cdf3de8f76372704f0260088ac6b86cf62778352918380898b5e7780fe9129860c107fbaccb4e2303c46f9bb739 SHA512 cbeea947fa8dee79c902420501fc1f98c8fbe7397005c0a789a02176c6088b5330f8d95d08506554eae59343eb6d748df28424104aa5551a16252d3a7c622d70
+DIST ktp-kded-module-21.11.90.tar.xz 99728 BLAKE2B b66b4217bf05016b03c1f161a877543b9fe6ec6eb4ddd10897d0a637e2896623dd65a815674cfb6737604943631c3562105d871dac8d13c1e8e994eb547198ee SHA512 75348a539326ba336c3d37d997fa2c9c05a7c3f1d9d72f8b20dc8f586cb120322f41cfe288560add9de059e48f5716c8be66b6959b1dc9ef92cd6f319025248d
+EBUILD ktp-kded-module-21.08.3.ebuild 1114 BLAKE2B 523fa3c3ab9ff468403375d31b05222dc35836e9d23259059819d170b024aa6624d605ab9b3728fa5b8bc93b1c133b3d556556b7328b35998a33bd73444b6ab2 SHA512 2a353fd9e27d6ac1970a885c32c16f5b4bda625686ffc04c30bbca5afb4cab6d7508ecface4d44baf37ca189d325ffa4d4982f4a979c11c8ad47e9a84e3934a8
+EBUILD ktp-kded-module-21.11.90.ebuild 1117 BLAKE2B a2711a800cddf7b3937a41177a45ea3dd95cdd23a211534e536165f4081c7d62a33bebdf0d3bd1f6eb8a73f365f450506e9d610a13fcc4f0428f1d7dfd8a4243 SHA512 65789a8ee48754f60c0deab9a0cd638d0ec7e9d47093613e8fb4e7561b0daa61caf2dfefeaf4ad215b596848b7d93736d0b637131517a59ee721ce5c3b760a04
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-21.08.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-21.08.3.ebuild
index 74ce6721148b..783945243092 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-21.08.3.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-21.04.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-21.11.90.ebuild
index 02c1b68b6906..56711d3092f9 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-21.04.3.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index ea093c64e954..c79f5d690974 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-send-file-21.04.3.tar.xz 28700 BLAKE2B 52e73baf0d7193465be660b759ac47702f167e9d94efd7604fe991f1bd87889ebfa0e940e1a6025b688c855a4b2e2174f8db2e5a07b726a50903facd4ba1a844 SHA512 538c9dce9ed232f24fdb4e20e2fda57cfe394d4d6b1c546e3b6b7cb139141c1307328b14f777e0936ed4329229639afe91786fea767fbdfc9a093ea6ff2eb577
 DIST ktp-send-file-21.08.3.tar.xz 28776 BLAKE2B 90a1d16fab9c4c8f37b0255b846b881b72ee0962860122ee45404719dfc7e194e9750b909b554b5a01ea4422ee9cab39a698da01408256540b0f5b6613fdc4a2 SHA512 54697cadf5db557f2655def1ac388013b14b628eb71c515b9a008709e9635419b2a617102f8024dec40963b19b51990c83460f3760eab387ff957f476d36e8b3
-EBUILD ktp-send-file-21.04.3.ebuild 875 BLAKE2B 1f4126b89ee1a3045f5a986850ec42cc34248db58c082c6fded65b20ea05baf4412e820c62ac708f9d42265e46f08e7bc4e90676ea8261732b33f6b276b724a5 SHA512 faf585b40064e4ea41408c9a1084e07d8f6273fdd079ce1eca41ca61163bd2e2f1ca6ecf1f789903933f151d69a7e29703c90194c00ed255ff7500e29c4a8ea0
-EBUILD ktp-send-file-21.08.3.ebuild 885 BLAKE2B f3f3e83c7e508c430b6b0160df80fa102da73fe2d86b124196a633c78964bde0858caa01dc9d1f3d735c7c893c574ebbba1b328cbe20b319e6765cb87925c469 SHA512 8f2bd663c28844dd8abb2ac85cb2a38d6361501fb5e8c2929c0f8d9318b10ed70ed5f8b7aef297318405bc513119b16ad45dc58c0fcfa6f63da4c6ad5781ecf1
+DIST ktp-send-file-21.11.90.tar.xz 28728 BLAKE2B 7e58eb3e57ee41a7bfbcf9106a656a28dfe8a84f9e70803f2209625929528b7f73ab89271d85eb2669f3ad3c658040bc5267f6a8e4402f0fb4d91c5de5f7e16a SHA512 8dde083aded651bfda7ea8f8264a30520dbd886c962b812cea843f0d6bd9b7a415688df56cc7c5ed40feedf92b26eb302634b3ac43cdb4c18b76ccd1602da984
+EBUILD ktp-send-file-21.08.3.ebuild 882 BLAKE2B eb43fd42387f53b2af628b750d18e175b8e9ba5d4092382613cbce805eaeb66a6b751b4492dfe20232031afbd8e8ed86a86084a8f08b22355aa30626713baaad SHA512 653787edc87521824e4c2ec71d137c2779d396324fb07948dcae861827a945fc97f2b0eb0624d67cc445b8e3fd07742d319b5c0fcb432af17d05e2ce8fdf5dd6
+EBUILD ktp-send-file-21.11.90.ebuild 885 BLAKE2B a60c31fd3c5efd21a11ad7cbf06042f8ec1e8e24dea1646515505bfdf3590526be6ccfec5a824daddd134c669f949613da5dd28055635e8236c95f30525abe03 SHA512 de385760178528784b4088826d04b9c4fd2a96828164b63ad65caad850b1293288582ff9e489fbdb5dc66be48a9db59d5ad3c1d7c38c2b30476a06b31e5dcaaa
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-send-file/ktp-send-file-21.08.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-21.08.3.ebuild
index 26ffd2911b39..8a33bf5e81b7 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-21.08.3.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-send-file/ktp-send-file-21.04.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-21.11.90.ebuild
index 5b6ca4fc9a60..092d4a97d791 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-21.04.3.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index 23c095a7ebe5..237e74766a97 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-text-ui-21.04.3.tar.xz 474640 BLAKE2B c69dace833198c3295bda2fb5fd3435b0531c87b4f5ffcb6076bb1fac2b3cff1bfb49be7f0206a7c858011b740509c045faeb3970d4fc9f615982a8a405398e9 SHA512 64b837b0f65d314d1e8bf9b471a53692a020c33eb0a70c3504d54a560a41a2f30e0cbb30c2ef8ccad75fce614604959f2aaadd6a02a8c09853842d083ba76641
 DIST ktp-text-ui-21.08.3.tar.xz 474660 BLAKE2B 242ab864372f9809dfc0857ad89a86736132a55591fcbc77e7a0b76c1a553e5ff803f927afbbac49ff949fa0f88353549b661982d34ec38fbbe2b4674e2a7e88 SHA512 7ed424d7b4972683eb5f9c43040ffd6577f457d0fb19b3c262f229bcfd141fee645eb3e5aa2204445b226829b6da8ea7f84d00aae737cf4c7f7f1b2b59d54e27
-EBUILD ktp-text-ui-21.04.3.ebuild 1637 BLAKE2B 1631fd7bb15fe635aa16459bc6682d7aeb989a075004601fcecd2318325020901dcc5965f731d34c24297550cfccf2f8eeb211c64f03f39b90cf8d44be91eaf2 SHA512 051f17e1ab9fad5ee60b6f87a8ca2ebadcf160b119859cb88ce7eea411fe98442a30fdeed8de7d69efc1e156d0076e504ae9c7ee876975640565dc6f75e58aae
-EBUILD ktp-text-ui-21.08.3.ebuild 1640 BLAKE2B 48f9c51e16763995f0e1d08e2a6c8e6c543fba8e00f5198f2da426189e1151f6b960b9ba81df4e517981572d70df07e862caa8ad828f85d073b2f476546555e2 SHA512 9ce326a96fe01fad99add86ac6f53c4fa5c5ed1baed2c97ae3f19987a786bb3dbcf85da3939053162de5e3cc49b276f0be40d0cdd344f639069b648d582ee64c
+DIST ktp-text-ui-21.11.90.tar.xz 474564 BLAKE2B cd083f7c2f1ab4f62ae1e9d9636e3daa36c06f3c4613f61a9f243e755a39f6df3dde3426b70424668bd51959311c9806ab619fdff84dbc6dca0d3cb6f924171f SHA512 aa158311b80f71451fd4f052c808faffe9fe9fffb879b934ab832e0dce71c048ec767bdc711f1dab5f76e598af8f4855e5574f81daacacb50dada9a64765da93
+EBUILD ktp-text-ui-21.08.3.ebuild 1637 BLAKE2B 5ab7e57d41fa7ab1477420e816247d7a5afc6ebc97e45bcd290d6cc3cb3b3e0114ca5114bfea64327b569db83654d2b3377cad2a4358135adbf0da70a9e34938 SHA512 3b372ea36fd64ea61c0e845a64ae2f1d7eae1d38b93ba1c0b420b9bb89833c3a6847c4ce3df88ef1e0720300d918b1e4b71c12bef99ae5e6e085d6b5ddb1ee23
+EBUILD ktp-text-ui-21.11.90.ebuild 1640 BLAKE2B fc7027df2e4b342b17d251830bbf840d32e16708f88cbde4c4322898dce541b6cebe3c38b63513a28549ed66b8214d5b5dfd13fb092b324a1fbefb84b6e46bf1 SHA512 52a583fe3b7d42761eaa49bf21ade24e3489b8a47f6b74582db85d8fd39e508073d26f8318c3e00031d6de122a68e309c63681fe5ad46c7b0fa184e730586066
 MISC metadata.xml 423 BLAKE2B 4f41432df84c943cd4dcee399318833046b75304eec8626df2dba65a8a26b6c07dda84dbef681de25f540f120d5ac4f3d94f7754f38e5d77561d8fb2cb9aef05 SHA512 5236958808b75157161fa5de0051f7ec49d12f94fb33cec8872465242e83207bafbf84c7ce4434c4f7123b1f1c7540509905354c0a7b95f7fc548536601d89ff
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-21.08.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-21.08.3.ebuild
index fa760b4b059c..1fbbddaff4a7 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-21.08.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-21.04.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-21.11.90.ebuild
index 0e4c712e78a8..704776ccb514 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-21.04.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 25e7fbffaa08..dd0592221602 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
-DIST ktuberling-21.04.3.tar.xz 70755172 BLAKE2B d7820b53e29d645a1149277ae8db6bf86dd0fce6746cda44593fb4f3de5dec9484e588af5753b977dd6d45ce794e3ed5461c3c1ac0bb5a93e5ea3111db7377fc SHA512 3d3ed7a102110207898d3fffbf127cda8be9c2c112692e037c6c067cb517699a8a60ab6044926a976876c6051ff5933481435d45088134abc7b8ff7ec44a7acb
 DIST ktuberling-21.08.3.tar.xz 70753332 BLAKE2B 0c6802c85de1c311cc3c6b2496c0f3e520f0b83f73464b466e420c87c7fb2adba9add7dd4603334cbef0af8ad9f9d3ccf619f1bf061d1997677a8c2b5f30ac1c SHA512 a3d54df723970415c56b5001cc762f6131321c78671d0e5282b4abe83b125d3ec9ab2764939d3bb666514a22fb208b3a507b218d5a1014703831dfcb7444fbce
-EBUILD ktuberling-21.04.3.ebuild 1104 BLAKE2B 86322c0eaf99ca704e365c17b0ac3a3897aa1f17acd4f603f765a526f7c6700d585f9318f1228b18a45b7b3356d9c8d78a93b444b5d8168dbaa7dff8ae46feb3 SHA512 ed3f5be885580493c51188e57b1bb7dba443d053e8b511392428f7fd28f1f7d054675fce23c43567c01db37c32023401bdb9eb8317b8e732e4f8075b59db5d25
-EBUILD ktuberling-21.08.3.ebuild 1114 BLAKE2B 40bc6361ff85b77cceb2d83132985281d6e58e57160884e309988909084d50b27bf580450d77f104fdbcb6ec04c67cc2b9ad88e740c9461d485e447e3b33b8b3 SHA512 1f66330473ce2a91b0c6247af2965d524d67ad78e88f9891e2e011970ddc7721b8626381d54b4f2c80272538a042ef90c760453a39131843079b84b3672a9772
+DIST ktuberling-21.11.90.tar.xz 70834024 BLAKE2B ecb24b7cb1cdee3e5fec7676d1b004e0965889e8ac3422293f93404934ea7a11550d97d1d0e53dc5a09a99d03acd972b4b31f5eeb077cdd556e96602b9b0c884 SHA512 4f01d006ffaa5be7d7b3ce87e452b07bc31f7df3a95ba12993b1991131e59a67b240f32e35069e6b6fbb89c68162e8abd7e8f39c54ab2b626cb28d2eb7323f9b
+EBUILD ktuberling-21.08.3.ebuild 1111 BLAKE2B cdf53eef6b9076be3622b27c24cc2864933725d11ebfea133b5472f4218a4812b679b4745a806dee6d1047c3fa47dffe447c88fe6d8e93db90308a2a6d8b8a7c SHA512 37bc219f1ca9bb487fb79e5736fec7ed0944382805e52566c49a8f084d91e683b51338ee259c1dad4e794cba1101a5311c5d08a6345915e8fc8405de41367505
+EBUILD ktuberling-21.11.90.ebuild 1114 BLAKE2B cfbbba2a990a991893312010e08a7a57c179a0dbfaa25d594569ba574c5bcb7859a774a26fc7ef3c47dc2f4abfd3b843ec27235933576a9e3b51130eb2d4f656 SHA512 66c3ee6433da4d1af94f896cda63e6fc0ac61174e03df0c88824a76103efa74d57a787a0a2a94b0f1fa2d187c05a06b8946fd8fc2f4ebfd688b3f6ffc991c274
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktuberling/ktuberling-21.08.3.ebuild b/kde-apps/ktuberling/ktuberling-21.08.3.ebuild
index 465b01f2cbeb..36cc303ecca4 100644
--- a/kde-apps/ktuberling/ktuberling-21.08.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-21.08.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/ktuberling/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktuberling/ktuberling-21.04.3.ebuild b/kde-apps/ktuberling/ktuberling-21.11.90.ebuild
index a03fe335123a..40b1e3c062e4 100644
--- a/kde-apps/ktuberling/ktuberling-21.04.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ https://games.kde.org/games/ktuberling/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index 5bcf787666d6..071f738a00aa 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
-DIST kturtle-21.04.3.tar.xz 1970952 BLAKE2B 88bb4425fd7d798c9d7d069b61a241adba9bce457f2e3bc804c12572637087feb6cc221c628a4d60c97ea3d292c242bc3339c033217dd14e41f1f6a0ed39b3a2 SHA512 7c7b4ff311a694ebfd29de55f7b74767daac7edd228612496356823a81e9836db6094d1802c3c7ed39540db645901bf3e0ff607d246c9f38b3501ccdeca0b012
 DIST kturtle-21.08.3.tar.xz 1971696 BLAKE2B b97e449a598e14c8f49273934cd2bd5cde9a4f27e7e58420b00fe6ee571f096d33914716078e160e743ed8098e144f504223d7d6a511049a8968a3f8ce307dc5 SHA512 b1ed78345aaf8d978209a001ebfe5285a6978951640092db8f2ed20ebf08638a53f5065de2e6791ee87c1c37ab67ab004533873c83cc0d5204aa8c519a38f796
-EBUILD kturtle-21.04.3.ebuild 1086 BLAKE2B 599158b87765bbb401ede61aa29a1be3c6cb2f82adcd0b4b3afecab588988d294a5d073189159b79bfe80dbb66e5f80ac3dc238595c7e8df163e79df4d3b476e SHA512 5f96c3fe126195ceaeb11f0a91de878b86847ee03197fee56813d0e3ea77beeb68277c05939810c9c4b3b1c15ee07e4975ddbeda42aa1b8b6ab2519ba7ccd853
-EBUILD kturtle-21.08.3.ebuild 999 BLAKE2B a35d8947b1653fc1118a20b15b242fc7128b87a4992ff0e1f4129ebf73448d21b1f072ed69d90c685c4707e9036109a91d10fc177b4ed205b9363cfad584b9da SHA512 72a48494428ae3e0ed338d60ae8474aa2200063834ccb76b2d8323ccee062d1009c96791e5f69b9b0d0929a9fef4903ab64ac9c6494a3adab5b90ba97f92d9d2
+DIST kturtle-21.11.90.tar.xz 1971896 BLAKE2B 0b5077002a0dcd0bf8c8e11dde383a3eee2c2058816ef99cb1a162b3412c05662355d928489a63e41af01f3d9981f3e7efadc3a5c4b02d193737dbdf9c7eb802 SHA512 b6d7d0ebfeed2df8b170d3171c16846740f9ae8374c3dbfb20674659c9f04b864f26b5f5d3fb3e1346130987ce83e529eaa66be1e82ee3d69d5ca35f8c33b050
+EBUILD kturtle-21.08.3.ebuild 996 BLAKE2B 0788113af896fc84be62e9b580b1827749bc7454f7ee9b5268790d09084697f103a964714fa70b1a3cf546c707eae67b0f30f1efb75eea52c00326892a93bccb SHA512 30e26b9f111aadc51bce65278e39e80bfc82984e7cdf5f5350b8c93424882b9bc6677126a673d8015f8cbf83e54c3316ffeebda009db38c23ebf765cb56a7223
+EBUILD kturtle-21.11.90.ebuild 999 BLAKE2B 91ca004885540353357fdefa6e94100cede39751505fb8cbe9cd87204545fc608a28277859a874188552361cc388b35d4b16b822573fb5a72c1b5da7379cb68a SHA512 a763febb8369c88fed9747fa9b570d33294194c1096136f4acb3ebd000380592ab1d35565a0af4f9f60961337ccad2629dea377f237123eca94ccec786a7fb62
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kturtle/kturtle-21.08.3.ebuild b/kde-apps/kturtle/kturtle-21.08.3.ebuild
index 159b0768d9e2..df7aed23b719 100644
--- a/kde-apps/kturtle/kturtle-21.08.3.ebuild
+++ b/kde-apps/kturtle/kturtle-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kturtle/ https://edu.kde.org/kturtle/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kturtle/kturtle-21.04.3.ebuild b/kde-apps/kturtle/kturtle-21.11.90.ebuild
index d57b652dc625..bf6f416542ce 100644
--- a/kde-apps/kturtle/kturtle-21.04.3.ebuild
+++ b/kde-apps/kturtle/kturtle-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kturtle/ https://edu.kde.org/kturtle/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -34,8 +34,3 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -r po/sq/docs || die # broken with <KF-5.84, bug #801919
-	ecm_src_prepare
-}
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index 13635d10f5d6..e5d1f5cda7a9 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
-DIST kubrick-21.04.3.tar.xz 343208 BLAKE2B 98738b63589ec7e79849b4d9fd4958eba8f8fd25a2820948caa95304777d0fb784d5e82cc6c02fcbec7c1c8f1289a9cab05e5627edbf209c8b2497498d0280ce SHA512 98f18557b86768e970ece7d6e2cc0b52e7cbc35cda4ffd20c4bd217897abf9345033fb97239bec02b4a73c725d6889bd0b1c0206e1a802a36fc60da5b2d2dcc5
 DIST kubrick-21.08.3.tar.xz 343112 BLAKE2B 27b5f9212388c537a6240e03030ad2a6e2c98abeae4fd6bf5827bb06a9c9faba93d4860f211772a9d6f8511cbcd2ef13c8846ae2e006c3f67ab03b5ebf20d746 SHA512 bbc1bc7e55a46b2652132e2ddbc47eb5c5a18d1cf460f4c3deffe582eafeac33347c5a814616d93cca931980ab22f52df51e6b691aae7f7bb2c5c3b38587a251
-EBUILD kubrick-21.04.3.ebuild 874 BLAKE2B c90ec02b6d6626c693b0dcc84622d937933eb41bba47aa3f7945ada0ed76113bfe5909f26edbb2af425d03cfb4cc44276e96acc803b0a0f323b9abf8e30c802a SHA512 7f614db9352f80f9ada4fb2d80808d416e8e486aa300753af5edf3b982e483a6a2db65a5c5332abec88d7262b2b5611d722ff9f954a1dd913510f99f4fe373b5
-EBUILD kubrick-21.08.3.ebuild 884 BLAKE2B 4c3afad6cfa6a69e7e8fb3169eadc13959e6446d9bcd7aa572f9ee8a00d9fac25a09629e672a74267d02d8cfadfe6bb264c4478dea7f3cd715ec9cbe9ee44d83 SHA512 495fee2cb13cf4c1498ee063cdffff487a230912249d275b77eb1dfcdc8385b868a203ba14ba0fbf6f3627f8f7e835f321274f4a368ec5bdc21bdd504df628de
+DIST kubrick-21.11.90.tar.xz 343324 BLAKE2B 33ccfbedbb72da076119ff258d49b45ec9732a29c30721fe0eb28f8ca61efe597db4209bd65497af7090ec09b88bf908d7c35e147d3be951e00e0d159ff112e1 SHA512 2517c6a83c5a228c9a0d57b0da745fcc13c74ebb9d40e46fee2a65e0a3e2e8e87ac59301076eeee1210355bb22c41a487e44429811f0a700a5b4567b00718e65
+EBUILD kubrick-21.08.3.ebuild 881 BLAKE2B e89ffa6517c3240247126555aaad4f6947cafcac3ceaa6ff4f71d6755771a46923be982e95866dde186c3bb53d8194d88dc3d1d5bd720e7687f927ff7c2b2112 SHA512 415ad54bc38729cc45acb90ca806d7f1a3af4ef4f8b465a0782d73ded6f6aacb09e0af2ae778e9f74530870d6ccde49ca509f33df19f93bec8c7db50536e07e6
+EBUILD kubrick-21.11.90.ebuild 884 BLAKE2B 6817c3eae2e58f0ecd82dc7e8938b6230a94cafd7caec07e0eb7cd6f55742cfc8bab9d54dd1d2f98afd50dcb865c6eb7a407b9c864681ee92c11d6ff3217bd36 SHA512 2bbfdfe01c51502f59455438450d9a02402c22944f29790100f731697ec95cc96e19c4de94698901a3b8c7fa3c590ae7f92066e29dd10577e18f36fdb7c8ff9d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kubrick/kubrick-21.08.3.ebuild b/kde-apps/kubrick/kubrick-21.08.3.ebuild
index b22a71fe58a6..c2ae3a090d35 100644
--- a/kde-apps/kubrick/kubrick-21.08.3.ebuild
+++ b/kde-apps/kubrick/kubrick-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kubrick/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kubrick/kubrick-21.04.3.ebuild b/kde-apps/kubrick/kubrick-21.11.90.ebuild
index 079b9a6b01e3..4f0d8982baa5 100644
--- a/kde-apps/kubrick/kubrick-21.04.3.ebuild
+++ b/kde-apps/kubrick/kubrick-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kubrick/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 5124143f8af8..4b35a8304f6a 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
-DIST kwalletmanager-21.04.3.tar.xz 796240 BLAKE2B 65188c28aa97ed7384db63dcd3ca2caf5be143f5b949ec62196dc7fb2c96aadaded2c9333be4f961351cfe33492f341ab9e50c6ace55d0e2e9bad7984fded39b SHA512 89bedce351f0c27c7a0452d087fd0633c40ca82d3fc162bdff06c6ee5eb95b66305aa85b9e4c37c6f01ff54b45c575f6af5d5cf9a6ec7e8836198a9e928203a1
 DIST kwalletmanager-21.08.3.tar.xz 796792 BLAKE2B 82ad169ea63f81a5160a1ad3bb99752d18620bc5cd190483b1ae8838baad9c34d01cb0e370a1cf88b5b8b061852b6ad8e33c4bb8e9b9c764b93bbd826aab7859 SHA512 cffd4151e8beced1ac691480b0b339bff973aa02de5edfef5e99455a602a04190cb43d24db9ca14e65721477dc6c14ae487fb75e73b8c6362c9e5c45b2810307
-EBUILD kwalletmanager-21.04.3.ebuild 1408 BLAKE2B d933bf4bc1339d94bea02492a99f0e1e54e81f682c40bbcc18d0083472f8ff2aad4e383bff2d176beb359484796e6aa7865ff5f5487aa8a3a4728270119cc891 SHA512 8df543e5844c5438a77f7081a6d417d314644c385be6af3fcea1c547cb6439f32b869fe98eedc2675eaa9072a2fce7a49a38a532e6ffdb063b50f3b95bccfa3f
-EBUILD kwalletmanager-21.08.3.ebuild 1377 BLAKE2B 9ce4231543ec400b9aa8e8ff2e94b187028b9add84827fb454fed35705cb5c000ad749733df16331d823880cfce76d0dde5a5ac3793e75db2b8f8e882521e64e SHA512 2f1e1d21ab05fcc0205d925fb4b0e79d3bdf2651fae29dd557375c33faf4bc8edfcf498b982db7a995c5f396634127908497260a6accaad710b039a79ac65ad3
+DIST kwalletmanager-21.11.90.tar.xz 799876 BLAKE2B b9be2caf621a31618d9e25f1050a3d9caa77a081142b88b47c9395cdc0d85c7227eac5ef17a52390ff97da5593e01e947859c3661ecf16f9ccb7d1cbeca88942 SHA512 4b2e0916e08cba6c2d1c9a9568db0905bd3856ff2057c0aa16c8be72df891e1486e852653fbfb044ee94f565a8c98bbc15cbfdc94eb8986e81a3c761f021538e
+EBUILD kwalletmanager-21.08.3.ebuild 1374 BLAKE2B 00a2e3fac3094882293d33f76502ed4c23c3afba4b6866a898b9c3a13c925abfb463ec39adeca9876654aa35a6c456b7ff27a10a0182a76b69e5d5f3eed7350b SHA512 864956c52a2db542715329e02cc47a9b838fcc92ffe23b739ea9a81b85050cf2dc16041921168260f65543fcb17825add7f984744d3e02f3a167e44423d63774
+EBUILD kwalletmanager-21.11.90.ebuild 1377 BLAKE2B 21c6a759f496cc5b30cd730c7345392e51db9f11f21b5353d3967166f8c7b5f8ac64affe080c585351640896a13ea0682e87edd1f228e17830988084e377f6fb SHA512 be2b85b5794f3e37a6cd937ca2684ca13770ea695386cd7411d01cf975d650acd34403e2fcb76d0ee54ada35d9096611d533816949322f6354e393675bfd55f9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kwalletmanager/kwalletmanager-21.08.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-21.08.3.ebuild
index cc989175faa0..30134892ea6e 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-21.08.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-21.08.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/kwalletmanager/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwalletmanager/kwalletmanager-21.04.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-21.11.90.ebuild
index 3510eaa065ec..dc7a0dad6eb7 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-21.04.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/kwalletmanager/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
@@ -31,7 +31,6 @@ DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index c946689aa160..eb2bf9ea9be4 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
-DIST kwave-21.04.3.tar.xz 6899140 BLAKE2B 963b2da276e9c897f6b431a665f880a6346dd9298e6f818b291a6a51c17b015ef3c3e1928caa4ec57d9780c982e58107966d39b618d40c2c75a3263c2e74bc9c SHA512 08a648e75ca3a331025ad84f02be7c04b6ec9e68ba251436fa923add35bb3132765519b9bc9fda44b01a45d8b3a9b85f12ac3eb267a8313593d360eb08161f6b
 DIST kwave-21.08.3.tar.xz 6915844 BLAKE2B 47957ff8f1fcee4ad135c04dcf1bd7610b8c4b25c5a6ec7abf6e44fe6783df56de31bbe6a10a58079bf2a35fa0959a1e1f675546f59473aaf00e3fef06a40fd7 SHA512 111a2159018c93fdd9d2b2627f926c39596dcc40241e15e467bb5909516fe6c6a07cb943a8f8611532c29de9aae28ec7c4eba53f7f38245b25d8b3386c0d69e3
-EBUILD kwave-21.04.3-r1.ebuild 2079 BLAKE2B 259e34f2a0542caa52c84d79ee88ee5bcfb8b62896cb03746bbab4cce334e5304d624b87cd60c306c86e88111053d26358e646263ae207baa60b5e235dbada56 SHA512 1a1e914113168cef4f686f22d802042be400b3c6b050f4e26ce32e09abf0b2525b593c76482ae6a99f66612210960014ef36e7e62badd37a896f5c84783d8175
-EBUILD kwave-21.08.3.ebuild 2089 BLAKE2B 0ad950cab5bb52d94b023b7423a90083b00e1db458a7088bdaf8f2f8bebe7de74a1d74f4e2e8252e8c3712ea2587c4f22c73cda9257c150fbe88aef7a5edb3db SHA512 3aac53797c51794b717d85c42be1058e91bc9d7f210281dead06c3e6c1b378bbff00321983d9b8bda88865bbd4adfd3eb84b2cbb9088179e4f9009ef458237f7
+DIST kwave-21.11.90.tar.xz 6953608 BLAKE2B 1010686a8d39dec5b83383a9dd96254c9de912b5dc1fa752c39b409c718cbcda4e3156d86241d6b27c38085cb4c130d2c264e99068deb3ab1f40f29038e23b00 SHA512 13eccbfab5b672f3df59e4d212ed80f6c6630f7bc77684c4f7b214a14ba381ef9b6db199184fcece0ad9c20f17045eb95a42a0b940b57e851d9b86d97ba2ef32
+EBUILD kwave-21.08.3.ebuild 2086 BLAKE2B fba5710ea0858ba722f4729326c1986156697621da13eb96174c590b9ad994909de0f986b3fc86fdce1fb3f9398af0d765e1e2a2164227075fd6c3433dbab71d SHA512 465702f0737406bde0c77f793df1dfa5fe836162de3b118858dc962b79e2c10f2afe218ba88b133e07076c6fec942e18e109f5790ea7fe2007a43176058d7da5
+EBUILD kwave-21.11.90.ebuild 2089 BLAKE2B 7a15ef083a9aa9690aee3112f8277e2caffa89bc9301b97c8c482e3ddfb979146bd9beec76a83b7f06b6c4a82c9ba20aec193a14dd417977a78fc551e73fa20e SHA512 fcc429c5f48019c5ec27f21121e2dd017554e3a0e5369d5e317784c896b8db495bf88479030bd917856e6781af2ea415aceeabcfc7cf7a727ec0fddec8dbab6b
 MISC metadata.xml 759 BLAKE2B 6a8771c874742936e5301754db683f085d283fd53f6f9f2b3e81a9b59041a3440e9202c60230763852eb6598f15a57c35d76eef8fc4adb66b44c7eb9069cc220 SHA512 7c3e7738773fbd838fa60b18f9ccbc5b8bc182517a17691e29b9b61a57f25817f52d6ee03609ba4c9ea48398aad27939b652a5bd628722324a6f8e61f52ef718
diff --git a/kde-apps/kwave/kwave-21.08.3.ebuild b/kde-apps/kwave/kwave-21.08.3.ebuild
index 6b7044662ba3..47452e273944 100644
--- a/kde-apps/kwave/kwave-21.08.3.ebuild
+++ b/kde-apps/kwave/kwave-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kwave/"
 
 LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
 RDEPEND="
diff --git a/kde-apps/kwave/kwave-21.04.3-r1.ebuild b/kde-apps/kwave/kwave-21.11.90.ebuild
index 5fd16128eac6..15938817dd31 100644
--- a/kde-apps/kwave/kwave-21.04.3-r1.ebuild
+++ b/kde-apps/kwave/kwave-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kwave/"
 
 LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
 RDEPEND="
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 6107420e9a79..7730c139a757 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
-DIST kwordquiz-21.04.3.tar.xz 4208304 BLAKE2B bf226afa6a145a438609de132aec7e4593e203f66b2f94bdb34f9eaa15d35ed7d60e73dc932e28cc704986b1ccbaeb65b0c00e2fe0699a9ed3b039d7d43b16c8 SHA512 5b52aa118b80f846ef4b61b43468438d0597e551a130ab9e2eb8d93a997eb59a3d5c694ccb2e77dc8c6372e3f81561c0e630a9e659bc1c561e448abeeeb46e21
 DIST kwordquiz-21.08.3.tar.xz 4208452 BLAKE2B 823b389b23c29f7f3c690095987922710c8b5230010afb4260035ff31f51ae6a5300fbdb1a1c558d0d4870476bf62255cc00a045addc63b9f41bef7e2b0952a1 SHA512 82642d7c1af661dae52e1753d6543e4d6b9ea7211179ef4fe9cd439f84076053fa73edce47407d5dfd9e30beab2c392cc65c42b9ff883a1eef7b0557cd08f791
-EBUILD kwordquiz-21.04.3.ebuild 1169 BLAKE2B 4e061731753e97c4943d8de75bf9947818937d5c53e0a42bffc519be41221a0b42edc147ddd18535fc5ce0e795d4591cf6c9481e82efbd2d2e6bd9802095df42 SHA512 cd799d07c25aafb224e7cd105108008ce8c65c3b925bf269ec303448b74dd5f89d7d3e30dc135d58dabd5a7acf916d819293c590cc1e8a0703682a2c329cc75f
-EBUILD kwordquiz-21.08.3.ebuild 1179 BLAKE2B c24bd7496b22fe55c299688b26cc7caed0e4c08fb1c57510a5a06f1f5ec84f8e996190fe5534229759594565652a2edd1fd23f74da3563c813e9169f18ef3326 SHA512 c6f5502da13b1db56f83ab54f16986cea16a0952a2df850f013d8ae90bb9eccdb43e903b7dd01d810b93d46a79781c7492ffa10164334f2031f479d30723170a
+DIST kwordquiz-21.11.90.tar.xz 4206964 BLAKE2B 9029e59b1c8b35a6f1f6b8156872e16a00b2fc137e69dcdae798ebe5e5e1565dd0f27aa97fb152097ebc3bfbfd7f88e18c32e70f5a1030d57c0c3eb66ddc23bd SHA512 3e1b429d8b25dd8b805da325312ed808797914271e829f28f58758096235ab834a220d37324afd4ed5a16e6bb9143167944c272aa82551fccfa20eeefb0d5e6a
+EBUILD kwordquiz-21.08.3.ebuild 1176 BLAKE2B 15309bfe94f0215b15af5c558cbccbec679f1270553e857b61eca0c69cca7c0932bd7b5b70deb615220d9942927f1e4f78e04597e56bd338c4424c8e2833f301 SHA512 cc3feeaff799cf6745b98871b994b617066477667ad11c3511206d96b5f54a9c364e7f20929681ab325a0b8ab33f83e222bb14b714dbc8619be3daeb4a1261d8
+EBUILD kwordquiz-21.11.90.ebuild 1179 BLAKE2B 3fc8dc79b2af5459ef36ea516f05d48d89b1faef245f844e35aa71ba3ebce2326fb84a25e0785a49bb160d81a686e22f984fa92e206c02aeafb1284ce453cc2c SHA512 1ee263cc0bf24e2adc90564f8e0a6850307af55d2ae52e42f3cd17500ed2c803e6fbc39a51e0deed9589dbe9320b3773660435f16c2a5798cab3d308d28383c6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kwordquiz/kwordquiz-21.08.3.ebuild b/kde-apps/kwordquiz/kwordquiz-21.08.3.ebuild
index 7a6c2b8e2b4a..d09855d45e2a 100644
--- a/kde-apps/kwordquiz/kwordquiz-21.08.3.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kwordquiz/ https://edu.kde.org/kwordquiz/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwordquiz/kwordquiz-21.04.3.ebuild b/kde-apps/kwordquiz/kwordquiz-21.11.90.ebuild
index a12cb54b3930..08048eb8e076 100644
--- a/kde-apps/kwordquiz/kwordquiz-21.04.3.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kwordquiz/ https://edu.kde.org/kwordquiz/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index a5caac411dc0..2baa3fd8ae55 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,5 +1,5 @@
-DIST kate-21.04.3.tar.xz 7283360 BLAKE2B 9520b6cffb284581aaa9bf70daad08fe5ab4570d433ea785a24d0c9122470c9d9d362026c3ea430924c453828001455a377e05537a83a2a81814df4de5e3cf72 SHA512 51c4023f3915edd348c1aa7ce448475f39c3401649510f89c7e17f9943739b67b09330e52b912794b31d4bbab1f94ed322f96bb45d450f016f84efa010d694bf
 DIST kate-21.08.3.tar.xz 7291244 BLAKE2B 190f166be207b513f3e2d723b08886fd70711ef1e409f6d52b7fb4ae8a748ce7fb279c081e1a758884622b05243e4bc0044c757a2bb5e17a141823009b8fa9fe SHA512 2977db9224fb5b49b3a210d8789fa5d644614f2a6ff72fa504337718f017f30ee209dcffb990d3aee8e1f322184e62195ca98668700a2d9becf4de9d9dda65b3
-EBUILD kwrite-21.04.3.ebuild 1450 BLAKE2B aea3eb896c07317db5893e179763e0c8cbbd371f9a28c2d45b9db644aad8878f3b3c2fc7870e685fbf8702a5db02f8edf62eceaab6298f1908a3d353a478bcef SHA512 efb0696e2ff7e13b9dd83455cbc5532b8161d0a97529bfe0a9bd41148a372ac0add05db8cbbf91be4c63a408250a197f3e9bb9cf9a52b2958b784fb8bfcc15ab
-EBUILD kwrite-21.08.3.ebuild 1460 BLAKE2B 018803ce64187f9642ee7383c5ae5776af6ede2aea15ef39389c4f030e848f3c84618b7cc5c015c4fe61ec730ff0f79d45e8d8e4cf1d37b127a6c229e45585ae SHA512 6f45b37551799c1a87bf9f5fbc388a7a2e2b17cf5fe6a2bd3efb4670f897fa3a8ed99843479f8a44c0388eede0df639e92fc3383faf6a334f0dd23aa45f46039
+DIST kate-21.11.90.tar.xz 7377248 BLAKE2B bc8df04f926662a08fb5613a231686aeab6ac6f1b28a3677dc7c7af1dbf5aa53191019039927ebc64ede5ddd97a7d00814075d373b52d2031f9a08daebed1662 SHA512 b173d6327e4efbfe0c259596188e960edb4589a86cd34db0b53040533f5a5ce8ee4232834ea8e2a347ddc0a80aed96267b46974e249b4012e22553924bd9cdfc
+EBUILD kwrite-21.08.3.ebuild 1501 BLAKE2B ff2a7eca01e3aaccc78eefa2608e08bba031a4092fcaa2aec4e7efd6f94c9d68ce8f850975f349bfb551226dba0602988685d2fd175eb0bd5aaa199fb2fa8eaa SHA512 873fca6926a1171be5c7705a28505928b329035219affdad400e887465db652226a1aca52eb76da14bb3f3df8a8d343b58d7760f7178c2ff7c65b443c2a456bc
+EBUILD kwrite-21.11.90.ebuild 1504 BLAKE2B 7e88f56a6987dd7e4e1ecb9befec09379bbd24a0fe369a9aa89507d80d5dac1e65ea9a258161edbbb5ae3a64f202baf300fa93da9dbbb867ebf61e63c22667ab SHA512 1365e369d616c123c1bdeb19ab79a0c2cf9a1385adb1e0c2f452416fa153fcfac511c3ec9744b71041a43d85b35173e8d1cb8d36a965f915b53a6d89cdd76060
 MISC metadata.xml 441 BLAKE2B 5571e5938f9e83ad9c62a30f809f530c4145bf0f24bea73155e32812397233e395ffd9930d178de4663efafb62138bcb8a5cac7b182dc1d75f3ecd46828364b1 SHA512 cef8e86019304017929f8a4cf2141e93fe171845a5fd86d4608021b4ac47e0057946f1160a358c78e55d4f2293bdcb5ee9391a165bb7878863e14d2c6b0491c4
diff --git a/kde-apps/kwrite/kwrite-21.08.3.ebuild b/kde-apps/kwrite/kwrite-21.08.3.ebuild
index 9c0f9c4a07ca..651d00d9bf74 100644
--- a/kde-apps/kwrite/kwrite-21.08.3.ebuild
+++ b/kde-apps/kwrite/kwrite-21.08.3.ebuild
@@ -14,10 +14,10 @@ HOMEPAGE="https://apps.kde.org/kwrite/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="activities"
 
-DEPEND="
+RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -34,7 +34,9 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+"
 
 src_prepare() {
 	ecm_src_prepare
diff --git a/kde-apps/kwrite/kwrite-21.04.3.ebuild b/kde-apps/kwrite/kwrite-21.11.90.ebuild
index d678aea65540..1b946369cf6c 100644
--- a/kde-apps/kwrite/kwrite-21.04.3.ebuild
+++ b/kde-apps/kwrite/kwrite-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KDE_ORG_NAME="kate"
 ECM_HANDBOOK="optional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,10 +14,10 @@ HOMEPAGE="https://apps.kde.org/kwrite/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="activities"
 
-DEPEND="
+RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -34,7 +34,9 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+"
 
 src_prepare() {
 	ecm_src_prepare
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index c2af5435df11..53c66f3e4956 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,3 @@
-DIST libgravatar-21.04.3.tar.xz 35628 BLAKE2B dee2ac47ada9f791925eb98385ef3d85dbe55f694454aa093572cf8d882efe8f70166f5bb04a70d0c3a5a3861b030a9022f2a07e71300c8deed67f9b55bf2405 SHA512 3477d1884915c0c157e565474d1c61a7ab5bcd3a589c94312e389b3ccb780888aa404d5bf76c6eb9363f1ee30f0f77f748aa0b5a8c835214134675a176daa028
 DIST libgravatar-21.08.3.tar.xz 34868 BLAKE2B 545b925a139ea71d230fbd43c179cb7a8a1a38190f811a227034a8263e7c9e5a4c970f40fc5cc5632dfcf0c67a38ba5382fac2b1a8faac164d76fc42f1abfdb4 SHA512 ce9c0414928fdc69c516fc18be379d14bc387b9ff69efa1eede5c95725874b898a9328bd3c6a212abe93ab122286f644c02cc6a30faf91144f21e9ab68baeee4
-EBUILD libgravatar-21.04.3.ebuild 822 BLAKE2B 2b3ba1301de14c3da9c9ca8df4cc316a6f87e42248b8aa9a0d4b7c45c6c25dff30399b58ba3336bc63049ac457850db447a24b5a03ada6e30ee9c0040f444513 SHA512 9922645279285ada008c8f129cbefdd505c6183f5781e514cdec038510e3e3d39758e34b2afaced2e6e11f351904e0c120c596a141700a32b0be3fd88ba29ce1
-EBUILD libgravatar-21.08.3.ebuild 825 BLAKE2B 3c00bf0639fcb6222fdd466eee9434c663a070320fdea0778228428a3684bf82690bed758640cfc224b0159e922470c9d89afb6601978b0e257c0c74c19af56b SHA512 f8fe81e7c686374da51107caadd75e733e818283cb72e041239ad2105ed6f752361a43682b5470708819f16e2f4260a6caa56fe3e4e5d77b02da2847f9294b25
+EBUILD libgravatar-21.08.3.ebuild 822 BLAKE2B e2a3f747a4f22d5030afdf65830be0e2274c74d60912e7c0a21dfe14c7a40edba2b68c4f1b4e1077e42317033aca4a603b7f87c2656ef9bb360b2e00416c6fed SHA512 17ea73018abce082a3b7e1cb91cac7defaa80ba9b81b67e9a18442b9479c5d06aea4a65df0a56ea735a67254d23dfa1421919ebfe60f85c6ac7e82213a926389
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libgravatar/libgravatar-21.04.3.ebuild b/kde-apps/libgravatar/libgravatar-21.04.3.ebuild
deleted file mode 100644
index da4e49e32644..000000000000
--- a/kde-apps/libgravatar/libgravatar-21.04.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for gravatar integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 624584 - needs internet connection
-	local myctestargs=(
-		-E "(gravatar-gravatarresolvurljobtest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/libgravatar/libgravatar-21.08.3.ebuild b/kde-apps/libgravatar/libgravatar-21.08.3.ebuild
index 1f245c50b8e3..03fbcc65721a 100644
--- a/kde-apps/libgravatar/libgravatar-21.08.3.ebuild
+++ b/kde-apps/libgravatar/libgravatar-21.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for gravatar integration"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index f3bc78a485d7..54d0bc369b15 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,5 @@
-DIST libkcddb-21.04.3.tar.xz 430108 BLAKE2B 414d6d6fd117aa5e6dceae349280a7920dea4fbcc14d79e01da1849a8da7c2e256cb8aa7eeb19bc5c545ce65ec8f7b3081bc420e9a15ba0ee8775f32ca8b6f70 SHA512 48df1dafd22fc323ab546f927e8a6f4059fdcd2ede5bfceb4b67014ce3d526a9f07a16cc66593c58575196a34a1d68a22882bcc391823ec4deb61af3fe09cd80
 DIST libkcddb-21.08.3.tar.xz 430168 BLAKE2B 72b8ca055559737b8bcd6bda86d0692d43a5986d5eb2302ccaea916aa79a76f635a445e731f424b0371cc0fb3b54361f2c0cfba21fb490a11e7829adf71ce6b9 SHA512 5a4a8729a06e256b6fe7c4677483e03218b1bd49f61560ff9e029a9df96acff1557a020f20a6f8c1b2919fc26148e00cab872627acd7e9fde6067f64965b2afe
-EBUILD libkcddb-21.04.3.ebuild 1071 BLAKE2B d57f0d78dc7db933865ba61338b7e3d2f0773fb9c50e8801e0f8495230a84fce21fb6f97454828e543cd02712df4b6514c9704091b7c63405168bc03ddb6087a SHA512 1455a061c51b45db9e412166b54f58cde921bdb6d50d9036552e0236160b1d20f4405b889fc1578901c245deb6376bb656966fd1a56f89aef3df26313bf9ac35
-EBUILD libkcddb-21.08.3.ebuild 1079 BLAKE2B 2e3fa9a1eb3e6034d81518d4865bb2962854ea285ff0947cce515a5c39911b1275cbba697b7ba643629f2d7d69c14a7b8df64377194245fc78da6617e3137c9f SHA512 1919544958c7081e81c5fdb5f6da4b7b127c28140ebc1ab5380cde16f65f34d78a7770e319a52a889e9bf6a93549cacc42e9a984322a4d6cf756255bf0790040
+DIST libkcddb-21.11.90.tar.xz 432836 BLAKE2B d14220e1f193c671c5398bdaa2ef41ab19f63edcc1ceecbe018a3337ec80aff2b72a050241d60e59415eb4df7eb7d03478286890cedf947b65778940a32d8e1c SHA512 16652f3746d40aad98914fef27cfdaf1e7e4243e067954797698d4c7a29d29997187d8e8904601260232a75c85a0af8b49e59d1ec7a08d06d19865dc1794b22e
+EBUILD libkcddb-21.08.3.ebuild 1076 BLAKE2B 28f2dbdc08b0927f2ad60fa4706d6ec2440280132f5bb4582cdbe55ef8637ad3c9ee5c0016ea90d34e129014e04e39c3cf5cea31c2c93df3c3a37503cf207228 SHA512 0731a428f36d5d3400db68085079913dfd67c342ec4b5426308129c85e79aaadaa67c15253125fca1ad02dae7447bca798a2c879e9ceebd1f57b268d2932b8a6
+EBUILD libkcddb-21.11.90.ebuild 1079 BLAKE2B 5508ec078dc1385f132c3ab95ccb28fc603dd1e7518c916076fa82b36d21b9260f7abf7546db204a719cf03f203e2dba09a14d20a169f03b0a8b9b6c56ce5016 SHA512 38e8c83e415e5ae4cf0cfd01723135b62ac4e22916e558e3ff563281efcee3b6b745d6fbd3ae369e25aacb537d50f6977bf22d8115ae92188d2bff5f7a492c5e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkcddb/libkcddb-21.08.3.ebuild b/kde-apps/libkcddb/libkcddb-21.08.3.ebuild
index e1f0c2327198..8747a6b3aaa3 100644
--- a/kde-apps/libkcddb/libkcddb-21.08.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-21.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE library for CDDB"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="musicbrainz"
 
 DEPEND="
diff --git a/kde-apps/libkcddb/libkcddb-21.04.3.ebuild b/kde-apps/libkcddb/libkcddb-21.11.90.ebuild
index cd587c3d549b..1de73b03fa0c 100644
--- a/kde-apps/libkcddb/libkcddb-21.04.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ DESCRIPTION="KDE library for CDDB"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="musicbrainz"
 
 DEPEND="
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}"
 
 # tests require network access and compare static data with online data
 # bug 280996
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_prepare() {
 	ecm_src_prepare
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index ea07611e6b6a..edfc94176cd8 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
-DIST libkcompactdisc-21.04.3.tar.xz 97152 BLAKE2B b91e174c465c4492afa703b7fd2f33d31e175690fe9565f845dc2cbe6888c0b5c326d1056b16cd25944af00138094cfd298f5a49e61aee7b93d4d210cec44ed0 SHA512 d41c7782740255ab5e641f22abc3b821506a0999be023cdfbe02faf081227255a4a53c6776463d8f912e268e8dd09a0c99dad20c842a8550085c499fd65caa9c
 DIST libkcompactdisc-21.08.3.tar.xz 97140 BLAKE2B cfe768eeb9d8b7f972d54d993563e94e6f20a1925bb196ce56e357f5f7f69ee65558b7e924a3b41b062495c66b04e5c93182e1551d114fc02312424a4425d50c SHA512 8265d2716bc5f3a871b1f9b3ad3cc995938a6dcad9f93aa4e131a2a66eeb9d85efe4bfa99294d7240659a29c6b6fadc19d7c821511fe9b025064c03c552b56ce
-EBUILD libkcompactdisc-21.04.3.ebuild 596 BLAKE2B 92eea6365edb08354d15347c61476c7cd17d7d74d864372f6c369f8fbc3e8fcfd7c327a800c8f6a872ca67ca4ded738ea2bba68c30a98b79b87b1c72d9386923 SHA512 2bd72be26e63d9ff69dbea80394bc2fa38a76150ab41b897402279653dd553e990e0a96f68061f762b17952ac7f746fba7c0ec54076eeda1bc20cace3953cf1c
-EBUILD libkcompactdisc-21.08.3.ebuild 606 BLAKE2B 292f0941e180b6237269f5fe232872c7d6b86552a09adb8358651f6b56a96c587527f9d864d9eb8792f682ff96edee58c20f8ee09bdb312bff9452bdc0306b20 SHA512 a8cac1bab084e2f7785b3f5f0cad45e6feef2110cbf896cb60da93abbebe7a7af7b728d3ec33194500eaff84b96b3ffe8f40b6cc0c598619d8d0b3f42c5a5a47
+DIST libkcompactdisc-21.11.90.tar.xz 97224 BLAKE2B 1e0c3868df7c6916228be5e9f8a2162137d3319cef56661fbb52e79616e11023ae40542ae4c05aec33d9c8f6a4c2fcb0d1fa43e5d1fc8125d19dd0dd6df46084 SHA512 50d775cfa2a87c11f9b7fca1c5e28e19c7fd2182d80c1c916f9bc9ab7643e1b1daf00d46d4aee545023c0657c03aa042ae5684e000141352e2edd5b76dbd4d78
+EBUILD libkcompactdisc-21.08.3.ebuild 603 BLAKE2B 01a3e6a0fdfb8bc0b958ac2018dd78b41c7c711cd5477f5cbeafb4d52e29c9b4febf9f215d0afff8711d33c4c9ed577c19835d4bc9b4fee4195b77a04c8df234 SHA512 a3625680de2fff5ae9bb36d3b3e370a61891e6049511679ab2f4bbb92162de8618fee268cbdd68bba7ba2d712da0684e06bad5b43309f8e7865fef9f5241216f
+EBUILD libkcompactdisc-21.11.90.ebuild 606 BLAKE2B 508fd09fe5a1bc834935ca699cf6cce2023f56f52d3bc98c9c00489f55686d036021b246b93e93dea1fc8a636bf07569c904c2b13403d5e9a425938a333f2cc3 SHA512 40dfb4376c57141cea5ffc1b0a3370612313e61598c0c5769d8cfa613399ffc9c91c8b149e98f43775139827e19a8e5e1ef7fcbcc28882c871ba59d3329f460e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-21.08.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-21.08.3.ebuild
index 2c0ce284ba2f..82332d7032fc 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-21.08.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-21.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for playing & ripping CDs"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="alsa"
 
 DEPEND="
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-21.04.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-21.11.90.ebuild
index 4124c42d88f1..5ff78c3624b2 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-21.04.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -12,7 +12,7 @@ DESCRIPTION="Library for playing & ripping CDs"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="alsa"
 
 DEPEND="
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index a2a09a8ff672..1ebb2bed17ed 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
-DIST libkdcraw-21.04.3.tar.xz 37196 BLAKE2B 22ba77fcd4c2e645bbcf9271f63271be34fc33b6e35210dce5532be32ce59789b31b171dd56a2b0ede86ea783265a9cc273cc76c5beb1a4a473a863536f21824 SHA512 a319fa7cb1b06054bd43201faddc251f9a35bc0c10d71c06c0e1dea8db90847c68ec20653373e69df9c2fde7f899d0ad62ef3635ded3aba8bb379594862fc611
 DIST libkdcraw-21.08.3.tar.xz 37196 BLAKE2B adc2148f3fd0e74619b7fd1008b9efe67bdfff3013373638c9337ef460719d481b76324b8ca04de7bdd2d48b1d21fc980f3fa12c88e5284ba71591f8ad5b5313 SHA512 207d3be458f1137fb617d916676a4bdb9241e323f4135231636a717e8d5e80b55b66b7de0d5048f3e8235fe22d22c29f59d1dd804f5bfa709a22f2217c541a6f
-EBUILD libkdcraw-21.04.3.ebuild 358 BLAKE2B 5c10569ee6c391389ed343beb5d26c64ffefb91eee8970f75d2469e247b7dbfd4075279b9d828d0057078680d8f0d6a0f46e3e3fb0719825b81eebf3a2b7ec3c SHA512 1e09358a49a44381be56393567f13c3e3263442c3db985c27ea4df851c4cff3839965571c965cd1d7d54e142ea691c458f37f8a80db183f4cdeaa707cde0da47
-EBUILD libkdcraw-21.08.3.ebuild 368 BLAKE2B 9f4172b6730abdc2c4a9cebb4189b1ef9dc58e2517eded689805d1cfe7204b79941853e4178662fce12752de5c6b0319bbf9377693515bfd5ae1277f51660b8b SHA512 49dc5c86aa00bdf94acb40df6dd62efb8c71747819e87a6dac47c35d92983a86cbe20111fcaaac9d48e9a4e0625b7f351dd2f2d4953721b623f1c6a280a56277
+DIST libkdcraw-21.11.90.tar.xz 37388 BLAKE2B ca0dfbf59c184ffc12ca8c2a0b40971c3f736b423e6b6bc1fa5f7989314d1c4af44cb03f71dd7ce6ffe4f42232879379258c83496bc9c3ae9d34fadc84764cbd SHA512 fc3bdaa36eef8591212fdd82774008490ab12a79c9a95cbcb2e9111cc471ee9b4dfd390cd1f76838dd1251944c2850ebb9f2ac9aec1cd529a7007ef5a9f7aca3
+EBUILD libkdcraw-21.08.3.ebuild 365 BLAKE2B 022ba5b21f7d997db2ded6e9802a5285f2cee2e9fbeb120f3e2e37cdde2758c5e4e14a69a78b00a09be6ce7c4a3c10d9e25f4047cbcdee1a1ce42692be79c6da SHA512 8e9b7b1ffdee20a2b5116a8e0d8948d905c2d400886276e1be5dc80a06df5cd3c9b9944e3c3aaa904b8bf4bca124708fcd49046a4a97f0ec30479904829e91c3
+EBUILD libkdcraw-21.11.90.ebuild 368 BLAKE2B 9f4172b6730abdc2c4a9cebb4189b1ef9dc58e2517eded689805d1cfe7204b79941853e4178662fce12752de5c6b0319bbf9377693515bfd5ae1277f51660b8b SHA512 49dc5c86aa00bdf94acb40df6dd62efb8c71747819e87a6dac47c35d92983a86cbe20111fcaaac9d48e9a4e0625b7f351dd2f2d4953721b623f1c6a280a56277
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkdcraw/libkdcraw-21.08.3.ebuild b/kde-apps/libkdcraw/libkdcraw-21.08.3.ebuild
index d8ae4a35f433..73937d0b6d43 100644
--- a/kde-apps/libkdcraw/libkdcraw-21.08.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-21.08.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Digital camera raw image library wrapper"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdcraw/libkdcraw-21.04.3.ebuild b/kde-apps/libkdcraw/libkdcraw-21.11.90.ebuild
index 6bc5b767cc2f..d8ae4a35f433 100644
--- a/kde-apps/libkdcraw/libkdcraw-21.04.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-21.11.90.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
@@ -10,7 +10,7 @@ DESCRIPTION="Digital camera raw image library wrapper"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index f1df1fbb47e2..7c4cffb58c1e 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,5 +1,5 @@
-DIST libkdegames-21.04.3.tar.xz 6403228 BLAKE2B b6b14dfcfee44ad65a58c1ab5bcd975289b86bc8dc7e5cb7867f5d0c0b8e508b620a568840dc2548b65c33c2e81b76a32ff3e411ffa669ac6bd9cdd79c2aadce SHA512 f50b20e9c62f80ab76e87ade191ab45da06fe4113fd2f6a431b926a7d6d0fd6f111258ceeb793dd2f6831f88f2ed436355911d7ed6ce6935d2de65f56cb82111
 DIST libkdegames-21.08.3.tar.xz 6405504 BLAKE2B 135170d4f9c12f0c937a6aad62803fced08f6506f4aae139304ef2d52423cdeec20a047958e661ba9d46cff8fc0e3c3532aaacaf604c30dab735b852bbe64d96 SHA512 da24c906cd664fe83a9b9f7d3c2cb6718014cda49c878c8431435b2d201b31cb9482704f49764c31a198478b0673491ee78884394b930f01b3ffe70b6472424f
-EBUILD libkdegames-21.04.3.ebuild 1470 BLAKE2B db772728d6958387230f9cac278baf11c0c7d43ef7271c0c2f983427648336a4729a19bf761a44f18d9bf4d07bf49fef19bdeaa1404208bb9fb75fd62b202f9d SHA512 4a8c38b400149e02671113d9f16b5459edc8f4282ab41d570a057a0ea1c90b480447fdd121d344cf3f52017098434541c115e531ad57cd78c66bc439f9794ecf
-EBUILD libkdegames-21.08.3.ebuild 1480 BLAKE2B b209c1261863098efb94aecfc278f13fc23e993cac7c195545d31a20b1cacbc9e115b653038115ce46d29af6aacd97fe6cc6c30c2dcc00210b2cd3f7bff7785b SHA512 56e67576c49f64055319051ffe21f5bfc4145cf7bd63af95ce442e37ff856648bf03a2771163cc96b512febf9a085c80b5ccafdeb0870b7ef7fe3b3d158760ce
+DIST libkdegames-21.11.90.tar.xz 5949068 BLAKE2B d089b45a6a81d52e7479a55c8014b3bef619300b5a614c7941c6f13730a7e6059d2858dec9abf23e91bc29ee061b4859dc9e6b63ba48b3dfd82c113d4efbf44e SHA512 4803708cc27086d87a283e555dc56a8ac1b62fb09a07adb568ed39f1cdcf7088f0940fbbf9bf25c4252a3e940a6d186b5db4019d16d4a25231b07502c317e5b5
+EBUILD libkdegames-21.08.3.ebuild 1477 BLAKE2B 463c5df465f2212650e1f7b68466850d9d55568de514787e38314c182a6f9a6112632e3f4bad2f2a9d125867cd6988d8585f99f8ec2ad01618c2c67370ef836a SHA512 b8a411f59a9d3fdf4b7d3a0a59add7b7dc90666d61cc0b36dd63533253af1b52f2736dc9ee4f9b8a59b3ff3d3cc9d93731ba74f8cd05ada3bb269532ada8dd91
+EBUILD libkdegames-21.11.90.ebuild 1480 BLAKE2B c0255f6e09c0f728481c0bfed8a397c02a8bf8bbc33a13ba0ded452fabd9e2f1b746b5b5baf5645a77784a5324981507b889c2df289dd23e61e264606ecfe63f SHA512 544ef21cabb8c3cf1080a56918eebd42e9d38bbb5c54d0dca3caa459471090da686c2c1c1e213c8654821080c6fb7fee74957ef8b8f5da976cd84e14fa18b21a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkdegames/libkdegames-21.08.3.ebuild b/kde-apps/libkdegames/libkdegames-21.08.3.ebuild
index b519676e2d3c..69813cf08412 100644
--- a/kde-apps/libkdegames/libkdegames-21.08.3.ebuild
+++ b/kde-apps/libkdegames/libkdegames-21.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Base library common to many KDE games"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdegames/libkdegames-21.04.3.ebuild b/kde-apps/libkdegames/libkdegames-21.11.90.ebuild
index 52510a5eef33..debd0fc157ac 100644
--- a/kde-apps/libkdegames/libkdegames-21.04.3.ebuild
+++ b/kde-apps/libkdegames/libkdegames-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -13,7 +13,7 @@ DESCRIPTION="Base library common to many KDE games"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index f6f298a404d4..1bf13193997d 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,3 @@
-DIST libkdepim-21.04.3.tar.xz 253924 BLAKE2B 13324c2e931d81ccf8a4970551f636654c9ebbadff353ea33c5308c61838d6575cf5924a693f65c984bdad66c4d78fd6e73e1ec5100665f5b5e565843f090848 SHA512 79cfe0aa5095246d407d697e05916878a74cc021368f4385ecbd4c92dc87a43b8b001ace84b3f40752d549de1940f65acfe709da4171e2a3a21a9c335c090bac
 DIST libkdepim-21.08.3.tar.xz 253248 BLAKE2B 907a6fc0dc6911fcc34ed6f3e6df2e01a39b7c0d7f946a99605e65b06bbceee549edd4d82ac588d79a19cf82195b6751f7c3f40613db356fe101cbb582ed5a5c SHA512 37cb530ea01f1cb5d73e69c92dacd5daa2ed543d7a13fece26ae920276dfccd4c66c61439a8d4a1eb3cc6261de34def294004e7a1cb05f7274768ba30acd555c
-EBUILD libkdepim-21.04.3.ebuild 843 BLAKE2B 375b06f30ee8390568d59001d5c5c15335e05d633cc6dda171af2335b867efaa27c547e3c981b8ca5f18778e9c661047be65c76bba456231346821ce2bc56863 SHA512 120da55d3d3e8fa85e189117301b161292e66303a6f5a5348ece0da1313261a0be294273c3fa377ad573238938dd4f60fe58ac15fbc5ca6a9171fd3d21727868
-EBUILD libkdepim-21.08.3.ebuild 853 BLAKE2B 2a74e3af8a85c36f9f2854a12ed3b304bafb6bef37db848e30461e51a34493b07573590ac12762440ba6e4483063cd16ba512f814731e688f8bb2b4b3645a70f SHA512 a64d80121687c79d3aac9bc21b1469568a4dbf23383340d923146d4c429d5ebe2ac4042f45e6494e3f9b8e93fd86eac1ef3941228dba07d028c11a06d1690118
+EBUILD libkdepim-21.08.3.ebuild 850 BLAKE2B 849c0852bf1123c1c078b6edd34650ce98c8ae10e44fc9aca14302b3c3bf2ea8d497a123cf090f9d5665e760099eeb211e3673df7fac2d480347dc70577c538a SHA512 cb3f47f9b906aa9d94ba2d4b2e57737afe2cfba2767da950b3d42de9516d1c09dadaf95019c24543f2d5b0642e59fea749c7d8affcdd2e77ef880dcd258563ae
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/kde-apps/libkdepim/libkdepim-21.04.3.ebuild b/kde-apps/libkdepim/libkdepim-21.04.3.ebuild
deleted file mode 100644
index 3ecbaec51e3b..000000000000
--- a/kde-apps/libkdepim/libkdepim-21.04.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/libkdepim-21.08.3.ebuild b/kde-apps/libkdepim/libkdepim-21.08.3.ebuild
index 8faeaba6c004..6b7b3ba1c970 100644
--- a/kde-apps/libkdepim/libkdepim-21.08.3.ebuild
+++ b/kde-apps/libkdepim/libkdepim-21.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index c9021145bc3e..6b3dbc3eb47b 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
-DIST libkeduvocdocument-21.04.3.tar.xz 217404 BLAKE2B 5751b9c6ed0cb7242d4a3494b3746c5c02bbafa5c63338c7ff6395e58d8eae5035687b3690e28ff34b9642c43280229c0012f24c5a60a3799d4770e1dff45bcb SHA512 24362a485cbd4348a40b2d96c51756ce7f962ab7e3c156d68fe1026f83e70a23f6c52907fc10a4bd74d4eac0ff7f2a9163bc03139d820a61c142e40855ff31b3
 DIST libkeduvocdocument-21.08.3.tar.xz 217744 BLAKE2B 7bfb16349196b78f61a542723d470ca909f63ed134887d84790c2f20fc5949ce08613a58d3eb296aa714acae682f0df6216a218bce5f3b3c39a34d58511f3825 SHA512 4a2d1ed17801c8dadbf45111b8f6ab4ccdc0edf1e9395e9f2d5ff0463fde40b4d65b81e701fbf1966755e2b285f99e2b3b24964857dcba553c7081e88c065fc9
-EBUILD libkeduvocdocument-21.04.3.ebuild 505 BLAKE2B c00e867ef1f4fac957f459618fa2557c4376dd2f5826d434b2aaee9db10f51a86c9c2cf44df2025f9450e1e83052a0fb2765dd81085a4e383666d777dcb46e38 SHA512 78619833ee68cffe5e1dfa20eb90c61e1c2be673b5b2354f4228bd713c07910edb8ba3ed8fd84f8390d349c3b7c0142b432993fcca6ffb9ec4dbe08e5bbfad29
-EBUILD libkeduvocdocument-21.08.3.ebuild 515 BLAKE2B bdbed2b3678e13c0f88c7446276d782355e8619730bf144c7d89a164bd5059c79687e3764219e2bbd2ad83737d531985be76f5d2b2cea59c83c7f1bbe282c712 SHA512 d349202162523c8f7fa798e302e2c47be37eb4d7ca53790d2cdab9cfa3c4c64c0a781fe7d86675af04f355ad63af7d9d49242ef8ba9d8f568312797678cc120c
+DIST libkeduvocdocument-21.11.90.tar.xz 218004 BLAKE2B 665e8d5cf3331687ee3549c14a568c3a50487a84e4d12d68be4d3094477b4fdd8751b48a4fa485ece06c758e206f2eabee442e00a0650c3d85458ccf20f72a0d SHA512 841e7a27d5fd419f86b29adca3f8cd60b20a75b7bfddb9ae2ea96e44bbf15bff68065b1f8aa5ea11ae1380427c28e882f5f6178f3a2c301fe95d4caa2f4214ed
+EBUILD libkeduvocdocument-21.08.3.ebuild 512 BLAKE2B 09ca099f7e2cfd0c08bfd653c36dbbe370d44f75a1a0b0dcf18523d30c8a78aa2775eb8f00935fb7570221a046c754bf222988167c34700c17864d8225cbde0e SHA512 98183e16383ce4f745cc5afb79299e5d25d3ab40c280607ccc7322aff31f0ba6338d479fe01384d829b85b7319c1c5df181e8cf4218241f92f50eff359eb888d
+EBUILD libkeduvocdocument-21.11.90.ebuild 515 BLAKE2B db6a6a83f553a0b5cb3c762f9fd6951669b4395d97396c3a1e5dd8357d211c81ed0f5816466e899cef5f2f0bfe7c9036766fa3f4bfa2d181e4d9dd10f87f283c SHA512 4d6bf5ff344b7b421ed34fc423a832c07cb693a045655777deb578b9545cb227bd675e88001887342ba237d35fe6777157d890300fc73d545d62bb544d11b746
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-21.08.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-21.08.3.ebuild
index c4de40cb9646..c5f89b8985bc 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-21.08.3.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-21.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for reading/writing KVTML"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-21.04.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-21.11.90.ebuild
index 1fd436e36f17..4b7718f6b097 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-21.04.3.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -12,7 +12,7 @@ DESCRIPTION="Library for reading/writing KVTML"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 1aa7389bb2bd..a330beb90f17 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
-DIST libkexiv2-21.04.3.tar.xz 60268 BLAKE2B 1f6210e20a701d87250b465658360cd5fadbda006b9604844c5af76b841a2b25618712c66d934d964695cc83952c346a4f9c2439a976ef03b1c7767ae3945a45 SHA512 0295c1b88744f350846ded713943733de6a0e1d4b2d92a09e1a44af57bb94a62e63420b9c911dcf0e3ca89e7df22a3424981ee38d8f4a299cdd437ea3f12bf6c
 DIST libkexiv2-21.08.3.tar.xz 59404 BLAKE2B 75eafbcb89535b0ca6a2d587e404cf804af87980a630daa3ee98f21048f19bc7df5d351dd30a872cb583302693210ad0d17dc25aab4793c9301927e4e72302cb SHA512 918dcc79c100464b6fc7482f0ede6cf533ff1f5c702d53e5131f13d02a825ce8e49f9fddfd0025004b3df0f9477e43de02b1c0335c8e8d55696d663b6eeaca9d
-EBUILD libkexiv2-21.04.3.ebuild 354 BLAKE2B 58e5e1fd50812ee00c510086a5d6cbdb6ed59b72b7ba62b18740528225fbb4dd0de719e0d0d28949f6b9c8def55b2472c78d27c01f452fa956125ba4faa6475c SHA512 ab11ef2335831ee5d900e9325ca9221b506e1785dbcf5b72851d069983ff67cae4f301e6dc56bf2c18c227a97543089f8262bd02ad249fe9b8498dd54b8ea52b
-EBUILD libkexiv2-21.08.3.ebuild 364 BLAKE2B b493d54e32fccea9fd22efe5e586174655cdb75380c52dd8d7adef77395a52c2c941b7d1a9b53fbd96a352f4f20de971ea3bf6ae2648338b126e103bfb1ed18c SHA512 e98a07b09b49e867eb96f9a93f6452a78df3084f92fa07a67b292c51a00b1e6bb8937ea77d36197af5896ab55f436c5b368b9c586a4c3243e0e40039c7b198bf
+DIST libkexiv2-21.11.90.tar.xz 59552 BLAKE2B 02731d5619ef22849225cd83980c87a5675c9efd4faefe80bed12e4cf74a71077a0a734641d854cd79f44d4a3d3cd65ba5005e081fa005198588cfdb92256f1a SHA512 c609d348a7456d8308f699ff1f666a25a22b4cc813592f5774ba1af15bf50ab14433ad9910bc98128887e23af215c50b52ddcf6df4f5201ec50b40048c18c0ba
+EBUILD libkexiv2-21.08.3.ebuild 361 BLAKE2B 9d71562148f813dd8bb5779786c5cccf3304803224ccc27ba055f8896f009819ab4cdd31b8c5da9e38f28c6104410bf4f99495e07a4583e72f6c5fee3c72285d SHA512 a959f8c7bee23d2ef18237a2d4f331e0d09c9cb52bce5606a5318f086ea733ffab2ad859a0396eb9a2de11fd0cc43fb6cdaee9be4fe04cb4d631c15a3b18e8d8
+EBUILD libkexiv2-21.11.90.ebuild 364 BLAKE2B b493d54e32fccea9fd22efe5e586174655cdb75380c52dd8d7adef77395a52c2c941b7d1a9b53fbd96a352f4f20de971ea3bf6ae2648338b126e103bfb1ed18c SHA512 e98a07b09b49e867eb96f9a93f6452a78df3084f92fa07a67b292c51a00b1e6bb8937ea77d36197af5896ab55f436c5b368b9c586a4c3243e0e40039c7b198bf
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkexiv2/libkexiv2-21.08.3.ebuild b/kde-apps/libkexiv2/libkexiv2-21.08.3.ebuild
index 892cd34a72b3..d8704a29a6a3 100644
--- a/kde-apps/libkexiv2/libkexiv2-21.08.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-21.08.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wrapper around exiv2 library"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+xmp"
 
 DEPEND="
diff --git a/kde-apps/libkexiv2/libkexiv2-21.04.3.ebuild b/kde-apps/libkexiv2/libkexiv2-21.11.90.ebuild
index 81813f956c9a..892cd34a72b3 100644
--- a/kde-apps/libkexiv2/libkexiv2-21.04.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-21.11.90.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
@@ -10,7 +10,7 @@ DESCRIPTION="Wrapper around exiv2 library"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+xmp"
 
 DEPEND="
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index a4f8cc35c51f..635bb5f7db7b 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,3 @@
-DIST libkgapi-21.04.3.tar.xz 249512 BLAKE2B 06a43e967073057914a7a5d679b2c3c3bb3fd9171a49f773ba3b4d75a71807869766f5aeb6003d1d797f22fd0c0b7be4dcd95f580228d6909f05158206706d4f SHA512 24653e1fa0b5c31378d69a5a3e59d83c82d4e3d12469a062318a4140474a555a71b873291edf6313acf995cadf46ad2581cb8017abd2223b125d31c9a124bf8f
 DIST libkgapi-21.08.3.tar.xz 247684 BLAKE2B d01e2481dbf89af282da2a604156e21e6a87a827eca56f2f68bed3af6febbfaa11b7f4ee3f500dc9972c45eb78da28552e2e6b27912ddc8686e62424c91d4bdf SHA512 aacd08066d014eb90ef32413876a6bab42a65773fa0447aeab11bb87fe2b425dbe09abf37a4374e64d24f5ed864f0a14d7c7dbe4a221eca3e2b492ccb566bbd2
-EBUILD libkgapi-21.04.3.ebuild 760 BLAKE2B 8b3f6ebce13d7650a0b2e3ca8b8893137139336a258b5fb86494eaaefddd89366dc364b0f693b3fec555cacc4bf6a8f019bd0c40c8910f3a4ebb836ca569933d SHA512 6777cfb9f7556c1abdc50f02a679d2db7ff788a22679a5dbc4e47a176efcc79baac13cd22abc114c6e337a6911cb2dcda77fdaa41f0de0a0bcf8d379d2459f9c
-EBUILD libkgapi-21.08.3.ebuild 763 BLAKE2B aa37af939241afe9a6ecf7d183b1176bb9c22f2ce358e1fbdd4e9b1638b308508884d3e6ce179d8082aa74113b6bad74f4c8144a861386aaefd83f844288e32f SHA512 30533b1724370bb3568ce79434e640f0994ad4c45df10f6e5f7c6919d674c9508076243b6bbe0b646c801ffefc2dee903c91e061492821be4f7b43efa5542148
+EBUILD libkgapi-21.08.3.ebuild 767 BLAKE2B 9b293c4734357f27fe7836cd52f62fb7a6c2257a60fd0f825e306a91755b14f8f2390944e43a641ef87a61e07a31c04cd3ec09137d01d3106f4bd2d846622fbf SHA512 b7e39ff649ca638318b90c93cb45751a64e278f53dfc7d9c52903c32af795bc1f04db980af5cc1f7d3371a547c9e207b5b4c2b16f2ee59efcbf6a2fd89ff3453
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkgapi/libkgapi-21.04.3.ebuild b/kde-apps/libkgapi/libkgapi-21.04.3.ebuild
deleted file mode 100644
index ce59c664328e..000000000000
--- a/kde-apps/libkgapi/libkgapi-21.04.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	dev-libs/cyrus-sasl:2
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkgapi/libkgapi-21.08.3.ebuild b/kde-apps/libkgapi/libkgapi-21.08.3.ebuild
index a77783ef0af5..d948e288cd46 100644
--- a/kde-apps/libkgapi/libkgapi-21.08.3.ebuild
+++ b/kde-apps/libkgapi/libkgapi-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 58543af2807b..32821b571017 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
-DIST libkipi-21.04.3.tar.xz 103416 BLAKE2B 9459a2d9d2054ca53e2ff224334c4eedc5601b23c84b150a6dff6e4f88b25285315eeb9a2cc1d4e844c95d545368e2e98ba10d9f614ada9b4f206fe9e3abcf66 SHA512 5f94cf57da4578d2be02947b7e67d7e8b580757d78ce7de5fc08698c9a8dda2879af3486d0f40504a25b40b51bf18658f39b3ff38e4ebff33aaa18a249983a71
 DIST libkipi-21.08.3.tar.xz 103388 BLAKE2B e83ab0be1e6a32991b448254ca85b15c0d4afb809dce3981322e2f02b93c6d473175c129ffefcb075757e499c7deab1a5772516ba2d79fdb196b01e899840a12 SHA512 07a717cc5a28d79f3e3aea7a2d3d86a46b6c83efaa00e2fd3f723a619305848091e944fd937b595b5ec65e9b46177839ce9b9fc46f5d1125d51d6ceb8c904040
-EBUILD libkipi-21.04.3.ebuild 569 BLAKE2B 1e9576c86b58dce1092f453fdc1a9780c85cd99bb2b1fcbf029fd00d49f166578dface45a89a9b8e2e00a6519e3a7c7dbda296d0b818d05a985104b1c928c5ce SHA512 63675645ba6f3b257194713b0347a8c91c9da7257b8b215222b6261e6ef521fce19bdcc9dc68cdb17a4df36d586d8d04a976aceebce17fe3db21a710659656d7
-EBUILD libkipi-21.08.3.ebuild 579 BLAKE2B 6d5a3158aba9ae550310bf50c8ed1736da2410c20cdb2d495254f96d4bd37e441b3470da4e5c9947e2a66db0533a59f4d5e4a16f28dce53a753bef7a895a81bf SHA512 0fdcc629dd9864c517be201bec8174d10284ea50d68ad42f21b55a2e4d8ac6f25db977d9fd8f843caed4d5e11d6e5723ca917539d8e8d74a608d58532062b644
+DIST libkipi-21.11.90.tar.xz 103612 BLAKE2B a057683e7fe52e35becfafdebee1aa39ef64e014f161df05fb4272947e7ffc066927dd519d8314eee7924dceebdcc382b9e5894f67936a392f8b4cdb93f477e6 SHA512 4427a2b43f9dc8a7b31c0e01606f6a14021219cebf22edc031d2422edf0c9d648889d4f0d0a62380132807aafaa3a2bb542bf7cce8cf7c99232b757b97f279dd
+EBUILD libkipi-21.08.3.ebuild 576 BLAKE2B ff37ca5e9cb6dd3a718c5cbaff804df809637d61281b1178d426c3c90e8f4d349ce2d88dacd750b624da3cc2afd2100e0c9d9be468a0b9748cfb5c0d2adc8643 SHA512 f7c345dcb33fa7f532cd1b8f1ea0c5ace95cd450e882da6ec9b5ce299a82ebeb83f6578ebf2344cd596424a649633f1b3e4419e41ac4e1e06d37b7d459d37038
+EBUILD libkipi-21.11.90.ebuild 579 BLAKE2B e515b3939e78ca85a38bf8e23206be83e100074f49b351013d66c89610f337cf9ee92847e7b123d22db4a8b384e1053c9931298b311dbddc805421f55748b7d9 SHA512 8300f02ecb73992ada9d531a46228f763f621faf75f859dfb9fa1a2f9266e79b4209bea54a7c53eecfc9db02480abc4097bf42f8c42729163da333d7dfdefc03
 MISC metadata.xml 404 BLAKE2B 24710d877085b368710aabf95dea177ead34e57c65a05151d175f81619f0971590a7d96b5652bc0f4ed4f23824691b87747158bc560a71b54aaea5a9f0a9f0f9 SHA512 a58be61cdc1b18719562fe512545c339ccadf8b38c37339867b81f66a5af567436e2548e7d362d1a800da3be536fb5ec53690d0cbb6656350a70907a3eb19ebe
diff --git a/kde-apps/libkipi/libkipi-21.08.3.ebuild b/kde-apps/libkipi/libkipi-21.08.3.ebuild
index 3f84d324c945..16f8aec6966a 100644
--- a/kde-apps/libkipi/libkipi-21.08.3.ebuild
+++ b/kde-apps/libkipi/libkipi-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A library for image plugins accross KDE applications"
 
 LICENSE="GPL-2+"
 SLOT="5/32"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkipi/libkipi-21.04.3.ebuild b/kde-apps/libkipi/libkipi-21.11.90.ebuild
index 9779ddfb8fb0..928e92366d38 100644
--- a/kde-apps/libkipi/libkipi-21.04.3.ebuild
+++ b/kde-apps/libkipi/libkipi-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="A library for image plugins accross KDE applications"
 
 LICENSE="GPL-2+"
 SLOT="5/32"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 8bb11a7bc3ca..9951cc5a84db 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,3 @@
-DIST libkleo-21.04.3.tar.xz 384252 BLAKE2B 7ce806619ca1f83f3fda727d219e58d34234afadbca38ad8540c0fc298632202627167a6feb446f0e658428f3db3a914e92f05500f9593a4c8a6cd5f802e94a6 SHA512 3f302d11ff884901c880d9732a06128ddd22cf525b0ce9f3a3da179cd9543b8b3878fb508863fb4aa80f8591120485da08e5b55f7de4da9faa0ea50ba7d1628e
 DIST libkleo-21.08.3.tar.xz 437532 BLAKE2B f14f669e9d35e905a56e13023b211a627a649fed2053eccfdd103a7cf8f24ae8dfcaa74a824db79d2759fc3a151d2a6b284a60104606dd5a7560335c8f2eed9a SHA512 f417c5e4d98212879eaa60a45258ec6eb58193756aa2d0938b152f9afddb2a27ff4a47d18e53262dfc2a15161441c49c14d8c4ac8644949b7d3fa4162c329762
-EBUILD libkleo-21.04.3.ebuild 960 BLAKE2B d2597a0fe140464064ae3b88ecd8926a25440e6d37b9bdcd2ae810888a2fb318e9dc96058a7e7e6676069332607ce13d25cee3177e6169e1d6be4b0e355073a8 SHA512 1afab333cff1d3718bf68915dd2bcefdfa52ee0c31adad2101c4a6a274d8896f563baab892f6f9fa5c72e6b0b0aaeed6a5405637a4d57672cc7dab4b7290b682
-EBUILD libkleo-21.08.3.ebuild 994 BLAKE2B 733d90de2a8a58b882f8b0a609e6aa714fb1590a8aa9c486f3388e485538632053aacf66365c8d1f83f97c9eb0f09de07c91f8dbd58b16158d4dcb8a3c5f0611 SHA512 e1fda3e03679816959038f28c40d4551def7f164b85c3915b41c85e656f637e6c0e68b24de57e20e57ee8285c7c71314534ef7e0510151f2c91658cb72013973
+EBUILD libkleo-21.08.3.ebuild 991 BLAKE2B f236c006364cffc70fd08341d586eaf782b1e9a5e2e0d1ab91bd16deb7b8786b1ee70a5bcb380f89be45ce51161d235a0daf2fe921fa67c1984d716c29649f9b SHA512 8753873ceff78bf548a5473ef4563cf1173bc93123672ea4c0e95a7f7718f79140f5fdda7de135df50f979414d31831d7345b939b141488100cf289f7b780732
 MISC metadata.xml 437 BLAKE2B 57e3ea17650e5e927cd94e1750831dc60748f4bb46f00e4fae9a548a24a5d187636dffc4f095a60e28b7a1647000550ceb842af4c33ec7d1285a883deb1f194e SHA512 8d2c898901d0afd275acadf8c758d91a41bbd0692c7f311139f51cd6962c6ec95bd44e2d689f02fc59b8b9ce13fc28e78a7d0fafe7902f9816b09818e0b6b4c2
diff --git a/kde-apps/libkleo/libkleo-21.04.3.ebuild b/kde-apps/libkleo/libkleo-21.04.3.ebuild
deleted file mode 100644
index d5ab012a8321..000000000000
--- a/kde-apps/libkleo/libkleo-21.04.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for encryption handling"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+fancyviewer"
-
-RDEPEND="
-	>=app-crypt/gpgme-1.13.1[cxx,qt5]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/libkleo/libkleo-21.08.3.ebuild b/kde-apps/libkleo/libkleo-21.08.3.ebuild
index 6d5c1c66dabc..95886ee3a146 100644
--- a/kde-apps/libkleo/libkleo-21.08.3.ebuild
+++ b/kde-apps/libkleo/libkleo-21.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for encryption handling"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+fancyviewer"
 
 RDEPEND="
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index 475d419e044b..b4861fb3affb 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
-DIST libkmahjongg-21.04.3.tar.xz 1682112 BLAKE2B 284c3595edbd06bbb693d3cce2b068d8e722df348c83e423d599dcb1df2b057b2d47f0720ba9bab1a4388f966ab8ada77d820f5406971be51f10a565ad7a3810 SHA512 30b8a488f2dc50538ce0177807d5982826be121cf36fb5134bd94e9df66babdeb532f80a50abf2caa250252531fe3877c599f28c660c6fd674a8cecf655971ba
 DIST libkmahjongg-21.08.3.tar.xz 1680376 BLAKE2B 9e028935899eebd355082cdd248e535a89f6f2da76853a7b47a500c1fc584a6946706fb53ea2a15c5ba421e01afd1369a78154aef846adabea7819d82947f554 SHA512 1b94aaf73b05c57f80da0253f60cd99d892ffbac51d8fa7139e718a29490d7b0773f9da8846ed0fe460c37b1beb54cfc4b09efe0eba1ab194cd70a43832ea1ef
-EBUILD libkmahjongg-21.04.3.ebuild 652 BLAKE2B fc29ad67241f517877d405d6b549dc305b2aaf220aea4909b0cb61117315d67bb314eef7329ec37f86494d2bbb6036d16205e87a6a0df07ae59acdcc37add02a SHA512 9bba815c882dc802f319fd387767691629f0717bd69e1dc4d96df1950ae5e87513a806a0f5faf7d7192a8ff3d40385d452915463658e85dff6c94238f205a937
-EBUILD libkmahjongg-21.08.3.ebuild 662 BLAKE2B 95953c94414e73b03596c6891cf22e872c5ba78a832263b549fdd0a09d0824ea7230390aaddb7c9a18366ecf1d74a1ac85b25b8bd41fbd1d5d2668ec30cd8810 SHA512 a1ef115b6e039081bf40a61c2b0082f27628846d7139956d1101cc405724aef2dcd530605fe1e5e5855fbd4eb3bce8dfeeb4bb1569353c17f0a451b8ec31a0d1
+DIST libkmahjongg-21.11.90.tar.xz 1682892 BLAKE2B 0a030dd9a5f3394e7fbb423c406d75b5aa587f18165e3a27bb37d19150dc6bb2e3bada492326f90ac07281ba669413f34192a54fef8e66066ef0860d24dc5547 SHA512 c749595cff96d25028b7068480a71972b54796c8326baeee59f28a66f0947ed48d385cae05485cd603abe3fd3d89b4d7b54ef36f93dbca5457a430af09eeba27
+EBUILD libkmahjongg-21.08.3.ebuild 659 BLAKE2B 3ea4d25eb08b8569a37a368db320b951b8f7f12b6076a8af3d469bdbf66d1c866c8b2f062fcec423241f2626f162d46843b30911a1fa72dafe1487da263dbaf1 SHA512 22b26b8d5e49472cb4171202a553ce8f930c3cb824bff6f97fb759835c2187be92cae0f9c530cd3e1fdbea7b8069ffcdda6ac59f641ce8b7d286b58af91f2214
+EBUILD libkmahjongg-21.11.90.ebuild 662 BLAKE2B f5abf6e59a9ccf8a2b1a5a4440dce0d43ff1b87820430af7837236576b51d61270eecf2b21543c55662e1b9eccee2a7f52f53fcc0200e7a3f177d25f27effa2e SHA512 5a3461c32792eb6564dcbec0c80b3b0d6e2706e184a4a3cb0bd1dff6a0b07be88f6d61d864ba0bac0fee392c62f8add0e83d266a5b99ca3d5c0c8bfa4bdc58a8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkmahjongg/libkmahjongg-21.08.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-21.08.3.ebuild
index b91be4cbf7bf..f610721b3e41 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-21.08.3.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkmahjongg/libkmahjongg-21.04.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-21.11.90.ebuild
index bef2bafc79c0..296589366b00 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-21.04.3.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index 3e58e886ef63..22fecdc1ec78 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
-DIST libkomparediff2-21.04.3.tar.xz 172344 BLAKE2B 91fb20a0dbb69b3468092fc04026edbe86e0cad1c921638b6cbb2a05696c1fbf79e9b91844e492a7b2d14b3451f569ed39fbcbf5b6725fd0af7fbd0c647995a8 SHA512 51b7f092c154ee557a512045a43fa83229da5586911ee5c6cafbcb679a69d74d2fd76079ae91145465e6ed52559cfc70a22cfde0043db4a14f890d8a2818dc7d
 DIST libkomparediff2-21.08.3.tar.xz 172420 BLAKE2B 476242adc14aa64bc6cb42dbd681e2461e59501b04e59663b8e909e1265d41313e95954efa4d5f076b79624943aba6e781d7bb30efd76737e503d3e70fc09d95 SHA512 02f02c7de6f00204de3db9090e252e56bbfb22940b7d28d148e06624f4411a874adff87ed718f003eed05eede73f2c03886d14ffe03c5f3a7846b96d22352907
-EBUILD libkomparediff2-21.04.3.ebuild 660 BLAKE2B 70bc8e16e1d8cfaeac091a8995151ea86ae1739dbc89b7ecc06714340f02f49f1c1a365802371c9d9644732415b129e2629f9da37d92b15ced261fa7f1254568 SHA512 e0e88bc16b4b89c7cab7d5f581adc81f2d37d1b7817219aa5a3011527038eca1a9326865acf1434a420014f672e0179e7a93cb8a76d2fffc995352cde6795b33
-EBUILD libkomparediff2-21.08.3.ebuild 677 BLAKE2B 40fe549334f9e602dd42b565dd0795d22ff14ff869eb03dbab01ca70282253e49fbf49eada2758c38a61bf3b226ef843b48031c31418b6992f77f3923b4d76d0 SHA512 04afbac36bf418e9fb5be0ac3f3fcde5ce774c123e922e05cc1665758be28d1c21c75c07a11a7ace0aab058876a594be268c15ff8745565af7d596f94d2b2258
+DIST libkomparediff2-21.11.90.tar.xz 172672 BLAKE2B c2d633ec6047e92d177df4a615c82e9102fade008920ecb9cfb1c7bb1111d61ba235ee56b94cc2e8d81cbe07d8cdf73a02ce11e72deceee3bb57848724e6c0e8 SHA512 3a557930ddb0b22f5f3dede913219bb37fb8b36e5ceb2e265c80dd0200d619ec945ca57ab8ad5867482bc1234779b8b819f672aa834dd78dc58f0081b3ffccbd
+EBUILD libkomparediff2-21.08.3.ebuild 674 BLAKE2B 9653b563fb79ad4ab56ff93411a56c941067d1bb03c7ed67398f63d09b3d14de592dbadce098a1c34449fb75dd8f8823e7e9adfe04cc7bc83f647f4299e76bef SHA512 11b5a47bcc59721ad90822a05cf01f7e3c0a6f8a514d7eea6f659eae410b0c9ffa8012be155d455f44eb92f2febb4935f488c3f78c80d29ddf9ce560c34d822c
+EBUILD libkomparediff2-21.11.90.ebuild 677 BLAKE2B ff4d79bcc56df1e6b8895e13e382fb19ceb2edf0218a31f68c8b3b5ee63d815f4bbd3b604d71ff414f87ef4513db5db513ce828620f0999fe5505c270fd96b69 SHA512 fbd44d0b5226251a5ec8aeee8e5ee4d00ed1fcdd2389b3d5033faec0655a65b844fd2f80eaf40d7901e9ad00da0194e7cc201ed8c5c98f92e31bbc92983a0b4e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkomparediff2/libkomparediff2-21.08.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-21.08.3.ebuild
index 8cb34d5f96c0..ef8f5eb7e097 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-21.08.3.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-21.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE library to compare files and strings"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkomparediff2/libkomparediff2-21.04.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-21.11.90.ebuild
index a505c32408ac..b7ffdcfb9418 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-21.04.3.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -12,7 +12,7 @@ DESCRIPTION="KDE library to compare files and strings"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index a18d39e7fcbd..66924bee67c1 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
-DIST libksane-21.04.3.tar.xz 145304 BLAKE2B 0b6a44aa21591051395a135c37e7635fa54eeb65bb7aee6757db0978da10ceeedc71c6eee0ed881deaa34f01a2c123488ae15f1e528873d086cb0c0183ce6845 SHA512 33676207ceedd6e855c797cb8f2fe35ac920869f4a9e8a76ce4a278f24db32e3c7481071d09ca535c5ddf9641d20a04d8a1899521985c6d25b30b78b7d9c0923
 DIST libksane-21.08.3.tar.xz 157004 BLAKE2B d36a8f35680ff6a205c1da71c84d0bb6605f86cca968b01637a951c38cdfde06c5df3badfe36276c8b9a41800531c43af0a60e53e00553eda53953789653d676 SHA512 443d1c40df13ad02823ca2f5aa6525b8ac46b61d7907aa89322a8a13d04a86308b5f61f3f776e7979106f715605bcbaf2320d3c48f63ecd8623d124a62ce34b7
-EBUILD libksane-21.04.3.ebuild 709 BLAKE2B 72bbadb5ea65823f26d632418ec95f8e16f5cd0af92f6f976ccb55d3e3979398ad80ff2f317d776b361b2232eeb2d86799371627b9d66274fb49f84ecaeaf8fe SHA512 9f2795e35f03de028763135806fc2e5c24dfb93bfbaf246b8fb0c5d9ef4b2046e0d12a555a1600ab9c844fbb1f8a82fe7c0389316f328b7ff7e5045bd59a60f9
-EBUILD libksane-21.08.3.ebuild 719 BLAKE2B 9930a370e2061b9eab36e5a179f32285f7710f8bc0a09fe9ee77662f42c3058734ad4f80c8e6132a4065cda35817a728440b1d4856ad46038b77b0bf1c379f37 SHA512 970dcf10797a3104bb04241f51f84972dd6cd29ef4ffc39d5d2b8a3c9690a6a9970037709a848102a3311d5de2a5685406b64e3cec9e3612037ea0f52c0bc0bc
+DIST libksane-21.11.90.tar.xz 162744 BLAKE2B a16777a9d68a2a0cc2b70b8181517dc0463c570cc89b0989db121e735edc80b69692209986df44caab61bbaaa334f9e731f96f2c73f1c96b789142a47ee14e75 SHA512 77328c945740a2698cee1d85899af0944998cfe0991c0ed9c306f8ef13e8ef9503e7e20e4971b2bbcc6772dae492dcf54602c5f969993a56c4cfd51d321dbe0d
+EBUILD libksane-21.08.3.ebuild 716 BLAKE2B 363c0b568e30af3ad6977c7fd6c3eefa236ec5213f3c6c46244c1df63f057bcb5e3d01e30665eff913550a7968eee92d228bd2d9a44cf0c67fb874684e7961be SHA512 9bedab576d4e54cdcf6aee0370dcdd90007f5a5d2322232be8d6c7227456fe9afa7c6ee2c58b8b8b9f3e1430bd18d276d03b1f6780ec07c1fcd520cb985ccedc
+EBUILD libksane-21.11.90.ebuild 719 BLAKE2B 6088bdac7370228ddf7ce65f8ad6b63bd5b67bfc670169646eb188ae6f22b0637bc9f2bfcef3d607e86cc9fe074c149c4aaa63afe01d6520c28dc81330947618 SHA512 40f4d12d9768e138dd57337068f5d53b9b878437d81a87269e79d015b3f03db1824c86886545568a953e7630e97ea03b4d77f4e0cb22e69db4f9ec7ed2d4a268
 MISC metadata.xml 440 BLAKE2B 09802236acebec3b481f48351f5397ac95b2a0a13defe6860c118f7b55e5f36ed7976e67633a0d391b4e05bff712696b03d3d49c486f09c7ea01ca6422825216 SHA512 b8e84e2bdedc8bcdea58a05f2252f7f41e374d98c10420e912fb7334e480946ba14023cd278d18091cc7f3883626eda9caae221b6c2696fe154c016e82019cf2
diff --git a/kde-apps/libksane/libksane-21.08.3.ebuild b/kde-apps/libksane/libksane-21.08.3.ebuild
index 0b572231aa39..780650dd59ef 100644
--- a/kde-apps/libksane/libksane-21.08.3.ebuild
+++ b/kde-apps/libksane/libksane-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="SANE Library interface based on KDE Frameworks"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="kwallet"
 
 DEPEND="
diff --git a/kde-apps/libksane/libksane-21.04.3.ebuild b/kde-apps/libksane/libksane-21.11.90.ebuild
index f012f7689fd1..bf570a4d3de3 100644
--- a/kde-apps/libksane/libksane-21.04.3.ebuild
+++ b/kde-apps/libksane/libksane-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="SANE Library interface based on KDE Frameworks"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="kwallet"
 
 DEPEND="
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index fcf3e7400300..e3695267092e 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,3 @@
-DIST libksieve-21.04.3.tar.xz 572768 BLAKE2B 1c27c5187a443d1f27301e677a8832a0999d16faeeca84960c4f7188cb7964f4153a6c90b226f69306a3e723c01c7c6eafede7377b17335f142f02b87c9bada6 SHA512 e4780a17b47fb17a338320a6ab7edf078cf0cfb21709e5ca7c32fe78048ee0dde588039e8fb1dc93f97170d14f7ddafcc3eb50fc59300240773d567ce2390bb0
 DIST libksieve-21.08.3.tar.xz 569836 BLAKE2B 0b04ce3a3e00c62dc168b8a6bc0d32d465198f9ce3a2e6af0e7d2e1c14118a0f94f2bceac743cf51057d35fec2f2bec84293b0065d77a4f80d653029114d53eb SHA512 ed4a116e26e27606b54b83a4c48038b962b32f294cdfdfed87bc9dc280d660a6f3345312bee8a61a2e17c7fa2c896cabc6856991d6d364dad19969411840b819
-EBUILD libksieve-21.04.3.ebuild 1406 BLAKE2B fc8324e79a2ee80cf59ec0ee77da92fda8cbc9e40ffe8b7bf38a54c0d71500c41e783aa0b393408d9583d0e92da871820c062772128150b8e819c4b3c41ff605 SHA512 8dc8c2d15d1aeac7196d5e7dfb49c2aaac4ab1c1c7b0edd0c2b20db193300a2f945b8d85cbf960857b1876929257200e7a8d3873f53b611505bd65a996f77a31
-EBUILD libksieve-21.08.3.ebuild 1407 BLAKE2B 6459bf876b08a85e67c044af57c9bce7723176722ac7844981d23910e4118f080e32f90bd047787e5a332edc38689597d823554f2ed7997a49e1a35b32703ba1 SHA512 12fa3ed63905f5d29978ae37bd94f42be61802ccf459ef730d5dd1baff31000c5abdffb24756de139f5d253733d551008f2541f68c121d98275293fcfcb698e8
+EBUILD libksieve-21.08.3.ebuild 1404 BLAKE2B d01b40ba94e03e36273a76db1143ac3721d1d0a4c095296bdc0c63d6328b9300dc25073dbca9cdabc3c8608708729fabed9d581d9be34c7e33a4cc5a41e08f4e SHA512 a93fdf5651ef9fbd9dd1b20e5a5669e7992dbfdc035cfde2cbc90fb05aba1682faff215da45ac4fb9103f2ab9fd5e5d68ad88fc91e53951b502e52cc13bee5c0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libksieve/libksieve-21.04.3.ebuild b/kde-apps/libksieve/libksieve-21.04.3.ebuild
deleted file mode 100644
index 4886ad92b475..000000000000
--- a/kde-apps/libksieve/libksieve-21.04.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-	cmake_run_in kioslave cmake_comment_add_subdirectory doc
-}
diff --git a/kde-apps/libksieve/libksieve-21.08.3.ebuild b/kde-apps/libksieve/libksieve-21.08.3.ebuild
index b2268ded5086..9213e2079a0d 100644
--- a/kde-apps/libksieve/libksieve-21.08.3.ebuild
+++ b/kde-apps/libksieve/libksieve-21.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 5f9791aaed54..75201f20e6c8 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,3 @@
-DIST ktnef-21.04.3.tar.xz 306380 BLAKE2B 5749d419c1c765f6a47903cec11df336797c1b20c22b72649d3814975cf2c79567eef891223679f8c20ec8b58b652416f544b246f607d87e3396d46f704c229d SHA512 e2d13dcf5ec40f777b88a662c85cccccbebb7a7fe24c980d4faa2ff4e1a9a1129dd59b6e05b2564c6884552541a53f4a3de5456ed1c51574753c2306c70daa60
 DIST ktnef-21.08.3.tar.xz 305744 BLAKE2B ca7856e8e110663bc3a6b2bbd3fde3a81460828f97595229dca3d5d4d35cf702d1f7442ef02a539b9bb819c5d7954db52b0b98951167dbfeb8e134bf8d7b07bb SHA512 ea9d37d597dbdd93ac32a6de0c0dbf01bedbb281291d6ae201ee6a52b02eeae8e956fef42295fa01a5a51e0bb2bcf882a0c99d1998998aeac8a3929348143525
-EBUILD libktnef-21.04.3.ebuild 545 BLAKE2B acfd8a635c5ad8575bcbfc232104ee3e772cf0a7872edb627a776078cfddb1e0e690c4c5a38baf01a4b320b70ed1ffc29a84b3924c1304ab13436aa5a85c6f5d SHA512 5aeded9188d56799a9b9e7f6bcbd6cb297ee05a5cadd525558b9f2235e41ecd7397fe5028088cf6af84af65d60017abee7027ccf8c21c3a13d4838ecc94672d9
-EBUILD libktnef-21.08.3.ebuild 555 BLAKE2B 76334422ef92b0e311ec1d755e2949f0f9379b9a7720833c1e86c3075e6650ea79515c58fdb6b5b7ef5d34d94584824de0501fbf200acd7a840d181366575a74 SHA512 04ae06630b337c7372f4c66740f1150073e18fc29c4299844a2f8390fa2c41807c480e5445577b1022e2cc9f065d1792dc0641ef228a8651a615c3d1ffc5a012
+EBUILD libktnef-21.08.3.ebuild 552 BLAKE2B e0b70527f40f30dd5f3c725ff33f376b4e8821a7dabedc3eb0e276fddfdea37c48041002f3db816b6e03839b96bc367b02e01e834f2091b4725423f03fbf6bd1 SHA512 5cb5f3c457028de92974763358ee98f74936126538ceed0f7df3e05405c0fee693c3c07ff0e7c02a14dea9a811bb47c115e59a50d4b9f5fd2d886baaf0e9e878
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libktnef/libktnef-21.04.3.ebuild b/kde-apps/libktnef/libktnef-21.04.3.ebuild
deleted file mode 100644
index 12ebf49f8cf1..000000000000
--- a/kde-apps/libktnef/libktnef-21.04.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_ORG_NAME="ktnef"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Library for handling TNEF data"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libktnef/libktnef-21.08.3.ebuild b/kde-apps/libktnef/libktnef-21.08.3.ebuild
index 1633806c3dec..9a7747a8d0cd 100644
--- a/kde-apps/libktnef/libktnef-21.08.3.ebuild
+++ b/kde-apps/libktnef/libktnef-21.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for handling TNEF data"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index 6494bf1c5461..2f28c37710a9 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,6 +1,5 @@
-AUX lokalize-21.04.3-unused-dep.patch 847 BLAKE2B aaa6d5deb07d844f0c25a5d42f8fb3e41bb7ed41d2f7a56154b9218c2265f21d9e169349898278d403fffd91ff9db637b6585ec55524e1c178620d71bf1d9374 SHA512 0c5191a95c333b5232d69a3c3d7b204a6f87fcb4b8a111241ca5f24c8533108a64657759626cf2be5fc70c357ed61f65bb8893dd9a929f455c6597381730f318
-DIST lokalize-21.04.3.tar.xz 2023364 BLAKE2B 8b8790e72e1b4a6e7389adf9577ed1d392693ec14072d314d8c3d0e269a6d40c11acf22537bc328831de9a8e28a6b948fc02ac4956a325b887172e78fa56f9bd SHA512 b336fe464c123b60e4de4ba8bda0f34e2ba5eaf7708879179b9671bc33d8b031f81d595d089c24b4275ea56032e9867653cd98bf21c3d0c3db125564c057e21d
 DIST lokalize-21.08.3.tar.xz 2045936 BLAKE2B aa57ea5428db59d58352306b9aab2a79eb37e7d62a49132b440e23209f51e5c433d61282326e9d51e66f6770f609fcaa2322c57bcfaaed8183d90e8500705409 SHA512 d4368ccab3cbe3ea360fbd97f099dcbb46caaa4fe6595d7426ff94d34c2023b99dcee62e3634e54e0dc39e02768993b9c414982a2c6c061b230c33a5f337d6ff
-EBUILD lokalize-21.04.3-r1.ebuild 1984 BLAKE2B 5914fcc983b1c94521e09ee6211dfad2b26ce4871d58dfd6eab52d6e549e74fc53be79fc338c84e34250af833ecbd2f2a12169b6c37d35e2095e070f056c92f6 SHA512 66e56511e44bd4698fe2718e10b38708e042ac0660943ed6607422b275d1d15d80c8ad482305b917fd3d3549721b969b718fb660769ac26bc5ae2a97af9049f2
-EBUILD lokalize-21.08.3.ebuild 1937 BLAKE2B 79cec64457c64f270f7d52b642035a50f96896e918edc284c2e5e0b73482cc4cbc7d468f077a6ec9f761a4a584436dd1e31e704f01388a1c7449504006692b4b SHA512 f23561992d10d04228d375b1482042ac5c5615875c9c2f245f8be1fb93f1c788ccbe462d023dfdf062d7685e4f06c1909f130ac933bba7c111d8ea211e997a21
+DIST lokalize-21.11.90.tar.xz 2054908 BLAKE2B 7526ec005ebe93f6b22972d93fc124e607e475f31212fe480b5eacebf83bfff64f04bde7511fe351981f2ff64dd522436a700f5b1c85809806730b8adc57e57b SHA512 6eef6f9c63470f5e2fd104f1b08a03797e8251db2a926b2eaf2437907aa41d3543ad87bc0d4f3c40e9a14b30e7efbd5683287ec9e8e752d356c8943861b07d01
+EBUILD lokalize-21.08.3.ebuild 1934 BLAKE2B 2e9c703efc20dfc0b5095be296ebe28894318c06563cc74aabe0a7bad8759b9e59f508070b3e0ec216eb793cbde42f5a34426fa4693b20d57691496f1e3ed8b3 SHA512 26ba6359153ed7c9aab8dd0a0cf951ea18faa210e23a65f4175644dec59d0e06ea10bf0ea601c0f0ceb11ef493acd2a97cc3c0245ccecc8f6d0e4c203d3ee1c2
+EBUILD lokalize-21.11.90.ebuild 1902 BLAKE2B 0cd21bc084cfbf67b7239139448a643ee0123d90681b46b9745b23d75748be8c1bc4d9b28bbad02e8bc836c81b4016a60eda939144ef8194664c2d183f47844b SHA512 58026d4cc21f234c45e9b66ca0bdf6b3b8ffaadb016722267451c7add16bfb428b10214a912732e7543e1d0174f4d871052274d1c5df0127ad401610789373f9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/lokalize/files/lokalize-21.04.3-unused-dep.patch b/kde-apps/lokalize/files/lokalize-21.04.3-unused-dep.patch
deleted file mode 100644
index efb230d3a650..000000000000
--- a/kde-apps/lokalize/files/lokalize-21.04.3-unused-dep.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 07fa320da849f9f283ffd707d684e29f1d807405 Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Sun, 6 Jun 2021 22:29:57 +0200
-Subject: [PATCH] Remove unneeded Qt5::Script find_package call
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1e95619..10bfd6d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,7 +21,7 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
- include(ECMAddAppIcon)
- include(ECMQtDeclareLoggingCategory)
- 
--find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Sql)
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Sql)
- 
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED I18n KIO XmlGui Notifications Config CoreAddons DocTools Kross Sonnet DBusAddons Crash)
- 
--- 
-GitLab
-
diff --git a/kde-apps/lokalize/lokalize-21.08.3.ebuild b/kde-apps/lokalize/lokalize-21.08.3.ebuild
index cdbeea57ce8e..97b5bfeb359c 100644
--- a/kde-apps/lokalize/lokalize-21.08.3.ebuild
+++ b/kde-apps/lokalize/lokalize-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild b/kde-apps/lokalize/lokalize-21.11.90.ebuild
index 7f902826727b..dc160a26cb54 100644
--- a/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild
+++ b/kde-apps/lokalize/lokalize-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{8,9} )
-KFMIN=5.80.0
+PYTHON_COMPAT=( python3_{8..10} )
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit python-single-r1 ecm kde.org optfeature
 
@@ -14,12 +14,11 @@ HOMEPAGE="https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT+=" test" # tests are broken, bug 739734
+RESTRICT="test" # tests are broken, bug 739734
 
 DEPEND="${PYTHON_DEPS}
 	>=app-text/hunspell-1.2.8:=
@@ -39,7 +38,6 @@ DEPEND="${PYTHON_DEPS}
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
@@ -51,8 +49,6 @@ RDEPEND="${DEPEND}
 	')
 "
 
-PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
-
 pkg_setup() {
 	python-single-r1_pkg_setup
 	ecm_pkg_setup
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index 72a8abbda962..61c9de5e3df4 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,5 @@
-DIST lskat-21.04.3.tar.xz 1229296 BLAKE2B f274535cf19d9238fcb751e72a0162c81a888381957c25181cef15bfb7c17345c262a7ebb051dafa4a05e4c9523f7a6a73ebd8c022adce35a058fa825f55e203 SHA512 d15a94b083d553ffc1f87eca582ededa76d5bc0c8ca5e2cc730c912271e384a3a7a361a3a260a782583e69f835b00c93446cc21c28254339851d57e77b0be7c7
 DIST lskat-21.08.3.tar.xz 1229788 BLAKE2B d7c3ef6968a4a74411155ba7b64d94d392e3a3a1e1822dcff7fb0e589265721b04073ef4f8d3ac5a1bd72b0c363dd0f95ac251151213db49e487be06fd5e0c76 SHA512 a8ce7eb53837a8a31ecb6afcd373df682bac3bc707d0d35e21eb8af28258135f201ccccb6efc24f1382912c1472d4bfcf251577d60917b3b20f56a5354cc025c
-EBUILD lskat-21.04.3.ebuild 839 BLAKE2B 64af17d8228d4271a64dd49b12c9c492fb82cbd192f28c4a1ae869b2020a3b776aad13a27a5b0b758ae8ef23d6341836553720ca560f763db92122a3ca94d59c SHA512 fc4affea8392a3ff0a2ea8e64284eb39cae06c5b7a4a993b6d5892514a39dc70b1214e5cce99de8801418534740cf8abc8523fa568427bacb2bfe2c6ba50a829
-EBUILD lskat-21.08.3.ebuild 849 BLAKE2B 2d3f89d1662768b30e8f7c57bc7bebd3455a45c992e4e6e5aab44e19b19e7850e2fdda4fc505b85f923b3f246a16c8df6284901f24cf4940a13f77bd4fe5296f SHA512 34e6f55106973c5f5d332635f3ab5edf35ee68c4c3f767781b21d03501da4885204f4be169026d56d0238603346d96888f3863ce4dcf224a6cb19b864611d414
+DIST lskat-21.11.90.tar.xz 1232792 BLAKE2B 8639737a06c6faa7d45792240e49ffcde8424c3c53d1c8a75da90ec13320ce7eaab6018687bc072439d6e2ee9570b9c8481129b3445baf45cf5e77b88d73f3fc SHA512 092a6479910f149704f18d7cc0e57795f36af17e062e4a334306c90348155077db552c0ff2f61ade6202c0f32e9768d14e6081cdaeb8b65d43572476fae66bed
+EBUILD lskat-21.08.3.ebuild 846 BLAKE2B 002f1cd63f9d9f09712a1138364920d1003d4ff03d5f799ea32ebbe2af647c10216ca6b157a378abac172afd7e6cb12ceba1303287c598226717e46a92272e66 SHA512 feeca16e9770eff199f00538ccb5a28c6816c04ebef984a87476aad50492cc56cd8f5942c552135c6add46a5d4d7276e752f3cc25e7586dfbebbd159f13b4dbe
+EBUILD lskat-21.11.90.ebuild 849 BLAKE2B beaf831d8a6f7d7f3979f6d17b3b60b75d988a103d2f6427277a8f304660c61c1c37dcbabebb1432ec1db6f3f66a7fca5d5825b436f06e5ba940eec07bfe2674 SHA512 2342d37d2786ba4ebf5cc87776d6c696ddf1eab6bb8a82dbb93808398bdd5497c6760f9f0fc282523f06676d2e0dd5476d2b5ee589b7a715e8e46baf4a676780
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/lskat/lskat-21.08.3.ebuild b/kde-apps/lskat/lskat-21.08.3.ebuild
index b62a1a0020b1..dbe21af23b01 100644
--- a/kde-apps/lskat/lskat-21.08.3.ebuild
+++ b/kde-apps/lskat/lskat-21.08.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/lskat/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/lskat/lskat-21.04.3.ebuild b/kde-apps/lskat/lskat-21.11.90.ebuild
index 2de61c8a84a9..3e1ceb5e76f7 100644
--- a/kde-apps/lskat/lskat-21.04.3.ebuild
+++ b/kde-apps/lskat/lskat-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ https://games.kde.org/games/lskat/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 705ec07ca269..1806154b4419 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,3 @@
-DIST mailcommon-21.04.3.tar.xz 730556 BLAKE2B 12a4ff5b41258c852fa6f6842b58b083b9cfa689b358cb3cf8c39424b0937f78797ff102ee06699106e883ac770d012babd0f8783def087949d8a2876416557a SHA512 4d64a0eaa7668a17487edbc1d5b92c82e73e0b84bc424a43666268fbbbfb62822c9f01ac7a3ac1ceb2a16887431c4c1f94633ca740a87eb20d37601b8201e0cd
 DIST mailcommon-21.08.3.tar.xz 737088 BLAKE2B b624cbeb62cfb76d84742e610009c7d6f0be9cdd96e64cd165b50f0aa193a856eb3d6872937fecd84f8c3347c3e28395de885ad4374fe03430e022685a764af1 SHA512 4d923b034a19399d47c7f5813f6fc0af493816cb14e2776a64ea78620eae57d24374b2793a0fbbc7445d81ed39af72aac7b74f8f63697bc1e71f1119c7fe08cd
-EBUILD mailcommon-21.04.3.ebuild 1719 BLAKE2B ce9a7cd93aafd8415a507ee29994a9c8665ed81695c1f2912eede14b10c5de93ea36afe95a0934f505bfa8ea6d677df04eb7327a4da7fb19683ef9ea1e8fa70e SHA512 bc9f9c882ca3324a540ed0044a9a39743507e3c993ab8d710c79f266bfd327ddfa235026f30fb35b2c252d817e10039a001a59fb0e64ff6d7a67e98a309d139b
-EBUILD mailcommon-21.08.3.ebuild 1720 BLAKE2B 0f8268d3d0b98e007e876a0e96c27890b5a9587551e60ad23c087a0f3ddb3c938902dd225609627570a2a94087c253a46d951953013ada8cd2df02008657ca17 SHA512 2504106f9bd557eb80709fa6935f158a6e423223c632b53ff20dde7425a1e57a284e0ab338c1cf25a6ed4164bb2643b458c14745b01ae6e8102aab1f2d0069f4
+EBUILD mailcommon-21.08.3-r1.ebuild 1754 BLAKE2B 1dfb8692897a5c615113bd8684bf7e6b85ee8263627bdde422a6cc88101ee6c73739f6910f299c3601fab17e9f973b6e80b6e7d43f1a22e45d4b457fef818407 SHA512 ec18c693294200cffd787adae8447f3be18a79a948d6d6a7430820f0f16e3ac1af97a7adef7d748b15a1fa07a961f55b21cf2621fe080f8443534ff9eee29c8e
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/kde-apps/mailcommon/mailcommon-21.04.3.ebuild b/kde-apps/mailcommon/mailcommon-21.04.3.ebuild
deleted file mode 100644
index 3984c9bed28d..000000000000
--- a/kde-apps/mailcommon/mailcommon-21.04.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common mail library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-libs/libxslt"
diff --git a/kde-apps/mailcommon/mailcommon-21.08.3.ebuild b/kde-apps/mailcommon/mailcommon-21.08.3-r1.ebuild
index d8054f348741..4b69db134aea 100644
--- a/kde-apps/mailcommon/mailcommon-21.08.3.ebuild
+++ b/kde-apps/mailcommon/mailcommon-21.08.3-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common mail library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT="test"
@@ -30,7 +30,6 @@ DEPEND="
 	>=kde-apps/akonadi-${PVCUT}:5
 	>=kde-apps/akonadi-contacts-${PVCUT}:5
 	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
 	>=kde-apps/kmailtransport-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
 	>=kde-apps/kpimtextedit-${PVCUT}:5
@@ -59,3 +58,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="dev-libs/libxslt"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index e5f16f744cfa..e7802ca83007 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,3 @@
-DIST mailimporter-21.04.3.tar.xz 559468 BLAKE2B 97bfc4b8b3518131575e83e2a6dbdcbee49eb0bf178e03891be0aea4775c0331540970a1ea15cdf273112a3493b31ba47748d18c19002e4c91c4cd0f27e4acd2 SHA512 a90350b3c88fe7153b6b3058cbbb10dd4ed3667d1d36f9f57c7534da16f788e63e568e7c0400dd71d68e6641a189b939ea408145043025e2bd2e5e65aacb8e71
 DIST mailimporter-21.08.3.tar.xz 558244 BLAKE2B 9f88baee58974f41f73e7b554ca7e1f4d57537ba4bc3ca076ba9ee51d15a492de0a530fe210bdf901dbe97d160e8ec814e62f503f3686ffc66e627efd776bd10 SHA512 5ae7bcc12a84a5ded19f2b280cca486cdeaf715491a122236ae300813d4760e3f50efdc5ffe00327408383ab55fa459097a9607461f1d064356cf74c75e02905
-EBUILD mailimporter-21.04.3.ebuild 789 BLAKE2B 0bf75cb4c57a99ffc25ef7ca24ac8c0fd86e9e97529877a960a4f6696086e9b4a877da827f91c479d959d4d254170a66d35442595f7a007cae777f1b3b778a5f SHA512 02ed5eb452f95d27cf16f72a8661f5f39548bc6396c43dc4c9dbdcdd27d25b6eac91728a0e5a95b141e6c33c665ed819886813fbd40725ef29cbcb4859ef5cce
-EBUILD mailimporter-21.08.3.ebuild 792 BLAKE2B bc657e19b5e17c03cdbe50e9e9fc428d4ccb69ec45cf1617aeb710f34e8752c40266d4ca319fba397526aa5c9bc94735306d12a7145576a0ee2c3ee0c9148ff2 SHA512 0964af02c349bf9bbf10bd7ab16b67ef9f1040db5070e6a3c8d2ec4226e27e944105d02bfaee0e45ba3264de994284826897e44bd35b0713f9cc10a4b2b5b7dc
+EBUILD mailimporter-21.08.3.ebuild 789 BLAKE2B e2c0741012924827f7541f8bfb3eef2b97c29ae8e0e53868d032f8549c4109e0d9b1395b81c2b75440ec874984579e941ddf2c0c181098e7c63a11c477032cee SHA512 85b3cdafed4b7451591326070cd1fffaa9848d604763eb2c096c91caab47589dac67518ff39708784fa4fec102093cf6a9d8d94b1cc5304f53d44c34813700eb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/mailimporter/mailimporter-21.04.3.ebuild b/kde-apps/mailimporter/mailimporter-21.04.3.ebuild
deleted file mode 100644
index 7aa1cf579e32..000000000000
--- a/kde-apps/mailimporter/mailimporter-21.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library to import mail from various sources"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailimporter/mailimporter-21.08.3.ebuild b/kde-apps/mailimporter/mailimporter-21.08.3.ebuild
index 5a90dd9fc3e4..6a9988f5878b 100644
--- a/kde-apps/mailimporter/mailimporter-21.08.3.ebuild
+++ b/kde-apps/mailimporter/mailimporter-21.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library to import mail from various sources"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index bd6ed90c46c2..a51f2a92939a 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
-DIST marble-21.04.3.tar.xz 52386284 BLAKE2B a23a326e7c181046f03c896fb49d2d39156bce060cdf643d92e98a1d2fc44000a7e1367dbe1e00a939cf78a9d1b07d47152735f3e528126dbda85594f1e5b5b9 SHA512 db926120fd275e0803cf176137c32463de784dd54f16b1d2d7e20e6ae750e6d6b373ef2fd51d1e31a0bee219d8e7c278ede8e83bdbe753edd32d138098855b8c
 DIST marble-21.08.3.tar.xz 52421300 BLAKE2B 00745e94306c44baae71598a9920c6e416b796bdae2388987406a2c963359c85210742f0a86bad69a8c5b50b1c1e07f642facc93dc32406e62dcb0a8564bd3da SHA512 e989d1a6dec23c3a7d80e3a389c18283d5a0940e084f89f3f5ad4df3ef6a5fc7c3d7f479af91ed75853fd38c97cb4849d1626c261d8b9d954f9ad2e73954d693
-EBUILD marble-21.04.3.ebuild 2697 BLAKE2B 08ed258df751ba31addf57b0afd7f9aa80c52feda743a7087da62fc32b2901522f0acde5b845f4134f6dc21facd506a032b82493c650e6344ccef4ebab302abe SHA512 fb56f8344acf6b5c5c34dda2473fe3ce5a0ed8e8e6f9de9a7baf159266fd04b6cf794310770f9c7ed3b8d1ea60fb196465d0ba4307c868ad04897abd44c70195
-EBUILD marble-21.08.3.ebuild 2705 BLAKE2B 08e2072a3cb32180a706c0371c158a08cac507668e0fb0f4f86d6870973b577937f5029d6f1ee6fd3981b5fbb9bb59b708fe6f9141425cc6594e99cc5b5ef5be SHA512 4db1b0ce286b021ef4e74290383f880ac908afd0d2951020b4da2792da9279163a7038e803938a0a148b672d934128e5c8ec3edc43f2cee75173feea79e9c927
+DIST marble-21.11.90.tar.xz 53658752 BLAKE2B 4e2d75dbc0534d6fd40ab5ebcc3183bd07d845dae48e9bbee0115ef4d03dbd055471d7a6ab4ed8e50b03b565beb40c5e6be5c145d423e0ef6e212f65e81af9d5 SHA512 ac3b6f2b980e0edb12730645f771ce2614b687691d291165ea203b2bb8555896e5bbea1134a23c9859a3cda185bef9a0c76a37821f1e9e0a477e68ddcd49d8b2
+EBUILD marble-21.08.3.ebuild 2702 BLAKE2B a5294e90c490cb138842105da2438fd6d3ab4fdfec3b13b40c4a1980474198a682a625923938cf6af34c2bc58c699dbfc69053f29a1cc8a1a2c2e353ca65f713 SHA512 5f32e633574cd573be7606f10502c71e0bd27f4d698c32ab23424450300af2eae94cfb011da85b5cce06dd2d21b6aa8d1d78d2541b080d5b56e431f146703125
+EBUILD marble-21.11.90.ebuild 2705 BLAKE2B a30b862a5730d329daa65193084bc83c85f811352e5481e347d95225cfab3d8016660bc5bea7774510f6cff339d88dd7b11df84f6c557e1cf29bcd36c04f52c8 SHA512 97c9aa9276d04f3628cdb4691d560519fab94aed063bb2b6e297557d90f641758a5fce585244fb04e43754099211b42965f93a3f60b6c295e8217217081f7460
 MISC metadata.xml 910 BLAKE2B a37a5cc007ea6af8f319dcc827d85bea57ed7cfd6daae76ef19b1f35f89a86df08ecd767f86655c769f86350310c2972be8841e8a594916e33baa8069f462bc6 SHA512 47bc8f365cddd40247b4c4ecdd7932bcd7a833d1c0ff46fe4d9c6722ee063d11bbede81623e8b9a572691330b868c2cdebdd8f1785c95418af6b64c73af0396f
diff --git a/kde-apps/marble/marble-21.08.3.ebuild b/kde-apps/marble/marble-21.08.3.ebuild
index 0e56f3ae9a60..6d3f891af293 100644
--- a/kde-apps/marble/marble-21.08.3.ebuild
+++ b/kde-apps/marble/marble-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://marble.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine"
 
 # FIXME (new package): libwlocate, WLAN-based geolocation
diff --git a/kde-apps/marble/marble-21.04.3.ebuild b/kde-apps/marble/marble-21.11.90.ebuild
index b9b9e117f13d..e6460011d5ca 100644
--- a/kde-apps/marble/marble-21.04.3.ebuild
+++ b/kde-apps/marble/marble-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
 ECM_TEST="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,7 +15,7 @@ HOMEPAGE="https://marble.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine"
 
 # FIXME (new package): libwlocate, WLAN-based geolocation
@@ -63,7 +63,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 # bug 588320
-RESTRICT+=" test"
+RESTRICT="test"
 
 src_prepare() {
 	ecm_src_prepare
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 08055e82ed1d..ce64c31c6bf6 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,3 @@
-DIST mbox-importer-21.04.3.tar.xz 28656 BLAKE2B 529b6d833655ee8d77b0cb080afe0191d1199abea68a2797041594c76d88df1807770ca60e7c669c441619e1c99854a615748a4082befe91969d2df5694ae3ba SHA512 6f92c052876b9bb0ac39ff1a3a3f1c96a8ef676c280cb915a0a9c472a25ff86573196b059035096bfe82d570d28483a092a8ef147099c1eaae82dacb50c45554
 DIST mbox-importer-21.08.3.tar.xz 28660 BLAKE2B b00dc3775e57968692b6faeb32171234c3bf6637306f2972c13a8a15d168b98f91ef365cc2eff72f9e0517f1ae19beeb72ed0c6375c68fa8fda9ac050408813f SHA512 0554f88b29e8bd416b45a7d592731f2071732c071c3f14d74c8920d62dc779687283954f62a41ef497750cb3faf2088e07ecac02400505b8fe21e9a578ce9080
-EBUILD mbox-importer-21.04.3.ebuild 922 BLAKE2B b4c7a93df7931e62eb5a63b91d5039d8999d1a4089a1bd5cd4c635d2e665dec3a02f90ed52320666d1db75bdbf21be4e2fdaa20814e82bd879dc282f54e547a1 SHA512 08f2c5df0622dcc197f91126876e99c4207133e69006b81d2b6841225af15d4c4e5b877219132e41f34fb4ae12c3235ad49b1159aa33e84b8e30d81504d9161e
-EBUILD mbox-importer-21.08.3.ebuild 925 BLAKE2B a4af0c50cd669b523477157035c75b9fdf19469ac996e710105e4965363fa0842aa4496ee41cf2700b95191e615573a58cc0004f5b8c0c4774e7de2059fabb9a SHA512 340d8c881b5648f2dcf7caaa86f63384a4e4fce9500d085730be8cff9a777e2845177f079d963b3a867a5e4865708f1cc8f161b60e4f8751ccc59fdf2c063641
+EBUILD mbox-importer-21.08.3.ebuild 996 BLAKE2B 4a42ecca09b798a4884793a2b14c97d85060d5ce9c69f36f53317c2b7ae7c4887d2860a8d55e866418617506d06436a045d235b881e661800e9e38dddb69364c SHA512 5ed1c1807a9c63e1bf2056f46799804dcaf0d7b9ad6037fd77fcd411ae0cecfcc7d7f4c3c3dd8c36082151820802d95d45ac7bf6753192f7463f95b27b9a1c66
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/mbox-importer/mbox-importer-21.04.3.ebuild b/kde-apps/mbox-importer/mbox-importer-21.04.3.ebuild
deleted file mode 100644
index f48064124a94..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-21.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mbox-importer/mbox-importer-21.08.3.ebuild b/kde-apps/mbox-importer/mbox-importer-21.08.3.ebuild
index 299a7d0f58b1..d959adf126b5 100644
--- a/kde-apps/mbox-importer/mbox-importer-21.08.3.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-21.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
@@ -32,3 +32,8 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 582211da31a4..51e5c134359f 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,3 @@
-DIST messagelib-21.04.3.tar.xz 10795852 BLAKE2B b83dcd2fa1e76058ada2cb95ed4c6fc8700be4dfdb7a75fefc7e29f1f72fcde85962b1a7aff130f894fa456b544513ea202c9f618e6293c54a45873a030d740e SHA512 5820278f486d061081590cb2742a56fc5374048b8880d921f6fb7e4f7021dc09ca1921282228560d75b90aa451a6fbffa8b1ccf6a869c17e90703e7300d8151a
 DIST messagelib-21.08.3.tar.xz 10789696 BLAKE2B 8c70e63d6ac731cfbdc5cf4ac1c9534a7826f382f420a28f222706e2901b0fb4e05cecc95219cd9919c0a4fb348fda614e1c1cf0e8e244f93523eec5708d6d57 SHA512 bb4371b8cebfda476ac950158df5ee7c6ae5cefe6022a51cb23fccdd9b2469a5ec79001187cf61bca5fb7e44af0f0bd434e695044f4f54fb4256f9d1f5b37cf2
-EBUILD messagelib-21.04.3.ebuild 2169 BLAKE2B 93b103d5a5f8a3cbdcf700d9feb30bae07817bc2ec93776a147a30a19836ad10fb4c617a65bdff000f76c1079eba3e49f7d2cf73fc95bce86be347938003c834 SHA512 65737cb7109f6afd7f67608517cb3b2c55256b0f1064239039b57954171b457d7952e8f720a14d660c5343d393d37afb9919ca7d5b7a8a8b069027ecd2071eaa
-EBUILD messagelib-21.08.3.ebuild 2170 BLAKE2B b99524b885708b05e1e80d87cfebcbc60ca6619eb009b76da40f1cfda7f440b25d97058a8d3b954607c22bb636f33be75c4c2568cd342d598da1c89f1fad56ad SHA512 30b763bf2bb1c21ef183110948bd6184f78e0e769e210dba890166fecc240413155b3c119e8f649dd3ba39a872eac06b2d31615ccb54a92c1251d81ade36d3f1
+EBUILD messagelib-21.08.3.ebuild 2167 BLAKE2B c4b44836806f72f3fe9afac72ffeb51c44fc521ef5ccf486c1eb31a1e7656481f32b0c03c45340ccecbd1b37f547489f195742a9b7bb919ffac67f929ec37a62 SHA512 6601f09f39a8a98bae5d0b7cf859777cc0d5fafd030827d990176a7e4c6b466b06b0991eeff91602338231137c80e9963fb585406e05c103fe760a5aad78e138
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/messagelib/messagelib-21.04.3.ebuild b/kde-apps/messagelib/messagelib-21.04.3.ebuild
deleted file mode 100644
index 4d42dceae00d..000000000000
--- a/kde-apps/messagelib/messagelib-21.04.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries for messaging functions"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
-	>=app-crypt/qca-2.3.0:2
-	>=dev-libs/grantlee-5.2.0:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmbox-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-# bug 579630
-RESTRICT+=" test"
diff --git a/kde-apps/messagelib/messagelib-21.08.3.ebuild b/kde-apps/messagelib/messagelib-21.08.3.ebuild
index 533761399d6a..7e17702a12c3 100644
--- a/kde-apps/messagelib/messagelib-21.08.3.ebuild
+++ b/kde-apps/messagelib/messagelib-21.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Libraries for messaging functions"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 123fedc65ea3..6365c7413476 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,5 @@
-DIST minuet-21.04.3.tar.xz 27726656 BLAKE2B c986771fba76acfd54095819fa817a51a69f68add00267d044d5e2a2176ffa6a0213c5541539ee46fa2905e14ee612e940b02f855bbabfb3a2b9785893e85fed SHA512 0513c9074c4505a0f83899b340dd122c7c5861325fa5e27b18ce11d1195069d0066b47861f8ab3eb540d3a5e89c6134cab9016680709c650a322ff4599bb35de
 DIST minuet-21.08.3.tar.xz 27731012 BLAKE2B 6d97236765f987b6c3ec6e39d5f878d6c327082073250b2bb8bf3e27f72287bff3dfaf90a0bdab19e0ea4a79da63abdcf995c8f31e2f53e08f02025b393be80e SHA512 2b4c695bbd4df70ad3fcddd3aece28f95b5b19054ed541ca20a982899dd540fbc79b47e0896768b01edcd7084e7c47d69d97d8be4f6245c92aefa388024a2d1d
-EBUILD minuet-21.04.3.ebuild 673 BLAKE2B 96412a1be49b0b9e5fbc1ed8616348467dbeb5a638d02844989fd6e67c908eab382c14ea46a027e4dc71c6ef013ed2f65aabf430c04fd17b9fcb54432e3b0f6b SHA512 31632ed1ae7f85ea4c305a93b24e779a4dc23efab58c6ef0a195d65d3f789ed5be378b605b65abb4a7c8297877c99dd151b0920926a903ddd0b7c0e88dfa3697
-EBUILD minuet-21.08.3.ebuild 683 BLAKE2B 058f49ba231588d7df9a1bfc4d0231efeb68d8e1a5b25fa63b8e80c6fa5a02bfeb5a400126f1099ff45cc080facdb3bc2c145f017f747467fdcdf4e0ec238397 SHA512 5911223275fb0b717067e53aae18384d76148bfa86c9153afc8bbf989817b99d44fb58618e0fb4dcbde8396ffef048d2f3b30256686bcab84b82f3ea7bc03018
+DIST minuet-21.11.90.tar.xz 27670584 BLAKE2B 6db9f6e6cc3f1bc2442e20899e34c3e9fb01d3ee4c84014cd83a86f2e903ad551b28461f67903dac58f3a71d902f79935311b98a92eb5486ac329369e29f7473 SHA512 9a47d66ea82e3cc2aa88a117f79c98de30d08692a5cf5d1bb1cddd273016b433999a3429ef65f2cb5a70b6fa32516fc1669c80b7e44759177f2af1c9656e72ab
+EBUILD minuet-21.08.3.ebuild 680 BLAKE2B 9201fd20eccc74e646a0e47ceb91038e6a3ac2bc6088b74309f0a41d03a45596afec6d1054ed59e8747977839515b7f4f24668099c1bdc60eb1267e17c6913e0 SHA512 37edfc88a8d5f36c9636c5f5dd0d5b5fb910b0336f5ed781cf05df1be6b75e0c91c57e26627ea28951c946abf0f8adfe1a9572d9eef007b1a75518edd5be839d
+EBUILD minuet-21.11.90.ebuild 683 BLAKE2B f6c12a517bfcc22c4ca9c2690f6e3f597b31fe4fb9cab4cf531335414a58041b599dbea103e80af9f48fe4935ed4bb7dfbf811eabc00b56914b3aeffec7bde40 SHA512 2a601109bdb376eb69138f932e4a064d8b2371efdb87ce5900bd432bce78e92f2be42612e226f0d78fdcb7842c10c040c78f32ec4a6166ad01b04df5251ab121
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/minuet/minuet-21.08.3.ebuild b/kde-apps/minuet/minuet-21.08.3.ebuild
index 45d586341d01..b2088363f347 100644
--- a/kde-apps/minuet/minuet-21.08.3.ebuild
+++ b/kde-apps/minuet/minuet-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://minuet.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/minuet/minuet-21.04.3.ebuild b/kde-apps/minuet/minuet-21.11.90.ebuild
index 6ffce77b659e..da7d75d29881 100644
--- a/kde-apps/minuet/minuet-21.04.3.ebuild
+++ b/kde-apps/minuet/minuet-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://minuet.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 42eaf7cab0de..660f89554362 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,9 +1,9 @@
 AUX okular-20.08.2-hide-mobile-app.patch 849 BLAKE2B 73e324e61d8a39d085bff4b818845f7392cfff8e01e38624e1e3aa1c7073bc4d6adbe2fbe314a6f4a43b6559cd83c5c45589df49aab8e7e5f0c5b8cf559a47bc SHA512 8b35589046581600c67a464011e34494626f3cd0f4d08080b51ac704f2c7c3f9bacc64f5b0d2f1bcd1732c6c50b924e1dbdb9bfdf259cfc88e8f583c4f1df53b
 AUX okular-20.11.90-tests.patch 6748 BLAKE2B 309fb48b50fcd594e9827c4c9b1cbd86e3631fea791e55fbe2d3773b0c46730cd1ab1e9397197287872ad42ebe2f03eccef58cec8237f93c9da7df0c1f19364c SHA512 a0f41a9285f67a3b4878cfaa38e59074ab493e43d5ccb78d65dcb9dd94605b76c36f2345b32a66a5764e9ad564e41282a4470cfeda6af305721a198defab134e
-AUX okular-21.04.3-fix-fictionbook-support.patch 1074 BLAKE2B 16f98c1ba248ed2ba0b6829f09045dd8e3501483f3cd6f8a8911183c27da3fb5fb737838711093f85e1f7ef3d33e9a430ef600c9181a90e8526337f3d9294ce7 SHA512 e1f290553bba99773a39d52f7ed89c4193f40d9a674e78d4abd7ac29e8a8622e7ed1334aececcb1b426bf67c6b60c94405c75b6d0379eab2b97f6b2bd719641e
 AUX okular-21.08.1-optional-options.patch 3144 BLAKE2B 1770bba880ab336998c628887c52062e10a87d1b2ed5fcf08870c17837ec8c2c2c608952153fcf6459eb63fb1302e3cb2276be60fc0607f23886442a920defc9 SHA512 5b34ffa7b58e67ec34b95e50274a97b55eafc5a5b47e07efb43597d5314f785c8dbf34222de220511327b6f9f9d8a98288a50ef9fe4a42c9b3f899dc580b7587
-DIST okular-21.04.3.tar.xz 8052500 BLAKE2B d0bcd358f9da6c0a19c30d036e73736c06e67730d30be6fca64c33a188adbe8bc1f15efba2c62739e88fc3a4dfe4100a9c3588e077f689176f1a0a2ad2f6b59b SHA512 21f34dcef50d15a8816d3898a002133e068ba239d1730892e0d71e58e6196b493544792fa5c06de689fdf1fe7f853586578f3963a64e46a9797484f983814c22
+AUX okular-21.11.80-tests.patch 4269 BLAKE2B bbe4f8761b113b42e5c882db5c68ab95419cf64b317acf62565de35984604f94cc93f8432487585156f743a9dd314f585f6470513fc8897a42c8c212da2aa03e SHA512 45a8a3331cb5bec3e00f424c700abb8dff4a49ec29d620366006dcf72af335a2af95c5c4d0e0df29b821ecefe138084aa25036b22148802e47a7edf48920b2d5
 DIST okular-21.08.3.tar.xz 8088712 BLAKE2B 50ded7dba63355a995db869d2b4f6eabd3aad905c1d17cd9b5e51cfd0d082ade838d641aee246c0aabf10d24c7c4704cdae03d2e9499452a1cb3c344b05997da SHA512 50f5e4718ae879932aad411dc6569905c541852f81ecf0e4c1896eb249039311c1360274d051ae3aba05e37dd2ec010844b56e277f52b1cc5326a86f8ecba85d
-EBUILD okular-21.04.3-r2.ebuild 3301 BLAKE2B 5627fe73b7be3898b2d62214c929ba254865b88d73c8c7577a97638aadb9af5998486bbd5f3bd351f9f6895162840966c4b60f27f5d4867e521e782599cdd40a SHA512 af9f1c243a2a88b8fe3f5add30f1a1065c572a11d8958a74db9129aba3365e89b8744dc7512bd9694bf62829b6d0a11aae780f951dda923aaba60bfc8129c66e
-EBUILD okular-21.08.3.ebuild 3363 BLAKE2B bfd6ce3a8b42f0290fcdade1c0425f1fd8ccd84883c0d148faf6bdfb8a7ec231b83043efd6667bac74bb019ed91d8ee2a685353bb35757a6bccbb7bfd7e758dc SHA512 77c4bfc15c729d7ccc8f19eed7ce3e976aec3a87e3a377f346bdd87aa0e816f35cf91ebd55d4de2eca42b6d57e11f2c1a62446b6dc35fdaa90294d8424b416fc
-MISC metadata.xml 1106 BLAKE2B 1310d9ce720f26ecaea0ea4d63e9bed06ea2dc4dcf646dbe9473edd21711943910952c7d82208e0fda699bfebf2c0d03ac47bcb4877bb05f4e1245373b1788a9 SHA512 f3a53b35998ef23cf6b9fa9ecfb57a1a39f31b8368552b796a8a368d2a5d76ab64700dd2a4fed229ec942d6614edeb7359627d96d9b0ebeebcc96679db7a9b32
+DIST okular-21.11.90.tar.xz 8125568 BLAKE2B fb0673fc13e05671849f63ae0fcaa735f9309af9856d2fc7f159eb0704c5b6cef4b320890345156bf7a9ea53b700847e9427ece4f2762ea7d727d640e0d12d9c SHA512 5e93173d5704b965695547288c8dd586e8d3a574efa7457775287a017e38011e8a8ade694e6edc981e9055445470d7c90262f144204364b517287216094771bd
+EBUILD okular-21.08.3.ebuild 3354 BLAKE2B 701eba0004bf50a7ff37e293e56da6649af390805c9d15b1a843b1fedef9d89759581285e7ed01451919bf68a2877cfc7643625ca7ad3d46078115290ef2ce18 SHA512 cc9a151f86ac089c558b6cbcb6a0f54ee998cd11f897f7590b5826b04ce1a667bed7e2f5f573c835218c82bbf13dfda9a6eff5821dc203c96af5c184a4f0b919
+EBUILD okular-21.11.90.ebuild 3284 BLAKE2B c451a34a1d8e14211d6698acdfc05d1da990d9ab788a0285a4f31358e7c0264d9ca41f1a8ea20c9c1b418786d75e6f7d7faec1579b308bf96d83c1fb4426513d SHA512 b4485ae10c92427bcdbed3dbbddc24cd358308428e2418759f71c5c731d1d380ef9f5c3e9cc2af814bfd66b7028db88d3571a347e6de05e14c6a72301178050d
+MISC metadata.xml 1113 BLAKE2B c13cccdc34297b23156dd5ef8f41c8515df5d2f2adf5aac584080aebf43556ab27f03716ed6f844617d5abf426f434febc69f99f0f2d8fac5f4dedd83c34b8ae SHA512 de94d9c06c35e64f67f191cb15a6347042bf57da991a182e1ce1ef576453b0f56fb39209829702f2d6a6297d53e0d1606d3dfdc82dd176bc65b6f1cb8b4710e5
diff --git a/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch b/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch
deleted file mode 100644
index 061db80d2bc5..000000000000
--- a/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 504eec7688e7139e9d193fc2b3ddafac0f835b6f Mon Sep 17 00:00:00 2001
-From: Yaroslav Sidlovsky <zawertun@gmail.com>
-Date: Mon, 12 Jul 2021 11:06:26 +0300
-Subject: [PATCH] Fix non unique KPlugin Id for fictionbook generator
-
-BUG: 439807
-(cherry picked from commit 8dc58c7617abcacf9325e5b93a5e38149f6e2aaf)
----
- generators/fictionbook/libokularGenerator_fb.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json
-index 1ef01a2d5..3d499a50f 100644
---- a/generators/fictionbook/libokularGenerator_fb.json
-+++ b/generators/fictionbook/libokularGenerator_fb.json
-@@ -120,7 +120,7 @@
-         "Description[x-test]": "xxA renderer for FictionBook eBooksxx",
-         "Description[zh_CN]": "FictionBook 电子书渲染器",
-         "Description[zh_TW]": "FictionBook 電子書成像器",
--        "Id": "okular_fax",
-+        "Id": "okular_fictionbook",
-         "License": "GPL",
-         "MimeTypes": [
-             "application/x-fictionbook+xml"
--- 
-GitLab
-
diff --git a/kde-apps/okular/files/okular-21.11.80-tests.patch b/kde-apps/okular/files/okular-21.11.80-tests.patch
new file mode 100644
index 000000000000..a0babcad1c05
--- /dev/null
+++ b/kde-apps/okular/files/okular-21.11.80-tests.patch
@@ -0,0 +1,101 @@
+From 323fed918995fe2e01036c74c1498446b4d2f122 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu, 12 Oct 2017 14:09:09 +0200
+Subject: [PATCH] Move tests into existing (auto)tests subdirectories
+
+---
+ generators/chm/CMakeLists.txt                 | 12 +++---------
+ generators/chm/autotests/CMakeLists.txt       |  8 ++++++++
+ generators/chm/autotests/chmgeneratortest.cpp |  2 +-
+ generators/comicbook/CMakeLists.txt           | 10 +++-------
+ generators/comicbook/autotests/CMakeLists.txt |  6 ++++++
+ 8 files changed, 27 insertions(+), 18 deletions(-)
+ create mode 100644 generators/chm/autotests/CMakeLists.txt
+ create mode 100644 generators/comicbook/autotests/CMakeLists.txt
+
+diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
+index 0d7452cba..3adb3fd54 100644
+--- a/generators/chm/CMakeLists.txt
++++ b/generators/chm/CMakeLists.txt
+@@ -23,15 +23,9 @@ okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
+ target_include_directories(okularGenerator_chmlib PRIVATE ${CHM_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR})
+ target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml)
+ 
+-########### autotests ###############
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/chmgeneratortest.cpp
+-    TEST_NAME "chmgeneratortest"
+-    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
+-)
+-
+-target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
++if(BUILD_TESTING)
++   add_subdirectory(autotests)
++endif()
+ 
+ ########### install files ###############
+ install( FILES okularChm.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/generators/chm/autotests/CMakeLists.txt b/generators/chm/autotests/CMakeLists.txt
+new file mode 100644
+index 000000000..59753ca45
+--- /dev/null
++++ b/generators/chm/autotests/CMakeLists.txt
+@@ -0,0 +1,8 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++
++ecm_add_test(chmgeneratortest.cpp
++    TEST_NAME "chmgeneratortest"
++    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
++)
++
++target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
+diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp
+index c428fa1b3..68f7a5821 100644
+--- a/generators/chm/autotests/chmgeneratortest.cpp
++++ b/generators/chm/autotests/chmgeneratortest.cpp
+@@ -30,7 +30,7 @@ void ChmGeneratorTest::initTestCase()
+ {
+     Okular::SettingsCore::instance(QStringLiteral("ChmGeneratorTest"));
+     m_document = new Okular::Document(nullptr);
+-    const QString testFile = QStringLiteral(KDESRCDIR "autotests/data/test.chm");
++    const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
+     QMimeDatabase db;
+     const QMimeType mime = db.mimeTypeForFile(testFile);
+     QCOMPARE(m_document->openDocument(testFile, QUrl(), mime), Okular::Document::OpenSuccess);
+diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt
+index a0e7569a2..91bcc6ec7 100644
+--- a/generators/comicbook/CMakeLists.txt
++++ b/generators/comicbook/CMakeLists.txt
+@@ -25,13 +25,9 @@ if (KArchive_HAVE_LZMA)
+     target_compile_definitions(okular_comicbook PRIVATE -DWITH_K7ZIP=1)
+ endif()
+ 
+-########### autotests ###############
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/comicbooktest.cpp
+-    TEST_NAME "comicbooktest"
+-    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
+-)
++if(BUILD_TESTING)
++    add_subdirectory(autotests)
++endif()
+ 
+ ########### install files ###############
+ install( FILES okularComicbook.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/generators/comicbook/autotests/CMakeLists.txt b/generators/comicbook/autotests/CMakeLists.txt
+new file mode 100644
+index 000000000..aaacb341a
+--- /dev/null
++++ b/generators/comicbook/autotests/CMakeLists.txt
+@@ -0,0 +1,6 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++
++ecm_add_test(comicbooktest.cpp
++    TEST_NAME "comicbooktest"
++    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
++)
+-- 
+2.33.0
+
diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 79a14c030c28..5294ccba1b21 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -10,9 +10,9 @@
 	</upstream>
 	<use>
 		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
+		<flag name="crypt">Enable support for password-encrypted documents via <pkg>kde-frameworks/kwallet</pkg></flag>
 		<flag name="epub">Enable E-Book support via <pkg>app-text/ebook-tools</pkg></flag>
 		<flag name="image-backend">Enable image viewing support</flag>
-		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
 		<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
 		<flag name="mobi">Enable mobipocket support</flag>
 		<flag name="plucker">Enable Plucker E-Book for Palm OS devices support</flag>
diff --git a/kde-apps/okular/okular-21.08.3.ebuild b/kde-apps/okular/okular-21.08.3.ebuild
index 4e3e45b993dd..85d5e52e333a 100644
--- a/kde-apps/okular/okular-21.08.3.ebuild
+++ b/kde-apps/okular/okular-21.08.3.ebuild
@@ -16,8 +16,8 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="chm djvu epub +image-backend kwallet markdown mobi +pdf +plucker +postscript qml share speech +tiff"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+IUSE="chm crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -48,13 +48,13 @@ DEPEND="
 		dev-libs/libzip:=
 		>=kde-frameworks/khtml-${KFMIN}:5
 	)
+	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
 		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
 		>=kde-apps/libkexiv2-${PVCUT}:5
 	)
-	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	markdown? ( app-text/discount )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( app-text/poppler[nss,qt5] )
@@ -84,10 +84,10 @@ src_configure() {
 		$(cmake_use_find_package chm CHM)
 		$(cmake_use_find_package chm KF5KHtml)
 		$(cmake_use_find_package chm LibZip)
+		-DWITH_KWALLET=$(usex crypt)
 		$(cmake_use_find_package djvu DjVuLibre)
 		$(cmake_use_find_package epub EPub)
 		$(cmake_use_find_package image-backend KF5KExiv2)
-		-DWITH_KWALLET=$(usex kwallet)
 		$(cmake_use_find_package markdown Discount)
 		$(cmake_use_find_package mobi QMobipocket)
 		$(cmake_use_find_package pdf Poppler)
diff --git a/kde-apps/okular/okular-21.04.3-r2.ebuild b/kde-apps/okular/okular-21.11.90.ebuild
index 8ef5c513334a..f09e5894687d 100644
--- a/kde-apps/okular/okular-21.04.3-r2.ebuild
+++ b/kde-apps/okular/okular-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -16,8 +16,8 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -39,16 +39,11 @@ DEPEND="
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/kpty-${KFMIN}:5
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/threadweaver-${KFMIN}:5
 	media-libs/freetype
 	>=media-libs/phonon-4.11.0
 	sys-libs/zlib
-	chm? (
-		dev-libs/chmlib
-		dev-libs/libzip:=
-		>=kde-frameworks/khtml-${KFMIN}:5
-	)
+	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
@@ -57,7 +52,7 @@ DEPEND="
 	)
 	markdown? ( app-text/discount )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-	pdf? ( app-text/poppler[nss,qt5] )
+	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
 	plucker? ( virtual/jpeg:0 )
 	postscript? ( app-text/libspectre )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
@@ -73,17 +68,18 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138
+	"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
 	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
-	"${FILESDIR}/${P}-fix-fictionbook-support.patch" # KDE-bug 439807
+	"${FILESDIR}/${PN}-21.08.1-optional-options.patch" # bug 810958
 )
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
 		-DOKULAR_UI=$(usex qml "both" "desktop")
-		$(cmake_use_find_package chm CHM)
-		$(cmake_use_find_package chm KF5KHtml)
-		$(cmake_use_find_package chm LibZip)
+		-DWITH_KWALLET=$(usex crypt)
 		$(cmake_use_find_package djvu DjVuLibre)
 		$(cmake_use_find_package epub EPub)
 		$(cmake_use_find_package image-backend KF5KExiv2)
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index aac7a9d187ba..cafce86b746c 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,5 @@
-DIST palapeli-21.04.3.tar.xz 2076828 BLAKE2B f6aa798c3bfd2affa8656412fcc599ae59f1ad46334fd7bdb286ef8eec33c835c41723e448d1e98143a7ec8a8b9441b978d4d7b029d91c54be8afef4aa93eaf3 SHA512 bc2f147e0a819ee6f6c08f83522ce2a61e1fe642cfe2d93ab1831e2d9e89ba878e62912c358b3a9b4a336e5abe6cc69abfae1e872efd32392afcd41966ce42e9
 DIST palapeli-21.08.3.tar.xz 2079900 BLAKE2B 522f50c0df83912aaf31564d2d7379ac9595a055bf2260e56d8b57c8e75921658348041820d4a427bd25349ecb584d8d64d1a39a3d0a997496eac0692c1d1cce SHA512 68be6a90580c7769935a4802b9f84e560b73b75b911ef6805f08bcd484b82601b34bc1943684d19cf32a07b8b815ab9af6071a5992806074348ff28d2f1a318c
-EBUILD palapeli-21.04.3.ebuild 1028 BLAKE2B a97fc071e1e069b0021a82e8f1217aecb9b6d2a287e6a0e04a32655f553dcf90baa10008fa05c109cbe692de11c472fcbdcdc1aaac04c8d1d099026b9841eec8 SHA512 6fada93d20e9dcb248ad7df02df10e4c617fc62924044170aae0c4b82f2e4672314941953d302e674c623363c74f7657464e7bcc956073ad7b8abe2846e6d032
-EBUILD palapeli-21.08.3.ebuild 1038 BLAKE2B a2558b767e8947221504b950fe8f38ca5fd29ed48db8bc328a96c741f6d5b309040a605bafec365d94429d04a3db08949ae7fbb5c4ac9480fc32c871530e6578 SHA512 e01dd65d08fa55beaf7b3e9b8b84b4c234ac1dca6f2cdc62250442f7123abc162e5c934bdcf78d34b5ab70f02136a66c80e09315327d7906facc5f3e82f3ea18
+DIST palapeli-21.11.90.tar.xz 2094524 BLAKE2B 6507d2c37c758c030b085b41826201ff8347df5f00795bbf220aa32849df47d4ad456afac726e0119f1dd0ccb07d0c305bc1ce7f85b046d1ba33042b99e4b449 SHA512 ed87dadaead879e35b500eecaa8eb4d03576bc60de29d85cca6dc78cd8fce61fd5d85d2f2cb66ad0de416b633d68b1b7711419128569ef43e3cbb58ead8636e8
+EBUILD palapeli-21.08.3.ebuild 1035 BLAKE2B b5d6f1811c1d15a2da3cfaf73f6e1147a4610c75d760ebe5004eac3fbcc089a8a0f0a328b4229e03b55b6bf7e30e4377c5cad0ab9c774808750611a4d8f8c72c SHA512 4accd96090b1f7d9753dc56159ad0776f87c2c6edd9baf5b24e3f76d647a4e0790620ad65b01c3cf68adde38e5abcab14ffd784f2874b9c730f832ddea9ab5a0
+EBUILD palapeli-21.11.90.ebuild 1038 BLAKE2B bafe70904a9b8584a4063fa1eb1dbffb2f38d48b9b18eb8b52629eaf245d05279191aabf96b78182f259b6f1ae09354a3280ac5dbd31b5d5acc262e0fdd603b3 SHA512 1adcf43b62ef97568a963572878538ac91ba22d1bfc6a485bfcdeff165e82a053e1e8787ad66af2dfb57c4018953af91ee59853546f346436fa1067ffc9bf3c4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/palapeli/palapeli-21.08.3.ebuild b/kde-apps/palapeli/palapeli-21.08.3.ebuild
index 50c4a6fdf597..800a7add563f 100644
--- a/kde-apps/palapeli/palapeli-21.08.3.ebuild
+++ b/kde-apps/palapeli/palapeli-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/palapeli/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/palapeli/palapeli-21.04.3.ebuild b/kde-apps/palapeli/palapeli-21.11.90.ebuild
index 8db093f7feed..93d4a08bf583 100644
--- a/kde-apps/palapeli/palapeli-21.04.3.ebuild
+++ b/kde-apps/palapeli/palapeli-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/palapeli/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 2c70ea7ee347..4346fc9e0c97 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
-DIST parley-21.04.3.tar.xz 8890316 BLAKE2B f3ca83e72e6ad616151111d2f1cb0df79c086829d6b51061d6d415d1287cb9b8bd9d045413278da4310f3c48b1fcbbb932f17a52fe134472b6a2262149244983 SHA512 18bebd246eb5a4199322e90040c53d77c31cba770abc566a63d9a26acb9e0066b5d1159156e8e0b533d6bd096be3d8806e75ae4a155b678626aa24b28d4555d1
 DIST parley-21.08.3.tar.xz 8898172 BLAKE2B 65ef35c0de18ca0dd7f4b80ecc815f0d2906312dc3ce858d3d8de17fdf3a4bb3ccc8fb0ccf4ffba3a7ca211082709b2c27af66d3e9f48ab3c41f71b2d717b925 SHA512 5bfb0d44c8a3d0d62d0c9446e99c9c36173916c62b8d02c33eced4e3440fe9c19392515df837f00b132aa320c6df8a7ac78c2873e21e2ad4d90d03664c998a7b
-EBUILD parley-21.04.3.ebuild 1632 BLAKE2B 2a99b29e356acf226ce34010372bffc4ec91ad0d27483f491a37a1aa9a8bd57f423de5b2e9e2b351c091e5cebbde16d0b7d4dec9196a8f247e2ba06d7ec753da SHA512 18edbeffa3131c3565095ed7ec214103ee573b94f7de4c61b09797b190ced3bda01953eca93cc51799e0f4a4746ce3edfdd6e02af6262fd996aefd4fd7724b1d
-EBUILD parley-21.08.3.ebuild 1635 BLAKE2B caafa1a701f68cf8ee77d6b284c38b93425ba424e277b882edf757bb34c26cfad9a0ef9e871eb021a44523c3c6d2c279e555f227f22691d1908664561636c5f8 SHA512 c91e68233eef21fabd91fc475c738a4fe335fb574b60f706f93b132b80e247da9c124641feee1a5750649944f7d91d202165317f6e59157b1b46c0be208dc821
+DIST parley-21.11.90.tar.xz 8485880 BLAKE2B 82ca66bb1b8c56f4d0673047d20d5b10dc504876243f2f13cae9a2073617f8b9da57d7845fa9dde4b7deaf12f6059f8b8436d31da726605dd3a6ca59b44fe451 SHA512 85b275628aa7c2003c4a1b9139f8a8531bb18bfea4b381e971a988de977a716a2249e387d5037afc6a050f79eff19e34b7b81196163fab515684f15888d983e1
+EBUILD parley-21.08.3.ebuild 1632 BLAKE2B 51d9a3943e1c6d169c9164e68e08ff7671e1c74ab822833d1a8eec864027a69a1e43bad92cf5239ffb9aa136a3825d032c3fdfd2d42a7d3c25d532f66d04be63 SHA512 91c915697525a2c6f7b22d62a10f6122681b3dd1c8e89306a095a899d1805f60943764143a0c0d135531725ba9fd67650bdba006ed13f6aa1423bf7b4144ef85
+EBUILD parley-21.11.90.ebuild 1473 BLAKE2B dea3a63113fd5e4279f798aa59c50ee20c5ed3251e865dd3b86b41bfe8704841f8c4e081126d0fe7d172a91c9ab0cdc88f3a0731433a62e6400fb50fa569e616 SHA512 5ba3943e6715e71b63629e42650c112e1c2361d0ab29fa15d228068ef810421afd8748c5f77662ebf5ec728a8112dd7d0a86fada27226f34b9b9aef22f576e79
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/parley/parley-21.08.3.ebuild b/kde-apps/parley/parley-21.08.3.ebuild
index 32ff5b3c942f..fef894407668 100644
--- a/kde-apps/parley/parley-21.08.3.ebuild
+++ b/kde-apps/parley/parley-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/parley/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/parley/parley-21.04.3.ebuild b/kde-apps/parley/parley-21.11.90.ebuild
index 8f82c25017b4..0a616a899135 100644
--- a/kde-apps/parley/parley-21.04.3.ebuild
+++ b/kde-apps/parley/parley-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_HANDBOOK_DIR="docs"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,10 +15,11 @@ HOMEPAGE="https://apps.kde.org/parley/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
+	app-i18n/translate-shell
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -39,7 +40,6 @@ DEPEND="
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
@@ -54,9 +54,3 @@ src_prepare() {
 	ecm_src_prepare
 	cmake_comment_add_subdirectory plugins
 }
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Plugins are disabled in Gentoo due to lack of Python-3 compatible"
-	elog "kross-interpreters, bug #766333."
-}
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index 3b805809933a..7baaab2d3595 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
-DIST picmi-21.04.3.tar.xz 1369196 BLAKE2B 294ddf72382001d4a44355225d794a24aad14bddf1f8abdbb7faff6dae54b745c2c0f3060fc6b5a7dd38cf16a2e371d5cd519d33a9daaa8b6502ae6c47389c71 SHA512 8d2a27d8a1652407750f0d74ddceb6fb3d252c29d5691dea96153ccf0e685d0c5134ed204170d77148000e6209a9251fddef02fcb5a1179b0b04e652f6c34c4a
 DIST picmi-21.08.3.tar.xz 1369896 BLAKE2B 106c509f2cebeb78b9f9b6f69d582c6ed32fb31e20da66b83964cdf3117b284911d6649e4dc9fec68898e1fd7b03724929ac0a431c2ea279053197b5e433dad1 SHA512 792768cd7a7a2b9db2a1750276dbb78f45c4054481dad31e904c50489a72605913e5ebbeb7ae702971c5fe87a580ced86bd12ccce39ed21eeeb9f13698c636a9
-EBUILD picmi-21.04.3.ebuild 1056 BLAKE2B 42de067fdc9d51630168632bbe867ac5e2bb4da86328eb65e344ed5c5ad4f76864c682dc1c4263c8f0fc8511d1b770c092d0ba3cfa65939cff72cacccb9d47a6 SHA512 f83e445c08d9d19bdb7408b650548f8484c54739410c3f2ed20244fc0cf1c4a3d07328cf596cf633b69c052db18f4dcb4deaa525877a4a08430467b933c2cc27
-EBUILD picmi-21.08.3.ebuild 1066 BLAKE2B b658b9ff9c1ad9f4ec851f28912f6f738e0120d65fc304d82b946408807ed5f633a54536e560e6d2d4f1995985eeb76d15e3ffa449a33376824e06cb6047ecc8 SHA512 5fb86edc8e0dbb7be0c010510360f6ad0ec675ec4e21f307b06997e5be842a06a07ca140eba90c9d46698fe9d6a38158e9b8c92cac71e709d87181e6cd544939
+DIST picmi-21.11.90.tar.xz 1537896 BLAKE2B 1f35bd6af1534a964f5f074d811a60a9776700c8c6fc17f2fd6dbdc62c66b16c8c3aa0590bfb3f9e969c0d838b39400a41767490f1e55912864a9d24b7ae9844 SHA512 205f53ed02f414b89877dcd499ff94afaf8722aef2f65b16b8039ee25c40975e7d4c816e4def8c078829eda304041f0cb7c553d0c7d4415f0acb3bb6c2ab037b
+EBUILD picmi-21.08.3.ebuild 1063 BLAKE2B 54ed3d9271df5ff12e4142a7fd47b36cef6c326e872c06425954b7a23c5134e844a48be0b7afbaad7f28fcabc7ac9b27eefbb3f9fca1d860dba13501d1fa6dc5 SHA512 73e666e1948953293db38831681735fa991b611bb6a40a9a2577fd1a96be7281e44f36b21fc5ba1640718636c3bab008ad4bc45a8fa1a56bce5e04655f6c5925
+EBUILD picmi-21.11.90.ebuild 1066 BLAKE2B f16204e9256d5952d86686af73f52a854888403a575b724c260dc7f5ff12824b51dcd9dadc59f3202b85bdf1ac1ee29c7215f837612e084e8aac556374770724 SHA512 c9b1c5a99d1543f01ee014618f774b0144407151c5bd07edad8d5424d85040d7a92b691ff927e9b7c21d0836e13b45ca5535f44415660794f84e5aed81450fa0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/picmi/picmi-21.08.3.ebuild b/kde-apps/picmi/picmi-21.08.3.ebuild
index 77e0ae412ea2..e3d9c7883b71 100644
--- a/kde-apps/picmi/picmi-21.08.3.ebuild
+++ b/kde-apps/picmi/picmi-21.08.3.ebuild
@@ -17,7 +17,7 @@ https://games.kde.org/games/picmi/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/picmi/picmi-21.04.3.ebuild b/kde-apps/picmi/picmi-21.11.90.ebuild
index 58185eef7cb2..52f6d4b2d798 100644
--- a/kde-apps/picmi/picmi-21.04.3.ebuild
+++ b/kde-apps/picmi/picmi-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -17,7 +17,7 @@ https://games.kde.org/games/picmi/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index faafd4be580d..11c486b6c1e9 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,3 @@
-DIST pim-data-exporter-21.04.3.tar.xz 398624 BLAKE2B 18c1009482a351dcbd54f0db1623642a22944edd2faa1db54621abd2910c66c1807a7e001b373829a440df398219bfe97120a27f25447f2eebe34926d7612464 SHA512 fc700846b5af72e4b20a07be106200843ab3f7f16e15012c91d2a9364b18dedf5cadf3dc36aa9f11f15b676794d61194534c1a63173b4453ad1ee98ad90f933d
 DIST pim-data-exporter-21.08.3.tar.xz 397144 BLAKE2B 1dfcd5bc209272f3996f456f898583ea12fc94aaf05219c326ce84904e453311e485313b9512cc5ae57e7bcf69f0de08d09e99a7c87902de206431d0b643efef SHA512 c95deec046493383becc990be54bace0b159bd6f8f116db40f78cd048288f5821bac8aaed6784d511304a9d5dd7dc62c9b529565208ac7cb0e1a1e1353189379
-EBUILD pim-data-exporter-21.04.3.ebuild 1648 BLAKE2B 1d92927f49bf9cc719f91630133cc0977cd69d54adc618d9c0866a7310eab035d69be1f6f778892e474447892f13f622b7a44d5dda0ff77e80f5803258a6a198 SHA512 5d4cc967e21e0ca6f51f05d3b9eb130357a2cbd6dfa83e7dfee8fc91d3b4781e47b831a52490fd6d562259edd5bfb5c955d6afc41701cc1a24bdc47ba7eb7489
-EBUILD pim-data-exporter-21.08.3.ebuild 1644 BLAKE2B 9b9c4f52fa94e9c44040a5106fbb61c70d74d55e9853c1981ab96e2265cc2317a0c590eac17db3de1885284c1b389f8fedcaa6647b3283621bfd983ae3e37648 SHA512 ffd7da315c379983c9b4bb7a95983ce816f0d7d04d7709f65c39a44e7602a5441d9a6fc828cee80e7428ce98f5f8796bdbce4fd3dc84de2b6731ec2a62bff50c
+EBUILD pim-data-exporter-21.08.3-r1.ebuild 1678 BLAKE2B 8434f4fe31c6c28f86b82d0d886f4ca18afcf0a7e9ef9c235914bab4170d4fcda68af0bf027e7a740c581247c8350e8f8cf6dad93c97ee75e0be95cc9a144c26 SHA512 a0bf2ef811a877b04861df8c4a242c863fb5684d1086f89cbe41067d268915eaa7ee7c72c56561106f2a841dd276041245d760d28c3abe34f0d6bc18de60435d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-21.04.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-21.04.3.ebuild
deleted file mode 100644
index ed6c078b7e88..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-21.04.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE="https://apps.kde.org/pimdataexporter/
-https://userbase.kde.org/KMail/Backup_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # 11 out of 21 tests fail...
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-21.08.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-21.08.3-r1.ebuild
index f9169ae123e4..d4fe5dbc1ade 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-21.08.3.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-21.08.3-r1.ebuild
@@ -17,14 +17,15 @@ https://userbase.kde.org/KMail/Backup_Options"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
+RESTRICT="test" # 11 out of 21 tests fail...
+
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
 	>=kde-apps/kidentitymanagement-${PVCUT}:5
 	>=kde-apps/kmailtransport-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
@@ -49,7 +50,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT="test" # 11 out of 21 tests fail...
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 77c7c5266266..8e83bb0c4ca9 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,4 @@
-DIST pim-sieve-editor-21.04.3.tar.xz 458072 BLAKE2B cc1edb9e6720b83cb910c85e8df647cc4e1e59e20146824f57dfa37aea4e657ec4227bfdb47f58e37beb436d997f5b092aa4ae4319d22ef3e7d2d4dce572a8d8 SHA512 017f6825ae373ca8201be593f11f61ef2c26b5490776d3278ba77c61e961e25746e79a405caffef0e8c7c9218161a6b28ec09e195df1a193ae8a72c348a6ee74
+AUX pim-sieve-editor-21.08.3-unused-dep.patch 1666 BLAKE2B 0cac029124e25dc66eb31c12a5e7ffac07eb9787cf4cec6d7931d415b33b527965e7bf6150d1362f32ae11fdf3ca19927b7118ae7d0c588d2a2c13101ba993c9 SHA512 d75742ed7765a964f4404a388a70b9768983370dc34a7098b5ab9abb84d67e1c8565ed34708d4b60f94b2b27a4101b47d285cfaf569a1cc39ed77d4772e5c9dd
 DIST pim-sieve-editor-21.08.3.tar.xz 458408 BLAKE2B 92e3afc0802dfebae76e630044920d762ca3d05a7e576ed94d7b1d153de5269abd20cff7d0c1170da080776e5e948f621d0c8ccccbcd87d1381fbb722b29c0de SHA512 6aa0455b6dca25bdf6ac1413e262a710101a533fe56526f36a0584c3480b69db8f87ccd88eff01e3001b907cefe1efa3dd1e2c63df62f49b190f73b277d84ce7
-EBUILD pim-sieve-editor-21.04.3.ebuild 1446 BLAKE2B f615dab9f44c9b3c0b462116d90f78fb167129777002d69698621b2eee7dfadfe7a3812d86fb5ec78f58598a0081c87ea8acda97074c531ae40e7ffc821c8b89 SHA512 6368567a8b2297b51f97fbc27ad1b500edc7d1c46a9f331f465812d5929e03182b92d477632401a96910dcf62a6d4cc69f266d2fa852a30df50c98c5ced7d782
-EBUILD pim-sieve-editor-21.08.3.ebuild 1435 BLAKE2B 4c07deac95f3637d9c23e017f5cae1b279239b6c8be3b7d8f011ff3fa77108a56ec785e3e4c04c1b50f3a6fac155bec774aff9a79db9f421c58c985abaa135e8 SHA512 d81316263ebd9f8654f427844addbc65bc329b935aff7a1235c5b228867a35ebfbe16b6c36c47247f03d4d418bf657e940d2cc099c50b31c2c7d56eab1de4d41
+EBUILD pim-sieve-editor-21.08.3-r1.ebuild 1481 BLAKE2B 16fa625c6e215abda2b241f47eaff55e955dac5d6ece609833a48f5be868722749d6dcffea8d2d878bf9ed0f4620d1416461696740a3d83b02f51857af6df612 SHA512 aba3cc099b80a2ce87abf37cd577ec2e8807dfc7cdd6821eaad3e2b3f0883975f9430b981bd9baa64a7e1e52aec5755131c25a8020dc6f4f96a7c212482c7fd4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/pim-sieve-editor/files/pim-sieve-editor-21.08.3-unused-dep.patch b/kde-apps/pim-sieve-editor/files/pim-sieve-editor-21.08.3-unused-dep.patch
new file mode 100644
index 000000000000..c3a1bcb87540
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/files/pim-sieve-editor-21.08.3-unused-dep.patch
@@ -0,0 +1,51 @@
+From ffaa4290742302dc25976abefc7a7888fee65fec Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sat, 24 Apr 2021 20:46:28 +0200
+Subject: [PATCH] Remove unused KIconThemes dep
+
+---
+ CMakeLists.txt                | 1 -
+ src/CMakeLists.txt            | 1 -
+ src/sieveeditormainwindow.cpp | 2 --
+ 3 files changed, 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d529344..a6f5aaa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +59,6 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network)
+ find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ find_package(KF5Crash ${KF5_MIN_VERSION} REQUIRED)
+ find_package(KF5Bookmarks ${KF5_MIN_VERSION} REQUIRED)
+-find_package(KF5IconThemes ${KF5_MIN_VERSION} REQUIRED)
+ find_package(KF5KIO ${KF5_MIN_VERSION} REQUIRED)
+ find_package(KF5DocTools ${KF5_MIN_VERSION})
+ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 565851a..c6c8914 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -85,7 +85,6 @@ target_link_libraries(libsieveeditor
+     KF5::MailTransport
+     KF5::Bookmarks
+     KF5::I18n
+-    KF5::IconThemes
+     KF5::XmlGui
+     KF5::PimCommon
+     KF5::KSieveUi
+diff --git a/src/sieveeditormainwindow.cpp b/src/sieveeditormainwindow.cpp
+index 73e1c7d..bd4258b 100644
+--- a/src/sieveeditormainwindow.cpp
++++ b/src/sieveeditormainwindow.cpp
+@@ -17,8 +17,6 @@
+ #include "sieveserversettings.h"
+ #include <PimCommon/KActionMenuChangeCase>
+ 
+-#include <KIconEngine>
+-#include <KIconLoader>
+ #include <KSharedConfig>
+ #include <PimCommon/NetworkManager>
+ 
+-- 
+GitLab
+
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.3.ebuild
deleted file mode 100644
index 98cfa8018c3b..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant for editing IMAP Sieve filters"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-DEPEND="
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.08.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.08.3-r1.ebuild
index 6271f76f494e..6695b71a915c 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.08.3.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.08.3-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Assistant for editing IMAP Sieve filters"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
@@ -46,6 +46,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package telemetry KUserFeedback)
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 0b7fe0fe2a77..6885808f0bdd 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,3 @@
-DIST pimcommon-21.04.3.tar.xz 369372 BLAKE2B 4f378ae377b664839e7e7e6bc7d00565fb7ba24371582277575c23e989fd722945f0c78f187e7fcf931a26b417380e3244bddb682a23677f032a6f8faffaaa41 SHA512 b2ff1ff7942e49676aedfbe923e3a3bfa26e170007b58d2ee07d80da466b4d701fbf0707720cdc10304c7c41381c3503781993e83f88414546e605896817b320
 DIST pimcommon-21.08.3.tar.xz 368900 BLAKE2B 293d4d8ef29525bc7fdf439d7b8e356af5c8c959f0a08c1cd99b62080b605155dd1a44ca10891c8cd3d49ba9b2336d92ff766de3308f590862e9afd054f74967 SHA512 cb5c285bb92119507b09dbe9ca2fc1ec614ff23c33e04e4c821d499195aba48df00b79185877e4caf2fd6022dce7d1912bd83979049e66d0c5a812c14697fe7e
-EBUILD pimcommon-21.04.3.ebuild 1724 BLAKE2B 20da2b69b8ad110e29279fad84e6a46f7241b6bb8d42a2cba96adf67d0f05e3ef017cf0ea564ed70808ab45d92bc37971064a5939fd4c6f3d0c2c39a98adc498 SHA512 da560a66d85d5157be2bbbe170bd522114b0fdce44df86b4e460dfdc020a3f66912c8ba9fdb74bbd04022eee0225dc0e1cdc7d323aab256277390546d8773ed0
-EBUILD pimcommon-21.08.3.ebuild 1727 BLAKE2B de59bd5c90286ed26a867f8e5ade5aa80ae1f010bd4b855a28a0ade277b7da1bc4a25a1a5d9f613c4c4290d91662e11cb7ff9c79e5a5847ac86ff6a331c9850c SHA512 b3fbfa94f8077e2028a89a136f60dd9f752d5d1b73829ab95e28fb71e65ffc1acf6169fa617a6e49a7aae7a4217cf92603b82cfd3092fae3ae6d72da64158cee
+EBUILD pimcommon-21.08.3.ebuild 1798 BLAKE2B 37cd8a3515522c69768fdbb2efa68a1f776a4de121445d91f1620fc5555c40c1da40224fc3cb69e95b392c87c18a2e3585febfe3987d00fb51ce73f7171ed6fe SHA512 17ffc20cf78e5477b6bde4536d27faf0de1fe0e4f0e84652e6a170da4fec76146265e857739de50f7212dc9d716ab51b642d41f3ada59d728147d6fb3622b91b
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/kde-apps/pimcommon/pimcommon-21.04.3.ebuild b/kde-apps/pimcommon/pimcommon-21.04.3.ebuild
deleted file mode 100644
index 4caeb7ad81e6..000000000000
--- a/kde-apps/pimcommon/pimcommon-21.04.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=kde-apps/kmime-${PVCUT}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/libkdepim-20.07.80:5
-"
-
-src_test() {
-	# bugs 641730, 661330
-	local myctestargs=(
-		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/pimcommon/pimcommon-21.08.3.ebuild b/kde-apps/pimcommon/pimcommon-21.08.3.ebuild
index 6f3a5489c88a..2a54f2b43ee5 100644
--- a/kde-apps/pimcommon/pimcommon-21.08.3.ebuild
+++ b/kde-apps/pimcommon/pimcommon-21.08.3.ebuild
@@ -15,12 +15,9 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
-BDEPEND="
-	dev-libs/libxslt
-"
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -58,6 +55,14 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/libkdepim-20.07.80:5
 "
+BDEPEND="
+	dev-libs/libxslt
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}
 
 src_test() {
 	# bugs 641730, 661330
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index a19df5837c08..35f1719b3efd 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD plasma-telepathy-meta-21.04.3.ebuild 919 BLAKE2B eac14f096d35e38d013f3ce0e9c22d6789ed4c9283c091d6649be5eb3c988d3a18d9e3d22ba2b2d09428092bba6dd541147a0790658be73a53a28c724e81c0e1 SHA512 16d5447f93f7be39ed619da5ac843fbb8a58b342def5cc60f225102c8d28007ef1eb57848944ab1c4a28270ec6dab8dab56b15dde16a43824b354d5eaad66a84
-EBUILD plasma-telepathy-meta-21.08.3.ebuild 922 BLAKE2B ceb08ea02e5899bcb3a55d2ec69824f0b0fd9fdfa4db5918454fd869385394fb8186efad6b1370f78fcd98502907a45ebd10655b347ac64d6aa14dee0ee05fe9 SHA512 80330ec1733676f89ec593fb4a51caf6a4c5f6ee978e6829f8c9dfa3eecf8c8f5724eb17c871547f886d714c4d259f6748bfa3fd2672cf52fa754517d2584cc9
+EBUILD plasma-telepathy-meta-21.08.3.ebuild 919 BLAKE2B 260c3cd777634138a80ce5c26c3d722cae311f2a9392e7223f45511761fbb1a1439736000e0811a5cfc2f92b74a48d5c52262d0c658ba451efe4b324e8079fe9 SHA512 e87cf98f2a16e87a35a3a16888dff918a833390ca2c8ceadae0625a7a95643e2e8e2de9871d8252d65660007eb0c1be6e52227d7c5510e1105347999ac18893d
+EBUILD plasma-telepathy-meta-21.11.90.ebuild 922 BLAKE2B ceb08ea02e5899bcb3a55d2ec69824f0b0fd9fdfa4db5918454fd869385394fb8186efad6b1370f78fcd98502907a45ebd10655b347ac64d6aa14dee0ee05fe9 SHA512 80330ec1733676f89ec593fb4a51caf6a4c5f6ee978e6829f8c9dfa3eecf8c8f5724eb17c871547f886d714c4d259f6748bfa3fd2672cf52fa754517d2584cc9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.08.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.08.3.ebuild
index eb6e8c0e009c..f5ffab02bc10 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.08.3.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.04.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.11.90.ebuild
index a4cb5672b62b..eb6e8c0e009c 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.04.3.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.11.90.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Plasma Telepathy client"
 HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 089223ef3ca3..10b79eaf88c4 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
-DIST poxml-21.04.3.tar.xz 43540 BLAKE2B 97c42e772625c82d1d2f6f994228eb8159130875450580d8e292fedd2f1b048d8672987929c256e07b5ae3d6735f602930917993d3c21738d32936cd4c8558df SHA512 52647f1574790e7f0c444e4a0ade0789da6034db0e68f8a9b92606c8511ca06c7f317ead23b4cb72db5330cf1e41e58646b98eb2c3bec47c6b8c813c60969df8
 DIST poxml-21.08.3.tar.xz 43504 BLAKE2B 7719438eee9c9dab8bf0ff2acea6259ac97f095cdd1c90a069ed9a95a2650e0e5033386bebad93d1a9206a5c9dc7977fd931537d8675e653c96670ee6afb27c2 SHA512 1b86376b408a38947f426f44f45f0a3b5f8df19b389e309ba80500ccf50efbac05f3e8d724786b480a43e49ab31f71412d41d9b581405d8fd8b65e3e29449a91
-EBUILD poxml-21.04.3.ebuild 409 BLAKE2B e44956fb6f363ab6ee88a386442587d7f35ed73a05f280886ec45170a79b7bf3691516127a64fa72d67e3475bcea1bf9bc7f006c35150dadb037af9a52d952b1 SHA512 f29398570744814b07ac3dc9a738f2c99f937407bf53a9fcb9c215fe48ef6c11dd2959dd4b2ffcffc9f9437c668635f0a0980d011292f2f1778dfb8d204312bd
-EBUILD poxml-21.08.3.ebuild 419 BLAKE2B e34d7e606f31dc73563cc642c9189a4291741a30f6b7ad7b52802f97727f5eaf620447622476949c5b65c33cefd67e82b3ae9f6769d1849ef6851f3a79c63a6c SHA512 f1154598aa588945ea0cf608937ee23bd0a3b7ed2c8a14955e65f796187456ab05c0784a1856dae66ef4eae88d26360354cfa9b581c268d35a7fe39b594fedd6
+DIST poxml-21.11.90.tar.xz 43540 BLAKE2B 8f6690c54cac864a5561b6a981acc91f98d74e8cf8edfc1ac224b9c53dfab62db410e9248ac95ccb90f187f333aec1faadfaa958fdcfeb300b60af193455e9ed SHA512 f19c6832004e7f1e4ed1efc769aa7839cd5fa8f98b38b78906472f53847106464653a1d2c2193e4fd18f02ed2ea121c650b623d17ea252586d9fce62a5957d4c
+EBUILD poxml-21.08.3.ebuild 416 BLAKE2B a990de025fb26a38b6bda9b839e2c7a950659c2225697ceb2546ecb1ac8f8d42942da4f81fed26fb5405204c52f6d5c7518f998fd4873caf0078138e70ead7df SHA512 a430d703ad2d966f9c58b7c163543c32fb3104cd2dd551618265b38059a90fe382f2d2008db033b01534ee0f77be37a25e5d2e5c1c4f8c5abf93931c3570e7a6
+EBUILD poxml-21.11.90.ebuild 419 BLAKE2B e34d7e606f31dc73563cc642c9189a4291741a30f6b7ad7b52802f97727f5eaf620447622476949c5b65c33cefd67e82b3ae9f6769d1849ef6851f3a79c63a6c SHA512 f1154598aa588945ea0cf608937ee23bd0a3b7ed2c8a14955e65f796187456ab05c0784a1856dae66ef4eae88d26360354cfa9b581c268d35a7fe39b594fedd6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/poxml/poxml-21.08.3.ebuild b/kde-apps/poxml/poxml-21.08.3.ebuild
index 0d5f6515027d..3e740f55354e 100644
--- a/kde-apps/poxml/poxml-21.08.3.ebuild
+++ b/kde-apps/poxml/poxml-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/poxml/poxml-21.04.3.ebuild b/kde-apps/poxml/poxml-21.11.90.ebuild
index 53f8c5bfce65..0d5f6515027d 100644
--- a/kde-apps/poxml/poxml-21.04.3.ebuild
+++ b/kde-apps/poxml/poxml-21.11.90.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"
 QTMIN=5.15.2
@@ -11,7 +11,7 @@ DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 2040bf6410ec..1a6dc27ca8be 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
-DIST print-manager-21.04.3.tar.xz 263964 BLAKE2B 9e2646b618bd4b64d811ae920880414ca11b78dcdd74a815194499929d453649bc08d0a9b3043d472cedeef10ff66acdd64f63e499c6d68ced24cfda4abcc898 SHA512 6ee679f46301213dcccc15212f78c23aff173d9fab2f26a492cc7e07e95c5f1fa98a2feea5a42d3f0460ac3b7ce8147f5624cdc36c4def74f15dd2b924f9412b
 DIST print-manager-21.08.3.tar.xz 270280 BLAKE2B 93e24a65f8f46d8b076a4973f4fefa7e2d9f9394a68517e236268b7426614a2a672ed85610164f68c8518023cc6dcc82e290c0b321ceab3253f098c11bb9ac4a SHA512 81287517738ffe06c624d67b28c6e6a962e25d2367f32e78a9b7dcee4de986314643667fac7e249e055d734bed39e001a6570b9149937a56b7545437ad07bd42
-EBUILD print-manager-21.04.3.ebuild 1824 BLAKE2B c50aecf8ee858a02fd60cc08358299938f8f0c6a231ce9cab0f7576e1b89595b42939ac65954600d6e7bb5a79c1342f127cc3a64a48cb5fb93733192f973aa0e SHA512 9eee73edd987e659a6eca5bc0d1e94b4bbf26035f13115711e4e75979cd113d37095fd0c78416aa87557ec92613ed3c86eec345df99954f5c3f9fc04b2a06c44
-EBUILD print-manager-21.08.3.ebuild 1834 BLAKE2B 1b88b0fba26c9d0e866647a866c1872fa54958428b7f50cb4898329440589550176ce185e74b4b373486dc3c2f19a582390aa7175b387ac54f3b24dd16fc87a5 SHA512 8014c7f4b668980fb889f405afaf8e1575188ccc109030332d3d8e00a7642ba49e59c97ae7e129fe44f1462887ab7a12d8d19830faf4e9c5cacca4035cfc2d05
+DIST print-manager-21.11.90.tar.xz 271724 BLAKE2B 494609b4a934a4f830d9fea907ecaf193b2fda8a2f670321e98666adac7e7d58cdfd7f0d9d49e04fffbc73bf868fa703dd76ebc8e85f5a3a2f7960a2fdc64293 SHA512 b87b39f54a7f275eb5b9892b1f79432e200411997f91d889fe21c0f23a12dff24e65e9b01a191a1cdd6b4a7661ff25191b65ebc84687b021f97ff76424b73840
+EBUILD print-manager-21.08.3.ebuild 1831 BLAKE2B bc566040aeac3a17b7cc0658d3729021afc42c9be4efa6dc1269a656c4e60625f820e50f01851238038f4ee24c17678b68355cdf6cbf1afb862a5989fb0760b3 SHA512 6b890c6035a125b9748b81da61a4eeb3aa04177c745d20969b9bac3b9773d09741522e47f601314e770e24080955a77fb277f18aa254d02162e9068ac99d2cb4
+EBUILD print-manager-21.11.90.ebuild 1834 BLAKE2B 2eeb262818eb05a52b351c76aabb6e67a6d3ead479b66eb24b063aa6205cac5cdcc7db88dca690f929253662b9c8059382c8672d1172a5934b471fcfde29be46 SHA512 011a303a7c1be761094215d5da4319529713480ab4bb23a46fe98363c6c8fe5d1f66d268a1fea88164bd2977e7b65b6e8a0f572b315bb5077b0399e4740961cd
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/print-manager/print-manager-21.08.3.ebuild b/kde-apps/print-manager/print-manager-21.08.3.ebuild
index 25c399835a97..87111717387a 100644
--- a/kde-apps/print-manager/print-manager-21.08.3.ebuild
+++ b/kde-apps/print-manager/print-manager-21.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Manage print jobs and printers in Plasma"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+gtk"
 
 DEPEND="
diff --git a/kde-apps/print-manager/print-manager-21.04.3.ebuild b/kde-apps/print-manager/print-manager-21.11.90.ebuild
index 16dcf09f0f9a..ca84e3071d56 100644
--- a/kde-apps/print-manager/print-manager-21.04.3.ebuild
+++ b/kde-apps/print-manager/print-manager-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 PLASMA_MINIMAL=5.16.5
 QTMIN=5.15.2
 inherit ecm kde.org
@@ -12,7 +12,7 @@ DESCRIPTION="Manage print jobs and printers in Plasma"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+gtk"
 
 DEPEND="
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index 4f701cfa8774..56eed07188c2 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
-DIST rocs-21.04.3.tar.xz 1547728 BLAKE2B 7088fa48653da5a5f4fc2f8dff9fc38233e15701a1139934ae06660e257a579db0c7a442305daf75129cf968a872b45a564ca563609e67ad31f6133d11b114d1 SHA512 f097157f7664a637448055a2b9142dcb4b0fada3a811f8efa1f37c3f23f486b613aac367f4248db8efc3fbe6ca8c350b5c280c3e382b8bbc331e2659a32fb1fd
 DIST rocs-21.08.3.tar.xz 1554836 BLAKE2B c5353530c24a10fd89655075411207f649388ad67b94b1e239343080e1a33069f86759e9e91f9c446d96341feda497b1d96ace8b5e4d137aa6ebdcf21c58f144 SHA512 0e66198bb5796eb2737d2d38748aff331c9e951e2863f329ae8126c0a79e26944b0b51b53b4ba4e3e74c86e893e0c2fe66aa0468015fe1dde2b904ab7d0f5343
-EBUILD rocs-21.04.3.ebuild 1299 BLAKE2B 15f68280e4f8b2134b2144ddc8107e92836adeb91ff9e8e232f10d9295734c826ec71643e7655c77f0e4e3d002dd42e7ac2396cb1a1fa9cc25d3400f219b95d8 SHA512 4ef542ad0cb0c12abebc71f6b325fa146ca59a70b3b87079a2d1bc77c8326658c14dcf3e9a5b720863e8a36ec11244de93436cdd8a92dc4268e7a3938c748757
-EBUILD rocs-21.08.3.ebuild 1286 BLAKE2B 6c4f0d69bfe9abd012e5dc0a5f8f80e632c741a83d41f21510f32e61715cdea9f65b2e587c765df7ad9eb6624bd3dde14918f710321090ef4f7a8399f0f0be05 SHA512 a6ae0829ead78399dbb74faf058efc71aed06099ca05d4fabc801d874a97432a3b06f844989bcc87ecf3cbbefa4537252f5855884cf7ea48d9dedf1e0b1253a3
+DIST rocs-21.11.90.tar.xz 1558868 BLAKE2B 980448284900c17c4895e47b9807a167c8b0fd508c8d8eeed268ca5e073d9602eac47108c99fd83d6d97095e8a2a5c6ddc85c3a24f5713f0d5af5bd9f71c586d SHA512 079bd5c93f0f8d4498a60cfb2ec7cbed03eb5602bc4773e1326c22d4585bdbf1aaa6868189fbad065373027986c4afa44ac32e519efacda86acf4863fd2eb8ad
+EBUILD rocs-21.08.3.ebuild 1283 BLAKE2B a12b0fdb9277b355e40998363a63978c4e4f4228f9cb049ac32d6699006a43b6faee4a6b12f99fff6e38f889791028d2aeb923ef40ffbad15c598e334a88046a SHA512 10221a72bfb0b665e16331e683007e43aeb315c2ac00d42a612aca4f861df8558ffcbf9b2be4b17ee06f9937c3dbafa91fc797c309d52b614cfa3e244ef8e095
+EBUILD rocs-21.11.90.ebuild 1286 BLAKE2B ba1322b453a1d232a5c393c37558d20f2b2f08d4c56f81dbedc29d7cdb9cb43f92fe289a1bafb44e442abf400c9bf6c884cb0b48e250e15823fc6edc8614c0dd SHA512 770d87412c9ad91e8b0e031f33f7ccec22ffab5723293981ab362b9f66bc354bef26b8a2564591127e65e7101bae190ec5ca22a333eb1182b81fc088f6ee5041
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/rocs/rocs-21.08.3.ebuild b/kde-apps/rocs/rocs-21.08.3.ebuild
index bd5d8cfdec89..0abdaf550580 100644
--- a/kde-apps/rocs/rocs-21.08.3.ebuild
+++ b/kde-apps/rocs/rocs-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/rocs/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/rocs/rocs-21.04.3.ebuild b/kde-apps/rocs/rocs-21.11.90.ebuild
index 22631703d221..eed89cee800b 100644
--- a/kde-apps/rocs/rocs-21.04.3.ebuild
+++ b/kde-apps/rocs/rocs-21.11.90.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Interface to work with Graph Theory"
@@ -14,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/rocs/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -46,5 +47,3 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
 "
-
-RESTRICT+=" test"	# 1/10 tests currently fails
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index 8b27df0c7448..1e4e210da16d 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
-DIST signon-kwallet-extension-21.04.3.tar.xz 10780 BLAKE2B 1253500a0317054d2a965facf965d903e62f09eb37c7d23fdd99338d72aa03b43e321c78de47f0cf09f6fe098776b2225b21d73223f6bb5c506af058c5836135 SHA512 26ead682a111548b1f6c4cb6c9c9dbe53613bfaea81c835a3c30d1af2eee0f571f0dd179e8a837d719893f482dd22479c413e23c6f212c7615484be816224136
 DIST signon-kwallet-extension-21.08.3.tar.xz 10772 BLAKE2B 2e0eefca1d66c8cad9d2e7cc29fc3b4bcf03b396ae0f3021b11b7689fb62f732bae2f624740ee87f6241247907a076d377aca9b85ffbf1a0563f0ba7aeec32c1 SHA512 b1b50af890c1666086c7fc236dac6f85fd2c841ce812036186936ceb7e21186a1e87dfefb24714900cdcc609b23dc727ebc95156e385f12ee59572a3b366f736
-EBUILD signon-kwallet-extension-21.04.3.ebuild 375 BLAKE2B 68f8c1594f83136252ddd2208f157d263ea8be339055e428f19218778f7e6ceb455331c9abc095f6ac47634f8f436f35a7986df3f6f11685f918f13282672c33 SHA512 3a619406eaf7002c5df89a350946b6fb772da642786eeaf88810a4f7e58f7183cadbdc190efd013fc69b5b9f0d49f5ffee19f4836fd22fc75a71a6e311323df5
-EBUILD signon-kwallet-extension-21.08.3.ebuild 385 BLAKE2B a76ebf320193fd0cab92ed949aa87c1bcafd77e73c14c4868b783fee636cece6103fe577256138064994f2a5db4be1969542be91c0190e57bf7cb397c0e6259e SHA512 1b063aefa0ce4c7089543466074cc025d429485877b73ed34bc0d0e36ae7a328679592ccc655052b8cd10fc1863a5562aa3837f2e54ae6db79a899b11a0be681
+DIST signon-kwallet-extension-21.11.90.tar.xz 10768 BLAKE2B bbd8a1ca6c8a2602738889cd0297c84143cf69abb8a5f0c982014db29878fff45aaf7e795fb723ae58f67634579c02a81d025cdeff176880308666346ad0f40f SHA512 c87887e1a2ffb3457b622f91c4b7692b72d44c006ea80afd97520b60483a8e1731be010e33f03b9b940994960b4eaaf3644bcad63172a8b12979dd7b3058a0b5
+EBUILD signon-kwallet-extension-21.08.3.ebuild 382 BLAKE2B 7b9796ca27b21815b84f80aa9255b3643a54a352cf32bfec9b9aeca6c3b2c82b3faf4a53c2af859b36e8301514eaaabc52a0679448319ea73c30bee7500a53be SHA512 d14274bf789a508e7d9deb7eae624637ac5ae330d5d393d9b60c6d02b1caae3e1ec7dfa4699f6226e93a598b792f9166117d3db635401f3c857152f903fbeabf
+EBUILD signon-kwallet-extension-21.11.90.ebuild 385 BLAKE2B 48de493476727f3e1a1bc4b7d696aca3d8658ebe3a0061e746d45e5ace06779919f4743f38c124b572ffb789642433f39ccf18327e82a28b458f79d33c54629b SHA512 7d76b6c2d739b25b56cf9ca7572268dbb38fdefce20935746b18eefefba5e264db2f51d13396fe46644f94f05bed849941806f1f89a33082f94f51db558d7ac1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.08.3.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.08.3.ebuild
index a7ef94eed799..08d8d1f73732 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.08.3.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.08.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://accounts-sso.gitlab.io/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 DEPEND="
 	>=kde-frameworks/kwallet-${KFMIN}:5
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.04.3.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.11.90.ebuild
index 7ad6e4aa692c..3c28b47d09ba 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.04.3.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 inherit ecm kde.org
 
 DESCRIPTION="KWallet extension for signond"
@@ -11,7 +11,7 @@ HOMEPAGE="https://accounts-sso.gitlab.io/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="
 	>=kde-frameworks/kwallet-${KFMIN}:5
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index ecd81dfea059..d064216e02a0 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,6 +1,5 @@
-AUX spectacle-21.04.0-implicit-dep.patch 1179 BLAKE2B 62bd639d12a32b6faea613608160ada4854dc780b999e7b98204eea36b82f3e001097cb9c22d08056cd5765e43139daa9c02b7c74d79e745aac0d3021b5ce85b SHA512 d2257372821524a471ad75617df2f631a73f7b9a09e59adf1775d60fd0bcff393df16382a5fa9b109a7ffa8ca5684639ee565304a99b854272f8ab28570dbdaa
-DIST spectacle-21.04.3.tar.xz 1175024 BLAKE2B 00d5ca9bf905b889e1ebbd510efc7d86571533e53206c5c65130d8b018d9e1941e283b698baab497928c6e3255d067ae6b4fde279945c0d56ed7ab7e9f226e83 SHA512 86af85d322c8d1231c4c47edaf886077dcfd1b20a33d6022ef5a8a543261e3d9f8c7b33957140d32f346c3dbaa87e13c9bed25b391771185468b4994e7ca3841
 DIST spectacle-21.08.3.tar.xz 1242704 BLAKE2B 3d9d7b6fb54f6cab7ca86d97daafbc2f9b256029aeffcf30aa2b75c7592616e87a61ee586ca2d27d5af2a5caca2829d7a1fae9600c43503043477abeef91e5e9 SHA512 03568bc1865bbed143bd0177835cc0bcd49444d9c336ea06ba5a43bbdbb4da141a29c2b58d6e95de340126029066499a988546957e79f161e05401931d75a078
-EBUILD spectacle-21.04.3.ebuild 2080 BLAKE2B 29382327138d45a1106324b76115bd3fb1058444ae369ada587b648443693ad797a0d408dd4ffbc716c0905a94325b5992db52831256c7b28ed467f0e1275e2a SHA512 21d3511fd496855ba6320e0a66fea8de913a6f9c1305d510b5cb10e0e92c65a4f21d051cc33d822865ea0609fc514bc12a68077cf9eaa2a937aac54c24e9f247
-EBUILD spectacle-21.08.3.ebuild 2017 BLAKE2B 90ff3019564b46e9372c67f05b319d62fb5f9643f1773f6ec5894501683be24322b05478ae8bb8cf17c9912ff98fa814d1f3ce9912ccb56dcf4df40a7f7770e6 SHA512 51128618a7969a296bb27bc0b5f2d71612f3ac0233f7ec57cb5c7f0bb06a3de74814b549c76b7dc29e587ed99b4d514ba249027c89b9b4af999f51c18798ba5f
+DIST spectacle-21.11.90.tar.xz 1253580 BLAKE2B b725702eca37c886de05a494ce8b806cf212efb3c339b289927b6386ed5552d1462eef29f250b9417a4e83cf53f870cc28333b40a6aedc70070431d28e192ba0 SHA512 4549232cc6621f352419c14f4a5221b38e236d272b03ac52395943a410aa16be80651ab2165d4fb2201c33519cafe8fdfdd26fcea76dd683d8afd4fd990941db
+EBUILD spectacle-21.08.3.ebuild 2014 BLAKE2B de8245a60b40b74b72f58a7fad4eedc2204154ea154e50a41a29bf3c0d9b89dadd67c729451607fd306d5795b299e5117a587541c07f3135076d2a3f04632250 SHA512 6a7f9df24baca157cfd04b3f1bc810dcf7819a1ef7cb22ee8e9abccf0690e3d181814b635e4b3faa810483bd1d1435265a3e34c51aefa58c7d986de914ea19e9
+EBUILD spectacle-21.11.90.ebuild 2017 BLAKE2B b9e5322af6c6241674d82b0a95e5eeb997847704fc1f4ca47aa88c2cf60657619bb8e2b1073aebd59b5aa2fdb0a5b1e187c646a44db03ae2bc0a102dfeb6ea59 SHA512 8d31e615dad05b96b23d88da4f87a447310ffd42075bc9ae69fd6b7628b1895d1690b3c08b11e2bafa2282f4cedc62265f09b30833b41ed7b3b5e6aa9e11dda8
 MISC metadata.xml 627 BLAKE2B 55becdc1a13a5b029e58197cb5c919a8a0c34c04f23e24199252234b2c05fad6bcb7e5ef9a4537be892087ee739b091f1025361bfd5e8dee91262e90b14cb87e SHA512 c0db82c29fc878fec343896bbd1e61ad99098681f2d23a2b0bad6cab18f7e8f5fdba5a0b53c56be7de29c36b83ae822deb45816a41e6d8131bb9ca56d87792ac
diff --git a/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch b/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch
deleted file mode 100644
index 572cc501aeb8..000000000000
--- a/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a4450b62365d5e7c511e9855d31a68808c9bcfba Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 24 Apr 2021 18:22:10 +0200
-Subject: [PATCH] Add missing Qt5Concurrent
-
-Implicit use via KIO.
-
-See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt     | 1 +
- src/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c63dca..7aac0d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,6 +40,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOR
- find_package(
-     Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
-         Core
-+        Concurrent
-         Widgets
-         DBus
-         PrintSupport
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3cd737b..c715a29 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -69,6 +69,7 @@ ki18n_wrap_ui(spectacle Gui/SettingsDialog/GeneralOptions.ui Gui/SettingsDialog/
- 
- target_link_libraries(
-     spectacle
-+        Qt::Concurrent
-         Qt::DBus
-         Qt::PrintSupport
-         KF5::CoreAddons
--- 
-2.31.1
-
diff --git a/kde-apps/spectacle/spectacle-21.08.3.ebuild b/kde-apps/spectacle/spectacle-21.08.3.ebuild
index 266f3b132d79..8c7049030a1f 100644
--- a/kde-apps/spectacle/spectacle-21.08.3.ebuild
+++ b/kde-apps/spectacle/spectacle-21.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/spectacle/"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+annotate kipi share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
diff --git a/kde-apps/spectacle/spectacle-21.04.3.ebuild b/kde-apps/spectacle/spectacle-21.11.90.ebuild
index e7880e514aa5..c568e7d2078e 100644
--- a/kde-apps/spectacle/spectacle-21.04.3.ebuild
+++ b/kde-apps/spectacle/spectacle-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/spectacle/"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+annotate kipi share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
@@ -46,7 +46,7 @@ DEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-cursor
 	x11-libs/xcb-util-image
-	annotate? ( >=media-libs/kimageannotator-0.4.1 )
+	annotate? ( >=media-libs/kimageannotator-0.5.0 )
 	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 "
@@ -54,8 +54,6 @@ RDEPEND="${DEPEND}
 	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-21.04.0-implicit-dep.patch" ) # bug 785403
-
 src_prepare() {
 	ecm_src_prepare
 	# Unnecessary with >=media-libs/kimageannotator-0.4.0
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index d57ba5c189a5..e9d2a82200fb 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
-DIST step-21.04.3.tar.xz 979172 BLAKE2B ab734e21dfa406be1686632f0f10376354a8a3d633a3c539b266814a5a14b9d98db7b9a11652fc9490e0a1419cd0220b066274a46ad18baed198de116925318c SHA512 273c5424321a1508a715c4553c954914dbd8b0a42b8ca0872d61ed0d272f252262f6794daa64d5764366f406678004c51cf0224541da1a813d99bd7502af1898
 DIST step-21.08.3.tar.xz 976040 BLAKE2B 8699f07d40c98edb00d3dd19100d9702b7d0559fd1bc3a46b81d6240276a2508e625a9ce189e28ee518c2bf15a2e8806be27fe0e385af55a7e1dd93d7e9f19cb SHA512 de865263325c54c8b6a697c3ec9b7b3e3c20938fbe01e4bd9326f02b7f3bcc2d72926b3439f20e48ef0fdecf8e3076195ecc91a3be4284b4a513de08f576afac
-EBUILD step-21.04.3.ebuild 1436 BLAKE2B 8d14170a1b0404935b70ead43b5a5df25627d408b5e5e4b9704d809e8b9a0ce9e9427ad1b7b628b9a3232f995be969d7bc6fa36b31edda837e70fbb044891ed0 SHA512 4decda9d5f97bc2fdf559ddc90cbe16cf7228100287265f6c3d5542e64aea049f48af842ffd600195e577aa7208ed0b7e169eff38991236b23d8cdfc01b25666
-EBUILD step-21.08.3.ebuild 1446 BLAKE2B 4647a1dcc829176b65e4d0cc546d84497426864be65f6a98338f1307815e436a62615a4ae59c98584067078d1aa509daf8c94331cd3639a63d76c0dfe6d62d83 SHA512 85a069e9f677cae95f757956bb88029e67b1ded2740f5f7b7e8ec17721f47ac219bb068f2a8b4a51fafbcd5fd190b98756600dde6b288cca1af45346f5a03ec7
+DIST step-21.11.90.tar.xz 922044 BLAKE2B daec2c71a58319f9a18aeb1c4fdab700549967eee353d37f9bb17af62c8171336b4ba4bfa93fc4c791cf75b8e488076fe856553b28f4c9f73e86a844c1f86e48 SHA512 2d0d14dee4e1c94cc544a5850c6e7be6a7b15a6ddb24f1de46663179ad0ecf15ada080bb199747e8aa245595cc30c4667ede6a2ed94e9e9e5cb0290bd9104e79
+EBUILD step-21.08.3.ebuild 1443 BLAKE2B 1ac0707c02a3b1e1beb1f760cc678a0d2ad3c878a279e293860dc7e580a7d9e423035377d66e99240864487581d592e7d9cc30e5f5518d386013c474b3adc7b1 SHA512 acbd381b4c499ef3dfb87bbcc1a22ba5b3aa92061a613e6e5b644cabe4c9b39c9ff4a8302017de405d951e1173205f7f0bd280c0722555d8b122d899f46e6bcd
+EBUILD step-21.11.90.ebuild 1446 BLAKE2B 3acb90bd094eb8cc5a2f7e86447a668c4c61a65cd677a954dcd4aeca55366f3ad76178074719b53011cd3bbf6d011c232432601d5925b78c5ee5f98fa9c858a5 SHA512 45c24241a869a55f6e1a77dd50e7426d9ff61d3dfb24070c67613c07e974681f447a60aa7145d893c9a85faf0406d6b34030f4f9b54e42d2b5748737c6bd18fd
 MISC metadata.xml 417 BLAKE2B de9527c46129517ecc1eac9da86866a8196d7256cd1e6b73fd9c415b18f3278099bb08200e16b791bea345daf84a6b3392ae583530f848e699fb8102c2f99b4f SHA512 ff67c68e133f784d4819a3b475ca8090bf6a2ee7d4266f4f48bc3a3032fc3778ae4004206981098f304a3c32fbb9a36a0488dca095cdff55e2abfafc16424fff
diff --git a/kde-apps/step/step-21.08.3.ebuild b/kde-apps/step/step-21.08.3.ebuild
index a49c348c7bda..abca91db84e5 100644
--- a/kde-apps/step/step-21.08.3.ebuild
+++ b/kde-apps/step/step-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/step/ https://edu.kde.org/step/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="+gsl nls +qalculate"
 
 BDEPEND="
diff --git a/kde-apps/step/step-21.04.3.ebuild b/kde-apps/step/step-21.11.90.ebuild
index 527656cea15b..d6c8aa003cc7 100644
--- a/kde-apps/step/step-21.04.3.ebuild
+++ b/kde-apps/step/step-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/step/ https://edu.kde.org/step/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+gsl nls +qalculate"
 
 BDEPEND="
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index 1168918f567e..0f56c249ed3c 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
-DIST svgpart-21.04.3.tar.xz 24600 BLAKE2B 06216a156a15abe07303ad937418a048c3c6e4a4889878e92f2089b8c5ae7de548f900da32f783796a3d52edf3d40e4d778e3cc092bae9345a4b77e87b958332 SHA512 ca0507eb3e0b95462161cf3f883970d32ca1dc266b319e7f959db1ec06da5a593c7aa71b8185cc8af226e5e86c6c5e3238c6607048877e546cf7eadc0970743b
 DIST svgpart-21.08.3.tar.xz 24644 BLAKE2B 5bd722e78c215602d70b6d2599a46388363e144ac365e353642430ba73f7959d3610c995bdf7e66772a8730aea190222f348fdf4ed53e02fe9b262abc84fc433 SHA512 2cf8c83630a14116f83b403ad1bbab04b9fa4ecf6168e0cbc100b02effdf5b0ab5efa44d3fb4f4a8a58328c21bc9a4d158191a0535498fab2f76966f1e8eb19c
-EBUILD svgpart-21.04.3.ebuild 576 BLAKE2B 80f8f41cd410fc1b0791dc0c0e44ce90335f12bc993dcdbbe943d5a00be9ea9cfd127e0489051ce0a99557fc04a30842709ffdbf247ae602b3c0342f39d89021 SHA512 8231ef3f9d5232abfe45b26c5c6e2b04fa1b70c8587b1eff41a7b24107dd74eaca5b32e37f883b792fbcfea5dcbe4fe78fe9401c8e43b88a1a67ec989d0dbf8f
-EBUILD svgpart-21.08.3.ebuild 586 BLAKE2B 08b27fb9cfc46ed65d8d7bdf5611f14e95d2c7b368065012294d10bc1cefdba4469bbff6444c3cc92c0e46a23d850d7668924e80a0e29c7ad602ea8f60ef5641 SHA512 7b38d8e2dcb2e846c756a42cae079e98d42640b806de803a2ff43d46c64861254b0afa080b20f39bfaf987ce73214df3a4f420235a6da2e69b70c0d61974d3a3
+DIST svgpart-21.11.90.tar.xz 25148 BLAKE2B cc4e31366d3add438e290aebd6fe06d4539160270a7c3df03e8dfd297eff431b217805765e1b9a25ff55f2be9514096eeb79e0caba659a114cee3fe7e535d3b2 SHA512 9307474683baa7cad4d1e9f2ffc58a24915565bc828856edabc3e7e9a93b6151414b9360ea238e8c61a5d4790a511349347122230c2c9e5416532b2cae9fdb59
+EBUILD svgpart-21.08.3.ebuild 583 BLAKE2B 2877090fdc1fb47e167cd62b243882cf670148a02ab05c3ba31093a124354e9ab15c296b0debbd5f30215857d70f2c20aec50a87eb7f13af84ffb3fec3cff14f SHA512 a8498e81a56948c48b3e043ebbe777a68eb483fff468b1784a05e7197c5c41886892ee0083141361d4926aafa9b04dcea68aeac29822d61936d8b7f881a7be86
+EBUILD svgpart-21.11.90.ebuild 586 BLAKE2B 00ff9daf14e241545761ea37cda8644f09b6681ad393a1773d60076796d5e4e260a22ff28c58485a97541bd6bfb7233fff6701333d00b853e3b7de5b47feb017 SHA512 a81277c1fc35922e0e204c962d1de1a726873a99dcb7075cd6fca5970d77db4957f2ea7212f8cadf00e93c6218defbef9fc6d996abb5151b2d8eeb9836e45240
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/svgpart/svgpart-21.08.3.ebuild b/kde-apps/svgpart/svgpart-21.08.3.ebuild
index 77af33bcc7e6..8705347156c8 100644
--- a/kde-apps/svgpart/svgpart-21.08.3.ebuild
+++ b/kde-apps/svgpart/svgpart-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Kpart for viewing SVGs"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/svgpart/svgpart-21.04.3.ebuild b/kde-apps/svgpart/svgpart-21.11.90.ebuild
index 2572e018d54a..a21b242b6443 100644
--- a/kde-apps/svgpart/svgpart-21.04.3.ebuild
+++ b/kde-apps/svgpart/svgpart-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="Kpart for viewing SVGs"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 4b1feeee895d..2af15d4ff871 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
-DIST sweeper-21.04.3.tar.xz 376440 BLAKE2B c22d1caeb59126157381961a8fdaeda9504010f1c0732280d2b3a031eb35467baf961703f17e4d9c177c53cc4c52f377b06ec2d42cac2aae11a23de72251da81 SHA512 b500294b708275aa6744c4d2db6aaaf306c939de337d878d9f5a00318a7d76b3e1597b8f87402953a90a4b3188d643a53d41fd85848a4aa56336b0dd76846eb0
 DIST sweeper-21.08.3.tar.xz 377364 BLAKE2B a2b02abb927b0934c20b6dcc5bd68c4be5e9475250892cb112244e084d469c80c98a70c355fc647bdd047d19707b43ce34f72cc55f8993db53cfa9eca03a72fa SHA512 a774e0c4e3ea4eb7348819d1ad00886701c8fd5e7875c3979baf4054e98f04e9d6c1e48bca98ec4dd46c1977d711a2f4acd5b23ab6f4c037f2fe7e92943354f0
-EBUILD sweeper-21.04.3.ebuild 1010 BLAKE2B 800cdf9665c1d56af77ecee347520b570155584531f3ed1c3f09df2ef919fa1d6644a0549758e86f708af74aef24aba484b9ef6a98fdfe87f93518e717f0dad4 SHA512 1ebee912afe1844f78720526249827a229f707852f30f66269aec89ef841c8d45852c7738fd2b279ed71bb4e3b47b971cfbffde8b7c141cb7f5dc86db7f6bbcb
-EBUILD sweeper-21.08.3.ebuild 1020 BLAKE2B f67011fea2ddeb28ac24b7d3bfa62a91723378495572a31700005a4c5458a98b450f3ae2ddd7abb71c333e6c4723153add20b485b9f0260eb79a2ece88ba466b SHA512 98aadccd5393e189ac52ed65daaca713dabed82560a82b9b41b39265887146562c71ee0c427d324ec574885f194048086fe89dcbbcf46c262669f034d0681b35
+DIST sweeper-21.11.90.tar.xz 378300 BLAKE2B 0661c60f496690964e56c9f1028631cf10f8d36d80501512882eeb573b690106107bd62b9417cc3a01cf32d2e0adb7f98477c5a88c3e03349a3040d390a799d6 SHA512 fe3ea4295b70cdfa91c2c5aa81d3af3ce68990adf4a89f7c63b676182f6ce738aa6bdf0f87d93e2bcb4a2b072bb84668bef9b9c5176e0ef45bd84e2069ce5fce
+EBUILD sweeper-21.08.3.ebuild 1017 BLAKE2B 4da56cb8a10f697155ecb99a480181bb1a5772752816595d4acf9706c4d9cef2678176e3da51f4a4b819c377022503bb02e433eb42194abf70cd5e2c7bd69463 SHA512 5b02351080d7e37bdb74c9d4c3328a27001c7ba6706d316385cecbbaf5469499b1fb28008eac2ed08a3deb7a45bd5d9ed716a2de00a72d29f0f810049e1c5ede
+EBUILD sweeper-21.11.90.ebuild 1020 BLAKE2B 5d6cb74ecc2fb72f4136dd81232c3fd693d8f1c52911cf8bbf2d775fb723d012bab7e271f734abe041528890086cba484f18ca82e9bbf67a5c30e9e5846f355d SHA512 4f86882e114bd5c6fa51cc92c838b6fb31253473589bcfdb6d134f94bcd132a50a7e6296c5b97d1b501e63490fb756876431080d8b225f0337707a441552fc6f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/sweeper/sweeper-21.08.3.ebuild b/kde-apps/sweeper/sweeper-21.08.3.ebuild
index dff5c083a12e..7e80e1619e78 100644
--- a/kde-apps/sweeper/sweeper-21.08.3.ebuild
+++ b/kde-apps/sweeper/sweeper-21.08.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/sweeper/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/sweeper/sweeper-21.04.3.ebuild b/kde-apps/sweeper/sweeper-21.11.90.ebuild
index ce52a2c56818..504bf85d0837 100644
--- a/kde-apps/sweeper/sweeper-21.04.3.ebuild
+++ b/kde-apps/sweeper/sweeper-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/sweeper/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index 803c88aad6e6..218446fa1f70 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
-DIST kdegraphics-thumbnailers-21.04.3.tar.xz 47152 BLAKE2B 8d5b4ff3f5a2cde19df7a55dbbf118f01ced761086942c89e9833ed09c72a02faefe5314d019d52b2296fb128f38302e99f9d9ff20aad9319e19c320271b1206 SHA512 3534c79f21d7f61ddb15a59ca08c22cab335c478e00c7a1dd0190c7e0ede69abe21c0ff795f39ad6459bbbc7b7589268511d668a0be3a28c508e252bbfc26823
 DIST kdegraphics-thumbnailers-21.08.3.tar.xz 47176 BLAKE2B d59ec2c870201726ec31522d3b17beacf13b7bb41ad2967b26f873d966a0a159f31a49673a32b02cba85407af7d857617ba6edb6e0296cfcbbc62fc0987da449 SHA512 b7c32b3b5d1294e724e783576d1dda192cf90355c7dbd207e719c76ce6186653d9a5b0caffaadb527e4a7ec5643ad11e3f8f5dcec9596dc2579619afa02d07a2
-EBUILD thumbnailers-21.04.3.ebuild 711 BLAKE2B 7415f7f4dca33b270be5abe5c9df36be95d3a335c44c98cca81b7d03cfd5b8c3621dd70cce8224939394548fd777142813f37a941da775ed7d121264600b101a SHA512 6d74d453cc1d879898be64c66591d10075467a1155fce47df19d6a0f80ee078bd776ec44c2519d24b80134b873b42e6d761a7bf5add9fbeed3248d5b79e914ce
-EBUILD thumbnailers-21.08.3.ebuild 721 BLAKE2B 4902413d22e67a7dac0e9732091c831108c751610744a98938d8dc52cc887c808170151fce6dc1f0225cbbc6ffc1284c1ce996d2bfd2dcb7449d45c913eee813 SHA512 e8956a432bec45b252190b9848a119663883d0339bb38126142baa00344dc4d9e0b8842d12f18a3fbd4ef3a5dde03b64c788ccdb701ce355611389f62b311961
+DIST kdegraphics-thumbnailers-21.11.90.tar.xz 47192 BLAKE2B 67619a64e0bbb863678fa87718d434511a8fce2816861694009ef57954037ba0c209c5ef259f476b24fc9745840c0565a9d27d7744a48a77b9da61504235819e SHA512 a218b18a66eabab646fb31c9fdfe41ec0baa5705e31fd83c206fb168823c672cb44d8014d54695536d5cc1fdab01bf6a15c5261354baacae3a393cebf40df36a
+EBUILD thumbnailers-21.08.3.ebuild 718 BLAKE2B bfec19934f543f80bc8dd98b05b97e3183fade0c6ff6ae9c64b6af833231d38c3a461cbe318bd1700d8922828869088213a0e9d0ca89c94a346d719cc3fae294 SHA512 fbf02aa383da682ab3f055e2571e948a534d85fe4a8177eaa15f426b6e809d9fd45c28533eb48f251978dbc167bd00fd0c4f6e9b26e77b408e6edeb135e7bae3
+EBUILD thumbnailers-21.11.90.ebuild 721 BLAKE2B c53e56ee54bc54ca9f40574147e286152f9b875a00c809feacaac1af35b04750dea017c348d7a8d9628b78d4ecbfaf609830cc775129e4c31128d026cf6447e9 SHA512 59be83a59d28572ffb52673b66da2cb294805dd5f49b5d80602cd5dfdae9e2c2e558c5226eff838cee52c64dfdf47fb897fe9c0be739068d87e3062d1035ed89
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/thumbnailers/thumbnailers-21.08.3.ebuild b/kde-apps/thumbnailers/thumbnailers-21.08.3.ebuild
index 8f560d507394..72b708e129f1 100644
--- a/kde-apps/thumbnailers/thumbnailers-21.08.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-21.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="raw"
 
 DEPEND="
diff --git a/kde-apps/thumbnailers/thumbnailers-21.04.3.ebuild b/kde-apps/thumbnailers/thumbnailers-21.11.90.ebuild
index a1a3bca32c26..5302a92a9d37 100644
--- a/kde-apps/thumbnailers/thumbnailers-21.04.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-21.11.90.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KDE_ORG_NAME="kdegraphics-thumbnailers"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="raw"
 
 DEPEND="
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 9dc8d377d8c4..c5f58e144007 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,7 +1,7 @@
 AUX umbrello-20.08.3-gentoo-docbundledir.patch 1990 BLAKE2B c629fa51a4d701576e2c5bc870d8368851773687b93309a02986f2cd3140089c435a2964edafd1be930796906295bc8ef1477ba8c9837f560f986ed07ae19358 SHA512 9635b33d0aa612eebbbed37f82812b5f1ea8edcc6bfd0a8749e667cbc718d3ed56568397a6db43838a84f04085682dcd5c3a8a272b92bd9ee9a84de30a2f2d40
 AUX umbrello-20.08.3-no-qtwebkit.patch 3512 BLAKE2B ae1f25f42c75f061c52f2f9316d88337153c81d20ca407dacdf786d7d343b5fa1207216c3ccb761321648cdcfc7785ddc77161fe6e471014cc36438e002c5486 SHA512 f03b54ee66d10dd51cb9b1a8a9affc0c832501ac0f40377c7357999649fecb05374f6227cd43bfff069900dfc94f9c6ee507e42188a826ed9f675dab39e77225
-DIST umbrello-21.04.3.tar.xz 5650032 BLAKE2B b306695798eb2791968b9b4ad98b34825c8712800fbf2a87a2f6398768cf9bcee1e94dd1efa8d513f2cb8f07f683ee880c8e655236d88b96c3c1bcc98929af6d SHA512 f4f632bf37f4170ebf6c1d776b70b058ded1c8a1a9626adea1c9b63e7d7cf45c0afaf77c4c9bf778c601265b9d819f5a898813ac32b58bcf29d7ab94c753d73d
 DIST umbrello-21.08.3.tar.xz 5650048 BLAKE2B da8d0fd63e7d603a52866e8a91e3aa0d6f4c80f4e95096b4dea4746348ad0cfcde11ec194d4771c6540a6861a206dda371316b12b8f1c69d4853783380d0e92a SHA512 176804977069383aab5e809b2a3e94b2b965d5b57bf14eb8215416a2288d5a141a8bdeabae241b3f08bab498b36b018ac501797f8f61653bf18910302aa61130
-EBUILD umbrello-21.04.3.ebuild 2049 BLAKE2B e7e686a565b1634e293cbd11a7f3258b446b659f1b86cf454ff4dc27329f61ef89a75f95d4932bdd5ecd2ba8ad5eb12d40b956e7602496ebdeb5bdeff88f2f25 SHA512 e24fe915980530b28a9b296fa1401856807732920b811b3fbc30048ea8302dfd5723c3a46b991aacd60e97c95ec2a239e7acf07a3731152d11318566c519e263
-EBUILD umbrello-21.08.3.ebuild 1996 BLAKE2B bdb562f1c7abb3986c98b38cb0039298a6cd0f96c87ed296528853de4a8a534d71a556071414303a6c6b036ef96903745acde71dec88daca33df2f01f938ec98 SHA512 ddb92018c27c2d88a8fa4888b45517a7ddca37d0961fa7737bb39d1899af872ab9885f7b3d92ac5108ecbf7a125d7d2c0587110f1b0090ef734ff11ffe50532e
+DIST umbrello-21.11.90.tar.xz 5650848 BLAKE2B 2a28e8008bdf5ad5408e7442c6fb93ffa191e119df34efe88089bf7833f10ac01b795e53eebe51f8f50739f50c6dfd2c62ab4e767f3ce2d14dd65d3d50421d29 SHA512 d4ffe83491da8b421488fac69e274ceab673d770630a18e38000aa0ca965f17fd21ebe578274b9c829ce6a615b103aae58c99b3bb3026e6df8d1a3cd0dc13b40
+EBUILD umbrello-21.08.3.ebuild 1993 BLAKE2B 92c99554568bd3c2f4eba9345e98a4a1b4226aa978ad530515fa0af215347827e6850d69bc0ed71c8f5704c7cf902a5987b20bd608ba0b21dd166c1e6cbffd1e SHA512 756d0402e58f23e48fd59f7f025ad7e6f11b469160cd843bde6474b4bc3c227369854d8346e5ba282d2b7d2e60de2acf7528b97376207316c5004376b7f86b77
+EBUILD umbrello-21.11.90.ebuild 1996 BLAKE2B 6de084424c0a2d4235d30a0c5ece038580ba6303442e247c4dd73086f65ff47bf0b90b4df54c0877095d4f1fed7b94a7a119e5eee9b08d3ec5f4366238b7cd70 SHA512 98ce69ba1fa5ae97540083a1298adf5d8daf3df65bcd2d55bb5334bc81742aeeeb35fb29497c85c2e0ea4b53a80b7657cae8bc92c65cdb97ef6a31749e0377a5
 MISC metadata.xml 459 BLAKE2B 465f4c84b8aeb296c6c2e6b7c387545709a78db7bd3a42e276ecd67b9e0d6137be482e058b984784a3e68f965561763149de1fec93abb3d4c601f9de115c5b38 SHA512 fee91c5580066b6e088669602c6629a20e65e58390809427e737c6042b1233b118dc9d245b15af14f588aaf84cdba30e811e8a1d246ba6ecfd43215285741608
diff --git a/kde-apps/umbrello/umbrello-21.08.3.ebuild b/kde-apps/umbrello/umbrello-21.08.3.ebuild
index 8681fe2a91bf..b65e3bbacb25 100644
--- a/kde-apps/umbrello/umbrello-21.08.3.ebuild
+++ b/kde-apps/umbrello/umbrello-21.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/umbrello/ https://umbrello.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="php"
 
 RDEPEND="
diff --git a/kde-apps/umbrello/umbrello-21.04.3.ebuild b/kde-apps/umbrello/umbrello-21.11.90.ebuild
index 404428e20f18..3965c91a8f82 100644
--- a/kde-apps/umbrello/umbrello-21.04.3.ebuild
+++ b/kde-apps/umbrello/umbrello-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # 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" # TODO: figure out install error
 ECM_TEST="forceoptional"
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -16,11 +16,9 @@ HOMEPAGE="https://apps.kde.org/umbrello/ https://umbrello.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="php"
 
-RESTRICT+=" test" # no-qtwebkit.patch lacks test fixes
-
 RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index e17ab54fb641..f06096c97321 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,5 +1,5 @@
-DIST yakuake-21.04.3.tar.xz 393052 BLAKE2B dae07678875d05e73ffb8cebd9cd09457f00a53542e001e7c6e70027824c2fde9f1f84a397546afb41a3ab1208718c426cb7c60ebb9295149b0484f326163ad4 SHA512 d4f651bfcc9db787f8b53c7237e4c19db33a7c2cd4c337ed271b639886a1453e562236be589644896de0fd82cbdc7adc41a3e16a20c8d6d7fadb4232849ef5c7
 DIST yakuake-21.08.3.tar.xz 397892 BLAKE2B 8002094fec5662d2f1a3b2a948bc9f70aa822d22ed100f12ad1cac610a1cfc4c0d55fa7018d86273ba080f48e8043e08a8291d788f416c2f724756ff530dcbf9 SHA512 91f4e1b25493e8936a6ee4c13b5c1d1419fc7c19fec2b98f1b8ee691575a6ad9f589d9cc39e7c6031764cbe90111df81c4c72cb833a90bb43495f363dac7eb46
-EBUILD yakuake-21.04.3.ebuild 1543 BLAKE2B 8773c02cba250f9c814b4d34dad269ba699519c7ec5a28d6d961c9fb247c6dee2a8114d385ec6e7bced601ece1c6fc7cca5cbf2a538d8847b89474170834f7b5 SHA512 b51dc56f5de04f616cce70709a57b9265701d76ec33db5d819a422b042e5c4c976edcdfe306c3161819d128874f52c6f73a97326400aa7b80c36ca5420704078
-EBUILD yakuake-21.08.3.ebuild 1546 BLAKE2B 100ec9e85cd1354a00cdb6831a1e64223d33b77ef510dbb509ca7f12c14a2e78ee9c1111a5380efed77334cde2d6caaddacb81d18a3b34dae0aef68d9b2fd10f SHA512 005ba3977f7b74579d8e8c29ad5db62c05217281d8a8776e9f6e7f90130abf1211dc7e6fc851336237bdf1e141a0a307ed30458fe22dbe66260730b09251830c
+DIST yakuake-21.11.90.tar.xz 400592 BLAKE2B dac3a5f27c46df42b57d31c5396f907adc8d989849dc831eeecdd7e171f5936971fdc1f3cc23a3345483ef11a9aa11a4b37fe68461ca7cbf5f28ebf989c7ad21 SHA512 f6a18c2e120eddffb627e7d872767586ee8ddd87b55f8de1169a8dccfeb12008098149b5c2a5066e87573d4887766a7d6ec0cf620f3b90bf17fd478cfbfac4f5
+EBUILD yakuake-21.08.3.ebuild 1543 BLAKE2B 89dc66ee547c16fe092cf2c235b8ead711a9fa67a65f780eabcbb1442dc5ff39c68822357517faec572ca43c6514dfcf953892034a15982c7f0f1e603b26f873 SHA512 af34d9f7c612d5508f1b4e17ab7338f7bf4538e89bae1f5b2c27541349bcad8d8caf0bafac28d1be70360a3c0e5eae5e47f480b39790f9710c9ccc0c5f72b8a1
+EBUILD yakuake-21.11.90.ebuild 1546 BLAKE2B 337cceed77b5959c58e94cd7f8d6d5fc8f8351ae5fc254d2e87255f82223234c61d9919ab29827b56f80eecc2c75a32ca9cab343e93b706ee54882cccf684b20 SHA512 c4b995eca156a70b021f5c52efa287b389b0c6c704fc97fd085923e2eac74370082e283fd82a40fb3f8c7c4783a3ada89a7af9cb3abef542eda1dc25ea3bd5d6
 MISC metadata.xml 730 BLAKE2B a366bbedfe3a0b4257147f664f48130ff318a003433134d63e4bd076b9ee43169f28798e0c8da2e13804446abc2b80b1c5327c7468a1f8d6e8243c44c3c72c60 SHA512 7594648f5354d0660fa1063c52fb99af6955b0f3de5603a7c9eca3d1a24db24315990efa13f85680e56d63f77bedfde01f5728271594be794bd896fcf0f01f56
diff --git a/kde-apps/yakuake/yakuake-21.08.3.ebuild b/kde-apps/yakuake/yakuake-21.08.3.ebuild
index 23d3773e089e..13f7f78035bb 100644
--- a/kde-apps/yakuake/yakuake-21.08.3.ebuild
+++ b/kde-apps/yakuake/yakuake-21.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/yakuake/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="absolute-position X"
 
 DEPEND="
diff --git a/kde-apps/yakuake/yakuake-21.04.3.ebuild b/kde-apps/yakuake/yakuake-21.11.90.ebuild
index 414bfcc99f98..07151a5b8079 100644
--- a/kde-apps/yakuake/yakuake-21.04.3.ebuild
+++ b/kde-apps/yakuake/yakuake-21.11.90.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/yakuake/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="absolute-position X"
 
 DEPEND="
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index cb041e8b97c7..565f581b8a27 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
-DIST zeroconf-ioslave-21.04.3.tar.xz 44568 BLAKE2B be644a9eada31122efd3eec54f9140c4e526180312abc33d00099c13f21fb88572632553fafa978d59a3d6e2103b8eae9631e20debef5a33e3968201a5c990ba SHA512 b1b24cf39193102db3f521a8f5ae15e9bfb6b1a60a69da01e5434460e1597abccc55c904016a04957a72e988ee94da55bd5750a483efbc9ffac5ec0b0c66e6f8
 DIST zeroconf-ioslave-21.08.3.tar.xz 38400 BLAKE2B 9f6bd93dd51fe907cdc2d55e54d6eea61986278cbc6813153cd2b42c6c48f1efcb36e104bb9096f680204d9799b6d60d302baee1d0116f6432fba564ce7ebd96 SHA512 223271f49ea1262cdb81c4df883141221b0b6d5f46833a324b7cec6750512f8e2ac5525c74177b8d1352737360d4d7f1a4764a91645423c9b50f4c53956a0817
-EBUILD zeroconf-ioslave-21.04.3.ebuild 577 BLAKE2B b7f552e3265d9345ae9126def203106cb1700b033f5dd427591ce3f9e493d0a02b84f81059223ae1b3bfb393605c5ab8e786e10d7cca93918a5baf1386a6165a SHA512 801ce4bd5a1088713208fdd7cd14d2eba1d04b74a174e66767e1f6498544a273e3836f71e94e5f705c15576c940e8657b82edcae3043bfbb91c77f3587e88990
-EBUILD zeroconf-ioslave-21.08.3.ebuild 580 BLAKE2B ce0b45f3974dc365cd3282832b91591a689240147029fdfcc5ecb073fc086725235b4668407f6b49b68af958d1123a561afcb828a71ea00534e5818c6a22504d SHA512 e257c2b8ec90f51458a8c9257c479a601f689133570f6713050553b5cc107d08d50c659770d0f625ffb4ff16b6c4d377af067324a97a4ac5f01d635c215875fe
+DIST zeroconf-ioslave-21.11.90.tar.xz 38224 BLAKE2B 0910fb8693f19f82dfa2efcd793f96f59fb6a138d4ccabc0b3d5944ec7c5b0c5b9e28aada8805343231b97ef8ad097241ae2e6b9ccd0f719c2240aa7bdcbaa51 SHA512 35e2e0b9e682f3cde4e2b413355a7dedcb7de15e2e1c0c767881b98af5b093a6752dd55c066f4164aaf1b677bd32ad94fd2e30dcf42a96dc2310478dbe54c62f
+EBUILD zeroconf-ioslave-21.08.3.ebuild 577 BLAKE2B 1436263a03b8113345a6d99e69b826933e5491ac059be1b0af1fe3158443c0334adf8e602f4d9a318714a3d6bc4c78cda487d449cef47deae0e1070f15c61006 SHA512 e86ba4108d15d1b843e969c771438c72a1034ae45e4594e787f63f01ede67d05e7958d43469809f733b5d24764c630447fd8b68346fe6758a1046783419a7593
+EBUILD zeroconf-ioslave-21.11.90.ebuild 580 BLAKE2B e5920bcb24d0c043754b105624df8f976bc6168a42da633b1eb1758928fb14fe7dd3f66e422bef74e6f14f975dd9a56554be44891d4882eb519f789a432cff58 SHA512 51d59f9dd899e0214699f18f43143a65a9d3a75c66504e6df91269069e666ea9b0e60026dda8f1fbd6c45f73bcb7bd90e27519557cdeb9f6894770c32b77e73d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.08.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.08.3.ebuild
index 8861d3f969b1..b136acb69381 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.08.3.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.04.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.11.90.ebuild
index 9916ee73dd9c..f27e432a9810 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.04.3.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.11.90.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
commit	2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree	c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /kde-apps
parent	e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)