gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /kde-apps
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
703 files changed, 2375 insertions, 2485 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index a3870784b35b..0ca2f630f856 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 0c4d129e2b63..2ec37932cf3b 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-calendar-20.12.2.tar.xz 342764 BLAKE2B 0c71a7a2f5949eff8ccd0c93d31f4c332d04015b507477f6d03d06ac930622ac9704794a18ae7fc263eeaee3c6e3550f7d4bedc62be90e275c11b412adef9263 SHA512 80d7d9e77d176c157e885d1229fee07def248728679d5fea90124518aefd6f998cde4a2a22a0b5087c49547ba4fda3811b1a6980a920c47d13bc9039a17e02ae
 DIST akonadi-calendar-20.12.3.tar.xz 342788 BLAKE2B feb4f73e862279dcabb7800f6152748b440f9a284a683fc62eb4187d4e7abf930c88d2af0c32f59b227a88563841557315eb0ddf79f0d130345ee51f178f6055 SHA512 739a7896d457283f92f94e022139edfc22e80383724818bdc457128d1c952f4024ec5e3c91a444c48977d1c8932c60f5b90bda7dd4dddc82fce7ede5bb04c89b
-EBUILD akonadi-calendar-20.12.2.ebuild 1192 BLAKE2B 0c2d06768ec8b1bdd6064497e207dbde6e764beb953522e0813572d35c1e310daef1aea48e3551c977e4f10ed2de434a26ddd060de6046a8daa946a8b67b9a84 SHA512 10690eb300a6a1eabd165043fc982efa2a017bcff1a36d16471a21b822533771e0d91d355d55ce3ae93c88a26d563f3b292a12bfa852ac6eb6cc37077e5ace8f
-EBUILD akonadi-calendar-20.12.3.ebuild 1195 BLAKE2B 5cb81619de057bea4db1bcd2a19e8e8d8c75e921115c027fc85b3faf2b0b9e2e1f3b6345f27270041bf13e4e1366c946cff664cdc6289d968eef2a13fa957dab SHA512 81d8027d3a8afa9d6e9d73808254472826a0e5e529730327cc10fb8d6c54e60605038585bc2e5349d91daaa0533c7db6265d046cae2b06a89b302d2a0151c0f4
+DIST akonadi-calendar-21.04.0.tar.xz 348028 BLAKE2B d03144505f6c38c1863bc5abe9157f793a032212c47e3206f86bda7666d004f6be394f4f5d392ef3bbda194e1b3fc7037e3e4b6174a644456492a5bbaed715bf SHA512 0ce070d98b84bdaf5fe0cad8fc1f1366a13a05700eb88a15bf8e709a9b1c93ec59aefc4b096e96a7e22bc94057779d5ae80ff36bc3b24b504455320ca65222f5
+EBUILD akonadi-calendar-20.12.3.ebuild 1192 BLAKE2B 0c2d06768ec8b1bdd6064497e207dbde6e764beb953522e0813572d35c1e310daef1aea48e3551c977e4f10ed2de434a26ddd060de6046a8daa946a8b67b9a84 SHA512 10690eb300a6a1eabd165043fc982efa2a017bcff1a36d16471a21b822533771e0d91d355d55ce3ae93c88a26d563f3b292a12bfa852ac6eb6cc37077e5ace8f
+EBUILD akonadi-calendar-21.04.0.ebuild 1195 BLAKE2B 0b70b97f73173205153c03d6a5407dcd6feba99b02d60b6ffca56cd9c9ec62fe1910836849775fdfec470ac68ec8d7ddafaf280a6bc6bf638c7c438a30c6fa3a SHA512 941fe3e84d8dcd3c87ce8f49b7184a90bdfeeeb29ff07131c82b993bc614e371ee93e31d37b81ef780e069554ecbfa8e6546740a83f73bcc72017154f48d5386
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-20.12.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-20.12.3.ebuild
index c0cb12f6b932..909df4b925d1 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-20.12.3.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-20.12.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi calendar integration"
 
 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/akonadi-calendar/akonadi-calendar-20.12.2.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-21.04.0.ebuild
index 909df4b925d1..3b14acc43691 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi calendar integration"
 
 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/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 48c43fdcd1f3..9bd3016396dc 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-contacts-20.12.2.tar.xz 414208 BLAKE2B d0cdd880e6a05422afed82d7ec0d69424928c9bc9a2d7ff1565fb89163d5f4842388cfc8a6805bd052a0aa06f2fd895f34103809f9e4c7072bc0c569594a14fe SHA512 9e6bb8162619a484fffe822d448ab3aae5199c5deacb2ce10ccfdafb025b19e1f1a3aa0241f013c261205f6e7c9b7501c755589d69b082d3bc00d5d6fb58ccb9
 DIST akonadi-contacts-20.12.3.tar.xz 414416 BLAKE2B d7898bdf6e5a89c9fc0f27dde4414f4c132131e6a8ccfb8c5fa6405fee972df01ee2ac160f5aa4083d82032851e8a111ea8089bd3e69102e275c06830d9405e3 SHA512 41f201d7e37e7570667f4ef6fa61972622301a11b1952a3558491b9263fa8890fa468e55048353ccbe8b4b12339c36352a5f2630dea36e083e932e9b8c045d6a
-EBUILD akonadi-contacts-20.12.2.ebuild 1248 BLAKE2B c754ac64599dbc6aa85c11a7ea6f71b1c47f2e1b6a1a98f67c4d50d1f361ea72ad63addcdde009d48319f82f374ef1dbeec3cdee228ce65098068ebce8fbeb21 SHA512 e785fe326869bcee0a69f8c1754f7d954cbe2a2d0553845e9da275cba4132a10926fc0625be3549c432ea7dfa21e8047cb468b29f030745fd86d58bfc7dfb6e7
-EBUILD akonadi-contacts-20.12.3.ebuild 1251 BLAKE2B b0d5171e5b40169dd3592789670bd90b2e4f4e20ef3994c950e2a3d969782e7e311a3ae9389a1b18d3326b02c73604eb2fc96a2fb9164d8c0527d6905fec499e SHA512 8bffc7cc07b25e72116d74e5ba163ea2a684e8851d183e44341e2fd9c92df322ab2b387eac524e6cfc50a433dcd0529419a4296de12b8386c48c9676b7e99ead
+DIST akonadi-contacts-21.04.0.tar.xz 419228 BLAKE2B 4089d3dc276d4435dbde0b0c14812204360ab87a93a47121856c61b604116986bc3300e4bacf3f05784039d8144a3b78217bbafa8a72ab1f1fd53ffb4af1d4a9 SHA512 3de75e1aae96a7ad7eef4fa3a15f3f179d55f9138ccadff99e6e418973097a654900163574e18c054f89c9dd58c10953ebabcf2f07de5b4eaa5866578e86d059
+EBUILD akonadi-contacts-20.12.3.ebuild 1248 BLAKE2B c754ac64599dbc6aa85c11a7ea6f71b1c47f2e1b6a1a98f67c4d50d1f361ea72ad63addcdde009d48319f82f374ef1dbeec3cdee228ce65098068ebce8fbeb21 SHA512 e785fe326869bcee0a69f8c1754f7d954cbe2a2d0553845e9da275cba4132a10926fc0625be3549c432ea7dfa21e8047cb468b29f030745fd86d58bfc7dfb6e7
+EBUILD akonadi-contacts-21.04.0.ebuild 1251 BLAKE2B 3167ede8150c9cbc5c7163452b3a7a735e82369a497c72e428befd8327df75aaa92f957e25aab0660163e0b7663f28c2f2532cb36edb516af925349e52e89b9e SHA512 60833c003e613daaadb76c3a67a8d9c6dc22ad68a39d205335e1c9cb954fd4aa78eb97cbe8904605d701db338a99893a17529bf59a94220338baedfd158d907f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-20.12.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-20.12.3.ebuild
index b546743d414b..f42c78dd86cf 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-20.12.3.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-20.12.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 x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-21.04.0.ebuild
index f42c78dd86cf..23974b87bba9 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-21.04.0.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+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"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 774f5eeb398a..0a6c27bdd9cf 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-import-wizard-20.12.2.tar.xz 506672 BLAKE2B fcb9c46b509787d68296e96ad55e960c994ce4bcc87e7d541a8ead254378433efde46339565e01894949ddeb69378078e469e21833a49b8406fc9a64fabd0d2f SHA512 459014c383e62566b85535468ea0ac2970315248b98cf2aa7b5581e01a799ad35aa0fb5488e66e71ca3e6a1d94eb3dc1421e9ff638d2b87e8ec7dc3b6461906b
 DIST akonadi-import-wizard-20.12.3.tar.xz 506664 BLAKE2B ad2a4a1e0b97ac154b05b2a44a6c4462f3a3fb8414349b681fb58d8ad2531cada7d4d534a3d4438b5ddebd044c9294afbcf0822aeb0f32518756220defd33600 SHA512 8b35a37617347c39ef4c76eaec8e3a982d985e6bd41b6219ab353542a82168b6bb46f01fb383bf02ef2819c51a60b86b837e126a23415a8bbb025b27bfabef2d
-EBUILD akonadi-import-wizard-20.12.2.ebuild 1232 BLAKE2B c590de3398d4c23cf84d5194643d0952f53e11079c47056bb065c02616455047f0a565774e12635ea86e2d2023762dbbf6af329dc4c4d0a790438938675e8352 SHA512 0a450c695316c029bd27f4d50e306bcb17a41d79e8cb754fea8c136fe7c0b281879580ba58aa866f9ea6177f18ae00e4c0c54e3916d948f6e3b035c4f3ae6bff
-EBUILD akonadi-import-wizard-20.12.3.ebuild 1235 BLAKE2B bbbfc9a86b3d1eb40b986b3a091f3723613f7733c726ef1667597810b3da98d472aa451b1ad6d826d6fdcec8c9572b0d4ce8a74b4a657256da913f76e66e25d4 SHA512 d798904dcca4bdb81d18f443314dfc6859a69bdc75708c0ea872e1f09b5f6f5a8988e6ab13404693545b4373cd95dbe5fc9a9b5d06d65e6629efdaa042307f83
+DIST akonadi-import-wizard-21.04.0.tar.xz 511128 BLAKE2B 19e60fb8ebf7b448d550aa9f8100bdeed84f98a18ea746e79249d9ea2385f6b31ef0d1d7c5f02982f131846d4ea23ca1d1fa03c1466f68ab50384a1bd15033ad SHA512 557a02f85ab2a31d10cc027b509b7347e14e11c80bcd572b2bba94fad967182bc2618a069ddd81494fafe1c0a6d512b8bbe337130aca88572c780a3480c3705c
+EBUILD akonadi-import-wizard-20.12.3.ebuild 1232 BLAKE2B c590de3398d4c23cf84d5194643d0952f53e11079c47056bb065c02616455047f0a565774e12635ea86e2d2023762dbbf6af329dc4c4d0a790438938675e8352 SHA512 0a450c695316c029bd27f4d50e306bcb17a41d79e8cb754fea8c136fe7c0b281879580ba58aa866f9ea6177f18ae00e4c0c54e3916d948f6e3b035c4f3ae6bff
+EBUILD akonadi-import-wizard-21.04.0.ebuild 1221 BLAKE2B d6f16a04ab008b6c9fd16cf9fbeac8a456086a4c099a5d7fca6c8209b02d269688e45b6ada39d16dd72a531ad539e37d68e6bee61789d53f692ed58a9bc8922b SHA512 892d9ee0e6851e870a4649ca55c837594272e3e3f6fb74bc68e1150258f826338e42edca9ce0b2651b7791861523982001c75abc82f6440accdc61dd32cd29ba
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.3.ebuild
index 9b0d68e29440..2a87744f374d 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.3.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.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-import-wizard/akonadi-import-wizard-20.12.2.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.04.0.ebuild
index 2a87744f374d..7eb969d1159c 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,10 +14,11 @@ 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="
+	dev-libs/qtkeychain:=
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
@@ -36,7 +37,6 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 271ff9f6c12e..a5b80f673e92 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-mime-20.12.2.tar.xz 135892 BLAKE2B 29ee94c335728ffd815ddf75a4b9839707654a4894647e097398b7c148cb211e2a19ca951bfd4c249798e248c5b97bb256bd02615c10a7a6c266f551929783e5 SHA512 7d4aadacdeb2c9627bea5494ca3d986365af1aea3cb87482e7d671edb4aa3055a6069709bb57bdf8cd3a4e291160af548044ec42f2e3c3aa2dcacfc0ae018aaf
 DIST akonadi-mime-20.12.3.tar.xz 136144 BLAKE2B 4d5421e159e45d41d4fe842be7a019d7df4b273b00082a5747b2759db3851a66224a8d2449caaa9228a402e43fee784ddb84ddcc1ab66df737f9c615582a2852 SHA512 9ca435850f4c65ea285b0663d2b2f490ad79e7d238ec3161a1c60e58b0b897c98f0770e20ebc050c68827b129f10af173cf77ae3ec98fca684ef69839df53a93
-EBUILD akonadi-mime-20.12.2.ebuild 884 BLAKE2B e3624d8fc1fc10c5caa2ca4a34beac1e15487ec1af17edca91222068dd47576c08e99221e6b14c51b7a823e2d1d06e2060510683917d6a862d5ffdb1bb0ec88e SHA512 441ac88e6424ba6f40043b6b00f5bec28e5d06b2f9aa043e55aaec8855d3786b607d5715503f5e20640d1b2301f308e9ada2f8659b8926d7ad239454a693faf6
-EBUILD akonadi-mime-20.12.3.ebuild 887 BLAKE2B 14725e23fc997b0cc8f504d3f489d04c27f579d291180dbe8c0554355a7a6c39722b5d57a6debc3d61e28032bbccebb03c57dc16ddecb68b548f92614b995b62 SHA512 3f489f46bb98933b184c88185e5d612a93a2d6ef11f8b55abcfbcab47ea93309e975a6e74112fb08e5bcd241fa8c946e42d5e5e288f4148239ee422ceda00d60
+DIST akonadi-mime-21.04.0.tar.xz 140616 BLAKE2B 61593c93a0039a08d19ea790bbbddcbe8c2a46cfdf01c85f25dba7cf97c8f8b0b453652333966dc62b9ff340d74b851ca374c7ab83064462f5a710119733be05 SHA512 0dba31eea1ce2597939ae369e2e03106298a11aef694847aa4256f7718b98a6cefeff9f21faf17edf894709aa2646e303e7ea3ef67505363683146d9ecfe18ee
+EBUILD akonadi-mime-20.12.3.ebuild 884 BLAKE2B e3624d8fc1fc10c5caa2ca4a34beac1e15487ec1af17edca91222068dd47576c08e99221e6b14c51b7a823e2d1d06e2060510683917d6a862d5ffdb1bb0ec88e SHA512 441ac88e6424ba6f40043b6b00f5bec28e5d06b2f9aa043e55aaec8855d3786b607d5715503f5e20640d1b2301f308e9ada2f8659b8926d7ad239454a693faf6
+EBUILD akonadi-mime-21.04.0.ebuild 887 BLAKE2B 7c49d7e30d1df6dfa9169eca31707acadc3368ffd96e45880f4fc51692a57f91c9fc582aa72b9696776c1b2b6d7358e87482280677d493eceafb8fe2e65c7708 SHA512 bfd079f171b418a5de894db8b5527124547ac528232bbbd2cd199e1a783ad74a11a7716c7ec8a280fd7c5f45174b5cc31affe78e6319d720568b6db3876cd275
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-20.12.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-20.12.3.ebuild
index 610e0e0a9e08..ad9c82303281 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-20.12.3.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-20.12.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 x86"
 IUSE=""
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
diff --git a/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild b/kde-apps/akonadi-mime/akonadi-mime-21.04.0.ebuild
index ad9c82303281..37483e3d8f20 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -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 ~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 e230a0db9e7b..811b68368352 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-notes-20.12.2.tar.xz 22916 BLAKE2B 54928a4adf67d4e6afb6692067e177f634142bae2fa0041663c6154bef5bcd2ed051bcf0a1a597d27d9d4685ca18627f001401e7f7b70eec802e64468fd896ef SHA512 30e4fc0753abee49f69c5c0727b123ff8bf2e8e8c127043895e6f3a221f0cf1e6bf5ca89ed87687d83184e082c8cf7fad7f490f1bc5678317cac8c18d2e83b49
 DIST akonadi-notes-20.12.3.tar.xz 22876 BLAKE2B 5e3dece4f5b98a22a93a12c3884a5db70d605f1ab0042644542f25e562dffebfae816ce1b44c737f0a6dc320cf8a4ccc2e79f891b691aa95c82fa26e334a8f75 SHA512 100d26caa3e8ace0d58c58ba58a71f301d9979c86dcd993e43d6bac63ccded76e063d942f86533ea4da20d6657eb9992321c83ec73ed0f5817aff6ce6c90d812
-EBUILD akonadi-notes-20.12.2.ebuild 468 BLAKE2B 111837329a0247ea9dc34b70577b1d3386ae6eb72cc44a0a4b159ee729f39f837eabe95b3face9488eb0f7bd4fb87af5ff3e0132b35420d8ce1eabb0344b62cd SHA512 2b6e7fa79282cd1d5e40831eb2d12cf3bbc0f726d3521f045c7c277eaeb2cf0f2c42bc8bca1100925413a6939c24d56fe5c9a083bf339924f0caaf5f8e37588f
-EBUILD akonadi-notes-20.12.3.ebuild 471 BLAKE2B 5a33310167beb681572e361cbdf414ad9ede458c91c9a793c4e41b0f7aca7ebf3e8ec6cc645079f9fb8ffe6b2af348977cc4531601fae629cda260568756a5fd SHA512 cadaf6901f0142c96c4c1802f09508b6c8a50199643a2cd6811a9f472cfaf24a60f6eda23c52b52c7c61df385584642bb26109df83e7d3a344fb8fc6326a461d
+DIST akonadi-notes-21.04.0.tar.xz 26812 BLAKE2B d0b219bb60fd437be406c5d32697e7e1b7e9db9f88ca15626271ddc56ebed0eda71027b00ce0d49438adf218ad4e43f0fa0bdab7be7f3f077a9ebfacccdc39f2 SHA512 52933f210559a2adc56d6220bc287d713b164ebfe484b343157fc822bd99bcc7a1095eb02b64acea30c268ffdf13f3cfd812d7eac6a4be5ae5970d110d04d1b5
+EBUILD akonadi-notes-20.12.3.ebuild 468 BLAKE2B 111837329a0247ea9dc34b70577b1d3386ae6eb72cc44a0a4b159ee729f39f837eabe95b3face9488eb0f7bd4fb87af5ff3e0132b35420d8ce1eabb0344b62cd SHA512 2b6e7fa79282cd1d5e40831eb2d12cf3bbc0f726d3521f045c7c277eaeb2cf0f2c42bc8bca1100925413a6939c24d56fe5c9a083bf339924f0caaf5f8e37588f
+EBUILD akonadi-notes-21.04.0.ebuild 471 BLAKE2B 004abc42d1504de04c74e01d6e8ec71faea80975b15e4a1f391623490b0841d47f7fcc15586bd29a7a70be919c3463d54043cee53adbbcdeae02b73908ee7217 SHA512 2e3f775250ef9cc28c8a59d15cf7c37682b311089edb23d5ee3ba73f552cda21ac4cfcc7896b13e0a7c4fc6273cc9a3291321ace605221753bd2b5e737681833
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-20.12.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-20.12.3.ebuild
index 0b141def05b6..bc1ec9fcad70 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-20.12.3.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-20.12.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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild b/kde-apps/akonadi-notes/akonadi-notes-21.04.0.ebuild
index bc1ec9fcad70..2131768ae4e5 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi notes integration"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index cbaaa9efc969..7a2754c7c7b6 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-search-20.12.2.tar.xz 93988 BLAKE2B 42b62605b4dbe27dae073761ccb78e6063b65fc9ad934aa77065baa380e4dba38b38062f30ac800ec9546697d1b10b275f1bc0ca21426ebe16f5d8e399560720 SHA512 cbb9bb579b0545198ebc145d41ca3ffdc84a5cdab00941ef133c5d2fba2e720eefdb4ea52edfa065bcd2baffe5a612c15058fd5d7a2106c8728ad4ff6e531de0
 DIST akonadi-search-20.12.3.tar.xz 93984 BLAKE2B 6a360f1acf51ac6647033278d14494ed83b11d227a84ccbe83d98bef2ec59067f71402702f6a6305e267a906ba2702449dbe2c7623e7d40ac58131af34ae570e SHA512 8942788fa0f5034661abd164136b33228ae71e2d305ad8dcbeb97737bfd9ea8d305d7ba6254ecccb160ac41047b3bcfd29e9ee17bb27a290e2e2e2033c09bc08
-EBUILD akonadi-search-20.12.2-r1.ebuild 1301 BLAKE2B 85e1806f1e1d7f12404d315de50a0c74a4deb716c4d6aec4ce917fe902014a7506d5c35b8c942fb2a4122815b945194eace519bf40339d5a081802c9ec428c90 SHA512 e63b03fc6aceb77ff80c556bf01ba6d6d59248a68580c2c28225148ab5ad10d539746056a36f17892eb18871a53ba09d0d225ade082f3c81f68b1d2c87569f5c
-EBUILD akonadi-search-20.12.3.ebuild 1304 BLAKE2B 62f40c6accd6e1743935f8657adf7d3c7e12fbef17b7cce360c4aa979b00bbf28555cc19352ca24327f355be795effdc262cd47ceff1d4f0b8bb1bc869417965 SHA512 de7cd43541b59a7f7233c521ea718e3ec58d86f8e6d3f9e2371ec61d4e47dba7682469a513ca6c1251ba8407e9885bb18ee4927c9116fdbb5c22797419badf3a
+DIST akonadi-search-21.04.0.tar.xz 97880 BLAKE2B f582333058147dca2385165100efaa4508940d296ebeb37451348bcd7a453c38f2942ec0f7690fff476f6555cd08d15a002a0d7c6233ec030ef956289448839e SHA512 030c2708157b4a145640739e0a1947f26fe4e766a60e89d6bdedd9920ac7e4148e9f9168247e7c9789128ce858dcd4f55ac93151fd5befa48ec5b71e62adbf90
+EBUILD akonadi-search-20.12.3.ebuild 1301 BLAKE2B 85e1806f1e1d7f12404d315de50a0c74a4deb716c4d6aec4ce917fe902014a7506d5c35b8c942fb2a4122815b945194eace519bf40339d5a081802c9ec428c90 SHA512 e63b03fc6aceb77ff80c556bf01ba6d6d59248a68580c2c28225148ab5ad10d539746056a36f17892eb18871a53ba09d0d225ade082f3c81f68b1d2c87569f5c
+EBUILD akonadi-search-21.04.0.ebuild 1304 BLAKE2B 20a371855f158c90e8143675af67b286cf77ce3165af3ecb731e03482ed74ae5ac6f76b970386768ee055843ac4ccb1b4b7e4ad81e8410e867c1d06cb62e30b6 SHA512 8221ce7d4ebc2fcd959ab529d2fbbc6ad84fbc9fc22ef3d73a3a24fa6f5405bb71223bc8d919960254a4ee8b71a67c09218212ac2286703d309d1064be07f9cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-20.12.3.ebuild b/kde-apps/akonadi-search/akonadi-search-20.12.3.ebuild
index e8429904b4bf..55be7024c781 100644
--- a/kde-apps/akonadi-search/akonadi-search-20.12.3.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-20.12.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 x86"
 IUSE=""
 
 RESTRICT+=" test" # perpetually broken, bug 662378
diff --git a/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild b/kde-apps/akonadi-search/akonadi-search-21.04.0.ebuild
index 55be7024c781..82ff1bfde225 100644
--- a/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -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 ~x86"
 IUSE=""
 
 RESTRICT+=" test" # perpetually broken, bug 662378
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index ee65794f32a1..511d26e498d4 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,7 +1,8 @@
+AUX README.gentoo 1607 BLAKE2B c5f6ae8c403ff0306e7c83f54d7b0bea5ae273e090d9ba1cb1c13ded4c292d7194433998a2d02ec7ccadc0f27bf12b6b64539338effcd49e242edd24a4230e58 SHA512 e4480205a76d2a5acb7882984de7de27322a816cccd1ef40886be2f90e551806d93ede5968c40a72a9e3b3dbf13cc58384dbbeb50224f74be198a861c5eb1dec
 AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623
-AUX akonadi-20.12.2-mysql8-conf.patch 2392 BLAKE2B 10d34a17d0af283d273186c32770af4dd3ea86893ac96d600203872dde8a0b1f62463315f1b3f46a91be86e44f7d49f88fdfbc1ff3ce56c51057cfa40cf6c51f SHA512 04fed8d69129ea410938edfa73af302f4aafa26894061480f4ef25b7b38b16df71ce813e404c78cc55d70af62b8bd2c4ed940f22b8030444bea66cef3adc5871
-DIST akonadi-20.12.2.tar.xz 1593452 BLAKE2B e3d058a43685a8b8bf92ffbb169f1c17b8e831712567a4ef8eba6ef1eee6321ae45f82a72a4c44a71835b65c18075497d26c8802b7a2f0a10c9baa21efefa65e SHA512 2c21db5d6ab6b8d9cedabad2f726fd518ba8219db3cb6f8f72820edc71ed72efa31efcb2c4cd8ff36e52e4c0a38a97dd890789bf6816ab524f0568892254523c
+AUX akonadi-21.03.80-mysql56-crash.patch 2534 BLAKE2B bc36e6a80f6f93695e35fc19edf9d8a1139508b9fe3cd1f81a1e6a1ca7723def4ed81fb9bdc75822b00835ad65333bb1dc44a552d33f09bfd331a4ddb8e23d13 SHA512 acb0432f98a96d5af609d43dc5aa25d3d5d0668c9493c62b2339add0f3ef78d54449137884eafc0201b9f0f4de4543a584ef6cd746cd3634d1a84169cd0e4219
 DIST akonadi-20.12.3.tar.xz 1593588 BLAKE2B 783b75a21cf1b1771a5ed25fb25d395af374e249e43ae15f725e92921ef7afdf312cf39c60457a61ba549ba90fc3aebc8ef0b53b666ad1a89ce0cf58c43748b6 SHA512 516f240349b4a680ee8ab1986b8f3d018e9e54a8802aed404b3deb08491edd67413cc4bbb43aedc583f7110812b6bf41277f83908f54221cf21efb3b7f6e32df
-EBUILD akonadi-20.12.2-r1.ebuild 3751 BLAKE2B 969d2aad7e56fa8fee1fd4964789657a63f606e705f97f26d599110762b789f65c074f0e30d8900e47d5bbaa25c82dbaf68b4313f5489c3567fee4e752dc982b SHA512 4d497021179b8b05d9733502f24be27a05c9aca4ec7e4d91e4abe209901c36feb6690fc8fe7ff5128e43d3e575a36dc90f0f7c518bb9d7236da53676924534f5
-EBUILD akonadi-20.12.3.ebuild 3702 BLAKE2B 2aeb6c738953c0466de1bba7b4becd7bd5f4e3579cfe9caabbf3fe2c779bdeb11b9266ad1baf96048a1ae29d110f001e7d2ab668a1c841e786d02bf6cf7cbb3d SHA512 8e961ec95e57bd37509af8e4f619ae5c8c317485fc8ac31c109c57304b8c979a529c53e082890c3ade84332482c5f553b7b0653f2682ee0e037106371ea2316f
+DIST akonadi-21.04.0.tar.xz 1598612 BLAKE2B 647dc2490cd421ca1afee6758ec413495ae22ce48cf1af7de073aa5e607d5e6aceb3bbe2481d328eec978e6a077ce76cbabf48b153745f13d88126b7f782f7cb SHA512 7d8336e745728eab6756313088dc0f2b3dde2c8330abb1fc973e5a557955d06be67bea0da026b7d26bf4eeb2f27abb79c609d7d4b56cbf543eaae1f49b634440
+EBUILD akonadi-20.12.3.ebuild 3444 BLAKE2B 149f5e1df84514187600dcba980905b0e3a81ea1d169e15e0faf5c3a89c96979f35561fd050852314185bcf9e0d8b2396f1815c7280e62e2890d1c270f149a27 SHA512 16ebc6189f20119203af2e26c164324f5d82d7ca3d276e576a0aff2a07004ebbad400b8c99087f96cf6e451fdb849cf7f6c2d161f85a8b62c9839daf945ee3df
+EBUILD akonadi-21.04.0.ebuild 3448 BLAKE2B 923417260107f35463dccf16a7045ef952d4dbeb6766fa9a3a1fdd28230ac83959a7e08340cb9b9e59252e6b4e3e0e3e046a3055568a9cd48d9776d492d7bd0a SHA512 fabaac9fea2a96546e6b44103bec66f5e4b40dcb236919177bc1c02289a516b5efccd7dfe10d83443f73d704563f21f00ab4b080f4c4edf0b1bb93b5da58505c
 MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e
diff --git a/kde-apps/akonadi/akonadi-20.12.3.ebuild b/kde-apps/akonadi/akonadi-20.12.3.ebuild
index 6f78d4f5ff9f..5b6a1853aeb3 100644
--- a/kde-apps/akonadi/akonadi-20.12.3.ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.3.ebuild
@@ -9,14 +9,14 @@ KFMIN=5.75.0
 QTMIN=5.15.2
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+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"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+kaccounts +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
@@ -73,15 +73,9 @@ pkg_setup() {
 	use postgres && DRIVER="QPSQL"
 	use mysql && DRIVER="QMYSQL"
 
-	if use mysql && has_version ">=dev-db/mariadb-10.4"; then
-		ewarn "If an existing Akonadi QMYSQL database is being upgraded using"
-		ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
-		ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
-		ewarn "  \"Cannot add or update a child row: a foreign key constraint fails\""
+	if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version "dev-db/mariadb"; then
 		ewarn
-		ewarn "Manual steps are required to fix it, see also:"
-		ewarn "  https://bugs.gentoo.org/688746 (see Whiteboard)"
-		ewarn "  https://bugs.kde.org/show_bug.cgi?id=409224"
+		ewarn "Attention: Make sure to read README.gentoo after install."
 		ewarn
 	fi
 
@@ -116,6 +110,7 @@ EOF
 	doins "${T}"/akonadiserverrc
 
 	ecm_src_install
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
@@ -126,4 +121,6 @@ pkg_postinst() {
 	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-20.12.2-r1.ebuild b/kde-apps/akonadi/akonadi-21.04.0.ebuild
index c0e9eb4ea8cc..7e807c4a6a14 100644
--- a/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild
+++ b/kde-apps/akonadi/akonadi-21.04.0.ebuild
@@ -5,18 +5,18 @@ EAPI=7
 
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+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"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+kaccounts +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
@@ -64,10 +64,7 @@ RDEPEND="${COMMON_DEPEND}
 	postgres? ( dev-db/postgresql )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch"
-	"${FILESDIR}/${P}-mysql8-conf.patch" # bug 709812
-)
+PATCHES=( "${FILESDIR}/${PN}-21.03.80-mysql56-crash.patch" )
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
@@ -76,15 +73,9 @@ pkg_setup() {
 	use postgres && DRIVER="QPSQL"
 	use mysql && DRIVER="QMYSQL"
 
-	if use mysql && has_version ">=dev-db/mariadb-10.4"; then
-		ewarn "If an existing Akonadi QMYSQL database is being upgraded using"
-		ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
-		ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
-		ewarn "  \"Cannot add or update a child row: a foreign key constraint fails\""
+	if use mysql && has_version "${CATEGORY}/${PN}[mysql]" && has_version "dev-db/mariadb"; then
 		ewarn
-		ewarn "Manual steps are required to fix it, see also:"
-		ewarn "  https://bugs.gentoo.org/688746 (see Whiteboard)"
-		ewarn "  https://bugs.kde.org/show_bug.cgi?id=409224"
+		ewarn "Attention: Make sure to read README.gentoo after install."
 		ewarn
 	fi
 
@@ -119,6 +110,7 @@ EOF
 	doins "${T}"/akonadiserverrc
 
 	ecm_src_install
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
@@ -129,4 +121,6 @@ pkg_postinst() {
 	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/files/README.gentoo b/kde-apps/akonadi/files/README.gentoo
new file mode 100644
index 000000000000..c778f6d1a211
--- /dev/null
+++ b/kde-apps/akonadi/files/README.gentoo
@@ -0,0 +1,39 @@
+Akonadi QMYSQL backends that were created using <dev-db/mariadb-10.5.9-r3 may
+be in need of a manual fix. Failure to do so could result in akonadi service
+to stop fetching and sending mail for KMail or any other kind of issues in PIM
+applications depending on akonadi like KOrganizer, KAddressBook etc.
+
+Note:
+  - All commands that follow are to be run by a regular user.
+  - They will have to be repeated for any other user of KDE PIM.
+  - Use your favorite terminal.
+
+  1) Check if "mysql" system db is present:
+     $ mysql -S /run/user/$(id -u)/akonadi/mysql.socket -e 'select schema_name \
+         from information_schema.schemata where schema_name = "mysql"'
+
+     The output obtained should look like this:
+        +-------------+
+        | schema_name |
+        +-------------+
+        | mysql       |
+        +-------------+
+
+     If so, then automatic DB upgrades will succeed, no further action necessary.
+
+  2) If, however, the above query returned empty, add the missing database:
+     $ mysql -S /run/user/$(id -u)/akonadi/mysql.socket -e 'create database mysql'
+
+     Future MariaDB releases should upgrade without manual intervention now.
+
+  3) Optional: You may have come here with an already defunct akonadi service.
+     To manually fix the akonadi MariaDB backend:
+     $ mysql_upgrade -S /run/user/$(id -u)/akonadi/default/mysql.socket \
+         --defaults-file=~/.local/share/akonadi/mysql.conf
+
+     Don't forget to restart the akonadi service afterwards:
+     $ akonadictl restart
+
+References:
+  [1] https://bugs.gentoo.org/688746
+  [2] https://bugs.kde.org/show_bug.cgi?id=409224
diff --git a/kde-apps/akonadi/files/akonadi-20.12.2-mysql8-conf.patch b/kde-apps/akonadi/files/akonadi-20.12.2-mysql8-conf.patch
deleted file mode 100644
index 8edf9d605dde..000000000000
--- a/kde-apps/akonadi/files/akonadi-20.12.2-mysql8-conf.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 9c666d0d6039a87f6286014c7d9c7281a5bd9dd1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 16 Feb 2021 21:38:14 +0100
-Subject: [PATCH] MySQL server settings: Make use of 'loose_' option prefix
-
-Idea by one of the Gentoo MySQL maintainers. This makes MySQL skip over
-unsupported options rather than fail, which is important with >=MySQL-8.
-
-See also:
-https://dev.mysql.com/doc/refman/8.0/en/option-files.html#option-file-syntax
-https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#option-prefixes
-
-BUG: 421922
-
-Thanks-to: Thomas Deutschmann <whissi@gentoo.org>
----
- src/server/storage/mysql-global-mobile.conf | 6 +++---
- src/server/storage/mysql-global.conf        | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/server/storage/mysql-global-mobile.conf b/src/server/storage/mysql-global-mobile.conf
-index 19649d347..48e150af7 100644
---- a/src/server/storage/mysql-global-mobile.conf
-+++ b/src/server/storage/mysql-global-mobile.conf
-@@ -65,7 +65,7 @@ innodb_large_prefix=1
- log_error=mysql.err
- 
- # print warnings and connection errors (default:1)
--log_warnings=2
-+loose_log_warnings=2
- 
- # Convert table named to lowercase
- lower_case_table_names=1
-@@ -80,10 +80,10 @@ max_connections=256
- # (make sense when having the same query multiple times)
- 
- # Memory allocated for caching query results (default:0 (disabled))
--query_cache_size=0
-+loose_query_cache_size=0
- 
- # Do not cache results (default:1)
--query_cache_type=0
-+loose_query_cache_type=0
- 
- # Do not use the privileges mechanisms
- skip_grant_tables
-diff --git a/src/server/storage/mysql-global.conf b/src/server/storage/mysql-global.conf
-index ab4a4a1e3..b67a4ec1e 100644
---- a/src/server/storage/mysql-global.conf
-+++ b/src/server/storage/mysql-global.conf
-@@ -62,7 +62,7 @@ innodb_log_file_size=64M
- log_error=mysql.err
- 
- # print warnings and connection errors (default:1)
--log_warnings=2
-+loose_log_warnings=2
- 
- # Convert table named to lowercase
- lower_case_table_names=1
-@@ -77,10 +77,10 @@ max_connections=256
- # (make sense when having the same query multiple times)
- 
- # Memory allocated for caching query results (default:0 (disabled))
--query_cache_size=0
-+loose_query_cache_size=0
- 
- # Do not cache results (default:1)
--query_cache_type=0
-+loose_query_cache_type=0
- 
- # Do not use the privileges mechanisms
- skip_grant_tables
--- 
-2.30.1
-
diff --git a/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
new file mode 100644
index 000000000000..7cee0b0e815f
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-21.03.80-mysql56-crash.patch
@@ -0,0 +1,51 @@
+From ca023c075e5e239dd6d254722c8866b17a524a3c Mon Sep 17 00:00:00 2001
+From: Manuel Nickschas <sputnick@quassel-irc.org>
+Date: Wed, 10 Feb 2021 09:40:44 +0100
+Subject: [PATCH] Find mysql_install_db and add required option
+
+Rebase patch onto 21.03.80
+Gentoo-bug: 530012
+---
+ src/server/storage/dbconfigmysql.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+index fd057670e..c19cff0e0 100644
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -53,6 +53,7 @@ static QString findExecutable(const QString &bin)
+         QStringLiteral("/usr/local/sbin"),
+         QStringLiteral("/usr/local/libexec"),
+         QStringLiteral("/usr/libexec"),
++        QStringLiteral("/usr/share/mysql/scripts"),
+         QStringLiteral("/opt/mysql/libexec"),
+         QStringLiteral("/opt/local/lib/mysql5/bin"),
+         QStringLiteral("/opt/mysql/sbin"),
+@@ -597,7 +598,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt
+         == execute(mMysqlInstallDbPath,
+                    {QStringLiteral("--defaults-file=%1").arg(confFile),
+                     QStringLiteral("--force"),
+-                    QStringLiteral("--basedir=%1").arg(baseDir),
++                    QStringLiteral("--basedir=/usr"),
+                     QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+ 
+@@ -609,7 +610,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const
+ {
+     return 0
+         == execute(mMysqldPath,
+-                   {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--initialize"), QStringLiteral("--datadir=%1/").arg(dataDir)});
++                   {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--initialize"), QStringLiteral("--basedir=/usr"), QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+ 
+ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QString &dataDir) const
+@@ -629,5 +630,5 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri
+     return 0
+         == execute(
+                mMysqlInstallDbPath,
+-               {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--basedir=%1").arg(baseDir), QStringLiteral("--datadir=%1/").arg(dataDir)});
++               {QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--basedir=/usr"), QStringLiteral("--datadir=%1/").arg(dataDir)});
+ }
+-- 
+2.30.0
+
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 5101a0ca554d..20b3015dd32a 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
-DIST akonadiconsole-20.12.2.tar.xz 198012 BLAKE2B 1cbbb43d7d20d45a5afe112345b1a4a17b1492fd128e885c61925d9ef7a34a3347f3440ab577b6d81309c378ad6ddef9e56d8b2beb51a68ad4c412bed99a8fff SHA512 f4b33bd2b8add0e09beb5443d6360d2bfd226249950233d8dd44e1e408e199e3d3e625e2b6a1e0d4b6c756371c2b1ee5e486394ca4b2bc47e48e476e0711a6e4
 DIST akonadiconsole-20.12.3.tar.xz 198064 BLAKE2B 84d20b4e1b9194d7936848d9096f84da37419cb38384637c01adfecd9ccf800108e3c7465954f0c3e043746bd2da4047af829411e970bfebdf45950832e74d55 SHA512 6a24e4ea642621472f28d9ead78247830393ce2b917a0f8386890c2a61de4a95250e9cf0823a58a53501955e250860c55c0b536486ffd2b9d71b2347f47d2e82
-EBUILD akonadiconsole-20.12.2.ebuild 1481 BLAKE2B 70365c62cba2bd3bf2b3c6c6a0d18af426004bdef57962acdc727fe38152865792b89386ae2e15df95d8126ff91353bb672d74f3a4be47a9a35b86a63216fdaa SHA512 b87cf2d33cdcaf8634f7ee0c808657d9f39f246e95947750aadc8286a1e021e2269df0f7c7649cfaef32e056f5b9c53380e7cbd68c4906c29bd72b2cc4c80390
-EBUILD akonadiconsole-20.12.3.ebuild 1484 BLAKE2B 257fc6791a2ad5f6a1e0314b3aeeb6c48874fa2248f1674a37bffeea90bf8916b65aa84a83eb505feaed1fb664e592b6194e1ce17c7adbaa46bec7df05306c88 SHA512 ee1d198eaf88909541fd249a6d29c8035143d38ec0e7ece0a92fc3766783d4b0849d3614ddd743e53c408acbbe5ca833b1a3cef64d626502f357ed5199bcfce6
+DIST akonadiconsole-21.04.0.tar.xz 201776 BLAKE2B 25f3fe851a2af2e14d226cffe29b19be08b236f2aa4bdbe057b4b578def5f8127ce1e41d01fac5fba25fbfe19460667d32728f8492ea32ba0ee341b0249326ea SHA512 e559dace323bafb8c1e78b0ed57c12d4723ad9a285d9a8f34acd4750a822619d223351a151397ea8d7a139b8dd26885bd8b3c704dd754579bb3214ad73053520
+EBUILD akonadiconsole-20.12.3.ebuild 1481 BLAKE2B 70365c62cba2bd3bf2b3c6c6a0d18af426004bdef57962acdc727fe38152865792b89386ae2e15df95d8126ff91353bb672d74f3a4be47a9a35b86a63216fdaa SHA512 b87cf2d33cdcaf8634f7ee0c808657d9f39f246e95947750aadc8286a1e021e2269df0f7c7649cfaef32e056f5b9c53380e7cbd68c4906c29bd72b2cc4c80390
+EBUILD akonadiconsole-21.04.0.ebuild 1484 BLAKE2B 373f9525eafbb30290121ca22df0c63141a607e9b4d363bf98174d8884039d07fb8e2273fb3317a1afff5086f9a8e18b0f1e5bdcc361d04e50ba81a1f3ab00ce SHA512 e0bafad9142aa30c05f8916b7878ba93f52eda19df7fd6cd5c8212bd4939e2e3cb56a237639f53c77a4ea1a35a297376a1b3504d6a941cf63c78b03d2173f424
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-20.12.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-20.12.3.ebuild
index b06d71b02a82..402f00b62a0d 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-20.12.3.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-20.12.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="
diff --git a/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild b/kde-apps/akonadiconsole/akonadiconsole-21.04.0.ebuild
index 402f00b62a0d..a0e66c6a00f1 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -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="
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 5f5d559a7ca0..e92c023a0c71 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,6 @@
-DIST akregator-20.12.2.tar.xz 2205104 BLAKE2B 56a05146aca50a419a659c93bbd9b8c5903e2465f80cd5125a01be14f53a67d1d9da6e7e7b2a97550ec86d28e85431f8f56392475d7c3f371b9c86754246ed17 SHA512 b8fef0b5f4a825d8854373810f173dc0c3d9e95007f6e96647d8b537801910f572d7b8593801137b078cbd754447e70af08c1ff3c2863e733be10dcfbc4c0913
+AUX akregator-21.04.0-fix-dependencies.patch 1061 BLAKE2B eaec25b98a2f4aadb4547a50c1d732c015a6775aa435a0ff866289e794eba9cd927a8b510f034463a11610332d73a96a768a8fa90686c2ccae0851d8ead853db SHA512 1e1cae77456104dd127076439f857e26950ec672ee22ddb37b6218eece56ebbddf37d93fede886ecce606717260df7066db2ad1603483a69017bca1bb35bd3dd
 DIST akregator-20.12.3.tar.xz 2206188 BLAKE2B b1bb959de8d792057b6542a9f059687121fc3cfcffa36e519ebbb10940f1a0d002d9d3c0784e0c1f0163ebaf7442fea19985fe434a728c060e254fbbc8369624 SHA512 f223c45fb63a844a1f662c3a77a1f6d23a9b0f8de738fd3a0a88379a82c1be4343536f6ae11856839b03406181ed1bc42cee8ab2cb1ff2515a74a2adb2327ad7
-EBUILD akregator-20.12.2.ebuild 1727 BLAKE2B 56737a4663211a79cf102f67774c62c16444bd95fc1ed33f9ba9c803fe3e11b27239b4f96e5ff98d9799dc62e681c1197e2b97b1b23a49009ed918bf2d128310 SHA512 2c4fab22348188ae0947d2b48e52560f72563e9e4b78e8df4b2f12b44a99323470b96b87d92354f6b588b89e96270e8e61d0f65c3505fa3438dd4cc9ea2808ef
-EBUILD akregator-20.12.3.ebuild 1730 BLAKE2B f55e06fe6861a10c9a85105c098c831f2866c0fc0c1fdbe03ebc88a1529ed98e535ad531bf9f061a88755fab8ccf334dcef49d8022d20a0e52cd58ba9081e9d5 SHA512 73cdf61fe918fa243cfe2d791784b0f011a7586f9b950a0538b358355d9fa20c1717e0abe80fc1e210c5a718c43191165c2ad86770d8ad21bddfe250fa69b50f
+DIST akregator-21.04.0.tar.xz 2213808 BLAKE2B 90bc37a9a54271a6b728397e461ac0f48044f446cc7990f3c830ffb38cc1762fdf5f016a2c0a934b2acdadd440e58fb79e17a408fd8404db1012bdefd4cc8cca SHA512 75d158cc4384728b5d690550bb49eb620b38606ff73c070cbb0b3ee39186c9a84a81cebd0720e0b08c7d1b517efc7124204fe25b608dd55274d3957548009731
+EBUILD akregator-20.12.3.ebuild 1804 BLAKE2B a1aa477d57307643d1330eb8e1e0f336c283786fd874615a108021dcb9728154b6240aac12fdd3784d93be22947eecb67e06586bb61edf917a7646912b11b5bb SHA512 0b6253cc4dce84f7c16067389e2f38f2c5cee07c35e4e68a52092df3f2581714d3dfbb3b92085baae34d026d072374a41154eaf1e41514097bee60010590edcc
+EBUILD akregator-21.04.0.ebuild 1798 BLAKE2B a2cbf708e4973aef7d1a5c94be6085b76e38e89eba3edd36f574ac9c84e4bccd1c9015896b47108161ba4ca53b0dd7712ad0241d1d12306d9a23d0bc84016cb6 SHA512 733b90ff9ed384100a5ccebd92245d51c45d208b3531f1e380d9914fea05153cd96eb0a6423c889db71afc786c276e7697b924504627d60a3587ff1b6dbbbb1a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-20.12.3.ebuild b/kde-apps/akregator/akregator-20.12.3.ebuild
index 3fce873a34ae..45c5d16c8f31 100644
--- a/kde-apps/akregator/akregator-20.12.3.ebuild
+++ b/kde-apps/akregator/akregator-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/akregator"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 RDEPEND="
@@ -55,6 +55,8 @@ 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)
diff --git a/kde-apps/akregator/akregator-20.12.2.ebuild b/kde-apps/akregator/akregator-21.04.0.ebuild
index 2f6b14d2bdc9..d6d4f438d456 100644
--- a/kde-apps/akregator/akregator-20.12.2.ebuild
+++ b/kde-apps/akregator/akregator-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/akregator"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="telemetry"
 
 RDEPEND="
@@ -55,6 +55,8 @@ DEPEND="${RDEPEND}
 	dev-libs/grantlee:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-dependencies.patch" ) # bug 783921
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package telemetry KUserFeedback)
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
new file mode 100644
index 000000000000..4455b10fbd30
--- /dev/null
+++ b/kde-apps/akregator/files/akregator-21.04.0-fix-dependencies.patch
@@ -0,0 +1,26 @@
+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 da2bf608744f..c58504540d41 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
-DIST analitza-20.08.3.tar.xz 338512 BLAKE2B e5d80d4c944e77af8153fa80a0063917485fb884b9fcb3b003d028a72b4cff0dca92d89d1deed306f5b964d50eb8682c7f6a27ae4222ebf5bb24c35989a8903b SHA512 b5a92b5953668308c9ce095017e5c7fd62400223811f63d10e3f24968ed374e1259b8482f1a090dab7f96b624739a6b48e616152a8723668ae33e3d333b2b746
 DIST analitza-20.12.3.tar.xz 341640 BLAKE2B 0efcf1596f78413523375ec5dbc3ce9007c36ad71173d03f5c9de7de5add8353c856b27c0d18d2243969d4c147664844a39023eee8df32792c6e8e8ab7aaf1db SHA512 2357c5395bcdf66b1a54de7404441ef6966ef6b2a6c2c9a6cc31d5104a126acdd09f7aeb3f4d605591c0e2753a32967eafbccb48e188c96318126ed6657b0d01
-EBUILD analitza-20.08.3.ebuild 913 BLAKE2B 7a745f15e7aba2fff8b97b156f87ae4d1673d2218cde2e6fa066f1e4378969a76a8b8cb81d8b7e7ff5fbb12b4ca1772dd5e81f6bd97930d667e7b128399487b5 SHA512 87538a83513ceb4671fb06ebb5db42baa9eb9a5ecb192d1ce90030a0d0284c7f2a5eda858cb155d9bbfe0fddd83fd759e64a264965f2df444656cdd011fa7e81
-EBUILD analitza-20.12.3.ebuild 916 BLAKE2B 1ec4d19088961208ba62a7db4cfbe0368f79ad239226a62eb33884bc8e1daeb75264396539ee35046eaceb3dd450831d0d63d1cfc111dcfc90c0803e541769a1 SHA512 775a5e64f37d04503c5b9181f843429f95c90c20ea41e4a4be963e9216ca66e2c3f32afcb64935560e462bb9f03dc9d62fcc812ff756cfba42f479709befb7e1
+DIST analitza-21.04.0.tar.xz 342048 BLAKE2B 442c5f116a16b0211df116aafa144bf625cef16c9f3abd9a6ce58f703aeccfdd32b751f9a85731f6c05c46c64472a90ee6437c76b7d25dc657ec81a08362eca2 SHA512 9fd702f048902251f47c7f0928ef6b8de1472be6a78b129981909cd12d729d68d00309cb2fde2c9d5edaefb613ab5cb4dd955401bc63e973ed0809d8ab2bcdac
+EBUILD analitza-20.12.3.ebuild 913 BLAKE2B c458cf7ca5ed9a9283efaea699c7be1eea149280b95734f1f556b8435154377e67bbcde441082d6edbbf5b91153583f7c0cf4cab3e1b19a4617fc4a2162a35fd SHA512 b108b40cfedce4b6c7de394a43a6f342526e855447aa42cabfb2c133b72760cc41763b9ddfbea71aede71a6e3098393637d6d12d20209405b193ba67022344d6
+EBUILD analitza-21.04.0.ebuild 916 BLAKE2B 1ec4d19088961208ba62a7db4cfbe0368f79ad239226a62eb33884bc8e1daeb75264396539ee35046eaceb3dd450831d0d63d1cfc111dcfc90c0803e541769a1 SHA512 775a5e64f37d04503c5b9181f843429f95c90c20ea41e4a4be963e9216ca66e2c3f32afcb64935560e462bb9f03dc9d62fcc812ff756cfba42f479709befb7e1
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-20.12.3.ebuild b/kde-apps/analitza/analitza-20.12.3.ebuild
index aa7c43b7fda8..ccbb8c1184a3 100644
--- a/kde-apps/analitza/analitza-20.12.3.ebuild
+++ b/kde-apps/analitza/analitza-20.12.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE library for mathematical features"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="eigen nls"
 
 BDEPEND="
diff --git a/kde-apps/analitza/analitza-20.08.3.ebuild b/kde-apps/analitza/analitza-21.04.0.ebuild
index 82416b6a5481..aa7c43b7fda8 100644
--- a/kde-apps/analitza/analitza-20.08.3.ebuild
+++ b/kde-apps/analitza/analitza-21.04.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="forceoptional"
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -12,7 +12,7 @@ DESCRIPTION="KDE library for mathematical features"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="eigen nls"
 
 BDEPEND="
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index ba8d91818bb4..f81ab9141fe2 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,5 @@
-DIST ark-20.08.3.tar.xz 2711708 BLAKE2B c486320f113ab3d12b67aec7589e7973a022415da5dbe01754a9e454c74bb59d2b6556c6934aafd7b5c0ee685e2eca7feee276ad3ebb8a0c6f57aea5bc666a0f SHA512 41ab1498b77f9d152f900eba9e784e8ed28127c849796e42c18db5beb963b0c8f2a1ef1c408d37db02fb21577e5d8e08d8561b72b14042e079a5f1baffa01a01
 DIST ark-20.12.3.tar.xz 2717324 BLAKE2B 120dd525b1f6a4230dcb6307b86ff866161ba9da8a47d7a13852ebe028d0efc936b1aaaa69160329fff82d26fcb2aa4d198d09c4d1407774c1184aa7c4aaecdf SHA512 c6f3da5f3c24ad274891af99dd118d0c852382ce632abbc1273a5b6e216ecb53ef466d49d2279d3e6f0e1b088975584eadb2d2182d3819b888047c0a59ba0a7a
-EBUILD ark-20.08.3.ebuild 1984 BLAKE2B 39c49bf07dd81ef82c1ec4696c1baad53fc3ce4a27785b17414dae84e60064a5731dbed505d4af8e3231d715ccbdf8c2386d8170114a25236ccb888ff300a031 SHA512 7e82c9ae8b6077833143ebfd256ce04786d84f04da1a1dff3626ae1d9b3a212adc031338ad6fd92018719f4219ed2c9dc30950d18034ea1b70337afe9185dd4e
-EBUILD ark-20.12.3.ebuild 1987 BLAKE2B dd293003f8ba6368def3d1e53597e5d77050fac82a85cf00b19c45ebc21466495444023c32680fa93611d40551a82493e33f79ec457fa7d068d89d84e5a0e72e SHA512 5c4f4aee143837066276c01d595797a3bc931f92578252c6ecc7846908aabe9bfce7f8f248939bd35742e3958a6d14deb700ff0ddf22f64ba7e84bf23e5d9fac
+DIST ark-21.04.0.tar.xz 2726388 BLAKE2B 30b4a6e65051b1736527406d5f6f6b4b011f21d69e715aa5cc345da75540b880ef747d63e3682651d6d30ada1c6586872bd7fbec21441441833339ead2a0f139 SHA512 0daa37c9eafc39611dd01043af4cba3f49de57cc9fd09b222319a0c50803637e1e4f4e59d28262a49a6ef93fd225d3648ed451fed55002e9c2c6c8c3a3a1b891
+EBUILD ark-20.12.3.ebuild 1952 BLAKE2B 65ec4414d1a29c3c5a6e56454a055de559d3ad395c87e4362782d9741f453baa454a36fe9c561405f2e63523f3ab5603f6ba38fece08f3d5e6be5104add8b898 SHA512 2c0daff48b4620a72ab16a101052d686cf43d3b76ae33eb9e0dc4c342c1574ff53f4ec8224e0fd6e01d9ab0b0bbfd82151bc446c1af60eb5c0c35dd05ad42c94
+EBUILD ark-21.04.0.ebuild 1955 BLAKE2B 58d35e160653e44f71e30dd6423ca496ca9611bed063f546d6d94eef1e93d33b96cea758f53985972dc55cf2994a3a29b54f7d49e40a4057c36c8941542d994e SHA512 49edec38dcad48057b2399618f8c718a7a58216506467d83a763062b247e2856f080dc9fb12ff8ea235520cc9139a01139eea9ccc85f6a644e2b87d08843e13b
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-20.12.3.ebuild b/kde-apps/ark/ark-20.12.3.ebuild
index 72ad1a83c0b5..15ec763c66be 100644
--- a/kde-apps/ark/ark-20.12.3.ebuild
+++ b/kde-apps/ark/ark-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/ark https://utils.kde.org/projects/ark/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="zip"
 
 BDEPEND="
@@ -67,7 +67,6 @@ src_test() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "rar archive creation/extraction" app-arch/rar
 		optfeature "rar archive extraction only" app-arch/unar app-arch/unrar
 		optfeature "7-Zip archive support" app-arch/p7zip
diff --git a/kde-apps/ark/ark-20.08.3.ebuild b/kde-apps/ark/ark-21.04.0.ebuild
index c9ef36a81bf1..36ad6d1af8ce 100644
--- a/kde-apps/ark/ark-20.08.3.ebuild
+++ b/kde-apps/ark/ark-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/ark https://utils.kde.org/projects/ark/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="zip"
 
 BDEPEND="
@@ -67,7 +67,6 @@ src_test() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "rar archive creation/extraction" app-arch/rar
 		optfeature "rar archive extraction only" app-arch/unar app-arch/unrar
 		optfeature "7-Zip archive support" app-arch/p7zip
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 911fa5b4a750..062c175ab09b 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
-DIST artikulate-20.08.3.tar.xz 1084024 BLAKE2B 021d0d7cc1ac04ecc5861e0b66df79bb9df2ddb4130906f565706b8cb1670daab792f0c5551506e7974116f468f4ce5f57c9d52d879bb337cb7e3fef9d06515f SHA512 6bce1555acdb9762277f9c54ef004f98fe5b08375d27716b0fc623d30906b053d4a025f79af93a3fc373341d37cf20e05b59bf01df6da9f4b1e8b3f43ea3d2f2
 DIST artikulate-20.12.3.tar.xz 1085400 BLAKE2B e482a4cb9e4414737bb60b12ba6fec542a804f885f8723b2e8a01a7ceccb09aead993ee7f98358e02e1d9401ddda2348bc6ba18d95f9566c4af1e16c2ee47edb SHA512 34fec06e45120745c668e58ce691c68c28c56e8528a163c6fa330419018cef258a5ce7a33d2e2cdba991e256a50c2523460ca5224180b37e8764559a229ac3a6
-EBUILD artikulate-20.08.3.ebuild 1188 BLAKE2B 35aa5b5cea3349a7f436edcf2a315f21172d6f87a1ec27cab874514aa59b67b9f796752190edea02329792318d6b5f583376d1f7ac724e99c0ba7962ca578f58 SHA512 6af288a0592854dd3f51b6653a78cd500b2137cec97ee7b12247dfcaa597b16008bfbc7f2b2883cb13f213523dd45b7b6afbb2addb890e229a3afa641fa38603
-EBUILD artikulate-20.12.3.ebuild 1085 BLAKE2B 8ff4e26e293799b6dd2c33cf56b2d9826eaa4f744d4ebfa1d2656d1a2b3eff23bcd24985e396f36483ce5184b546331b92791af954a0fdffe212333bd1aa8f13 SHA512 fd53c6d0d0976a8b967aed5a2dd0f3c960f5755c45593b985dae999f7f4eaaea0eecd14e6891f6e4e33618ffafd546ea0666b9b943d55286b4633e5eeac10d78
+DIST artikulate-21.04.0.tar.xz 1086736 BLAKE2B e8a57a1e8e29cf479bb562aacc41103ec661e4d5af7a03d93f29d46deaebc878cd6316025a2e1595a5d4b09e1590d5d619d50197c3fc646a24f574e3392732d6 SHA512 842ae972e28162afb81d2debe13cd0df7c05727e31e2d0fe407310d4a1686c1ddf23f27b8bad64ef4b660e4c443853526d68f798514c38481a876aec95249732
+EBUILD artikulate-20.12.3.ebuild 1082 BLAKE2B ba972cb56df41d3c9fe5a68f2118ecf7119af240bc9c4661c6c3d461f519b3ce8f6eee9c0fab942c457c7fa573da8b7be91efbf45a5554c9cedc65058763e4dc SHA512 20f790fc8084531b527e993ead1b41e065c7272a28c74b94590cdab71c72db1d813f286bd3c942b6fbf2c9955132a2a59c067cd094f043236a157c51b793f565
+EBUILD artikulate-21.04.0.ebuild 1085 BLAKE2B 7286f341f6d9114e09e2b57258208765c5beee26bf04347766c4c1930a758a43d69d2d8d3d42b25853471dfb70bfbec73f8953b009df7c9c196fdb73fc78c561 SHA512 00afee54ac5828356001c3414c08f7d1a7d8a3006a8b5a47acbd1560de7d1eb6dc6c1c20ca27f50c559c1e371a01b4084bc93ec5af8b0a58d6def06d728348c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/artikulate/artikulate-20.12.3.ebuild b/kde-apps/artikulate/artikulate-20.12.3.ebuild
index 82f107954ca5..664945b2b466 100644
--- a/kde-apps/artikulate/artikulate-20.12.3.ebuild
+++ b/kde-apps/artikulate/artikulate-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/artikulate"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/artikulate/artikulate-20.08.3.ebuild b/kde-apps/artikulate/artikulate-21.04.0.ebuild
index f78704598c5c..e13fafbd0a01 100644
--- a/kde-apps/artikulate/artikulate-20.08.3.ebuild
+++ b/kde-apps/artikulate/artikulate-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="optional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Language learning application that helps improving pronunciation skills"
@@ -13,12 +13,13 @@ HOMEPAGE="https://apps.kde.org/en/artikulate"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="gstreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
 
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
@@ -31,15 +32,13 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0-r4 )
-	!gstreamer? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
-		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex !gstreamer)
+		-DBUILD_GSTREAMER_PLUGIN=OFF
+		-DBUILD_QTMULTIMEDIA_PLUGIN=ON
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 1640b7fc2a05..8d5384d3c6aa 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-20.08.3.tar.xz 498660 BLAKE2B 60fc9d06505b7ad03d8cb8eec78d4f3893ca54859d1a18f6ea3ac28060ba74780af64baf3ba6499b16d3fc6388837b111eb6a3cc602c5adf55de0b96eb0a71a4 SHA512 77d03d9aed910329a70dcb6c1825de34caeb5d9d215959c772d98e972e92fafb94a5245df0b14c65f1e5d08f5cf565b9bba00e9637320eca156837890b6dd87b
 DIST audiocd-kio-20.12.3.tar.xz 500672 BLAKE2B 44cd5c3f0670f4336352126fa569c5ee53182efca435d6d308b00a50021190b9627f1bc8ac4b64faa1f25fc3f9aa2f9b91a611c1333f9e8341c6a9ba6fa4156e SHA512 0b5d343f802cee3435fa1aadf39ddba3afa6ec70569bab00da0e0cbda4360618e5384042c913a4e54017f82f27f3f202a509d933762d1b7ef4884d2ba70556bc
-EBUILD audiocd-kio-20.08.3.ebuild 1082 BLAKE2B 0b9230eaa1e06e94133a787b34be3757932b7571cc962a43fa31e41473582acd48b7e6e2a857980acaf4a877674200e8c1f26e0ccfbbbd9b20d75f15b3a23c62 SHA512 0d204f194d720bc89df195a5fdeabf58fca92b7a53489e3ec96e225438c70b3deaa8e8f7a560275a8cd894ebf4b41f2b62d280c33b291e4195e49fb629e95788
-EBUILD audiocd-kio-20.12.3.ebuild 1085 BLAKE2B a0b414cf673beb348c08a20e933b548049cfeff1e68d3fe6e441866b98727ac37b69510847f3f3bf84829aaff98887d8f693ab49494c56a5942fbbc20add4e66 SHA512 12868b625beec681743310ec7e2a9cf378e5dd005b720a2faefdefdb16ef76fbf4ad6b8e35a036057816217ee50795d8d767567a8fa8c767575b67c42581fa2a
+DIST audiocd-kio-21.04.0.tar.xz 501820 BLAKE2B a5f7beb993f681d7281c1e3f2a5ff8f11d7861e3e44f257d1cbb0bb95c3ece99d3292be8d92f275d8fbf9ab959060839f6235ae47378ec49c5a02e8fedf65ebf SHA512 0996435317fd8129a752b6196cb38cc71aab1be8324fe67bd63b5cf37376c5eab9274adc22201a585e97c6956820f1c49ddbcad6814f2e8970f34c6676671bdd
+EBUILD audiocd-kio-20.12.3.ebuild 1082 BLAKE2B 2e96da3421b53f2b2c905dfdd7996b24458c81377cad88e20784d20cb7f7c17f0a1e99f0e9554cc078b7830f1fe81647a14bdd687a9a493094cbd4cb4c00e50d SHA512 f665506398264e550c8022b12b8fbad2054688011b15fdd902f3929ca0aad76f3bb238fbdd991866c20699f7170593d99cbd03e15038dacded8d34029fd7c00e
+EBUILD audiocd-kio-21.04.0.ebuild 1085 BLAKE2B b87b785a67ce6a1a6ec388f83f69d9498c0d7a1db3fe295ccd3b32dc465cedc6428deb88c28658283339ab3d02a79d48644e28a1e9e1b31d1e2d9cd698cfcd5d SHA512 7bf729e0364b9e5ed32eed37c9e833316fc99b814154b01e743f3c0e6c2ac054c13095a8b860c4a55b54a31067ac7418476dea42fb55fc7123352f94bf7a79c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-20.12.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-20.12.3.ebuild
index 76e1abfa9787..553a4b8d976d 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-20.12.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="flac vorbis"
 
 DEPEND="
diff --git a/kde-apps/audiocd-kio/audiocd-kio-20.08.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-21.04.0.ebuild
index bd78baae3f47..af5c2a65eb01 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-20.08.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-21.04.0.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="kioslave for accessing audio CDs"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="flac vorbis"
 
 DEPEND="
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 33a8511a89bd..5480171d7b9c 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
-DIST baloo-widgets-20.08.3.tar.xz 261756 BLAKE2B 06fe1287ffd63608a50d05eef3a247d4231bb75475bfd3377bddad593551322fbd663c8a8d8e31503eb896e68b1b440185ec493fb3e06618e61e6005361dcdd4 SHA512 3a2d033d86a6b008c1c73f23f3f54b0bf4757f7fb0f8799b9e932d2951434ec49d01a2bbcc18ea25d4f4560baf549ac0cbd383e9f9aca7e24c684459aaa23b26
 DIST baloo-widgets-20.12.3.tar.xz 261628 BLAKE2B 95bfc55b901dca67795572e4bd77c5822f1bdfd87c9b24526a1275e556c5ae612d54cead1f6f0d20bb519f39304cfb3d9cb6a59369624a215724178320d0ffc7 SHA512 dc00b8196cb0128c69188981b691b17ef242dc150b38322fa7094b400393cd4b592be472c1c17991fd85f8d606f4138936d225a02568b24ee28440ecdba37650
-EBUILD baloo-widgets-20.08.3.ebuild 704 BLAKE2B 004fcd11d7d59e6fbbeb81e68c5f8fc82d11f899935b23e632afb5247b0c9b9b02a5c0c45e5add3eb1e836fad61612c2a64115c0e7c52aa996e2ad038a5abb66 SHA512 3e4fce3e0387b144c7e383313205f3e526d65c37e96a6a7da1825057d89b11e682856f297971ece5a29212c7d46efe19c327d58c7691ee555f40d4e541978077
-EBUILD baloo-widgets-20.12.3.ebuild 707 BLAKE2B 083d35521686ba2f6533a12aac056a25ffc7e05c3a2ae18b5c0f8114d7bbbe0f79fe2bb82343c4fd2ab03d8747824ec1fb289ec21ca69ed4df3a30303e3c3627 SHA512 0d9a8d39173ccad728ecde784581ee0e034535cf44163f804fdbf7c05c1ea8f3f943e3aec9d013aa37065b471e288a5f24af5e159da4b83c87945f761b584eef
+DIST baloo-widgets-21.04.0.tar.xz 262244 BLAKE2B c542952485abdc932311df202c33ae33014b28c4773fa05b9f6850cce37c488fbed3152ee9678cdc41937fdd2962ac49bd274b927003b36b49b5c60753ec3ca7 SHA512 37df755d19dd042abd9f0ee833015cb2110b210b52f416e7fe0ad9db927f13951b0e57ab05a848185757aae8d74f6aa722f58f1e16be0e144c4ffdeb04b71cb4
+EBUILD baloo-widgets-20.12.3.ebuild 704 BLAKE2B f0f4d61e4937ee0488899d3ca05700c1052dfc475410f24b8d821c324454196124e3868bc21a22435cec574e7495fb708fc60ad23f9431cfff886332761f0e0f SHA512 76d8d06232f7b5919a1a68bf944fcdc9896cbd5f74f3d890624177456d3bdf793879d6a5f50b66f216ed548a5d1ba78bdb99fc7b879ba2acc000f6d88d2b7ff9
+EBUILD baloo-widgets-21.04.0.ebuild 707 BLAKE2B 6d8547ba0f5e07a9be6b6bc461643eabe8d4108d0fc4e108517176dc6a77ec3c5ee7f2fac6814847fffa7c22e085f0aeec57ed704c818085cd1faad2ea29231d SHA512 1335a37eca3bd5acfd901725b1420496b75d7995ce268b83d00125bf73203803c394eb04268ea04130a33eacf63531c805da9468287a6b3df09945b3337d8760
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-20.12.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-20.12.3.ebuild
index b64c1916c837..0abe9d687811 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-20.12.3.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/baloo-widgets/baloo-widgets-20.08.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-21.04.0.ebuild
index 6bbe2551bd80..4d5d9a6075bf 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-20.08.3.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-21.04.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 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 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index c3126ad0e114..0ce22b38cc5d 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
-DIST blinken-20.08.3.tar.xz 2828668 BLAKE2B f5feebddeaf03a7f45c44515ce2550e4d80daea0e6416ff35f3679598506b193491b7793134c472d9e77eebf40f9068c70b07fefaa84689785b1b08a40eb7003 SHA512 fdba92252b7997d51d13e49918b87644254bd4d61dc9451b8479c7f401206cd0e3594254d3a0cb28887aa2f9ab138332f4ec428fd534fae476f9ef1ed2d0eab6
 DIST blinken-20.12.3.tar.xz 2537996 BLAKE2B e45062261af09bcb568ae04e99bd6c1070ce6aeee92ddd4f78cbd27399a4635b0d43a6e53b52c3c03ea54e25316334d9b7589716be4be137941ea3d73cc6fe18 SHA512 0c78fdddb9772f003e73ef12cd09557fa0af469ecdbbbefe1b6c01e236f6d882b93182bdd99427d430eb680a0cfb2346a36df54f626cab568bb86d60e1fe3a84
-EBUILD blinken-20.08.3.ebuild 898 BLAKE2B f09183499e825454c56e8227785bc4617b600fcbf644b58ff6f35d0ac6b3480e092b3ff135ea5e42dc754524aac74e617f005b43bed3b3f7a39eabea9ee30211 SHA512 6e52f76cc6ce9fe86bb6fa75d0341b1f01d691d4e6f88b16aace49466374b34782f47904e5e6bac6d953755a734ae086dce3659beae67fe7b451a7b397452fab
-EBUILD blinken-20.12.3.ebuild 901 BLAKE2B a668cad86473b433ef4df958693898a1ecfb40814642d1674adc33cd66c7bcecf54093029ffe714e19fe415647d3e71acd0dc59fc61fd9b864ef01e543b70d3c SHA512 e7bba1039e80f141735e6ead943dbd9b35753b5c24584e01759d4e29d71010bf5a167c9478b9aec9982d619b0701b51f5f9178e5eef5e9a85b81d0729349e130
+DIST blinken-21.04.0.tar.xz 2709568 BLAKE2B 6d63074934a76784047b706bcacb48815b8e3c360b2f4b4d5008e98dfd28861ce091cb224e420009e19e734ba955638d0f20056186d32124843583e050eea1a4 SHA512 20ca3e2dd642912240e9dae7b77fe53726866978d35eae4c2f29f0f13e6c99b2fbbcbc1abfbf35fae61569bba0e6f0aa77ccc824f23a7c6bdfe1d04b36332aff
+EBUILD blinken-20.12.3.ebuild 898 BLAKE2B 604dba367c9582577b3f8de55a73ed29d7e682f39cb4a5c7e78a06aed17b5b6fd2272af506b2f714dcbfdd962c961ba2363119c79e919568b24aca3811f0a67d SHA512 34414edfe91622ebbbfa712b0e7e2ed49475bc9ef313ede80579ea5228fb9577f55ce39ec29bc7636b9a96e5c0507e55b15b1869e7c95884a8e2d63323eeda41
+EBUILD blinken-21.04.0.ebuild 901 BLAKE2B 0c0e88d75d6566b3a94f732c2754bf94a9f294625d910ae12c63ea7ef8633a24cb71c076f3cbf027e7b83463203d18e37d2ce592f30b84b0d84e32040e6be8a8 SHA512 45864dcba6cdf2e274d8b267e2ae40eccefac028aa1329e852bacc50b66fd52022ec62af2410ad04a87635a2e1038e697d371e0384c1684a67738d4f8b934eb2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-20.12.3.ebuild b/kde-apps/blinken/blinken-20.12.3.ebuild
index 98780d90f803..3a524de4b4d8 100644
--- a/kde-apps/blinken/blinken-20.12.3.ebuild
+++ b/kde-apps/blinken/blinken-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/blinken https://edu.kde.org/blinken/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/blinken/blinken-20.08.3.ebuild b/kde-apps/blinken/blinken-21.04.0.ebuild
index d0460b330c88..9a0ac05372f5 100644
--- a/kde-apps/blinken/blinken-20.08.3.ebuild
+++ b/kde-apps/blinken/blinken-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Memory enhancement game based on KDE Frameworks"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/blinken https://edu.kde.org/blinken/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index c2eab29faa8c..05a2e7cf3675 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
-DIST bomber-20.08.3.tar.xz 824992 BLAKE2B 2f611fc9c0b91e538260a56c24d7634568f5dbbc1e71bea54306ac003125adf95e4643fac4e0e454c6617c91ca96957dd2658fec3a69af203e8beaf890d52ff7 SHA512 efc884a08aa1eaeda1c25a7a8b25a86858b4ab69e44a29967317c043960067ce4a02acd3541202d3c8c7f9c9faa130678442ecaeffc9c83c636f50f3f0a2fb41
 DIST bomber-20.12.3.tar.xz 825104 BLAKE2B 1f252e8edc3f3e0a033efc8dece86c62227508379ab5766f1165f6313be5a7008a90d10491a9ba97f4e7ec96751b66769c6fcaf03b0ed766536d00fda2e06d8d SHA512 4a40b968507ee3c0b9db4fd0adb87a734a11e170599513fc2bccf4086047eb9991ca566109f82b7b147cb551efe50e9ecb95d9a3a8b723a8c2c7823cebbde50c
-EBUILD bomber-20.08.3.ebuild 839 BLAKE2B 44a112a489926b84c8c71188e455c6694edecaaf88a765955302273e8f15d26dca7a5fe93c5e880c087c40ec96016bc3491c2c421a3cd1e70568da27031533b0 SHA512 e62235d3f4d4a757ca3b595cb1c4b81098a2706193370cc8ec176a76184e729112aa16cccdbef1a3c29cf275f7049fc24f112c55240ae5e140d08ee292c0b65f
-EBUILD bomber-20.12.3.ebuild 842 BLAKE2B 10e12d05c911f7672bca2e7b6d6e175e14a3bdcb15021b4b9481e8b31babd67960c799ab6490f087af82cffc321d357676b1d9ee2d0508267b11adfa62f34976 SHA512 ffa2e058f8785ec6a51dba225d51de3863a79d82c30535a25f9036eea281fe491d60167f786e8628b391d3ef9a7b592930a9aa4900964fe12f9025a05e472d13
+DIST bomber-21.04.0.tar.xz 828344 BLAKE2B a22189d7c204986a6a6eee64eaae3e7fabca20f658952ff3164503cd39213322a2bf836ac47b769023a1b6defe7ed6ca992eafd4dcf1e08e669ff44166fa1ae9 SHA512 ccd7675c48da2210d3ba581d99f832581e046abd58c0421d1758fa1b091ae688f7845f9bf045dfb21757118210fead5df0afc6e6c78708b5782147a9e3f9b5bc
+EBUILD bomber-20.12.3.ebuild 839 BLAKE2B fe3dae9822b9db7578611929bcbe68c5a3dbe0a0af6ed234b7782011d8878ebc8f4c28be505969078ebc23aa37757ca2a04e1b2f403654e9025090a95f0770e0 SHA512 1a3d97636927961137dd26e53f85aac990b2b8007b1454e7da01c63d6d1ec52c9804b8c8553aa7c500b2eeaa80827c20ddc5cdd2422b4f36087ba6a2d878507e
+EBUILD bomber-21.04.0.ebuild 842 BLAKE2B da629aa2feaf3b0d506b5a86d3918100acbd9675d217c57e91941c8ad32611013bedf285bbe65d6eff54849fa053420c4250278e1710f33f48fef1bad1c9b904 SHA512 9a981f5d02aee412639b9cb6846cc8d9e836e03166c0f1cdb915801bca24ff3c47e6a18ddf809a9118a32de6d016410756a880ced0384e550f66d8c48ed6487d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-20.12.3.ebuild b/kde-apps/bomber/bomber-20.12.3.ebuild
index bf6d536106ba..c3c3c5bb81ac 100644
--- a/kde-apps/bomber/bomber-20.12.3.ebuild
+++ b/kde-apps/bomber/bomber-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/bomber"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bomber/bomber-20.08.3.ebuild b/kde-apps/bomber/bomber-21.04.0.ebuild
index a22b99b15d6c..784739506fab 100644
--- a/kde-apps/bomber/bomber-20.08.3.ebuild
+++ b/kde-apps/bomber/bomber-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Single player arcade bombing game"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/bomber"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index b464990642f5..c121a91ac470 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
-DIST bovo-20.08.3.tar.xz 205900 BLAKE2B 65b220d02a36976f6c426caed1b518586affe3cc51948ce0018cbdcd2f667e20d1bc5a993b98b0c3340932c95fdecca03ace98f17fb7d585f6642a9414703f96 SHA512 f8b270add7930b665f7d4ef0eb1332e22016aa349743edc6bb4df3d5301ed4b58b86ede361a591cfcf95dd5cf0b319eea1efc9c961f63b0530a58c2350f30b6b
 DIST bovo-20.12.3.tar.xz 205792 BLAKE2B 53589575bf462c3ea9c73e0b85fe3af0b60996dcc39ef90e53bc6704d4d927f3b883373b16897ffe77e959f4ef003eebcb5a597b01966cda0ac0a119087dc28a SHA512 3da7166ea79a597eb8efa092fdcaf85a89f32d2fd8cd9113d33741701c259d2267ace1f050ba87f5ed035cd451aa44fc77cb687a3321fa26a48adf118c4fe2ee
-EBUILD bovo-20.08.3.ebuild 852 BLAKE2B 04f5f66483e161638bc9c97ac7f9a13b523480311b2a81433fca9f4abde5d10ba37a39aec05ac035a9d3269f8f673d3f3fc2342d7647ed7571319ace937c3372 SHA512 4ff8825b6d8385c7190174bb4f7618e55c4b9ff20029351b7f81aee8d3f80e73aeb2b2b4d0404efa6a9b5bb1f4a42f5f2486480e48cf075f1d3ff8bd31d1e8c6
-EBUILD bovo-20.12.3.ebuild 855 BLAKE2B f6aa64801d4e6ada0d2d7f39c1a9a4a700edc3581368581813c22955b5d986a5ca317a746edd13e97b35e7118b9ca81a6c3c8220e5349c14f341e77d9f973d23 SHA512 f66393f160f501d76b9ce33f9e04db8aec169b2cf5c81ce2ca2400525f223ab88f59c2510fc7c1231056f38af8e2e21505d8161c7f13e540822fa96633117a92
+DIST bovo-21.04.0.tar.xz 206472 BLAKE2B d32055b3c759eca29de7e73c369c5b05b17d21bbf5f96cc710f4a1030bad0a0be2c961a8416a01cfa8285d5d6f48ab78b070435d3661ed315ba495852fbbb1d6 SHA512 ed10e54fef7109fc58016395f862f03696b317805316a0d03be42fdcd1d2c08db3fbb370444d251a1c1a11df4aa3dfa209e12150785ffaa9c20634d48651640c
+EBUILD bovo-20.12.3.ebuild 852 BLAKE2B ac056b146b5491595048dcb8593ef118468c134b81a3f7e6b57f3a63fafea871c9f955bdca9b426d20b2c60de93539194946da52effafba4fcfc7de51c5fe525 SHA512 1a2ee89f8ce2a8eb1f8eac7d72cc94c2e6dd12fbd5d98f4bbc0831c1f9c2c03d61435dbb2e3cd86fa8c5a6cfdb024ef1366300ce8af2de0d94f02bc507afd1b0
+EBUILD bovo-21.04.0.ebuild 855 BLAKE2B 5b2733dc24685567896f6893eb5a0faa7d5af0121e90736f2a80c2e15c9467a9ab40b856cbd94bfac8aae567c6df7dc2bfdf9392440f74631ec8279be27ec81c SHA512 f6b17fb67d4da20051f61daf6d22a974a27eab48c86f280adef9f7112db8dcc8d6ee1a531a349a4bd3168fac0a4dce2e6803eac701d9b1196cdc7252d08c61e2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-20.12.3.ebuild b/kde-apps/bovo/bovo-20.12.3.ebuild
index 29c7b19435d0..5078540591e4 100644
--- a/kde-apps/bovo/bovo-20.12.3.ebuild
+++ b/kde-apps/bovo/bovo-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/bovo"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bovo/bovo-20.08.3.ebuild b/kde-apps/bovo/bovo-21.04.0.ebuild
index 866fb61629c2..17bacd07fd43 100644
--- a/kde-apps/bovo/bovo-20.08.3.ebuild
+++ b/kde-apps/bovo/bovo-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Five-in-a-row Board Game"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/bovo"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index e5579cc77c78..4e3f5d69d8ee 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-calendar-tools-20.12.2.tar.xz 224864 BLAKE2B 137a0d975242b2e419007ebc9be0eaac55e5f024b708c78fb773158695a0bb0b673657b8634423826eeba03cfdab75ff7e85bcc6ce09e33372a0927490d0b9b8 SHA512 12ed3517ec1a308bbb80691bb1fccf29a2a44c9715436288f51aa5eeffee25c3842d6664c1bfbe7c2ac669806d5ae0f0123bc1dece279953abd95feaafafff81
 DIST akonadi-calendar-tools-20.12.3.tar.xz 224860 BLAKE2B 0f03e653c6cde40a1288fe24d92d612e238768fe38f9c10e7ddf0a20c18cdc8ce44c85e416a0535bf45a8730dee33358a8027a2c7a67442e98d65066de5c3109 SHA512 5890454e49f4cfb04e3edb4895eb4f4f7abfba691185ccc9b9b3c3efc3d675cfe8c7b493b3378143d5da552ff784a391fd194c7107e4ddd11434aa3c130e5d56
-EBUILD calendarjanitor-20.12.2.ebuild 1085 BLAKE2B 1cbd02f4d8eb4ab4468b3650c845cd5c35a56677fd8ff4b01d011bf6847bdb04c9009c53300f6293b28759ffc066ab74080bf98b6f6793d7138321949c7af69a SHA512 53157f89ab676ad494354aa5d2aa9be60492ef4ae3f4d2b424cd9d66969cc3dc53ac399bf0a79990771de73f014387a94b8ef74af6c004546bcad456b593f158
-EBUILD calendarjanitor-20.12.3.ebuild 1088 BLAKE2B e15f34f1408698f80e8e3655f3d763cf704142cb90ce03db9b7329a33b5c9088cc41ebf604a1af81a6c21c3bae1dbad785694de7808dce7a833c6f89aaf9c7bd SHA512 04355cd8861abfea586a284d1a2dccd2f9bbce4de7db7f813f92a89ff03b70d1fcaab27a71a33dcef1f0e6fd5626eaed278713e8d6ce87c1f19d37acfb9b1ecf
+DIST akonadi-calendar-tools-21.04.0.tar.xz 228368 BLAKE2B 559106c1042eccddeea6c311faeda95088f9dffde304d59bacc1cc49cd8a0ec66e9875249c12813602e02ad09ea6dd94b350a7c056e7e5b8f769a5f7af3d9d90 SHA512 8f159cb3fc41b26bec66fc4499e19835a6935d84cb7cd9a95468b7f2fc6dc72de848b0ade88b83780946c222f8130bc90cac8de879d0cb669d5a9a060085098f
+EBUILD calendarjanitor-20.12.3.ebuild 1085 BLAKE2B 1cbd02f4d8eb4ab4468b3650c845cd5c35a56677fd8ff4b01d011bf6847bdb04c9009c53300f6293b28759ffc066ab74080bf98b6f6793d7138321949c7af69a SHA512 53157f89ab676ad494354aa5d2aa9be60492ef4ae3f4d2b424cd9d66969cc3dc53ac399bf0a79990771de73f014387a94b8ef74af6c004546bcad456b593f158
+EBUILD calendarjanitor-21.04.0.ebuild 1088 BLAKE2B 3afa1cd1f78c193905bbb8161bf6c2a18c534aee0b89770037a897e3463bdfb9ae733c178c6fc3d94960884cd53ead00c58d8fdb4d74832f01fbda702301e61c SHA512 f0b89223972c60abccb41c596afa3f7f0dd176a683d1210cde76264fc97b8d5a56b4fb9874a21b532c753ac8f8597bd838f3d08bc19d6523e1a02c88dbbc3f05
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-20.12.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-20.12.3.ebuild
index 0ee234b1a929..6e6c5bf7979d 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-20.12.3.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-20.12.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/calendarjanitor/calendarjanitor-20.12.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-21.04.0.ebuild
index 6e6c5bf7979d..27ee1f1d5ada 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-21.04.0.ebuild
@@ -7,7 +7,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.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -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 66e77f2a7937..0094bb6bc707 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
-DIST calendarsupport-20.12.2.tar.xz 665200 BLAKE2B dbaf358e0295c27f663b87f91598a4aae6449f37bd470648f8416c69e654b8db39a37c9429c32ba204232118e7dc67cf3a1ef7927fdc2b84a04812620e0499f8 SHA512 63878598f52634e6dcd4aca527dd3f6278b9d2569b169d2a81a78d31b2cce632b45713da8fd4b97d241aa041fd9805a909b59aa2c090f6b55e685fe60e2f8cde
 DIST calendarsupport-20.12.3.tar.xz 666200 BLAKE2B 9ba81d61384fb1f5f88c7166f54bb68989657416432948a5709451bc3387102c2b54e99465f15b7e1dcaf46a917a2e211a8fdfc2ad1be09f651a899a593d11a3 SHA512 cfb2c1faabdeae1aee13d1f0a6e3b960b68e835e5f96dc86acb9af7c84d57516b3e7ab131e9f0dda12db41e26aabe65f02c4326c989ed2f54620325e6b11196e
-EBUILD calendarsupport-20.12.2.ebuild 1261 BLAKE2B 49c14bef54245e290d04dae12690dd1cc97aaa95da9fa9465a2e47ed2a0c07541378fb7b6e41b1df356e621a312801c3b902fb4054d2d5bd7dca36fb269f7c1c SHA512 3d0dc16fc5ad074a75837c09585d5de6ae8e78195e0cc75b6dbde463ab7b31c6d4a56176901155086e4b8f742989eba3ec1c6f724f6ae4f3fd07ea97fdb1eb0b
-EBUILD calendarsupport-20.12.3.ebuild 1264 BLAKE2B bb855a1615eef36dbd4b8ce5fbc394a8b4410440cd5446de0b5dca3f1a6f7291c20303fd735c78451b02d0e0d2629be71e7957db0bf6165075f4f5ea208df2d7 SHA512 2e68b344362d18178aee2813c5d88c9e8ce6996c72b6c853445e21ecb59cddd5df675ba012f2098ea6ffa512aba6319169e9d97834c30dbc972a868a1d94f227
+DIST calendarsupport-21.04.0.tar.xz 670960 BLAKE2B e2d84c5e98b8f15483a7fb3bb4c2f82d9434dc4839a0e89bfbaf12b709961a7cf039df55a30d35eabb62f484acc16cdadd1027ace645073c42083b55d58ba705 SHA512 3e6a5f65451a0f37eb017096e36a925c57915acfcdb21317eb2dabad860826fb2195ea763bceefc01f3f5953c13a4712635c05bdbc133e2deb506a2b635e0334
+EBUILD calendarsupport-20.12.3.ebuild 1261 BLAKE2B 49c14bef54245e290d04dae12690dd1cc97aaa95da9fa9465a2e47ed2a0c07541378fb7b6e41b1df356e621a312801c3b902fb4054d2d5bd7dca36fb269f7c1c SHA512 3d0dc16fc5ad074a75837c09585d5de6ae8e78195e0cc75b6dbde463ab7b31c6d4a56176901155086e4b8f742989eba3ec1c6f724f6ae4f3fd07ea97fdb1eb0b
+EBUILD calendarsupport-21.04.0.ebuild 1264 BLAKE2B 73881dd7e173083e7100f8a4bd4d0f47f1feba220a4de4bd6d2170da3399bd12c021a416083d8557eed1cf74c948380fc07be8b9d73d66008e8f8f4f5188f353 SHA512 8866d6b361ccb785dd9dcb4cfee558627fec3fed96d4cf53220ae263d617727612436da37a490d7e9e976c222f27448743d5ce608a223ced9058d42dc62e7eda
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-20.12.3.ebuild b/kde-apps/calendarsupport/calendarsupport-20.12.3.ebuild
index be894e0fd1b4..85d97b997ff4 100644
--- a/kde-apps/calendarsupport/calendarsupport-20.12.3.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-20.12.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/calendarsupport/calendarsupport-20.12.2.ebuild b/kde-apps/calendarsupport/calendarsupport-21.04.0.ebuild
index 85d97b997ff4..5349cf98524d 100644
--- a/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-21.04.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_TEST="false"
-KFMIN=5.75.0
+KFMIN=5.80.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -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 8e54da80384b..5759ded5f025 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,6 +1,5 @@
-AUX cantor-20.08.3-python.patch 2597 BLAKE2B b92ddb263a4eda184811a597ec26db479ba4b5f6887ccff6b6655f48e5b1a3a8c9b7791f7aba17c222d76229d1734039f3421453067cb0700ca39f8c68b60c6f SHA512 5444255c1c186bb07dccd6def392f6e0ea4d894d1205bef19bba15e06993e730be175960e1bb8efd19d51ac6671e485e23ff78a441d941e99f8bc9d96dc9044f
-DIST cantor-20.08.3.tar.xz 9082332 BLAKE2B 7ea84959559e109a28794d1f610e07936de353c08e7732a90c6f8145828df99d6b408006580e367208e135c3d76530bdb02716c873a4adf491912ef07b470350 SHA512 8558bb6b3e6641c1c575a4f5f0b1db7f6d6003ed011432f555ee0954586f0cd3a0d1d897d55114dd29cd9aa58d7e6d7ffb9a2357b1e96c01bbf2b4f3623174dd
 DIST cantor-20.12.3.tar.xz 9128948 BLAKE2B 9cc4c6b28ea1f9946ad6d4eeac98b5c47b17b16efc434f355ba2a0f71b23afd4a58ab31df12a881e2a35e836901075d197ad9550409a97f025efdbd21ac919de SHA512 35461a47c9ce4aa4de8ca8496ca33c42691db6be927f30018e174f3234a485c436cca90b6362c8ba325f8bc220a09079069278bdfd08f4510dd7d12ee1a39ed7
-EBUILD cantor-20.08.3.ebuild 2926 BLAKE2B c13d8bd379b3f88099bff6ce5adbac7902455b6b712c7e9f967b689044a19a207d8c142316afae9591d8009e86201fbf7a053161a7241443986a3c8f5e3e80c7 SHA512 9b712cd2be6aec653497240e5b3985884750462d19568d1bdd296c62c5eaafd44e82e0c4cc7a9a20b11255955e48130637d65d222fd82ba8b2a95c3aa1581117
-EBUILD cantor-20.12.3.ebuild 3104 BLAKE2B c8a46d6ab9274faf53f1228dec7265358bb7b4f7b69f0277a97b8b92215f34b525ea7a9c0d8119e3f62b6a87959b431bfc251614c659c6e2615690531960bed8 SHA512 44a2960b4e93d602023eed98ecb63e96249bffef7c9b08a7b993f5be538c4a5c3500709dd7727d811e7acb46ceccb7ef015d3243f81273e3af5a0f7127e8c4ce
+DIST cantor-21.04.0.tar.xz 9133736 BLAKE2B afa21074188d4d61503592f9d15f25077ea63bcc696cc86c55a823ef4db09a087cbf4369ecff7d691cbaa4adfffa083ff48104c94d8df9459d3fb46aaff821c3 SHA512 c6cc1c29d4455c1709b184e3a92b4fd81ae213f5a762a381f5174378820e3c1419b9c2477b5b4a9951eee91c552d1a59f4754dc8f49d71310ac7da06399f82d3
+EBUILD cantor-20.12.3.ebuild 3069 BLAKE2B b1dba899bd3e61a759e8765806c45a06a0ebca38b585e802bb452a297d7d3beea49fbce774dcdd6158bb81c5816c0bc122babbecb0eaa63d8ebe5c6cc2311d62 SHA512 d1b02c92e0fa15492c63c4139f4d2a41156e0538793580d61c9624a876bbe43edf58938815abbc518440556065f0e1b2e5aa01409066b4d7c2040a17dac550d0
+EBUILD cantor-21.04.0.ebuild 3072 BLAKE2B b8c36f2d9c1ddd225d499e5a6a76d4524847ee88511449c4fca7acd54780720737f3b0a40f79af9556eb7891047ade239da5f6264bbea259cc1fe8ea6a1dc714 SHA512 0e0a4db378866e9dc667269ab1bacd907d890fb43b7d25747e3bdeb5795d5abd2c9b81807037211450ff58e2becb99528afac1b20b331c3f2a4e2e932d138f4d
 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-20.12.3.ebuild b/kde-apps/cantor/cantor-20.12.3.ebuild
index 1b56dc9a352b..50fdcdc98e87 100644
--- a/kde-apps/cantor/cantor-20.12.3.ebuild
+++ b/kde-apps/cantor/cantor-20.12.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://apps.kde.org/en/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} )"
@@ -102,7 +102,6 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "Maxima backend" sci-mathematics/maxima
 		optfeature "Octave backend" sci-mathematics/octave
 		optfeature "LaTeX support" virtual/latex-base
diff --git a/kde-apps/cantor/cantor-20.08.3.ebuild b/kde-apps/cantor/cantor-21.04.0.ebuild
index 09094f1a82bb..677b39e44709 100644
--- a/kde-apps/cantor/cantor-20.08.3.ebuild
+++ b/kde-apps/cantor/cantor-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,23 +6,24 @@ EAPI=7
 CMAKE_MAKEFILE_GENERATOR="emake"
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
+LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{7,8,9} )
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org optfeature python-single-r1
+KFMIN=5.80.0
+QTMIN=5.15.2
+inherit ecm kde.org lua-single optfeature python-single-r1
 
 DESCRIPTION="Interface for doing mathematics and scientific computing"
 HOMEPAGE="https://apps.kde.org/en/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="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
 
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
+# TODO Add Sage Mathematics Software backend (https://www.sagemath.org)
 DEPEND="
 	app-text/poppler[qt5]
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -50,7 +51,7 @@ DEPEND="
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	analitza? ( >=kde-apps/analitza-${PVCUT}:5 )
 	julia? ( dev-lang/julia )
-	lua? ( dev-lang/luajit:2 )
+	lua? ( ${LUA_DEPS} )
 	qalculate? (
 		sci-libs/cln
 		sci-libs/libqalculate:=
@@ -73,9 +74,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-20.08.3-python.patch" )
-
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 	ecm_pkg_setup
 }
@@ -92,13 +92,16 @@ src_configure() {
 		$(cmake_use_find_package qalculate Qalculate)
 		$(cmake_use_find_package R R)
 	)
+	use lua && mycmakeargs+=(
+		-DLUAJIT_INCLUDEDIR="${EPREFIX}/$(lua_get_include_dir)"
+		-DLUAJIT_LIBDIR="${EPREFIX}/$(lua_get_cmod_dir)"
+	)
 	use python && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
 	ecm_src_configure
 }
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "Maxima backend" sci-mathematics/maxima
 		optfeature "Octave backend" sci-mathematics/octave
 		optfeature "LaTeX support" virtual/latex-base
diff --git a/kde-apps/cantor/files/cantor-20.08.3-python.patch b/kde-apps/cantor/files/cantor-20.08.3-python.patch
deleted file mode 100644
index c0dc3804c83c..000000000000
--- a/kde-apps/cantor/files/cantor-20.08.3-python.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From c794fb5f0f616ce2d9e4004fc459a1c50f077470 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 11 Oct 2020 22:47:55 +0200
-Subject: [PATCH] Use CMake FindPython3 module, raises minimum CMake to 3.12
-
-Gives us out-of-the-box future proof python detection (python-3.9 right now).
----
- CMakeLists.txt                     |  2 +-
- src/backends/CMakeLists.txt        | 10 ++++------
- src/backends/python/CMakeLists.txt |  4 +---
- 3 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e96e6df0..a90328b5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
-+cmake_minimum_required (VERSION 3.12 FATAL_ERROR)
- 
- set(CMAKE_CXX_STANDARD 11)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
-diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt
-index e99e1731..9b6b615e 100644
---- a/src/backends/CMakeLists.txt
-+++ b/src/backends/CMakeLists.txt
-@@ -50,15 +50,13 @@ if(QALCULATE_FOUND)
-     add_subdirectory(qalculate)
- endif(QALCULATE_FOUND)
- 
--set_package_properties(PythonLibs3 PROPERTIES DESCRIPTION "A powerful dynamic programming language."
--    URL "https://www.python.org/"
--    TYPE OPTIONAL
-+set_package_properties(Python3 PROPERTIES TYPE OPTIONAL
-     PURPOSE "Backend to use Python with Cantor.")
- 
--find_package(PythonLibs3)
--if(PYTHONLIBS3_FOUND)
-+find_package(Python3 COMPONENTS Interpreter Development)
-+if(Python3_FOUND)
-     add_subdirectory(python)
--endif(PYTHONLIBS3_FOUND)
-+endif()
- 
- set_package_properties(LuaJIT PROPERTIES DESCRIPTION "A lightweight, extensible programming language (luajit implementation)."
-     URL "https://www.lua.org/"
-diff --git a/src/backends/python/CMakeLists.txt b/src/backends/python/CMakeLists.txt
-index 04b4c313..c7868561 100644
---- a/src/backends/python/CMakeLists.txt
-+++ b/src/backends/python/CMakeLists.txt
-@@ -14,8 +14,6 @@ set(PythonServer_SRCS
-   pythonserver.cpp
- )
- 
--include_directories(${PYTHONLIBS3_INCLUDE_DIRS})
--
- qt5_add_resources(PythonBackend_RSCS python.qrc)
- ki18n_wrap_ui(PythonBackend_SRCS settings.ui)
- kconfig_add_kcfg_files(PythonBackend_SRCS settings.kcfgc)
-@@ -34,7 +32,7 @@ set_target_properties(cantor_pythonserver PROPERTIES INSTALL_RPATH_USE_LINK_PATH
- if(MSVC)
-   set_property(TARGET cantor_pythonserver PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE")
- endif()
--target_link_libraries(cantor_pythonserver ${PYTHONLIBS3_LIBRARIES})
-+target_link_libraries(cantor_pythonserver Python3::Python)
- 
- if(BUILD_TESTING)
-   add_executable(testpython testpython.cpp settings.cpp)
--- 
-2.28.0
-
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 64ed4da85e9a..667988606b52 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
-DIST cervisia-20.08.3.tar.xz 1888324 BLAKE2B 06f4b3c72846f738c439a44b36b4daff3deca517cf37454df3abf4cacbaf48fbafde1ca6dbab77f81450712b198b0c85878df0a7319f211d418f8bce5429c620 SHA512 8479024588c458d60e45319b9e50928861a56bc7c4225dcb119c9b43a65a4e2ab2f639b6da304e2a5fa5767d01b5c4b9dd9d0b3be2399782ec453f8c3ef21a9d
 DIST cervisia-20.12.3.tar.xz 1888284 BLAKE2B 2e49250c45ae8f734f94f726fe6b1a133392fc89080fe2b4d7ec74eed728da0755666a074f12d06eb67b9a959de8d2dd934c143c74491c1facffd12a980dda14 SHA512 461f856f6fc5a9381b981c82aea70c005fa0da424a5658a706b9b6f6c90749cef85c3e3692df38210c891db57ca42b214abba29fc22494a359d32ba4fc017113
-EBUILD cervisia-20.08.3.ebuild 1062 BLAKE2B c7939bb65d1eee59488a89ef667272fb8e398556a663387fd0fb93c063d7e31c69712ec5991c00d5f732cebc4d5bc0192d542d297ba1997399983dd9a282af91 SHA512 da6e1c719cd960342e713d4a60dd51335e0e7a2f031394f833f4ef3441febf7d65f65bd7fd2f8d632cef7afb532df4afd7290769e352b78c55b2fa41b2d2b4e3
-EBUILD cervisia-20.12.3.ebuild 1065 BLAKE2B fd28b53554e436190569a8d229589575ad8abdd3ebe09fd2082246747bf935c606993db28ea64a72b686505b03210acbb627491051d34f909bdb49da1f8bea4d SHA512 1b19fa7a5541abf8ef251b7b59a3b9432ef173a33861dbb8e6ad220e256368235120cd7fac112884b9bfe8cc59250974c7e1223ff9529e297fff8f104b6ae8ae
+DIST cervisia-21.04.0.tar.xz 1888564 BLAKE2B c2e6095e759c630a2e6419f0e075e3d081a353cc6afbcd1f6141e8e02cd5a95861f17f245a5fe4d49a302035f3dd558a15a68cb790398d40d17c97865a13d6ea SHA512 2336dd8a9b856be2c1520a90339d0815a6ecfa799de7bf93601e688505770ea51dc2570819a1d9b03b305f42a694be40953a201c9b0e35b4b13749b9b084f2a3
+EBUILD cervisia-20.12.3.ebuild 1062 BLAKE2B ba62db45e8af2b3c0c1c20f6af9356752994fb02fa193bf7a8ea4e33627d4715937c22a8f05e2b9cd4fb957731da114bbe8137e2a2ce6423bb44e8f93664e830 SHA512 41aa0ff70276698975097285858afd76a6b27ed90b114345615ed98b34f675f6768fa965a3b2c26384471fe888cce64ecf36501362a9625683e2a0b8a9c9f856
+EBUILD cervisia-21.04.0.ebuild 1065 BLAKE2B b493faf1a1cc596f320ff4a15b3c7595c97873aaf7e20bc1291c0bf5ed2b9f082d4b679ad5b2ac6cbd156ffc2f129c6126a1ecf3d06e5e193c3d7d64452fcff8 SHA512 4bfb8f5c5c567f192ba8708eb0a0877532f87d5e11173612912ea81a6749e2961ca2e148359cc4e79584115d060bd4fd610749f9674cbdac1518b081fc56005e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-20.12.3.ebuild b/kde-apps/cervisia/cervisia-20.12.3.ebuild
index 542e82a2c57c..df3ac160df47 100644
--- a/kde-apps/cervisia/cervisia-20.12.3.ebuild
+++ b/kde-apps/cervisia/cervisia-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/cervisia"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/cervisia/cervisia-20.08.3.ebuild b/kde-apps/cervisia/cervisia-21.04.0.ebuild
index 5c1083158d22..8334b0e310f9 100644
--- a/kde-apps/cervisia/cervisia-20.08.3.ebuild
+++ b/kde-apps/cervisia/cervisia-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="CVS frontend by KDE"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/cervisia"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index 1debccb364ab..371f2711906e 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-20.08.3.tar.xz 230272 BLAKE2B 1978ffebe88d95350cac0892c56e127507b6ddd6d5675bca8f420990552e20ff271e6f5742a2bdeff685c82464e70177ac83e5e9368547eb175a3e8133d77624 SHA512 2010be567ef025375caac92e90c0259faea1eb58bdbc55e441e42a10af68b6313391707a7f6b6b10285ba80dcbdee92468fa5088970eb98d4ea8afea145976d9
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
-EBUILD dolphin-plugins-dropbox-20.08.3.ebuild 1440 BLAKE2B 77b631eb4c8cb58acd3a1f50712be409f0c7dfc6b6a31cb8f3cd6d5d912dc3e90b36fea2b03d81d759c9680983d6183ec8fe4a4c47c3efa619a4e620c1c1f7b3 SHA512 c5d3101e10a41d1a486264ace9a0e7da2146bb0f963f53fb552079e5a93d0ce2be6be47f240aad8970f1777219c41ca3208aed30a176aff9375d9ab9c13eb016
-EBUILD dolphin-plugins-dropbox-20.12.3.ebuild 1413 BLAKE2B cba3fa4c627bd0d60067d9cc39f5212f6c005f8e9c17aa28e21bc062341e67b1b3d68e2bd3691213c830e633be8277ea30bbb56e904e635b2beca04c42294163 SHA512 5a623d576386946d4e093660c973b0458cb73b77a92a46958d36c3880ae8074a1afd603649bec3292161118d990da6bd96fd608475c5ea99f6f3d0e247778a14
+DIST dolphin-plugins-21.04.0.tar.xz 242608 BLAKE2B c12366f9a0d661e79b968ce375e2ea46dd8d90f322691755dc238d4dd08d07f6527711aa117fead2a3714d7f97c508e53c5ecd87a69c23c397e44033669fe5b1 SHA512 9f093133eba93615392a117f8184177f06bb117d4a3ad4691025ef26e4d83e251f966c157ae107f52447c78bf600ab586a175f57a02f78fec8e620aa5462138d
+EBUILD dolphin-plugins-dropbox-20.12.3.ebuild 1411 BLAKE2B 7a9c97e561d45811fb1ae6c3b2f6fffab2cd20e1186981a7014d91aef22f3bc075964e91de62fc707ea4e8356bbd1fd0254ccec2544fcd9aeced795b6fbe3d7a SHA512 33067f05abc34a588e01925c2ab918261f6e9844ae774eda71c85fa261b2ad3ca56e0ba2e8f20684711f3afbe1f6e51644c97ffa92c4b20e1dc199514c8b75f5
+EBUILD dolphin-plugins-dropbox-21.04.0.ebuild 1413 BLAKE2B 6e541942ab28303fd249ed0ea9644b046cf4e8af679353f33d1d6f5aa7ca1a10771a6c6a2da06a23af689b2dcdc7c51819b7e43680dee484e876b1eb7f78dac3 SHA512 da7ce59530741f9b3ae4eaefd47e40190a2f45df283f3059ea5fd48736df106c4751a8a380e3bc99972d9b02bf150cedafc334fdc4a3a902c06c32b8c5fc62aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.12.3.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.12.3.ebuild
index 6875d5b940ab..39cbd301146f 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.12.3.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/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-20.08.3.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.04.0.ebuild
index d42966a73dfa..476140b119db 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ ECM_HANDBOOK="false"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="dropbox"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Dolphin plugin for Dropbox service integration"
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/dolphin_plugins"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -31,7 +31,6 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
 	net-misc/dropbox-cli
 "
 
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index 8c2881b658ca..86ed8a822267 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-20.08.3.tar.xz 230272 BLAKE2B 1978ffebe88d95350cac0892c56e127507b6ddd6d5675bca8f420990552e20ff271e6f5742a2bdeff685c82464e70177ac83e5e9368547eb175a3e8133d77624 SHA512 2010be567ef025375caac92e90c0259faea1eb58bdbc55e441e42a10af68b6313391707a7f6b6b10285ba80dcbdee92468fa5088970eb98d4ea8afea145976d9
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
-EBUILD dolphin-plugins-git-20.08.3.ebuild 1552 BLAKE2B 12d79603231b496f2c6f7663a4ceb29fcdc87da02f9ece1db59df3c97956bfef7560fc8eee48229a42a85b7951c8c89891819f765c2d1b9a8f7c1921da04dcc7 SHA512 8ef16eb44473461883263941e4f9f857795c86bd2cf2e2cfae258cc70f6b3d8e54a48b5b3e0f9086b7800f25eb1c84d9779b9603a2bcc7063f48d8c825be7941
-EBUILD dolphin-plugins-git-20.12.3.ebuild 1526 BLAKE2B d3c3072a9fbc834f25e7155470cb764667c09b2f396def72ba9a8fa9e1a5cdbc6eb61ad00378fe50d7514f1f9abf3d5ad7f268ac9e430c1f4769f88c9f7d7cc0 SHA512 ed940637e5f1fc650a0a26c6808dbdf0c4fa67d1d39ec40b55c05b2f1bae8a2d78fc4f003524f680aeb24a6f83ec590ed1f8371d3c8adc3c04e4c5048ae6fc3f
+DIST dolphin-plugins-21.04.0.tar.xz 242608 BLAKE2B c12366f9a0d661e79b968ce375e2ea46dd8d90f322691755dc238d4dd08d07f6527711aa117fead2a3714d7f97c508e53c5ecd87a69c23c397e44033669fe5b1 SHA512 9f093133eba93615392a117f8184177f06bb117d4a3ad4691025ef26e4d83e251f966c157ae107f52447c78bf600ab586a175f57a02f78fec8e620aa5462138d
+EBUILD dolphin-plugins-git-20.12.3.ebuild 1523 BLAKE2B 177133a6a610432424267a260d73c166f602dc78336ad6fcc5ae17263ddfe5f8c19f90fde73153812eab7992da73a8ab9efe5740a379b618392c3fb19095c052 SHA512 4536bfa358108c13bea43c3121c60ad9d15dd1e6d103c613259173745b035a3f2dcc6c7c3904633576fb3cf644068437223e1bde44fdd5512dd2cc73ad8f4c4c
+EBUILD dolphin-plugins-git-21.04.0.ebuild 1526 BLAKE2B 4138350e8adc184de7ca233932735c029ded5cecbcaac663a3e0cee8a76f0cef83b6d1024c507127d823a2f4ad274ed8054943fffec652f189f8ac35a8b72f7a SHA512 d6916911b4a4a112a07cbdba060559130649f2835eeecf1a6723a604ae51b9b097eaad427d3941885632fb61794d4239cfef7657ac7a81e7194b8c9594a8b2d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.12.3.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.12.3.ebuild
index c12141833c42..26e9c62dc281 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.12.3.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/dolphin_plugins"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.08.3.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.04.0.ebuild
index 3c5bb7ccd14c..93cfd1973554 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ ECM_HANDBOOK="false"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="git"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Dolphin plugin for Git integration"
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/dolphin_plugins"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -31,7 +31,6 @@ DEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
 	dev-vcs/git
 "
 
diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index 7af56d2c79a1..2a5c971134e4 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-20.08.3.tar.xz 230272 BLAKE2B 1978ffebe88d95350cac0892c56e127507b6ddd6d5675bca8f420990552e20ff271e6f5742a2bdeff685c82464e70177ac83e5e9368547eb175a3e8133d77624 SHA512 2010be567ef025375caac92e90c0259faea1eb58bdbc55e441e42a10af68b6313391707a7f6b6b10285ba80dcbdee92468fa5088970eb98d4ea8afea145976d9
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
-EBUILD dolphin-plugins-mercurial-20.08.3.ebuild 1680 BLAKE2B 39fc4a0568fb04ee24b83fbbf5f83837d66588cc1c5dd6fa229cf4f81aae88fd963fef5da15b394d98cc0eda6dc9f7b080f3539f0cd692932cb21508dbfc8483 SHA512 fef393c698f2b4403d05958c15bd36e7ac5514fd00470ef2d927398b3d12f9e0873fdba3e7f9a154176bfaf7585501e5811164be9cd10ef5e42db92ddf9a269f
-EBUILD dolphin-plugins-mercurial-20.12.3.ebuild 1654 BLAKE2B 45588e930a2c7b8d0a2c68afe36b5905a9b688823f2ab013f97d88b7d702e5214cbb10441447379ed7abfc95f25ddce4dd49b0f2e9efbfc3c3cdb65cc83fcfc9 SHA512 d5cdd89ccf048b8d9101f8e1f98ca06f04a5a8bdf1070595fec010411bd966908afcead9d70e57732fc675155db4e5f683fcbcaa6de6406a30c58eeea20201be
+DIST dolphin-plugins-21.04.0.tar.xz 242608 BLAKE2B c12366f9a0d661e79b968ce375e2ea46dd8d90f322691755dc238d4dd08d07f6527711aa117fead2a3714d7f97c508e53c5ecd87a69c23c397e44033669fe5b1 SHA512 9f093133eba93615392a117f8184177f06bb117d4a3ad4691025ef26e4d83e251f966c157ae107f52447c78bf600ab586a175f57a02f78fec8e620aa5462138d
+EBUILD dolphin-plugins-mercurial-20.12.3.ebuild 1651 BLAKE2B 672a96f784ac5fdffe160a81965aedc541823a285a149636156e11721f04b3d256ae3ab3f610358c322ae5a0b7d04e7631f57db02a3c12d3ffb6468181a0d509 SHA512 65594bcd8dc3bc5c83cdbdc91cc0e7e6e30f78aad3d20e8b9221f7eb8e266ab4dab296dfd61ba980e7293e42a8e8365324b26fedd02911e01f0b0eae2ef30cb3
+EBUILD dolphin-plugins-mercurial-21.04.0.ebuild 1654 BLAKE2B accf73ae8c7a6dfee29843f333d2075e4d2814a3b9f024d851885eb767eb875f60f4f69be754534e6752618209b3018dbe15a3937dde9c23e5cea9392f14fb68 SHA512 9d346d362a6f411d943b2061bb4de7ee754bd34b273e71a6607a0a8a53a13e960b7bde168974a301d42a80b80ce3988f29a4969999950d181fbd96aced8476c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.12.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.12.3.ebuild
index 61df933c1154..fead50691914 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.12.3.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/dolphin_plugins"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.08.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.04.0.ebuild
index f6011f824b3b..89dca504705e 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ ECM_HANDBOOK="false"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="hg"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Dolphin plugin for Mercurial integration"
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/dolphin_plugins"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -34,7 +34,6 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
 	dev-vcs/mercurial
 "
 
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index abaf1d82c183..05d87e26df64 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-20.08.3.tar.xz 230272 BLAKE2B 1978ffebe88d95350cac0892c56e127507b6ddd6d5675bca8f420990552e20ff271e6f5742a2bdeff685c82464e70177ac83e5e9368547eb175a3e8133d77624 SHA512 2010be567ef025375caac92e90c0259faea1eb58bdbc55e441e42a10af68b6313391707a7f6b6b10285ba80dcbdee92468fa5088970eb98d4ea8afea145976d9
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
-EBUILD dolphin-plugins-subversion-20.08.3.ebuild 1512 BLAKE2B 86d7d1c9097497d01cbc6b26f6494f1481325e25c62de7bf5694631754cf6940341036a88e9e565b956e0fe59d3af42d95c33ee293cd57f0bf30215f00ba7382 SHA512 ae9434ba17ae9507adba7a6e686b993036eac96e38392dac3dd3871090b59f38f46f0c91b97ceeb441521509bd85181983eb89117cc2adf5443f6f2ef6ed1756
-EBUILD dolphin-plugins-subversion-20.12.3.ebuild 1486 BLAKE2B ed491749f02f288aad397d3430db8f901d2c280ea8776a54d42e4ff06ab239a2d939a16298bf20e37c1c2782e7c453e5fbde9246e6ef97efa420cd89b3842588 SHA512 6af62915e7dc5e8fd7e27d7d9d0f1a9032e096aebbf2aa2f34b98686e2738e863b180932a2267fcb35a978fe7c3fcf4ef5e885a9723d7b29dbf874465b73fab8
+DIST dolphin-plugins-21.04.0.tar.xz 242608 BLAKE2B c12366f9a0d661e79b968ce375e2ea46dd8d90f322691755dc238d4dd08d07f6527711aa117fead2a3714d7f97c508e53c5ecd87a69c23c397e44033669fe5b1 SHA512 9f093133eba93615392a117f8184177f06bb117d4a3ad4691025ef26e4d83e251f966c157ae107f52447c78bf600ab586a175f57a02f78fec8e620aa5462138d
+EBUILD dolphin-plugins-subversion-20.12.3.ebuild 1483 BLAKE2B 88396bc8cc571d41e014768ee243834ef0d10469d6ab647e9c721b69ef00e4e3e9a75a30f0ec1a1a8b1633f98028f7d3b5990d7e3c683ded2a36683231645cde SHA512 177f34985eb74b868cb449fa568378a252fda4f355f77bea72bf6ef203a029cda31774245c8eeb8ec8ae7de15396ffedcc1c8bfef2c221bfe0527b66dbfffe3e
+EBUILD dolphin-plugins-subversion-21.04.0.ebuild 1486 BLAKE2B 665b64501e5cd61b73ae9377f58b50426f0da2dbea841672ebdda95185c91eedf9689ca8b9c4d5a9d8dbba8842dd1f6b2c61e0f0dc2cbb4db26bbcfd79c345a9 SHA512 64080d1df8c9143b5bd80e82f78c47321c49493f4bafb8e7e2f8d831fe97ec6e62d61bb9c72ce0d8b07856c0656004dacba63a37a0c642d2a3ef4674e1da3c47
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.12.3.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.12.3.ebuild
index cfaac1ff550a..9eac01dbc8d3 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.12.3.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/dolphin_plugins"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.08.3.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.04.0.ebuild
index ddfa845d95da..932ef798376d 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ ECM_HANDBOOK="false"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="svn"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Dolphin plugin for Subversion integration"
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/dolphin_plugins"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -29,7 +29,6 @@ DEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
 	dev-vcs/subversion
 	>=kde-apps/kompare-${PVCUT}:5
 "
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index f3b611a8b395..b51fccf7bc04 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,6 @@
-DIST dolphin-20.08.3.tar.xz 5094964 BLAKE2B 368eca6e1972361bdb02bb3b1d3b449074d7d48af7bb88df60447ac9a7c88e8562fcac185c96596c57520df3efb87859cd21ad19e3b8515ec4ce40ebc7d2b3a5 SHA512 6fb1533597d886a7a032b68dbe2d9d05c0b856c006ba06d08eeda5ae267530f528fa4c4b7a8e2caf1cb074284a27d01a223922b606fde238984588a7df3abe6c
+AUX dolphin-20.12.3-fix-session-restore-w-o-tabs.patch 2643 BLAKE2B 07856c16e9e68739a8b9feec46e1fe16272eddf49b45a88c7030d2439cb90345dc902ea5d11e08f0565c0a45fde3c2efe912d8225547e679dd7ae5d0e3b38e18 SHA512 182fd1e6e87a7a25326123be17015174e84124b042056ea72353c7f051de7ecc550b8284885ce3cb92b2a9e88b81cd6e40426369acdeb33995c9fdc3534c9efc
 DIST dolphin-20.12.3.tar.xz 5134660 BLAKE2B 3ad3e7c16d0c4203e189bdf035028777115971091bc3c45a3e88231f9715c9439f44c67b2bf2d9d4680a07d222c0c14858028d54499fbe8cf006e3eae63a9193 SHA512 fb57121875fb6b3db9b3071590ea2b6fe7db1d22238af758591835946ac297d7a1734646385a2f6b7ade41de7dcfdf8f6b5e7dccf335a3cf558259d017e44a11
-EBUILD dolphin-20.08.3.ebuild 3065 BLAKE2B d935f22318e5aa0dfdc22ba1f6dc9b6c9a79bd8e19509c75e918c7ee6855e8fabc55351d5e8bb0e01f349d305c448cafbee77fb6aaceef4e7afdd1c25892af39 SHA512 e78165d126936b7b1e324e3cbdc57f6af5632d27f3c9ed6be3a742d60a71c1edcf2949c78fa4ecf50c8661b841ac8a80fc80bd754e1c1a8d35cdb4b2e3afd3c3
-EBUILD dolphin-20.12.3.ebuild 3172 BLAKE2B 47dfb6d42fe679f6e685e3c2fb704d564c08eace47e39f1f6d76295cbe4c22766843b9e8168d15480db1d0bf4cd6bbe641c42ee64c166e4aa8e5411d896bca92 SHA512 1b28db9562633f701f485ff7956d6bf614439443b2f4887bfdd9a31e1abfbdec9f736c3b557ea5643b732546d196c6144cb33005b54493c256b798db3eef0a40
+DIST dolphin-21.04.0.tar.xz 5160064 BLAKE2B 4443e68ca72e3849a082644c4f14e1bab57581261be3da20bd1a2f646277270d617d78afab1f0c26244886de77a1d3aa701cdda66dce33f69e3e84c389353dd2 SHA512 6675d39146f69395c51d264459b6ba29210d131fed068de8006be1ba324c604ce004ccc4e5d68cc8ac6c0dfa5a63a7b2fac25c04227e6abc802dfe5a37e96c35
+EBUILD dolphin-20.12.3-r1.ebuild 3222 BLAKE2B dab5e90ca245bca9593ff081935c03baa4e2cc151033d19b859f698285b8dae34a3fce1efb4ac53c6ddf53cec7e9f2a403b9adc095853d12677e513a97ff7b92 SHA512 4b4060d40cb8e18a0e457e4b1acc4675e4b38404265db96fc7fdd45d41e176668abbbb8ed320024f667faf7c499ac7f181b551ffd23e4729fc043f591665518e
+EBUILD dolphin-21.04.0.ebuild 3140 BLAKE2B bc0910dceeedc0acd0e0df61c4fd9c0df3133b46a76df5808f649d1aea76c904aabe7cb0e77e902028a5100948a7e0581c53f73383f40f1d0a817d9759dfbbb3 SHA512 a6fe7b44df2ee1293bc2cc3e315f9869e2516e6d12cc07d87e241b8f7fae84657fb52eb1618ed2c85fc8897f589d9cf2d21430beb21bbe3639d4ee87a8a34a00
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-20.08.3.ebuild b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
index 05f04613e4bd..7f9f2d90c9af 100644
--- a/kde-apps/dolphin/dolphin-20.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-20.12.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.75.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://apps.kde.org/en/dolphin https://userbase.kde.org/Dolphin"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="activities semantic-desktop"
+IUSE="activities semantic-desktop telemetry"
 
 DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -37,7 +37,7 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5=
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
@@ -56,11 +56,16 @@ DEPEND="
 		>=kde-frameworks/baloo-${KFMIN}:5
 		>=kde-frameworks/kfilemetadata-${KFMIN}:5
 	)
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}
 	>=kde-apps/kio-extras-${PVCUT}:5
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-session-restore-w-o-tabs.patch" # KDE-bug 434911
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
@@ -68,6 +73,7 @@ src_configure() {
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
 		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
 		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 	ecm_src_configure
 }
@@ -84,7 +90,6 @@ src_test() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "compress/extract and other actions" kde-apps/ark:${SLOT}
 		optfeature "crypto actions" kde-apps/kleopatra:${SLOT}
 		optfeature "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT}
diff --git a/kde-apps/dolphin/dolphin-20.12.3.ebuild b/kde-apps/dolphin/dolphin-21.04.0.ebuild
index a352ed21adbf..2f5121e83267 100644
--- a/kde-apps/dolphin/dolphin-20.12.3.ebuild
+++ b/kde-apps/dolphin/dolphin-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
@@ -86,7 +86,6 @@ src_test() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "compress/extract and other actions" kde-apps/ark:${SLOT}
 		optfeature "crypto actions" kde-apps/kleopatra:${SLOT}
 		optfeature "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT}
diff --git a/kde-apps/dolphin/files/dolphin-20.12.3-fix-session-restore-w-o-tabs.patch b/kde-apps/dolphin/files/dolphin-20.12.3-fix-session-restore-w-o-tabs.patch
new file mode 100644
index 000000000000..9605bead03cf
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-20.12.3-fix-session-restore-w-o-tabs.patch
@@ -0,0 +1,70 @@
+From 175538020824355115cd98637ce83ecc53badd44 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 18 Mar 2021 13:42:59 -0600
+Subject: [PATCH] Don't re-open already-open URLs when using session-restore
+ feature
+
+If Dolphin would be asked to open a location that is already open, don't
+open it again in a new tab; instead switch to that view. Supports tabs
+and split view.
+
+BUG: 434911
+FIXED-IN: 21.04
+---
+ src/dolphintabwidget.cpp | 24 ++++++++++++++++++------
+ 1 file changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
+index d61a9f74f..17fa0ff4e 100644
+--- a/src/dolphintabwidget.cpp
++++ b/src/dolphintabwidget.cpp
+@@ -186,14 +186,20 @@ void DolphinTabWidget::openDirectories(const QList<QUrl>& dirs, bool splitView)
+ {
+     Q_ASSERT(dirs.size() > 0);
+ 
++    bool somethingWasAlreadyOpen = false;
++
+     QList<QUrl>::const_iterator it = dirs.constBegin();
+     while (it != dirs.constEnd()) {
+         const QUrl& primaryUrl = *(it++);
+         const QPair<int, bool> indexInfo = indexByUrl(primaryUrl);
+         const int index = indexInfo.first;
+         const bool isInPrimaryView = indexInfo.second;
++
++        // When the user asks for a URL that's already open, activate it instead
++        // of opening a second copy
+         if (index >= 0) {
+-            setCurrentIndex(index);
++            somethingWasAlreadyOpen = true;
++            activateTab(index);
+             const auto tabPage = tabPageAt(index);
+             if (isInPrimaryView) {
+                 tabPage->primaryViewContainer()->setActive(true);
+@@ -204,13 +210,19 @@ void DolphinTabWidget::openDirectories(const QList<QUrl>& dirs, bool splitView)
+             // Required for updateViewState() call in openFiles() to work as expected
+             // If there is a selection, updateViewState() calls are effectively a no-op
+             tabPage->activeViewContainer()->view()->clearSelection();
+-            continue;
+-        }
+-        if (splitView && (it != dirs.constEnd())) {
++        } else if (splitView) {
+             const QUrl& secondaryUrl = *(it++);
+-            openNewActivatedTab(primaryUrl, secondaryUrl);
++            if (somethingWasAlreadyOpen) {
++                openNewTab(primaryUrl, secondaryUrl);
++            } else {
++                openNewActivatedTab(primaryUrl, secondaryUrl);
++            }
+         } else {
+-            openNewActivatedTab(primaryUrl);
++            if (somethingWasAlreadyOpen) {
++                openNewTab(primaryUrl);
++            } else {
++                openNewActivatedTab(primaryUrl);
++            }
+         }
+     }
+ }
+-- 
+GitLab
+
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index db2db5063744..66e52ae63a33 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
-DIST dragon-20.08.3.tar.xz 1657212 BLAKE2B 6eed982c500ac47b37936e46d50264f1b75160f1f676404caf877951adeea343ab1c200fe20582b3929c8783a3436db9b78e73de03b2e310ae77b285d16cef94 SHA512 88bab2a2608ad55f67a42261badc7471853be32bb325dac9c91478353910067c77c1a0dbc313cef4dd1a00969334bcbbbdae02809e9547d5c785ab076d116ccc
 DIST dragon-20.12.3.tar.xz 1656596 BLAKE2B a06979932943221fe99f2fb9e2815b87b94d9cb6aa9c591950b3cda2736cc855a00af943f4e76cef2c00a7cb9c40763023595580d53e94551439a2aa5ec5bc52 SHA512 af05801abdf24670286fcfdade58c600b1f0ae4a0316cc95cb8020deafbba7a5b5832e9907b7cc78569d5074d855a348e9aac325305ccb5afd7fdeb0d1e62527
-EBUILD dragon-20.08.3.ebuild 1143 BLAKE2B 03c7d1062617489c5df425e64703fa68f7b5558ab84d07a32fbba515c6909619cfe2f1138df35ab7907b62bc3c197b330b946cabf587cd7332eb2f75ba6a7793 SHA512 d1d3fde60b8cf3cfb4257af8a9215a7bb884eb27a4010f1a0e6ba9a82ef18efbde20a9249ff88c79afcd48a7ad28d346a152aecd9ddda11722e50cb07af05398
-EBUILD dragon-20.12.3.ebuild 1146 BLAKE2B e69ce90195609be3c469c46aba2dcfed755e98c9072c68499a9304b509dfdae810066c6224c347b6bcbb24644de11535f9e761fde3f594cc9817e84f60fd0975 SHA512 49a6633b6112717df189b9761e461fc22fc6d921b07d54d1f04fd5853d5ba4841234cb5b2f527703e8e32753c401e760ece2870813b5f091d347c36091cd5020
+DIST dragon-21.04.0.tar.xz 1664152 BLAKE2B 30392a7eae580d8573919186716fba1e9010fdab53d56659e807238d03b3b56f5149e03a52e45103be8aacbef9182717445f57cfd73dda007203b0658718fca1 SHA512 14ecc31213e38236bb1a1aebc754da7f4cc9b76b01a00362fe6f5ecc7ac13a33e02551d39bb447942ff6982be02e6ea78adf7d16d73d6ff47c981e1f3549b1b0
+EBUILD dragon-20.12.3.ebuild 1143 BLAKE2B 4c79d66e4096eb2a0a87b9908cc85bb401dd810009c030efd9627d49688e9f5aded5bc0ef4f23d5702480142075607dcbc3fed27f6c9b876586f9ed7fb4d56b8 SHA512 03ae6b276903436f03ddf3eadaf25420632f5fff8a7ddee78fb99bf17a5a32b90b30c29c877802fdd2795ef81bd5b3e8184c6782c9dbf7a271fe46c232e7df67
+EBUILD dragon-21.04.0.ebuild 1146 BLAKE2B cef7b89ad913029c4eaf2699f071c201672e1a3444eb8314db56e7d8aa3a06a13b83c91c61b248b253a32bef1139a86cb5e0cf91f45fd1c538e1ae0fc5c7322d SHA512 f54966eb23f92a6bed187ccedf5573d8cc01f38781a7a87018b86baf1d3a8ef834fb2a370c43032f6c240b956089f15386c4e8357d6e8e42bd3f78824f50472e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-20.12.3.ebuild b/kde-apps/dragon/dragon-20.12.3.ebuild
index 00c66c0a4eef..553680d46311 100644
--- a/kde-apps/dragon/dragon-20.12.3.ebuild
+++ b/kde-apps/dragon/dragon-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/dragonplayer"
 
 LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/dragon/dragon-20.08.3.ebuild b/kde-apps/dragon/dragon-21.04.0.ebuild
index 8aaa630d3a14..cfd1198334d5 100644
--- a/kde-apps/dragon/dragon-20.08.3.ebuild
+++ b/kde-apps/dragon/dragon-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Simple video player"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/dragonplayer"
 
 LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index a3e69a5d9f57..3fe23947bec9 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
-DIST eventviews-20.12.2.tar.xz 444096 BLAKE2B 937d4a1d390536140af60fe11a0cb8725b1ba7aefb89bba2984890f6fe4433e5e6a708c2e4b0d4461a003fbd276691a14ade7deeb86de4e48fec4f0f6bd35d56 SHA512 c76427eff7f14db5b58529e6c62ab1606e68fd90ce397f2d1b44013ea2d6c19761bf8b3900acee16a4aec29e6c5082a03ed349409063e0dbfa933bf68000732a
 DIST eventviews-20.12.3.tar.xz 444100 BLAKE2B 9afa966f56b364ca047ec6e13368f833bc91fdd733c376a1d690c2a90c59248385c782542a8e3c66ebd1bc89485149bc32b5c433584e1a686358f30eff0c240a SHA512 a9f69fceffe8772cd059e5407660ef040bd9e4a4d8bff8ef4b4be3e18df989b74e4bb8c66b5d42251c89aeac9b1602fed08e75380e332182160c0a00c9a334cc
-EBUILD eventviews-20.12.2.ebuild 1201 BLAKE2B 2dc6e8e2bc71d77e9d1dbc096355b7159870259968fa2418d8cb0561f6734e3449c1272be3ea4f86997760afaa3c5e567339b241f3f503610e0f61a6aef60dae SHA512 71a3c5a21e4c490516495155e1f166b1607795d1ab0baafcc8015daa5b8ab2170163b6bd7e71cb0085a6d884a742fb9c7f66805d2047633ce7d1fde976657ab2
-EBUILD eventviews-20.12.3.ebuild 1204 BLAKE2B 5862a81ee41af7c7a6ed2ea05e63b0e4f49baf65697b9fb90b123e4adecee923bc1e50af66d3c765ea7838270841217afc2f417de7fb5d956afc6d727509f90a SHA512 d1919daecfb86014041b0368377c1bdbfabda6d4da2df092650139b8d57eaf3114746893354722d60f24c3671af345900f5609270229774bb78ee35b5160b70f
+DIST eventviews-21.04.0.tar.xz 447000 BLAKE2B 7aca6420e87a1463c6906e657f845f6f6b6c457ec6f13280c47c4b82cdda5d977908df40bf50169bfb03c6ec8569f7c2c5576e5ae550a9a1169208f958f0e4fe SHA512 84c5a4f047b2674eaf0988ca4f20d552c2141b88f43879b3ff60388459d1e68264c98ba55af8816f47bfa38f7575e9760ef4c4803a338a6f376e5d7f9728a026
+EBUILD eventviews-20.12.3.ebuild 1201 BLAKE2B 2dc6e8e2bc71d77e9d1dbc096355b7159870259968fa2418d8cb0561f6734e3449c1272be3ea4f86997760afaa3c5e567339b241f3f503610e0f61a6aef60dae SHA512 71a3c5a21e4c490516495155e1f166b1607795d1ab0baafcc8015daa5b8ab2170163b6bd7e71cb0085a6d884a742fb9c7f66805d2047633ce7d1fde976657ab2
+EBUILD eventviews-21.04.0.ebuild 1204 BLAKE2B e1db9d70db8ad51d380d1c78defb013362f45d7a4f369b43c784f8c6bb1b2d1804735547bbe22091106d729c1028ba135d2867e9cd0a4c7ad31174a7a274b878 SHA512 a2c34ebb754bf47df8e4a38373168a6d3210a1e38cd7b56fecdc1657c728ee21623948a9caae1347cc3657d83977d95542d80e4cad066980d297d4a584d4687c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-20.12.3.ebuild b/kde-apps/eventviews/eventviews-20.12.3.ebuild
index d83fb4df63f7..38e701200e41 100644
--- a/kde-apps/eventviews/eventviews-20.12.3.ebuild
+++ b/kde-apps/eventviews/eventviews-20.12.3.ebuild
@@ -13,7 +13,7 @@ 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/eventviews/eventviews-20.12.2.ebuild b/kde-apps/eventviews/eventviews-21.04.0.ebuild
index 38e701200e41..df1e1307e4ff 100644
--- a/kde-apps/eventviews/eventviews-20.12.2.ebuild
+++ b/kde-apps/eventviews/eventviews-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ 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 ae77b491f5b6..85e635e9e02d 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
-DIST ffmpegthumbs-20.08.3.tar.xz 32164 BLAKE2B edb1a898709d8a6bb5591ed055b5f28c5424321558a541130e3b61b516c2fecab8a7498bdc53a33949efdbe365c6fe49fb59fc9d3bef28dabfcf2bd2fcfe8c2b SHA512 03dbd65bf2d2151bfd6f20bafeba24df78c8be97188878e79e3566e1a5d11bac0d4959507ae997b45026533b985f60acbbcc68faca730663f8dba888a8b93b5f
 DIST ffmpegthumbs-20.12.3.tar.xz 34088 BLAKE2B cbabaff6409d7349939c8b9d63ca3b38490b5d851032e3aa3d4663bae25202c7361e1fb9cff9863b8073a6f91082f93d4fee4dc696a8f762c813eed1e8d2c28f SHA512 d81f89fa3c26982d9f7e84f76b2deb562308467376b5f01af9acda1bc2d62e21cc3054afe5bcbad5d098e3ecf79d9e9b0adee7e719127aaab228ee8efa190aad
-EBUILD ffmpegthumbs-20.08.3.ebuild 541 BLAKE2B ef9330dbda1ad092fb8931e528787cb81017fbd8b2071e4cfdb60d506a01efbc1fa0070ec001f2a7e97034a1247bbbe727eb3473e45fd99da0c225c25dea097d SHA512 e0a1230f6216b2cd6ec6b6d5e340a9288844bdb454dd6a28d2dd34878e1ce6b564bc233b483a8be14c615d3b8a8dda521c592037930753dcd9859b4187588771
-EBUILD ffmpegthumbs-20.12.3.ebuild 563 BLAKE2B 8f38d0dd885587abf1c6ac57ee650c3053915620e30f49e4d156736ea23c412bdb126fda2a40a7ad653ceaebd51e2c862ed58626a6165da7ae39e62e21dd080c SHA512 a8196cb1768384ba6786f4b47f2ef2b665a38e2ea637f7e3338a885c30d28595f6c0e8964abc06c97cb6a94962df58d1bc3b4c4ec040eb9c7d3a9c599a0b5aa4
+DIST ffmpegthumbs-21.04.0.tar.xz 33544 BLAKE2B b8490ddd91932b60313ab2cd4796c6b1625e16d74cf7908baad2516a9af125a37e699883c3361f966d1e4d6b95649d328b29b7b29ae1c406f71ac070a39d97ad SHA512 f94cd476077d6ec991a89ca62749a8ac0f5da726a6630b766bb37e4616e3df897cd79f2b0279cff321fca8e8fb0af788a0d49f3b1b30b80d6c122253b9f0cc7a
+EBUILD ffmpegthumbs-20.12.3.ebuild 560 BLAKE2B 42c16e6b703d5135ecc12b4269e56794a0efc1cee31ad520705140ae3a4ab6196e25e36c0be9562f9bd00eefa0a876a38ab3859c541a7c450bba011b5e2ce23a SHA512 16378de64a32da30498a3e9e4a2e362221ac887a208537cca1f3cd7f217b66873d002e8150bc666237838c65329a30814c507e9a31d82794ee690481d5708a9d
+EBUILD ffmpegthumbs-21.04.0.ebuild 563 BLAKE2B 7489fbb26915c38e11f285dbe08da67f5a006b022e08e9deec87bbb58d5cb2cea532216c16ade3ac6eca249d777dd2e6874b44749108ee2177c3a739236f6c9a SHA512 62b32648302c31f3409aaec3978911158d4d66034a910fa7f743ede79a789fd3a0b7901b5bf40a247145af452d3ca6ce63dfa053dd467cf38f77063b138e3ed2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.3.ebuild
index 0f1b475c48c9..0bc7fbc7af1d 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.08.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.04.0.ebuild
index 0eb49bf77275..416a9c63a2e1 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.08.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.04.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="FFmpeg based thumbnail generator for video files"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
@@ -23,6 +23,7 @@ DEPEND="
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
+	media-libs/taglib
 	media-video/ffmpeg:0=
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index e23a2c5e1af1..d7df53f7f75d 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,6 @@
-DIST filelight-20.08.3.tar.xz 667748 BLAKE2B d3d6e842eb2027e9b9420fd7130d7a32a5f63d0085029e1bf382c88b9cd12b073ec5c001eb9c6a351a7d46feb43b105a3f8bbaee7c2b6d170ded2cac0df0a61e SHA512 1cf668980055b158479ba5016bef593774ef06aead671d1ff09661f93bf78f591448568f3ec447fbaef53fc2f7253adeff797a26e3d467d678c9f336ea7b3aa2
+AUX filelight-21.04.0-kdoctools_install.patch 813 BLAKE2B d0ce60459c3e1e3ad3eefb858ff3f1bd8c6459c9672d7251f799d0697bd138e3ae83d64b41fd799bd43ddae2f9500cb120eb36a64f2d9dacbf80b92f872803c3 SHA512 9f2e1131f18cddf3b76783f85ab34a8a271ccc5979e5e4c984f680e162e221441fb165d6d460999f2b7cb9e0171b830a314ba4cc72b3b23615d6d758f300cf9a
 DIST filelight-20.12.3.tar.xz 671244 BLAKE2B 0de8b3fddba934d1d6cbd014fa7185f16e0736cf1623cda4efba938a958f5134d71f24ee37d4f9753e5c1edf3e5025b0fbc326f55d1e4922ec5b1a0a7d4a58de SHA512 3a30181a95deb4eb8f9f5cc435658bfa9f5d6406a4756d80535de6783c5ab86c31f874cfa86f56b9a687a72b249d73fcdaa7066e99a548301f648b0abe5b2bb9
-EBUILD filelight-20.08.3.ebuild 905 BLAKE2B d633e30ccc272ef4a9c6195a88574b7161ae496fd0baff2bf860cbd186b2138c95fb851a14dc6417d4c6dda0100c25c22e65df930c81596b61dbde7e9c5d936c SHA512 2b193b2e6206d9472b60010b54e52739c7b9bec7bcb6842fa26d989b5381ab6e5279835bedcc56389c6858faa75b8245cb94f27ab4b29899019a5059e1bacd88
-EBUILD filelight-20.12.3.ebuild 935 BLAKE2B 5db77f38f4a695e5b465f99fe8dad4b36fe59404fc5dc866b013351fa96327ab1caf1cfa1ec8f3a80f90ebe6c372a37840bb760a623407c66381d66654790ed0 SHA512 849f087f134db35fe5ad97d8bee7ff0f1e8c4190bbfa021cdc6e6869f2b3bd5e62c78212a4f8fad04c975a6a1fd5a68a898eab6f4ddd874a4ce8acaeeb1ba7db
+DIST filelight-21.04.0.tar.xz 679032 BLAKE2B 4d3537a189f1fe0c0412e2415f8d364f8517af954bc034bc8e7f87cf77821997316131b4fb30c0fa106c5300f37fa4914321e7cde0368c16e0ccf1dc4f6b9955 SHA512 c87e1ec0a9401ad6e85e6074e59c02cc5c4dca8de98e698bf7dc761036db27bb38eaed914d0302109c5bee26b5776aa4d493114107e2f3ec6130b3078d73fd89
+EBUILD filelight-20.12.3.ebuild 932 BLAKE2B e68ad78b143aeefe28595b24d0b7391eb35e7ee4a846b3449f9ff2f11956fce0231c0cafaad9b024794f3dcc8e2ffe1d27bbf971178d12fb032ebefbd5cb3ab8 SHA512 26414f5f817d585521b5987f144b1cf3d1d97765de890ef42e1a6a9e2d046dc72d36d3121173bfe807720fe94025b97dab2a4bad2b2da2ab3eb4ce8fcfdd1c20
+EBUILD filelight-21.04.0.ebuild 991 BLAKE2B fd64815e1dcdc746b7a718abd4502662c3af94dc013d383385ff390867f4eab93c1bce80c5e00901db9729f38901d954b2fc93931829fbf3fc3f8ab74723f548 SHA512 b265e6f4dc78f8de100eb1f0b2e3b8e7b3247ecefe110e5fceb6e8167c6c4958bfef4e039e9e99d546f23bca535e69dd7ac08eb6af88e7a37fedab75a7283d72
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-20.12.3.ebuild b/kde-apps/filelight/filelight-20.12.3.ebuild
index 2568251b6066..e39fb92427c9 100644
--- a/kde-apps/filelight/filelight-20.12.3.ebuild
+++ b/kde-apps/filelight/filelight-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/filelight/filelight-20.08.3.ebuild b/kde-apps/filelight/filelight-21.04.0.ebuild
index 4e5350a9939b..7ae7ae95813a 100644
--- a/kde-apps/filelight/filelight-20.08.3.ebuild
+++ b/kde-apps/filelight/filelight-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
@@ -15,11 +15,12 @@ https://utils.kde.org/projects/filelight/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -32,3 +33,5 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-kdoctools_install.patch" )
diff --git a/kde-apps/filelight/files/filelight-21.04.0-kdoctools_install.patch b/kde-apps/filelight/files/filelight-21.04.0-kdoctools_install.patch
new file mode 100644
index 000000000000..e9d4c6444f65
--- /dev/null
+++ b/kde-apps/filelight/files/filelight-21.04.0-kdoctools_install.patch
@@ -0,0 +1,28 @@
+From 0db4a8c6b941800d0616e726ebf3f2e751f2293d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Apr 2021 11:34:46 +0200
+Subject: [PATCH] Hide kdoctools_install() behind KF5DocTools_FOUND conditional
+
+The dependency is optional in this package so the macro call must be too.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8c5c73..72e80dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,5 +56,7 @@ if (KF5DocTools_FOUND)
+ endif()
+ 
+ ki18n_install(po)
+-kdoctools_install(po)
++if (KF5DocTools_FOUND)
++    kdoctools_install(po)
++endif()
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-- 
+2.31.1
+
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index 6dc96b48b399..778a6b3d53d2 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
-DIST granatier-20.08.3.tar.xz 1951616 BLAKE2B 03a3d330116bdbfb7e078fec9382b23e8d71da289b00af71a85374d3876d006b215a40842aae5ea12cc6a7206379cdf08a3a22688e8f800ef5e4ccb51e037ac4 SHA512 c77a09980fe09b89c58e9ca1bdb9063eb1b9fe637b0e7dea1a3e3191e29885e40aba5937b6ce1768ee4b0b6a3e6b88070be51a5976a116b3d1204d0b61338385
 DIST granatier-20.12.3.tar.xz 1951672 BLAKE2B ed49b7a3d843eddc721cc826db3e59a428b4c80b56a9c4c5bb9217ee8079737fddde61caf4b360862c89aae7ccc0da8501520b3197308319a77f3a3f7e802b39 SHA512 91b577c2b6e87e4e5376e139d6161d03c9f9f7e835446f11b02541d04e2bb1a0f8f5f6f0ae2f10c1d83ec0ce74046d3d926f29c2d051e68a2c83abf61730ee93
-EBUILD granatier-20.08.3.ebuild 896 BLAKE2B ef13747d10f5978647f44e7e4051a297a9e73aceefc3d8246c152eb33f5abb18760997166be885ff851d5a6c312eb13801361ff90e52bb5126a6d14777716a2b SHA512 4ca2bbebca674b2386db0330761a82e0bb00d58fa95bdfd9f4603315489786b56b37e41ebca90c81f6bc59ae798d9bb47295681de912c2656fed905ea61b1d6a
-EBUILD granatier-20.12.3.ebuild 899 BLAKE2B e900eebf9ec62933bfe5b2199b793c97956ee988a5af8ce532e95a3a97acfe0b6eff53f85533bb9fa59372d12b8febd495b7410a3eed0772675fcb78f31bb6c3 SHA512 a7447d6e2c77e449dc4612d80c5dc0eafe3565caa64b21250e76343b2e8e6558639529b688bdab27030d867a813f73f2615eb424b92064b451c6d59be1eb0fa9
+DIST granatier-21.04.0.tar.xz 1952812 BLAKE2B 19e1d345c359f697a13cc4ecccaddaf188f4a6cd33986d23db905040ee49881c84388b2dc80ab69f31eae227fbcf88f9dd222807cfbdc039aae1162f96ec5714 SHA512 64b7ade214ec36159e81dcf214b453799078008250c8dd30b3d30dd38dcc37c94214db2347ca847b9a4fd63f966639ca5a66cbd840ec2eb4579b865af15450b2
+EBUILD granatier-20.12.3.ebuild 896 BLAKE2B 0fd04349f3c51c2eaee3b4cc4c85c77c701684a2d3d52ad18c86044cc44b189efa6f441654cf8d40a274c98c554de4f74ba57abd1f9ec799d31b8795e0b7de19 SHA512 59ae4af16d42251e4c9df15823a78c83c66e7d384d7adc8c28e4bf00c3198c8798a60302d014ab365629975dee99310bb9a77ba49d8589652b1c1e1ad4100cc0
+EBUILD granatier-21.04.0.ebuild 860 BLAKE2B fb98fff8f320fc5858b4543abbb88c97b411b7335982f7b1e50aa8b6f2b560d7dbb17b92cf7052dd540f69f3186ae9ab7d45a86601143b4ca07ae4158cdf1f25 SHA512 dc10dbb15c4588907a192a010f279b83bca4fd2c71ee7bcc8b73e4e06766c0090b858aea7e29dbfe17d809020c8ce8787b933139b941b97a9914db2e6cfa06ee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-20.12.3.ebuild b/kde-apps/granatier/granatier-20.12.3.ebuild
index 296e2c2eaf22..4ad2e1f7c65a 100644
--- a/kde-apps/granatier/granatier-20.12.3.ebuild
+++ b/kde-apps/granatier/granatier-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/granatier"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/granatier/granatier-20.08.3.ebuild b/kde-apps/granatier/granatier-21.04.0.ebuild
index ec7c253c5fd0..ed1ebafb4b0a 100644
--- a/kde-apps/granatier/granatier-20.08.3.ebuild
+++ b/kde-apps/granatier/granatier-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Bomberman game"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/granatier"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -29,7 +29,6 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 148add3b84f4..59e68feb543f 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
-DIST grantlee-editor-20.12.2.tar.xz 107480 BLAKE2B 6363c03ca0b020dd411f689a539002af822c09f0a1c2d63d131acf634e649db603c69b9ec13c3472052910846041ff62f263092332a30538d93d0fb3d1cca336 SHA512 b430d535b3c0e15c32dea5ac7aea73cd3d2353f84972fb3cdeb6c5f5d946fcc9b3058d175e998cf1b8d3dc9db5b16251d0c8cdf5d15cb710f0f7fec6ba3d4132
 DIST grantlee-editor-20.12.3.tar.xz 107424 BLAKE2B ba967fa5f5e5b7415f696a3e2e9874625abddebeb135fec2aa510a8c7241434ebde6f42357ec961cf70fc7deabebf0316e8755de942c2b6b17d3be9392893b3b SHA512 7e601b8f180e502f639ee6fc62fea45c383602a8d9732034ffb5a14d27bf4ec47fe5115e09eb8bca6ba039fa703765fe57aab9b5221c70e05deac2438dcf2fbb
-EBUILD grantlee-editor-20.12.2.ebuild 1264 BLAKE2B 053c90baef7fdc08a99665784258fcfc88d97d67670cb20246399881e50c65ed63fd0501cfd0ef5c553fde801bebd117c0bac8ff28dae6242cc630179c27021a SHA512 fd65644ad30a59d3794ee670d548d024204bed1873421589b52d8a4586839fda1445fb0fe530daa69def553014ef3527a2d5a326830c9d103eadaba7752cf6e9
-EBUILD grantlee-editor-20.12.3.ebuild 1267 BLAKE2B 1360084c00bce383a2b4b8bb9b276939821ca562adb29cb9a11ea72a01d652095051fc09c0d9d6665c4b736210116ea952a408dbb36b560378fb92b26ef7c15d SHA512 c96f30a67a9d288c0bf457649681706d051cb6b8137fd166b740171ae7b3db871c01e278cc917d0f1664c0d74d46ba5ed7f63cd6d836a9745d06f1f4e998d342
+DIST grantlee-editor-21.04.0.tar.xz 111752 BLAKE2B ece50f82f06df1d217a9c4b2983a0fe5d75f6e087dc96b5a1675d23e1b3c88b717f9c1cfd372f0708c621dac69c9273ac6154134a1cf46ded08d634a1174741c SHA512 670cb5f3287881dcfdcc7df8898b2b42b63568592f253bf33edb5f2f1905aa8c97e001909128f6292f383e8fc9ca173511aa2bfec10651becbd7137f4ebfcb13
+EBUILD grantlee-editor-20.12.3.ebuild 1264 BLAKE2B 053c90baef7fdc08a99665784258fcfc88d97d67670cb20246399881e50c65ed63fd0501cfd0ef5c553fde801bebd117c0bac8ff28dae6242cc630179c27021a SHA512 fd65644ad30a59d3794ee670d548d024204bed1873421589b52d8a4586839fda1445fb0fe530daa69def553014ef3527a2d5a326830c9d103eadaba7752cf6e9
+EBUILD grantlee-editor-21.04.0.ebuild 1230 BLAKE2B bfc0be8563290b4509b2da89f01bf1e8763835aaaf5feea618733e3c505fdae2d0bcc30713b2fe6c18261749b673d9425a81b91b7b47aa73bde57960431e7d19 SHA512 b95a3e1bd55389e234e944fb4a0b3f6c772ac4ea9e40e85ef36e75d5e2533e68e180eb2ffc9330b891e8ca728a2518bf412782fa2eb1c9228bd7eee8aa807510
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-20.12.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-20.12.3.ebuild
index 14c95bd7e7d7..2c70baa0c538 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-20.12.3.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-20.12.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/grantlee-editor/grantlee-editor-20.12.2.ebuild b/kde-apps/grantlee-editor/grantlee-editor-21.04.0.ebuild
index 2c70baa0c538..7a74222088e2 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -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="
@@ -37,7 +37,6 @@ DEPEND="
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 3b2dfa2c830b..0f0175178a3c 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
-DIST grantleetheme-20.12.2.tar.xz 56536 BLAKE2B 58a15b4beed8b2712bb6df6c7645cd41532b873422145c13e1b932faebecf30eda57bffa5fa214c58b3f994727341c2808b9e0a681cddcb5f2857c45c7347f80 SHA512 6f587ea30e4c5954fd09bfdacb5ebadb406c333ce04758e99ff31d7b219eb65c3be68d426f8677ad6816c38e409717f1a77fec4d4d97797fa3ee525d72380979
 DIST grantleetheme-20.12.3.tar.xz 56540 BLAKE2B fc65cd63ef8c2a2f5e003f6e8eaab67a3c1a2c1ee1ef4b1a17afede8afcc5ab4c00302ecadd16e24d34ec4c5ff3f60d6e05dfd42b56bb7710c595678db0f99b1 SHA512 8daa07c7903dbff3b2435c35f31e8ff0fc7b7d29ca6f8f05473ef09331c0fc14bb18f419c575c2f4f4778fb6847f5f202b2a30d6e2d699bc57711ee8028f3ac1
-EBUILD grantleetheme-20.12.2.ebuild 825 BLAKE2B 26c6a21af3b67b6175d7f6f439f0cb4ec94b37b88ec731d75c0ab7b892a7d124b46d785f501fdf4df6f8f70508269daa9e4215c2a97079efde7017bd39cab178 SHA512 bb9aabd48ebaf27996308bbf319a19268bb239bc5f565379ae1d378ec8036440c3e0321360f2d8122d7470b448d5fc87d612a3c9a704e0171dbca62de1138b5d
-EBUILD grantleetheme-20.12.3.ebuild 828 BLAKE2B 880ed10f92ff87f0ff258dc7cdfab00602c1e5297c10895453dba44b228b6cb3e0a924e94bf74cd5a09fd891189eb929e860b7bdd23edc819383806924f348be SHA512 705a62dbbd6baae3947460326dcf1cfcaeac42ec202c133e8f7c99c4153af1610f57712727938fc1c16be53e33422f833f04399431d9a841ff337e33cc058b9e
+DIST grantleetheme-21.04.0.tar.xz 60596 BLAKE2B bec7015ae0e61b02cb2c0b365c7f0bd8179616c2d66df68f66fb4b79daed637117a1d0e93e397dac911f28780dce94405c83ace0c713b246c898482f215239b1 SHA512 ba933568851b9c5c17c9ff65df770bd7440da983bf78a334ddd903d6063a22ac4854dbba7878908d3b6320e1ecdc56915d308ed10bc41006d779ffbc59c00d7f
+EBUILD grantleetheme-20.12.3.ebuild 825 BLAKE2B 26c6a21af3b67b6175d7f6f439f0cb4ec94b37b88ec731d75c0ab7b892a7d124b46d785f501fdf4df6f8f70508269daa9e4215c2a97079efde7017bd39cab178 SHA512 bb9aabd48ebaf27996308bbf319a19268bb239bc5f565379ae1d378ec8036440c3e0321360f2d8122d7470b448d5fc87d612a3c9a704e0171dbca62de1138b5d
+EBUILD grantleetheme-21.04.0.ebuild 828 BLAKE2B c1b46e7887ffc4fa2520847ca11ba037ad416c4de8271570172202d64fc22e2c79ce79af48186d9a1cc82fa9fdbf7c31b01c3b785eee29724c274d1e2bb8170a SHA512 c279f8f418b27238538e728a3c4d88f6e31a10fefcf87581d86f9fc59ac0025a13cc240cfb40d044841b9f2d102b888070e067c1882656f106baf96a8e447d64
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-20.12.3.ebuild b/kde-apps/grantleetheme/grantleetheme-20.12.3.ebuild
index 55ab02ade230..662f50179731 100644
--- a/kde-apps/grantleetheme/grantleetheme-20.12.3.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-20.12.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for Grantlee plugins"
 
 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/grantleetheme/grantleetheme-20.12.2.ebuild b/kde-apps/grantleetheme/grantleetheme-21.04.0.ebuild
index 662f50179731..52f8ed090e61 100644
--- a/kde-apps/grantleetheme/grantleetheme-20.12.2.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-21.04.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -12,7 +12,7 @@ DESCRIPTION="Library for Grantlee plugins"
 
 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/gwenview/Manifest b/kde-apps/gwenview/Manifest
index cf97151ddd29..ae2794a76285 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,5 @@
-DIST gwenview-20.08.3.tar.xz 6742928 BLAKE2B 1494d58e65993cfd3cd40311818c7ec414a9e9b5052d241e043b9425e5bb6de64578bd1f8e0e6b9708680fdd73dcf8c42cc2aab909c0f8efb653a9ad4e3732ad SHA512 a636250900f7b0ac96a4b847571acbc13854d7a0977fbec3d57a0291f2dfd88b1b1eae5048f3f507ef62db48152de0ce1bce1d113aba53353067650ce51c50f7
 DIST gwenview-20.12.3.tar.xz 6753636 BLAKE2B ebf4cb69941875f9f2cda8816ff16953fd82a8a434efb18dab60c4ce53e1cd4e76ae8d51ef619b39f18fde82a2fb0943b2a24465513fe85cdb774d411e389c38 SHA512 4a2973029d7bb2e8883cebb8b031fa60068b3a258eceb165a8ba2dcfe52d63fa3c505772a895d72aae93bf88b024fbbb2189e9f1b982ecd94a3629f67d15eb2b
-EBUILD gwenview-20.08.3.ebuild 2964 BLAKE2B 2c54f0c5d6285ef8abec94794b19452b4e648d3436917d24614c275d7b3eb999591bdc90533ea696fd5f2d99c42ded7de8c88acb87cef3b3610bb331f1a67dc8 SHA512 16e9fef0148e1b4e2ed4f7f19881f33084862ab69e3323b4cfba1c481d82262d94290d58e32a18e66f459bc79bb832d6ed7d4de9110166a6bc0e6ddc94ccd307
-EBUILD gwenview-20.12.3.ebuild 2967 BLAKE2B a5c2f1e395bffe3833b528f8695844b1fd448db7e4d8f57aaa604418f17de2ae232d78767176b29fc1db1b2e25411e3999737d1b1731aa160637eac8ddc98d24 SHA512 49b93ec2da0b296f022c48d9357cf4bb0887af5e0380a99c62158df4759918c3cd71027f0a8c81dabdd7179036945265f31712b80a2c7e85631ec4eecf18f016
+DIST gwenview-21.04.0.tar.xz 6757484 BLAKE2B ccc9b044d29a9b91bd6c16fac1e25c815a8334747b037a7110bcb3b1c227502490f22f6e03a1195eceb370e15a675bcb15c8a4d1c79b23566ec26bb8547f0a16 SHA512 68a890a11d8cb7c63f414ad940eead983a59886c9a24e7b06376f7edd388f020d337768ca78c1adf654b22aa358c65c5886b52c7fde315d6af7cd7fba2ceda3f
+EBUILD gwenview-20.12.3.ebuild 2932 BLAKE2B 70b5ca3ecc58c0ac9f4904978640151dee5c5d1fca46d1a78c53c1a4b0147901aa71191c1db414c62a3458053ef6375c7a68a70753a23ea8dc0fbe183974ffd4 SHA512 358ae74ef86930e9248b48d15420cb86c5368026723817b512ec2a9a50fd7840ff3d39c9c1fda653fef366e39302b07b1137e7b4d476d218af59ed0bfb338d78
+EBUILD gwenview-21.04.0.ebuild 2905 BLAKE2B b0f7bc5f51560ac802fc2f4ea30795a30b0380882eb7251c47f8434a6d45d4d3574ba79499751bd4a8359bdb9209fc97ee7da87cf3b76e6d030024a99b2d1883 SHA512 1e958fd6674af561e45666100d4675741b48290854709b5e25881071c35d41f7ef53f06b54a0c32748be4f56629b3a3d758787e57e6e408ba95dba5eaaac8897
 MISC metadata.xml 708 BLAKE2B cde335a32954748c28475a1620aac2e6733490fd8e6126f8963c6b5b0b6e8e87065dbab17e1723945e8f5646815acdf9fdfbf89c4dc57639663567fdcab0b5c9 SHA512 b8fffc87db328df9c5dafb6d72b954ce052678810375278adb390c832bec11f419000fcdd08bd73b9dbcc3e475b7e7b927663c9886b6eb92b7caca7e311015e6
diff --git a/kde-apps/gwenview/gwenview-20.12.3.ebuild b/kde-apps/gwenview/gwenview-20.12.3.ebuild
index dd45a4bb02fb..1c998d449a71 100644
--- a/kde-apps/gwenview/gwenview-20.12.3.ebuild
+++ b/kde-apps/gwenview/gwenview-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/gwenview https://userbase.kde.org/Gwenview"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 
 # requires running environment
@@ -103,7 +103,6 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "SVG support" kde-apps/svgpart:${SLOT}
 	fi
 	ecm_pkg_postinst
diff --git a/kde-apps/gwenview/gwenview-20.08.3.ebuild b/kde-apps/gwenview/gwenview-21.04.0.ebuild
index af70d29510ee..929ef2ecd4ae 100644
--- a/kde-apps/gwenview/gwenview-20.08.3.ebuild
+++ b/kde-apps/gwenview/gwenview-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org optfeature
 
 DESCRIPTION="Image viewer by KDE"
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/gwenview https://userbase.kde.org/Gwenview"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 
 # requires running environment
@@ -23,7 +23,6 @@ RESTRICT+=" test"
 
 COMMON_DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtopengl-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -103,7 +102,6 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "SVG support" kde-apps/svgpart:${SLOT}
 	fi
 	ecm_pkg_postinst
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index 2720f6097e49..6eb1bd56c3ad 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
-DIST incidenceeditor-20.12.2.tar.xz 546144 BLAKE2B 2a7ee26b398347595a26b4a74c2dbfbd3c99e3cf576b484497b418b7522c9fe3ed0c218434da79b2fe72063224ab11add669e02dd033529f24a02cbf001f429b SHA512 4c28ccdbc7e389a26f93072309626966570392bb05af2457c8a8c73581f7ca9e04d030eb7d4bc45c16a5545218e928d66575cd9f5fb2333131be136f3b52c0ad
 DIST incidenceeditor-20.12.3.tar.xz 546308 BLAKE2B 8156fc4bf9a5fb06d755c89debc55c8f765d3d76f9a33b03bad94df8d8dc1617be79e584e6cf6728577c66fdb4db5a627570545d06d0d673615b1d4795c759cc SHA512 cd344322ae026c9782fdd2756c5206b89bb8dc475f38addfc58b3622ea4ab8106287d32b0105506c0b4491c2575b227ea52570c486a29e019b7495f41ba5aa90
-EBUILD incidenceeditor-20.12.2.ebuild 1878 BLAKE2B 3e8ef837ff891798e1d0bf5688d3d7d53836a5bd366f1136b782aa0f48dbe6627f507e1973aea214b5442a90108bb3e9c137b41907a593ab3f25cd535e5989b5 SHA512 c2decbf0782791fdd58622bc0a965ae5b192bbd943f5a608ed988a9391edc82ddb72b15dd9f2acf1f0d73752d722a2b87ee10dc3e663390ab445dcd91e259291
-EBUILD incidenceeditor-20.12.3.ebuild 1881 BLAKE2B b27b2e61573a2eb8effc007c4093f0a24cd065efb09b9e872b2ee8c4860789b13567e80709d983cc8e30e848f60d9fc8e1af91f38e7846bb639f2d938c186e1a SHA512 3709c0977614b41d18cd1f7ab06a028e68c3dc1c4f77985098f4d89143e1c4e6815fd0116b0d2bf5e96b3c9923a5f4a79c5a674178af0ce7ffcd5d045c974324
+DIST incidenceeditor-21.04.0.tar.xz 539892 BLAKE2B 767b62435313b6d112c03d6f6e7020d5c52d0c3e63959f92cfbfa43a761818ee4a06d6ffb53e5438fcd28b55cbfd11a1f20e13ac0b30cda65985afe16091e9bb SHA512 ec31ee5d209381d05a8a376792a5d16c3f9c59c8b1b120a2ed3f0c6bb76c55533ec5a72ec218a837244b16ab156cb98efcf2e9bb75e59a9ff41f01709b2589c1
+EBUILD incidenceeditor-20.12.3.ebuild 1878 BLAKE2B 3e8ef837ff891798e1d0bf5688d3d7d53836a5bd366f1136b782aa0f48dbe6627f507e1973aea214b5442a90108bb3e9c137b41907a593ab3f25cd535e5989b5 SHA512 c2decbf0782791fdd58622bc0a965ae5b192bbd943f5a608ed988a9391edc82ddb72b15dd9f2acf1f0d73752d722a2b87ee10dc3e663390ab445dcd91e259291
+EBUILD incidenceeditor-21.04.0.ebuild 1881 BLAKE2B de1b1848a7685ee92aed0a7a184051a280721326ca6951f2a3d15a7964c238beb3d807a0e03669d10d71e9b21186d2fa1d7093f2afe5023532725cde1e20edef SHA512 7f0895bbde0756fec1e81389c8005f593c6b68419a296a7ab81a89ddd847a391a3ee1135fea50cbaf3b9888bd7af70accd7f2bbb9a688b8172cafc7f1a75807d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-20.12.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-20.12.3.ebuild
index 70a6db0af84d..72a8cbb949a6 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-20.12.3.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-20.12.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="
diff --git a/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild b/kde-apps/incidenceeditor/incidenceeditor-21.04.0.ebuild
index 72a8cbb949a6..aab7cb64bd6d 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -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="
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index edd94370413d..28554c17a566 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,6 @@
-DIST juk-20.08.3.tar.xz 1997992 BLAKE2B 83a4df418e782067ac4b65ad89a7fe749870d8cab318ebe71a04d995b48be4bb442b03ead274de49c074cdc4320cf644ba7bed02c389d4788ca507403f236c6c SHA512 7e12689364b01c409f69547fd7a7b24149296c12dc8c9b8f4392932b15a24613ca6d92381bb37914c995610bfc618829646f0ca9d57883c8ad6e7957d29a2f3b
+AUX juk-21.04.0-missing-link.patch 821 BLAKE2B 2bc4ef72c25068a92bbc92c5c8dfa684e24c1eb83e4c6dfe574f8e968efa81ee9895759e64d1af4ae34eba7522c2fbee32800d02cc827a385db939c4837c30ab SHA512 d59aadb96449b3d531db5cf059d6c7d0dea6da73dfdaf6485e7d142039b3357f1efe7213356cd9035f34ccf26a221d28562633542cc56a79eb4b413c230152d5
 DIST juk-20.12.3.tar.xz 1997996 BLAKE2B 857defce1e5d089d711f7f70ca0077beec0267d576cb262536b79089622b32e53700d2c031430cdb63d7bf2a5c9eb8a67d5fc0aac64c0ccf2557835b15174f61 SHA512 3eca02446be784cc8d3dd68e7da146dfbe5ab7296d27ba78d0f15ce34b87183692d91ef01126aa97a9bc95a558e9af6b6bef47c0ba0a2f25fbeacda79285edc1
-EBUILD juk-20.08.3.ebuild 1276 BLAKE2B 5e773dc78f5a0dd21f0bcdc184534738ec80e901c21378cb262ac809a6688cc4f06d636f295242fb03527342bd12af5af87dca5ad533a24f90be227808fa9091 SHA512 409fcee3d8157988e58ca9fbab06202ba2d19a6b3f389910c52855da0ce2dfe7483d24fcddf3667af78a4e46bdbb0fc6510945366cc584e48ce010cb7505acd4
-EBUILD juk-20.12.3.ebuild 1279 BLAKE2B 34d18a519bf008fce7e25d13ea77cfeccbdd497eba009eef17e013cdaec843b6bd73e54858fe8d02bf1a832bc633ca09f3c9264028bd723038c01396e54f2acc SHA512 cf0731ee08efa8d35dd26fd7f1b6ebeb0697431d56b1ee642567b62e5a3d4c7d863192d709de17de0db3476955bed1c43f3141824661f8edfbfce6e171973bb6
+DIST juk-21.04.0.tar.xz 1993360 BLAKE2B 0c0a7e66791dbe378f08a0968e531709b932843a252ea8ba1fda85544ddb7e487deff92e82e03789d380a638ce88b15dbb3d35e17993be019ce75b89939803bc SHA512 9b5d009020f1749b2a0cc9ec97ba428dca8e244de2725ff826056b69db1bf6ad3b5cf1a10e0fb0925b73c3c019d1f2e57c3042b030053daa1f3dc5694aa75576
+EBUILD juk-20.12.3.ebuild 1276 BLAKE2B aa0093fac46bd9f94cdd89bdecaae34f61769d5ac4f934a85d95f658597b271b03d8e9f9ff1dd8e03710e66fafbfce289617c0c02e3b99e0b20ee7ea3fc6d89e SHA512 95add12b3bb0e2f622133d170100b4706c6f193ec93ec3345cb04fab9154786c20a887efe7edff2528f2bd418e462e9329964b068a2b1da659f2e9bfc90b8623
+EBUILD juk-21.04.0.ebuild 1379 BLAKE2B f8b19a492fa680b4820c5be9020ea3110bfe7bae3728a5c979a96d22f73d13b8ebf24a3f311fd4076450ac243c89d145d6afaad68778c2d6360ab70900d55737 SHA512 2637919faa288d7af2f0d2510f46643df445c05bccbdcd5fb4c39d8ce18e860172feb70e32f7606c0880d094aeb8a1d578dd03b3819f18fbc765eccb4351d369
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/files/juk-21.04.0-missing-link.patch b/kde-apps/juk/files/juk-21.04.0-missing-link.patch
new file mode 100644
index 000000000000..cb59f81e83e4
--- /dev/null
+++ b/kde-apps/juk/files/juk-21.04.0-missing-link.patch
@@ -0,0 +1,29 @@
+From c36b4aba0946b932f9da335e77295af2e31dff6d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Apr 2021 18:44:04 +0200
+Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries
+
+This was working as long as it was implicitly provided by KIO.
+
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e30cfad6..f3413e6a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -162,6 +162,7 @@ if(NOT MSVC AND NOT ( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) )
+ endif()
+ 
+ target_link_libraries(juk ${LIBMATH}
++    Qt5::Concurrent
+     Qt5::Gui
+     Qt5::Svg
+     Qt5::Widgets
+-- 
+2.31.1
+
diff --git a/kde-apps/juk/juk-20.12.3.ebuild b/kde-apps/juk/juk-20.12.3.ebuild
index 11f7e929c8fe..d8c64bf2ba68 100644
--- a/kde-apps/juk/juk-20.12.3.ebuild
+++ b/kde-apps/juk/juk-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/juk"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/juk/juk-20.08.3.ebuild b/kde-apps/juk/juk-21.04.0.ebuild
index 119da45e2d11..ade918bc4e55 100644
--- a/kde-apps/juk/juk-20.08.3.ebuild
+++ b/kde-apps/juk/juk-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Jukebox and music manager by KDE"
@@ -14,10 +14,10 @@ HOMEPAGE="https://apps.kde.org/en/juk"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
@@ -43,4 +43,8 @@ DEPEND="
 	>=media-libs/phonon-4.11.0
 	>=media-libs/taglib-1.6
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-missing-link.patch" ) # bug 785418
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index f87e24bba159..c67d67fd0613 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
-DIST k3b-20.08.3.tar.xz 10684548 BLAKE2B bfb9a06fd5b9c023fe7a9c1c93fd2f473941906870f8face596617cf5bc2e26e258cc6adbe9fb7a99da0ed5bd9f09273168408133c8d6142bd42dc4779e2fa32 SHA512 0d068f10d8dd287a33ca672e780673b7f6a92c2071ea9ec22176ea4a9a210e205eb1b605ee23edca4d2e7eaefbe2dead04ef8b8ee29b690f38185e3caae14ba8
 DIST k3b-20.12.3.tar.xz 10688136 BLAKE2B aa2e8de78b98e33888f47454ca5b2edfb195915c000c5a6f94f6cf0bd89575d22b7c4efde1e307a91b61bab1087b2e5fa665bf2abcb28de178f236df1ec37758 SHA512 e0c85d4faa6749d271d92a945e54c68876582b7d5c5719682950ca9305b75d0a46226f080e9c0bac300e63e32387ebb034d48f6ddc3b2d1a4fa2487db53f4039
-EBUILD k3b-20.08.3.ebuild 3438 BLAKE2B 5fb85afbf32ec5f1ec912b2e9058ec0b455f7dbc4ee594b78d9265c4ef39172ed492f25bb7b2bcffc2f10ecf10fee19af9658c73723610148fa569ea40c031eb SHA512 ce21464e436c493918e7440f01d6c16746ad4e73ad4a21f848212fbb99cd8d6a62e6b42852bc27486d81273fd51879be8ff5bd921e481b941e2f1b914ecab3e6
-EBUILD k3b-20.12.3.ebuild 3441 BLAKE2B 6b81fdfa0176ad5da8e7ee807904d2c95f25762aa0ed254eb6bf7dbe7fbba053165263d5b5d396e7fb612a7d1994448376ef7cb1eb8a1086d9985f8a04ef4365 SHA512 54743f911e0345b01e66f330d7f3a682516234cf0e05a69906236182cf7e53d8b1e99e435f9313c35d05a1c91535a2e8b827274102919900c2aebf06be542a5c
+DIST k3b-21.04.0.tar.xz 10709248 BLAKE2B c26211f922f83156b4c60942f098751c55202107b789a2070cfa6daf61446548f9f2c588689a50e0fbf1fd6fd4f31ae239670f46d746dab3a6bb0421abf06bea SHA512 c1dbb40140b04d7ffcb052be96c779c58bb6c03b846f4c17e0de1fc112bb7b39c28b24cf4912ca8d40f22e72859c283da5e224a3464238ade467032391006013
+EBUILD k3b-20.12.3.ebuild 3438 BLAKE2B dcaf54293a24fcedf29882b45c8eea4b291d8fa89fc85d38e65bacb514d260ec9adda520045bf7b28d092573134a067db401384ca511c1266a503e6413386e1d SHA512 0b4a2d97487a0408e9f3dced564304238dc2eaa3bc67891520218b0632763b9b4e9060ae16968db63c5a994680d28cd909f06df1be421d3157ffebafed11153f
+EBUILD k3b-21.04.0.ebuild 3441 BLAKE2B ce1c647269ef08078a9abac8a67cc1b5d0b209b5541318891d3e67d17a30ba7b1cf7e60b0db5586073be610610e18adc3b59eca9d35dedc3ebd4902fe39f3904 SHA512 0c82768131e013f501e71a83e05be26f26408b638e877529eab07f046de74bbf59739e8b5b6fd265c2ff38c066bdd4d0655c5d51c3da41e9d678fb06197bad99
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/k3b/k3b-20.12.3.ebuild b/kde-apps/k3b/k3b-20.12.3.ebuild
index ca9977f28e15..b7bf4c6e1d4a 100644
--- a/kde-apps/k3b/k3b-20.12.3.ebuild
+++ b/kde-apps/k3b/k3b-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/k3b https://userbase.kde.org/K3b"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 REQUIRED_USE="
diff --git a/kde-apps/k3b/k3b-20.08.3.ebuild b/kde-apps/k3b/k3b-21.04.0.ebuild
index cfe5805e1339..f997b0cf5e23 100644
--- a/kde-apps/k3b/k3b-20.08.3.ebuild
+++ b/kde-apps/k3b/k3b-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/k3b https://userbase.kde.org/K3b"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~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 ecbc57c1c05c..66d112311b69 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
-DIST kaccounts-integration-20.08.3.tar.xz 76624 BLAKE2B 4e12fdb8b83e2e99184756b1ce43b7b0c7261c2989dfd7f11e29ecb79902ecd2a11ebeed7242c9de466bdb1d18ba517d86634cf2595370c0f7a8729c1f30c045 SHA512 83dadfc224568ab07f23975db6dd04d8524a512bbdecc72da6dd8dc03cc06290199309a60f3b6f2570ac422da9bfdb9e253ec7a56c7dc15026414b3c108098a6
 DIST kaccounts-integration-20.12.3.tar.xz 84376 BLAKE2B 55f03614f86f2fa60b5b6475092ecf8f923e5e5c9ca2e057d2488abda250861fc1eb7a5c0141006da8a4a1747efe6a897bfbfc45740baea72c51a898783de34b SHA512 e9089f5d99d665a0568e43d66837faa5e994d2d93a3699057e6b86ff3bd65bddc448dd36afb49642ff80e150a922b4f110541f7834d04b52e9059fbff7795a88
-EBUILD kaccounts-integration-20.08.3.ebuild 1196 BLAKE2B e92f9a85d202176216e425f966c7d3cc4e67956976510ac75c5116804036ee5bd6b88cb3998413f0b946ff6af6b085f80cb2354206e9f415a570bafc890d843c SHA512 889720644aaca5dadf6efb62e84310cf8a65c668a1dcdca6080c9bfa6a5ddc40573ec34ec5d31702b5e2d960d94786c5fc376623b15edf5d71b4a5591e1f4746
-EBUILD kaccounts-integration-20.12.3.ebuild 1199 BLAKE2B e97eea74d80b3525f65775a71cfa611cc2d16c3fb8b908da0d64b9ca19428421c4356402e1b2648c2464bb6f96d1e8283bd6ff192eb4e70d68d50a593adef6d2 SHA512 c4e7e3e3be5c589daab36498ba574a8cefe6e622b11e7f04f4294760f27f217402d820cab184396679215142984e2d9ca6a01925dc6468a4df59f7749b29861a
+DIST kaccounts-integration-21.04.0.tar.xz 84508 BLAKE2B b587457a238069a9512765b33ba66d5e4c5a6d596c6076cee8c41983f15a88bb9ba5bb9c5023c4897766c08d6ceb10c63b9cd8131ab622e199d3fc7f825d66f2 SHA512 83d78b34216a8670f2a042b1beb3da733eff9120abff5db9bda864cb8470e885754897448bc6bd1e1eb388ad95ad7dfaffd57967f3ff954f3f42a98a6c87a69b
+EBUILD kaccounts-integration-20.12.3.ebuild 1196 BLAKE2B d52c3fd612e77097761e849fec0713635aa42d1b51cdcb2522b331dba8d1c4df2ff337874de35dde290a979cbec4f54d6f1b96b62467f1d223a7b4f133e33dd1 SHA512 df7f571320e46516735f230dd2b7b6ded2e74b92d4e2f1a99f8decdea40d10b20189329201a1339afadff31a76bef775806b745db7b1db3420a6ff5fe5ef33e3
+EBUILD kaccounts-integration-21.04.0.ebuild 1199 BLAKE2B 1e5dc6b2ba07e044031e63260908a10c45610e3b7ca5bc43858c2380efb17a339e93f6609081ed5ae8708acca8c8e769395829643e8742ed867d3e3ca1b9a1e1 SHA512 b9bc6d9bea82c9d733e8e6d0d057b65c0998cc056d44aae0cac79f32a095201fb0490851ff2e888fb0bd80de55ebae4c1caa85a5af1bbfa28818057cac448704
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-20.12.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-20.12.3.ebuild
index a23818e0f8e0..56db75dc8ae1 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-20.12.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-20.08.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-21.04.0.ebuild
index 7f3b0790605f..e6a71ffbc9cb 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-20.08.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
+KFMIN=5.80.0
 PLASMA_MINIMAL=5.16.5
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALDBUS_TEST="true"
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 90ac3a193703..0d4272dd495a 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,6 @@
-DIST kaccounts-providers-20.08.3.tar.xz 36188 BLAKE2B 90694addc96e68ef87ba53115e1e0021543e5d4731f31b42e419bfa7c282581efd175723f89a5f091400ba69d23c929d26d75f0ccbe365ce00bcd19c91362348 SHA512 d83e66c315f0b6bd2cc6bc7a438812ca45aed2327e57e9007e29be78e20b947cb47eea929f787e97bf18d0c555ff10bbbace26d6c791c6b78dc0048f8f4804fc
+AUX kaccounts-providers-20.12.3-qtwebengine-optional.patch 2822 BLAKE2B c303be4a5291ab18945e73a83167fb563daef52aebe68c3ec94f98327f01d3fbdcae1390cf51a1334c950d7f04cc7d8de17dac388340d15c773ed2a9d1275c91 SHA512 50dee13af1c01df73bea1d7f3f36588f415c959e1d7bcd84d73f17c88808df9b0fcd434b5a9a0281c9dbfaab416e852627f68a4bfeef41451c2a1d4560a10d0a
 DIST kaccounts-providers-20.12.3.tar.xz 61612 BLAKE2B 89861cc15a73f7003900b8ee540c904a0e426ed254c802a4116e5a9861f4483daecd00dafbc4f28eca7edc97f52af58d3c5503396e8d3168575e5f654129fd1d SHA512 9ad534fd4e4bfd4992265fb2722b09eb09fc3f4a880751a44b5f29da7250d2827dc1bf62a7df04449064d63d2b0b30ce4038f0920f9a6838f8f4876bf680b2c2
-EBUILD kaccounts-providers-20.08.3.ebuild 803 BLAKE2B 727f43ef62287c6e074f8de7789b781306744ba269731e19021c237bb882eedb92b30e1a55be1c5f8d62050e2aa394a53478be843f3882cb641256550ce83bc3 SHA512 3862b0c8f6cdcc4d1939236c49eb6e6b9eabdd9d3919792a1cb410e93ca3d32619ee166343eece064bd0859d26185a1a9c4aac82f77392046fa9b185675e2e8b
-EBUILD kaccounts-providers-20.12.3.ebuild 797 BLAKE2B b71b835aba833c5012b64db895c44797c2b9965537f0716c6695ecf2ea33eb61deb16abf15dcd5f0933d9a94880da60085fbc4b78464a60b3a558da6ae42e73f SHA512 66f719a7dc2e4be48d0f159bcb3727b3567835d76c78495c6065421bfab1c7045065cc391e666daea585edd3a8ffe8551a37ba68bf15efc2e608cdf8453e4c48
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+DIST kaccounts-providers-21.04.0.tar.xz 62304 BLAKE2B b292de65f70157e041ceb966044fe38660a38a0a2d64ea12f71736688acc41fbe38e3b10331ba48d37a2072cac0c00657ad19dba39dfd96308608498c825d9f2 SHA512 acb4cde37abac5b696e52b012fb79e381bb32e00f2afb7f240d7ce7cf41b743bfd017f82e3cdd9a062dc325c95062bf158793bd008ff9e2dde63b8509b61f1f4
+EBUILD kaccounts-providers-20.12.3-r1.ebuild 1006 BLAKE2B cf5d7c5018dada508ce84f2bff23e55d8d8a945be882102e417a7e50e45c297c3a2a22f1864a3176dcfcb8a024e99e419edbad15d64f5a08322fb0f8fe9a82be SHA512 905a180bea05586009022dcc2d4e2d3283f9b144fcf91fc21ca70b68fa1e96845177726d5c51f458cad57f6311cd1235d43b1840572ba0124acd0bf98f3e674e
+EBUILD kaccounts-providers-21.04.0.ebuild 1018 BLAKE2B e99dab445005c70ad998554680b021f5986f58ff104474bb6b8406e6b857699fc3e1ec26e473ede90c0170d6b28ec4a662dc2a26bfdff69bcffb6e19185621d3 SHA512 84c1d27d55701b3fa9c8ffbe70f2bdf45d58992155b88efac6034beebbcd135ce63170ca8557f7ae94b839cc913b4904bc8892f436fae3926e1ffbf5d52a532f
+MISC metadata.xml 366 BLAKE2B 7d04e3030abdea6593027fcdbbb1825369569be3de6312d1b66ca699d0c0817a3ef1bb8b685480a28b703cd6f20698174aaaaca42c886807cbd6dc50aeb3d32a SHA512 18a7a40fae8cd9bd9932a754033e80a8a4a67423964c8bc72c2ced8f9f85ce15843ebfbb2c6850a04965c39e2067d2f52323395d2668d1dba7e32b4fcbf86c2c
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
new file mode 100644
index 000000000000..02e5c9ee1d93
--- /dev/null
+++ b/kde-apps/kaccounts-providers/files/kaccounts-providers-20.12.3-qtwebengine-optional.patch
@@ -0,0 +1,81 @@
+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-20.08.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-20.12.3-r1.ebuild
index d3e7056ab52b..5edc0450b26b 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-20.08.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-20.12.3-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.75.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE accounts providers"
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
+IUSE="+webengine"
 
 BDEPEND="
 	dev-util/intltool
@@ -22,7 +22,6 @@ BDEPEND="
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-apps/kaccounts-integration-${PVCUT}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -30,8 +29,18 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kpackage-${KFMIN}:5
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
 	net-libs/signon-oauth2
 	net-libs/signon-ui
 "
+
+PATCHES=( "${FILESDIR}/${P}-qtwebengine-optional.patch" ) # bug 753274
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-20.12.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-21.04.0.ebuild
index 36d288e4a231..0121ca06ed2e 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-20.12.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-21.04.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.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 ~ppc64 ~x86"
-IUSE=""
+IUSE="+webengine"
 
 BDEPEND="
 	dev-util/intltool
@@ -22,7 +22,6 @@ BDEPEND="
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-apps/kaccounts-integration-${PVCUT}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -30,8 +29,18 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kpackage-${KFMIN}:5
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
 	net-libs/signon-oauth2
 	net-libs/signon-ui
 "
+
+PATCHES=( "${FILESDIR}/${PN}-20.12.3-qtwebengine-optional.patch" ) # bug 753274
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kaccounts-providers/metadata.xml b/kde-apps/kaccounts-providers/metadata.xml
index 2fdbf33d963d..915d461d6529 100644
--- a/kde-apps/kaccounts-providers/metadata.xml
+++ b/kde-apps/kaccounts-providers/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="webengine">Enable Nextcloud KAccounts plugin using <pkg>dev-qt/qtwebengine</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index edb6f0326df0..25078e3b72e0 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
-DIST kaddressbook-20.12.2.tar.xz 3257200 BLAKE2B 8c5c8a31400533d145999b9d574c44d9466854da3480746d435d4d556db603ea4baf52a5563a96972281db9453d7d0212183b018a5b4d7f4fd75def79df0374b SHA512 fd7e8213db1061807b3ad509d92627282d0782af9c528d940a493fecc50c1680b97170d38d00d4b044722a598d4c5717a2561ec25171369f672518d24c99911b
 DIST kaddressbook-20.12.3.tar.xz 3263556 BLAKE2B 711a518d90d207473b4125c74e3a04d34773feef500ea5635247eeafb8050b870e85cc19ebfd18147e4b4318d6052361cef4bfe1afa54a77fb2a3c63ac48673b SHA512 6f8b069222734fd3d42078d1bb2401db8dc4d8697c0383e49c47479b559fd7776b0ae7f7f757e2e767c2a173b1738c7ba8adda928481ac947dbfd404fdaa0434
-EBUILD kaddressbook-20.12.2.ebuild 2042 BLAKE2B c497ea8b798007ab6df6b8e294bfaf98c9bef6bf053601886067520c871df4c797560692be55ce16b59cb6de97929372cb247a207a36d49dc7a96834788ed57f SHA512 6dcf4be47615b8f95af2c5ba9e87c8efeb6a8c26f3e933e3a4a8097f12d76b66a34a512cbd59cd9c6361941f236311ae226e9c61828fb2d4cdd69c9adefee73e
-EBUILD kaddressbook-20.12.3.ebuild 2045 BLAKE2B db08d58d11d4c9b7dbef7d6083ac816cf10196da30f739f52d2d9472a1af07f8ccb1cf08dc4ac9a852ba011e61c258bc29ee40103ed2b30f4c018d945b498ffb SHA512 6d9aac005438eddb26097cd0e1b2e4493a1737c981a60582d636fa42d7b1bb01fab5062eb00dd67bfc79d99106a3b1bac0a6840ec840564f7c738f9bf4d21269
+DIST kaddressbook-21.04.0.tar.xz 3261584 BLAKE2B d7550862c4519e454a7732529d3d2c68f605b0d1abc7c1a0fe57f9984c208d31e6556a5bd1a6b52e12130fe7d69d6172791b222ee0c6140d083e2d9e7fa49c6d SHA512 991a37c19a8fe42479dafd8039da4607c6143a6fa3ca7af37a9ba345171df55dad4c5386ba6bd60168aa17b7c5f48239df8a2f267ec8694dcb0b31d6cd32838f
+EBUILD kaddressbook-20.12.3.ebuild 2010 BLAKE2B 497c853793e97db0ad0677a4e2e33441d64105bdb2bc0cd499c66d0b735896b90c6647cc49c68bda68e0c584d88f031d2ca8a3ae53443178b83058738c4231b3 SHA512 d0985f05ee5e3da10c7ed725ab14d038513288b91c27462bd55c8f93e6b02eb66ec1ade2d42b5ebe351d29ea7236a6c3ff832303d8197e1f9ae678e32eb03526
+EBUILD kaddressbook-21.04.0.ebuild 2013 BLAKE2B de1b0edc7c39d858d9680c6fd98a7e54fc0d0d7e241f0e55fdaef47c092cdd9c56d2059f3960ed75e08aa40f7caf603aec07e49fb6e4c5bbb4b8f03518b15aab SHA512 1add96152f11a56a17e599f2d4d079911e147dd8d89cdc72fdd5db6fa9c4f1dbcaf9a0aad882706571b0a220f290f1b56c63264b1dadb3f168764ddef7187b8b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-20.12.3.ebuild b/kde-apps/kaddressbook/kaddressbook-20.12.3.ebuild
index 2bf21097d8c8..39d33fd5af10 100644
--- a/kde-apps/kaddressbook/kaddressbook-20.12.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-20.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/kaddressbook"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
@@ -68,7 +68,6 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
 	fi
 	ecm_pkg_postinst
diff --git a/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild b/kde-apps/kaddressbook/kaddressbook-21.04.0.ebuild
index c0eb71bdae66..1c414501f591 100644
--- a/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/kaddressbook"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="telemetry"
 
 DEPEND="
@@ -68,7 +68,6 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
 	fi
 	ecm_pkg_postinst
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 2207df3b6038..93542a91f3d3 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
-DIST kajongg-20.08.3.tar.xz 4475032 BLAKE2B 736fea6a3a10131d94b72a5ec5b44160e790ee62884d60524ee80ac26540a116d9b9c0ce5fe63270ba9b4676ed16cd7f0469f6982f11d96412fa68d997aa0ed0 SHA512 b63f989cc166808326c1d3ea33d884f957bb1b33a38f1ab26339b18f6b822239da505c161c956fbde720b3c5f52e2956b910761bb6c6a8cca75e88d140742f30
 DIST kajongg-20.12.3.tar.xz 4471984 BLAKE2B 0101613bada0322e27640135fe103980b5436c34593d2214093adeb8426fbc95a1b7258f027229488daf378a84f44f232ea8ebfb54f39b97b397b06093a85a53 SHA512 6821c06c1eb7aa9f55872234289de9ffe503dbe6183bb208aee104769fe8fa1af4cc2e34448f5902046c576e0823c1724f215a0bc9a3f60ef25b59b81d85ffa6
-EBUILD kajongg-20.08.3.ebuild 1023 BLAKE2B 7a2550dc9fe68009a051db32f397e19ce6b7a067a5eb77954eff014a022ab89da7af169952bad9c29a0ba99ac5c67d7c1c4fd8e1b20f9578ade7da9c2c3507c5 SHA512 f0279e358d59352f0adfd8fc8714a670178aa1b4c35cb880ac120e7b9bd1f873121fd461a3e90a0a48ed95f5733b88b7f14c3dfe4b3ffc848df8646d67e381d2
-EBUILD kajongg-20.12.3.ebuild 1026 BLAKE2B 763bb31f7c079a726eb17845adbf12173018050217bc23f734d50e0c1577af200fd7efe789d0d0ffbc354ee76fb97b6e3a6012b2af0cb6b2850a0a4a7e699df6 SHA512 0e1e1625d26e08051fb70ff8726372ff0201fe0dfdfd1c8195d8afc41f7d7c16c918f9bb8ac7fae85417038a1998c525c88e80dd7cfbe71a0fa2594480ece5a9
+DIST kajongg-21.04.0.tar.xz 4472996 BLAKE2B 6aa58f7c8903d4aa76db2333a8f733080662156287c5fed618df3dd61ca63aea1456b9250c0c608bb4dfbee7bd7cc22eeca43610e7fd39d478d455300536f4ed SHA512 88143faf29323cd6cc7e1789174484e89a44ff6acc5ed0546c768567006c1554b4cd5459c4b9cf82b06be7f7feba33da96084875e9a56a475f887f83cd7f73b0
+EBUILD kajongg-20.12.3.ebuild 1023 BLAKE2B 690ecf31ea683917d2d2d7dd38309498a19a5a3f9858f34d3aa605b135e7c5b146418dc0e138fac122f1feedd226be8448a201d6ed1cee0408818872c132522c SHA512 64ffee829f88a8eda7bd73bc1c1453cbe85135c8bd7d6f2684fe25a0513e997c219665687c4f0c5990cae814d737868775d5d38662489b7513cf31c87812daaa
+EBUILD kajongg-21.04.0.ebuild 1026 BLAKE2B e59e88bfbf8abf48992a2b314eef9128e02c3b693d88298f2e070000a16494c6d9eb877c1dfbf8a71269e6c609170b03b5e5051cd9365a4e5b18ecca0f418c40 SHA512 767b59535726f2d3340552cf78ed3ddaf7538485bf3a140e9c1f8e63a515658db8e5cc85f7516bed686ec42264a59752537f918a128e48936fc6ac0431f3639d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-20.12.3.ebuild b/kde-apps/kajongg/kajongg-20.12.3.ebuild
index 3485f592775c..a31126f08f98 100644
--- a/kde-apps/kajongg/kajongg-20.12.3.ebuild
+++ b/kde-apps/kajongg/kajongg-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kajongg"
 
 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/kajongg/kajongg-20.08.3.ebuild b/kde-apps/kajongg/kajongg-21.04.0.ebuild
index 4b4bf9e2a388..6a88bf751aeb 100644
--- a/kde-apps/kajongg/kajongg-20.08.3.ebuild
+++ b/kde-apps/kajongg/kajongg-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 PYTHON_COMPAT=( python3_{7,8,9} )
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit python-single-r1 ecm kde.org
 
 DESCRIPTION="Classical Mah Jongg for four players"
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kajongg"
 
 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/kalarm/Manifest b/kde-apps/kalarm/Manifest
index e11fe27d985c..f0478b7331b6 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
-DIST kalarm-20.12.2.tar.xz 2080628 BLAKE2B dbb9109f6ed67b08cd57a575cd008bff7eafded5a64a49b13e507f54b0f982a202d9673e958c8a80cebab9df3c19ad6513ee6f8aab9f93791e8d8c7ce7cac614 SHA512 ff3b86679a98aa3da30691989b90bccaa1b400b5d11e6e8c2c730f999d64146c0913c4b321da7fd20a6e409c5200dad2a997036bffcb380957e6ec1b69d7f898
 DIST kalarm-20.12.3.tar.xz 2110400 BLAKE2B e87af2d4ba02f5aede932894811d3b46a316a40625886f52ac98187a48b637bcb10d7b31f35734627a5379d993930b8d9b4e5abd4e07c4e63d80b2a4da350991 SHA512 c0e335e766349f0474a982325db6d8c6e4fc611a5a2e925a0dd4a108be6d4edb25493e88d08ab26cdc9167546cf1810c5898d036f6f9be32f491ff1662becfd1
-EBUILD kalarm-20.12.2.ebuild 2451 BLAKE2B 644260e2b192ffb4c083c725e687ab37b858f2fbceb83c8111c6bcda76e1837d1b61541949e377422a5eb691bb4354ce27882ff9358b498101097b85d229c419 SHA512 c724cf1fb79fc44baabc3c7e83962d2441508e5205b117e09942d4642a05c799372674c507d24a50e3b574f1805452b5e73ea60687cf6b699722ffb2479fb167
-EBUILD kalarm-20.12.3.ebuild 2454 BLAKE2B 405117c92e6bee1aa79b08372c692ad88f9736290d6893659d67f45b3937628ca1e2d938146c42517f13896d147b830de11090c1f9a2727fbd0a8f4290b52597 SHA512 099605278843edced28c9bebcc5ce216baf0a350f4cf27618e743101c3f811a415bd7f82089baea19d9344c8f578b474ea6a708b0e3ef04030768de55703fa25
+DIST kalarm-21.04.0.tar.xz 2074536 BLAKE2B 130bb59c9edb1ea62b7a7bfd16202ad075c10b6f60f7edbfcc753b677dcc82ba0fc1fccb558d8a9be48226985947d4b7dc8014b62029df36518ffc95707b9a31 SHA512 8d6212d62ec3e88aac4398ca9015ac5818a777e092eaf51dde9db9cfbdbfecb5dbb6c884c94a1ad7e46a8425559b0f7c215ab2062d57fe2d4a25ad0017ebeee2
+EBUILD kalarm-20.12.3.ebuild 2451 BLAKE2B 644260e2b192ffb4c083c725e687ab37b858f2fbceb83c8111c6bcda76e1837d1b61541949e377422a5eb691bb4354ce27882ff9358b498101097b85d229c419 SHA512 c724cf1fb79fc44baabc3c7e83962d2441508e5205b117e09942d4642a05c799372674c507d24a50e3b574f1805452b5e73ea60687cf6b699722ffb2479fb167
+EBUILD kalarm-21.04.0.ebuild 2417 BLAKE2B f300cbfa22c1b6898fee1e747b6ff312ab59b7294b59640e387406c2f335263b28e708dd536914c6213383efffa2044bfcb942311991b8e6c4a28fa0e747fd8b SHA512 39b21b7869a8397ca59032ec27940eb51585f278e77a0176fa47d105f7050c20fdb16178eb5e435ea8b3881d18d18bd8676497ead59ed260e61a8377948f7563
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-20.12.3.ebuild b/kde-apps/kalarm/kalarm-20.12.3.ebuild
index 2e220c77ac31..b5da90eae87f 100644
--- a/kde-apps/kalarm/kalarm-20.12.3.ebuild
+++ b/kde-apps/kalarm/kalarm-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kalarm https://userbase.kde.org/KAlarm"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="X"
 
 BDEPEND="
diff --git a/kde-apps/kalarm/kalarm-20.12.2.ebuild b/kde-apps/kalarm/kalarm-21.04.0.ebuild
index b5da90eae87f..1e3ee6eb83f5 100644
--- a/kde-apps/kalarm/kalarm-20.12.2.ebuild
+++ b/kde-apps/kalarm/kalarm-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,12 +14,9 @@ HOMEPAGE="https://apps.kde.org/en/kalarm https://userbase.kde.org/KAlarm"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
-BDEPEND="
-	dev-libs/libxslt
-"
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -36,7 +33,6 @@ DEPEND="
 	>=kde-apps/kmime-${PVCUT}:5
 	>=kde-apps/kontactinterface-${PVCUT}:5
 	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
 	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/kauth-${KFMIN}:5
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
@@ -74,6 +70,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 "
+BDEPEND="dev-libs/libxslt"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 864dd87338c6..67305d405317 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
-DIST kalarmcal-20.12.2.tar.xz 576636 BLAKE2B 0b0eae2df5bb31d285c0c484133e233f1b1b42b34c99bd45fea5886e550f1f1669799f0f0661b133a183990fb7477ab017f0baba4946ddf3b63850ceaca80600 SHA512 af5522ff68bda3f6443aa3049f2826d85567fec77adf72721c79f4a1767272ae8181e663e1b904b7c49953630185df37f4b50999a961f964caa65911653038ba
 DIST kalarmcal-20.12.3.tar.xz 576680 BLAKE2B 7ddc5fe35c68ca4601dd361a26d7b324b467353d56757712d909a8f8c424711a7189abfb15e9565a2adcde08fa9aadb6ecb59016d1c65d2ba9e98f3fbc19951f SHA512 97391ff398c404051ab2001811cdf317720e8d68100d6e654b8ff416c2f4d49cff8ef3ef65c5476e4990749ab92356c767310637d876e1a0cadc6bcd923f33b4
-EBUILD kalarmcal-20.12.2.ebuild 766 BLAKE2B 94e92106e1dc6638bdf94bac4f559fdae7bfb7ad2315c84018e7722f777978b32ea33785cbc8a8be8be70c510e80fb17a39f1eabb7ba071f548acb417d52fff6 SHA512 648ff277149868b9adb515eb9327d5794ae59c23cccd48a02305e09138cd3ce7b309399d65f36c1927038bc75d0c23df69ddf54cd33b8a44c8dbc7d0900f39d9
-EBUILD kalarmcal-20.12.3.ebuild 769 BLAKE2B 090e136aa449f07c1250227ce3881d1aaf520cad6dda52bb73e82077d69271efbf87baeefe64eda65b3d1ffe564ec887d778e9104044d119e68879f646a79a79 SHA512 767b9fe1e15423959fda52193e35fca77a24fae656c397718ef070c9e23a432502686eedb5eab7b656aa5a700cce1ee9d169b69abf167a37c731763b98daceed
+DIST kalarmcal-21.04.0.tar.xz 579956 BLAKE2B 70bde399ba03ba8ad96bccc450ae8546ac5eedc763f3bf7d4cfb1603d1f9c50c888687915b0064ff84ad3c0538ae8ac8d4c0c6224c103f9e6876c87aece14c90 SHA512 2edf1f7f662826c5700f0f0326c152ff21b78fbd3e364618cfa5fff54e014825d360bc4fdaffb95b1ed71d0fcdaa12107eac1b40d81cec225b44eda7ae785f11
+EBUILD kalarmcal-20.12.3.ebuild 766 BLAKE2B 94e92106e1dc6638bdf94bac4f559fdae7bfb7ad2315c84018e7722f777978b32ea33785cbc8a8be8be70c510e80fb17a39f1eabb7ba071f548acb417d52fff6 SHA512 648ff277149868b9adb515eb9327d5794ae59c23cccd48a02305e09138cd3ce7b309399d65f36c1927038bc75d0c23df69ddf54cd33b8a44c8dbc7d0900f39d9
+EBUILD kalarmcal-21.04.0.ebuild 769 BLAKE2B 248699e95012deb3747400d5b6ca60d5faf9e4ca866dce1d23f1e3b4bde084629fb27e20229ff3ba468f92d57a80da436e420840d3a32d71426cb87100a1a839 SHA512 301693d3909986e774bc686b0505439b4d296a955efbecacc00700a1b5c7c0510b0919f2535970f1bc010d451ceed913f275f122890ba1ba9c846792e9bf287e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-20.12.3.ebuild b/kde-apps/kalarmcal/kalarmcal-20.12.3.ebuild
index 1ad9db797272..01b92b99042d 100644
--- a/kde-apps/kalarmcal/kalarmcal-20.12.3.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild b/kde-apps/kalarmcal/kalarmcal-21.04.0.ebuild
index 01b92b99042d..676913358689 100644
--- a/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -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 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index e7211cc01530..66a829a8fd2c 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
-DIST kalgebra-20.08.3.tar.xz 1164344 BLAKE2B d5019283db8a8b5bf3d12641c581eff5388107ff428dc14f1483d77401aff4b6471c05a9ddbbeced2d1fb2c8f2a941b1cfc42a85c18ff49a56f4fdd770ba7808 SHA512 fce406cba3546ca58e03172558352d035b65ab35ecd22811644839daad6bd6b2f85635e1cca2c99472cfe74d96e3e95c4b1dee62fa3d53512057867ac37f3134
 DIST kalgebra-20.12.3.tar.xz 1024612 BLAKE2B 0a3a5ce9b91dea0997f7ce8ceb7cfd28d8b5267fce8ea2e321c50b67b66d3230191502058506071621b2c574491256b8824d53986182e67982f4221919a61537 SHA512 75cc1a85253103768486de84526fb3902fe8a269320af0259bdb0c2dc732062a2928b05c8871a74dc0d0563db57fa5d0304e7c0702c928b29d6a40c99a3b9d30
-EBUILD kalgebra-20.08.3.ebuild 1139 BLAKE2B 5ee81fbcbb8e657e3047b6e0a886e7f159e857b331347e8de10008624d445eb0aafde1663c5a8cc9a4818af4928921c47004128c5afb9436875552581f7e21d4 SHA512 78109f638c88f358265f566f080a64421ea7143fd048d482b22ef32fce290305df794ac1569a0630e4178c5f48c0c4746db2fd2d0938df96fe7abf8a9f3ea2fd
-EBUILD kalgebra-20.12.3.ebuild 1142 BLAKE2B d705fcb62704ad8b884a23d83c168f99238ff1907aaa8f9c4acd55ba1b06d5e419d2c75c5f0b75ab8fa75a2823404512081703ee6ba4e73c73d6b32db1433435 SHA512 6905b92d1c9c1132064b8ade6bf771aa6e4dfe5dae038bea64b68c10f30b8739e607c52f664611e7efade6a51a6fcf6797a4a3745702174d5e18296740f034b7
+DIST kalgebra-21.04.0.tar.xz 1021892 BLAKE2B b82edd0a4ced6c1fe9097a835659fdbb448dd35cb3d1a4963c28cc15c61b24fc9ce5cc7f7af847f0a07053fc19a25cc934d1138736bac605556cde63cdfa7c69 SHA512 5e2f6bba4c8b1dc44ada2d4d93add7366376747b1c60d5f10696e36e2af4c14b27eacc68f3a13da63e885ad862e36a92b179109a423007763a6b2908d6b4d7f2
+EBUILD kalgebra-20.12.3.ebuild 1139 BLAKE2B e129fbf0930d697a7d1ff42126d3f6f35586a2855d43d825f174ac233592ce18742293358a6b7426e1627168b23d1bc787a5a97cd67f0f8544614f45a10045a2 SHA512 f6c89c2cca307e4e7cd4f8459750fb3ad638cb8640cb6893a7abdcecfa4bbc7afea340b87b07c515daca148c9a3943fdcf5a62b9a5d41b88eeb738963bb93339
+EBUILD kalgebra-21.04.0.ebuild 1180 BLAKE2B 8ffe7801ad1a6aef7abbfd3cc4a029857b0827a0f26896101dd91104673d2dabc7453f470cb123e556706cd3619c1e99a18b79fb968516ccd12583e62382f5ef SHA512 ec7bdf2cd23bee03f5b7c66a8e5cdb35c2557452c75a04cc74b8dea1dfa17206523408f370073d722e706086ce34fe3f7b0e49de4c6f41ddc91e23aa953b2644
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-20.12.3.ebuild b/kde-apps/kalgebra/kalgebra-20.12.3.ebuild
index 85d8d730e234..92be21243842 100644
--- a/kde-apps/kalgebra/kalgebra-20.12.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/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-20.08.3.ebuild b/kde-apps/kalgebra/kalgebra-21.04.0.ebuild
index eea999dba62b..48a4b4f92bf3 100644
--- a/kde-apps/kalgebra/kalgebra-20.08.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-21.04.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="MathML-based 2D and 3D graph calculator by KDE"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kalgebra https://edu.kde.org/kalgebra/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="readline"
 
 DEPEND="
@@ -35,6 +35,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
 
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 8f1e5c797dea..52e0c615fd28 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,6 @@
-DIST kalzium-20.08.3.tar.xz 24524836 BLAKE2B 5e039f685890ce647cfabd1f320f34f51677809c33e012d9de8c10c461726e50f119856b4a32e333cc971f64255c2b112b96a79a468786610e0a9059ac34de88 SHA512 d755c601c5478901be24368da9bcd22ffd8df932bcc08a22a3919fe853a012ef300ae142fc3512af4b6615dcdd02263df300acc3afa66922b64a6ae41ebbcd2f
+AUX kalzium-21.03.90-cmake.patch 815 BLAKE2B ba13821a0d50f1120e37d73b30d13b7597a67342b74c710155429b3880bddaafcef665f44acbc93d63dc7ed894b5b906a906bfef7a0a587554cea278c4c41553 SHA512 3b188578152cc399b13062afceb6e5a0e006f5e42810c09dec45ee7d8388a4177a98a076fe7789d1aeba49236e70f861f6a9af6907a5c06db3405db383cf83c9
 DIST kalzium-20.12.3.tar.xz 24521912 BLAKE2B 23b1f1aa9948428789e46469c19e6bb9ebfa9841db29b4f8b89254e6cf973b213d49e9abda07fc9ee34a7a661d4ee2849491e0e6ade1e3fc0e544f7ba477e45b SHA512 09e3d588dd0ebcdac0b7c473f5bf7f240516a12797240a36efb1e764968c3953373c04e589ee84ff92b23df97e8d367a155b980175dc8ad01a2551a9d5d1f046
-EBUILD kalzium-20.08.3.ebuild 1708 BLAKE2B c971efde3ccddc4d282acd81258a9173dd6fbf68238b79c7f22171a485ab1707c28986355e4c874d9b84728d0586ec747dfaccc08b5b569413f6bfcd7dd79b42 SHA512 e0eb830d4cd6a1c57b0ab3653b95ae7a3e72a6a997d38faa24ce15ec682a3bfdf46acee74638a645f1bce2b2f8c8eb4c3e9c98713b23f046eac3182325ef2f36
-EBUILD kalzium-20.12.3.ebuild 1711 BLAKE2B 6975f4521c96fb93f1ace5377563551ca591bc1f0036105229547eff700a8aba6e6b70a7f13c744ff01acb645f0cc5fd69696d22318138cb2c1c33b439e5e04e SHA512 3ad71ff4727d244b94a819b70c78849d38b0bd35c52120613637921a4dcfd15d8f95798c7ebba74d4ae3c98d828ed25477f81b985895f22ef6701121d90edf37
+DIST kalzium-21.04.0.tar.xz 24544292 BLAKE2B a45ca661eac391c628030e30b45e96beebb5e4fc063c1c0f3103c7ba009ce176a8afde9c898ac6301d5f221b51493f0bb6df4f67184bf815bea3c72d9d81ffee SHA512 cc319f212b5284b7889fa5af85c3c0976ba9ed93d8224f2845ff2f1b64df63040f51ddbaf877c0d66ca33988832f5506fcfef8d598b121981612306ea12d6f3c
+EBUILD kalzium-20.12.3.ebuild 1708 BLAKE2B 2344c4303f4d37297c7c24427934c190f10ed1290819f592b857214b0545202d56c5e04d67b1a6c3fabd57a20c0ccc7259fe0b520a18611fa6d9047aa911bb4c SHA512 4ece25564b52a01334ea74d44ddc0fae6b9c42e1f766530f59558bff86e814e1c499d590a5c0b303f67c3a90dedd9db175286a7a297b9b1eac612b7e2929f17b
+EBUILD kalzium-21.04.0.ebuild 1837 BLAKE2B 7f1959e3252cc7c93f151e0a89989a8971a4f9171e0ca5d08430b58c30b11906b6b86c3dcea7d0d855b7ef4a8ec5b58508119772e9f0a87f169203eff3646c73 SHA512 51f33071a26b0ed49e97ec5638108f8b81c058b67f7a9a850ee70ca8c72ffe25cde6b14cca4508e6c226a6b03723cab860e13b6a4c03c28840f9e40cf15da136
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch b/kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch
new file mode 100644
index 000000000000..4339fbf0ce1c
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch
@@ -0,0 +1,28 @@
+From 137a209512e632ccc7b297355a6b54301657c9ff Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 12 Apr 2021 00:02:48 +0200
+Subject: [PATCH] Drop brackets around OpenBabel3_FOUND
+
+It breaks when cmake is run with -DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON.
+
+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 abc8120b..a370e5da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,7 +27,7 @@ find_package(Gettext REQUIRED)
+ find_package(PythonInterp REQUIRED)
+ find_package(PkgConfig)
+ find_package(OpenBabel3 3.1)
+-if(NOT ${OpenBabel3_FOUND})
++if(NOT OpenBabel3_FOUND)
+     find_package(OpenBabel2)
+ endif()
+ find_package(AvogadroLibs)
+-- 
+2.31.1
+
diff --git a/kde-apps/kalzium/kalzium-20.12.3.ebuild b/kde-apps/kalzium/kalzium-20.12.3.ebuild
index 94f0f019d72c..1f0afd8ff6d6 100644
--- a/kde-apps/kalzium/kalzium-20.12.3.ebuild
+++ b/kde-apps/kalzium/kalzium-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/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-20.08.3.ebuild b/kde-apps/kalzium/kalzium-21.04.0.ebuild
index bac5f26501d5..18bc4df102d0 100644
--- a/kde-apps/kalzium/kalzium-20.08.3.ebuild
+++ b/kde-apps/kalzium/kalzium-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org flag-o-matic
 
 DESCRIPTION="Periodic table of the elements"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/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="
@@ -39,7 +39,7 @@ DEPEND="
 		dev-cpp/eigen:3
 		>=dev-qt/qtopengl-${QTMIN}:5
 		>=kde-frameworks/knewstuff-${KFMIN}:5
-		sci-chemistry/openbabel
+		sci-chemistry/openbabel:=
 		>=sci-libs/avogadrolibs-1.93[qt5]
 	)
 	solver? ( dev-ml/facile[ocamlopt] )
@@ -48,11 +48,14 @@ RDEPEND="${DEPEND}
 	sci-chemistry/chemical-mime-data
 "
 
+PATCHES=( "${FILESDIR}/${PN}-21.03.90-cmake.patch" )
+
 src_configure(){
 	# Fix missing finite()
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
 
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON # TODO: not packaged yet
 		$(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 e095e33097a8..aa64ddc10163 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
-DIST kamera-20.08.3.tar.xz 108748 BLAKE2B 5a402fc999e43940840972c743ff1a80a03f0fbd6bbf19682ca00403e673b4768de03350ee71397e95dc23251abfab80f8ade320c9388aee8e755ae7963975c2 SHA512 9f66deb0cc9a6025412135e5785927b00a1a7f029d7261bf006d1ff0b80a955f03a40889d68c16e8dcb7a8a05e8346623d594e5b1625958b667b364917ceda93
 DIST kamera-20.12.3.tar.xz 108696 BLAKE2B f449aa46ca076d03db9bdd60147702cd56ca3a0d47f9ef510198ea6f87d33ed04a6cd473d29e6060c3b34904239a189fedc12bc51322651e6e022e5f3c7c3ba4 SHA512 7abe0ae6e85e270084e608b85fa5982c3b67ebf16a81b9ed3e9690dbf860abbbc8ca1feb885e3cd7dd93faa91622757c16848a26baa4f68f128cc119fe91bd2c
-EBUILD kamera-20.08.3.ebuild 792 BLAKE2B 1c7e8c10ab5316940d3d4e854d8a8baf71bdbb37ca785a6f05034bd3353e5e115a4fe87dafb9ad465470dd043491d99eedf95d515fce8d7fb07c40f8e3ba45ec SHA512 8a8864154415c5a772dcc0d0b37f9882086eb01e70518ecfabce1332473abb79851d6c0e3b50871689be726f9d664f234db6f0e41b324954080bc32042f57ad5
-EBUILD kamera-20.12.3.ebuild 795 BLAKE2B 31cdf2686789c758e85634bbe948ec50042ee68b8ee8956e745527b317534b7e8e345a639e8df9462cbd11a0ef7bbbcf753f65c57abef09a65e1a03193b8aecc SHA512 b653d15212660e30686d42ecc92a35e9ef5b760bd81b3bb54c2ab9477b7b79421224662aadccb766b633877cc5736eaab1b149948ca7a1fdcc231015a860c502
+DIST kamera-21.04.0.tar.xz 109824 BLAKE2B 505bc711869ef218bd32520c702e004a3edc47c50c6362044ceca900380e36edd06ad98f5a0efba340e666845892040c86b9e98c1238a46d1c23b6fbfd071cae SHA512 951543ed0dff35de5a4066552b57f5a84e2200290f65de452fe12c48483acb26bf58785eec983089aedb7a73cc0d4313f5224c0eb179f6530e72ddd33967a259
+EBUILD kamera-20.12.3.ebuild 792 BLAKE2B c411436d1e4bd8cf3f6dfbb353f6a87d038606351c5981d314b440bb26391df243732c58a244d44661c256b92c9784815087d95283c0410d441e4e3e315577b3 SHA512 ba6bde88d7794314188df478bd064787b9e83bce4ce43b97073eea992f21c3f946696c97c574eb84ebf2c2ff2f8591f97465f997ec1664211d8ea5fc0a32e3ba
+EBUILD kamera-21.04.0.ebuild 795 BLAKE2B 111435f3b0cc11e8f689ebeb2011df03e006bc94bd516879973d83f12b64a9d8eedb5dc47b789bef93931d07197c6b55f56938a170e64cf858287023ee656074 SHA512 f2d5b857b6f448eb1cb8bcd2472a8dcdb684f38e223336744d83df5cb4983fea1e7f5187f4dab79d46d3928a1a192b850eadec18ca86d34523a9c9b3b252145b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-20.12.3.ebuild b/kde-apps/kamera/kamera-20.12.3.ebuild
index bc631f33d4e8..2b80cc01f55b 100644
--- a/kde-apps/kamera/kamera-20.12.3.ebuild
+++ b/kde-apps/kamera/kamera-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kamera"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kamera/kamera-20.08.3.ebuild b/kde-apps/kamera/kamera-21.04.0.ebuild
index ca31fcb6d60a..6236a6bd2dba 100644
--- a/kde-apps/kamera/kamera-20.08.3.ebuild
+++ b/kde-apps/kamera/kamera-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Plasma integration for gphoto2 cameras"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kamera"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index 733bcbf70a62..19751e5f9da3 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,5 +1,5 @@
-DIST kamoso-20.08.3.tar.xz 212588 BLAKE2B 4db6d759092d4cdf7b4ddf6e2ec4eca2417bc253da7ee5d5067a3a6a3bb14c364f0c404b592f5a51fee4090d2aa5075e5899acb89d1437ff20906a69d59cbffc SHA512 da978695dd9242e7ec5aba7d411ff532e209882815bc0bdfd75e2a954884498fd40380fea3099ce5435d1fec98c9bb75f1360dfa2eedf30c4c12c9457acf627e
 DIST kamoso-20.12.3.tar.xz 211540 BLAKE2B 2f4b9c8ed3a5f6110769ad30fbb380cafde4381802cd38678f70896d2c1f23902577442cb018c06d15e215dcdbec0b62e2a785ac2bcd1f72dc14d1a29f5ab0cf SHA512 9542452b52c7fb574ca00ce32b2fb836f3da211702ec2cea7c2f7cf735cf0eef7f5f80528e0312bff54c88c9e11bf52d73a54c14b933768a2394a2cc756b496b
-EBUILD kamoso-20.08.3.ebuild 1092 BLAKE2B 100a74d7e1bfed76272c8af696d3ce2cd7aee8e5b07014e5fefe7ce9b36ffaea4a97e1587bf3c8d83ba13b2a3538e9c738bd42393dc3c3a3854bb02f58e0ae90 SHA512 3013df2cbde9cc6c91c8db5dce9c9d510e4d948cd0e0e117915a7b0480b8762392979687c8753ac7959f60c684b7b9b1ffaa38acd94337b8c6d7e31ca182ad02
-EBUILD kamoso-20.12.3.ebuild 1095 BLAKE2B ed118cbd5478562287509cdac86b9a0887b2f65edb8a5632ea14b27daed961ab0dca30be6edb8eb63cbeec070a1489621f9d56aacbef34d605e5405e05233f46 SHA512 8d88fc8f37322f2b07412b5bcc59c02933ba402c1f0ea3b9f3ee675fbf2c295238af292d9393c3556e27cd598896ba488e332e62304be705989514655ae61990
+DIST kamoso-21.04.0.tar.xz 211956 BLAKE2B 133343415c6d169b856c3cc117233b0fda2650053f69ff03f93a4f097b2d7638dcb13b1384e089ca33b20ff562a44dcfc1741ddedf068b713c2177e4d53e40de SHA512 713c38090fbf2a541897e048147aea04ba6f63f55ec56fa14b131a77dedc1bf83bea80cf90ea66ad032af11431d6e1b6761e2674911d468cf4c91eb60e304cf1
+EBUILD kamoso-20.12.3.ebuild 1092 BLAKE2B 81258604e6d7152606f3ab87d466588a8f5639bc6d494124c4c7e40a004b2412b90650291686fc9d14e9c2c914bb5e12c7ee5555b60a6622890a316b825d9cde SHA512 b2531606f0b0f3202cee2f93d4fabc15e5f966aa6f70d4743e6f28a0e5c3a89a4bf99bebeab4bdad1f2934488944904c86233090b069b62bf0f7bf0012476591
+EBUILD kamoso-21.04.0.ebuild 1095 BLAKE2B af59039ba29f14eaf4f56f9a687c1397d9a10ae004ba31b24166405a65f5c13c729348ea5a18b5d3452f31b01382bc343ee47d294407c244c4f2e3b89b13a427 SHA512 cf0a476a275e5f4cd718ed7f5161a8e26a9cef8365323647a28f7e66c4465ec1a955b5ad0e9790b681d6c862197bcbd90433a6a556dc2b001d4cb38f9e61d1ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamoso/kamoso-20.12.3.ebuild b/kde-apps/kamoso/kamoso-20.12.3.ebuild
index 7d4f6a7c8efc..ec41bf8203a3 100644
--- a/kde-apps/kamoso/kamoso-20.12.3.ebuild
+++ b/kde-apps/kamoso/kamoso-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kamoso https://userbase.kde.org/Kamoso"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kamoso/kamoso-20.08.3.ebuild b/kde-apps/kamoso/kamoso-21.04.0.ebuild
index e3ccaf8829c8..cad252bb04f1 100644
--- a/kde-apps/kamoso/kamoso-20.08.3.ebuild
+++ b/kde-apps/kamoso/kamoso-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kamoso https://userbase.kde.org/Kamoso"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index c035256f8615..b4f3fe7a1e91 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
-DIST kanagram-20.08.3.tar.xz 8030604 BLAKE2B ccf88417f2404104e90722000245d883502e849cc72550947f7b4e2db4d736453c6f66c4bd8a135cf84710190f10d171fc5c1e08f3a958e08bd4e82582e39251 SHA512 b6d679493f30a4a0accd7ea6b8482b8055b23af7ce5af623e1f95d058a35e0b66164b9fe44347750246910116144ee963da124d06064585dd262bcf0be18ae4b
 DIST kanagram-20.12.3.tar.xz 8028804 BLAKE2B 980219011d912a3acca1356edc6d8cfea3d17967eeb9c5272c70da7896ee011cbd98e82a537b98d1f4d4eca121096aafa2178ee217ab5b594e9f6c042aa1a4c5 SHA512 2e101bc3430ab563c4b7c7f68d60560c60484c11c9e3243d6b7ca872fd4042e339165fcc8533a755c0c161098bef8a66c15afbae88a375a73f62293bddc54c26
-EBUILD kanagram-20.08.3.ebuild 1267 BLAKE2B fa50c888c637ccc1d044bca8c16816621a5571f48c7f526c85b0abff7233de2e0f10eed7d2f813be4f172eb029a44c61856476e4f8e7bec5677990621f4e7aa7 SHA512 d9423462db197359e045447d5beac57993a1db1c7f7e0698f2482389ee297c8aa63383f7fbce419445a491c5faf3e87f9b82d737ba64382193f88e59a2eb218b
-EBUILD kanagram-20.12.3.ebuild 1228 BLAKE2B 0721a7539998b297e17f680f0ecdd13fd11aa8575a200327ae64927bea386dd54782c2917d61fed63509ea0a0e5e6b9eb1845876e2a116216f5b26d07a309721 SHA512 ac4c19eba16f0c80685278900fb4595161f63a83503982b24c32a246007ea45be38ad9a91e4712d6d823567c95ae9dc0eaafee07b69c46cb249ff6fc68358e06
+DIST kanagram-21.04.0.tar.xz 8033760 BLAKE2B f467e94995a5c6e7b1e51eb14f15b75e9044d4cd248694d29c70627887ef4bb714c5091ede838681bde3fba7e3cfb7f312bdec14eb86e6d1a2767aa42cd860ff SHA512 06fb68dd6cc5b93595007ae0f62bc854da55330e375d9073adf07ce793b614dbce2bbe9d4b292bd886f613c3becebe1bb4174888990c9d7b10721ec8fd328aae
+EBUILD kanagram-20.12.3.ebuild 1225 BLAKE2B 607d8555a66b38217ab3cd3939614b8cb90e9a994654f1b0d504c11f6076ad7b03b9603beae78d756c74df5f3f08ebb19429a0cd5d0353359b83d96ffdf88283 SHA512 ec3805a3e160825815974029d00688092087902a9e7949f1c7beb6e78800ac96b473553069732a28aa958a331894306504cbf5cfdd60ea85c68313b897cbcd97
+EBUILD kanagram-21.04.0.ebuild 1228 BLAKE2B 9aa292180d666305343b0d2f136e186188bab1ee603b9f21514f731d70ad0bf2e25aaefba3f2bd1dd2010d32a04b727dd210c471a9f02f6f0982c74d5e89df34 SHA512 634bb3c9e462eb3c377a589ba3c46a17fff439a2ce9205dcabbcb13735fb0566413c46db1aaa7f122521b59733cfc069b6c70423946ee1cf78ca7c111891518c
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-20.12.3.ebuild b/kde-apps/kanagram/kanagram-20.12.3.ebuild
index d98f7b4533b7..4d8f14d30def 100644
--- a/kde-apps/kanagram/kanagram-20.12.3.ebuild
+++ b/kde-apps/kanagram/kanagram-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kanagram https://edu.kde.org/kanagram/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/kanagram/kanagram-20.08.3.ebuild b/kde-apps/kanagram/kanagram-21.04.0.ebuild
index 3f94e16a8e75..6d26dbd34e2e 100644
--- a/kde-apps/kanagram/kanagram-20.08.3.ebuild
+++ b/kde-apps/kanagram/kanagram-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Game based on anagrams of words"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kanagram https://edu.kde.org/kanagram/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="speech"
 
 DEPEND="
@@ -26,7 +26,6 @@ DEPEND="
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index 30a48ed0d8c4..54bbdeac0ec5 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
-DIST kapman-20.08.3.tar.xz 2531540 BLAKE2B c1e263a52d5602d77069aa81432dbbe7ab34633f84ec6d826fd9a5f2cfd880a9c7c7ba83ddfef6dfcf8df9d405110ae07ef7e6593310e23cd3e6a014a0007c78 SHA512 6e6dc6d0a5f534c43dd9977d57acf53d9bfd481e8a863b303d508a3c4d99a9f6466c89c3d205bb1895e52bc38d8c741d0be98061b4ce508b930cc5daf4365e1c
 DIST kapman-20.12.3.tar.xz 2531568 BLAKE2B 9f853146aebf46ecfab0f518d0078385e6233512a221f42cddeb45f903e1cb82f2d8beac9f122ac0ecbf522243720c1f0dcc694b47bceb4b50c044dbfffb3c2f SHA512 cbfd2424a714695b643103300d693de987fb2b893910a9028806b8e18bf2b8841610fe816344821dc9847796af201d6732c86ae0add53e32fab0ade5bfe1be5f
-EBUILD kapman-20.08.3.ebuild 856 BLAKE2B 0cff6feae0091e62f65808b043570a1083802a04d29ba3565ab1dc768467e6740b1f6da6893dc2dd822be95eb89ea1b76d5ac453f7bcf6b0f1c13e0a516d2d84 SHA512 f8e56ef23f208241fd8edbd783604baadd32b3d023df08e122e6f3d907b8b5e09178b3da5f9b60b2e260042d30f80fadb2aca42efaf19831eb59ac1f2e94106e
-EBUILD kapman-20.12.3.ebuild 859 BLAKE2B c0afda87b6919ad103f5160b7fb447effdb4ff76e2182bc6d197a6caff2c9b823b1db3d3c7cc6c51fb507c2393b16c8fd3ed9b197dc5e53244b684feb78b9f02 SHA512 93e347ca1be340b0a5348e3efca01b8868eb1d3fef801f91beaa5aa7743e8b62ceb9ee23e7bc0578299b32c311a84c06b831246f543c24be3edadca0009a150d
+DIST kapman-21.04.0.tar.xz 2531396 BLAKE2B c75b757b7485c25f37f97c0fe94dd52f6243f14110b429d5a5c88fe4669c44ce5654171b2fc35eb366174562be7c1ff47be584dc9ef88d482b2172d8f5cc658d SHA512 e0d47fb40bbb04e90eea421c40d2ad8d0c1d04485276e00767e2ed3f083951f38ea18d13611f666bd001a8eb434ce51c1f10eb51f954af6e59e69b1c39d92a09
+EBUILD kapman-20.12.3.ebuild 856 BLAKE2B e33491815f9ffe315384f5b6f30c2ff16135a18568382cb1bc45deae6815d0eab4ef03081ebcd12ba8b9d4419813e368d269191569fdff6c5cd350acf0216041 SHA512 a43c9f617d73fb5f9ccdab77d9423d92ab8afc54342e6839e194fb0385446fe1c86de71bec6ff0f529b13366ae24570addcd697c925ae7540ca14f1d587f8ab6
+EBUILD kapman-21.04.0.ebuild 859 BLAKE2B 13aaa1a1255b94aed858f5d68a3333b6791710fba8d232d11c509f98fda9b814c0ea89a1a58e7c4935a2e3e78dc45caff6fa13428ef77f06b50ca8d2a3e44a10 SHA512 6dd17f6e3bdbbcf8642d1f61abb24da08782865438ec5335f53738b824da3081df68caba701db0e7ec4d13e625e0d312610fc2ae72331ce8facac95d7b81dde4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-20.12.3.ebuild b/kde-apps/kapman/kapman-20.12.3.ebuild
index b6b808b1503d..247bb2d554ec 100644
--- a/kde-apps/kapman/kapman-20.12.3.ebuild
+++ b/kde-apps/kapman/kapman-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kapman"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapman/kapman-20.08.3.ebuild b/kde-apps/kapman/kapman-21.04.0.ebuild
index 08ef4fddd52a..dfd8cccc8a58 100644
--- a/kde-apps/kapman/kapman-20.08.3.ebuild
+++ b/kde-apps/kapman/kapman-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Pac-Man clone by KDE"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kapman"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index 12456c4eeffb..5db8c3815d22 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
-DIST kapptemplate-20.08.3.tar.xz 335632 BLAKE2B a177522814ba5dc726a980592433443d6e17f1afec3901d0ea95e2045c902c7104ba256ab8cc35167dab2520a5cfb48c510401d0670a32eb7da30b8fed31cf90 SHA512 3d13a73d80e31c50d6a4d9ffa8e54b86638c6b87f7ba6e10d76114381fd55b8775c8329c0ca6c7647b9a357d3221c58e3e188db3281579648e68064916df4464
 DIST kapptemplate-20.12.3.tar.xz 336772 BLAKE2B d0bd72275519d54c60a1b77f9e65dd9dd692475fd431b84440af11ad06c32683c2fb298315ff687a2286a8d23a601e4df554bd9350e16f11aae379de2100720c SHA512 a767c905b5a517c76940fef529a3add8f839c30bf80e36e3ff4a9319265c20686fa26d0b74fdf85cbd4b530931dce19191a267f0aa3fd426a62dacca9404716b
-EBUILD kapptemplate-20.08.3.ebuild 829 BLAKE2B 63969c3588c1b1ba47126ae86abe7b3705584332f32b2f6e8bd2d8c0c2d69be883066fdb2c4136f26a0c7548082ada6d9acf7d12378ecede05c26e92844097cd SHA512 f3e666e022c7e8eb273632d026fa3ac23e2b515a8b318c6b38722dac4aeaf92a0ddce513c2970275ede284e9b63d3dd66b17f888b95c7b5a5357499b8ee5c388
-EBUILD kapptemplate-20.12.3.ebuild 832 BLAKE2B 87e49f50af5c447a87c07528c20dda32651dccfeaf7f652fa597284fe198aefc579909edcaecad8790e6cd320f5b146e57b9e7657282d2b0902b3650ff1725e3 SHA512 98b1ca053d42a2b639a50b45e553dcdaff5dbb4a406f876d8373b292b4eccc0ba65656bde178b803a05e1ef944190b6de1ba395ab9656f1739d2c851f926b69f
+DIST kapptemplate-21.04.0.tar.xz 333612 BLAKE2B 320d769f24777d0a3ad3c495488c9ad4b76108f0026a408b9729aed894b56c99ca973cc6ff3601fbf9f599710d0181b725c7afad5f05e03b8ab55bb8f51377ca SHA512 43edb09dfebd82f3e3ade059a17a1e95ab3665befeb74828f1b11b2644b75cc559f818003605716d39960ee37f4ab29246483d5ad9e62040b813b03708bb9acf
+EBUILD kapptemplate-20.12.3.ebuild 829 BLAKE2B 6ecceb8523d31a638b1bf60ad14eb08c97e9fb2c504361a3c28d25999e3ea13dc80ddfcb9a689ac7d3103f2725ac4246cabac567bf186e8daa27d8c8c37a52d4 SHA512 6d08fe23d66938d4cb6438482a1d604bf060ef0f4467e1bd20fe3a6bab74293db7ff5369ac4a09192a5935f0bb4c642d430af436ff49448774def7961a0f58fe
+EBUILD kapptemplate-21.04.0.ebuild 832 BLAKE2B fa987ff1f417e18397f6d03f7688fbd14a62a938e8c2ee7d0e5ba7fef8cc1f41cbed8eef9ce4aa195b43ca52f8000fb6156cc43560a1487c6c8f6598ca5d307c SHA512 ea8b1589168a8c9f8a64466a1245dbe6cfa4d5613faeecd1c6e9675eebc8b86dfed654dead1c9a0077fe047ffba978ff7d9203d3eeffc2b0ff5d776211e9cfe8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-20.12.3.ebuild b/kde-apps/kapptemplate/kapptemplate-20.12.3.ebuild
index e35bdf88b467..8e3aaf6d71dc 100644
--- a/kde-apps/kapptemplate/kapptemplate-20.12.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kapptemplate"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/kapptemplate-20.08.3.ebuild b/kde-apps/kapptemplate/kapptemplate-21.04.0.ebuild
index cc8898263346..9127d6d29b5b 100644
--- a/kde-apps/kapptemplate/kapptemplate-20.08.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Shell script to create the necessary framework to develop KDE applications"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kapptemplate"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index f6612b63b32f..b4e2b630399a 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,7 @@
 AUX kate-20.08.3-fix-filetree_model_test.patch 909 BLAKE2B ffa7ea62388751d4d173aaab2b27372fd0e7ded38a7612ff8644906e12c4ae52bf27df22188bf0229b06ee7de08e3ead278e17631a79623350621ca61b4e2a06 SHA512 4d4388bf0cab7db1979f174ba79d5736843a5584e6e6d85cc0751fa8a6e43d8a1baeebe3c3ed463c3ec376a7df7fef79d4e28a1835604cd4120ae576d8f8fd39
-DIST kate-20.08.3.tar.xz 5853216 BLAKE2B 8ad6f14e98e44355731497dd3363dab51e3f1658feadc398ba03629c13acb648f1a84e573bb200040008c0f3226f0ec1b6414a0975cf1ccc2cd1bfcebce1e125 SHA512 bb514f92a65ce7ff4e3552f16a400d10b30703340f779a1318403035900f32b2fd5c1da2ca0714632d49ad35da15e0f7e05a17bc008cd039388e89ab4fac3bd2
+AUX kate-21.04.0-implicit-dep.patch 2160 BLAKE2B e184cbf456f45e15904e17213813c935b548d1fba6cff98b162dcc4619d0ba166ae1db0c726a637c2b41bd95ebfe75d114259b5d7bcceccdf09141532e893d78 SHA512 23d56228dfdbcb419ec6ecc3353659efdc604f0786ce0ddff6dddb63a990a7086a7d6d777e038567fdbf049c14013d77fdd99f1b01022627a235ce597ca05140
 DIST kate-20.12.3.tar.xz 5949012 BLAKE2B e35c4da5426772286abe54156babc0de09fbdf8fb5c7505714637ad427e3a694fd541ca7b17e99ebab22f9a19f2a8893d34098cb625fd0e1c0f0b6b920acd62f SHA512 545ec2a48ea6ec737011602b20ac2f60a0f9db0a5e55e0b232f9fd7c10b7e3f54d2a346be7e6341537758a3f8f94868c4083a6d2d10b572568f5c56c9d3aee9c
-EBUILD kate-20.08.3.ebuild 3153 BLAKE2B 0924bace56f9005e4410e3f480c9e03bc86361c5f749b57c4033e5ab60e0468486b5182f9825ad74317e0dff8d08689966e238876917c1c404b94ecd11dafa06 SHA512 649e1e5f2fed4601abedf7f69849854ab5962ff4b7660ffd71210e68a4736ffe1052f8433e5ac95d8a25781ef33ef21e087d2db68eb0be5a338e62ee5ebbbeb8
-EBUILD kate-20.12.3.ebuild 3165 BLAKE2B 88fc4e8a6800420ba386f64f123e4476f40973ea8c8d234df2c9ee4030143dab553fa0611c4c091ee8bed30368a152121baf88f3c0467f044948a4b76b5bdce8 SHA512 80e43883386acf2726d74ce2277bbd56ccc93e418fec3034918df3314c70a61612051da19e180079d69d2e104a4e5e7c8dd8e724fac8796b6e0f34f293562c01
+DIST kate-21.04.0.tar.xz 6940360 BLAKE2B ab4fdcb46cb9729e70537522387e3ab8fbf9808fd25453e6fd1aea5fa8a9aa67e5fbd44f4b68341b65da998e2412e24500cd009df10df5462ec2be55f137b988 SHA512 bc610758597bb2e800e8797c9c25eb0d227040dc2cf5b6e522dd019839f205b4ef05dcf2801265a4ce2743221054061b3002e31bc5e65470ef056afb96b834d9
+EBUILD kate-20.12.3.ebuild 3130 BLAKE2B 1f7b47493e7b3ca6031b3836ae805e05aac2a699e769a25f183d77254221b65b6f6ee6a88d29b89b713a120a2e1360eb418bb23c4dac6362db8d5de92ba58a16 SHA512 924d02160b20ae71d27824a420ff072e8601e2ff66face985498e75d0a712dfa44a041883907e6f3bb7d76bb55320238389f04a16298c7895927f9f1aeac714d
+EBUILD kate-21.04.0-r1.ebuild 3160 BLAKE2B a175317afd9b6e987d63ba0e7402171126487d9e9e529db0ab18eee56d2e23b48f518ab3136f5f8862f7cca13970a3220a94130996b080f047368d09fee3640e SHA512 dd03011e8693f8ebd26948e74bfb884ff09f0927aee2d2aec7fd45f28e5e4b91354b0decaa18cfcaed27007701672437644ae5d8535d10dbd20c9a425f788195
 MISC metadata.xml 862 BLAKE2B 9b27a2dc759d83a85b1be9a5afc2dedc77caab98255575d493f4af6961d9b5bb19699eb69858082e1bc05dd8ff14f5c0c9212e5e146ff13ec1a3685008fd837d SHA512 d1a90d55277f25dbbad445d8d591da5fa5ddf3bb65aa0ae2d70ba6626abe7deebb56cbcb8a3718c43ad136da2de1b06a017c9740493504b446f33fbeac2734a7
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
new file mode 100644
index 000000000000..482d9a872cd1
--- /dev/null
+++ b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch
@@ -0,0 +1,69 @@
+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-20.12.3.ebuild b/kde-apps/kate/kate-20.12.3.ebuild
index 47bc8aebbfa4..e0bb021ef417 100644
--- a/kde-apps/kate/kate-20.12.3.ebuild
+++ b/kde-apps/kate/kate-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/en/kate"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
 
 # only addons/externaltools depends on kiconthemes, too small for USE
@@ -102,7 +102,6 @@ src_test() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "Markdown text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
 		optfeature "DOT graph file previews" media-gfx/kgraphviewer
 	fi
diff --git a/kde-apps/kate/kate-20.08.3.ebuild b/kde-apps/kate/kate-21.04.0-r1.ebuild
index d6299f186d5f..c453398ad304 100644
--- a/kde-apps/kate/kate-20.08.3.ebuild
+++ b/kde-apps/kate/kate-21.04.0-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
@@ -15,11 +15,12 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/en/kate"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
 
 # only addons/externaltools depends on kiconthemes, too small for USE
 DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -61,9 +62,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-fix-filetree_model_test.patch" # bug 769548
-)
+PATCHES=( "${FILESDIR}/${P}-implicit-dep.patch" ) # bug 785412, master/21.08
 
 src_prepare() {
 	ecm_src_prepare
@@ -102,7 +101,6 @@ src_test() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "Markdown text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
 		optfeature "DOT graph file previews" media-gfx/kgraphviewer
 	fi
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 83c7d072a4dc..b5faed1303b7 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,5 @@
-DIST katomic-20.08.3.tar.xz 1429312 BLAKE2B 1bd037c9d801946604ac9568a720769e157d1a65f2c9e372da6dea8d3e96c8a56a660df0a1af25127cdb04ed3dc1d317a16c57949bf3122de7c273e516228b04 SHA512 6e39c495b8ed55af7e3135132e4c402ddda7d62f70f46b3021f99ef47ba9444522d0adf824113ad0fcc6bf764550e234a9d3ee833a1a11a3c601de982cc5e90b
 DIST katomic-20.12.3.tar.xz 1429264 BLAKE2B 44fc6055ac792f4e7c0c6c8844f38fc5fadbdf3509a80e0f280149906899b32e774efd40cefe3d0df273a98be53b4392ba1daf06a6e6991ba47eb21709efd2d9 SHA512 3b738b702ae41ab3044da158c38ec267d6cf71f73a49973c4f7d31ef0c31c87d38927dbcd6f8a4aae0b723cd969394d6ea61aa5717b3fc50285ee84d56ca26db
-EBUILD katomic-20.08.3.ebuild 870 BLAKE2B e92b51b5b1381aa821b7e5f4ae555cce2c87c0ebf4b2ef2ceca907275a76f6bf2744c0d706996fe5a66e2ab9b50e3e85682a2aeb97e2799c507e5fd1b8ef5fa1 SHA512 2f970854f49dacb531eade115804227a12165a4ba968678d12c6446943feaf7a835b76e5b569d8ddd12ec4a86427fd100d18efdfcaccabb76c3064ba1d569082
-EBUILD katomic-20.12.3.ebuild 873 BLAKE2B 740fc39724da91fa8d69b4585e370b5c39703e75f2d6d7a84a578b39d5cf6e48fd4033384be67f5f6881f7de04b760197548b138f53de9d4e7d9d126043bea95 SHA512 a7e7a0e794fdb3a6e4bc8385d920188d1c0aa322b761e9448184f7324e95ef64dfe328b44d4468c4377cae601ed8e5cf8ad4c3e70428cb834741a0f055c9b847
+DIST katomic-21.04.0.tar.xz 1428692 BLAKE2B 7295edebf6dedeb84c500903d9337b2c178aeb22f8c16a662ca968984ae376226d85d3d0329aa9cf6be7ffc65f34845c6c93fe562b95d07c8f06a04a1af7143a SHA512 d04d55068f89c447ad39b0dc0e2d7a586098e687f580cc98479f75cdae77ad7c835834b365ee86b501dd32ad83e2ca4eb528e42f029ea83758e07c2e9a801853
+EBUILD katomic-20.12.3.ebuild 870 BLAKE2B 6eacfa72bca33b05d9914b6198117b0c95db2b65172c36689c7191ebe36893fc303dac7546dd63812f526f5ef3d973347a64914e69dfea76e7ba24a653aab61f SHA512 fe8f90b724c63658598996e0b33a14c45e3037de0f10c3ce35dcdad67e22e43241a637eff9f5ed384b6d60f9703c36d6cda5510b60d763b661adf542d6b91e0e
+EBUILD katomic-21.04.0.ebuild 873 BLAKE2B 19668b3e0d44ed82cf858017c22baa470c417975b95c9f8624e00e921df85ee6c653b75922a43e194ccaf055c934c5040a4e12c88b66d4090cc9009c894d8a55 SHA512 ced1def6becdba70b87c1d3f85f7e3174a67b3c5a3ee63a87cebc5405c717c9e598c9d0614fc448817ff5cd6651cb3da504ede031d2ef9d23ee131271fa0fe2a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-20.12.3.ebuild b/kde-apps/katomic/katomic-20.12.3.ebuild
index c92897755d0f..597f7875fe38 100644
--- a/kde-apps/katomic/katomic-20.12.3.ebuild
+++ b/kde-apps/katomic/katomic-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/katomic"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/katomic/katomic-20.08.3.ebuild b/kde-apps/katomic/katomic-21.04.0.ebuild
index edf411d9e612..b55049b42b1f 100644
--- a/kde-apps/katomic/katomic-20.08.3.ebuild
+++ b/kde-apps/katomic/katomic-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Atomic Entertainment Game"
@@ -16,7 +16,7 @@ https://games.kde.org/games/katomic"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index 714ce7076637..587b98a2c34d 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,5 +1,5 @@
-DIST kbackup-20.08.3.tar.xz 375188 BLAKE2B da675847bf9021097d06510bb3a79b57c4a9c2db4f44c96effc1e6b162a8d8fafc2788226a8688fddac3af65bc70f673fec8ccdb65520eb28feb137d94005979 SHA512 4154348e567b0ebd4bbaf023a80d3f2506fae0b37f1f51b2bfc31607998e7a1ea51896b2d90a9e719e7452029bf4350ab864a02cc47e5bdbd5b57f557f0f7906
 DIST kbackup-20.12.3.tar.xz 380824 BLAKE2B 2a24a4b44ae7759e82d61497f38420c478a811ce0e6c49b0c217eb389c66e2c4c9c0c8b572f36b07c766d2a627294fe8bcef0a7869eee137a9378c1dceeae469 SHA512 5fab293909eca6b43ed6f29f0c62b81d6ec175f9a002a09bdae960bb933f370533a0709dfce5625865360b6e5b4a85aadc8bfb48f5ae9ca2dcf3f38981aeac37
-EBUILD kbackup-20.08.3.ebuild 932 BLAKE2B cee818393e9a87f1a2c209988b686e7b17cc45fcdf8f607b4e9fd16e0caed5eeaee7d1bd5d0a06593f49b11c57fe942f0e6d06ce1d178ffd21f921ef34783a34 SHA512 6961561557ea34ffb4cade9ddc4e1f362647e60c88f4ab6a6ab391bd2e8934cf87826b5161b36fdd1c36de3c9af623481a12d47a2502188b7d1a12dbb448af62
-EBUILD kbackup-20.12.3.ebuild 935 BLAKE2B cbb4e119ae66bc2f410d1907fe783dd985f100b596ddb2f419712469276db718848f0774b3c8e26624b523c1c67a394135343f4265c325a590892e42b6fc58c1 SHA512 144a69c678bb5a569be5f2b1493c9c5763b5a6f79e211a830962ed8703319b0b26fb052d1fab020594a6f0481fdd43b7fdcbe27975274e72e98924a895fac0d4
+DIST kbackup-21.04.0.tar.xz 383604 BLAKE2B 997fbab6db3bbc754596845c5b71e9e655142d0ba38b34c00868435c71417ea253fb98d89cd1456f940cf8bc4137f557e387dcdd2929672527fd2a9a7806db65 SHA512 f8c0422ea3d29df2dfd74ab274184194457136c2042b798e100b1d9a0f3b7bec958f23c5024ac7455775dce8aaa206ae7238a19fc063e3df5b25e42707eac75b
+EBUILD kbackup-20.12.3.ebuild 932 BLAKE2B 390ed9ab5a14e470af5ec6380eedec86e1dd0560bdefa0ee0ffbbb42edce66ff21ff240e7dc04a7b64377448f2378a082e5ed1c862a4679371234342fa57ac3c SHA512 f39018b9c15d40ab5a09f28178ea4586b7db0a61aca6c7f9a81eafd6bd02842f543cb10265070394ea872136061c8646886f894aa46e498aeda1db33d882cd56
+EBUILD kbackup-21.04.0.ebuild 935 BLAKE2B 979d31270b0b403c986f2c9574dd6776a3d2348973c53416ef71a3f06c46ddafc8498a42347777151540daa5fd494b8a8b5b2f70880c16e4a842f2c800e9d3f5 SHA512 f9941ce4a569f98a1a836c321416a0bd8d495cf150a9420f6e1f5e48b8b7898f829c76b5f973b67a557e02e9062d02f4a12e4c92e531bbfc9d2292433182d30a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbackup/kbackup-20.12.3.ebuild b/kde-apps/kbackup/kbackup-20.12.3.ebuild
index 3516f62df9bf..f8c842bcf301 100644
--- a/kde-apps/kbackup/kbackup-20.12.3.ebuild
+++ b/kde-apps/kbackup/kbackup-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kbackup"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbackup/kbackup-20.08.3.ebuild b/kde-apps/kbackup/kbackup-21.04.0.ebuild
index b840205c6a64..c0236d5353d6 100644
--- a/kde-apps/kbackup/kbackup-20.08.3.ebuild
+++ b/kde-apps/kbackup/kbackup-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Program that lets you back up any directories or files"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kbackup"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index 1a6a3decbece..bc80136d15e0 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
-DIST kblackbox-20.08.3.tar.xz 450388 BLAKE2B b107bf7e82425828685b9ba62f8bb7ede701c4c01e95d172b77f3177d5afdc383e4d5f692e10b0224ac2d2155662f13c1e4d3970b51a57cd83d8fd1c091c86de SHA512 517ca3ef49e84d59dd22c7c6d70100b67e497e474aea92b56ecdb1d7ec4b9c425966625b0ec8039c4f847f4823d15c9b8d9b40ad919831a6bb47910ebfa854c3
 DIST kblackbox-20.12.3.tar.xz 450304 BLAKE2B 9ff8a31b61815ad05ac57834d035aa229d7ecd489a1c78c682940ac9169062a0312af848ff03baf9d52a7ba9499b86f88fd2ed70c69f76079d0aa023aef21e19 SHA512 5e641009fa3482e8e1dac73b01224a66a6ce14c1a4180d011d08b812815919a74c9c9285a5a7aa49ea2567ac744475327eef3311fae505e4cd52400b998b6310
-EBUILD kblackbox-20.08.3.ebuild 993 BLAKE2B 43f1c5413c0024b17f28e91b006fc74a7676d6bf33a8f35256b4d406bd5e0204024ad0f19837dbac6d013dc86d37c3689c6f242740897e13e539b84a5b45bfce SHA512 f441fc867165ac37949a54fb8ff4235f262e6a434fde9dd2ca14fd35077853e038b2b2000cb9a4d0654a6b2bb0e7bc9fa30d77564f08facf8bc2d4a34d5edb52
-EBUILD kblackbox-20.12.3.ebuild 996 BLAKE2B aa5711674a97e7524bdd88c1bdd209b394f9beb04e06d0b770e41d986000ead4f71b6bc2f791d546a8cfec013e20367bd7b2d3071e2b7ed4505b2973ca3ba71a SHA512 157d3f159a1a108fd9d45acc12482a8fa6f0825b41c30869e5ce62203b55db01236e51f61746a57abd48323a1b65a9bf5dd96282a9c94f642c1b16a7f848e2df
+DIST kblackbox-21.04.0.tar.xz 449880 BLAKE2B 3a8cba8389661772b4eda0e518b0bb905406d80bd5facb02d94e3fb4754860fa392b00228706d046de748a5718b46e586335e796bb5239bb2f94c29d0d3251a5 SHA512 6434433bdad882b33c6d8d6861bf81b906f8debe8764836269d3edfb6eb84019c3d740bc969e46340d845309aa7b6f4a9b85fa2063fea66917e4500efd825aa7
+EBUILD kblackbox-20.12.3.ebuild 993 BLAKE2B 8c7828880c4d9dcb150d1c57965b97e3b5d4853ba23726a287183b0cd79d63a081456784c137535890b469cfbb26efe2f7002368a539502dfcdb4bc74fd3b2ac SHA512 4e82fd9de3d064f61f05b1c52aabdef7a859e6f7ee3c7ec23c4e56addc52f6901848a315c9b17bb3e10d37d72c31448ccc7bb0c37862bbc5619e9bb1e372a47a
+EBUILD kblackbox-21.04.0.ebuild 996 BLAKE2B 1d777f4fd0a415fbbdf2a328d923e488e70dbb0110c759b882398d94416f93f6bc8e51839d017058aa3f8d6ab749502bbb1653992826e58f10d997dae7573044 SHA512 d6f8352f6776e8eae515714187250a7f62d83ff640af9e526a61ddee12ab07bd03a40b384caf5d2201f047bd4086e3e6b9bf0f2117f2ca79af5ec751d4f3aeb7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-20.12.3.ebuild b/kde-apps/kblackbox/kblackbox-20.12.3.ebuild
index e041afa38868..c14ce1f3a911 100644
--- a/kde-apps/kblackbox/kblackbox-20.12.3.ebuild
+++ b/kde-apps/kblackbox/kblackbox-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kblackbox"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblackbox/kblackbox-20.08.3.ebuild b/kde-apps/kblackbox/kblackbox-21.04.0.ebuild
index d3ab14bebc4f..623bcf747936 100644
--- a/kde-apps/kblackbox/kblackbox-20.08.3.ebuild
+++ b/kde-apps/kblackbox/kblackbox-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Game of hide and seek played on a grid of boxes"
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kblackbox"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index 6cc979bd22c6..58cf898acd0d 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,5 @@
-DIST kblocks-20.08.3.tar.xz 1907248 BLAKE2B 73267b70909f3f0207d0cfccf4f4291fe7786b8be606bdf53879ce4329ba9746bec24a303dbe65a763e7f2f94c73f7f048800fa4a07aa38170bf0e6b0a79454e SHA512 34c3a877cb1311a015e4328c51bb06f6891751561c9081d17cd578112b2fcfa7f1e94b1bdc5693410e44ce09a9423842c6a43d1a9e97f607071c178b5481f0ed
 DIST kblocks-20.12.3.tar.xz 1908420 BLAKE2B f4b5489b1fba530bba81ac446af949fba242812c5dd1b9dbe24c25f237bccddb858c30c882e5d8659685b3a1745af7f97d24b7014abb34dbdfcc7649310d2096 SHA512 ba5164af1bae348780b4ac284be0a696521671d258a26d0e2d7e401b995077d7b4c01fa0c3df4dbffdd6f79c617907e41b452b067d6d8861ffcbe5b68d5a2690
-EBUILD kblocks-20.08.3.ebuild 834 BLAKE2B 919f2715509eeaee110719b53e9f88b6399eedaefb797dbd32e73e341242f0fa6ce38d722dd1c6963239c9f887456c915285d6cc636ddfbce829c37492d7af07 SHA512 d11007dbaaf917a7bf56f9fd459201efa54387a6896db23f03fdc2636491d29c2201feb3aa118410f55c0c0ca325c79f3137da99ea9cb29a5f70c6d4fc0b8fc3
-EBUILD kblocks-20.12.3.ebuild 837 BLAKE2B f07312ac8fded45f7ed38a4f30cb669681be0904e3f9b209771b310c91e16dc3cdbafad0e18df16e5bdcbf27f14497d1d051a093e320216c1e32eb69504e798b SHA512 84d048016f60edc83e0bf8dfd77277d1fd144236664a263269fe08331de25e0d6d7272b9bdf83f4240e75191ff2322b32767e59004ee85e524d8f820395af1b1
+DIST kblocks-21.04.0.tar.xz 1910768 BLAKE2B 32cdb7f8ec647f3b3a9d64fa21b4021dc8fdb1b117fa7a90d31b9deb3206ea87fb3806c0bebab4a94a5d452cfb4dd080788520311f545db33b11cb54e6180d3b SHA512 0abd5c117244e500b83d9337e2f7b0fb87c4a09803606c5488f27794647f0c5c4aa8d316a0279b076c87640dd57f429e1a1b3a32d12ebc2999dee6fef51cb3a6
+EBUILD kblocks-20.12.3.ebuild 834 BLAKE2B f9d65efda329a740a1bbeae7fd39791191f192466e5432226d884d1d60fbabbf671a986e0e9dca2e091e803769b2bf4669be880f862cf1671a49594fd2a95270 SHA512 c4038c0b1dca0a6f8b29f3dba2d33d83fd538354d67b52006cd713a9888a78873306561dbeca2a13c2732b26dac1bc8417a1f1b9852aa991f590d226b69f5df4
+EBUILD kblocks-21.04.0.ebuild 862 BLAKE2B f69cfdbe5b037832c4d3d8c4f56dc4f5379f9d9c2631448ec043e2282d9254ded528e7c1e97011d8a7cfb4d8a8afeca67af47f9d2cf71c46430364d386dbcde7 SHA512 36645ba0437b5578884f892324fa1fff3aa35e6aa49ae4ffd12e6cf197d54121576d2922f6ccb21ebf3b262b18f3715ef9a37a5b4b1c82a42aa939659e8b1875
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-20.12.3.ebuild b/kde-apps/kblocks/kblocks-20.12.3.ebuild
index 11bcac25b400..31540a1254a2 100644
--- a/kde-apps/kblocks/kblocks-20.12.3.ebuild
+++ b/kde-apps/kblocks/kblocks-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kblocks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblocks/kblocks-20.08.3.ebuild b/kde-apps/kblocks/kblocks-21.04.0.ebuild
index 2207fee89f69..111f3e08cee0 100644
--- a/kde-apps/kblocks/kblocks-20.08.3.ebuild
+++ b/kde-apps/kblocks/kblocks-21.04.0.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Single-player Tetris-like KDE game"
@@ -14,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kblocks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index c40bc55d6c35..277417c0cad2 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
-DIST kbounce-20.08.3.tar.xz 3444312 BLAKE2B 1ccb88d0499cd1d6240230ce8d1ca5e1170a08dc468093f81a26f1a11c8f6b7b0cc7dca47656d4675e3102e45ce8ae70b585864b1a7a253e05c8876a97aa943e SHA512 d90db84f9ffd279be89e2401150e8c98671a04ea1f227b291bb9d7747493225d5a213c164dde4d907373a2a0c6f0a6c9e8c60ae1d4733da2898a36185571cfc4
 DIST kbounce-20.12.3.tar.xz 3443204 BLAKE2B 97cd3d386cc37a60e68cf0f19842abb74df16e1784436299134f7a7473a20f5ace66742351696fb9ef4f8e0a86ebb861668e80df971b81c60d0bd64afa7adb0f SHA512 d1137116ba98a96b129d21fca8f087c87df338ef081dea0b6bcab6b026eb341ad9ef4e9c0858d95a7268e5585aac68336b58bc132acc14148a0f91646637a22c
-EBUILD kbounce-20.08.3.ebuild 967 BLAKE2B 2ff559005444a1638ea0968a2c653b4cbfd1546ec30266204e1be5c5f139d2d6f0df33ea64f199ab3a10190a00821f0c9f8faff769a4cfa25fbb802fd6e12eec SHA512 00ff78a73ba347dad632ebd02aacf6288bd92048c178697e992746f1d9b6f6b850d96e5af20e35e0a664f3225640f5de86080b7cc2466de0e396d42fb406f522
-EBUILD kbounce-20.12.3.ebuild 970 BLAKE2B 420bde5f7640af62613d11b96d26de2ff0965a29143acd2235ca91292e9f4fade076b168671c87d3d14d2eb589c8302df67097c5d10253aaf9dbd51d51c7c944 SHA512 1957373f2a48c03b2990b8c1442e72a572fb192c04b7219c0659c82dfa91bb4b19ed7d056997114221285fbeb940f0b5c160e6d244887ff394363f8e9450033e
+DIST kbounce-21.04.0.tar.xz 3442920 BLAKE2B 775bebd6fcfd9ae6130f577d165f80c6ee2bf3e4deff9248d14aff0ab61b1ca68ad30884641b05f63e6c6d705ef7c64022b814790e5759cc752289a3c077d509 SHA512 0a35c0a5b0f217be3cc3be7a500340fdf547d0d3debaf1ee4c55cc89ec88b2ca572cf28bf5a3591112068b90a39595c73a269c44a00445f489786db1650de454
+EBUILD kbounce-20.12.3.ebuild 967 BLAKE2B 533599a0acb39a59969c6e0ea104a2490ccb0e2d46debfbe352ae0d54d77cff44b7369bbf3d8e295b590f5fe9ca03ba248d0e7b6a9af631d89adbad8fbdc9a31 SHA512 5cd8a47105e151b6cba75b4f74998074e7e5f856c53a6ddbd4e1d5d8cc22bd96f822fd543fd430157299442286932dfa34fb98ac2ab30e35dc9e39335066f44f
+EBUILD kbounce-21.04.0.ebuild 970 BLAKE2B 192ca7f0ed64693d1e7018e3f484e7ef8464e0813082cfdb76d0d1b4307cef2779bbcbf4427dc9fca9c8bcc24cf52f3cf8ea7a2f88f1c82e8bc0b73e373c3871 SHA512 602b97d9c6c0969a84acab1570664625bfa10c44f907028848b650efdf8859f0c863a44669acc92f8a32282bdb079c1d25f2f9a377780bad28b6e95312459bfa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-20.12.3.ebuild b/kde-apps/kbounce/kbounce-20.12.3.ebuild
index 91effd4f2828..641e0ada141f 100644
--- a/kde-apps/kbounce/kbounce-20.12.3.ebuild
+++ b/kde-apps/kbounce/kbounce-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kbounce"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbounce/kbounce-20.08.3.ebuild b/kde-apps/kbounce/kbounce-21.04.0.ebuild
index f2628bacc051..d59f57bb0870 100644
--- a/kde-apps/kbounce/kbounce-20.08.3.ebuild
+++ b/kde-apps/kbounce/kbounce-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Bounce Ball Game"
@@ -16,7 +16,7 @@ https://games.kde.org/games/kbounce"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index f06c2543b708..01a7fb7d2b65 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
-DIST kbreakout-20.08.3.tar.xz 2283392 BLAKE2B a6d95fb6c1ec329f90ad80700670a5bac93ea0b0e74a3b9fc676436ea907403d3d5169e141659b60b52ebf431190c91cf8b1032128119faf75a4d5d80bef3967 SHA512 f82e6abf17425d2b8dc9787b02b983650a6dc4d99cf7badb9f3c597588d2d0325b38846fdce0276be148c13cd148050ef93548be9e190595f24ec31434bbcca9
 DIST kbreakout-20.12.3.tar.xz 2284120 BLAKE2B 48f81ade530cf2d601d960030cb5eaca12af38345d736225b8ea65874fe08632a86fd3ff57147eaeb56d1d7c4bf31a93403904f65846d3140fee599fc81aaa79 SHA512 e74d6ecd602d210ca40f4192c00984eea9bc96c18dc2b72194449e578a5656f81c18680bacb444d707d301cdcf06c47b8651117a05b0ff2888117fea994958fe
-EBUILD kbreakout-20.08.3.ebuild 910 BLAKE2B 2de1aa4e3155e6470c9c491c6aa0356e2d7d87531989b0ba8bce8d1af21a35d02446f8af85980c488c6c7e69234f5d72a466f568c8914d5d9b4137fa34383fb8 SHA512 162fabac2b69cd32e5e488f6c3027be4e494475d1007d2a79efaefaf42bae76ea068806fe5a0d0a62a299ee109869b89c613845ce9fa21945babea852c658f7e
-EBUILD kbreakout-20.12.3.ebuild 913 BLAKE2B 88def5ceff6777235c3ac0030a4a38d79b4cc16a2e8c810e41ee416cc661d195db5913a0cf47b3af9b026c6aca0d7b46e53df7ffb6add62c0690873b51d3aa05 SHA512 29c019959a995da67e4fc17b8bf3e6b74a9140cb1d00341cc9223c008e6e65abdc7344d3c526d3f8716ec13d191389c370def02f28915eb5f860bec771c39d2c
+DIST kbreakout-21.04.0.tar.xz 2281340 BLAKE2B 986e64cea741eec3d615ec3a2e2994e775d48f3c4094f8265a70dd0b9fd6ddc72ff0fe4262dadef199649d345c5d3e72052bcbb005f79a1abfc3bfca308597f7 SHA512 4b904461e25c9ea196c12ac7e5e9d85aafe217dc849cafab3977a415836715f381f07b43d50cdd1491d6193c974990e2d19571260bb061efaad855fc44cff556
+EBUILD kbreakout-20.12.3.ebuild 910 BLAKE2B 47bee8bbcbc7d9735401eee6296b39276b63efc735445874e3ad7418659ed3ba7399a8248a9a7247b7d87f27064a09e2621cd46e15b6df503451ea85f6583866 SHA512 999ce26fad78bf40baef4e46ee53c51aa777d2e120ee0edf580da39065cd243a9b7d7b6a9506d675c7906698822eff588c785e1dd04ba944f30a7e8372e16d44
+EBUILD kbreakout-21.04.0.ebuild 913 BLAKE2B fa055344bef9f3972c07a4f70ef1fe86117ec3a5eae6c9e05de066496ff7a22a3f23ef3d055c027c2ebccab32d64f74e85116e1aaf048a257c091f3ff3ab52a8 SHA512 1e1d94b6c20c82c4da9bdf34bc289572ce09f1dc8d4e3b50840f89a234867092564df13f7101ce2f790c8babdc0d76b88932b19a51cd99ada3db0cfdec600c2d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-20.12.3.ebuild b/kde-apps/kbreakout/kbreakout-20.12.3.ebuild
index 1b0fa27dd1b6..95c8362c9ae7 100644
--- a/kde-apps/kbreakout/kbreakout-20.12.3.ebuild
+++ b/kde-apps/kbreakout/kbreakout-20.12.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kbreakout"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbreakout/kbreakout-20.08.3.ebuild b/kde-apps/kbreakout/kbreakout-21.04.0.ebuild
index 780b8ee8dc49..558a0e8b60e8 100644
--- a/kde-apps/kbreakout/kbreakout-20.08.3.ebuild
+++ b/kde-apps/kbreakout/kbreakout-21.04.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Breakout-like game by KDE"
@@ -15,7 +15,7 @@ https://games.kde.org/games/kbreakout"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 092a93d73abc..843692be61de 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
-DIST kbruch-20.08.3.tar.xz 5614600 BLAKE2B 6143109f2f38563e64b4b201ab58e88b65d820b74b48c1c6c7a01791d54cd37053c4a65124f8fb73b98fa6ee26cfe1b82442cf4fa221bd4c5afec0f1ce2020cb SHA512 75b3acf9b4dfec2ae99ac98067387310e639c0e50f2c3234507267fde87746aaf7ece85f01872058a5f176b66bca1eb1c09d3661495d253ccf8c8ce3bd3841a0
 DIST kbruch-20.12.3.tar.xz 5614940 BLAKE2B aedcf2426709cc26a992686ec5d561ab7808230d4c58323117d31901873026f101268b2df136390406e43551c61a6117714a8932ab10264b6e5d1d22a4d65d21 SHA512 c0c72e9eef3da49328b201e36160d0ff6e92e011c8be5ff3d82db67a2c598e53a1ed4d95949ae0734bedaa3bf3b49af5722eb184fcb2578a813af5f159797dae
-EBUILD kbruch-20.08.3.ebuild 736 BLAKE2B f51351bed889d4150240c55869a752dc1c9c0caf4b2c7447a999deb6f8406b44eefa1e487bfcd0447971324106a39a6a14874491b457e6618a7010ecac9fac48 SHA512 2a38f3ec44837b2103799468e86413b46dbab4b4887b447d4ad1c6c03d6bc5f4118d9ff2f067331bd50c0279c068624fcf1d0beafe5898b94b0a2bc46954e97e
-EBUILD kbruch-20.12.3.ebuild 739 BLAKE2B cdc760cbfcde222fe856cc4830a0f13b02bb8779119928f0e41b1d4f56cc82aad321d92b7f59937b5845c3c19c8be735f32c0644e00dd23e654004745ca67343 SHA512 1d3919bbdbd7d22dbc26e17fa26d38dde7ba469b3f11fdc3af7080ffd5817cd6e110a61fa23a8f0a40f10f6e5fca2b4f1c5338d0da1abaa74c70c4fc85c3ff39
+DIST kbruch-21.04.0.tar.xz 5615876 BLAKE2B fd1aa75cbf0afdfb98d4846d896d91726433f4955505ffe48f91a7d3367bb76d2f6d3fcec27a58a45d98d851391c4acc67cbd8c37c2530c225736853b222ae0f SHA512 cc44e8e09ae09ddf8c566985b76b4d5173900504fdf1cc79c3248a365966a67b66f40799722104968a4d732e1dd14ffe2cdcb0be773cbeb16c2aa49b64d47001
+EBUILD kbruch-20.12.3.ebuild 736 BLAKE2B 190df56059483cda9ce3b2a587bb117704bc5c5a02c8d0c435f9c276e833c9366b77bb990a9c8f8d9ce1dd5386d6d37900a6e303be225686fa32fb57084ca803 SHA512 ac3282bb2a9e6189859c2527b67daad4a869d7dad2aeda4583492c556f8a6a8303f9b00b2a446f4e4c66333aaf8a72dd0a58d5b158d626e369fba5f1c79be7ff
+EBUILD kbruch-21.04.0.ebuild 739 BLAKE2B 67221a3e83ac732d80ffc7cca0b811a99bb5361a99027e9274884267e7533083a7ae19b7488ca0a60004eb0a0f87b79ceebb7c5ad8068903e4317ff12621c7d5 SHA512 74356bbf75d915cb026bc86ef06a87fc1cff190b89e303b9a05405da2005a4132820a13017ae5ec3184d8aea5d47ed0747c16998023317e36c52eec0779085b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-20.12.3.ebuild b/kde-apps/kbruch/kbruch-20.12.3.ebuild
index 96843013d43c..ec1522f9063a 100644
--- a/kde-apps/kbruch/kbruch-20.12.3.ebuild
+++ b/kde-apps/kbruch/kbruch-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kbruch https://edu.kde.org/kbruch/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbruch/kbruch-20.08.3.ebuild b/kde-apps/kbruch/kbruch-21.04.0.ebuild
index 0260763c3d07..71a92b38bfdf 100644
--- a/kde-apps/kbruch/kbruch-20.08.3.ebuild
+++ b/kde-apps/kbruch/kbruch-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Educational application to learn calculating with fractions"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kbruch https://edu.kde.org/kbruch/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 719f1a27f7ed..4651243905cb 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
-DIST kcachegrind-20.08.3.tar.xz 790584 BLAKE2B 765ebbe74eef548c2e9393fd690d3c1be9af02cddfd7d2730f25edff4d3148597c9903df411487f5d0182d4766735ed9aecbe0a0dc9e28e342ff92a11f7265d6 SHA512 01083e7355492d066fd9dc9d99d94ae7bb956a42c78146ac0764fd6c178e52f8f4ede8983eb110c4b47552d7f647cf5a8952a1955a16f4c705479ddf550893c1
 DIST kcachegrind-20.12.3.tar.xz 818260 BLAKE2B d3dfd5255cfcd8cf9297992d372121683441e0254308de61cdee89b70266c32393da75d065331675f14242d6df450f58174c55d0e6f310487f49eb23d9c33227 SHA512 6c2f3a70becf81736e481595676550ffa12426399e856bf6a33f033fb009b86ae55cac8f60b0fe8f499400e5d19d6fc316a191f47d11c40962c8206da7ffdd9d
-EBUILD kcachegrind-20.08.3.ebuild 977 BLAKE2B aa4e23db1a17942872486c644d1426c9d8b878dd1f78d9499ae9d33ade77d5b091272819c0f37bd4f5db89e94637276db74dc3542b426ca2b189bc00ae406a09 SHA512 9f3138a08e2ee972401952fd22573443b5feb6105af9f3b42fa4f56516de74d9fa86b5d71aae80194a703cc5aebd00e9c1aa036611e761f4dddce4fe075a4c51
-EBUILD kcachegrind-20.12.3.ebuild 980 BLAKE2B 67672b63ef9b8b111e30d321f8e63f07395d412eac3063c08ee0d7513ac668dce4faff67cdd223ed4e2601f659a2fdf906edae653170f702e9be884f9780e210 SHA512 55e1bb7421d2a73e79604966e900ce6d2633e08afb0e14c4048298bc3f408fbb1ad125e74b5789d57c89a341e7b40ff9851fe9a8027ee25c9adc04cafdc24d38
+DIST kcachegrind-21.04.0.tar.xz 828436 BLAKE2B 895fd47b0195a20a556e4f3be9e850bfd1e545d39c5a21c4d3016a7af6e904daefd96081f6c05863fc0562d2eb2648fea578689c4fb4989eb553900e4462c3d0 SHA512 2a796efa0e85b794cfcec82653630be5d46b5ae5738cbd38ee68f06188716620caefc0b23b8f38ddccbe34b6b51d5caedd07b10158163702ea4e08d943590302
+EBUILD kcachegrind-20.12.3.ebuild 977 BLAKE2B f022d1f60e9d801f522ed899d1ff77c3320a50543dfa9ee5b3d516f80d586e2d58d32aca51131f4467a84d3295cf8245db6c0029834d9e185470623a2d0ce905 SHA512 51854d532dea38994b0ee9ba343052446173f8c5f949d40b42940cebce537db729ede190ad2add129dd549f5ab1ca382107f59a093380cf9ed75ad5d29ade9e6
+EBUILD kcachegrind-21.04.0.ebuild 980 BLAKE2B d8963ba4e4aa087fe214ed0a03c4df916f1c83422ecd84e6514e61d45b22fd646096e88c88d9241fcf1097c8afa14ade8aa36ecf6740673010b96c039a6ddd6b SHA512 bcc8a9dfbed318924dce1f84e6312645c38d056c49dc3c21e8f05a47d9489fba04495d5ea7aba91fbc1f5cdaa1502d7db02d307db0c5ae8756ae92a35f47222d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-20.12.3.ebuild b/kde-apps/kcachegrind/kcachegrind-20.12.3.ebuild
index 96070a53ae7b..b8874121cbc5 100644
--- a/kde-apps/kcachegrind/kcachegrind-20.12.3.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-20.12.3.ebuild
@@ -14,7 +14,7 @@ https://kcachegrind.github.io/html/Home.html"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/kcachegrind/kcachegrind-20.08.3.ebuild b/kde-apps/kcachegrind/kcachegrind-21.04.0.ebuild
index 9c98a19404e1..7e07c79139a4 100644
--- a/kde-apps/kcachegrind/kcachegrind-20.08.3.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Frontend for Cachegrind by KDE"
@@ -14,7 +14,7 @@ https://kcachegrind.github.io/html/Home.html"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 9c9b81fc31c8..ad151f70fa3d 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
-DIST kcalc-20.08.3.tar.xz 379180 BLAKE2B e3d9235b1cbc3aeccf2ddaa4935e0dc106c3c83c73db99c5a13d584a18100966a40cc6f3ec92591d3171c4ea3fb2b8c9ffd95bf5bc789ddda3986916279e0001 SHA512 33f01720ac2b8609f4659d57cc5b9faabc823e6c346833c8bb2d7e233aa91243289619cb6b83208b6b8865a703e68cfb81b327ade2f20d94ff094b79ff3cea52
 DIST kcalc-20.12.3.tar.xz 380676 BLAKE2B 00a091b778d510112e9ad0ce72f103b039f5bd28cfceb68481f20fc5f9d810a8d0ddf0503db532893ae0eba32387b0e844fedb3b48b4ba5ac399f76b9d044512 SHA512 033b57ed3432f09974185a8b237a6e675a5603328be5fe9391a00039a22784e7f5757cf64a65f0cec0eaa878004670447036e54fed25e120558f4bfdeccdb4df
-EBUILD kcalc-20.08.3.ebuild 971 BLAKE2B 1fea210e95c205337a2cef682e7873803d75bb2ae640f2231056e0f5ef382e33a6b928d53718afa396894b23f871ba5548b6e50b513a7dd655f5a8648dad8ea1 SHA512 d3f1175d5dd5267e8e4c20223b0db44c832ecadd217d0b3678c39a53308648f51d63cc6c2d7b0549875224c7cea1936e2498ee54fa72948ab31e6836edd244c5
-EBUILD kcalc-20.12.3.ebuild 974 BLAKE2B 78983c7839fd03ac6c8df23fd89a994b372633f270bd8963c4badd9aa926e3bafba0cdbf322318be573f1d0760dc712443017f1bea9b8e129bbf9d354b202a4e SHA512 5f9b11526bd8301cae1f8fb710332a58e37bf2a314fcd65e5b1e703a6936c124de2042ed3747efce9c0039b4fbe0e6b528dc9f1001e75ea00b3f2ec718d8f222
+DIST kcalc-21.04.0.tar.xz 360392 BLAKE2B d3ce3bc552ecdc774565726ed6400c9e90fc55e5c06b2dbd9388429ced021e15907208011a37ee54b7d757a1b50888b0f733bdb43a7c959aa4ff9c3b675b6d16 SHA512 0238658a5fcc22cd73cf2e0f32ec2916d7db7bbb6c68a6b546d8d8f8bc802dc5872178dc0442adfe75518648a707c5a35bf5c9269b3d6f0eb1538a24b06184a7
+EBUILD kcalc-20.12.3.ebuild 971 BLAKE2B 5bf858549d37739f4cfa4b317ffbeea16cb933059adbe9d244df0047d4c357a7646ab0a22f101e4ccf5147a219eb6013d4777f23d8030d8cc447cfcb219b6672 SHA512 dcf9225ae4116f74c0da9c5e16d26a50511b0fdb05c781a8ab12c8d010a5e35431cdc89f7656026b75037d183f66391e8dd63a7449a331815421cab73056bf2d
+EBUILD kcalc-21.04.0.ebuild 974 BLAKE2B b64271427cf49b4c1ac691e7ff820d014c7c9777c22c313fef0abf96cd65a3d5e2114141a8984fecce9fb84e1415dcd5318ff571f5bc63b7ead7cdd6c5f8be7b SHA512 47085674b0c3c7b5f452eb332f4b9507f0747855ceeb3ce091180fbb1ef6068d24b65584cda4899db8c1b60f15f159847492c444b935c12f7cad83c86f47cc04
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-20.12.3.ebuild b/kde-apps/kcalc/kcalc-20.12.3.ebuild
index c886a9d07582..86176a307836 100644
--- a/kde-apps/kcalc/kcalc-20.12.3.ebuild
+++ b/kde-apps/kcalc/kcalc-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kcalc https://utils.kde.org/projects/kcalc/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kcalc/kcalc-20.08.3.ebuild b/kde-apps/kcalc/kcalc-21.04.0.ebuild
index 18d107fa8f70..987bee3e3347 100644
--- a/kde-apps/kcalc/kcalc-20.08.3.ebuild
+++ b/kde-apps/kcalc/kcalc-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE calculator"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kcalc https://utils.kde.org/projects/kcalc/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 6d1efd366290..ae37bc2c1301 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
-DIST kcalutils-20.12.2.tar.xz 324624 BLAKE2B 180837b6f461b41a9915f96ee202d84681340091e2f2093a4f6d46757f67a04d8f2adf9252fe7cf10652d8b61d6ebdac0119f153015f3b201f17cad3727843d1 SHA512 ed4a2dbd9dc866809c5c2ee7befe9070d1b94b02d5066e1bd0e460ec2f633bb7040328bf0f6a0df128788b203eac0866f129a34f27ad391d279ed99ce9c7e8b9
 DIST kcalutils-20.12.3.tar.xz 324512 BLAKE2B 0e475570d34302c6008c597be9fe57cc09c2aad52983dcd0648926492a4b57c93db69b8c34ea08efda808efbac238e0db01502f57bf3cf8f0b4b3292a260f4d8 SHA512 a25d85dcc2e7ece08e9b1e4299954977150ea0e4422f1e9062a86a4829f59a356417bc6cea3f242310e7645f88bd66f8335a8b07b839ef58df1c00abf26558df
-EBUILD kcalutils-20.12.2.ebuild 974 BLAKE2B f39b69e05d6b2c399d9f0a0a1c85280d3e23784b6a3ef909d5568fa428f2eec49d9d5da70e04144e7caa803b3b9c4ff4830c92eb5d54621e11d6e84eb2fd86e7 SHA512 6da0290904f155230a72bc2dc1dfd4c566428c3e25dc153e58a73e7833462492f91a7fd6e3a80fc1a8abe423c86bad2f3fd69aef7bbe2965c734e9b291aa892e
-EBUILD kcalutils-20.12.3.ebuild 977 BLAKE2B f611eaea569f4a83e83e03686d5f940b3d2fac39c7e639da7f8822f9664fcad06c4432a4e56a4549bfa6c0b7913c96c87aec259ef47384934bcb7b93e364a01a SHA512 7bdd3ca27b742f8b4497937ed316eb32bbfdcca27a8b052eac627cdbe81403e27463d35bab399c21ac73634a126dd27e9b396dbb6322a7be1b94a995c3e0c184
+DIST kcalutils-21.04.0.tar.xz 333732 BLAKE2B f5e8d476e101e5c30ccd964801ff9d69dfde2e7cabddfbd570ac0ce68082debaa7cd3a0620eee8712d10eb165d1113c14374378fd1c79d5e4d428b7378794646 SHA512 5fccf800c2b813a0bd89a79e29164b102f1fe92d2c16f6574bd28f2141edd28e45bad92b0b9f19e76a1d04a61a14f6bb35cbb5c948f63f0adae29bc9949ba1b9
+EBUILD kcalutils-20.12.3.ebuild 974 BLAKE2B f39b69e05d6b2c399d9f0a0a1c85280d3e23784b6a3ef909d5568fa428f2eec49d9d5da70e04144e7caa803b3b9c4ff4830c92eb5d54621e11d6e84eb2fd86e7 SHA512 6da0290904f155230a72bc2dc1dfd4c566428c3e25dc153e58a73e7833462492f91a7fd6e3a80fc1a8abe423c86bad2f3fd69aef7bbe2965c734e9b291aa892e
+EBUILD kcalutils-21.04.0.ebuild 977 BLAKE2B 17f849ce2c0ad9cdf9f26ac01c42a360c4427a1bf7865ccbadf70927fe4dab348cf653f0f7ec2a7351bab84dc197c7be5d74fa71e4db57caa324d774572625bd SHA512 a45fc32369d8ee966912bc6a9ca597fe237abd62b5aba8c0a7113be6b487ad9c4da469b364d4631e7d53c9c553650502ac4b468afb4e788b840a309ea74e6b53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-20.12.3.ebuild b/kde-apps/kcalutils/kcalutils-20.12.3.ebuild
index bb4bb6a682db..607945f11100 100644
--- a/kde-apps/kcalutils/kcalutils-20.12.3.ebuild
+++ b/kde-apps/kcalutils/kcalutils-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcalutils/kcalutils-20.12.2.ebuild b/kde-apps/kcalutils/kcalutils-21.04.0.ebuild
index 607945f11100..5a4d4b3ad75b 100644
--- a/kde-apps/kcalutils/kcalutils-20.12.2.ebuild
+++ b/kde-apps/kcalutils/kcalutils-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -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 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 3535fca83f66..fc8001397bd7 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,5 @@
-DIST kcharselect-20.08.3.tar.xz 366104 BLAKE2B 5b9da6dc56e311d28ec3d051169f05a3f7b221e176c4ed0fe4be8f6c44bd7664e4e84dbb75d7b2e15401cf44d24e0f055781ff23b9aec3ca52076f4c10320e2e SHA512 a51d46736652b26220e481bc2b75b1007b03e19fb4cd5a8ba3b1c47c9c8e99dc271434a781d2f5cfb86d3ad84fc735f6f636d88a14a058426089f59575bcae2e
 DIST kcharselect-20.12.3.tar.xz 366696 BLAKE2B 8154d34a4ca06cfc264542e95bd3b5f379fc9cfbc07acc3a4f9a05002ccd7923285ffe51fd5d1d1089cc75e212ea316ecbb4779a140d2d3e2622f706a16df04e SHA512 327eb664516645df72b671fc6a77c70435e5515506a661a40945a760f9b46f027303f97069e04f1695bd4a79009949fdfda70b213edc2415444a7ca0d05912f2
-EBUILD kcharselect-20.08.3.ebuild 776 BLAKE2B 981ec8f47917abb11564eea1131dd9ec50479a59197e763045b2e4533cc9079c387cb8588cdca68139cb2b97b538ff724d3e85d7c70383f0d81a03f2ea5bc8aa SHA512 a3e95fadd948b56ee006c8a1ef6c6cae01c239064f572777e4ccea18dd367877732cd5abdf6852f53ce424e1dc305c4d326d407a3050d25dce72fb372ee45f04
-EBUILD kcharselect-20.12.3.ebuild 779 BLAKE2B 21e33d653a57a30d06dfb14dacc55707c2f6637e39f00006e1e8d568259f6097440cae3b280fe474ca50b67b0331868a54f40ef5a34428ef1224d3b46b742a0b SHA512 08a006d9380a4629f369eabae6f756f6dde9fe3f8adc3301753bf6d208e417671e41da21b9dfe818869b1a9bfa7b820695723d29a3c8b86c7b8e191d3be599b5
+DIST kcharselect-21.04.0.tar.xz 366660 BLAKE2B 58948be8f261cbd12a71fc6a789e43ed50c989c71959b9594f2829f52aa5c831dcd10789e8d42919bca0a1f69f91d2a398b2c1333348650d21eb75436cccb827 SHA512 7bd3f3f4b75c0c4f93af2f7daa4c0aaccee13bfd33fafd4b793b7f5a5bee982b01076d7ecff9e916911b050708a997edbe31a06f62969910c178a3d7b8c172c8
+EBUILD kcharselect-20.12.3.ebuild 776 BLAKE2B a2ab643812bd5da75ac62a85a84e54f2e810f0795f6afb54b784218453c48eda714bc56301b509e27956c61a3bcd17886c24f0921a4079e14293f1b469743ec0 SHA512 fb72c021d2be31e0cccb4aa3ada8fae9fe7e0bbedc8bb9419ddb6f22f0d6b16ef6e0aaafe9ea9ce6c2ef90a77f64761f58714d3eab06ee844728d48e10b3ad22
+EBUILD kcharselect-21.04.0.ebuild 779 BLAKE2B 0655bf553943ce6ee73b29b42271d5e27af7e6ccf63c1d69036e4750b3fa294f72c523ab9b3354662a2a54b82c3ba42a306887a17446f10b9726d4215546c6e7 SHA512 aee411a6dabd39a2e70c2a221ff99180b8968e7094efd9741b78ef518c9ec85a5745b7b0e8af5ee92b9a4e9c0770b322369c675a14f31940dc3e26efb9be34ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-20.12.3.ebuild b/kde-apps/kcharselect/kcharselect-20.12.3.ebuild
index 29892f58de3d..fb85b6610f30 100644
--- a/kde-apps/kcharselect/kcharselect-20.12.3.ebuild
+++ b/kde-apps/kcharselect/kcharselect-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcharselect/kcharselect-20.08.3.ebuild b/kde-apps/kcharselect/kcharselect-21.04.0.ebuild
index dfda6bcbc867..900a18e524e0 100644
--- a/kde-apps/kcharselect/kcharselect-20.08.3.ebuild
+++ b/kde-apps/kcharselect/kcharselect-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE character selection utility"
@@ -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 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index ee4b6844640b..3f1f680a157a 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
-DIST kcolorchooser-20.08.3.tar.xz 27400 BLAKE2B 0e5c9796ea8890379334592eff0926ba6c0a2ae0ccd44e6a2863f4ddc8a6803a90f5f392ba7a082797bd0ef8444338115881d8b7c7d97cc66fdd746bbc13612a SHA512 3250af20aec324bd08e29e781e869bd71a2dd27f308e5793d4ba05c8ed2e5576e9fea75210b7725a06bdc53d770aea830d743855e1b4d692931e1d5ac8233f36
 DIST kcolorchooser-20.12.3.tar.xz 27660 BLAKE2B 96789e1b1ed6cf3efbf03e53cfbe34c25bef070277ce9e4ea7e63952c7280d961d4f5a74009e103f6b570f964e5f3fe1270ec619c857fc87ed15dd4e9c412abb SHA512 0447b447ef7eab1bfa4a13d1e2767e636602180703c994cbfefe490fb7b18478e4d80ab86e52b88f67ab8bc4a327e3855fadf60f56af0816713703cce4b078fb
-EBUILD kcolorchooser-20.08.3.ebuild 518 BLAKE2B 3ec5cd13aece0d531e8ffe61fe34d7e862065023025f5bcf2f0e199e7afb2f30ed9c67a9e6b74a84ade06e21cc99a92a6ac90393114790073b2ff316cad75e0a SHA512 88afa5a8497da0dfaf4ddacf3ee103f161d9e5f4adf91714d10b8c5b19ea4424e1174e4bf468db5bd43494329cfd8ef24b4c56ba6f31739425030525b1dc318c
-EBUILD kcolorchooser-20.12.3.ebuild 521 BLAKE2B 15e7c3957cc803e7198365b8bffd57401826858debfaeca7168eb76db3bca08c211a040060f1a4a68959eb6fbaa3bf29ec0ee2d06d91b023757fd57d40599afb SHA512 b1e5bcb827e2d5992aebf3a55435db35bf31c34c9c1a6fc6efcf39d5ce5be7f4d42edbaa2913a82fdd6507a44af2af7f0b7b86aa4d591c00bb3dabdffeea776a
+DIST kcolorchooser-21.04.0.tar.xz 27736 BLAKE2B ac2e810d772fefbe8e87e9ffd46c5e1b9ccfab98e6b42c0eb06aec8fd57527583de0911537eb650b63106c18bafea0197a85e9ad74edba80e8416a09454d9b54 SHA512 8be9087211dcb4f16661302c1a71384622c56cc7443ec99a060420473b12a72dbe32aba2f03507a823f5a32692aabe5c67291f510d13d1e16eebbea7fd7014cb
+EBUILD kcolorchooser-20.12.3.ebuild 518 BLAKE2B 863cf2ecdb3a2ca7a5e6654466a813c3095537f6bd6a184dd3df881295b0f0d94a097de7db8a69550f52fcd3e047c36d2f7ffca6df26d527b5734930f38c72c8 SHA512 3c3182725af52f1ca0c8696606772a9ff8881d02a414af1116956c55d53d55722c6ae79dd4e767a17400b6a0d7205587e46c0e2abe2c9c8f17daf4d8801e9c6e
+EBUILD kcolorchooser-21.04.0.ebuild 521 BLAKE2B b719cead6b09f2abdaa1fa2dbe34931e414c9f16df12616171ed8fda26c1b475d770a830a6479e4e678008c09908b4ae123ed25270d3ba8adcfc33cff946bd97 SHA512 fcf1d98d16286b0f00fcbf5a64f3b3585e247c8a7492232d382ef95da7e37109c0602e541a158af2b9316d1e80547dd7fc0521cc54a126414cca978c33232af4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-20.12.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-20.12.3.ebuild
index 054a87649c3f..18b528e2b3f8 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-20.12.3.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-20.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/en/kcolorchooser"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcolorchooser/kcolorchooser-20.08.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-21.04.0.ebuild
index c747face3826..34d3773110e9 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-20.08.3.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-21.04.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE color selector/editor"
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/en/kcolorchooser"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index 8e2ada8e3f91..55c85dddfc89 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
-DIST kcron-20.08.3.tar.xz 898708 BLAKE2B 235fba0e709c8b9bc9ced259091b53c9753b2d8b3b72bcf1339ed9db92cbacbbff166b85a6f89bfd7299d64de53ffd5f57015f5bce40fcd3e39c8dfed2a0903c SHA512 399ee6d7723125773a52932277a5c9ae6b404eae7070516a8279890aedca0e6b4bea743f674c49a5fc2f19948fb54a739db6fa3dc70453f0c83cb397161e6c6f
 DIST kcron-20.12.3.tar.xz 899000 BLAKE2B a1bd50d43a885974c76755ea357487dd16d964ff888867ab7325780ad930d9d99f4dd2f609ca14fe7356e71e6d9489cf86349044d312cedaf59f45e22f29c2f0 SHA512 e1571c113d8bf869e0fac0a3811625e35896bd3e64aa711541ecd59d145d2e051ccf563e00f0412f5813c1024b292c7a571111d89f0cb3fbc8fcbe4ef95b9b8c
-EBUILD kcron-20.08.3.ebuild 724 BLAKE2B 65f0eb32c6ead8b2e3e304a1d83d7bfc63cf398cf675f70aad280790bec3f6a8b1af014b07f8b3f99f3420fadfdabfd5ec5a5cc094e9072b26ee68d4c39d83d3 SHA512 9eff49523c26fb948afa1c2429a7d075bd24dc529871a152c3eda57b60f4d7f40112babae1bb635685c92acb2fc1297946b66cfcfe84788fe01975d0223947b0
-EBUILD kcron-20.12.3.ebuild 727 BLAKE2B c472cb36d37b1e18f9feb90005c52dcfe8fb1eaa73b3ae6a10468792e783be3483113b4870a72c1ad06cacf3b56905050ee3472dc366d9a2336ced51bd791124 SHA512 1647ea0b7166957ab1e4c4b003e0abaeb545914867db0cdb40078eeb7a966efcdd15f5c4364428febf210be831ee35cedcaceab7eb3def3f6a5cf5d0a7d2b88b
+DIST kcron-21.04.0.tar.xz 901412 BLAKE2B df2e1610119d77d31fc0076a5fdb6883203bc4b854f63cb69ec76c98fd389325dbbd52a46b4972db7f755f9e88cdf5147ce23e65c21af75239a0fdd2a6025838 SHA512 b06f1c896fba5ff48e1e6bbf67f5095c0982192f401f5505e0c0a5291b1e12925a07d55645152847450621bf706d48569c4c76d87296b9fe240551f903a260c5
+EBUILD kcron-20.12.3.ebuild 724 BLAKE2B 372a5c4e67ecb7ec3f83ef0086dab6713fbdcb9995daffdacd924207d674f3deae0236da57d981eb44c5e2e779b48a609182377b4fd413c32545129fdf276679 SHA512 6c239dee382de013ceee6e38fb708c5955b4601087a3a6253c1cd1c0293722db0470bb03e247ef2838917446e636606c4ce3f26fada3a95e3e0e319f2fb132c2
+EBUILD kcron-21.04.0.ebuild 727 BLAKE2B fd858ba5c989a2b7e759fda5a8e7aabf8d4ee5e075d18df2d676450fad3614442b55f9adb76cffa6eb4edffc9e5eaf07fa8ffec1935b322a4505f98c21029476 SHA512 ec7c30e149004c36ed9a40615da6b6ff47db0757a84d915694e3a68e60741275c18ca40efac359d7046ad0e5f9bc238c32314827b629c7b5702723c2666ba81a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-20.12.3.ebuild b/kde-apps/kcron/kcron-20.12.3.ebuild
index 4bc0557b0a00..0c74dd9f366d 100644
--- a/kde-apps/kcron/kcron-20.12.3.ebuild
+++ b/kde-apps/kcron/kcron-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kcron"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcron/kcron-20.08.3.ebuild b/kde-apps/kcron/kcron-21.04.0.ebuild
index 02988c2cd2e4..46622f7faa5f 100644
--- a/kde-apps/kcron/kcron-20.08.3.ebuild
+++ b/kde-apps/kcron/kcron-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Task Scheduler"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kcron"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index 8c0c14cee1f2..c0cd6818b65f 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kde-apps-meta-20.08.3.ebuild 950 BLAKE2B 3ab8395a5f36299423fb0c77afbc0e5cb7d001b89b45e6ad430eb582681dc60099e0b6f951b17e25ffab93f6fa7393fe7362ecacc437e4de22f427f60bba433d SHA512 b813ea98a858277e23f744d66964fcf45b32f8d1b168fe1690b892e00ae67298e05ff20352f7bbceaa56c2c50307d0e41a84e6b3bcf63b48b2bbab0376b91695
-EBUILD kde-apps-meta-20.12.3.ebuild 953 BLAKE2B 8a0cf50f89756dfc8cf4b334fa9309d001c50acbb9b0813af2524cdb1f52a06345e849d674f00996f3da96712b094a56fe70dc73dd8e0e2c4c5a1fd97424e4db SHA512 6b0d91ea6325a1d5bf4370a7d92d82bd5c37716608c64cb4281aab9d14a1f8e38384bd411965b65ea9fb2932b5de0d730b66b65e7e3988b34a4459b2b6be7c41
+EBUILD kde-apps-meta-20.12.3.ebuild 950 BLAKE2B f72c901956e376de586e5d0229babcb6b1bd229a13a354a0bdb04fb198afdb685d8de5dc129d9fb74fa959e3a0ae86d3ce5401a468dcfca284d5a5ccad6070e5 SHA512 42720bb05eebb2dcedf71aaf50cf479047075298e606039acad28ba918062dee750f2aa953764d6d1a99dc088258580b3f1f2f2ca683ef2673344c81a981062b
+EBUILD kde-apps-meta-21.04.0.ebuild 953 BLAKE2B 8a0cf50f89756dfc8cf4b334fa9309d001c50acbb9b0813af2524cdb1f52a06345e849d674f00996f3da96712b094a56fe70dc73dd8e0e2c4c5a1fd97424e4db SHA512 6b0d91ea6325a1d5bf4370a7d92d82bd5c37716608c64cb4281aab9d14a1f8e38384bd411965b65ea9fb2932b5de0d730b66b65e7e3988b34a4459b2b6be7c41
 MISC metadata.xml 1049 BLAKE2B 778017619970b4273fe80289685d475957f475d667835e05c90b7e39066e1bc33e2bb30d44d24d22adb0f15ff23fcb30fe9be96870192c66ff2c110826d3c697 SHA512 9841707a510b2b7a948fe4e06ecb79aec4650d9f40a4a4acbbcaf1e5500d5ec7767496bd7d1daf194a66a919284dc1c04c8fed73e81d1cacac4b1aee3839c77c
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-20.12.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-20.12.3.ebuild
index 324d66357462..d6cbbfe7c929 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-20.12.3.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-20.12.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-20.08.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-21.04.0.ebuild
index 4ea71e1ef409..324d66357462 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-20.08.3.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 37a0edb07ba2..aff8cab4c075 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
-DIST kde-dev-scripts-20.08.3.tar.xz 366100 BLAKE2B 9e76cc03a0a945a58c58bebaffbd5c3b09d2ed589cafe58a87612e906b8768f143241cb0b4e25f51f39302a32c903714a0539fe74f3070551753ddc6e40b8f96 SHA512 bb1298a85c6dfc64cbbf2dabb92ea5c964c13a927a73530bb1e84f21e2b55f6c60fdd1dc94c239c791a0dd8faea65ee3ac65dc0e1e0cb5c98e9eb523213e366e
 DIST kde-dev-scripts-20.12.3.tar.xz 366516 BLAKE2B e828220505de0287bfaa16f690a75a2f12fa2d6f7615aa61da123c9a2dd6473340cb17cb491541d37e1ee41688c10af2b0609a9d65f1a8f38b9cd0fb5d44edfa SHA512 5f6df12e9a43fe0721a9e21f152a25406ed03d7dcac45f06990667b54e13227744dacad2e7092b3c12655159e4c36aad1ebc908978117d8ac22db6f52486b59c
-EBUILD kde-dev-scripts-20.08.3.ebuild 633 BLAKE2B 37dc0f1aa7c9b94d2eef4f7e1149ff0b90af01e8cf9dd91d117452dcbfbfb5ed621ad5ae6f0ddf8f6d438b42193525c2aab91da42fca9c3cdd6510fe5732a274 SHA512 dea2546e252ea2dc88e98bd7a1416b8f502998e5ffcf137e5465d32fae6c78532e9d744b71624d25db22ee7275f2ef44be2dedbb5f217e0906bf62ce5126c973
-EBUILD kde-dev-scripts-20.12.3.ebuild 636 BLAKE2B 9939607daf770570f24e129e8668a7760db6ecbc3dfae222e57e43c3c7b7d4687644dfec698257eff8bbaaeedbde58a1be0d754496d2cc60ea33e3739e8bd944 SHA512 c7aa6a5450b587fb50e0574359aca71f0760c96e879f12b9e9c6a2642650bf4af58c4dc17053212b5ba43ea13a2714369212a877cb700967608607739fe3d8ab
+DIST kde-dev-scripts-21.04.0.tar.xz 366316 BLAKE2B d234f6c5f0d6a53d1a3fb50e978b608a98ce519bd05bbd8b5b3b9a27cfe3cfbddb3bfe2be95a50785bcaea0e1ffe5f3752f162d985eebb087b9d40be422e3c84 SHA512 445b00902ccc6dc11654360c6a6b0add125bfa786c1043a0301339ccdd19531d7502d567b284156115d13a089ee8e9153a26df707214a80dc58d606956983a07
+EBUILD kde-dev-scripts-20.12.3.ebuild 633 BLAKE2B 0bae83d8f8f1c9b9d8e02a6f38acca0e16e76d55334bed2d0e9e5369ec88fdb794955401c7956eaadd4fe45bb62c4c57020b66a04513533e35b13025e3d7e3d6 SHA512 5d47d0195d41d49e048375fe748399552a74d509521aaaa94c14793c7affbe7ba878c4083b79aeba2a4bdc734fd09f45a8576af0fa8990ae4c02c4d758285670
+EBUILD kde-dev-scripts-21.04.0.ebuild 636 BLAKE2B 968cc7720e01bc48e83ce2e6c582d9a34b2da76b12ab3ae94c536848cd1bb83d8ce9bb1800eb0efbf2858f9fc629875542d26e2bb2eed37829abd3c996c3b0e8 SHA512 ac0a2de5b3cc66d28569a63d70c54f2448e64805f1558708035e866b1ec2794fbd8e8b53c72833b2f7edb2b1094f2323eeff5909d8d0b5185b83e716ae3628aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-20.12.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-20.12.3.ebuild
index 17d8087c88c6..d3f03075ec80 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-20.12.3.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-20.12.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Development Scripts"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 # kdelibs4support - required for kdex.dtd
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-20.08.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-21.04.0.ebuild
index 809a3e65276a..8b412e9ee4db 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-20.08.3.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-21.04.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="true"
-KFMIN=5.74.0
+KFMIN=5.80.0
 inherit ecm kde.org
 
 DESCRIPTION="KDE Development Scripts"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 # kdelibs4support - required for kdex.dtd
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index 8fe873491300..da4aade38a32 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,5 @@
-DIST kde-dev-utils-20.08.3.tar.xz 65480 BLAKE2B a882ce5963feddfac84f856e1be1a75e14d7d8902834519a26d7d3818b736e565e397fe5345bf81abacab2ab4f9f69228bade83b03052fba2b143800150166fc SHA512 803273b6038f13963a49f5f61d616218c3323ac10aa4aece5f6f048c85373d6c2588ad12aa7f0f916c59f866c717af6f8952fa8a656d81a570cd8feaf04aad15
 DIST kde-dev-utils-20.12.3.tar.xz 65832 BLAKE2B c83634cbbddd63b732d327ea316ef067840b70451e7f4eb9cc1f3d003fe4a61c8d2fbac0b5ccc0e1be535d7a31876455d98701f4d7c239393f021850abb38245 SHA512 72f5eccb3a67c4ac1a1bf9a8b81879a622dcae23b23df9caafa90f13f16de449a6c4750b0de55d99146a823716cf3c8845d1547360824c51d3b94882ca83cb7c
-EBUILD kde-dev-utils-20.08.3.ebuild 730 BLAKE2B b4b5d33777d22e9974c8d6caff8d6685fd5a07110707e066cfdfeea82cf7b6886d65400ab851a45d964317c03a3fc27b9281a68c0a5c34c58b8dc02cec27bcee SHA512 82fbf620087f57ee9536860492a34d0aa2c649068679c879ed78646a92e6733dd36fb9df36e2532974a3629973ad3106c798a561c2dcae59a36b131e40b3f8b4
-EBUILD kde-dev-utils-20.12.3.ebuild 733 BLAKE2B 43b77a1d673c9e1bd5e0d0e4c938d48b18f4e3393a93a770f142d3113e2fd2792692397ade02c114f43bbe50e39cf664b9a1726bf285a3d8b347895f3f41161c SHA512 a7cc435a18b19bac0c514848d769dfb44c4c30ff58d8895a6afc7f6be2dc7552d8bf93fc98b6ffc06f469fbbd9644313b45c55d855ab35a90b0a696eed2f58f5
+DIST kde-dev-utils-21.04.0.tar.xz 65728 BLAKE2B 22978fb0a7604fdfe86ca6f005c6a1f4d174f97218cfc3a2bfa475eea0fd58695e7ec88c16dd286954d2d388350d6d5ae66d7e87441bca8e03ed00f9764bac3a SHA512 bb3e76a3d58fc07eb3ca7b9d71bd844eb43239feebcf522e1833a35ff452fcb4ddb15d83268b2c4bd0498c3926cd72edaae1b8aed6424bf1fb717bbc5e1810ee
+EBUILD kde-dev-utils-20.12.3.ebuild 730 BLAKE2B 8d6c16f6c804811a47f48b1e6c27cee16017de2ed82f8b3139d7222c3b7c4dd461817550d907eaa6aeb4c83f9aa3cd454dedaf362d2c462f4b7fc3acd80000fe SHA512 75e004001767a593c7a936e6204e3f3791b87daeb1190d7106fe102fb15081a36d8221d86d41d751a24c622dee0c19d2c7c2c39aee1f85a5d1fbab22c45e2318
+EBUILD kde-dev-utils-21.04.0.ebuild 733 BLAKE2B 788fecfa92193d57a9937f3251ca8917e51ee377c8dad2a7058c1ee84c1195fd905717dab7bcaf40e6e34841b425843c175d547030348baea63a30be93c21f82 SHA512 877db72915a7cc75c9abbb30005125b635bda8251ad60ce93e964644662666149561114fd66e592dca9fdccbba4fcf7a3d7766eae33626d97d1b1a35e732fdcd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-20.12.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-20.12.3.ebuild
index 963cbb3e4dfd..e1db38d636f5 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-20.12.3.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-20.12.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Development Utilities"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-20.08.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-21.04.0.ebuild
index fd0101dad0e2..7c582a443f0c 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-20.08.3.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-21.04.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Development Utilities"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index 3bf25b61d24c..4af225b03462 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeaccessibility-meta-20.08.3.ebuild 414 BLAKE2B 294c7f921596ed12b580399549bb0d85b1f78d765e3f2bbf50c6612b28ce0189e344871cdcf50736368e3c92ac95c6ff3f51419ed07b6a39b285562619d0b41b SHA512 ed12710d4b9a333f5b0f4812744ab92af0881677fe1943d2ca3c932935c163a30fec3b2e962aa0cd715ec4b157f1c8abbab6bb0d35ebe26751fc0bf06df04e2c
-EBUILD kdeaccessibility-meta-20.12.3.ebuild 461 BLAKE2B 73efa1a252279d36b84dab3115f048dd766a29245a695c5d86197b8ef3f5e99ecfa452631d004fc16b80fdcdefa5fc40ec29276f634258917173876169a4297a SHA512 0696d12c5d9674949eab271b65eb310dabf7d135c0541e38fc022ff6da160fea6b4638c38d050c32649902028e52b064b14e6935095bf4e0709ecaecc737d51b
+EBUILD kdeaccessibility-meta-20.12.3.ebuild 458 BLAKE2B d406ec105431b43460050a5ded74658ec77b0fa3ecdfb5dcc8555f82ad0c064a457180f66fffee415ae5eecfab1bdf0501134998b33ec57dc2ba8eb03e090e1b SHA512 f87d0076f181a680f054b2cb05ef311eb4b3dc32643a7963bc81d3b6b848dea1678dc0d91446500c7090edbba5f5542115c17631351737ecf5262c707c8ac4e9
+EBUILD kdeaccessibility-meta-21.04.0.ebuild 461 BLAKE2B 73efa1a252279d36b84dab3115f048dd766a29245a695c5d86197b8ef3f5e99ecfa452631d004fc16b80fdcdefa5fc40ec29276f634258917173876169a4297a SHA512 0696d12c5d9674949eab271b65eb310dabf7d135c0541e38fc022ff6da160fea6b4638c38d050c32649902028e52b064b14e6935095bf4e0709ecaecc737d51b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.12.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.12.3.ebuild
index e4b3bccf62b5..b63ee5a52e52 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.12.3.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.12.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.08.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.04.0.ebuild
index f21f153825cb..e4b3bccf62b5 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.08.3.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,10 +8,11 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
+	>=app-accessibility/kontrast-${PV}:${SLOT}
 	>=kde-apps/kmag-${PV}:${SLOT}
 	>=kde-apps/kmousetool-${PV}:${SLOT}
 	>=kde-apps/kmouth-${PV}:${SLOT}
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index ce7626a5ba2a..b0154fed5c39 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeadmin-meta-20.08.3.ebuild 405 BLAKE2B 0c60fce6b82080a1c71f4268f573569c81c6a7330f72ef62bbf4b1bf0a4aa5a87dd5b2c7bb3ca60c34fd24049ce7fc778805ff77709967dc3cf408b3c8202822 SHA512 8b3a3a3c06873e4005525b0e8f34f27a772f0ddbb1adbfb73f1872a2ea7af9a911daf2f4ad86c8a5c4d2c28506f5b15d050d4b7e4c2c86391f9f1a1ba6e2da4a
-EBUILD kdeadmin-meta-20.12.3.ebuild 408 BLAKE2B 7e6d63185c5ea38506d9753a007bdd15634a9558eab09b6847e778fc5017662c8e91c84a83046bc87c13d66b493f7877e465a397e99505ad1955a56fc644265a SHA512 841b134f2be517b0dc47681a4ee2cbe31bdaf01d4b9d143327a5477f708b33837382b027721b95a0a687ae62c04d9f588d5c5eacab38f8195be4986b63939dca
+EBUILD kdeadmin-meta-20.12.3.ebuild 405 BLAKE2B c82262c889d94bdcad917f43d818a389607beedb3be7f0eea60dd645ad4e0230967e3edacbfd9655284ed19583a04149b82ad13aa99aeb24a51d0c30f68a3893 SHA512 d03f901b4d8a2b41aa6a758cad59d04a59886e960e495700ae4cb223df2404d09e6fa6f3934f80b52a90c5148ad7dac1953709757eb73d59da7f942f7ca44c57
+EBUILD kdeadmin-meta-21.04.0.ebuild 408 BLAKE2B 7e6d63185c5ea38506d9753a007bdd15634a9558eab09b6847e778fc5017662c8e91c84a83046bc87c13d66b493f7877e465a397e99505ad1955a56fc644265a SHA512 841b134f2be517b0dc47681a4ee2cbe31bdaf01d4b9d143327a5477f708b33837382b027721b95a0a687ae62c04d9f588d5c5eacab38f8195be4986b63939dca
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-20.12.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-20.12.3.ebuild
index d7737ca1704f..a22d5210f3ee 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-20.12.3.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-20.12.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="+cron"
 
 RDEPEND="
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-20.08.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-21.04.0.ebuild
index fcef1db6d44f..d7737ca1704f 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-20.08.3.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+cron"
 
 RDEPEND="
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index 70bd7211dd70..994e43954808 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
-DIST kdebugsettings-20.08.3.tar.xz 68064 BLAKE2B 3db9d7d860ff39646f01191a4eca0569d0e77532a2aaf73f613f68d3c27b7cf474c3a8164f087f7cfe4a9de1de462c670cc52ef01eb6d45ef8f5292ac7d1bcf8 SHA512 32ee1eb7fc5dab76bfdedf89b5708011aa0b964839d893c0de34fc3ad1520ebb654124038521bed910b4c41cd461c5bfa6b9b4636bb80d717d7e67dee6a35e97
 DIST kdebugsettings-20.12.3.tar.xz 68344 BLAKE2B 75fcdd7e9fa8374cf7540e0aa229f641f0eaefcab706840ab8bce6027b430f3d194f723517f24f84389bb1b9480f663d3a6302bf54bd3e2269e21bbb515ffffd SHA512 ce03f09aa75a2691a0752dd2fcfbd4f359584b97e18f6b19cc571985d4b6e552a925c6d3c5e16e32e6894f2e7f09a9923a81bb98347255bb9b9bbab951de3fd5
-EBUILD kdebugsettings-20.08.3.ebuild 782 BLAKE2B bd71b1f0ec35366fe7d13947b97c7b4ddb66b57fb2d58078953f1e8849d63375c127f8d6b0677bbffac1989584596af7db56c1e85fb3e707e449a80370204c0d SHA512 c98a5a09af914899dab18fee8273faf0f87ca80d9adcafdf87d7c173e93000400c5a6a57331fd300af76c2d765c3b951009150ebf21a4a94e8553f3c4f19b152
-EBUILD kdebugsettings-20.12.3.ebuild 785 BLAKE2B ad0b0ef750be06fec325a8557479691d5fe50def8485d7b9361c12fe5aada98259baf9fe43a8c012b78d47ce9f46d166faaace3107a4e9a9074bc49f8c73899b SHA512 96ce69bda41c75c449c4fb97e04c2f41db1fd05343fa9f4ee0943f74560b9a9d81d042e08a7ef1c14f1ad9d889a073596d0d8902acb036bad96acfc7d4cd03c3
+DIST kdebugsettings-21.04.0.tar.xz 86560 BLAKE2B 3f86fc125ab61e8c2d375a6a6e75b2d25ba63d64c79b15cbab81308f3d69869317ec334288be7cb3e08047a8edb2103058c9c84cc622cdf165b13af024858d44 SHA512 c059e9bbc526cfdb447861cbf2bc945def87e02a2c5086be2dd14d595a24ae1dc4f7fe11b648da07df8e7be5698664edcaa9f1a194573f75845d3dc36c1813fe
+EBUILD kdebugsettings-20.12.3.ebuild 782 BLAKE2B 3cafa97a8e7f577cc2d3e51e58cbfbb1be231dc2c647e63d9080679836ab6fedbfe0351ed59dc886ad5d3078b58ab6d61ad8dd413fa1d3a56c45fadf5bdc1690 SHA512 585edba417ec5fda484bed165c9ee00b896f5d14cfd59fe060fd0d486868804ba11f2843f74f168902732347b305612410d7abdff862af3e02602fa1c4488429
+EBUILD kdebugsettings-21.04.0.ebuild 785 BLAKE2B e66bb445c2e8e81c0ff81bcf91d8248ce12785d07be9bcbfaaf4426cc7b0729e132e077d43151514038016e2ed9f97f7931e2460a8f42afe20c2f9ee3eea9b45 SHA512 9976ebcf5a0b797fb789dac06021597c9a8f3cd5e0d1cdb92ba90290675c665019a52d7ff2e88b9d7933f5806d3d79fa0cd156ee3bfd14f8c14abc32f85868b8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-20.12.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-20.12.3.ebuild
index ff248d381f29..4a98f20fc618 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-20.12.3.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kdebugsettings"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdebugsettings/kdebugsettings-20.08.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-21.04.0.ebuild
index e3fe22e398c6..8abf1a945c4b 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-20.08.3.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kdebugsettings"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index 96819794c9d5..7bb32b41f916 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdecore-meta-20.08.3.ebuild 885 BLAKE2B 187e3f0da292f7dbb1cd2e2687303aec85741bd8adb6290e06d432ebe4e09c6f494cbea7d1961cb9bd6ef1493716f2042f3e8bf000a141576c4b2db82b05465f SHA512 f7b8435ac5b9b14307a92a68566d30906497d8724c9770e8e7f72d598504e3452c8515d8741065d520f942d3bdb0ada68da8c921cf7f241ee49403c709a59f32
-EBUILD kdecore-meta-20.12.3.ebuild 888 BLAKE2B cf4ef2a172d734886eb292b865505da063d0eb90046ef44ce745c2e00f57b02dc6370c4b4537c57141ddc7db4a2c35a5ba22352f1de7a020f42cb379bbdc636c SHA512 8baecab0300fff55904271055df814cc1c56970f21a5a1a7bfca83fb7f03fd871069b08d078f80fabf2fa19f1b210b6e9b448b4f00181d0be8db48befbf11e01
+EBUILD kdecore-meta-20.12.3.ebuild 885 BLAKE2B f5573ad359941896a2bd7fbbfffdae42c0db84d8b737268d9e67454f90b1c3d8acc0dcbe2fa095142fc8827ca7f50f8fea5d91dae0077a61d9f76db14684e35b SHA512 ef662757048eaf848da0e67a2229256bb0aa25d20fb060d7edd7e9a0ae61114d697718778d4838d242489f8ca5556fb27382bbacfd7321cd64db674ff7d9c8d5
+EBUILD kdecore-meta-21.04.0.ebuild 888 BLAKE2B cf4ef2a172d734886eb292b865505da063d0eb90046ef44ce745c2e00f57b02dc6370c4b4537c57141ddc7db4a2c35a5ba22352f1de7a020f42cb379bbdc636c SHA512 8baecab0300fff55904271055df814cc1c56970f21a5a1a7bfca83fb7f03fd871069b08d078f80fabf2fa19f1b210b6e9b448b4f00181d0be8db48befbf11e01
 MISC metadata.xml 682 BLAKE2B f02620682a0f1f2b1e8a7621ce9fca0f0bec646787a8e2b00b0d7b4b0b2236d07429fb31bab4935f0ad7f969857ccfae49f8c4ca8849c9b733583ce0e41533c1 SHA512 414e4d9cd87a259c5ce473d33e9f55c6aa54428f2024925f6bf49e68df2d458d45e42f865cc8a5ba97eca04ab85c035c253ab98503c5c3855e199b7b97043098
diff --git a/kde-apps/kdecore-meta/kdecore-meta-20.12.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-20.12.3.ebuild
index 747f60dace4a..8d22bd722458 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-20.12.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-20.12.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-20.08.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-21.04.0.ebuild
index d9dd4a2ed794..747f60dace4a 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-20.08.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 3d710361fa18..05e5cd7e93e6 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
-DIST kdeedu-data-20.08.3.tar.xz 335520 BLAKE2B f4dbde742cac32ef585574ff272c8274ef6b587cdcbea7364f7301ec611e92998df857689b8db9bd6d9c1817d057e44dd86a1c75723c6f44e0bacf3cf79fb0b8 SHA512 356dd58a156b312f4a71f3f3e1c736a6c1d3fccd027ff9de044597729dca1d3ae830e3e8b5342a2181ff38fdde2690c567cd704f25ca4ade34dd3e66a5a63a44
 DIST kdeedu-data-20.12.3.tar.xz 335416 BLAKE2B 2ffc9a521836b2a24bba19bbfd8ce6a70dec164c90d4d57d893ff4ce9111de13e24272df555db0dee84898159a38be5f819acf5bb9c7100c3c3e622b3aec0812 SHA512 f01ff9489e7548ef13ff0d4120e6d2cf77c5e41c26f0a74fa7979dde96cb89e1b08957017e54ae3df60bc440eae2abd653dd16d87d340f58ec17a9d84141286f
-EBUILD kdeedu-data-20.08.3.ebuild 345 BLAKE2B 41fd0c86a8ecd727d1429423e0773392fb4e139d8b67e4ad16b7e89a59e2c8716b2fe7f83a5f97b623c18476dfcc2ca586bd054118c88b435bec4fb9298743b9 SHA512 b63edb9b19b9f13a0ec51673a340aef92a9f1c4c227ac7aa7b937de598be703671319e45d5adc8d7bf8b09547c97f990b2ee1574cfc4b68051fcad1cb49c0305
-EBUILD kdeedu-data-20.12.3.ebuild 348 BLAKE2B 98e4d9d43e40d8ca48072c822e65156a8dd110c1dac602c5024685535bcfc427b9147e801e36a8d4965d5455dd240ab7f61d85a3271f9e939509f253075b49f9 SHA512 8eab227be35d22b6c0ed0b9e5702adcafbec44ba5235cae39bd41449c49e15007b3e33b4008d2dcefca6faeb5dd029853c6534679ae4e906fc1125ff83fa4e70
+DIST kdeedu-data-21.04.0.tar.xz 333792 BLAKE2B bfe005d9ca88cd0bdb239941f53b1d19483ef391b581dff49da69275b29208817f4f0aa7ba6fe83792157e8e23d788bbf2a2555401035bd3a506d8b6c8840bcd SHA512 dc7c71a6a420efa923d9b39fa7da3ecdea7504c337f31f6d4bfe8d1fb9ce3f0ceef1ad89c8ba199cf7c6ccaa5366c950bd9a62cf3403f52871c37bafd4525dfb
+EBUILD kdeedu-data-20.12.3.ebuild 345 BLAKE2B 316a4a729327f22630b07b69ea3fdcbfd79d379ac7b839572c3c2b9c51b578c61c2fc42dab521cae492a3fbdb7f3968c75a745174a7c54505ca10209093f6165 SHA512 abb4b66376f439d879d02a6b9b19b84a800b8c9e4c866730d7c325d8ba4f124b4068ad7e1df0ae432a24686b9e6defad3d16e004e65a60ec04cd0c17b92ea3af
+EBUILD kdeedu-data-21.04.0.ebuild 348 BLAKE2B 98e4d9d43e40d8ca48072c822e65156a8dd110c1dac602c5024685535bcfc427b9147e801e36a8d4965d5455dd240ab7f61d85a3271f9e939509f253075b49f9 SHA512 8eab227be35d22b6c0ed0b9e5702adcafbec44ba5235cae39bd41449c49e15007b3e33b4008d2dcefca6faeb5dd029853c6534679ae4e906fc1125ff83fa4e70
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-20.12.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-20.12.3.ebuild
index f4a76399035f..99a4e22a198c 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-20.12.3.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kdeedu-data/kdeedu-data-20.08.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-21.04.0.ebuild
index fcb228db73f6..f4a76399035f 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-20.08.3.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index d3d47e98865d..425042bd9ba9 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeedu-meta-20.08.3.ebuild 1206 BLAKE2B 6fce14aa475951d221e980a32ca897ad8a02bc528fc742b4b9abb7f792bca314a5529a73b597aeeee8aae39aebb4d2d5e31d92f29643aad5272c97be8c8859c4 SHA512 49d73404d0816db5bc44e43c83a7c42d50e3dfe2ee860590a867d72174197f6f307dd1f7aa3d9c6e270e0f2cbc10c8dac7fb0e08d56292c606aeb5e006fb1bf5
-EBUILD kdeedu-meta-20.12.3.ebuild 1209 BLAKE2B 8a3708473ac97cbb04bcac1152dbaccfe3cd44ced40ebcb7869ad99095e450e0c7ca92a8909b8253f5fda09d0a854d8e0bff021337e8cd63de78dfc741192e19 SHA512 b7b7abd5c312ad8600d716546574c8eec76df00dfceb945bc5f517e1e6225f6350b59a9802f5ec0ebbcfd7b461869b604608013d9c72c782ef4eb3c45095755a
+EBUILD kdeedu-meta-20.12.3.ebuild 1206 BLAKE2B e2f473e86877baf0ca717580f22a8a5e8049e3642fcdf761c7082388934e4858c531745ec7f81874c3238fbc968db5cddcafaeaafd5c5bc3c624a71a62cd6232 SHA512 510a5f40b16442a91cd7fb7f0bcfb62ec8e90b070e9f6dc4339fe86351feeadd205de4727c740b67dd69004d145f4192844917af682400596c569e68082bfe45
+EBUILD kdeedu-meta-21.04.0.ebuild 1209 BLAKE2B 8a3708473ac97cbb04bcac1152dbaccfe3cd44ced40ebcb7869ad99095e450e0c7ca92a8909b8253f5fda09d0a854d8e0bff021337e8cd63de78dfc741192e19 SHA512 b7b7abd5c312ad8600d716546574c8eec76df00dfceb945bc5f517e1e6225f6350b59a9802f5ec0ebbcfd7b461869b604608013d9c72c782ef4eb3c45095755a
 MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-20.12.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-20.12.3.ebuild
index 059d5892394e..a224f735883d 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-20.12.3.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-20.12.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-20.08.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-21.04.0.ebuild
index 40468c988e1d..059d5892394e 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-20.08.3.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index d92b53b12ee2..7ad6c10b1e79 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdegames-meta-20.08.3.ebuild 1804 BLAKE2B 50d9ae3a1cc9171edfa47c735408250ea5d9abbae3c75d81fee6d7cb54caf8c341f9497f7b0fa639637ca978435029440a39dd847493e4abe71a077075543447 SHA512 a6f364c017ce3eb925dab9b7ad8d28c81214ce7d1a357764f58a812dd1ab719c3b684160e0e78e302f2fff1810991b1c245ce75df4369660bf0e0855249b15b8
-EBUILD kdegames-meta-20.12.3.ebuild 1807 BLAKE2B ec4e9a72dcdba2cc25454e204c895a7a8d1a4346fd6a35c19ef57a2e96014f3e202ab386bd4ff35cbf6810849f2dca7a0a8fff68062a2b67b44b4934f721be4c SHA512 3d75ceb95e489c181cfebcb7aceea3eb99cb85923827b3b39c30c004f409480f791c0aa6e42b66cd85ffad749c91c2ab8eed65343d5d77c0bc72d8a1c9860896
+EBUILD kdegames-meta-20.12.3.ebuild 1804 BLAKE2B 1ea9c4228ab62ffcfcd645f55df6d5db7005078139d80c8ee75f5e20b0fef76bb0eefdeb09deae26fd3fdcf7decf33f262eb91d7d9e868055023c4ca55b71680 SHA512 b9be0ccdd464fc18681a1838fc90ed55c2309f06cdc45a898ceef0defd42f528dfda22842fd819d2d643966b757b25af05b596fd9fe5ece840e638bd6c7e6570
+EBUILD kdegames-meta-21.04.0.ebuild 1807 BLAKE2B ec4e9a72dcdba2cc25454e204c895a7a8d1a4346fd6a35c19ef57a2e96014f3e202ab386bd4ff35cbf6810849f2dca7a0a8fff68062a2b67b44b4934f721be4c SHA512 3d75ceb95e489c181cfebcb7aceea3eb99cb85923827b3b39c30c004f409480f791c0aa6e42b66cd85ffad749c91c2ab8eed65343d5d77c0bc72d8a1c9860896
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-20.12.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-20.12.3.ebuild
index 9c1bd5691767..6c9c14c5c343 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-20.12.3.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-20.12.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://games.kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-apps/kdegames-meta/kdegames-meta-20.08.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-21.04.0.ebuild
index cd5a665dee42..9c1bd5691767 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-20.08.3.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://games.kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index 1fdddc7faaa7..48cf4956281f 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdegraphics-meta-20.08.3.ebuild 894 BLAKE2B 1d56e344249d48412e8f4237b345551766c10c2e48dec8d3db2cec3cdd01e8bfef10a61d26be02cb786a837bb626c0db379bfc1e86801d66597194a992f36f26 SHA512 a49d51565d0087b70f5362bb4b8a9d37b6a99e5cffc076237227ce848b887ed46b538db5eabc5ba62f4600792c210c95eae09db9ce2799750cfe016675174703
-EBUILD kdegraphics-meta-20.12.3.ebuild 897 BLAKE2B b615ea795d66035158a429a7d1d9d0dd85e1b3c4ad453c57b1924809153be78d6b67616ec273f08581699b059c473c978ca6a4cf106dd27ef284128378ddaa7c SHA512 cd02cd445c892fac72f24566b866885e31360561210faf65b4a4bb65ba3ebec04e8fba81ef0a97deee5f2204392b24b1f77a8db93a2bfdbe08075dfbd064cd7f
+EBUILD kdegraphics-meta-20.12.3.ebuild 894 BLAKE2B 7b885454a3212f1c7b76bd4a491b3f144ff0212e54cb66cf4a03ae933bf4c5ebb535f3231c21521be05e14b534c01ff00b11d4aa7e5c268026fa2ac2dcd13856 SHA512 467468abca49bcc821ec695a6078979eb811175c849bcaafe31a9449d275abc1836c5c2d0e13f0dec1c9a7f28cb09c89a6f2c992839baf4794dd420c7df2c379
+EBUILD kdegraphics-meta-21.04.0.ebuild 897 BLAKE2B b615ea795d66035158a429a7d1d9d0dd85e1b3c4ad453c57b1924809153be78d6b67616ec273f08581699b059c473c978ca6a4cf106dd27ef284128378ddaa7c SHA512 cd02cd445c892fac72f24566b866885e31360561210faf65b4a4bb65ba3ebec04e8fba81ef0a97deee5f2204392b24b1f77a8db93a2bfdbe08075dfbd064cd7f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-20.12.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-20.12.3.ebuild
index d699eddfdd29..010dc1ce8b36 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-20.12.3.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-20.12.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/graphics"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="scanner"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-20.08.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-21.04.0.ebuild
index c74baf42d5e8..d699eddfdd29 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-20.08.3.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/graphics"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="scanner"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 435bb7381c3e..73bf432acfd2 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
-DIST kdegraphics-mobipocket-20.08.3.tar.xz 17048 BLAKE2B 118eb13481ffbdcfa92e07d4a3e32fa0e628f6e2da81c1d0159fde7d929d6dce2dc4a316d4235a6338198947cf049670603e2e1c9719f07386c43e3b83e9dec8 SHA512 9442b17d4abf01d5d808eb05b0027f102dc714bedd470307e9db866ea2424eab9d4922be36ba8a69f567350792b64f50284b3797fc8650b8c801bcf315b0d1db
 DIST kdegraphics-mobipocket-20.12.3.tar.xz 17056 BLAKE2B 9d04abfe25535c237db8acdb9e64d093a3da3fd87ad7940e1913b38a53fb59a449001a3b05a9a9ee352bb77af4aabe83511d7433ca0b9a57e3589ecc243b14fd SHA512 53367ccebe087186a30959852daaa0168f0e4c65f11ec9e074dd2f52c37569258b304a3ee5159770d5d2571d5aea98be6e113d9112ed249d5c948f2f00d92e8d
-EBUILD kdegraphics-mobipocket-20.08.3.ebuild 516 BLAKE2B 81f8126b747363716392652cc64fedb2f1f74a66ba6ce1a8fe693815bc3e2f2bd1bb7c50964d3c8e36fde8aec24c79cf276bf2405f5a568505759fdc89458fbb SHA512 dd0f4ba6e7c015d14cba5e02a2748afb8c07746c2ffd5134b36af40485f0f8b6bfc20ba39719813ee8630f6b2f83ffdeeafb1e913ad69bb0a02380107bebfceb
-EBUILD kdegraphics-mobipocket-20.12.3.ebuild 519 BLAKE2B 7b22f869e2562735261e5a805e6749ea29b8792ac8dd0992a59a61f6623a93581d91d82023199651c8098b8d2c9672e8727a3d854d732cf485ce362fb4bc1cf0 SHA512 a0d69caf4f5ae4b6e7e606d170439af51957bf4bae7b0af3546e6919abe7dfb0a874533e1f3a8dcf74c4eaab90aeec4a80128e32ff01543897c900c441ba285c
+DIST kdegraphics-mobipocket-21.04.0.tar.xz 17096 BLAKE2B 205719cb732aacb2eba71925f297553a93176b08603589fe6e626dfe4b279f2a16f2e91b0c375d981e21554d258405c11dda5782cc9c8d9acf2d5568af2109d9 SHA512 2364ffd59f98963542c29cb98d285d7924a0e9a9a77a37e0a4201d4d57629ef97101f8685f2eab279f5b63b9556ad404f87ffe9e14bf42bc382b924e52dead6a
+EBUILD kdegraphics-mobipocket-20.12.3.ebuild 516 BLAKE2B 8a65a5496de35ffb8ba9de3f4068977a76059c1af287ae3e2f1f0cde28675e4013b6e7d15511f67a13b3fe6871b6f915a3185f5b22a201b93e8bb289a3a8521f SHA512 43f0c4220195563b5593662b1d7761166443c15846c62839f0cbbffced0e4dc7ce3a4f3baa91d1dc58b8a6b3d02fae6fe1807c2968de0d90ad6c4aeb9c52f8e5
+EBUILD kdegraphics-mobipocket-21.04.0.ebuild 519 BLAKE2B da2bb330bd0c51594f7ac1a430690eda09d5edbf5b82cd60d10479e6b3bf1c5b7833b1d5a1302e60f1b17b31d6b26578155e0bbc8034387823575a9ff2a3f284 SHA512 8200a3960c34aa5380309765095a9a9241b9414e1b7b03d189d74166ca3dfeb29d16e07fb18136d93a1fcb40c54f17d42a2209f9989fb65e56122bbd929cd8f3
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.12.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.12.3.ebuild
index c4abd90fac86..003e1b3b67c1 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.12.3.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.12.3.ebuild
@@ -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 x86"
 IUSE="+thumbnail"
 
 DEPEND="
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.08.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.04.0.ebuild
index 03a80aa56ce4..bf1ea99cb9ee 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.08.3.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.04.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Library to support mobipocket ebooks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+thumbnail"
 
 DEPEND="
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index c533c8b60919..95cc79ee1a5e 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdemultimedia-meta-20.08.3.ebuild 839 BLAKE2B 6e6395a9138c96c1873f9c8ec511577dda2a2ade94faab27bec49ca363076e060fa3ee6306a64e9cb7be95a22af32d0d30aa78000c37a63ecce580fd6fb54f48 SHA512 5f2b170808de51495340f2dcf7185af2b493d0deed0da441e17fc49f9b9e9c01a2c4e1058826e229618b825e25a9abd8263463ce431f2a3425974df70cf47a41
-EBUILD kdemultimedia-meta-20.12.3.ebuild 842 BLAKE2B b504f61ee389aeb12cbc765e7214baf9a54e5925d07568956b90f8343cd4b3a71c8dc1a3029011eec53ef4b58c2cf0ad273eb192901370ae6a8c4824cbe58186 SHA512 a36fba533369d24c41e480184d34dace9b2b296937fc6a582d154a840b194f32ea17b7e06b280a3e832d5c2be6860631a16bebee8efb87b9138a5618b805c9be
+EBUILD kdemultimedia-meta-20.12.3.ebuild 839 BLAKE2B b9698977a516c6d21b6819019a376024eeba5b84c7ac8e5659b57c9d552917a2cb4b446ca0212441cf7594128f71e8f96646082ea5c7ea12167bc5998dafcfb3 SHA512 490d22956bf852c149a00e16e7464a8425809e7170ebd222eafd2d5909f3ae09356d6d364e317d7b5b406e275e2e3affe0c28055e4e67deb62fde361542db799
+EBUILD kdemultimedia-meta-21.04.0.ebuild 842 BLAKE2B b504f61ee389aeb12cbc765e7214baf9a54e5925d07568956b90f8343cd4b3a71c8dc1a3029011eec53ef4b58c2cf0ad273eb192901370ae6a8c4824cbe58186 SHA512 a36fba533369d24c41e480184d34dace9b2b296937fc6a582d154a840b194f32ea17b7e06b280a3e832d5c2be6860631a16bebee8efb87b9138a5618b805c9be
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.12.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.12.3.ebuild
index cb264994a964..bcbe5b92ee14 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.12.3.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.12.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-20.08.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.04.0.ebuild
index d4e7ec2b744e..cb264994a964 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.08.3.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 24026ce7db80..2d23cf5c004c 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
-DIST kdenetwork-filesharing-20.08.3.tar.xz 321644 BLAKE2B ae458979d4d2f82fe102c8bb7e7178c6ff4c197901038a98d50f5a03c8a9af2660450f9937c4c5d5e8f38b5db34af6fbb50a0d261fa8e203205816c45ba6fd1f SHA512 88171c288c9cb56644bd719827fa1f060572353745c4ff6f5f9de3c02e8a508e4b222f6029e424ad857508c540bce37229fa2d06e52ff43121bac0808cafc398
 DIST kdenetwork-filesharing-20.12.3.tar.xz 346716 BLAKE2B 8b80132ad55d26ecd9ffffaf11198ea58f284a9118289e4d22b7a74785b6617956fa0116f55304b0623a035e43d1aa3c9b220f564c5eba0d7ee7e656671a797c SHA512 ef635f83e9f4607bf1f0458761dbe918112ad2cee6c798f40c3666836dfa9fec2a6a4d6fa9237ab7694257675f1ab6c09f64a8636f18bc7560a4c4bcc0bee364
-EBUILD kdenetwork-filesharing-20.08.3.ebuild 760 BLAKE2B cc074005236ec07e3c3b627ac92496d8bfb9d8fa2c60d7a6381d5a64b964bb81b19a232c1115d2519966af3b843a59f60a63b1191b52c9621525c09b01caafaf SHA512 b9e703a43dcf74e9f250a95d6b1cada913c7f980b34809e02da1f8682d994b001fc4973bb3718fd151bfdd31a945750f74e63780afe8c8e6ae6a49a5dca7f28d
-EBUILD kdenetwork-filesharing-20.12.3.ebuild 931 BLAKE2B 3f3f5f41f45780b57a8627b058dfac682f22dbe3f17dfd2ba0ba5d62f747044e88767ffd5dc54c09b96be99b76d8ba30086d70b211b315d2d565bbc4fc4a03fb SHA512 941d40574f808ad336d9b5edcee515ec8f681f8baca92186d715a53083c0e62bcda78ba86ca02a1a651420a057c4b812bb738931646903642f7ad3655463fac2
+DIST kdenetwork-filesharing-21.04.0.tar.xz 353264 BLAKE2B 0dcd7c079e57bc3ec19f7d276360335a39c10d411763d2cddec2aa523a4c3af4ae4c3c0014f422d6d25af529b582734bb66a1f5ceeb9e0b169ef891faa062f90 SHA512 1694adec76d49d97e3304f8a8d2707920bc982a7894cc82d4d12720a6baba4298d870c0aeee674d98b697278b225e6feb83ac634b13554afe3890f19b62209ae
+EBUILD kdenetwork-filesharing-20.12.3.ebuild 924 BLAKE2B 5bd777f5cf3b8fa9d885162b57766c6eb06991eda8fc01d86a6bdace5dfd0d9c875ba11c29e982e31b6a2b173ecb39e3d3677bf5aaba31590d642ba7acee1974 SHA512 0848694a688421948fe36a4c889ce611f27d96aa4aa744f4d5a3d7e5008dc40e0be3d51615d40b282ed06571bb274e4b046c51740b3a38ab608af60343f373a6
+EBUILD kdenetwork-filesharing-21.04.0.ebuild 927 BLAKE2B 1cc97453767a5bbe523b7bebdb253211fdedfcd3ca31e9fbbfbe52002d2d20b041836e1dda6b3a2833d9e433d5160f3630f43035c4f71c99cdc68336468fad3a SHA512 8e4513c58f5430103421c52737655ab07a0748445e750094e2e9ccd238833f84533430638c70c7733785b8c7e0299379ac2138434f89d6f519b6b172c5fc5048
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.12.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.12.3.ebuild
index e6e967c0be4e..0f0970c9024f 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.12.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.12.3.ebuild
@@ -7,12 +7,12 @@ KFMIN=5.75.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
-DESCRIPTION="SMB filesharing config module for systemsettings"
+DESCRIPTION="Samba filesharing plugin for file properties"
 HOMEPAGE="https://apps.kde.org/en/kdenetwork_filesharing"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.08.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.04.0.ebuild
index 9d3e6db03848..ffe61e15ffc8 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.08.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.04.0.ebuild
@@ -1,30 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
-DESCRIPTION="SMB filesharing config module for systemsettings"
+DESCRIPTION="Samba filesharing plugin for file properties"
 HOMEPAGE="https://apps.kde.org/en/kdenetwork_filesharing"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	net-fs/samba
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index 8a56cd106f3a..8080a6660639 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdenetwork-meta-20.08.3-r1.ebuild 749 BLAKE2B f0158e5beb75bc468d26f3f8ec65fea2a9d4d2c22b3f040ffc580f9e370bb4ca7795f8cfde971eb3b6ead5b986dca35e9f7482ff5a886aee2821c8cdee035db9 SHA512 9a1ca1fc8e0006b9d1fef7f91e125eb32a123c1734a0001928be658b2b611ce87a1c6d150feea04c80f654b686637d2f0b44e18e9d3256127110518d1f4898bc
-EBUILD kdenetwork-meta-20.12.3.ebuild 890 BLAKE2B d3505fac7cd6927294110babdf2425fc9602ef338a5f83cd1a12e7628f62fc44e373de54fe5fa0900a2ec4bbe4528543926f89f0834a66ce9d68774b30920ec3 SHA512 738bfdac0bea9541e40dd3d5742e69c1d7f475c8222dd102cb555641c2b8ac684df85d1969127701382c29fd9b1c6cce95344da1c2585b375e6a0d728d80adc7
-MISC metadata.xml 676 BLAKE2B 435b0b937ccab2e9082ff1397ce0d62b0d80a545b5ac9aa161ecd2cc5d3ed104006b8bf4251f462e659fcd12af8f1115a8c55467f4f13f6a040eafd350c5158a SHA512 fccb910b01eee18eb60fad2243a690cf27f30909d366111da16864e9585c925279908ddea33106120ac4a88207b4e54fa7d40785d3c526ad1c5c6e461632787c
+EBUILD kdenetwork-meta-20.12.3-r1.ebuild 904 BLAKE2B 710ff9e513a359de7038a3c7fd84e09fdaba495176a712d483340dc9fa71c1bb72225433e1ea175d7fde5adf93245f6d9afa5ee327d4443aaba9cf413971aec7 SHA512 fc26677b0372968f53020895ad27918d449f18364e8d48d1f94dcda75441ad4a472facdef4386235d28910de7dc821fc6736b2d5e9a10a82178af97d0e90b9d4
+EBUILD kdenetwork-meta-21.04.0.ebuild 907 BLAKE2B c1a475908aa2dcddda8c0b71437835a0d3ea93f749a679e566f35ca7174132c9057d03ce0024ea1179bc20734103f62f24c78a989c0c9be6d4b166c694df0bb2 SHA512 5da145066920161170b9bbccd241a35654f0dd4d3c9bb28a6408ae4712c5190d9d1828b7d45d802216dec1b88c95385558efea6c2437ce31e023d1ba15242ff8
+MISC metadata.xml 766 BLAKE2B 07e98c3de6c7176a687ca99c8fb0ac74a5128865a1b3abd4774aa11b8884274115f38ddad5da11ac5e84071bf5b9a8987a37a4202c397838eec38c0aa637530b SHA512 36c978d73c8564969fbc234ca7763256cd89069d907a7d1ce5db87681eeaa3a691a3634afd8ffad78adcb3f6d4bad5f71b6a7cb4badbe2f67357cdace976e357
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-20.08.3-r1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-20.12.3-r1.ebuild
index eb279a721295..43505127fbc9 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-20.08.3-r1.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-20.12.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,19 +9,22 @@ HOMEPAGE="https://kde.org/"
 LICENSE="metapackage"
 SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="dropbox +webengine"
+IUSE="+bittorrent dropbox samba +webengine"
 
 RDEPEND="
-	>=kde-apps/kdenetwork-filesharing-${PV}:${SLOT}
 	>=kde-apps/kget-${PV}:${SLOT}
 	>=kde-apps/kopete-${PV}:${SLOT}
 	>=kde-apps/krdc-${PV}:${SLOT}
 	>=kde-apps/krfb-${PV}:${SLOT}
 	>=kde-apps/zeroconf-ioslave-${PV}:${SLOT}
 	>=kde-misc/kdeconnect-${PV}:${SLOT}
-	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:${SLOT} )
-	webengine? (
-		>=kde-apps/plasma-telepathy-meta-${PV}:${SLOT}
-		>=kde-misc/kio-gdrive-${PV}:${SLOT}
+	>=kde-misc/kio-gdrive-${PV}:${SLOT}
+	>=net-irc/konversation-${PV}:${SLOT}
+	bittorrent? (
+		>=net-libs/libktorrent-${PV}:${SLOT}
+		>=net-p2p/ktorrent-${PV}:${SLOT}
 	)
+	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:${SLOT} )
+	samba? ( >=kde-apps/kdenetwork-filesharing-${PV}:${SLOT} )
+	webengine? ( >=kde-apps/plasma-telepathy-meta-${PV}:${SLOT} )
 "
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-20.12.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-21.04.0.ebuild
index 6623f718ec7b..8831a2f47923 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-20.12.3.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-21.04.0.ebuild
@@ -9,10 +9,9 @@ HOMEPAGE="https://kde.org/"
 LICENSE="metapackage"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+bittorrent dropbox +webengine"
+IUSE="+bittorrent dropbox samba +webengine"
 
 RDEPEND="
-	>=kde-apps/kdenetwork-filesharing-${PV}:${SLOT}
 	>=kde-apps/kget-${PV}:${SLOT}
 	>=kde-apps/kopete-${PV}:${SLOT}
 	>=kde-apps/krdc-${PV}:${SLOT}
@@ -26,5 +25,6 @@ RDEPEND="
 		>=net-p2p/ktorrent-${PV}:${SLOT}
 	)
 	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:${SLOT} )
+	samba? ( >=kde-apps/kdenetwork-filesharing-${PV}:${SLOT} )
 	webengine? ( >=kde-apps/plasma-telepathy-meta-${PV}:${SLOT} )
 "
diff --git a/kde-apps/kdenetwork-meta/metadata.xml b/kde-apps/kdenetwork-meta/metadata.xml
index a87ce4de0014..b6ffc17ea56b 100644
--- a/kde-apps/kdenetwork-meta/metadata.xml
+++ b/kde-apps/kdenetwork-meta/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="bittorrent">Pull in <pkg>net-p2p/ktorrent</pkg> for BitTorrent protocol support</flag>
 		<flag name="dropbox">Enable support for Dropbox in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-dropbox</pkg></flag>
-		<flag name="webengine">Enable Google Drive support via <pkg>kde-misc/kio-gdrive</pkg> and instant messaging integration via <pkg>kde-apps/plasma-telepathy-meta</pkg></flag>
+		<flag name="samba">Enable support for <pkg>net-fs/samba</pkg> file sharing plugin from within file properties</flag>
+		<flag name="webengine">Enable support for Plasma Telepathy (instant messaging) integration via <pkg>kde-apps/plasma-telepathy-meta</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index f5da4b59b503..335b00e2efa1 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,6 +1,5 @@
-AUX kdenlive-20.08.3-webengine.patch 8643 BLAKE2B 705fe02d7fdfe29fc6cd414a358bcf4962a853fd8d7191771d9c2fd925025923116378e4fccd98e87cc4bce3cde2cbcb8b7c54c72d22c003d09a473c0d8703cc SHA512 03306e28e26535dae030e9ac29f90507045ad6c718567337be7bea3e3eb6348a4bacd43f6d1546850459714cbcdfb08f956c67d48d1ecdd396e55f6edb41e5a1
-DIST kdenlive-20.08.3.tar.xz 11383252 BLAKE2B aa8075758ec4b967c8eeabbab611278130df7235f10186b5bc4142a06805fb2cae94806059edf62f9af86a3640cee734863316e7651f3c67d020da32ab0d63ff SHA512 ed3ccffbe7c56d54e3c490d818a504bc4a3d65fd81c4d816a549d2a7d436b5320497145d122f352066def23c43aed523e2d31eb2a2f50378fb0122a89a23c424
 DIST kdenlive-20.12.3.tar.xz 11514396 BLAKE2B eb789a2dcddc67a73122d3fcab06d43d72566de8aeec97dd7bc8b76918231a859e86c8859be7eaab4017c9048edaa951fd143d8e24187437252490464bef0773 SHA512 b21c9bd59171969ab84b93bab2617333160521c3b99b61a2182f9d9b5e65c3220b6dd960d71fe5eeb032733127392dafd40748b950b9973e0edfb5ae6317380a
-EBUILD kdenlive-20.08.3.ebuild 2685 BLAKE2B 444add9a5f84cf6630dd068b423e666cec48f60d1d6bd584039c255153b07a3010d0c5a6b572bef93e3380a61e107505bcbe4b4630dd7aeb9960408ebecd28c5 SHA512 f43fac8851377bbf644522016b916d3990618094926a0462a392db6fdb340dbeafe7b2e799892ffe488c6c512f2955c9d246ce554272df0bb7b11808640e3bd5
-EBUILD kdenlive-20.12.3.ebuild 2612 BLAKE2B 8adb0446f11f2a2abfa79c70597eb0d0a5d0435dc5139503e7d4bc7e18fde4289e19e869c61203f3c99a1218b8fbf4bfee31b206f6626ff8a9d1a93c38a32628 SHA512 b00c7eafe61788ca7b212b105dc9380e04a3b0310c7828077ae7de1deb0e5de026dc354ce9ab81c11977771f7d25a3bd4459743114f41bfa55599bc484c3d673
+DIST kdenlive-21.04.0.tar.xz 11717116 BLAKE2B 4717757f24b81c3f8ece13e0968a14ae01254bcb168fef7d1827d3cc0b826d395f58454c59b8172621ff170411a7b29b9f3befb9340c9eb50412ebc7ed624aac SHA512 cc44df08e0fbe2a16646d005782aac3a8522e95cabc6cfb157b083f460e77e37bad0ef39b8a8ab2aa488faab161e81fb527108daf71d4f3b281b2ad18148a17f
+EBUILD kdenlive-20.12.3.ebuild 2609 BLAKE2B c0e1d6a000d558c613bb79bc5375f7937f25fec6528edec55ddcfd6223b020ab5d29a6fb60ee0d83baef1da57dde9a2fd90ab1bedce119f445011505502a7939 SHA512 0049ef2fc7e1ced0585a16de9a4dec01fcba55787f52dddff8260cf863e8267412870c222fadd45256e1fd1e92098fa62f51d03ca03715fc0f99374e8572ee4a
+EBUILD kdenlive-21.04.0.ebuild 2517 BLAKE2B a17cd792d035ad7a0c63aa2209afd3ff1005cbdab21ea84e9280ac6536954df8b607eb1030ef18120c6a1384a7ff5ae5b9cc7d1dadef1abf420a40e27c80e7fc SHA512 8a0dd28cab7fa8a6093ec9d95b7086d82d24906042b470765e1224d241503fd61134186a44a6a300dd663e3cb62ebb6e0f823438d956b6f394b1e5663aa6754c
 MISC metadata.xml 489 BLAKE2B 51ddd82047dffa39b9fcd279857844864ae16144b31a5768384726729019541c9033f6cf2b358331f039954878cb409b4eda3dde8356ca2d3a345667cd6afe04 SHA512 855156534b3863f573fb9ccdffd144d11be83bb77c0b4e0f968a175730611bbc6b16f2a85e172076561aa02b498c975830187006a24a3095af33b6685835409f
diff --git a/kde-apps/kdenlive/files/kdenlive-20.08.3-webengine.patch b/kde-apps/kdenlive/files/kdenlive-20.08.3-webengine.patch
deleted file mode 100644
index 0ffff1b4a384..000000000000
--- a/kde-apps/kdenlive/files/kdenlive-20.08.3-webengine.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From 51feccf3cc0939d42c3ff237eb17f9a6091f1dd8 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 23 Oct 2020 15:32:39 +0200
-Subject: [PATCH] Port to QtWebEngineWidgets
-
-Fixes https://invent.kde.org/multimedia/kdenlive/-/issues/775
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt                   |  2 +-
- src/CMakeLists.txt               | 12 ++++++------
- src/qt-oauth-lib/logindialog.cpp |  4 ++--
- src/qt-oauth-lib/logindialog.h   |  3 +--
- src/qt-oauth-lib/oauth2.h        |  4 ++--
- src/ui/logindialog_ui.ui         |  6 +++---
- src/utils/resourcewidget.cpp     | 14 +++++++-------
- 7 files changed, 22 insertions(+), 23 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d434f1e31..a3f838433 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,7 +71,7 @@ if(WIN32)
-     set(MLT_PREFIX "..")
- else()
-     set(MLT_PREFIX ${MLT_ROOT_DIR})
--    find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
-+    find_package(Qt5 OPTIONAL_COMPONENTS WebEngineWidgets QUIET)
- endif()
- 
- if(KF5FileMetaData_FOUND)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 551178133..8356d4e47 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -65,7 +65,7 @@ add_subdirectory(transitions)
- add_subdirectory(utils)
- add_subdirectory(widgets)
- add_subdirectory(xml)
--if(Qt5WebKitWidgets_FOUND)
-+if(Qt5WebEngineWidgets_FOUND)
-     add_subdirectory(qt-oauth-lib)
- endif()
- ## top_SRCS
-@@ -178,12 +178,12 @@ if(KF5_PURPOSE)
-     target_link_libraries(kdenliveLib KF5::Purpose KF5::PurposeWidgets)
- endif()
- 
--if(Qt5WebKitWidgets_FOUND)
--    message(STATUS "Found Qt5 WebKitWidgets. You can use your Freesound.org credentials to download files")
--    target_compile_definitions(kdenliveLib PRIVATE -DQT5_USE_WEBKIT)
--    target_link_libraries(kdenliveLib Qt5::WebKitWidgets)
-+if(Qt5WebEngineWidgets_FOUND)
-+    message(STATUS "Found Qt5 WebEngineWidgets. You can use your Freesound.org credentials to download files")
-+    target_compile_definitions(kdenliveLib PRIVATE -DQT5_USE_WEBENGINE)
-+    target_link_libraries(kdenliveLib Qt5::WebEngineWidgets)
- else()
--    message(STATUS "Qt5 WebKitWidgets not found. You cannot use your Freesound.org credentials, only preview files can be downloaded from the Online Resources Widget")
-+    message(STATUS "Qt5 WebEngineWidgets not found. You cannot use your Freesound.org credentials, only preview files can be downloaded from the Online Resources Widget")
- endif()
- 
- if(Q_WS_X11)
-diff --git a/src/qt-oauth-lib/logindialog.cpp b/src/qt-oauth-lib/logindialog.cpp
-index a41aa420b..111978831 100644
---- a/src/qt-oauth-lib/logindialog.cpp
-+++ b/src/qt-oauth-lib/logindialog.cpp
-@@ -38,7 +38,7 @@
- #include "ui_logindialog_ui.h"
- 
- #include "kdenlive_debug.h"
--#include <QWebView>
-+#include <QWebEngineView>
- 
- LoginDialog::LoginDialog(QWidget *parent)
-     : QDialog(parent)
-@@ -54,7 +54,7 @@ LoginDialog::LoginDialog(QWidget *parent)
-         i18n("Enter your freesound account details to download the highest quality version of this file. Or use the High Quality "
-              "preview file instead (no freesound account required)."));
-     // m_ui->textBrowser
--    connect(m_ui->webView, &QWebView::urlChanged, this, &LoginDialog::urlChanged);
-+    connect(m_ui->webView, &QWebEngineView::urlChanged, this, &LoginDialog::urlChanged);
- }
- 
- LoginDialog::~LoginDialog()
-diff --git a/src/qt-oauth-lib/logindialog.h b/src/qt-oauth-lib/logindialog.h
-index 963b38ec5..c34383bf2 100644
---- a/src/qt-oauth-lib/logindialog.h
-+++ b/src/qt-oauth-lib/logindialog.h
-@@ -47,11 +47,10 @@ class LoginDialog;
- 
- /**
-   \brief This is the dialog that is used to login to freesound
-- \details It contains a QWebView object to display the freesound web page. I did try using a QTextBrowser
-+ \details It contains a QWebEngineView object to display the freesound web page. I did try using a QTextBrowser
-  for this purpose but it responds to the URL that is used to connect with
-  "No document for
-  https://www.freesound.org/apiv2/oauth2/authorize/?client_id=3duhagdr874c&redirect_uri=https://www.freesound.org/home/app_permissions/permission_granted/&response_type=code"
-- The use of QWebView adds a dependency on the KF5WebKit to kdenlive. Need install libkf5webkit5-dev package on ubuntu
-  */
- class LoginDialog : public QDialog
- {
-diff --git a/src/qt-oauth-lib/oauth2.h b/src/qt-oauth-lib/oauth2.h
-index f28724455..03993a214 100644
---- a/src/qt-oauth-lib/oauth2.h
-+++ b/src/qt-oauth-lib/oauth2.h
-@@ -45,7 +45,7 @@
- const QLatin1String OAuth2_strClientSecret("441d88374716e7a3503997151e4780566f007313"); // obtained when ttguy registered the kdenlive application with freesound
- #endif
- 
--#ifdef QT5_USE_WEBKIT
-+#ifdef QT5_USE_WEBENGINE
- 
- class LoginDialog;
- 
-@@ -135,6 +135,6 @@ private:
-     void buildLoginDialog();
- };
- 
--#endif // QT5_USE_WEBKIT
-+#endif // QT5_USE_WEBENGINE
- 
- #endif // OAUTH2_H
-diff --git a/src/ui/logindialog_ui.ui b/src/ui/logindialog_ui.ui
-index 20827d686..e98a68ed2 100644
---- a/src/ui/logindialog_ui.ui
-+++ b/src/ui/logindialog_ui.ui
-@@ -15,7 +15,7 @@
-   </property>
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="1" column="0">
--    <widget class="QWebView" name="webView">
-+    <widget class="QWebEngineView" name="webView">
-      <property name="url">
-       <url>
-        <string>about:blank</string>
-@@ -51,9 +51,9 @@
-  </widget>
-  <customwidgets>
-   <customwidget>
--   <class>QWebView</class>
-+   <class>QWebEngineView</class>
-    <extends>QWidget</extends>
--   <header>QtWebKitWidgets/QWebView</header>
-+   <header>QtWebEngineWidgets/QWebEngineView</header>
-   </customwidget>
-  </customwidgets>
-  <resources/>
-diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp
-index 79bb48898..d0eaa225b 100644
---- a/src/utils/resourcewidget.cpp
-+++ b/src/utils/resourcewidget.cpp
-@@ -49,7 +49,7 @@
- #include <QPixmap>
- #include <klocalizedstring.h>
- 
--#ifdef QT5_USE_WEBKIT
-+#ifdef QT5_USE_WEBENGINE
- #include "qt-oauth-lib/oauth2.h"
- #endif
- 
-@@ -103,7 +103,7 @@ ResourceWidget::ResourceWidget(QString folder, QWidget *parent)
-     search_text->setFocus();
-     connect(search_text, SIGNAL(returnPressed()), this, SLOT(slotStartSearch()));
- 
--#ifdef QT5_USE_WEBKIT
-+#ifdef QT5_USE_WEBENGINE
-     m_pOAuth2 = new OAuth2(this);
-     connect(m_pOAuth2, &OAuth2::accessTokenReceived, this, &ResourceWidget::slotAccessTokenReceived);
-     connect(m_pOAuth2, &OAuth2::accessDenied, this, &ResourceWidget::slotFreesoundAccessDenied);
-@@ -375,7 +375,7 @@ void ResourceWidget::slotSaveItem(const QString &originalUrl)
-         path.append(m_currentService->getDefaultDownloadName(item));
- 
-         if (m_currentService->serviceType == AbstractService::FREESOUND) {
--#ifdef QT5_USE_WEBKIT
-+#ifdef QT5_USE_WEBENGINE
-             sFileExt = m_currentService->getExtension(search_results->currentItem());
- #else
-             sFileExt = QStringLiteral("*.") + m_currentInfo.HQpreview.section(QLatin1Char('.'), -1);
-@@ -402,7 +402,7 @@ void ResourceWidget::slotSaveItem(const QString &originalUrl)
-     }
-     slotSetDescription(QString());
-     button_import->setEnabled(false); // disable buttons while download runs. enabled in slotGotFile
--#ifdef QT5_USE_WEBKIT
-+#ifdef QT5_USE_WEBENGINE
-     if (m_currentService->serviceType == AbstractService::FREESOUND) { // open a dialog to authenticate with free sound and download the file
-         m_pOAuth2->obtainAccessToken();                                // when  job finished   ResourceWidget::slotAccessTokenReceived will be called
-     } else {                                                           // not freesound - do file download via a KIO file copy job
-@@ -841,7 +841,7 @@ void ResourceWidget::DownloadRequestFinished(QNetworkReply *reply)
-                 m_desc.append(m_saveLocation);
-                 updateLayout();
-             } else {
--#ifdef QT5_USE_WEBKIT
-+#ifdef QT5_USE_WEBENGINE
-                 m_pOAuth2->ForgetAccessToken();
- #endif
-                 m_desc.append(QStringLiteral("<br>") + i18n("Error Saving File"));
-@@ -850,11 +850,11 @@ void ResourceWidget::DownloadRequestFinished(QNetworkReply *reply)
-         } else {
- 
-             if (reply->error() == QNetworkReply::AuthenticationRequiredError) {
--#ifdef QT5_USE_WEBKIT
-+#ifdef QT5_USE_WEBENGINE
-                 m_pOAuth2->obtainNewAccessToken();
- #endif
-             } else {
--#ifdef QT5_USE_WEBKIT
-+#ifdef QT5_USE_WEBENGINE
-                 m_pOAuth2->ForgetAccessToken();
- #endif
-                 m_desc.append(QStringLiteral("<br>") + i18n("Error Downloading File. Error code: %1", reply->error()) + QStringLiteral("<br>"));
--- 
-2.29.1
-
diff --git a/kde-apps/kdenlive/kdenlive-20.12.3.ebuild b/kde-apps/kdenlive/kdenlive-20.12.3.ebuild
index 8facec13c036..013ec4cb7c15 100644
--- a/kde-apps/kdenlive/kdenlive-20.12.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-20.12.3.ebuild
@@ -15,7 +15,7 @@ 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 webengine"
 
 BDEPEND="
diff --git a/kde-apps/kdenlive/kdenlive-20.08.3.ebuild b/kde-apps/kdenlive/kdenlive-21.04.0.ebuild
index 8db9f9c0d767..a4296f92962a 100644
--- a/kde-apps/kdenlive/kdenlive-20.08.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,20 +15,22 @@ HOMEPAGE="https://kdenlive.org/en/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="gles2-only semantic-desktop share v4l webengine"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only semantic-desktop share v4l"
+
+RESTRICT+=" test" # segfaults, bug 684132
 
 BDEPEND="
 	sys-devel/gettext
 "
 DEPEND="
-	dev-cpp/rttr
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
 	>=dev-qt/qtmultimedia-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtnetworkauth-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -56,27 +58,21 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/mlt-6.20.0[ffmpeg,frei0r,kdenlive(+),melt(+),qt5,sdl,xml]
+	>=media-libs/mlt-6.26.0[ffmpeg,frei0r,kdenlive(+),melt(+),qt5,sdl,xml]
 	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	v4l? ( media-libs/libv4l )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
 	media-video/ffmpeg[encode,sdl,X]
 "
 
-RESTRICT+=" test" # segfaults, bug 684132
-
-PATCHES=( "${FILESDIR}/${PN}-20.08.3-webengine.patch" ) # pending upstream
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
 		$(cmake_use_find_package share KF5Purpose)
 		$(cmake_use_find_package v4l LibV4L2)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index b860e2b01f89..b1110061b9b2 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
-DIST kdepim-addons-20.12.2.tar.xz 2145492 BLAKE2B 6c143977f8e645c9fde13fb5453c292cc8b4068721cb82beac942dfa571906648b03e49e0aa69e37c8042d4a3c0cea4b5befe48716adc736b7bdbf03b0c6b4c9 SHA512 33ed5c0e6444c292f78767c32778ac11a4d1e567c7fde2c85ab10016ddaa7adef7d29e2c75635b1538abf0e6f59eaeae0810b3b122c9aeadc0de407e476c7797
 DIST kdepim-addons-20.12.3.tar.xz 2145600 BLAKE2B 142a519bd57a311042ecbdd1e246a6d4b8bccd64c64d1aeb13755cd5b55383b161082fdd897ccbd2cce83a5f7e9c24b2951cf25f88b2deae90ae0da5737c169d SHA512 345febeb6cd6db60f4c5e246d0a775e828310bca50288e36ba676185404ae5dfe556262a882a201e85cad851b3612a27de15e5b9d6076ee109abdb01e4909058
-EBUILD kdepim-addons-20.12.2.ebuild 2504 BLAKE2B 08da26f0bd40893ba038fa59e334b13c3913612ef564b1e7d6121c76ff710d024fe6229656afd249f8caeb2877270f8b6b811d40eefafc113fa5c2007dd55ecc SHA512 05c45241c34f455c3c855636452cc617dcb0318989e2cb6e047e1ef5f814d3bc12ba3e7d25c9f149afb590d198470e6dc1a72370bfe62fef9bf4842c385d661c
-EBUILD kdepim-addons-20.12.3.ebuild 2507 BLAKE2B 1768157c83c871ee763e91cab0edc1d706a754fb54de876185452b31cf66b7be797f7b035fc5247415e84754f51a665690f8c02d2321f236783cd470b0730a07 SHA512 788378f2d46ac6df425c9fc52ce8646ffde2d3be9d249e1ba0429ddfd08ccc9284853658d383df8afd5ed4ab6f31baa937d4f174d6431062ed8f7a65518de432
+DIST kdepim-addons-21.04.0.tar.xz 2159480 BLAKE2B eaf1f22660669a1efb8da2df8674ab84cb1c6775fd1692dbcac416a7efeaab232412388568ee018872757e941dcf162d7c25fd36e520e85ce80ef8c0ea2bc25b SHA512 6faec63c458f437821fa963244ed230323d0e999fa4282a7870b2cb9cc2a8efec2dc05afb5c797ea1bcd4ca5c17ecbc859d89189ebadf210e5a0a4a5493f4957
+EBUILD kdepim-addons-20.12.3.ebuild 2472 BLAKE2B 1cfc291db49b7287a80dcbbb8f3f77e5cdaec6c90a3f3688ce88114224e8eeba8f48e97cd462d35447eb92ca70c2c6ba32e8084acbf8e90ae4d9ad5769aaa580 SHA512 ccac07676d03b0390b8e819ea3b37f0c8ada3d7737769ed89d89884a483606f8054dc98c63e8463af9cc657f442534aa355b825f01004bbff8be5a22660449eb
+EBUILD kdepim-addons-21.04.0.ebuild 2475 BLAKE2B bc11536d0a084a0d9be2b5cbe20daef4b63c3b555ecef8a217a3a9a7c00888e06b082220b53639754eaf0e05dbeb840910d9d19289500f42f00a58be5f853841 SHA512 91ee38517b513229429ea25a0d8713bad12c21beb189d1bb414b6b7fc743b9f0f13f2a06fda02bd9c9bb6a926a38f82e5128925b21e4db72a3036c1bf324dff9
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-20.12.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-20.12.3.ebuild
index 16a173a9f36e..fe3bd36fc9d3 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-20.12.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="importwizard markdown"
 
 RDEPEND="
@@ -80,7 +80,6 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
 	fi
 	ecm_pkg_postinst
diff --git a/kde-apps/kdepim-addons/kdepim-addons-20.12.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-21.04.0.ebuild
index 9acc125594ec..b84cc4fb5453 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-20.12.2.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="importwizard markdown"
 
 RDEPEND="
@@ -80,7 +80,6 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
 	fi
 	ecm_pkg_postinst
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index a3ac9d6cd7eb..6ce4d3d12974 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdepim-meta-20.12.2.ebuild 2521 BLAKE2B b540822a9a8783d21c7b69f5fb207ddafc442d6c6865ea30d8ad69cf1a98a86627738ed8a8108cc681380389a98eb7af6c115b9f814789b8e2674ccbc4942d46 SHA512 e34de1f5ed9aaf2a6f24e46992b9974a986efe2977a9961eae0ac39093ad5e7f06e8f5ce068ac697a61d62525518aebd70ecfdb9de63d8393874cab7cf25ffc4
-EBUILD kdepim-meta-20.12.3.ebuild 2524 BLAKE2B 84703e2d46414d5789e169f14298e863aa8e90bee7747f2b75698ab7d0f22f3b17206dae9d185b8f2888dfac986f3b57558e1e9dfa7ecf5b505afb6ecb5ad6e6 SHA512 3246eb59d7ac72c3629f1362c72a7067f68d2a4698bd2cd6f057648bf58e2cd0986dfa6f1f9022141ff2851e3c377f89cfc92b3b026e1520023d7e0d26641b52
+EBUILD kdepim-meta-20.12.3.ebuild 2521 BLAKE2B b540822a9a8783d21c7b69f5fb207ddafc442d6c6865ea30d8ad69cf1a98a86627738ed8a8108cc681380389a98eb7af6c115b9f814789b8e2674ccbc4942d46 SHA512 e34de1f5ed9aaf2a6f24e46992b9974a986efe2977a9961eae0ac39093ad5e7f06e8f5ce068ac697a61d62525518aebd70ecfdb9de63d8393874cab7cf25ffc4
+EBUILD kdepim-meta-21.04.0.ebuild 2524 BLAKE2B 84703e2d46414d5789e169f14298e863aa8e90bee7747f2b75698ab7d0f22f3b17206dae9d185b8f2888dfac986f3b57558e1e9dfa7ecf5b505afb6ecb5ad6e6 SHA512 3246eb59d7ac72c3629f1362c72a7067f68d2a4698bd2cd6f057648bf58e2cd0986dfa6f1f9022141ff2851e3c377f89cfc92b3b026e1520023d7e0d26641b52
 MISC metadata.xml 650 BLAKE2B 27e2fa91fe17cd24da17294c2c8a54cd4eee5342c07d8a1a7ad1515d9c52bfe47fe938f3c96e4e2d1ae9b99e2100de9252e180d55458a46aaab03d46725ab9a0 SHA512 dff51eb660ecab8f80e9d865f9e2a9ce5ace1cea6ff322cd2b71af2e3ce83e45d0ea3fbd499a37413bd9572853b90fe860a040d3e3828836ecf842872a4eed88
diff --git a/kde-apps/kdepim-meta/kdepim-meta-20.12.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-20.12.3.ebuild
index 96540f8bfea5..6f04a2b45178 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-20.12.3.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-20.12.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/en/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-meta/kdepim-meta-20.12.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-21.04.0.ebuild
index 6f04a2b45178..96540f8bfea5 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-20.12.2.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-21.04.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/en/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 130df84206bb..f0745fb71108 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,5 @@
-DIST kdepim-runtime-20.12.2.tar.xz 1801616 BLAKE2B d1db1893a3f87392ecd345976735545a90188aa6b0156b3728c16e08dd3ffd35648345509cb8bce65f7a939708b45be6b8849a8df2ec48f0ae6275efd8982b07 SHA512 234751643730d2ef2f7e4988ca1cf364c30c23997f5e611ef24b09745ee497742210af21096fe2301bca1bdadfda2e7cf47f7ace1627b79ee8d9f8cdd2ebac4e
 DIST kdepim-runtime-20.12.3.tar.xz 1801580 BLAKE2B 491684ee067d43f0b7f74ee3773401bd633a4708586b6054657c267a1b44cfbe0c2b8ffd9bd8ef54ff1196989c2bc4461352315ea8b1ca32bca85aa9cc345b24 SHA512 5dcc122c80575b6ebd7e220d72f71c58fa96fb894c7419ed5f3549eca6c5d3702d20f826baf1b2f7a0e8b80ce03afa5ede26cb558b9d01e38edf38976ab9b12a
-EBUILD kdepim-runtime-20.12.2.ebuild 2519 BLAKE2B 542477f8e1c46bb2b8ab050965db9ad7db4d436b7af6c2228b28d37b43b0e4120ce021bbe3a92b48409aa5d5bb870a1c419330e9f57764af65957458477b1375 SHA512 b0cf8c585a5d6c0dab912f8e5441ab5c640f4783b81f05045bce32c584c9ff43586442aa55bb5defe66402aa668aa1281a1a16924adbcf5139506da8d5893638
-EBUILD kdepim-runtime-20.12.3.ebuild 2522 BLAKE2B b8a5a3408a10fb9171ec8fe5a437da3742ccd3f8ef242c3d1b64b9238099cedde30f00c5b02bff8d557aef8ac09148093af0a2b11984723d5b26c9554d77550b SHA512 c5cab932c09b199b5ff18fd2e9b1899baa00e33943898f13cb41347e58fa1eae4a807c569a0c8b55c4f88cfb14a02a45b900ee9439a89466722b673351e24c70
+DIST kdepim-runtime-21.04.0.tar.xz 1812356 BLAKE2B 934f91f45e0df521133548e1781bb9b6db5456946e67f6a8776697a15f7d0b9202af34deb17815464f17777aee4c66f6b081f98bcb6c441280c93adb4e3a3874 SHA512 3beb5cb10ecbc706ad94272b739474e5e9cdcce41721fe4a91bac35cac5ba7abadf5d43ca0e95015a9f14be9fa2ebe47b9b2d4e020aa6bc37a233e3204c6d450
+EBUILD kdepim-runtime-20.12.3.ebuild 2519 BLAKE2B 542477f8e1c46bb2b8ab050965db9ad7db4d436b7af6c2228b28d37b43b0e4120ce021bbe3a92b48409aa5d5bb870a1c419330e9f57764af65957458477b1375 SHA512 b0cf8c585a5d6c0dab912f8e5441ab5c640f4783b81f05045bce32c584c9ff43586442aa55bb5defe66402aa668aa1281a1a16924adbcf5139506da8d5893638
+EBUILD kdepim-runtime-21.04.0.ebuild 2505 BLAKE2B f8f9eec4240553c020d4c5b5c7194c3b54c8aedcdd2f33270ef39e17d97b6f0a08d978f3f087116dcc7e364ff9032c41f1cacf3b5917eba4c32793ee1ffa9aac SHA512 8658cc3f51b6637553d4bdbcac31d6efd71e93124c9773714de371fa9dc2b7c478f004ab0c12278e08319129f9a2fb4aa8babe7c11324909d5b3ce9d32066daf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.12.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.12.3.ebuild
index 51e789f92ae4..78109648bc76 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-20.12.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-20.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 # TODO kolab
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.04.0.ebuild
index 78109648bc76..8ebb14ff4541 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -16,17 +16,17 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
+RESTRICT+=" test"
+
 # TODO kolab
-BDEPEND="
-	dev-libs/libxslt
-"
 RDEPEND="
 	>=app-crypt/qca-2.3.0:2
 	dev-libs/cyrus-sasl:2
 	dev-libs/libical:=
+	dev-libs/qtkeychain:=
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
@@ -70,7 +70,6 @@ RDEPEND="
 	>=kde-frameworks/knotifyconfig-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
@@ -79,8 +78,7 @@ DEPEND="${RDEPEND}
 	>=dev-qt/qtxmlpatterns-${QTMIN}:5
 	test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
 "
-
-RESTRICT+=" test"
+BDEPEND="dev-libs/libxslt"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index 75a8706c3af5..2dd06357f31c 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
-DIST kdesdk-kioslaves-20.08.3.tar.xz 37368 BLAKE2B 3af5b8df85f3ac82ad2075fce8256a67b2154d7e4c211c569fc38e7e2188a3760d414df12cc63d1d4cb7e637f269de3c52a183908edb0610b2730f640d8cf460 SHA512 c02ffa42a7b44316764c643d8068bd9aef83719465d98d0b782ee76d7ece401d4ad4f2a1a1c8c6291d1055a1a4fcfb9a932a0cac5ccc587b5de33257ed3ccf95
 DIST kdesdk-kioslaves-20.12.3.tar.xz 37468 BLAKE2B 5e42378da8ebc64cde7684626519d77c0b788731b156febed47a89dad30fcc0dd94a772b5539c54b74b44d1006b69786490aee1f67f830b5668d10aa1722428a SHA512 8a37af8b86d3a716e2003d17d79fa018d87639b9379bf76b87184e1cb772afa7370b02e17541f3e895cbc7b2df76df85caaa9c697d46c5c7d3fb8677872a83ad
-EBUILD kdesdk-kioslaves-20.08.3.ebuild 422 BLAKE2B dece131d0d40d28a9bf65b3347bb85e7c8511211f617397498bcb1a111db2c215f941893653711f75047b2e919754b16590cdcbde777522c53e9ab6dcaefea50 SHA512 c262b506113579608b9d74def93320de72684f1556164f41cf2ff197ea60fd3712aa5105d5e3bddffdfa268811e8882ff98790fc299748cbc4ac5c740f3d9b2f
-EBUILD kdesdk-kioslaves-20.12.3.ebuild 425 BLAKE2B 2b106c8192a3c44d84d15a89a99af7db52b3e90b9756fcef72c5482ac308f2e43f5c32da0d7ce0894a4e4081fb2b58b45cb1432a56b3f54fcd59769b6bb72b6f SHA512 4ca1135963acf8d9f6f5f3f62b347390afa63a116537f07c7ac550e089845b7fbcb9df5db5366e5fd3849c5d1183a957e9843ab00d11670de0a1e254fe36f3dc
+DIST kdesdk-kioslaves-21.04.0.tar.xz 37524 BLAKE2B 3f7e9f4b35fc3e6dd657f0a4498a7bf0e6c865360310060d74c7e399c41f6fbb75fb8dd5f38fa8a0c9879a150065956df640e4f3b0673fefa82c7b41b4c042a9 SHA512 defb0e30d3c3c7676dd802f682b4f2caa3504ca4b32829e032929b149e34e2a7b31b262d7614d5743b08dd935c7ecc67c286bd3e0e41386ef0fead5203b498f2
+EBUILD kdesdk-kioslaves-20.12.3.ebuild 422 BLAKE2B 3ba00b60e1463fb7ec78fc293f2129560ad51e92eeecdbd0e61d210531b3ee5d84f27a096b25228f82dc77c05d9a6c77773d179457e52026158354357353555b SHA512 1bbd3098ea48782c60173d71280d9f0889d2ae89de9bd7d61f605a865c82a68ab92bb2b8d0fae1a64e866fd0434c7260f6242997b759ba58e050050486d3ea31
+EBUILD kdesdk-kioslaves-21.04.0.ebuild 425 BLAKE2B 5d4b642419486340649a21e8d5af885d6143876cbb367d1da8c0e284ed17da3ac6b92deed1ecb52e5112bc1edef077963a5f2fa727d1a6a078947db16ca4b80c SHA512 785510e559f1a8c33cd081d0524cac9c7f82ce3b5ac0f4fad1af79afd41a4ec0889284717bd52cb71435c16fda6e53bab75eb02ab6533ed4929d7c5bb586ea09
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.12.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.12.3.ebuild
index c282e83354db..e87df7055bbd 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.12.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.12.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="kioslaves from kdesdk package"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.08.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.04.0.ebuild
index ea210e062165..e10275243a45 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.08.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.04.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.80.0
 inherit ecm kde.org
 
 DESCRIPTION="kioslaves from kdesdk package"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index dc58d0cc683b..d6a729488e9a 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdesdk-meta-20.08.3.ebuild 1079 BLAKE2B 024d9d55b9a132c15fec3020ae54278bf72b0eb948f256742efda9aa235b4be422e048e0e50a3afc7e6098ab22e5579cc7c53505a8077209ada5f238fefa3784 SHA512 815d0ecd3101285ba0d18f6f77bcd483cec957ba9b2a495ecf1211cf4c50d3eaafa169f9a2e50b33f6e58f34e4225ca685047ed6e6d1e36581f77d37315fcce6
-EBUILD kdesdk-meta-20.12.3.ebuild 1082 BLAKE2B 087c6584222a1e58bcde2326e3e26ca3ccbeca8d3743eaf1c38b81e1a90369df033c56eb3164fb4150f9a370a220be4931018fcc255c397afd4171617d05c2cf SHA512 8bc8a179830275db95c10120dbcd2d7d4b149130c2a37ed43dc9c156b4beb63fd7137d1a184d5c85107ef413acbc8d6bdd13ba7074944afbbcd7162099237654
+EBUILD kdesdk-meta-20.12.3.ebuild 1079 BLAKE2B d435ebce4d2049987f460e631308e855c2f63a5f262a93e46a7f1f09db3a90d3128e425311ec856264a35b5cfa63a5b66d5189211ceb3e8fb74acd71d57388a3 SHA512 90db048eaa96be517c8fb9ec59a4fc07bc996cec2eca5476e312a81ac2ac721957b4e9c0c87d3cc5dcfd3fc421faad8f3fc6f7068cb8569623ee10e84210eaff
+EBUILD kdesdk-meta-21.04.0.ebuild 1082 BLAKE2B 087c6584222a1e58bcde2326e3e26ca3ccbeca8d3743eaf1c38b81e1a90369df033c56eb3164fb4150f9a370a220be4931018fcc255c397afd4171617d05c2cf SHA512 8bc8a179830275db95c10120dbcd2d7d4b149130c2a37ed43dc9c156b4beb63fd7137d1a184d5c85107ef413acbc8d6bdd13ba7074944afbbcd7162099237654
 MISC metadata.xml 694 BLAKE2B cfb8ab0250e68d767f4d361aff6b3d0341806601ef93012289646091e5eba7495ae07ca0eaa9363d5adc65b6f411cd0cd1ef7a092d02360ebd11e43f86905b75 SHA512 f6db059c65c8dee729f25700da4e9aa24384291bea6a28d546726e46ce6f7f64ee66daf872cd2358525bb8739b3fe18166d2e04142c0539e874f44dcd80b5c72
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-20.12.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-20.12.3.ebuild
index 51bd10479ac6..663b83060803 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-20.12.3.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-20.12.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-20.08.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-21.04.0.ebuild
index f72f977fe7d8..51bd10479ac6 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-20.08.3.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 8d9f3b69c963..5869a0b68b1f 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
-DIST kdesdk-thumbnailers-20.08.3.tar.xz 17688 BLAKE2B 0539ff592f9d3d659a183ab67a5a2ffcd303a85c86fec92069a7e7dd52736a031b11ffdda8cd23d95bd124fec66d28204df9d988c99ea20a521376f5add04022 SHA512 f1487b53ecc6be55058b78340a915a8f80f7c471a67a1bb198473a449b2b7f24e68cac1f397ebaf0b62d4fad9fcd0f7b471ec2d643371c84b438aa73b93567cb
 DIST kdesdk-thumbnailers-20.12.3.tar.xz 17816 BLAKE2B e5278cb5403f714e0853eeeddd968b618398107b79cff7d79a998b43e9479f94a7d98a84fc7ac8c546c5d4860270f1cbc43375537346266b07b9ce925091f749 SHA512 35c6af3e0770d45e357e33d3a7159b3be8c09f50a1a57f15fa4cc5e5bfcfa5f6767a890bcc268133975d48e839844aa968300062c54d338ef90298c928884313
-EBUILD kdesdk-thumbnailers-20.08.3.ebuild 540 BLAKE2B f74cd3763b7ff43594404efd33b8041d4c93f1fa03c40ad33d494c0acddcad4894762c1c020a9c7192cfd56691e7efd147d09dc0f08a4538f9142be3416263d3 SHA512 2080d954296e9846b1d83a9f96109fdb61258e13c70e8a42d38a87fa01a6d5d357dcecc3c5b5d1f85acdf96c76fdecb95e303d41dd373438cb3d53a1dbb950bb
-EBUILD kdesdk-thumbnailers-20.12.3.ebuild 543 BLAKE2B baa0651281b8eae4d1082e094669f89df189b7159db21fd5bb0ed5e207b5e81f14a75c70f27d7ce8a1be8d4b29004aae6aac7a09a53ecadc2c6b7c836eaf57b9 SHA512 61d696d6cdbd3949cde3ecfc8030eb624f10ed0c7f89cc50c56d27aa9986e9202cc58d3b7845cd9d6de6fb06189c40a3cd77ffcb7ef0e58be4df0cb0fb7461ee
+DIST kdesdk-thumbnailers-21.04.0.tar.xz 17836 BLAKE2B c9a3847ec410346b816718a043e3f475463e244638ab39beeb1aad4d9af587bafb30ee6da85b70672d08a7acc7b02d78ee61b9682983edc62b74b6107a8822e7 SHA512 3860234a9312c99e24846091646a97ccb7534d5df96412af82d40ed3d2c29f85b8cf8a819f77182de8e1473e48962f7c7778821d85001c57e78afd0184e104c9
+EBUILD kdesdk-thumbnailers-20.12.3.ebuild 540 BLAKE2B 2a2e155a913c9195d62687e3f0043fad52fbb20ce65b501807fd8d2c34cfcb5a76a9b11d5c3ccbed161e136155e48c8b134ce1a1efaec3affabe6bf35d0464e8 SHA512 74cbb53c8e5fd6213e1e86ced6ae59463925fcc7be215d294619f9240e3f5ffeea25f59146ed930e36e610ddf46e9f6788e0334c36dc7d6b5d00dc3434f829a1
+EBUILD kdesdk-thumbnailers-21.04.0.ebuild 543 BLAKE2B fc671853af627ff184f7438149ed81f063fd1b8b7715e52d266016b0dd617ee868219a23576ca21dadb57034f0a4a1b34d814c4f77a43fd5c2ed29b7cd298c76 SHA512 ac913139d24a0eb9576b83e493bd54270294620e4f5b70ae5c31e0dd4d75ea4a77a1196859fd91c929698e71df7e686f91bf4d745ec666b424bb729ba508669d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.12.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.12.3.ebuild
index bcddd0bf0088..1313493ff73d 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.12.3.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.12.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Thumbnail generator for PO files"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.08.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.04.0.ebuild
index a8438e1bd3e8..8e31812f6e50 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.08.3.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.04.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Thumbnail generator for PO files"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index 9b7286c0b11c..cdb3b601a874 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeutils-meta-20.08.3.ebuild 1249 BLAKE2B b8e03f7dc7c0206c14e0c0dfb35674b100a1008c376ca19fa3d41f948b3d46319acc8280a842933c37f2633872eff6fe1c6788379f124fc5cfbfc656fc2bdba1 SHA512 adcfbb0a415858ece977e903b34086e0859338ac889ca8a7b82008a8ae492ebe3ef0fee554187b732b12f3533035a380f0fef765a0edc97d80c85ca987fd0f5f
-EBUILD kdeutils-meta-20.12.3.ebuild 1369 BLAKE2B 213ac5756abb6aabb0610634658ee2646e0fdc748f4fe2729f834a997b613e19afd30e8d7881e50863bd9769747d9c30d712a2329b719357696e6beb05a319d0 SHA512 92819f9dd4f97a5df87a32d4591fce95f281d429abdffad36698cad9556434f34b91e9a0bebc2eb3a4212716206007d4ae21702a55b71e0e700e4e9cb77dcf02
+EBUILD kdeutils-meta-20.12.3.ebuild 1366 BLAKE2B e55e06ceed209443018df2f503477cb8beb8c499476e5334492dcd139d49e41cfcc6022ac91a1ac543aaa93b714a451ab4cbdbb1a6dca5253f2efc839bfc0219 SHA512 24621849fde80323f2114fb1b6c875db7f09ad70256264592aa3b03feef76c0f0c44dac46dc2cf5767d9804369a1380e413c3531de0cfab47a7da3f7d84ec21a
+EBUILD kdeutils-meta-21.04.0.ebuild 1369 BLAKE2B 213ac5756abb6aabb0610634658ee2646e0fdc748f4fe2729f834a997b613e19afd30e8d7881e50863bd9769747d9c30d712a2329b719357696e6beb05a319d0 SHA512 92819f9dd4f97a5df87a32d4591fce95f281d429abdffad36698cad9556434f34b91e9a0bebc2eb3a4212716206007d4ae21702a55b71e0e700e4e9cb77dcf02
 MISC metadata.xml 1004 BLAKE2B f2fed1a10b7eb10ba9016b72fe9c4863e853882e6f66790ffe70e21aace4e10b0fc5c699559934121b071c2e260a83b19d50b5d14adc53dff25d933ea0e8eae6 SHA512 d8f248c827327c4c855cc1ba7c6c9d31578b4a89ecca6dbc0ffde3f2b73b10f66d9923a907dde88481ee933a6047fb18089341ef49b8146836a00cb341a23f7a
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-20.12.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-20.12.3.ebuild
index d370c04e3b3e..bb268f0a7fdc 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-20.12.3.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-20.12.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-20.08.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-21.04.0.ebuild
index 9a98bc425ed7..d370c04e3b3e 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-20.08.3.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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="
@@ -26,6 +26,9 @@ RDEPEND="
 	>=kde-apps/kwalletmanager-${PV}:${SLOT}
 	>=kde-apps/sweeper-${PV}:${SLOT}
 	>=kde-apps/yakuake-${PV}:${SLOT}
+	>=kde-misc/markdownpart-${PV}:${SLOT}
+	>=sys-block/partitionmanager-${PV}:${SLOT}
+	>=sys-libs/kpmcore-${PV}:${SLOT}
 	cups? ( >=kde-apps/print-manager-${PV}:${SLOT} )
 	floppy? ( >=kde-apps/kfloppy-${PV}:${SLOT} )
 	gpg? ( >=kde-apps/kgpg-${PV}:${SLOT} )
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index b688ba4a1fce..46d46bbfdd7f 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
-DIST kdf-20.08.3.tar.xz 467208 BLAKE2B 5bebde8cd73aa1102d7bd4d519b156556faf2cc0b6e60215e9c0254eb374043d4dadb857c424298ef7ed2232146c1351fe0205e2537d9f50881e1f36bd530744 SHA512 caa585e5d9373fedd3e98b084cee8efd9c9e59f662f3b586cddf0c3911954e4beed75c96807c7596e77b0ff490f11e91f8e4eb0cb872aed0a3ece0d4bd119764
 DIST kdf-20.12.3.tar.xz 467360 BLAKE2B fabff3ee3f7f2f33ba0667f61ec42cd7e4655b82c620afe655ecef2d3ba4329d2670f80dd97e214bb52b93d1e0c0355d5cb0932ab013c096492ff0e74762d9de SHA512 9b799221e9eaefc57f602c927a08c391792ac919e9d100508ec55ff63be2218048a19496157045f6376629625cf4398ca3efd74ec52f815b2400e63995e0c714
-EBUILD kdf-20.08.3.ebuild 913 BLAKE2B 3f49df1a5413f5b1f5db54d1b4fa0935f4cf4df449ba6311ead1b86716a6516159cfb91c189146f62d445e1955bb3378f82009a9ed684750caedddab74cc6d11 SHA512 c80ab0883940303ce2ba57ffdc6e9e3cb908a3e9c5e548f0256c5b810ec32b4d48dc1ad19b5fcd56843ba714ebdd318a8fb6fa998d15119a0f804491ce0f6349
-EBUILD kdf-20.12.3.ebuild 916 BLAKE2B d5cc9eda3692bccfb730c26d7c98150fe0a38caadf00db6ddc2b814ec79d29f142235123a74916ba6c049254869bdefaafefa6a2758b934042c76e437706a8b2 SHA512 54b5709f5e97795995e34705be1e5e5b5ac700bfaafce1a6fee4435962d24cafe36625cb99deaeeb16f1d483c082182239a8248828d0d147ff3da17f9f2ff354
+DIST kdf-21.04.0.tar.xz 467312 BLAKE2B 41c62b3fb9c478fa7a69e3d2c07121888ecdd5188255c9520f2852183ca260187da88dafdebb3409e8f9d9b1c497ed788efb5bcf58a13a067051c2dd33669295 SHA512 7de86aabd0336b7f3750df9e8cec0501503de8d014a6366de6cd62fbdb095cd947e80e54c2210f8dab8a6cd6b741ca6317361791f97ae2da9324f42838f7a232
+EBUILD kdf-20.12.3.ebuild 913 BLAKE2B a04786d6da9ec57ab68dba264cee2b00b0b75ee51948915f7b55983bae8a6daee75f11a36d0380fd48ea9e01f184b3a2b3a0c8697484db4d128182debe462756 SHA512 16c5844f975f237dc42e12a8bb9d492071b871d50a992eb9c48d19cd81bcb98ad23e3afce7d9b230f54e044a948c1705c19bea02ef55c5fd1dc8954fc4172d5f
+EBUILD kdf-21.04.0.ebuild 916 BLAKE2B c410ced87657c60b227b2ba29c051a885802b0f08c8bfe793fa0aa3d799148346f00e98a23bd1acd4f11b39af147e7fcdb0aeb9da8ab0b9a4e8afcba4b39aa59 SHA512 c9c3b621e2f7f8c8ed3bddd14547d0ba20243968b032ef250e22b4fe42f5dee02be6c59a085b74831c85134f2c0f250c9ea60d07ff9bef5fc28d495c642f9449
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-20.12.3.ebuild b/kde-apps/kdf/kdf-20.12.3.ebuild
index 326107192294..5d0617db448b 100644
--- a/kde-apps/kdf/kdf-20.12.3.ebuild
+++ b/kde-apps/kdf/kdf-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kdf https://utils.kde.org/projects/kdf/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdf/kdf-20.08.3.ebuild b/kde-apps/kdf/kdf-21.04.0.ebuild
index 7645eb2c11b5..76f7dd9cde60 100644
--- a/kde-apps/kdf/kdf-20.08.3.ebuild
+++ b/kde-apps/kdf/kdf-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE free disk space utility"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kdf https://utils.kde.org/projects/kdf/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index e5281ca84beb..4bf88e5c69cc 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
-DIST kdialog-20.08.3.tar.xz 107888 BLAKE2B a18ae9f06086117f229014640d425a4618bd6d6c5a2ee44c6958e8cf787ac113501c4c5eee276d91603fec9bee9349679af35d5cca950d967a26dad1139e1bbc SHA512 72a0bcab15314af5fdc613860fe5cf475f879805da3c8d5b26e00ae08d24166c2df939063bdbf6bd78f1396850dc3d238d925a4b9b985bb38ad23bcecae1f71e
 DIST kdialog-20.12.3.tar.xz 108492 BLAKE2B 882cac8b2318fb879737085d3ccc59b121117a4ffca82326d89ed4aad9c66f9c32772da9a723dd6d17d31a400dd11a32d6c9cc4e894d35a16e6eea2a09be6f18 SHA512 09794892b150b8e9637f74971432c231c8abe9f2355b2c0c0ddd2527b5512d024a81f2d3dbab4dfd381495f729d4cb474caa46cfa8784f396abe223f989e243b
-EBUILD kdialog-20.08.3.ebuild 1038 BLAKE2B 593c36dec200a19127e029a13a13c3a8b9dfcc8b9550e952b7747c39b0b315f2f4fad0a6a17df0131321a3507e11a81096b46e5854c936d73f2975836dce4cda SHA512 c5a2744304b26c61a7f3d2227a58599345c60f4f984f220e62971325adf370131e712d96cb364cef1723c53d8ef7158f51ec2404520cb7ea0367051c652e3736
-EBUILD kdialog-20.12.3.ebuild 1041 BLAKE2B 0118bf553d90cd6b11a78c190b6f607cdc4d8a008ef66595d35a601449e423ae217016bfa86f420bea7332d1e960c6fa1e4be9cb214973a41413d5c50a2c3eaa SHA512 6c698199955651aeb5a384a72a1a9e5d9bb01115941d6d8a56804e1212424eb7124eea5353d9558d90efb8e8c0355bda795fd2868f89c1db18b8fdf166dc06ac
+DIST kdialog-21.04.0.tar.xz 109132 BLAKE2B 6e2b532515764b607898a984053052e76cf5d62fad5b9747fa0b4f51cf2c384d6d4cd141efd191b222cde967f36371017a0ecb44951e19b4e12e8c62c1b1ce01 SHA512 63bd29c05c9cb551ae1cbdc14f7ab97424c1056ee9bab6695f00daccf37dcf712a822ffd8b634d63a4a1ba56fe18642221898fe6507107bfe1ac64fc6afae7c0
+EBUILD kdialog-20.12.3.ebuild 1038 BLAKE2B 86b1ba100a1d5eb0e2e2a215c032efd91dcb700a9266c1ac880d72989199199e9191ef66a6e6a840728aabdbb5e891464460f0818e05e0d7b4143dbd264df09f SHA512 a78f9ac43a01eb7568fe9a60bc129f386134bb16096cac69e62de624152703a56d87569f0be1b6ac2e08b4770cfc11f7148563e3c7408aca97812c2a161f00a2
+EBUILD kdialog-21.04.0.ebuild 1041 BLAKE2B a2970422442cf159b741e4d6d010821ce175b19fbf33cb45f22704f45a9545c6d64728c3cd7eea96925dff74b37cc809caa178b882d1d3e877088178b8e9cd1b SHA512 3f4920e35f1100efb46e06ad500e3d5911f2fdd741e41cddbfe12f1e19c0a5611394e4f8c45ef8585cfe2e270610e9a6578649051b25281411e935faa91d5689
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-20.12.3.ebuild b/kde-apps/kdialog/kdialog-20.12.3.ebuild
index 627391ee66fa..24843071c308 100644
--- a/kde-apps/kdialog/kdialog-20.12.3.ebuild
+++ b/kde-apps/kdialog/kdialog-20.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/en/kdialog"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kdialog/kdialog-20.08.3.ebuild b/kde-apps/kdialog/kdialog-21.04.0.ebuild
index 3617ab97b2c2..a4d2d1c3cbbd 100644
--- a/kde-apps/kdialog/kdialog-20.08.3.ebuild
+++ b/kde-apps/kdialog/kdialog-21.04.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/en/kdialog"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 314d66414229..fb61ce1d7ea9 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,5 @@
-DIST kdiamond-20.08.3.tar.xz 4698100 BLAKE2B 29c84a38ce8cfdf645162d42fbf4f6210f28977e2cba596168f06029d7b1315beef683d3bd926eb12b00a0eb69ccf46d9ca0f1149afdfa4503a3eef043ade21b SHA512 d6b2292e70ba016f1d9a883348c45cd4383a95d002569360a80f7b27fbce3950515b277b6cc61de998b2dffb13c47290813dbda59fa27ab1d5a0642cd608c795
 DIST kdiamond-20.12.3.tar.xz 4698168 BLAKE2B 8aa5330c4ff34828dbd044abdebe1b186a5525d83adfbbb9bdbc72abba6a782d634ef43cf603997a7458f252ac9d236115245420bf8a8b152b8c70ec89d55e88 SHA512 f7eb5dbdeb709290a2cdb46b03f829ac111ea629dc49d81d61ce0f32eeaf0f23fcf234cd20d44a54013e93dc42e867b0dd802d54ec624d3ab4b5b9c1e8ce8c75
-EBUILD kdiamond-20.08.3.ebuild 941 BLAKE2B eb2e9816a1ef1fbf9328df87849e4418c03e88f7e3e414b136ded007ca2db6db8260a4bd15f924e1c47e00b7898ce9d9ec3fe83bca4c84296dd2e066419f38af SHA512 638161e92cbb8a9a0f1fb5e135963ad0db65cdb5dd5ec99ac71f7663745c1ecb636fa1f3af95700dc6139f6e953d0a4fb78a287da4c062474ecbfed268d985ff
-EBUILD kdiamond-20.12.3.ebuild 944 BLAKE2B a60d694f2fe6461b438d11ad77e95e2b2772643a3c171ea034fd56fb230e75f0cf46e57ed0952fb49a145a178a25957c2129355b2ecf7ab69f686570cb8aed9c SHA512 97eee4cb8d09cd005d4e5faebf92bf1376618718fc90941d0e0aef84b51252db7ce4282eaa62915c3f1e4486dc185819f93860fd09b25709d8bc5811977833de
+DIST kdiamond-21.04.0.tar.xz 4697428 BLAKE2B 6e6b1f5dc660d0c395638871ab840b691649822a2acd4203d50a4ea425e6d8046d243e49d5f839976d24a6148280a947fc2923ff5ad4ac02b6f6402d946ad295 SHA512 db9a2b2d707da9b2ba674bd01ae9f53f104ccc37d7ea49aa8db3f77a48131070bb6d0a4bb5c75563b88b6e2dbe90816cdfc2f56d901fdbfcd98f29e1c607177e
+EBUILD kdiamond-20.12.3.ebuild 941 BLAKE2B 6074fabfee50f04477145998ff5564e339fcf9655c027f79132e1f13b49433963efd68c278169d1e241883ecffeff0e354797c87d1108a200f11071dcef94b95 SHA512 77fab49ac2377f8593a0342eb64c3d39799358870076e5c4d320db6dc4d8c9e2f274a3b85b63fe54d9927d91b1a81dc3af56fce875173e5c7589cac943cdc0cb
+EBUILD kdiamond-21.04.0.ebuild 944 BLAKE2B f8cc0fd65eae97eb587d0b92290ce0b769ac44d03f630139482303d9c8c336ae4122234a80f20c5605ad6191035bec7fbd8cb1acb64ae31471778ba713a3b5ac SHA512 087bcb46d43dd61558afc314b454c941f02c819fcfddc4ee3e51ae153a487a804b2f859d27e86d9167bb3cce841037a30071dd94a76ed0dfceb667ccd7ebebf5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-20.12.3.ebuild b/kde-apps/kdiamond/kdiamond-20.12.3.ebuild
index a482715bcdb7..06c811bb9657 100644
--- a/kde-apps/kdiamond/kdiamond-20.12.3.ebuild
+++ b/kde-apps/kdiamond/kdiamond-20.12.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kdiamond"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdiamond/kdiamond-20.08.3.ebuild b/kde-apps/kdiamond/kdiamond-21.04.0.ebuild
index 8ef9f71f7e49..46d819bc52c4 100644
--- a/kde-apps/kdiamond/kdiamond-20.08.3.ebuild
+++ b/kde-apps/kdiamond/kdiamond-21.04.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Single player three-in-a-row game"
@@ -15,7 +15,7 @@ https://games.kde.org/games/kdiamond"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 0314df7341be..9cc7e8e5f6c8 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
-DIST keditbookmarks-20.08.3.tar.xz 190688 BLAKE2B 204439435cfb216c552c74fe827298c501aba003d9c022ee91fa217cddd4d03a870f3a3212e97d30b060188cac79799f598dd70e220b015c40d9891f692a636d SHA512 336808b9ac99b5e3fa7339f1ba7dafa02e81a01aaae51bc86f85d61ebde81b97a540e7763668c0c3009c05eae275844ba7f7255582c8caa538e0f1f7c07aa5b4
 DIST keditbookmarks-20.12.3.tar.xz 191892 BLAKE2B f72d2429258d8d3f912c74a0a972a4c07131f021bc7f1d5052e5347cc2bac2910f6827b014c18ea829f5adb4ca36e42cc9fe30c77df6e7b7ed6506cc068909ac SHA512 6b8341f94e1d170994100e0fd06f0cf7bac7e5b1ad31f595f74b3bff980e0b7ac286f985b7d4bf83bd6f29a4540d89b2d964cabc46dd95769e8e823536f873f7
-EBUILD keditbookmarks-20.08.3.ebuild 1161 BLAKE2B 9bbae5a28989e1d9be85c3cbe24f096607a04dab0d0b2278b1bc2550e1bb7d7da772e50ccf7a9af2032d1289252ba6d1f114c13d5778a28c8aea8a36819bf920 SHA512 88775603fdaed651465d41d47b40fe2f8febaab4e2f597ba59dc5257798605117bf38c1278c8c7c3af25e5f507ea7b1dd555c86cc1b2dc71817417610110c947
-EBUILD keditbookmarks-20.12.3.ebuild 1164 BLAKE2B 3a6f13d9310cd3b056df2f9ace518132cfd83d4cf1eff1fec0b72d127c93590db47dce5578a98c556d7a636377d47726bda7b4c5b5e27fd0f718f5dff71b65cf SHA512 1eacf2abf619443c0a876c24ede7f6e45c83b96bf602a87cf94e919ce8d429b719d4b2c4a34202231a40bd5fac503118f9b7841eb1f6b010a34419c4a5c7140a
+DIST keditbookmarks-21.04.0.tar.xz 190600 BLAKE2B d3de8242d287b8223cf28130bc8dd23709ee256bedcbd7896906e20113ca18e93dfaf1d8cfdfbd6bf41bc7ed67dc655bdf5e2a9381e3b854e5efd9520729c8c1 SHA512 0bd979d6df63106df7bea7e7e1f36337b77ffad20ea189d774e715a45d39093edc6e8933697147dc8055dd29a654b48c349e8d8a3cd223f96c045c52985fa70f
+EBUILD keditbookmarks-20.12.3.ebuild 1161 BLAKE2B 9350a787363d93ce2cf7981608decbd5d2b99ad02d83eebb9b473db4e26751efe7c6cebf717d0a378b1d6541e6eb3239abe4b71949db83e1d89f24426ad4615b SHA512 698dd495dcdba0c26d46f2acbd783fc317a9fcfd9f283784e90c0ca63a92249250a860b854a87fa84124b615f192aed91195d6892571590b7082127c1d702d36
+EBUILD keditbookmarks-21.04.0.ebuild 1164 BLAKE2B 259de721ef20eaec8e78bfbd6d01ad79159a313b4413acc55db030f6f705dcb62a535135cdf248b436c4fbef012ec1e8d3d69cad7aea6ee81335b77c29bbab21 SHA512 3632af0b97170ba0bec700ad88f7781047a6a46519975528aa1331315673f73e4688b4ea07f05cd72337b4e21708b963cd423472f406dd039e200eb14f3ae913
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/keditbookmarks/keditbookmarks-20.12.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-20.12.3.ebuild
index 81a21eebcac9..45d7bdbd2046 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-20.12.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-20.12.3.ebuild
@@ -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 x86"
 IUSE="+man"
 
 DEPEND="
diff --git a/kde-apps/keditbookmarks/keditbookmarks-20.08.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-21.04.0.ebuild
index d3d989540baa..30195a6ed954 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-20.08.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.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 ~x86"
 IUSE="+man"
 
 DEPEND="
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index c460bd9e1bb0..a863adfd1131 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,5 +1,5 @@
-DIST kfind-20.08.3.tar.xz 278648 BLAKE2B 7935cc4c8044a02fbce80c0b347de0ba5d49d544bba1e2dff73f7719de26395e62b8dea121344232848cfc5c6453c4297f09e8448209691fbcb4bc0e5a7f0f8b SHA512 2a3334221234889a4e6003ecfcc2a8e35d0b7db5bad999dd5a85074985eab11552c2e4015d3c31c1bf62752f098e81e8e33f090a9945f8874c8bd430e302b940
 DIST kfind-20.12.3.tar.xz 278656 BLAKE2B d117d3eefa73d6e716818861c68b928e255a44e594d0da5ff8d05d5cb7509fbe2b6c26558fbe4dc13afa0f05a54f69802de454ebb8e902264413af7037c5b803 SHA512 e66ef911138c844ddad606b31c9075b8b0d3984315e52f95beb6f3035d8ddbf16a40bc1390d4d7ef1e93eaf27aeb4d1b1566db3db0d1b26691c8dea443b0eca9
-EBUILD kfind-20.08.3.ebuild 968 BLAKE2B 52cc5612497ad91c4d4d4b87ac348cf67204130b6c084a5419e36e21d8bbf430797e22bcc5c99a11c8f80814228e4aa44d0e242bf63bc48ce0a96682593f5f96 SHA512 f51b255190c8de42dd069c08b08cecf2cd4cc39141e41a0bf2fd156813b130655c3d4be242a1347c2a21e6cc226dc340f647e4310d77ad9a2b6dff04a5358061
-EBUILD kfind-20.12.3.ebuild 971 BLAKE2B 164eb963a7c428969121bf88238d12f7a2265a2d96f61f86a862b221c68e28fabd896bffe9498420cfb302ba62faa57929f96a6176a31ec79b3f8e84d839a0d4 SHA512 1d437474208c007bcf268f60de99f9a5af2677d80846726998a4275c8c161bcd7430c0873a13b1b3c73901a72d33918b6ea7e717af68dac4a59bd851d846ed84
+DIST kfind-21.04.0.tar.xz 271640 BLAKE2B 3230d1dd40a028b08ace9621dd54ff48414470dae6e1906b73818780416366aa675bba95372d093345771d27d824d898435b085bb17fe8b730c06a505dbe5ca7 SHA512 e57e15a07661627f86c661e2cb6655061771e7ef62dd9a486cf6fc1adeeb2d64de99731c04bdd7125d132611bdc7fa0e26ba39aa54e8927f15fcfd3405a3e3ed
+EBUILD kfind-20.12.3.ebuild 968 BLAKE2B 5fbba18030bafb7ff5fba897e53bfde9e69883f2f0b8d35f2c8abaef22889c1a7ac3e59e4c8a0123ac398ec045ecbf3089b0f75d687fb220a13ea5d0f4c657b5 SHA512 90d6aed12ea02ced48a2ce8ca6dd6caf6202933d06a2410959af8040502a6ed915c5c0b090c72a3bf796983c91980b2a75e985343d0c71eafad0ec095a5988db
+EBUILD kfind-21.04.0.ebuild 971 BLAKE2B 9169c38cf4bd7f990b6b8f1c988305a537c3f7c43cc3f594b4aa2f7b98228f9440f39f548b0ca6766fae9231b54d832cf4c3fa7e379985b9bbe6cef84c002ea1 SHA512 f2ad46e2aa089a2cee78f4745ae48d43e0af26e7a0289134033881f54caa45aabf86747c8f2e1bb1bb280533d92b4bfc2e8eb38dcb1939e3a801c1ab4e29ad24
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-20.12.3.ebuild b/kde-apps/kfind/kfind-20.12.3.ebuild
index 6e4d7bf015f4..7beb54cf21bb 100644
--- a/kde-apps/kfind/kfind-20.12.3.ebuild
+++ b/kde-apps/kfind/kfind-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kfind"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kfind/kfind-20.08.3.ebuild b/kde-apps/kfind/kfind-21.04.0.ebuild
index 43e72ba38264..44f89f919f96 100644
--- a/kde-apps/kfind/kfind-20.08.3.ebuild
+++ b/kde-apps/kfind/kfind-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="File finder utility based on KDE Frameworks"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kfind"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 702a0ad1f295..49a5e6cf481e 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
-DIST kfloppy-20.08.3.tar.xz 204024 BLAKE2B 753d89d725b3e535900e1da9c3727991733f0bc7aee765dd9a604c465b1b9f82e52821c8bb9ada18227f0671df1730516e640c87f70ae99f7cc81b29677715dd SHA512 a3c22c3051bdb1463988f50d3dfb5db3e56db6bd142a31761622bb5739bdd3e2581bd8390b0ce5414299e2e2dc863979f20fad3221da11b1f6e277a1a10a2a47
 DIST kfloppy-20.12.3.tar.xz 204260 BLAKE2B f66f9cc1ac3cc6ad6ad01658d3599671608416aafbc8d57bfc1b12a5728584db215557cda3c5b798fcb10484b384fdf013823b68a5b715bfd2814f41b6905c89 SHA512 5220a465fbcb9feeed5f572d26ae4c2cf4eaf2aad68d66e102e3b6d24521d6997582bcb27484c39bb257ffdb19b93239dfe791890edec94af68879e8e10179c6
-EBUILD kfloppy-20.08.3.ebuild 873 BLAKE2B b1d7956be513dc724783e11342507fb09b7e3142fd0f81f7aa7d40db83aa17dde98f3e3ecb198114a4bbd6b628e7e9d6314c82997315178b3a8f7363cced2949 SHA512 f41cf1b2b056fbd5d077c4c6a990b281c51ecbea54aafc07bb3d337c722c3baa5aaa2b98bfd93e09043e56244c4ce600d2266abbf2c9bc9d87f14538d4fa3eb1
-EBUILD kfloppy-20.12.3.ebuild 876 BLAKE2B 18faa35442d1e9fc621358316876dceeb9e18818b546982025d2103674dc8b7be610dcf46984082c7b73be947ebcd41cf54576bab4f0e97df1a0051f7ef955a8 SHA512 dccc3a8e5dd3fb260073781939fb8ebbfedac603756d575f0bae99dd48ee18845b1b75bcd9ce2a19a301c906b7b5b8ebb222b45575ef20aaa0e38e9b5b6d4cb8
+DIST kfloppy-21.04.0.tar.xz 205156 BLAKE2B 0ea59501b2af915701d425df6a622a7d480d0a1dabdae5817f300f4f449cc0e72e5fa96b1cae72f70df5d81e2128cc92c3dfc3db7c7f20683fd2b0cbe4c6fbe9 SHA512 c9d45f16cbbb1ef3d14d58b92d825262bc8a27af750207eba763fb1212591abe5a3dc65ba41b81a94463ceb53d63ba3ce2035016ba6abee867dd611ceb5fa004
+EBUILD kfloppy-20.12.3.ebuild 873 BLAKE2B a133446a75ec480bc11a9a6f125777de0a428f2a6b991525a4ca68461595203e07c1b81b06eabd6685bc60d0b74f568918eb90a152a0050a94e83d011363ae52 SHA512 8f00e3394ab8ff826078521130a40a2f5f14ade12f593114d9d05f9378aee95dff71581bcb79640548c561ac2df9fe59a0353a10aae4c01268ff1d4704c22dbe
+EBUILD kfloppy-21.04.0.ebuild 876 BLAKE2B 1648c66d36149f5c26b250ed977c5a549a3c6f387e7861f8a18e7c18dd244fb7585764975b0a02180db95f3c90df2e8c729f52ba178b77f08d24ac0390e4fb5a SHA512 fef2470755b3aa9d41cbdf86e50e714a6734a79ff30552c89ec1faa06d21d19239e537f24916b18d77f52f5b80cc214dd70f05ce4b81a62a3dce0636ef081723
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-20.12.3.ebuild b/kde-apps/kfloppy/kfloppy-20.12.3.ebuild
index 06ea5eba5587..caee4df15148 100644
--- a/kde-apps/kfloppy/kfloppy-20.12.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfloppy/kfloppy-20.08.3.ebuild b/kde-apps/kfloppy/kfloppy-21.04.0.ebuild
index 16dd526bbe48..34a15d1245d5 100644
--- a/kde-apps/kfloppy/kfloppy-20.08.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
@@ -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 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index 3804a20d1c7e..236f8a703095 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
-DIST kfourinline-20.08.3.tar.xz 643876 BLAKE2B e9e81e55bd065e40fa3bce19ed435109010f9b977b7b1f8328856fe128b555528a891c8e5e7dbce2a1a53828f1b5801f617930dc57fc65eee5e078d44e52e643 SHA512 bedbc0700e3c588a8dedd33f52128dda4e0eb93c8629b88b0d3a2aab4de9fe16428f4020838a49166020026e5c1221107e5972a2a4cf8b7f22d573cc3feefaee
 DIST kfourinline-20.12.3.tar.xz 643812 BLAKE2B e26183d894b4f89c5edd2aff739d9c9c1c16ab0a45fd29070cbe9d0eeae8dbb062e95e6e92a74123fe582b4a62bb558a97d18d1940ae7d8edeff3a6b6d4addb5 SHA512 76792c00f6a2a0a5cd43d4441da5723b4c1ec79021d8fcdd66857ac222b25a80978014eb5878f05d4c091443a664d20fc5a2f25af8ec65f815d7a501775d3f83
-EBUILD kfourinline-20.08.3.ebuild 871 BLAKE2B 7c6e4407a3e6fae1db79d7bac6ce7dfea09c334659769a92995e6a79e3245d6fd5b296b735de26e577b15c52b5dc017623b3475f0d174c1aabc470011d2d76c9 SHA512 43a65a46998e63dde5e60d3883a27ef7890e108f3a0c9c78539c32621f6494e3dc87bb8fe99a7527a5efdec77b1511877dede0519e0471423877cf44b07dac62
-EBUILD kfourinline-20.12.3.ebuild 874 BLAKE2B 8845db71cc9f1c83b2bd46dd62b9f4ce8e27bf031ca18372f6b18f2e2ae4367fb32d9aaf6bab8d69fee55fb56d7cbbe8732a4203118c94281b55f6e77f270caa SHA512 49108cf0a8656a9b6ae350507536c13848ad4f6450bf25de761498dec3afa97253c9d57d8a38d4c0ce0b78b632fac766c4a497b9cb1ba3e574aa1115b43898fd
+DIST kfourinline-21.04.0.tar.xz 645016 BLAKE2B 1519ed036fb1f462dfcf6e73e37e3eb426ccbaf966374f1fc8892315ec19fd145cadd45d10035acb2a137166da3c604ee5ece6902b90c6acadf95aa40da7b228 SHA512 18e055e9faeb38a107da66266be197dc9b6fd2fc4eb5dabfdfe7afee13bc75b03f39ae2c337aee07d11c138d85f04f50fb55078b595e0d8c7ea6f689c336b5f7
+EBUILD kfourinline-20.12.3.ebuild 871 BLAKE2B e7ada6faece9464bf86b132203f3f4e6cdc928b2a391c4e9c88857e25340a7a9818e0b9bd89db99c30edec185ec6ea330c7d0ed4b0c7fec2e1f17e050092207c SHA512 94187fdad302d4d59fb30228d93e0243760533e48509e5a6a405622f30c97fa16dbe4cd98f113fe0e6479fdb4b3317b228c8c326450290b79ed965af20d92fe5
+EBUILD kfourinline-21.04.0.ebuild 874 BLAKE2B d0af0650b60c52e0cbab6becf99898475aa2c4560a187826a63645cee2c7b44c93553b66110e610345c5d7806a70a2d583801ffd4c849bb7d51edcfcbe194c4f SHA512 d452b77f015d80b94cff02019153a0b997d65acb33f07f980919022e70197d39508364d9c41cc6f5ab66a64a2b4917484e1cd2751dba94090155013b2a9104e6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-20.12.3.ebuild b/kde-apps/kfourinline/kfourinline-20.12.3.ebuild
index 4db9df714747..58b91909ece4 100644
--- a/kde-apps/kfourinline/kfourinline-20.12.3.ebuild
+++ b/kde-apps/kfourinline/kfourinline-20.12.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kfourinline"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfourinline/kfourinline-20.08.3.ebuild b/kde-apps/kfourinline/kfourinline-21.04.0.ebuild
index 8b1e3ae0957a..0fe92ddfc593 100644
--- a/kde-apps/kfourinline/kfourinline-20.08.3.ebuild
+++ b/kde-apps/kfourinline/kfourinline-21.04.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE four-in-a-row game"
@@ -15,7 +15,7 @@ https://games.kde.org/games/kfourinline"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index ab1e046f3bd0..1719561dd025 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
-DIST kgeography-20.08.3.tar.xz 10764816 BLAKE2B 312793f8cd0e69432702e226dee280bbf7fbd9fe16b0be166eae049125482eca46135bd2845bf0a99cf9508e5e4b7c597854cd057068a6890edd2550663a434b SHA512 49434ec725514c434476e7fae2a80e86e9a1c859a288137cbabdb6aa2a668f7ca7645f7e9c9a6c86defb657433fac530458debbcadfbf3cddda74a4021dd943e
 DIST kgeography-20.12.3.tar.xz 10764016 BLAKE2B fb24cbe5ca7b3c8febe8da4bfe9649d5d05462f2a6aeef8e4a99458f6433c66a1003506a6837fe83c2911794687be73993a91511f4f1e20b28e87c42de8c0a9e SHA512 b77f334c063364608875f783795b362aefd0360af1e06f6a3a2eb8047ab3f84a6853bde23e76e38f3f4ca5c348d358551af79fb8290e26d9d6615752df9746ab
-EBUILD kgeography-20.08.3.ebuild 820 BLAKE2B a0b8db8e895614848712623c6b3ad2345752ebc41af37f42edc6d8203e76eb6a4f665ca4f5b1b215b611d188fdbf402af57f055f3c8884742a7030918a832e44 SHA512 ce28f975f76458a1544eb03cb7135f07c4c5fc829684a9d14060e800da88aeb53af96ac6224859cd151cf8c96f58a4d88955e29ee99255b398107883c165e33c
-EBUILD kgeography-20.12.3.ebuild 823 BLAKE2B 6ca1a00f0036bdc28ac9cfba1f431905088aa213f503a7a313ee964a862491430cbfe979b86bfd271dc162256427db94d817b9ef86e1e0118a2ccb03b1ee3088 SHA512 d8c44ad6316081c39bf6d545941dfbdc5ae2be7d88d28294b6fb1317dc27e6a958fc80055889cfd2277b7529ba4c24976ac7f195d7c5969d3d3a0e33193a6536
+DIST kgeography-21.04.0.tar.xz 10761548 BLAKE2B aea11d6f6d4b7c4522d91c68d45ccac3bdf79cf8f8d68535973f14b79ab9201774ee493e92459b78cec506181afc852c6de4cc3e2c64f7dcce6e918d904e60fa SHA512 bde42ca20b4b81b181a522bccdf2928de8409450e759f75576df7811e36cdd32727a3fbb4172bc26e2a9a202514ff3be87a7e727f9ad8807b2850f5c3407e173
+EBUILD kgeography-20.12.3.ebuild 820 BLAKE2B 3eccf3e7975108dc028f87cd320f0a50b244756de466422a1b4fb1fb7f6c242588760d4addc912b445f1dbeaafe60c92f070a2fc9658800ec4dc5d845f0deb05 SHA512 c3f894fc572dff7982a001daf7fd116e7f2174bff3688fbc13b77537920465c479d8a2cd762b8a829f72fd8e84cc12a4f5ebbd3e1788a962b12108f235458ae3
+EBUILD kgeography-21.04.0.ebuild 823 BLAKE2B 2f1075db64942295a167e8452d0a4e52bfd5f4878f7fca3f953b113f529fb5551bbf77bb1b0b4f4945e7dda5fbfccf3296f21bd96e862d4ff03354c3d7a2916c SHA512 cb5c4116443726b84bca3c65103abe6f5881f5616d20d3e6e4139f5615355ebcb15d0f5c297b52c9d635554d7c27ed7f5b941851f87297e5c5eb4588d1c481d2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-20.12.3.ebuild b/kde-apps/kgeography/kgeography-20.12.3.ebuild
index 707fa71dd737..44ea7e12701f 100644
--- a/kde-apps/kgeography/kgeography-20.12.3.ebuild
+++ b/kde-apps/kgeography/kgeography-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kgeography"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgeography/kgeography-20.08.3.ebuild b/kde-apps/kgeography/kgeography-21.04.0.ebuild
index 375ca4b5c29a..a5c01a0dfd8c 100644
--- a/kde-apps/kgeography/kgeography-20.08.3.ebuild
+++ b/kde-apps/kgeography/kgeography-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Geography learning tool"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kgeography"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index d754f3e42e95..43aa49b89fce 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
-DIST kget-20.08.3.tar.xz 5583180 BLAKE2B d0893aedbbf744bde38a502f87b2340c295dc107aaafdf0a91febc6281d96694948c22b1ca0e404838b68f7677b06097b22cef45e8c076d4e20e0efbd8d6ce92 SHA512 91def334f76e37a53e89e6e696fb955714c1e5239bd85f07b44e5bc625122aa3549a76a0776418e58f3bc76f6052900d9ef0fc595da73d5e98779e3565346540
 DIST kget-20.12.3.tar.xz 5583636 BLAKE2B 174f46a833a5b7d4daae1ef81a6e5c695f97f0855dffebd21c882cd6d43a8725648a0d32cb3a5669ceeae75142cd45822f736ad778ad1b0c07a28daa551a18ec SHA512 f662fcf4915c72a19becd368ef1f069aab14b7a257c810c8290d5ca942446545265c54826588e8a157b009e35a1ea0b21e611085fa2b35976059cf7c19bb1549
-EBUILD kget-20.08.3.ebuild 2155 BLAKE2B 1e45d8028283a61d15aa2e01780b70d45fd4dbe11067b709ca55914aebb796f558e2b146f16de2ab8f751a5029582cac5c6b057bf8a00021744b5d35449bc0a7 SHA512 fbaa6629e038e24cc1c84b8c7ea659ad60e54c74c18693cd8449204a1375dee2f37f048f2b9fa65563c9cfd36e0ff4cf081dd833a6d48e082f769edd3bb21afb
-EBUILD kget-20.12.3.ebuild 2158 BLAKE2B 073a141db57ddf336a07a2170969405e1cc7c9cff154550e1ce449da24939e8cf79296fd56156e27be0205c0d096b38a446d9476221cc759cad350068fd195a5 SHA512 7972943bf672b4d4d9a20c3db92451cc5a08b5693400c3c66d332445113bccddd04ab1d953c68c4854f85ea95ad1f56461dff2eb00ac2c277b0e45729107bd1f
+DIST kget-21.04.0.tar.xz 5589608 BLAKE2B 09ea0f9ffc954df425f99cbf0172f258b31978895598560b6f146dd78dd241369488d70aa8c4667a3067bbd5bf48aed9ddeb9cd82ca5b3382a1d3ae0c9db97d6 SHA512 f17f883be16633e8e96e092965d4507b5f97f84fe1629247ee90bd6cd71aef72ec3c9d4ddf58f471ad46837483aa267053c07bcee65b49c2746b0e91ca635d09
+EBUILD kget-20.12.3.ebuild 2155 BLAKE2B 7112e0a8d0375fa046f621292bd4fae297448629b8bf781b5ceacc682ce8e2ff609b900cad9790162e2184d34750c86a01e8b4a83f3e34a70469e366963cd360 SHA512 cdacbc3dcd71bca34b304077cac8f556dea95e0d13b1e217e4bd322c959bcde5b639e2837d56b65d2e5a60915ce27a567984807403e603921fd4670a4308a83d
+EBUILD kget-21.04.0.ebuild 2158 BLAKE2B ee4cdf9cd6cd030491296376a5d25777f578fb9c568d8fa9ad626885ee6604dcabe00d89537d0adee1142025438b214ee008f2bceb190bf3977eed79bec89818 SHA512 8cb72e659c27e8c3e462c685eca42acf760393a5e7234d0302362afe14287604004798994373a67ebaf1e1725834103b4a9818758d6a8782c17a4f35031513f3
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-20.12.3.ebuild b/kde-apps/kget/kget-20.12.3.ebuild
index b490a3e553c7..5b35de3b25dc 100644
--- a/kde-apps/kget/kget-20.12.3.ebuild
+++ b/kde-apps/kget/kget-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kget"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="bittorrent gpg kde mms sqlite"
 
 RDEPEND="
diff --git a/kde-apps/kget/kget-20.08.3.ebuild b/kde-apps/kget/kget-21.04.0.ebuild
index a4a66f219622..fb13bf887932 100644
--- a/kde-apps/kget/kget-20.08.3.ebuild
+++ b/kde-apps/kget/kget-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kget"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="bittorrent gpg kde mms sqlite"
 
 RDEPEND="
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index 81bf94f98474..d94aa87ecbfa 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
-DIST kgoldrunner-20.08.3.tar.xz 4444600 BLAKE2B a1307341dc0a21fa89b12f6de98d169504da570f4f42c23d3aea0e0a946f2052b3c36f76d92bad6784c3edc2bb33d14f0913af3f2cbf5cdfbf16a58811f48c9b SHA512 0c049a53813c8811245b42b4bf15dcc4027e51a9af61fa3d4221d22d5971afa1df604ad92ac38e5f80c31bb9db50a064b1168338f74d4934d5ab48d4092eee09
 DIST kgoldrunner-20.12.3.tar.xz 4444752 BLAKE2B 302a55ce876fde2e8fc5795dad016a86d91464bef5b9dca3b96357dde37581d2dacdc87d028baf712345027e1ec2ae0757e0a47e0d785f14e85ef3240cf931bd SHA512 0cc72a33d0dee5368c034e7f8f5928531e785abd1a62ade58c24e0975af3ac6ec7e5bf89f07f52be720ce5cd8e5f0d6d4fdd4fa02a5bc8d46ecc5175ad419a4b
-EBUILD kgoldrunner-20.08.3.ebuild 997 BLAKE2B 540e691ed6094ecf997c6f2cc11665494e60370b63eb0f90da5f0cf0c92c1697ac8ae2b7999f54eac4c1a25e1c90156bfc26f90f31a9a0ae7e1afd22c5cf707f SHA512 ca9f9c7f92b25d950c5e8b3689cd588dff67ab26a4f48012b52d2519f35ab55b5a95978e05d1c43b4b48fc5235d7281ac5db1c0d9929d123ba204981a2444db0
-EBUILD kgoldrunner-20.12.3.ebuild 1000 BLAKE2B 757dbfdab159aee371a671558f421ffa13e12fca1b7d7989931c144f0aa3b2ea1a9f799123f7cf99736f60910ac27c79adee068172270bfe72b0da72c4101d27 SHA512 9c317b6d610949fad04f3446a50398f63ecc09bf79e0fcbb027d2f9c2451e2ead0608d96f3977e6f4b410888bc7ec410f76236058dc7681531ec14042a39627c
+DIST kgoldrunner-21.04.0.tar.xz 4450992 BLAKE2B b7b0f41a6081abae2c90ec014aa56573569bebaa931297752a441e253c76fc70fe65625e0ac4595258da4e2d902d176bd65fe2e74be285565ee11fdc3bd25ee4 SHA512 a9e890dacaf9bd26b6fff3b73f4ad96d6e26bb9db9ed28680f179cc756c652e34defdcd468aaa9a12f27f539463d5d69318caca730a89bbc638c788d2d56b62a
+EBUILD kgoldrunner-20.12.3.ebuild 997 BLAKE2B 2f97c975a7ab344caa61f3e5f04c3de1da2bfeccff127a1f55dcdf21e085a71fb54749f30ff69d2db1e3b4e2629e53365c6276051e3b90a89b2dc36cc9f0467c SHA512 ebb8477891a469b04e3ee2c1ed3c0888fa81b2ed1c3dad3496799d71994af1f76a051af877d02e8dc02437a96d3daeb7f334b6ab9aed8d84c6b098a3f3a82cbe
+EBUILD kgoldrunner-21.04.0.ebuild 1000 BLAKE2B 2964da35c45787bf88769e30d827c71460fdcaa47934813a94d6322e26c6a6e1f959b255e6d3439ea828ab964aebf1cfd60dc38369f223dda852ccd9a3e7b159 SHA512 cbd98af41ed2c5eb8d319d2ca3106ee0caf5e786fe6e3d6c5fc1e723ad6a3b98dd052ce89f854a93fe55c986f845b2846bd3badec97eca67c0fb652c6b85ed91
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-20.12.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-20.12.3.ebuild
index 9ac14b7f174e..0f530abc39d5 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-20.12.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kgoldrunner"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgoldrunner/kgoldrunner-20.08.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-21.04.0.ebuild
index f2586a9bc698..0560d21ce19d 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-20.08.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Game of action and puzzle solving by KDE"
@@ -16,7 +16,7 @@ https://games.kde.org/games/kgoldrunner"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index ad3e603a7ffb..168b9125627b 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
-DIST kgpg-20.08.3.tar.xz 2883760 BLAKE2B 31b8e9af66d26dbbe2a77355a74c819e007e198e44ef4c6a803604f4828d1da53676c03d2407cff9075830269e4f557f023b97b05eb468487a036ace1d4204e9 SHA512 37417ef9468e21b8f725956f42e644ff2c76193d8d3df595086b8db88d4c58ec18be2b689f508b4f2c41c7b4cc32953034b1ae6787ee71e4d669938152e96611
 DIST kgpg-20.12.3.tar.xz 2892236 BLAKE2B d953c76dcbff262827728088a6f4ed0dc2d94b0436cd3ca2fe6adcb2be066217a93226c187d3239c456a1dec8ebe1558606ed85f206ccd1d84d89ac03775876d SHA512 0816b1a2cf5d1bdc3d01230da57c84b357f8b7b5fd5a1afcab0ae47c257ef3ed3f4be6934db48896905437d9e3276c91c441da7139502c511582eba4bc6cb338
-EBUILD kgpg-20.08.3.ebuild 1508 BLAKE2B 817bde336596dc2a0aada0d3f3673a440a86630384d025f27a4dc2101dae61b616a4a299401758476893d9a48ea6395c799041a2dcd581298101bb1f8feb8d0f SHA512 c8ed75bd21cef654a5185990befee3cb415cb73ff92aa248798d35c50204e13d1f95150d5ec15a69793d89ea0e77c2bd039adb074c33db703096f16a18e3ebc6
-EBUILD kgpg-20.12.3.ebuild 1470 BLAKE2B 464312d65243b3b0ef9eb52a2052f595ea9a8a72422a864ae32d730b09733d2da095be251c52264d92780a1f270abc3c8f4b68b5965b21a8f7c90f919e4be46b SHA512 78f58bc0ac37c4501537f30c60d1fa8796522ffe29e4a3b1b96c6ae29e1d097ca5c33d3b47cc089e83e70b033a03ff5bcf12a65db9b281f812d68c00447d004e
+DIST kgpg-21.04.0.tar.xz 2886168 BLAKE2B 60fd2b0324bc24c44dba92958c412ee1fdf303fa31a012572639bb00fcb7fd2bca5f4d898002514c257cdba5ba750684f0a89415e4814df9632331c3c080bbee SHA512 2e3417284806b2422d235435778674302b3b515c67c9cf53b56b3bf2d9a883093334e360ee04d2524269bf9bdb4bf437cf0e0104bef78c37a7650cac16b1994d
+EBUILD kgpg-20.12.3.ebuild 1467 BLAKE2B 9ddc4eea235f055ea730c7bf00ac1418514648287db6133c01cbb1667ae09d069f1448874abf241b16b1e603d1c67ef7024c0eb5a9ae9ca9744fd77a75e09c2a SHA512 8aa462fec2cf778d051d2b3031028c5811ec5e19c849f34664e3d489e9b20a96735025257d8c7e9c1fcd4342b1ade1bd56ce1d2ed96ce9f6c056eb4e309f2216
+EBUILD kgpg-21.04.0.ebuild 1470 BLAKE2B 3a0e356e9a2de23b9385b476ac9a2520ca4b12aeb7c46a7b274c28bbd9252fd6a3b2cf3fd1b99bac74a0a148b7fd0ff9b3c142bdb4ddf4a6554b5b619b51cb05 SHA512 c63d16093c248d6c660dcf371139ace3115f67da478516718c90a471a86f86ad15a929256dea87437fa9053fcffdeba6b947f5ca9034cc5c5a6d7dfd382d9006
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-20.12.3.ebuild b/kde-apps/kgpg/kgpg-20.12.3.ebuild
index 97ad7c37d284..c0b55e2365b1 100644
--- a/kde-apps/kgpg/kgpg-20.12.3.ebuild
+++ b/kde-apps/kgpg/kgpg-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/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/kgpg/kgpg-20.08.3.ebuild b/kde-apps/kgpg/kgpg-21.04.0.ebuild
index a17108b4400d..a718ed9475ef 100644
--- a/kde-apps/kgpg/kgpg-20.08.3.ebuild
+++ b/kde-apps/kgpg/kgpg-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="gpg"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/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="
@@ -35,7 +35,6 @@ COMMON_DEPEND="
 	>=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/kjobwidgets-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 1440bd222fc7..17d3abe7b72f 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
-DIST khangman-20.08.3.tar.xz 7407344 BLAKE2B 0f88ee8e487244e157349346f749c433d8ba7a4cf5fb7ca4985fe07d4db28b4e16564ed4d1d8df7f0e8b11af48f6ccbc20a3051c29694e3e5c9dfcf84ee16987 SHA512 e64d40f7477a629e8b6e153d358f7cce9444fc07e12aa5d0a8a077db246d60e5ae66c65b9706b96825c56889cd8627c134b0a85564307a321beeccba51413e15
 DIST khangman-20.12.3.tar.xz 7400372 BLAKE2B d35d57b5a0af7d21b2c81b0ff0beb10eaea6c320190ee9c0b91376d2718db775b52f70f6f8c3ace0ce13821a2afec8dde047f2a53cb519b7e44db5cf727a922b SHA512 6b421298762a5b1f0747e41946d10f35b576b37d2dd865f45b6b35fc402a44f6845714788607e96bbad657d3f2da147f6661f0e53ed04857bc4a0a3d0ea2a2fd
-EBUILD khangman-20.08.3.ebuild 1239 BLAKE2B 8b7166d61db72eecacaf321bd093e3a6ce98bab2ef023c154868c3703887f4bef7df6267f6625e0c86a94375544e6456f5ee6fb15fce06479489cd45eddab496 SHA512 27de8aa52adf5ae4c3b8dcccbb91dcb92a77ac5d393715881e0bff23bcb26146de028be07f074340a778cce22c309c226ec95380066590eab92a3069e93d597d
-EBUILD khangman-20.12.3.ebuild 1200 BLAKE2B 8a61f1f309a12ece3ce009a17faaf0b3ef61980262ae2d9a786b6000a694ca1d761d8453036381c073b3895852b13e2d59deaeeb6e5e8ef80c80fc8af7f59b08 SHA512 cfb07b089cdb950320155343374e151dcdd8eb5eccb8da05596d74f5525c62f6ba97e33670b2fa09b6713d8d7fe4078922e3829a67bf8085a1aeecf61debb5fa
+DIST khangman-21.04.0.tar.xz 7414496 BLAKE2B 622c486f56139416e3ef8f5c26a63a2b7a70804cfb8e8b1adbd8b0ffef34666b3fa30666839eb2b51022d073febc3b5e426a7413ea085da5ce24869bfa9caab1 SHA512 add758d8fb22d584c044a6c98a350ac7bde3d14ea210d36adac3f19d789f9adcad647e36daeccfa5e068101e1c07ed72021d3feaf98ac6eab34b6fd0db4790c8
+EBUILD khangman-20.12.3.ebuild 1197 BLAKE2B d74964d409aae5959309dac3804cf70ecf38e63e7e54b9ad35f0b443e1cb4787cce0fe69db5024e601976f5eb17205c426491499aaea6b29ec5e63aeff8d45b8 SHA512 6af799aeb1632f8ea503352eba7eae73cb9d80e4c1f3ef679c18bb11ae3cc0638d494e664ca20e64204189b91e4faa6441f9704d8d836391991f16edd44345f2
+EBUILD khangman-21.04.0.ebuild 1200 BLAKE2B 99120da46c1221fcd5495f5b63b48e9e2cbeae64983dc304a14e4f2f5cb417a986b3aafc26ea9f4126fc559c46f4bccc93316d3b64bfb6c299f1e49ce891ceac SHA512 923644acf08f42e5b67053b7a5826fdef7d44e841859757e5b4fcb07e3ae6a54984d9340becf1406f9f031d5ab15e84d16d32315249aba9f5f974c3984d94f4d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-20.12.3.ebuild b/kde-apps/khangman/khangman-20.12.3.ebuild
index 8c0dadbe7d54..f93179191acc 100644
--- a/kde-apps/khangman/khangman-20.12.3.ebuild
+++ b/kde-apps/khangman/khangman-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/khangman https://edu.kde.org/khangman/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khangman/khangman-20.08.3.ebuild b/kde-apps/khangman/khangman-21.04.0.ebuild
index 5e4bc85296b0..becb67e1bbf7 100644
--- a/kde-apps/khangman/khangman-20.08.3.ebuild
+++ b/kde-apps/khangman/khangman-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Classical hangman game by KDE"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/khangman https://edu.kde.org/khangman/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -29,7 +29,6 @@ DEPEND="
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index ee6ff313d47c..565679faeaae 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
-DIST khelpcenter-20.08.3.tar.xz 4250844 BLAKE2B 62e8b4f952603ae9bfebbdc28ccb80d3ee92c6b16ae4cc3f305a5cc54f7e55fb7d48ecfacc28e1cb99e5355adcb62d85772ffca1055b60541ba3ccfb732f288c SHA512 cfc4118ff2dc1adb2f477f5520c37373c20f08e5ce28387f8135aa00f9d464cf97e72b4fa9c51dba3867930f5e42e839313e4ee2fc85b12dbf4d9b2d734e8934
 DIST khelpcenter-20.12.3.tar.xz 4250480 BLAKE2B 08a31566902cfce5d91ac25e6cb6fd04f33c1f3f131839e5dfe15e6681144de7ee464564fb77910edf7b987069af22b0e057e5faa64c7e899f0520ca8b74daaf SHA512 6047f7dd135a5ae8b25494d48ef36c245f9c7055eff294e5c29087d4395df656a6b4d5c6f1099cb99257628ac4362b31bb8c4278be46ebae2ae5c01261b566e0
-EBUILD khelpcenter-20.08.3.ebuild 1488 BLAKE2B d922f987383c9f74afc02695126ee2e82e0f6d6f21f93c964969eb3e4dd30a8eb1b7937744b2fd04c8b92885b0c0e54950bfb5d12b0f196c9f2716153ed30cd0 SHA512 3a3387e95891634d300df6048b565e19e8d7b420d14f4964a2a7d8fd8ab5ca3325c1996671dcbe66d83d6f9e76406e0408ec00c7adecc42ba582665528f86448
-EBUILD khelpcenter-20.12.3.ebuild 1491 BLAKE2B 2a1abf1620eb242cc62bcbb3db2199424cdfe1761c3eda226a1af52d47ada38dc35af7cf012db5c55621e8ca0ff366891dc472a36931f84b9f9fa245c5ffb637 SHA512 bdcae61c3716ce0500af42726e7c64ec6136fe32e8449b51382921183ae19f9d526e8edff1957c28633c8f3647583904158281acc2be8c12a1dc010bf3d6d071
+DIST khelpcenter-21.04.0.tar.xz 4266256 BLAKE2B 6f63eb27e6b5fe036b42f3bf4777b059d4a092230e04df245d6381fdba290204990957fb583e21503e5e6bd51ad193406c255fcd19f61f3652b73054bd110cc3 SHA512 68f03c072e5593bc6471d3546c1857849b516676653441087ad0a7abf13746adcdec891db5a52012fc7ddbaa27fb91be6b672b840069b9dededf276842b7f2c2
+EBUILD khelpcenter-20.12.3.ebuild 1488 BLAKE2B 04c06179ba0f3c3c0976dc82ea4b498dabf0ac4e20e08d131ae4d29a00dbf92517b9d63db3215c169dff715887ef55acf3f418a9d5bee5a5b9c5981689083705 SHA512 50d8cb53863c31cc309df4b7dbc6cc83bcdbf04b7a62766b023535db5a1deb8b27151d87be8d8b1fdf7239dfafe5f1c0dca18c28bc029b06279a1edfbbb8d963
+EBUILD khelpcenter-21.04.0.ebuild 1491 BLAKE2B 483fb939cef103872037a90a6502b35b227c81b8c9599eaea74ea43c745a607e0efb4631d832e3718aa63f9681079589afffd4258b61310bc6a36251847e5b05 SHA512 2d907fe1b5c382c0acfff70ae88c55f5b5f01534f1978793278a03f82668dae89ef5c92e883e663495fea334e8ba7d88caa25e80bd119558b009694846d09f8b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-20.12.3.ebuild b/kde-apps/khelpcenter/khelpcenter-20.12.3.ebuild
index e709bcde2528..629e7fef43f8 100644
--- a/kde-apps/khelpcenter/khelpcenter-20.12.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/Help https://userbase.kde.org/KHelpCenter"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khelpcenter/khelpcenter-20.08.3.ebuild b/kde-apps/khelpcenter/khelpcenter-21.04.0.ebuild
index 4f96b1c8c0c4..4037b0a4b3ce 100644
--- a/kde-apps/khelpcenter/khelpcenter-20.08.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.80.0
 PLASMA_MINIMAL=5.16.5
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Application to read documentation for KDE Plasma, Applications, Utilities"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/Help https://userbase.kde.org/KHelpCenter"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index e33a0cadd30f..016bcffecf09 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
-DIST kidentitymanagement-20.12.2.tar.xz 152092 BLAKE2B c23b6d9eb32f7c85d742a323166acad5b544cb5920130536a1df0ae44a87df9f78fc7c7348557cfa1ae6d60d771417fd4d47ebbb75fef06c66f0b0ca4eca9d5c SHA512 8a7544376b475b533d618c40fa3acad42a817f147492dc31dfb1622a727db9912dbedd8222c46c05bd11cfe4dc09b53dbb47f6252cd3965f2e52cee62a532ac2
 DIST kidentitymanagement-20.12.3.tar.xz 152000 BLAKE2B 1b54c296951be13cadb5db42959ead0e7ac79c9e5a7af8b8ecb5e74355513a8e294158facea289277c998da9de285521f812e5b77249b2e2b7a57b91800d20ed SHA512 24ea71f45bb1dc0efcd9acc03f4a05c4558a77a24689dfc70a3dfecb8a697c7282e05e3d212466961e37661c2c8522606f909df0b750e3b203e3843ea3729e02
-EBUILD kidentitymanagement-20.12.2.ebuild 858 BLAKE2B f24dbd50534c999516117207bc085ff97b725385557c75c7961fd7c14f160a73e627b42fe2bf64e76bb4d97f9ada7b2de6972577e0b085c9e6e1aa0470bcab94 SHA512 2ffaf54919072688e47a2d23f8a6d565a7470ae57e9c52c89ed299d2c319bd14cf4474c7cae8fea227cd02e799ed8493796d61627c5b0af3e67d2e27f2a52441
-EBUILD kidentitymanagement-20.12.3.ebuild 861 BLAKE2B c25ad0c8136efc42e105dde2503ab26371c09e455a7801878916ba7bf16a15a365ecaeec355d13b4b661f3538fbcacc3591a342076666b271314ae9f2abac604 SHA512 9eb0a6dda58b5af2e8c63bb61cb9e4193ecc0f12d8d91ba331050dc061171b3d7f89fb5d88cfb1b00cfb325221d6a7345d4815a53283a58c0b451e8a08d6a6d0
+DIST kidentitymanagement-21.04.0.tar.xz 155832 BLAKE2B d6e4b68d7d8fd88c9f3867f0d26aa8a10c04abca9544dd26becfa8651efa072ca483e1e3d066983bc060d98aa2cab05bbba9d86d8419b4e0a68e9db3eacb1233 SHA512 55c3d6170739811434ec66c6ef4706b386ea40145bba3e8712d5f131c5897f3aa9f7b116483c37ebdada66c255c66305b15c344300d1ff938d4755ded7070dcf
+EBUILD kidentitymanagement-20.12.3.ebuild 858 BLAKE2B f24dbd50534c999516117207bc085ff97b725385557c75c7961fd7c14f160a73e627b42fe2bf64e76bb4d97f9ada7b2de6972577e0b085c9e6e1aa0470bcab94 SHA512 2ffaf54919072688e47a2d23f8a6d565a7470ae57e9c52c89ed299d2c319bd14cf4474c7cae8fea227cd02e799ed8493796d61627c5b0af3e67d2e27f2a52441
+EBUILD kidentitymanagement-21.04.0.ebuild 861 BLAKE2B 62236dcc4feaeeaf1615e905b2236d714fa7bd7c4eb1d899a9f41bdd03407cbd2eaa2f8b66884f64a059ff0852d5dff06da25a56463f9ea011ff5b4f6bc082b7 SHA512 53d0c93dc7af60d89084152134908deec0a31a7ae33c580a6801b1da9f1cb1f4f2f186754a6a83c89284e8bd1d923ee8207b9820814847ce01bfc6fbb3f6e683
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-20.12.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-20.12.3.ebuild
index 055f58f6caf0..ddfde1583b45 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-20.12.3.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-20.12.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for managing identitites"
 
 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/kidentitymanagement/kidentitymanagement-20.12.2.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-21.04.0.ebuild
index ddfde1583b45..05dee7a30e5b 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -14,7 +14,7 @@ DESCRIPTION="Library for managing identitites"
 
 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/kig/Manifest b/kde-apps/kig/Manifest
index 4138d1c489da..c383d248666b 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-20.08.3.tar.xz 3467000 BLAKE2B 98b103707fa38c2d840a2b2c2fe3a9892e75fc0bd49367d514d33e1d04fef6379bce502d7f75bce29da13951ed79ee44e55700725506d81b220a624610ebae44 SHA512 becd24e67af434cda18ca7d483ace8649446273ca62eaf12618d5012bed1220e175de5841912075d67a54d777ff1a015a27d56ef53f12bb03c03d2c91e3bdf3f
 DIST kig-20.12.3.tar.xz 3122112 BLAKE2B cff7502feada09f674f055c209840e0e665765aa2d744260e629a58f7fde2af442c136370b173d3fd9adbd332e4d70d55aa794bb036f6c7bbdf42e4abc7db547 SHA512 4de18bf47d532c623aa877e2d52ef3e78f9fe715b96a110eb654aca578fb1addb5aa7d8f9e8e0f54f0549954018e3d7f829f07cb41bf587da115f1a2923e5428
-EBUILD kig-20.08.3.ebuild 1748 BLAKE2B 55c839cd02d4e2a77be9292895187e2c5f1bed48b879725cfd46e8a5b824c379ab1ca7b8b4b43692cf429d95f57e1d3131f15ffd787e23b74aabc404149c523e SHA512 e800c977a7cb640c683d71958b04a8e1ca9e46ce02f8d103ebfba8714b78b0f12b9caea5e5d03d2797c2ad75aceaebf81fe2682193b5f727cf4bb5f4022b8b17
-EBUILD kig-20.12.3.ebuild 1751 BLAKE2B b17e6af10d3f778d52ab1f37b05b1e673ff5a1e18222eea4e10d30f9abc6ee287cddce2b23f3c2744ecd8257355746c62ab606c7d9acdb0acf68abb3470ca18f SHA512 a1e0018fea1ee6a1c98a21421ac5a9db3a69f0d2ec9185872ea14e0a77a1de822cf6e6fde32c2477a1e175e4414811b789f2a38db9679180a053e6b31e963543
+DIST kig-21.04.0.tar.xz 3127632 BLAKE2B 2cf140341d26eeac9990581c679347a7b933836c26aaabb49632369568e1d475e0e5b8cce87231d978d0d5922dbe93dfc98a81153316a16fcdb820a465b4539d SHA512 c1c025adab750684bde4f67accc7c5c5e6d823f8337fb8280fad7eb32fe850fbe1f7dac35bcda21fbc7c03d7267c116b8679612700d90bfe9ac17383dcd81712
+EBUILD kig-20.12.3.ebuild 1748 BLAKE2B 60834e19960272cb5f2a4895370c89b3e8a022053032371bd426cc277f18f9ba035e5d78f0e1c13ba4d202c72b02b76b31357673c218ca746faadf8524ce0960 SHA512 b76d0e48dd29294b943e5314931e571de0d0e9afa4ba620dca747f97c268bd204ed3ee9c068d60db5dc49dea48ca4849b5b3d2c9c217aca86eaaed1f551ca664
+EBUILD kig-21.04.0.ebuild 1751 BLAKE2B 251c839ccae997af0036db0e51c9773470be1fe467ef11ba3df470d5505f014c4f5d8892352c67da3d2ec8bbcac01e0cab9c51694567bb1fd5e0a8a9d7f8a4f0 SHA512 70ae422741785dc4c594030d1f18bfb290d82dfa31556014a2fed19bbc029b670bcd81fc56d4bde8272a86f75068ba039e7ea7a3fc4bd7d83ee56efa60379e4b
 MISC metadata.xml 417 BLAKE2B e9b8762ae43f4e8e449b2a649d89d6e909bd34529bffaf6b0c4683a927b5b89486e7b94de5a34bebe5ceb580289b0ffbead4d3f8db19d0c79f95a93126b17f51 SHA512 9a87c6e27600a5bad58df8fc2de4696a6e2a81e1474cae08201e4861d7961537eba510463e3522ff0bf7a1bcdb77aa84804f0fb956e0d0cf096ffd8f523f1ace
diff --git a/kde-apps/kig/kig-20.12.3.ebuild b/kde-apps/kig/kig-20.12.3.ebuild
index 9ddc0ffeee40..573478a80e47 100644
--- a/kde-apps/kig/kig-20.12.3.ebuild
+++ b/kde-apps/kig/kig-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kig https://edu.kde.org/kig/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kig/kig-20.08.3.ebuild b/kde-apps/kig/kig-21.04.0.ebuild
index aff614b5b0e7..a7b8d4ef9e5f 100644
--- a/kde-apps/kig/kig-20.08.3.ebuild
+++ b/kde-apps/kig/kig-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit python-single-r1 ecm kde.org
 
 DESCRIPTION="KDE Interactive Geometry tool"
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kig https://edu.kde.org/kig/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index 49bc2cec3823..a5988b596462 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,5 @@
-DIST kigo-20.08.3.tar.xz 5232212 BLAKE2B 8dff205e3e0086129d7180a7ab490b61a94db5400810172b1a6cd8413c4593300f73fda8fd3ef5f782776326141a16ee8354e50f391b9351bcc689e0fb997708 SHA512 6bf520d28f5231ed61058175f6f554dff031de637b5facfc679bbd7b254657d8ea6ec8ec28c694bd41435a9a5d6fbbec2522b3762d98bf012497d7a804db8215
 DIST kigo-20.12.3.tar.xz 5234272 BLAKE2B 394f8dc485e4c544a2649673071c92188491a538920cf8e60df74e936f0cef2f5b1f9292736be3ca97f48609c61ac83dcc7a625c41d74e44f5e23a4f659d3e26 SHA512 6576abeafbd67bddbcb4466a4b1079c2cf709b21921f906270d637b4bc2364fab62030c4b12848dd7212910537d2581d2cde588f242286aca5b2039d684df69e
-EBUILD kigo-20.08.3.ebuild 996 BLAKE2B cfe3178894ddd8ccf1619be8a3f369d4744c13c3752ae92ca08b9588a2fff11a987e0b17ec9191c05e83cfdd9da3f74b00a2aeafcdbde366fa8dcfc57c0d8b84 SHA512 d0e872f9d634764845ce48d2f76db51b6de63a2b7b6da13b7b7704379843215fa8c72469184cf38de01793e0153b782c6ddcca8b4a7e671bf200fdc3a848af01
-EBUILD kigo-20.12.3.ebuild 999 BLAKE2B c0cb36d8ec201610e72aba7e8a65b977a98e6d028e6a205994b44204d51576aeb88f39fca2d95b157c871e846f8e2434d91eaf00328b48ae1ac1b7a4dfd9ccf9 SHA512 5518a87debb1f9daf187ae56dde3148fb331fc1dc5eaf97f95b85bd73a1390bd7ac2c7087f3d571ac63f6e120090a90a94e96d3f9bbdf33df231394448a48ba0
+DIST kigo-21.04.0.tar.xz 5245112 BLAKE2B 9b04ee6be68d20d05ed722015bd698a4c010d03663969a72285339a31ede76a09533d4b2599d02d668af2bb8d653d225077b130d14f54b822ccd1b6d99b96817 SHA512 4e0a6353b0229372f365c0945a1de8b4bf8b0b96942d9d0ebb1cf6c7bda4ff7d5f8fcdb2a70a441fb77cb9288ee4a741b138a5115fbf54ca76910f0a96ab37ec
+EBUILD kigo-20.12.3.ebuild 996 BLAKE2B 561538d52aacbc021220097f68d0f58e103eb05ededd939c8166b6db1e6fa7639960e7d639862d7dcd91e2a1d1df7e5457800d969428cbabfca0803691176c2d SHA512 ae2d8104c304aeb51c79e86c5194fedaf596080fb756d1cf447ce47a74715ec1c381ba10cd7aa2bcb1b1ece4eb7cb9410424800d4b03e7f00399c1aba0037694
+EBUILD kigo-21.04.0.ebuild 999 BLAKE2B 0094d25faf822c4b0425364053f758e06503863cf9d79c9feec7017950ba56d59b316adb34b24156beb671137a6dee0e6a6a0615a53a225de322b533cab0b760 SHA512 b7dcb1f24af5215393991f9b12c3ca24988c756d4213f97e4db7c154df00644bbfb2fc01798adc15b80d4ec9d9f074db9c6eff57101696ff3e8d61bf63200c95
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-20.12.3.ebuild b/kde-apps/kigo/kigo-20.12.3.ebuild
index 1c61d97e3a3a..c4d84c94f57c 100644
--- a/kde-apps/kigo/kigo-20.12.3.ebuild
+++ b/kde-apps/kigo/kigo-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kigo"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kigo/kigo-20.08.3.ebuild b/kde-apps/kigo/kigo-21.04.0.ebuild
index 1d77d887b8f7..ef8701879118 100644
--- a/kde-apps/kigo/kigo-20.08.3.ebuild
+++ b/kde-apps/kigo/kigo-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Go game by KDE"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kigo"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 84d498e7fa70..5d15e4662a05 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
-DIST killbots-20.08.3.tar.xz 1184736 BLAKE2B a8ac10b788030d36a49bd948184710deac4acc97d54db93fba934f82315cf55b4bdd02b3881c4c46c9dea8040d65bf9b0ffb7824bf99f03578cdfa9eccd96f77 SHA512 c0a8ea08ef0eb430f8ddd00aed2f031d2bde84c89fa2b0c51f0d64de9f3e1c07f2cbe88b5a52134faca99f20978d803f6007e1050074ee70a9717bd1fe56f7c3
 DIST killbots-20.12.3.tar.xz 1186532 BLAKE2B f2ac6281f3c4d10faaad0a9d3e4a2462a431e9275c0ab6d9e42ebdbf6dce4a393be4b5b61dca8e8745bbc69845c9afc4fdb9d2e7da27fbeab413bc00b00c9484 SHA512 247d4325d705e527ca3934d35d0f939415a05c4f37d7b7b53b43cdb9bf28c3b59b87f60070eeacd24bac9ce22888042081a9503c2c1ce65db8bd4495df7f8504
-EBUILD killbots-20.08.3.ebuild 865 BLAKE2B 6203f434fea198ee5bf6a9361e822a1490a826ef187990d3a7e57327fea72a7af9b567fec16e10408a150cc893a1d87876665550d175237f716d56e19fcfcc52 SHA512 1e5a12e8ed7e2b80862a3c37a1c18f4426971e7872bf95e939d9e4e91d5e24571908cba0986b8be6b40e07b6e1cc17364fb8529cd2cd9ea86b36da5ed2057e77
-EBUILD killbots-20.12.3.ebuild 868 BLAKE2B 17c6006b33f630b47d03ad5370164caaa620689c58b61b497caf7d6b70f54066076d06bc8177888723c70f47aee0036d037707c6a52f1b7d497e0aaa57e6d214 SHA512 ea2b738f091c387a82b74de0a67d88088f895ba6b52d006a8efb0e5df513615dd42b454b21dcb81675a1945ab5ea36c34a22fa6c7f1fc8174b32f55b15358054
+DIST killbots-21.04.0.tar.xz 1186320 BLAKE2B a09786d22d09aef2427c27df1da045488422afba125942951c7c44269a9c061a4526691f7be4211c5308452fb24b5ded71dd2919592ddf9f3d51a73aba2aef51 SHA512 e2001f83d5a7219a62dedbb1e8ce9edd88367166a9996114837472ac830c88edfd17c602eabf361fd48ff056ff1a290080ef585ce6e9573806f83c3653db9ed2
+EBUILD killbots-20.12.3.ebuild 865 BLAKE2B 447c1eacf091cc1e9084843909db6fa2218d6b41a4847c7f4425c57fe6d927778b887d80f70774fdba59851dbb481150769d5bf21283d668c8e662ba7f3abee7 SHA512 e3c0a7cb0afc1289ee4cd23369321b6ebfae87403631023319d66980bb05376af151e358b824fc18e85e49a154591771b4a45b8be14b277663c39c176e61a5df
+EBUILD killbots-21.04.0.ebuild 868 BLAKE2B efcde02afabbf119424a6b2008603e877091832a88d8e01c101606109f5ed2ae567433c89dba0e822a6bb571b1dc319874b22b59eda93f6f7bc90f9193b2c4aa SHA512 090b4060583b9f5991bfba9b9adc1194ba612ee9b43a65fd78df987da48d58deac049db465e6fb36f476f51a1009a8cedc09876fd0bc1dd04e4b39c3b040e6ef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-20.12.3.ebuild b/kde-apps/killbots/killbots-20.12.3.ebuild
index 9813bdbd6f24..4a42dc0bb0ed 100644
--- a/kde-apps/killbots/killbots-20.12.3.ebuild
+++ b/kde-apps/killbots/killbots-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/killbots"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/killbots/killbots-20.08.3.ebuild b/kde-apps/killbots/killbots-21.04.0.ebuild
index 67de16ddd0b8..27eb5848cfdc 100644
--- a/kde-apps/killbots/killbots-20.08.3.ebuild
+++ b/kde-apps/killbots/killbots-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Kill the bots or they kill you!"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/killbots"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index 524573bea796..1b0aa4eb5c35 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
-DIST kimagemapeditor-20.08.3.tar.xz 1077864 BLAKE2B 36f55cde0a5b556bccf39bb3ecc7747bbb3152d76c16dcc90faa9a50d034f0e17e33a97bc98f1d99a8971ae47d303e8f1a379416b983481f6fdea1f0bdcc0d64 SHA512 05b67d78c64957b97744a0b000d41f04c1922ca7d8c7a1750ac1a4978fd081b129b5012b23cfd5c17b03b9eb97d5ae0e181e0eb9e83add629376e303ab9e1662
 DIST kimagemapeditor-20.12.3.tar.xz 1079008 BLAKE2B 7490e8e548b2d2d0f22f45f2c3a61bb8b75e53e2ffdd920e3dad8fcc609989c35ef134ba3251f7f0104ccd9e2c29658f521955a08bd93149986d820e62f068db SHA512 5bc03c0c4aecdb18582fbbf3e1365b3bfce9eca171d5769a5f39234643903dbf4724a9725d95dfaca6a01a03ebaa2c9646597de3d7b4032cf4037e8b993d32f6
-EBUILD kimagemapeditor-20.08.3.ebuild 929 BLAKE2B 3cf98bf5ee585685475e3e3870da14f4086cb277d6005c42383de23ba006e38583fb565cd1117c8dc071faf455162b04dcb2ed7c2c1b303534497b33c78a04ed SHA512 a140bf65095db199254763bc49d2b41f72758da5a867ca24b1367b21d7826a65064f28f51936bf1dda498d8b08d1bd89fd8dd599acf20650199a96fa28ccb589
-EBUILD kimagemapeditor-20.12.3.ebuild 932 BLAKE2B 2d7d46ce9c30dfe2c137d123f1e7db97150340b192784e77b4068af47b9e604802dadb6aa0728aa13546af24463a58d32a9c1b4be567458bdacd0adeb337cf65 SHA512 bd8d0d45830d01bcf5050ea524f4a64fddaf738e6371df5c69af1927591bdeb048e058d519e12254ae54aedaa1e2699b4e926c16f33e26cdeba78f509dcdbaf5
+DIST kimagemapeditor-21.04.0.tar.xz 1079572 BLAKE2B fd717d8924eaf36977cd57e00840effa288754bc93eee2d2f5677f63ed4749e58f0a8119bb4057a542770812768e3020a32991264a5b3f5da1aeadd63564e2e0 SHA512 0f910bd88422d3cbb877649c051d299b96803e96d02b6602efd7c95d5448e83f94b450fdbae9eea721e4ab6c9940a15b5a0f0e65b2df18899881545ab02950a3
+EBUILD kimagemapeditor-20.12.3.ebuild 929 BLAKE2B 12fc56f81da2360881f3f09beaa976a55952479f866ac88a5302c7e083c13dc0e35f358115bd77c5a7f149796a21b055f296cf87fc2131783d11d221feb57801 SHA512 1eb72b89ccce7b161d94c744580e97fced2b62be55b67d17b608c729920c30a3af4027746e7815adf1911ef484faad08bf01841237ec75ee34f46041446f74c7
+EBUILD kimagemapeditor-21.04.0.ebuild 932 BLAKE2B 037c145d159fceb225357f53d06e0cdafdd8a3669af3133c2a038811a3a0fbd33202d6fee0aa5118e81280557419f27555936afa66f56bfe80b90f4e36794ca2 SHA512 8164465f4e73e4c0789dd096f5774a2b6e5cac5de6672934ba4f25d112d0b9924597f164de6270ca184a11c9e89a32961719942d2f3fcc9cf6c2fda70074cf7d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-20.12.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-20.12.3.ebuild
index a72f5c15955b..01bc04a7ccb2 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-20.12.3.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kimagemapeditor"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-20.08.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-21.04.0.ebuild
index 88a2f8c1b55b..30b5b2d46bbe 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-20.08.3.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Generator of HTML image maps"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kimagemapeditor"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 607fd33cf571..47b5bc69101a 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
-DIST kimap-20.12.2.tar.xz 124672 BLAKE2B f03ac4355a6c34af2a249e83d726c0120c12d1a7344e9232aef78adbd3f0f9aa11ffa4610d063fb17c724d7ba335bfec3ead08227994a5796c4ed17a108c5066 SHA512 8017720c029aad508b0f32aee0a338785e72566e20eba03a07ec0644c77b929c90049247988e684e52d34f00025c88b41e36e1acbd83c625a1769fa651fa5317
 DIST kimap-20.12.3.tar.xz 124676 BLAKE2B 3557b87d9afd1738a32fb7f62dbf11012a5043bba923fd712721c266add76d6cfed7da75a4ddcd68bcaf99839eed6b88c78930ca4e1319e278b501b5cbcc4615 SHA512 dc64e972c7955e64e5aea1b141d2c48b76e2074946c4048eada4c647f0089fb051bfd505578461fbf0cf7925b334c49c8de3abb898fc7ad97401276d4a16c5c3
-EBUILD kimap-20.12.2.ebuild 850 BLAKE2B 8cebcfec989d3bb53396234813daff6341744887fc0467d16b38c17cd81d700cd06092b8d4d205b6c2bed2ac323894ae474bce8878add2afa3bd2d49be01e923 SHA512 5e4d2a23d4f676163d16a325137580eab6ca162b7c1418dc5e8e92f7719c54fb6f13d383310e74094e9f6a2d6936b5e722673dfefd9f754cf1dd12c8b195fcc1
-EBUILD kimap-20.12.3.ebuild 853 BLAKE2B c194bb6c77d25ab0bd15eef439c43adba4f9f8a5dfe997dcdd20e3c748769e9f02fe50a2386f01ca70c386c1e7402c7644a687c4139a607774324ca35ac352d8 SHA512 9cd29a91f3e803b6905720eade853b646d6dd4825971f4f66523930b09da62206d47d268cf74664752284d211247af048b91167ef19feb385ee6c75cb1c58b78
+DIST kimap-21.04.0.tar.xz 128292 BLAKE2B 513afde5925c05760515180188f708bfe70d33f5b8feffa046820c52e3d0200cee0c8b76403b623a91552a75bed99ba8761b14782848c26430f3c575a86c8130 SHA512 de62883613f9015d719b52d153afea1c8f123fe5d334c18fd6d6bce2dbe52f2f97d0d6d066f408000ee5c6ac1ec79d18023c5c186284d6baba933808a6b940da
+EBUILD kimap-20.12.3.ebuild 850 BLAKE2B 8cebcfec989d3bb53396234813daff6341744887fc0467d16b38c17cd81d700cd06092b8d4d205b6c2bed2ac323894ae474bce8878add2afa3bd2d49be01e923 SHA512 5e4d2a23d4f676163d16a325137580eab6ca162b7c1418dc5e8e92f7719c54fb6f13d383310e74094e9f6a2d6936b5e722673dfefd9f754cf1dd12c8b195fcc1
+EBUILD kimap-21.04.0.ebuild 853 BLAKE2B 6355d89af4902316dd382ed9835f6182710631c4bbdb522769fdf562a84e1a2bc2a4eac19e063cfa6c14317662f97075f639141b6121826b6b1795e52f32f508 SHA512 a4402e8cbb4bbdcd8faeb07a047c2e4f05e53841467d7157163aa91d9cb84408563b2a993dcc52f1c9f4ad3b7d55978013bb185c2e0d8deb858b4451471452a1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-20.12.3.ebuild b/kde-apps/kimap/kimap-20.12.3.ebuild
index 6553e8cae07f..fe7782838823 100644
--- a/kde-apps/kimap/kimap-20.12.3.ebuild
+++ b/kde-apps/kimap/kimap-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kimap/kimap-20.12.2.ebuild b/kde-apps/kimap/kimap-21.04.0.ebuild
index fe7782838823..01b0dc112581 100644
--- a/kde-apps/kimap/kimap-20.12.2.ebuild
+++ b/kde-apps/kimap/kimap-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index a7468d3eee6b..db1ac2fc6150 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +1,5 @@
-DIST kio-extras-20.08.3.tar.xz 630900 BLAKE2B 85d10431df29f62744c92dd6a3fe29442170e2cc18b9a0bd91a6726eccee9d63d6fec89e1f2eddddf3f2fa046c486e543d65bb4777b85c6c23bb14d142077c0a SHA512 c9336b2a348ced91c4edc36628afd2698891d9b52cd9ca6819e13e00a93745bf112eb98ed7d85940a41ae046f538d192d3bc7d8164d8fd65eb8464490d9471f2
 DIST kio-extras-20.12.3.tar.xz 636012 BLAKE2B c5145871443ab7bfb562ac935462eb5dfdeb7caab63c123c53a929af9d41f3780bf03ac9f16153434854f785122455e1767573ce84b88bef196a01c62fc2e609 SHA512 a419f7fa92ff876802e8b53eef9b5756108dd3f30fee4f1e1d25f4c8f4468181b9565a92ec07c832aa175368763adcd512f7732666f09a4e534e8d1af6abd13e
-EBUILD kio-extras-20.08.3-r1.ebuild 2655 BLAKE2B 7e2da0fd425f63a2bf64f8e65796cb6c6b72c5f859396a977a465a23068f9ae2cde1f3007893c40e79f5015101755df38faf70ac1b7b66e9500a5f52835991c7 SHA512 3fd3216b16695f9f281d8d08eff565642de39f0913cae2e70b4cace062c4e821a3dc3d3e1a307719967722a4d06f71e90dbea0ede45e41efd530fbad5883f207
-EBUILD kio-extras-20.12.3.ebuild 2624 BLAKE2B d6f8edd4aeaf539af4c21f265c077c0c7628e92173543a0b3d302d0ce05e1accc5d84521101bf228354f926242925daa3a8b28e69046ef8facf23b2c6e5fd3d5 SHA512 63bad9a3ae3c4cf1a5085318b17709c30ab3ec0f172586cfce2d842b2d9c1acd41741f360f5687b6b5ac414e4fb2796b7a8869e3e813d67837f08f30a00519f6
+DIST kio-extras-21.04.0.tar.xz 646088 BLAKE2B a41286541a54ef3b30ca4e77306aff6633b5d35acf7f6da197065ef67cf6fa44a8f483c39d3cf641103b506c6d779765f1757a979f0c36ebda49b1324d216cef SHA512 c5f4dfd6517a3a57bc58bb7429d311f7e2327f663ac5da6495ea79ae7a8a2de55a495a9d9ea960d7d004a7fbe3a5df6ea179b7d4a01f6ce87a978446b27b03b0
+EBUILD kio-extras-20.12.3.ebuild 2621 BLAKE2B 5244624842b9b083e2a5b874f705bb4712a91f2247f8511986a9877bb2646b499aaf609d77ce1b8c08701276d1ce9d6f3d0ced1004631ba54b7b714739636377 SHA512 f5bcb699e5c7700115d9363177dcd4e3314d545ea6b41f5f3c04e7bf92bf9d57c30a792d9ea85470e181e3840cc9d8a6a699a33929e00a9e4a5817993630b9c7
+EBUILD kio-extras-21.04.0.ebuild 2629 BLAKE2B 9599d3e762359009391473fd1cb0efbe79bd24d6d27ec806bbff22b694ea596e4759d7806ec1af89a0f0f0fbdcde8782f2b99571775060548fa808498dccf47c SHA512 829a956e00bc311eed29ac9471ed4f15350f44806af9d5d724d21d3206825aa94bac2e3353d5092cbe169875c9d448e21c5439f396b6b0f0bc597922ad2d3f22
 MISC metadata.xml 840 BLAKE2B cba33bb5b6c15b2cd116fdf241f91adf13b96d7402bb863cbfa6a8fbb8a5c7524c5704c4ccc3eb1350262eb55ce5d3130e5f0fda078c66ef597bbed0425b8b7e SHA512 678501971728b966bcc286242477f6bab4be9244a9cdad765be5d50c43c1c5fd08102c03bc4b5e9a2d46c5e92d594b95609da26d47b2a923339fa7e1d500f7c2
diff --git a/kde-apps/kio-extras/kio-extras-20.12.3.ebuild b/kde-apps/kio-extras/kio-extras-20.12.3.ebuild
index 6f93839830c0..bbe8f9614b8f 100644
--- a/kde-apps/kio-extras/kio-extras-20.12.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-20.12.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 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
 BDEPEND="
diff --git a/kde-apps/kio-extras/kio-extras-20.08.3-r1.ebuild b/kde-apps/kio-extras/kio-extras-21.04.0.ebuild
index 58bbfff301cf..7a33fe927ad5 100644
--- a/kde-apps/kio-extras/kio-extras-20.08.3-r1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-21.04.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,12 +15,12 @@ HOMEPAGE="https://invent.kde.org/network/kio-extras"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
-BDEPEND="
-	man? ( dev-util/gperf )
-"
+# requires running Plasma environment
+RESTRICT+=" test"
+
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -38,10 +38,8 @@ DEPEND="
 	>=kde-frameworks/kdnssd-${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/kpty-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
@@ -70,14 +68,13 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=kde-frameworks/kded-${KFMIN}:5
 "
-
-# requires running kde environment
-RESTRICT+=" test"
+BDEPEND="man? ( dev-util/gperf )"
 
 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)
diff --git a/kde-apps/kipi-plugins/Manifest b/kde-apps/kipi-plugins/Manifest
index ca9f64def318..8d2714599856 100644
--- a/kde-apps/kipi-plugins/Manifest
+++ b/kde-apps/kipi-plugins/Manifest
@@ -1,5 +1,5 @@
-DIST kipi-plugins-20.08.3.tar.xz 1644404 BLAKE2B 28515f969b3ec04f794e18abdb919ed6d432e636592cd09db8821982731dcafd4f194f08275566db240d473eadb6833e3945958d5e4a42abb209ad578301b14f SHA512 89b65b600e09738cfbd503c76395a4d5b9d7efa46457b6616eab9fc8653c842383dba978316ee66c9e78d6a7d47b908526ddb956cc8321197ab1d6879b39a34c
 DIST kipi-plugins-20.12.3.tar.xz 1644852 BLAKE2B 5b2e298b34d12508910ff005f525cd457c2865a553f07089df33144eb8f3acf06bee9b761e388ac1474929bc4df558ef772981b1345e40fc3de6df90ac5e4be5 SHA512 8e5cf2ea81facc7ab5eed509be71b0dc57e93ce06237c805211493e345805f82b3aa3f8994d0def3b81dec97261409acb9bc51616b85eebf10a98c43369b4992
-EBUILD kipi-plugins-20.08.3.ebuild 1530 BLAKE2B 67fee3e11297a3f42321d808fed3ec6a40fb488d5953ae8358da27f281942268036675aa26698fa40721576a96a2e07d5308ecb67b749b23a2424fb47fae00fa SHA512 eb5db078220cb4198301ad526d2d8fd29e366f0e53ad40272304095de592a4397ccd5c29cac3d7c440f4da10dc59fe7d0fa02cda366919e1c902e9202eb7dbd9
-EBUILD kipi-plugins-20.12.3.ebuild 1478 BLAKE2B d5a6126b5bb68d0952a1b6f932ada4cd0671ab4def4db9e8e525f71a74a241bca90cd151fc52c39609d758651cf5b7f564a745c4dcadb9fdcca07c680b9cff51 SHA512 152876a44e2dd03dfeedb13e149cb6ece9e3b28f1e252def5663010e27b11371babf77da104d9460addf34a0d183033591e1105c47201cd70202ff1a8dc446b2
-MISC metadata.xml 687 BLAKE2B 77c5f391f0a6a78baa467283a0352ac6d79f8aad93e57fd6a57b6d61a04b7c45968f55d587b234edd2077bd94cffddcb039ea48b06cc83a255e0030384298ccf SHA512 1d3260f089af7889757e0960f74bd4c30ee7ec1c866d0eda82c09ae13be4cdbfd481e9da856d18f6c71008a58f8680275dd70e572449240062d216cf175079a9
+DIST kipi-plugins-21.04.0.tar.xz 1650804 BLAKE2B f258606aedd7daf9da0260533c1395753398fce1e6ff0554e91d626e3709367a74942d6d60b60c6337e2b32cd18fe4f075e969b99b886c8872fcd4497609948d SHA512 ceeb107d0dfb3c210e16f8927abd16c0a3238a1a29e7ae98d960ca312cb33e962daa583d315bd518b65c4b698faf3268cf160fae1d15af8e7dd433d01cdbf3c1
+EBUILD kipi-plugins-20.12.3.ebuild 1475 BLAKE2B 3042d038c11b4524cc55cae7634c9b385423a3662fdf8ea09502f6839ff64b0f200a1c19e65be3cec0e0d9a01b03115a0c71bd0f49da2bfe9871fef60a766eb5 SHA512 b9cc12a574d3499eba8bb6d634c69a21db27bda0238d1d5776c93179fd997e775947319de61aac578b0e51ff71e893ae96f5f8491ce32f04ee93c4e2fbee2f78
+EBUILD kipi-plugins-21.04.0.ebuild 1478 BLAKE2B f2c0098e2591e9407e2d26bcbd653b8accf62156b9a16101664fac96fdabb313464c390cdcfca90ce850568fa656ae2f7d79b56d8d109a8f25a0d43ddcff1342 SHA512 e3f3331fcb6d3b6c535a47e3a6fa11bc15c8be4841b87531b5fddb7fdb5ae3215b72c945c459bb8fe8a8042d179874cb26cc9e6d9c5ff44f4d9a76758884bdc6
+MISC metadata.xml 625 BLAKE2B cd63f210400e6238f574fbae4a33d2b299aa3c46c9264e21521255a3af9918805ba8905156629a676e3375009c873208a843a0d82f8a260689ef854321d55cdf SHA512 4f61eb0e78808875c77cbafd1c95fa7c8fde0e6b05b539308d5130f5ed5b7116ce54e1444e30c88ae3d295185442c99fa1f0db03b533aac15efeb06613b91f79
diff --git a/kde-apps/kipi-plugins/kipi-plugins-20.12.3.ebuild b/kde-apps/kipi-plugins/kipi-plugins-20.12.3.ebuild
index 0a8da4d9e430..6d60ea2a9887 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-20.12.3.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/KIPI https://invent.kde.org/graphics/kipi-plu
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="flashexport mediawiki +remotestorage"
 
 BDEPEND="sys-devel/gettext"
diff --git a/kde-apps/kipi-plugins/kipi-plugins-20.08.3.ebuild b/kde-apps/kipi-plugins/kipi-plugins-21.04.0.ebuild
index 81013316857b..eb847bcd97ec 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-20.08.3.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Plugins for the KDE Image Plugin Interface"
@@ -14,8 +14,8 @@ HOMEPAGE="https://userbase.kde.org/KIPI https://invent.kde.org/graphics/kipi-plu
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="flashexport mediawiki +remotestorage vkontakte"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="flashexport mediawiki +remotestorage"
 
 BDEPEND="sys-devel/gettext"
 RDEPEND="
@@ -37,7 +37,6 @@ RDEPEND="
 	flashexport? ( >=kde-frameworks/karchive-${KFMIN}:5 )
 	mediawiki? ( net-libs/libmediawiki:5 )
 	remotestorage? ( >=kde-frameworks/kio-${KFMIN}:5 )
-	vkontakte? ( net-libs/libkvkontakte:5 )
 "
 DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -45,10 +44,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Vkontakte=ON
 		$(cmake_use_find_package flashexport KF5Archive)
 		$(cmake_use_find_package mediawiki KF5MediaWiki)
 		$(cmake_use_find_package remotestorage KF5KIO)
-		$(cmake_use_find_package vkontakte KF5Vkontakte)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kipi-plugins/metadata.xml b/kde-apps/kipi-plugins/metadata.xml
index 0315d40cae15..6e02e48299fd 100644
--- a/kde-apps/kipi-plugins/metadata.xml
+++ b/kde-apps/kipi-plugins/metadata.xml
@@ -12,6 +12,5 @@
 		<flag name="flashexport">Build the flash export plugin</flag>
 		<flag name="mediawiki">Build the mediawiki export plugin</flag>
 		<flag name="remotestorage">Build plugin for remote storage using network protocols such as FTP, SSH, SAMBA via <pkg>kde-frameworks/kio</pkg></flag>
-		<flag name="vkontakte">Build plugin for vkontakte.ru</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 15be9e37685b..2f1ce2da8e03 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
-DIST kiriki-20.08.3.tar.xz 378736 BLAKE2B 88814a9940794d068eec28c6ac71f8273b1a317ba5d0b1702ab57574ce0e777b599b1f43fe0cce5d486d7f85f3947e26a04530a0a556eab125692fcc387ea68b SHA512 456d5914d5c6c897b09f685f8eb9e747ce072186c06ba0124501e37e8ab2add76df6fe198603764f9c169a8d3996bc0b5fd09c78e6cac8e7d3b481ca082f6c07
 DIST kiriki-20.12.3.tar.xz 378704 BLAKE2B d58599bd2b25346bf58033139299da3d7ab9fef6a6e43a7422873b266ed0f8464d3bcfd31e59c2ce0790422b8cd5427d78d0210fda376eab0b7ec8af9bc26715 SHA512 52615d3de4ba76e3e80450c8ae90dafb9fbd123954c9e703d44167be78ef4b3ce85fc51fe90a811621e5a8beb79ddc95499ce0b5d91003e9726705f9e4a0f9b5
-EBUILD kiriki-20.08.3.ebuild 924 BLAKE2B 7be87ec67fc449aab15d7d63d45d58fee0b24d496efe07a36e1fd69a72d866049608507bd0fe16d35508791a63d617492fb1a6891ec55da461f695df61445b5a SHA512 9f70cfcd211ba8babeaf229b6e14dea7d3727f10822bd547c90c5db5559f40bfbc899d7b91f14a7b20f48b32eab32ed89ec6446bd750e66a1eeec0e4a703766f
-EBUILD kiriki-20.12.3.ebuild 927 BLAKE2B 345f635584386a2d4ce2da59296f19b32ffb0cfdf5d14572fc5ebd503f770e00c9edcb0468e0b177a391737b07f1ea88c6363a66b027a05d5068a18ee21f76d0 SHA512 e7d609f8891447bfb49c009ff9337ffe60242f17be3914b75af19b678d50e693985f863bfb0f473ed0f7962355e4dfcc9fe7e763d1ad10b4dfc99014ac626c74
+DIST kiriki-21.04.0.tar.xz 379296 BLAKE2B 35420e3a5362a04dddb673e9cf7263f82c23d77ebfbe65d16dcb3ac2c00276ea72dc546d4f4e1fa1c2f6338dd7d11748d3093bde9b81512a9cabcacb509a5bc1 SHA512 c6749b6247697925840d33e5e0995debb3ea74e9344ca7c731220e818a40b838b3f2a1f1344de59cebf9e2829f05949ca77252ed6cc7b6d783712cae3b89155b
+EBUILD kiriki-20.12.3.ebuild 924 BLAKE2B 9b1079c40b904ed0f680949667eb8b8c3b8df715f38a1e584f8d97ad7fde3adf0f6c87959d5eb47e423f52c16a9ead32d76f5fa9f60a22879f23a39e3a6033a5 SHA512 9b527e660bcf416b592ada67daf414746717318496905f5316db70bdb7c8475533d9640b44ccaf88b5101428121b3e52293aedd7c54776a2b9b02b21eae5e5c2
+EBUILD kiriki-21.04.0.ebuild 927 BLAKE2B 92b5440c005b3e8b6c0620c9ae2623a6bcae263f665594fbae70b3ddb922bbed89173e67c522b373dde8709db1786cf58cb990e4c4e7527520070b25ffb92340 SHA512 14b40a177f95cf7122f2db26aa9c7802c6c51849b1ac7cc43aec97321122a72f0a30f770bbd496b487d089f23f0a9cbdd29b3bae22c94ec506a1199e21e2d8f8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-20.12.3.ebuild b/kde-apps/kiriki/kiriki-20.12.3.ebuild
index 0a74dc918845..5b4306afd2fd 100644
--- a/kde-apps/kiriki/kiriki-20.12.3.ebuild
+++ b/kde-apps/kiriki/kiriki-20.12.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kiriki"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiriki/kiriki-20.08.3.ebuild b/kde-apps/kiriki/kiriki-21.04.0.ebuild
index 1c01df4f039e..80568f73b2b9 100644
--- a/kde-apps/kiriki/kiriki-20.08.3.ebuild
+++ b/kde-apps/kiriki/kiriki-21.04.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="An addictive and fun dice game"
@@ -15,7 +15,7 @@ https://games.kde.org/games/kiriki"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index d8219ea6dbb0..e11252b59428 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
-DIST kiten-20.08.3.tar.xz 11299328 BLAKE2B 530510a8ffccdb451fd6d08e90bda5fc0c96d601471cd0317a6f30e38357dab2b9f3ff9aa044a2f35d462903ed4dc1aca7d424a94c2747debe2ce85b2f7253b4 SHA512 31911ad884d00bb8f0e7377f7f2018c9b7e0d5636b216f03d1367008348c53058d658d4640559b52b0ac01595786161adcba4f05d6b78f5fad85a4a456c9f90f
 DIST kiten-20.12.3.tar.xz 11298492 BLAKE2B 04cb5f59e13abd4da7083ad609268f20f49dec40185c7188c85f7a01c1e9328ec45ddb7961a17c33ead52fdf4782640526102322199895ebada66714ca670e1d SHA512 f9801aa1bb8eb5a7021f6ee8a5daff3a4b3cfa9e36166e4a4b4ab5407ed7557b3a75fc1cba4e79f80fb1b0f93633f1066116129f2250adcd9756b98745fd9209
-EBUILD kiten-20.08.3.ebuild 1078 BLAKE2B b9e6000b80b40673fbfef7d951e7d2df1bbffaae68dd1060d476dbe8d402623d8661c5f783491c1ff6104f4a5ec0c47d1ebccb75a19ea9fbb252a0055921030d SHA512 3267618e00831353f033c81f56df9b7252ab97fccf66dcd810f5f445fc1267e3ea703e46b894bcec7f8148f4d77ec73310a5e228fd3aafee713a8917ec7319a6
-EBUILD kiten-20.12.3.ebuild 1081 BLAKE2B 2c12e2fba52fa66e736b6cf3c074c780c1207dd71b9ce700be311cbd0417b62c5620efb7ae65e0ffd1ff2f476c811789f63c6682431891698b06fe0c30cb98a8 SHA512 bf4e2040efd61df858c487e538eb66d932ed25d5244e9183f213d505c15f95b133cda2c482e8f575a78ca7c1d70eb3aad6049719d06d92294b8c30421c031c10
+DIST kiten-21.04.0.tar.xz 11300440 BLAKE2B 929863764b8d1fc5fa143a04e4142b6db925720d3dd1f9d934830b7115749ab2e2628409d6ec954a789c5ef1847cd884b83b1b5b87a00e1f4ae0b5688606a97e SHA512 3ba2d754c3b7837473234ce9a735270be30067631ace5a7addbb6da4eb0e818c731d0725036ae333552739232a4433a3b3c66619701c1d272f985ab1841bc316
+EBUILD kiten-20.12.3.ebuild 1078 BLAKE2B e6c13557e57bb3e1712f50a484c064383a47fbe834400f27fd36e1205723c39c0da818403bbec8862b8290037f6684b96442cff0676520e5972419850a672236 SHA512 e4c1263f1b21e3fff4f472162258e297aa9ec5f2c0509046f2f8c1ea488d1487779b5eaf2b48c2318c4b84718fe5bbbfaa2da92c0fd8405699cc43901f57d215
+EBUILD kiten-21.04.0.ebuild 1081 BLAKE2B b868f543b19cfe52e4f3acebb9857806db9565863c43ded1109ae4caee4f53f5f4b6b8d2ca1cd029e627cc5199646caa4f3905b848bbeaed395e4beccfd96225 SHA512 0315b21edef7c9df478f35d37deacffde5a200e487b3745cb134fe4251b1843cee2bd0c2afb2d1e4a51dc944bb16eb8d485521cce4b9bf4a79afe9871fe96173
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-20.12.3.ebuild b/kde-apps/kiten/kiten-20.12.3.ebuild
index e5d5a55df482..19e783c033f5 100644
--- a/kde-apps/kiten/kiten-20.12.3.ebuild
+++ b/kde-apps/kiten/kiten-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kiten https://edu.kde.org/kiten/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiten/kiten-20.08.3.ebuild b/kde-apps/kiten/kiten-21.04.0.ebuild
index 051d0ecc7265..d9c5a38d525d 100644
--- a/kde-apps/kiten/kiten-20.08.3.ebuild
+++ b/kde-apps/kiten/kiten-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Japanese dictionary and reference"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kiten https://edu.kde.org/kiten/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 87d01be0ffe9..465c3c44eee4 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,5 @@
-DIST kitinerary-20.12.2.tar.xz 1814612 BLAKE2B 68401199d3415b02a087f24e20e2c6772a8c66ebef0122788c189de8c4084337e31af42b8e842605d5062b59cd2303921d20680636ae4f4a407ff03e6426949a SHA512 58b0d3832cb04c024d6e9f41b60d0f7679aaa5aca96c21a6dfca6309d1e1e24f7d5156ee04938b0ac5d5dda463483f96e272abfcb3b6566a9f64238759c1d228
 DIST kitinerary-20.12.3.tar.xz 1808996 BLAKE2B e1aca401696ce7aa01bff4c7d38eedd7af90b6ff4cf6246a22084bee64d130ed099b9dea98512df347c7516a55f78ef1a97795124f71f1944a87e30365ab7c8c SHA512 9216dde20f1941b933327fc37382af620e29c660d6ffebe84b0087c660df75b030056f4142a75afa857e339fa7d56ab146d6905065f341894ccd07c2e295e541
-EBUILD kitinerary-20.12.2.ebuild 1008 BLAKE2B 0bf0ded43f4e4950c63861fa5aef12ded07c1b37fee83a9b57def548f6b999e55201bc1cf9d2bd75c0d762b8cef27c43775a014b88cedbda2bd335d290fd9740 SHA512 ffd703710b6e8c7e613c7dcfc892d0b83e13931917d054ee8b75e3ee83f01b25dc6e84657b3a34c8ab722e3443f9004ef212c03fcefd49e1fbf7ad933408524e
-EBUILD kitinerary-20.12.3.ebuild 1011 BLAKE2B 1ac67283b5570f8718a0614a20dc98640b41292a03c87e6719f0575c8867676a501d071e323caf3ca30dadee9247cffe76777040dc3333b328ed7f5e2da3b276 SHA512 e6c0bd76945215f630da3a41932eb3a32214da7a599e15cb79bdf1e04d84b93125ac2fe430eca633ab2e3b54875425e9eb9eb041a2d4917dc8f9e6eeabad84fe
+DIST kitinerary-21.04.0.tar.xz 1819260 BLAKE2B 33891c4470372533a04019b5dbc61ed4ed9a2fc9d991ff7662b7c1e962a4e7d03783ee73a0ca1df9bcdf71fc2fb7dd23f0958534608885cfe94b2a313da34c3f SHA512 ed0e210ccf2fed10e1f8327e9b73540b412819eacf0db01292484b530bb8d6f4010bfd17ffcc58c2e0dd535826e6449bf1358306f8976141abb85703f675393a
+EBUILD kitinerary-20.12.3.ebuild 1008 BLAKE2B 0bf0ded43f4e4950c63861fa5aef12ded07c1b37fee83a9b57def548f6b999e55201bc1cf9d2bd75c0d762b8cef27c43775a014b88cedbda2bd335d290fd9740 SHA512 ffd703710b6e8c7e613c7dcfc892d0b83e13931917d054ee8b75e3ee83f01b25dc6e84657b3a34c8ab722e3443f9004ef212c03fcefd49e1fbf7ad933408524e
+EBUILD kitinerary-21.04.0.ebuild 1011 BLAKE2B 13156513c4017c9790d6f020c440ee1b90bcda8df96de18df53a61dc2b08f16369565210d320db449926f8ca202ade932edd80389b4fb6f1fcfe3444a41617e7 SHA512 0ef0856e95045c8d90bf861abc2d71bd417ecefc7fbe8c2ebd8cc12f95727021c5662d9f498c89f6c30c7df280c368ef3fadaaf524231443a2d4a8c8c8267475
 MISC metadata.xml 385 BLAKE2B 3831c360aacb09127cbaf52b779ff5b17708424dcbdc59d3c40739cae4742c9d22a95222aae7cbf188e74ddffd22ac58275440ede013b6c18c2f6b8a148bde5f SHA512 3bca0a73900f8dbdd9baf83b3e108d73e074d5713abfbfb5d4ec2923104096f516f409501e05fe9c42c59a949eac333d36ecb1e31b370a2810d7eeec515e86b5
diff --git a/kde-apps/kitinerary/kitinerary-20.12.3.ebuild b/kde-apps/kitinerary/kitinerary-20.12.3.ebuild
index 7281ebfe73be..40bf4c7fcb6b 100644
--- a/kde-apps/kitinerary/kitinerary-20.12.3.ebuild
+++ b/kde-apps/kitinerary/kitinerary-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/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/kitinerary/kitinerary-20.12.2.ebuild b/kde-apps/kitinerary/kitinerary-21.04.0.ebuild
index 40bf4c7fcb6b..94faf30f36ef 100644
--- a/kde-apps/kitinerary/kitinerary-20.12.2.ebuild
+++ b/kde-apps/kitinerary/kitinerary-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/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 6c2aafb94577..8233b8ab33fb 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
-DIST kjumpingcube-20.08.3.tar.xz 290544 BLAKE2B e43d7d1a9ecd9ef5bd907d286b5ca6c6fe631b8509488eabedb0fbcc9b07cc76b897cef75193740786556cb2ea31158b22b5fa026b3e80280d5fc11a97056897 SHA512 ddf1e81df463ba8e73e4eea95300eb610ae64df37ccea5e4efb248b42d15861a4f42b6457aca728760906d372e79d2ffbeb46d37963c1fbf02fff3bd225bc144
 DIST kjumpingcube-20.12.3.tar.xz 290892 BLAKE2B b0fe75d866889a9259daa4fa3c500eef1c93d077e0a6247a3bf7b1718435b721f4558ffd042ee7b2e6eb218ea888d5ee42dc30b2fb98ab7d910c1a0b65869fd1 SHA512 c4df393cf74c18b090d0cf97c04ab28579f75dc2f140921634a6250952747db0bec415a7516031eeda7ce731e15188062a57d652d0b5533193adfcdab48edc9b
-EBUILD kjumpingcube-20.08.3.ebuild 914 BLAKE2B b858c52b2593e38fff2b47d53d54a98210ea182d2531269c0e1a9f622d6548d86b789cd382d85bf627e5db92c4ebf4a2b9636cba9a53dbdd40dfb9d2f91cfefb SHA512 b6d8b0801c704d7790389fdce4f036d59b307ee328c15f44c5ee902120990634cd0920786f5345d02e8dd3d81a2e0eb0e1fce5e448a7d54087191db2dbc4baf4
-EBUILD kjumpingcube-20.12.3.ebuild 917 BLAKE2B 2587d6897dd0d2334369629978f5bfac9be2d84743499293fe3c12b1f2f2eac71db30842db2694e7110d21f8e22e7a9be856472690b6ed80787217ac007da2a3 SHA512 160d7f6078a48763ce2e0903558e78162d970310791ad932b0e9120d72324a71d654e8e48f49956d3124deb504e13aa0a6dc52da2c8af47573a5ac90b8c7f872
+DIST kjumpingcube-21.04.0.tar.xz 290988 BLAKE2B 9c21942386e0d6daf1a2216599a52b4271780f1f3bb632c7dad031feca17e2c0b027a36910663981da5bb8caf02771427e543a8c7fbec665f14f5ed719217d26 SHA512 e8ca8de5e6c34f23ff370544ba7d329d357bb98ab91f6d0c5a27c509baa3cfda2bb86e5bf2088cbe755932967da477cee1ae8e601dcd379855596c80cd29e003
+EBUILD kjumpingcube-20.12.3.ebuild 914 BLAKE2B ac1779352fbfec167219227ba7ec3e896c642dac6f3b4b518f286bd4baf628d84b386623aa680e5cec626763b45cdc5c4970a93b4ac14e129d03ae807685fe63 SHA512 f2cfffe6ed3024d86cd10af9ae9bdafb085b63c0e11a2d4994dfcd893252cfdab578c2e33b63d393d24901d9ddcb59bbcdc360951089696343763de2172019da
+EBUILD kjumpingcube-21.04.0.ebuild 917 BLAKE2B 4561f8ab6b85266711a3f0e0f882d800b1ef16529ed8f7d0d2f273dcbcc66c9efce69598d368af5d683bd7809307cbe33d356c937958d5787b0c44a2d82faa72 SHA512 f222f1a48a214a90ddb0673787b7ce84a23c869ec7383d4bcad2e45a2b48c138e0ef2badb6881b2092471ad83f4c3127fbf5f8a7d2b0257200e1d2a662fefdd7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-20.12.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-20.12.3.ebuild
index 872f3ecd9359..40930178a40a 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-20.12.3.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kjumpingcube"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kjumpingcube/kjumpingcube-20.08.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-21.04.0.ebuild
index 09fe1a7f145f..0f25f19d8d69 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-20.08.3.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Tactical one or two player game"
@@ -16,7 +16,7 @@ https://games.kde.org/games/kjumpingcube"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 549769836a4b..3c6ea11ccf25 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,6 @@
-DIST kldap-20.12.2.tar.xz 164608 BLAKE2B 1bb7e65eea8be94abb4d1506208730204265abc6a572be87e5146b578b17679b4afa70a3ebd1b6d948680df37a2f8c6211690ebbb7fa8bd71cb332b109433e61 SHA512 8576fed449efcbe1a49b3d473807d4ab64d0a64a490ea60dfa8019e69a94ce3dbc555c302b8310714febe9c3bac0ed1d8bd0b1a4eaf3ae41d42505deb47bf099
+AUX kldap-21.04.0-kdoctools_install.patch 850 BLAKE2B 3cd595a826659e5eb96e1794dbf84607d35d2c39972ad1a5b3df973efc86deecf945daeaa2f6460e7b75eac8266d5040634f1dbea8c29b0df7828110f9181430 SHA512 045fe0f2d310cba230c0129e40fd767b8077ee3595a33b35f2e4961795fb254f19457bd66b58161d65a73e949c0321085a977bfe5e81504981d3867093ca2cd1
 DIST kldap-20.12.3.tar.xz 164652 BLAKE2B 35c8f03a96616b125f7df264ad060753ae306b2503c350a90efe37884ae661f786b3e5a98078eec1fa9169872ea688faebb3b6847bc992499e5c57181e63491c SHA512 d1220afdd157de224fd65306f1b77f80c1adbe195307bea51c6de5234e9a94122b2c24d38e050ad5dd1a9597b5f7f0f65ea5de73a38c4a309d5692691ed09d54
-EBUILD kldap-20.12.2.ebuild 663 BLAKE2B 388c2498b74bf8094d3ddfd4c77c6d2aa74100666869d6d1a88a7c79a421f090039d1290a3d737163bde4563ae51967e851dff1ef6d556b4633db6e7d4ddc758 SHA512 16cd24268b8c058a4eb1c9899d19ec60492b03f5e5f195d0efb97337488b57da340d426c7dea38a9effef7c59bb2e51fe68b7aa67355c6eb6ed3274e63420984
-EBUILD kldap-20.12.3.ebuild 666 BLAKE2B c917413b36aedbe5e2fad7395d8b12354bc232dffed88dc9a2e2386d1e3a06750d93b48bd6c5ef6ff0c6276b7384ab399193496963c069b385dd97160ade9c2a SHA512 2d8cad60616bd657f92dfdcf027131517b0aef84a513927796b3f0b97fe97f6f0c897ce9ff21e6272f6a8774683f0ae8a7e61cf5595eace2a358273f32da7dde
+DIST kldap-21.04.0.tar.xz 170760 BLAKE2B a20a04e162c4076a29d817697175475c854efaf6b065d7641d7429f0ebd14e5f63b5a702067bb535548ecd6c46cdd19187641194260c30b92af7b49c06d8f1cb SHA512 abd8a3d0a801369871e9aec642c3e8607325cb297c697852d4e728e1a81588655f864208e50326aa38aea07b19a4cbff0013dbe8e2c73d07824686267f983daf
+EBUILD kldap-20.12.3.ebuild 663 BLAKE2B 388c2498b74bf8094d3ddfd4c77c6d2aa74100666869d6d1a88a7c79a421f090039d1290a3d737163bde4563ae51967e851dff1ef6d556b4633db6e7d4ddc758 SHA512 16cd24268b8c058a4eb1c9899d19ec60492b03f5e5f195d0efb97337488b57da340d426c7dea38a9effef7c59bb2e51fe68b7aa67355c6eb6ed3274e63420984
+EBUILD kldap-21.04.0.ebuild 708 BLAKE2B df8db29224ec8c661091ffabf16c937995390105335b56dd82166e6ab8918b8a86bd96892663dc428379d15aa971a1bef80404759ac948d7ae7898bdac3ac5e7 SHA512 73969b2b6501e99961a6115533d6a454a132401b5eb7b0876fdbbc25741e3ad1ec4b6397d913c3411d0a3b19a3cd9e70bc2df579e19230aefc694d2b8fbbdb69
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/files/kldap-21.04.0-kdoctools_install.patch b/kde-apps/kldap/files/kldap-21.04.0-kdoctools_install.patch
new file mode 100644
index 000000000000..164e49c170c5
--- /dev/null
+++ b/kde-apps/kldap/files/kldap-21.04.0-kdoctools_install.patch
@@ -0,0 +1,28 @@
+From d4b3b521cc398d85340075d99a2bf6964f13b544 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Apr 2021 11:38:58 +0200
+Subject: [PATCH] Hide kdoctools_install() behind KF5DocTools_FOUND conditional
+
+The dependency is optional in this package so the macro call must be too.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2e2512f..3d6c86a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -120,5 +120,7 @@ ecm_qt_install_logging_categories(
+ 
+ kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+ ki18n_install(po)
+-kdoctools_install(po)
++if(KF5DocTools_FOUND)
++    kdoctools_install(po)
++endif()
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-- 
+2.31.1
+
diff --git a/kde-apps/kldap/kldap-20.12.3.ebuild b/kde-apps/kldap/kldap-20.12.3.ebuild
index 95541b7cf054..88048114b272 100644
--- a/kde-apps/kldap/kldap-20.12.3.ebuild
+++ b/kde-apps/kldap/kldap-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kldap/kldap-20.12.2.ebuild b/kde-apps/kldap/kldap-21.04.0.ebuild
index 88048114b272..d78ebde564e9 100644
--- a/kde-apps/kldap/kldap-20.12.2.ebuild
+++ b/kde-apps/kldap/kldap-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,17 +14,19 @@ HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+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/kwallet-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	net-nds/openldap
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-kdoctools_install.patch" )
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index ce2fbed3e126..c807f81c96df 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
-DIST kleopatra-20.12.2.tar.xz 2000248 BLAKE2B 08fd582025a8a467dfc178e6f03f03be640e51a592efe7de3b35b51a5a5c234678a2344135c0475cc1359ee3ea4946d798233e6de112bb3ce52e7ea25e0c31d1 SHA512 23216e413993e61bb1ddb86df4dfb96e2d2b7b2beb27615bf4d55082fdbcb94c61cb3501d5678a30e99d3a414ad1fe3776a08800333a9576098d4ad41f03f797
 DIST kleopatra-20.12.3.tar.xz 2001196 BLAKE2B 2bab317762becfff6f44d8fecd1ae25a9425c30b492ad201cf51e249d26bfc145bdb0dc06bb52b6511e131ffe9f26b9b1628b6915dd415d223786e950c533ee4 SHA512 8f27930714988d53622c0d8e5e5e3cd82e58eaf6582ed150f4a7326f61837c44fbb6dee2881934bdea1a0d8976b7173ef5d580154ccfeb84e75e3b0c38019433
-EBUILD kleopatra-20.12.2.ebuild 1475 BLAKE2B 8f0c1330c615b849a030855a7c9773781c5ac1e72b25888a6bd4fa54ce780e6f33093675fa5c6769a1c85c795ae22de5ec04ae74fa5741d0efbf5509b2dba4d5 SHA512 71291ce7ab1a6540d724dd839b61a8c8a54feb390794c08f90be5299aa7a6080a358ef3a24cd89fdcc6540e00f50b171f1da3950bb37ac4732ab9cffd40f4f95
-EBUILD kleopatra-20.12.3.ebuild 1478 BLAKE2B 2b95872a9b5bf9f9bc22fb3d33b8ff0866e99c21ee9f3510e1011d5a122f684df0a405a666220f47bed01c73738b81df36551443f35842d9f719cb73ea3263fc SHA512 bca123030dd0e4195a06e0c9e5d2ebc253e5a87249de01ac5222c2526c841db979cb3b7de426b60851dafb44cf1db5f75dd25c0f3d80e321792ed72edccb0dab
+DIST kleopatra-21.04.0.tar.xz 2054088 BLAKE2B c7c99f4a19e3219dfd651caf47f074cd3c8a7c1ccb391aa221de9057a77237b83e4813391085ac2e946bf9af604f1deae162cb94848d8a2fe906f5c9453629b6 SHA512 fd3cb2d7c482a0cd05c27ee1a3c15e9f2ba80fc56cd43fb292dee25f989ad1c87edbc6b286b2b7bea612191c3a0cdc7e2290ab6d00cdc08cafa3e6332740508f
+EBUILD kleopatra-20.12.3.ebuild 1475 BLAKE2B 8f0c1330c615b849a030855a7c9773781c5ac1e72b25888a6bd4fa54ce780e6f33093675fa5c6769a1c85c795ae22de5ec04ae74fa5741d0efbf5509b2dba4d5 SHA512 71291ce7ab1a6540d724dd839b61a8c8a54feb390794c08f90be5299aa7a6080a358ef3a24cd89fdcc6540e00f50b171f1da3950bb37ac4732ab9cffd40f4f95
+EBUILD kleopatra-21.04.0.ebuild 1478 BLAKE2B 3e30114dd0263ae5bb2d435e8bf70fcb4addd0318ac9c0028953a8e1048b0377e911c3bc02955d6f8305f8717e903663dac46c8ff76b4694ab690cf518162fe0 SHA512 7a94e08ff0d943be4aa62f2773ab1e061c2994a25fe3284fc4289884e5fbfcb5973360962aad83dc73688fc54d657b27a73c6735f7e1bbef8200e994ba568ef2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-20.12.3.ebuild b/kde-apps/kleopatra/kleopatra-20.12.3.ebuild
index b68c917e49b1..caa291dca796 100644
--- a/kde-apps/kleopatra/kleopatra-20.12.3.ebuild
+++ b/kde-apps/kleopatra/kleopatra-20.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/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/kleopatra/kleopatra-20.12.2.ebuild b/kde-apps/kleopatra/kleopatra-21.04.0.ebuild
index caa291dca796..164f361a3b3b 100644
--- a/kde-apps/kleopatra/kleopatra-20.12.2.ebuild
+++ b/kde-apps/kleopatra/kleopatra-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -16,11 +16,11 @@ HOMEPAGE="https://apps.kde.org/en/kleopatra"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	>=app-crypt/gpgme-1.13.1[cxx,qt5]
 	dev-libs/boost:=
 	dev-libs/libassuan
 	dev-libs/libgpg-error
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index c2b018726c4d..9a388151977f 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
-DIST klettres-20.08.3.tar.xz 46835436 BLAKE2B cf02bb22fa244ee3239c62c665295123650fc405cb9d4bdd3b3a122852867194affbf9e293802308c7fbdc878abd145a826337f51c497f1e47a0396b9474fcc1 SHA512 31c8db762db004ccdb803da829555dfd51ea0642aa9811f1ff338541f04b7591ff70df8c9756bafef154ac033e1417f42c90dbaff6ab6164f9d9986ca5e994f6
 DIST klettres-20.12.3.tar.xz 47059092 BLAKE2B f4f55c6e9f3895042f6bff7aaf5d764d902ac4c35018b8ff277dfb1d01e1dd541ad03fa3a208b7ef74479da6dc8912e4497aaa3e29daf69e10a94462b4dc7381 SHA512 89e3b72f07f3594b83909e0cfb719a074d999a4ffc253d340d018ab3523293b41605d66fa3f0474974d9a9f0aab57c7bd443cbf58968495ccb69598e6f0da094
-EBUILD klettres-20.08.3.ebuild 867 BLAKE2B 253126df5d98f46141889a3aa624cd5fe2d7f444b4ebc97ff19db98612790e37f7e161b52a89365c4f16c9ef52ed6e303267f605d0b93dcd2aafdbd59519eaad SHA512 7d423fd20aa2a981b0d7863d28699b25bf45326219d512f5996a385930084993f4b33c036b2364af53f320bed24c5b28d8097cd994d36b646f8f40615a677006
-EBUILD klettres-20.12.3.ebuild 870 BLAKE2B 47b3a69133295708713d30d0b434dea635513ffc9ec39dfa74ab7274669c638bca2c0734b20da854efb9d6a0cddce087ea424965b920119756a3d09c70386ad4 SHA512 d13dcab36dcca5c613646cb4ee47215ba990a3ab8ca0df10ad6885cf852611fa6f05cbbabc254880de51302ce19a314bcee5cf18b44330fda030370d0a8c420d
+DIST klettres-21.04.0.tar.xz 47138804 BLAKE2B fa72828f887fd366772316733bb7095b4886988d7bba0b3553831dd3c963d6a54039ea77fefadcc2427dd8eda5068085f769943fdea9dddd788a72eb26c1a34d SHA512 aafdf5925cc9d94ac4175776efc9e3e7c043f8dad9170db11e606ad37a0cc32d94c9139f31ee00ecd39d0d92531fc0f75679a34aee511cfa4f383364b6d1ec93
+EBUILD klettres-20.12.3.ebuild 867 BLAKE2B 39c4b4ef897a74db35bf88d34f5ee09ae1e439211e102e0af573b0d359abd8c2680215f44c328a3fb1d13784234645553707148a4a7f55bef1c971c38554eddf SHA512 f6c0a402ad9cf6a4141b3997a13849796d21c7de741f83398104cc84a99b6d11be2760a86feb502c9ad838119e303f04d1d9c85ef7255e9a1f72a5ee648407af
+EBUILD klettres-21.04.0.ebuild 870 BLAKE2B d5397364a9193bca38cbd3422f30ed5146f5210c9d06aa82b2105f3615495f61a4125bbd23485c8c4801a51e180de1a1b451efc0862d30a75f6b9e45630cb219 SHA512 3ace389c4ed19b4d1041a9731945554acac82f65a2afc860c492cef79e25ca107f98409a3e108c3c0932664125df1419d28d9c25506acefaab73e12ccae5409d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-20.12.3.ebuild b/kde-apps/klettres/klettres-20.12.3.ebuild
index d1278e9baf80..1d25214d818d 100644
--- a/kde-apps/klettres/klettres-20.12.3.ebuild
+++ b/kde-apps/klettres/klettres-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/klettres https://edu.kde.org/klettres/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klettres/klettres-20.08.3.ebuild b/kde-apps/klettres/klettres-21.04.0.ebuild
index 0e693864644e..c4b20186cb2c 100644
--- a/kde-apps/klettres/klettres-20.08.3.ebuild
+++ b/kde-apps/klettres/klettres-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Alphabet learning application"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/klettres https://edu.kde.org/klettres/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index 905ec9e39b21..3674ac1c1fa6 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
-DIST klickety-20.08.3.tar.xz 1394772 BLAKE2B 63a78c955ec6898ec8ea35c3a7cb6efe326d7bb50bedce5a981cb5514d2e16870eb1ecf94ef97cb368fa66d62112d37d9bf73d27607d3629d110bb8b7a7bfb98 SHA512 8142149fda77414d92957f9c8df392125ddf7a91e9d3135baf6fcd7dfc3f5a28c8ad6d7b8b464e5dc73f737158a776db41436fef7989abac100521c8e0e3f6bc
 DIST klickety-20.12.3.tar.xz 1394852 BLAKE2B 47dd866e470b8041d2c41b7bf7052661fa4bf5beaf17c932497b2c231446fbd72799a7157cea21f38427d40f03b4c8ef3276bffa1d8967c3c12e81aea53d7ce8 SHA512 6fd26ee6d83e70f01911c31b17fbf398f718a54d26997174792c75884d0cd97f935caf7b25730ef1a9f6f1bc6daa78396449c19412c07936e630b5a7d42bf9f5
-EBUILD klickety-20.08.3.ebuild 1014 BLAKE2B 5524d025bfe0dcbc4ceeb87820ca84a0aeeb082a65490952932ce8ebd7f135c5e5f856711df1aa44086c5724b34b0af9ed3ab15697b7e073f8ffb46fbc015941 SHA512 4a0a93a88ba4014352cabc0fded1143b9e65e2fd5db3b4a89a593966c9a51121f35e09624593933e9161f42c7d7bd80eba052f8a241c1961a5d0b2db87cadcca
-EBUILD klickety-20.12.3.ebuild 1017 BLAKE2B af4eb2ed0e9c56715cfd2910306fd9298fef5f81b8abf52e41cbf19671e1282a0f4212e619ea542b77f7553f12a749c1c795b6f27e3ec7c6a4481dd9427d6e70 SHA512 032290943fefe6a1937be5252fdf090db80e08e8b8cb72a89b998fa7c2101656a102bdf5712f6e170a1ccb5c26f53ebe1ae594092ac6130f653002e29dc141e0
+DIST klickety-21.04.0.tar.xz 1394376 BLAKE2B 050141aa6bdda79c98874d7b253fd8468b742c75f3c3ada3c2e587c26e133d475d50ebcf04c478daa3260be6f659b893353415de7f0115f3f6978b4531f4efa4 SHA512 d9824d23628857312502cc38845b338fcc41cf1ba051d3e32f65d6a28a3ce90d31344b16b93b9c31e2bc78662832274b81acfd767e544917082551ecbb9378a9
+EBUILD klickety-20.12.3.ebuild 1014 BLAKE2B 54d2927fdd64f03ce93aa137adfe4d7b0ba72d09f24b7221d555848cdbf27c1a66aaf4e3c21b34797c37e4e8abcd9d2e77342a71970a8fea21fac6ced1980684 SHA512 a37dc0e8bd3e22e29cc92a05793dc1a4fedd03639e5bc0f0917b3f71593f768ed47997234eb3a51ab213b6823392a1e2bb457d965bdabf178404d97f4df184f7
+EBUILD klickety-21.04.0.ebuild 1017 BLAKE2B 28399e10b5d803d5c140b6c1d09f48fcae46430a9ee6fc81f6c1073ee807b4b50f2cd26651c438f931d964c80d0474e28ae4ff2265dbbf807b27754a11bda134 SHA512 8bc95fbacd4093729877a52a1f3ef4e8b202159b5315e12a1475a420be653a9c583be86b407f925a3cdddc99ea3ea48f7cb46ad5ad3f6094c239e156f79b36c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-20.12.3.ebuild b/kde-apps/klickety/klickety-20.12.3.ebuild
index 2f1518e5671e..93b92ed77946 100644
--- a/kde-apps/klickety/klickety-20.12.3.ebuild
+++ b/kde-apps/klickety/klickety-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/klickety"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klickety/klickety-20.08.3.ebuild b/kde-apps/klickety/klickety-21.04.0.ebuild
index cda694794496..3216f0c253d7 100644
--- a/kde-apps/klickety/klickety-20.08.3.ebuild
+++ b/kde-apps/klickety/klickety-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="An adaptation of the Clickomania game"
@@ -16,7 +16,7 @@ https://games.kde.org/games/klickety"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index 5c3f260e5a53..0643aae8c905 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,5 @@
-DIST klines-20.08.3.tar.xz 1790152 BLAKE2B c1721c51530beb112328c607cf6a79c97b2986a5f8ec5869ff21c1c4247c95c2f295691645d27d6089000d5799396d50f60865de9d17fc67e1122bd11d06d8b6 SHA512 76ea4f05652ada88e87132b822257be44e2fcf39c1503c0373a03e114195f807556a6a5a4632fa462c864825f63dedf529b44aa5e742353c12a993b8d0c9dead
 DIST klines-20.12.3.tar.xz 1790320 BLAKE2B 78ed389575599fbdbc94bd2ede84e09108f4a98b7df94fcbb8aac7d4031bda5c5b5b247da2ed1dadc8c91018d3dfbccebe8465c6927701e9de0cfbd298d5aff3 SHA512 8e580603b78e405c52dea0d7c9c122d47018898d6c6a9999f1945c43c2afbb97e38fdcf35d5782ed38549843d1fff9f00b1bed62e4fad529a9cb55aa64d2b83a
-EBUILD klines-20.08.3.ebuild 918 BLAKE2B 983c9162ec810510dfca58d0a5b1505f851f93e7b20496ff4fa4dd43edde03a4c92149a7dc986a54efd471c258d9a6d0a2208675f38bac3ec2e5b1bdc475d56a SHA512 0cbec308587bb03b8ad12e23d44974590bd5b66fe77790cf6cd7a5c5fcf310052f3433b2b532cc92584b97a49bea608eaaf79466043af309f73460c531142f9c
-EBUILD klines-20.12.3.ebuild 921 BLAKE2B 104f90cf4ffdfe7418137ec699671a60c78f1190df6a48f783b0723d420e4553d9c9e50347335e1cab169b4d9ae7168dd7e51ccadb75900d34624d98714a19b4 SHA512 e3bc658a41c8c2be875fcacca3d453945f13c0c8bf2ace13557c748cbc0077b794d02d744c1b736d0f3925b914ab286f7301191145cfb84013bfcc66f9ed20ca
+DIST klines-21.04.0.tar.xz 1789456 BLAKE2B 44b7f8a680e6755cdbbf31223df009c326b552cfd53024656f7118312876853e9a8b7b0f12fa2a5ddc16a2504245c16ad70b09f9397cd78b785ee9371491ec32 SHA512 20a5c943313b245b3b48919c687661a15ef6749d6924d9f318999084f5add6b83f08e3b51c9e7f609c44adc127e529bc660cc1c56f56d8780c8b4cafaa48e96b
+EBUILD klines-20.12.3.ebuild 918 BLAKE2B d75889aab5b25a9148b5dbd37d9758e499e8bdeb0272f786ee89e0d518d34215225317390be6cceaa2b1123d8319bafcd72e2066ff2fcc22b02ff6520e786b65 SHA512 23ae6fedd6727353b71ff7c6a945e5b6546798724775002ff8953e211b661e78ee387a308036b8881c714d97fad9bd60de823cfaaa93f56caafabf51985b18e5
+EBUILD klines-21.04.0.ebuild 921 BLAKE2B 25564a89398bf597cbe0d858ccb9fb66700ce788b69e7f458e95c2a057b622fd0e16881069cfda85053a142903f5dd96afd29689fcd18b11ad516aee1cb5527a SHA512 5ab2ffa48abc13cd81ccca8ec32b72921aeac0ac60f1237db58c3a8349d0370187010d705b3cb7af38273ad91d794045ae7486c7c52d775d34764421001aac02
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-20.12.3.ebuild b/kde-apps/klines/klines-20.12.3.ebuild
index 178591fd0dc0..57f0de49dac8 100644
--- a/kde-apps/klines/klines-20.12.3.ebuild
+++ b/kde-apps/klines/klines-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/klines"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klines/klines-20.08.3.ebuild b/kde-apps/klines/klines-21.04.0.ebuild
index 9cf0b83b9b17..7ed04d4e0d6c 100644
--- a/kde-apps/klines/klines-20.08.3.ebuild
+++ b/kde-apps/klines/klines-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="A little KDE game about balls and how to get rid of them"
@@ -16,7 +16,7 @@ https://games.kde.org/games/klines"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 485a7a2a80b0..e84ca4e245b0 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
-DIST kmag-20.08.3.tar.xz 697692 BLAKE2B ae8624c50571424597130e6e5c5c936b28491319f39c92687114df035370381c29c8b6ef50f5a189430de7f58db1255b93909e5beed5a95d35eb55db1d74f2c1 SHA512 cad250fbf12d15eb292fa5101bbd1b1b9b26375561ff9065b31b5892a1fdbeffbcbe9d3f3fe027f760f1128f79f3dfacd1dc6ba81f2d7fa86009b25ae830237e
 DIST kmag-20.12.3.tar.xz 700412 BLAKE2B d4abdc75fc6960fc9e6a6b2ab1f8ca35c6a1aec204e774e6a1610423758ab3f89066b30e6c811d374a89a671b8a6ee852703972f12e295e9adb5aadc7e80ac86 SHA512 6c80bbb0ef4e54ad9f4cd6275da7cdfb878d93f8826e78ea68d1330ca75e438474b0f288a676f544feac144a8190fcace37e53f94752ab40fdf93373c1aa1be0
-EBUILD kmag-20.08.3.ebuild 940 BLAKE2B 487bd75a6fd77ac56da6288bf4e1f41b812e9131a846c9c43a0a67647a73749ff28650e917695137da8ef18e247279c535d78ca0e3f6dcd19ba5ac35815b833e SHA512 475f11ae7796a26970fe64157bbdb040da71a87792c125831cb2df5e4a71061fcbef4130f8d2577ac712e85797488823d1a14bcb5b316be46f358cf394ba021d
-EBUILD kmag-20.12.3.ebuild 943 BLAKE2B 13df7d8cbd1250d932e66eb9c752330fdbbc94140bbcb26c1c418ecd0fdb73b756b214bdc13d01dc1bb37576a24d786d027d92946ff9e6dc8e2fd43bba27b755 SHA512 95619de6ac6d6c07ecbec1d9c51d2755f1a18ef5a19cf5a21c268783913e2371a5ce10ea4a63c8b76c8466b0d7ad88f1adf832a886be76e6ed2b85fb83aa4fed
+DIST kmag-21.04.0.tar.xz 698524 BLAKE2B 7eb90a5e6d4de5470ee3e6944a895abd4e93b8b73de7d905e5c76c5717b2d8dfe01d0a7337efb05514672c6264c7ee3ff892ac8e8318ec0ea936462cdb087415 SHA512 b8e368bf84b97db367731ff42c2c6ffc17ae5721c3fb880a67f57f8c552a77633935a87a852efc15eb36a401e9d7f55daf23f3e2c7922d44347f94a1ccc1c56d
+EBUILD kmag-20.12.3.ebuild 940 BLAKE2B 2ae86d08a3d5d9f97744607b873d8408d182f57d718f071e978f109e68e496fcd134b92b8b2da66603c892c9d7a7e257e8daa8b01019df942b95a192a62a344f SHA512 cc16f6acad168641e6751a16c18075a5cd45f600ebc7fbe48556f8fe105f6d39a729714720f2a38e19beb45655e0c8b0c12024fca73ea178b4042475f4a6dba2
+EBUILD kmag-21.04.0.ebuild 943 BLAKE2B f63e61fd28a12e170c932086ac053cd9cc6eae3e731d2f6d483b95d53008a1786dbb8c62f4e3feba860cbb17976f08bb8f6731b42272aa17e4c5c001c545ea3e SHA512 28a1d6ac82d21f55978f26501b87719f4f8f0d224b6e0413b4ad278d190faff85be9aa69a7e8225f1dc146359fcc6fb8d1179f165d3317a5ac0a3cdebe6e6ca2
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-20.12.3.ebuild b/kde-apps/kmag/kmag-20.12.3.ebuild
index 9bceb479b0a0..47d257e47b24 100644
--- a/kde-apps/kmag/kmag-20.12.3.ebuild
+++ b/kde-apps/kmag/kmag-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kmag"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="keyboardfocus"
 
 DEPEND="
diff --git a/kde-apps/kmag/kmag-20.08.3.ebuild b/kde-apps/kmag/kmag-21.04.0.ebuild
index bd583f6f5f1c..3740ca35c72d 100644
--- a/kde-apps/kmag/kmag-20.08.3.ebuild
+++ b/kde-apps/kmag/kmag-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE screen magnifier"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kmag"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="keyboardfocus"
 
 DEPEND="
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 8b8dcc3fe723..8e11ec0cc35f 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
-DIST kmahjongg-20.08.3.tar.xz 3434820 BLAKE2B 8ad982e860864513f5f94a813098b3b3b411159a3ced54157edf35f120dcc4e492c37bd03ece0af00c2a2fec1c82db7826e4c8b6aa0a6aa91f92a8e5343f4216 SHA512 9448ae277d818383b098aa8f303443d980489cd69751d7736d0c78d094c2864324cb1f487e701ad8988ad1a5968b1ad754ae9d346a9af4e9a3496f3142132bd7
 DIST kmahjongg-20.12.3.tar.xz 3435208 BLAKE2B d8df800bbf58181592f4db16b97bae69811570aef89a922cd097a297556d1aa0493f5e422b243314d292bf41e2b224e531def326a51e7d8546628c2b8915bacc SHA512 f9c021e00f2c1a0be6acc589eb3cc6eed6541864d30e46a39d96a4b08f04ea497d1a2d3eec6706f66d0e3539ee571663415e12d666a972b21a412a061f3ce703
-EBUILD kmahjongg-20.08.3.ebuild 1078 BLAKE2B ff3b088748968340c94dd1b08f48c7add1b1f10e7579fa656b4c18bbbf148e642593b18819c8fcbdde0053a10a837b9666f24cf54c6bf24074bfd1108cfb08be SHA512 83e6e4b9a3dd44227431ae407e892ab4e2b1647d5bbec5e95ef080206db637a14c70005c9a61a5aa76440b760dcef24f982012ac11187d6bf38ec285f1ab974b
-EBUILD kmahjongg-20.12.3.ebuild 1081 BLAKE2B 91c8b7bd2b219181c8a72780e5f2d9620d98bdcec0da4911a80d53d9f66426abfdec099aa1c60fb9842c6efbc3aeefc52e3b1a27b5c2174bc63ea354f5622c90 SHA512 83d91d185cce05d280f29f4299061da5e361d666f89cab740e14c26ea75646b34bccd0c8c55ffff99cef9d1794d07658fe570fac34fc8b9d9c28a0ea68222f77
+DIST kmahjongg-21.04.0.tar.xz 3433944 BLAKE2B 9a7453d2e927dfbdbecdc11fc0d4ccc012e16106b1fd6af1806d50ffe6ac2188f66ac65898484100f9ce4d6a4d22fe004459a2a201d79c3488aaec500bfe60cb SHA512 3959031a4de6e79c8eaa6a586437d1d80971ef6cf0697cb260567d0905fda0fa6cf25d56911485021e5d4bb6e4fa110eddf1361cccd7600a7a08fceb5e7576e6
+EBUILD kmahjongg-20.12.3.ebuild 1078 BLAKE2B 0e0ef0dbea4ae757049125fd5d78058e908f5b470cb9a884060b70c3d47ef882cebef16afe32c2ee502e6e4c0129508c7a3d1fad8f730bf0cc1f9535584650f2 SHA512 349b86127fd8cd0e3a8e7c3651c14f9000cad82dff1668ee593d089fb52e4a4abb6aea88cec51c4c60b5a15f03e7d48c1376ed1b37adcbb2d7d75b6f2de8a2e7
+EBUILD kmahjongg-21.04.0.ebuild 1081 BLAKE2B 24dbb032619a6c88cd5a0827229c5fef77f0f7d86d9b34948e719b577f203e09d67c08dafac9aa694bd32c631d13409583e210803d2640b0b9665e150f3cb069 SHA512 a0a70dbe73da119969c106d0c1b3c878968d477f061fe02f791c110b703f9b5454006689828d57b8881abf9792d8a3d69f18f0eef18a6e4b10dd8891d8e00e94
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-20.12.3.ebuild b/kde-apps/kmahjongg/kmahjongg-20.12.3.ebuild
index 0ce964b7d896..9f2f8e19045b 100644
--- a/kde-apps/kmahjongg/kmahjongg-20.12.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kmahjongg"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmahjongg/kmahjongg-20.08.3.ebuild b/kde-apps/kmahjongg/kmahjongg-21.04.0.ebuild
index d72b42e75238..62db3a28160f 100644
--- a/kde-apps/kmahjongg/kmahjongg-20.08.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="A tile matching game for one or two players"
@@ -16,7 +16,7 @@ https://games.kde.org/games/kmahjongg"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index d8e4e49dcb99..422e8770e9a5 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
-DIST kmail-account-wizard-20.12.2.tar.xz 160272 BLAKE2B 543e46692097b0c0737551c025141a14ab046edcdddfa5ea0d626d16a45c1f8c4b49f20b5aa6803473e272cf454802fcca9bc71e28478f7ef2fc0da4c68307d1 SHA512 621e45cfdf7d59a1a1008214baa84af9d09c8bacbc2ed3952d2cf735809e5eaa87fec4781060007eab4087a9aaf1e5c095b369316dbdab59c914190f472345cd
 DIST kmail-account-wizard-20.12.3.tar.xz 160704 BLAKE2B 2cd23f83f6200027953a78eb1a108ac20f406881d72bf6969b58c4f4176cbca5a7618b490f32ad1ec0c9c89499f296d411bc45fb8dff3a86353f40bb3ab00e64 SHA512 08508bd5e28ee20953dac413f56a62cef49b4d5d8ce5c14cb8482feb9b5c9f2abd65473923b5035977112bfce320b1da466d98bb64f931dbb435406327b57ed5
-EBUILD kmail-account-wizard-20.12.2.ebuild 1586 BLAKE2B 6447853c5087029c32f02f9e64fc8f48851c46e11038b41b8a54b0cfae076e67d8c7431f41ab606fb788aa1995911492339cfccf1bcb01b3553066a0ba181452 SHA512 207a5895a033c0616d6be993a45d460e1ff2cee466792d63a2edca4bb4920f5fbe81bfec6bfde8a08bf1d0d4924e9d21342668271bf153779827a7882bfa2075
-EBUILD kmail-account-wizard-20.12.3.ebuild 1589 BLAKE2B 6e7bd672b944062abb6a83de394cb7342db595095489f16bf5d16c4703a43ce8318f4d8c264089b4da07fa13defc6fa232703efafa382cbe3aba6d640718d3ae SHA512 a1d9206223d8284c4b3059182284106735d3ef6e102d9b80911ead4025f7a9894f5ed312870f38a1e08773ffb4531b8a6dd598457960474a7aeb02c8334bd89f
+DIST kmail-account-wizard-21.04.0.tar.xz 165656 BLAKE2B e790c182a6ceabf397d18c2d1d99195cdfd660c3cf6f41f9630e92271c0dac78aac9724b54269b3c396059d12f1eda58ca7324bdab4f4db1d0a11902d8b24022 SHA512 d3186c79356ff573ce6d3313296f62534c4e684b16f949649fb04d31cd37bf026c02df1584cfc75964890066a11e5c625985d95d202da5934a7c4624f498581e
+EBUILD kmail-account-wizard-20.12.3.ebuild 1586 BLAKE2B 6447853c5087029c32f02f9e64fc8f48851c46e11038b41b8a54b0cfae076e67d8c7431f41ab606fb788aa1995911492339cfccf1bcb01b3553066a0ba181452 SHA512 207a5895a033c0616d6be993a45d460e1ff2cee466792d63a2edca4bb4920f5fbe81bfec6bfde8a08bf1d0d4924e9d21342668271bf153779827a7882bfa2075
+EBUILD kmail-account-wizard-21.04.0.ebuild 1612 BLAKE2B 9a48615732cd59aa1c11ed3ec99bc82b9e5e6bfd31e6bdaa31c6aedaedaa43006863e4f700c3a42fc3a95627e8d7612cd186651b4d6e2a9560146bd8286032a4 SHA512 f16c284f08179f67215d9707a4e93c46f06732c9b6d9b2bd93c2605c09884be500a8a87c3a6ee8effaa2bb74de5cae73f60f81337f98cde7b8c50bc91c981223
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.3.ebuild
index b7e7f5654963..8c34ab9cade9 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.3.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.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-account-wizard/kmail-account-wizard-20.12.2.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-21.04.0.ebuild
index 8c34ab9cade9..90a11b294b98 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.2.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -16,10 +16,11 @@ 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="
+	dev-libs/qtkeychain:=
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 6eb4f8ba48c8..70d16a4d33b8 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,5 @@
-DIST kmail-20.12.2.tar.xz 4671468 BLAKE2B b95329724286f690a990a100bf88b5c743ac9e06688fe1e8c7208fffb0fe3a600b68a61215d2761a1edabfb56d95264765e790db1156b2c49349fcbfd93077ee SHA512 f6b2b217c95b844b8a4ed3c254a798310da411b6a9bc911378e087c6a150f83d76ab0c7d27bb337b5d5713f62852c3c646f2f8d5a1ef4cd44f7250be38a71945
 DIST kmail-20.12.3.tar.xz 4671256 BLAKE2B a6cc830c5fb0f3612c990462fb8dff0fdb33ef81a7909f47c4165da2c4d8b2e4dbc9ccd06f2d8511fb0e3248aad14877bb7c78abf82d792308939b330c35c2a9 SHA512 ddb05673fb8d8a11a4aaf8b8cb5cc7fcdc74d2ab26482ebd61f426d12d5247518f3a4fedd74d78812bbacdeca83cc24db9b749efd40bf8caece4bcb2f77902c8
-EBUILD kmail-20.12.2.ebuild 3431 BLAKE2B a2311087df478180bb351552bee6e24442513f0b526c5ffd7b7c7dc2900a6af366bd943c2fbd444a0ce83a18809ec37c503541c60d8c8042c18e9126e4971b44 SHA512 5919b130db0efd512c617b351b0b7ab994862a5e4e9166d0001192163cee767a76bdc90c1e781975a19ab2e2f969b122e0e1ba9f9d7dc08bcaa847fed83355fa
-EBUILD kmail-20.12.3.ebuild 3434 BLAKE2B ce3f7d8114688c17843b982c9865120407ea5ac07cda2ce083ee5062d5dfea28f0c94590e71b046b6f4744d86f72423c81824425556b4f36de3495a6eeea65c1 SHA512 6b87e5d7bfccddbf82718f3f9943eb6f70bc2c5eab59a5a52c8e70150044e1b610e48f21031702e7dd64d52867285f70af791056c986ba679d06dd669ffdb742
+DIST kmail-21.04.0.tar.xz 6298468 BLAKE2B d608daf2bcf432569017367cecf1f68c544469ad2f0b6d68e203cf964b0c3eb6c78e89beef692f02acc25956c8296ba5410a249c93eb40a159d0c83ffa8bf3c4 SHA512 e1a404c490b5ba4a8ccd0c1e0a16a3ac1d1ca0007490de2bfbc5dbd775d4da0858aa49d29143c8e50b5f4ce046468e8a4d2f3d3f24f04b8028023aa8c66a80a5
+EBUILD kmail-20.12.3.ebuild 3399 BLAKE2B 281e6880aa0b1acfe9bf3956bdc6179f8bac9b97583da12c419dfaae1bdca5ecbcb40c746ca367ff2ea8d64650121f04d36b1b03ce7e08259daa8976d8f1c281 SHA512 1eba65eeb1262c114993737ce307dff573ab177dd3ba692d140d66758a093bdaac876d078b55e1424d5ca6623375d0da17e97ae5323e62bf56b440f4e4af6b06
+EBUILD kmail-21.04.0.ebuild 3408 BLAKE2B 988020bca0f5891a07ee389569e48594dcde3f22eb5e3072d35c0882985c7e65272e3bd934c269575ab353ed7dede0a8f6380b37b8005db0760c366f2d2de431 SHA512 b32fa57eb52e0c896d34d19d1cf41324be5799d8f9c4538916dbbd6b0c7484f9bab456b6c92d22b9122c7cd0dfb38bac342d1d43ea3c264305fce406f55c421f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-20.12.3.ebuild b/kde-apps/kmail/kmail-20.12.3.ebuild
index 453b9dbcdede..860ae432ca27 100644
--- a/kde-apps/kmail/kmail-20.12.3.ebuild
+++ b/kde-apps/kmail/kmail-20.12.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="telemetry"
 
 BDEPEND="
@@ -104,7 +104,6 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		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}
diff --git a/kde-apps/kmail/kmail-20.12.2.ebuild b/kde-apps/kmail/kmail-21.04.0.ebuild
index 5b1a935b2e84..38f6b53fdc2d 100644
--- a/kde-apps/kmail/kmail-20.12.2.ebuild
+++ b/kde-apps/kmail/kmail-21.04.0.ebuild
@@ -6,24 +6,22 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org optfeature
 
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
 HOMEPAGE="https://apps.kde.org/en/kmail2
 https://kontact.kde.org/components/kmail.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="pch telemetry"
+
+RESTRICT+=" test" # bug 616878
 
-BDEPEND="
-	dev-libs/libxslt
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
 COMMON_DEPEND="
 	>=app-crypt/gpgme-1.11.1[cxx,qt5]
 	>=dev-qt/qtcore-${QTMIN}:5
@@ -52,7 +50,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kbookmarks-${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
@@ -86,8 +83,10 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 	>=kde-apps/kmail-account-wizard-${PVCUT}:5
 "
-
-RESTRICT+=" test" # bug 616878
+BDEPEND="
+	dev-libs/libxslt
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
 
 src_prepare() {
 	ecm_src_prepare
@@ -96,6 +95,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DUSE_PRECOMPILED_HEADERS=$(usex pch)
 		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 
@@ -104,11 +104,10 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
-		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}
+		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/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 7ce4ba78d867..3e67bb58ead5 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,5 @@
-DIST kmailtransport-20.12.2.tar.xz 168128 BLAKE2B bb98fd98b0e3bac7bd77e754e36ddac0b0f47c5785e45f8b244f1c54bb50816f92e38cc8d777ac55addfa4cc94b21a9f0409b8e94f8dc18461d1565a3e610843 SHA512 3697c2b3a9025ba0df9d6fa608bf2a634f95702c0188fe2a6625f13ae536a16f7b8c4347ea682d85259bf6fc92aa46054d245a822b8577282242fb02f6b2b1fa
 DIST kmailtransport-20.12.3.tar.xz 168148 BLAKE2B e3a5c99810fefc41088f8934e1a651b615281fda2bc1ff3eee2fef08d53871d99a752a9e773312ecc4b2b3beb3f6996e71c90d23164af44247708ab70c27aeba SHA512 7f270ee8d6695dac72611ff3f092a84ebd36bc8b4e373e04f8e80bce04080fec9f8f4eb0d88e968a641b62f7b860a7758b168ad992d5b849f6c18334a3e716a7
-EBUILD kmailtransport-20.12.2.ebuild 1035 BLAKE2B fc9b58af02bf40342b2c0f3a37d3ad1af3089fe680b6e6380d04cb5e7faeca8f3c3b49c374dc1c3182e171bb213b9ead8551cd383798322741d5ac1ae6da2e0c SHA512 13261b79e4af534f8997c411d835df4ec6a7810dcecd4f5d05352e7633d25618b249a30dd199af343faa5be4485793ff18c0d69caf1a990562cc184ba2bc5087
-EBUILD kmailtransport-20.12.3.ebuild 1038 BLAKE2B 982308e241b2647586ce492e676296b7a26f1a3dabbd760b8d730d709662295b456154a7069017a71c106a2bfd222ac12c52e201b114ba144c3ce9a659a6fc12 SHA512 81a20daf49f8d560087aeedebc73ed137f5e5bc72f997afa76b95caa288a067364b1bac7fcd39ef956699556a0586b77dff0a030af9bec0fe7ec19677f1412fa
+DIST kmailtransport-21.04.0.tar.xz 172176 BLAKE2B 5ca427ea1fc9b8637bb67e15d00ca9098d7e51567740d08e6b020651301dac55f1189a53ea1a0ecc889b057e7c56986dd9d12c62463816a80162202b7a1804cc SHA512 d5280cc1442f66e161f339f804c4187c4322ef02c06993fbc7e96d76ed15ad7057cd001c016b16a753e29d43349e32de04f0cf993e560290ded59424b8c60e07
+EBUILD kmailtransport-20.12.3.ebuild 1035 BLAKE2B fc9b58af02bf40342b2c0f3a37d3ad1af3089fe680b6e6380d04cb5e7faeca8f3c3b49c374dc1c3182e171bb213b9ead8551cd383798322741d5ac1ae6da2e0c SHA512 13261b79e4af534f8997c411d835df4ec6a7810dcecd4f5d05352e7633d25618b249a30dd199af343faa5be4485793ff18c0d69caf1a990562cc184ba2bc5087
+EBUILD kmailtransport-21.04.0.ebuild 1157 BLAKE2B 7ba5ffccbafba87132e1121fbbc60b5b13cf6181f8adf62eb6e45c0df53ad9d84da0c3e369970c48c53ef0a05bec2e8716f163c9b60aa267fd45c716c452e386 SHA512 9f0e0b5829e43c7dde0a537ca6eebadc40b3955e850ca626704320e02a66780cd4f02939d1fb263e8be6e9defcf0c603c5c581369d7110262404c964a6bf3dd4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-20.12.3.ebuild b/kde-apps/kmailtransport/kmailtransport-20.12.3.ebuild
index 4b9075c7fcd1..8a980c8c20ee 100644
--- a/kde-apps/kmailtransport/kmailtransport-20.12.3.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-20.12.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Mail transport service"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild b/kde-apps/kmailtransport/kmailtransport-21.04.0.ebuild
index 8a980c8c20ee..2a0f914c9436 100644
--- a/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,10 +13,13 @@ DESCRIPTION="Mail transport service"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+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
@@ -40,4 +43,7 @@ DEPEND="${RDEPEND}
 	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
 "
 
-RESTRICT+=" test"
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 Service # fixed in 21.08/git master
+}
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 769423739429..17172ea442db 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
-DIST kmbox-20.12.2.tar.xz 24788 BLAKE2B 388433f58ae3742af5792e4a0b758b77a60d5b4daeb61ab713a09b4c145265617659df1f7f566db00d7774cd2bb28cabac4920581f9ea90971ffe67b3c450a98 SHA512 02838f06d9866e77de79463622b9cd464ae2847362cb63ab8510b4fd8a5033fa49322dd554b8b8b5fe6fdea4b6fdb0aa3f4e8374a00e7c5c74d36e0571f420df
 DIST kmbox-20.12.3.tar.xz 24792 BLAKE2B aa1607ebb99149450ee7fd17f87b8083e0567d61a96de0b378bd55f309f49e6b69812bcc395f2f9886dfec7d4267621ed2ffc985397f9937a05606e308209811 SHA512 6df398ec30bb0d892ef6f29586de345400bfa8bad4f5888d1aa2ce9b71c99e59dc96778bfbf4d08085aabaf32f0c8cd374afabe079b9956a13134c69b49d1fd1
-EBUILD kmbox-20.12.2.ebuild 360 BLAKE2B 4c2888b908bb267a9d28ba6cd701e4a6d8f8c3c46bd7890bbc5ec006d59ce451d125f1f60efc548c6ae7b5ca789c06b918aec8177f18d1b65b392fc2e39646aa SHA512 131268e0cb8d89323fe3b10dec5594ef60436bb1b3e65fd929f87fa92a58c007b3c8a92827dfa96605b3b690c0b772cd0f3c97ec504732fd8296d45084ea1733
-EBUILD kmbox-20.12.3.ebuild 363 BLAKE2B 79da5c18e82ab856ef60a7da3bd1d6f850d8be3753ab2379b9cb8440405e57ca33061dd95e9acafd92a9c69cf4c9636c1b73a9c65285ad4b9e33169a2efebdac SHA512 7d77f92a817dc6769d49b268571baa61af39b0788a9c0847d4a2d3ef014b66bd7e181f0137ffea35e74e9e5488ae1b9bcaa89e02b4d02526861ae018769696c7
+DIST kmbox-21.04.0.tar.xz 28472 BLAKE2B c65fb6fb9200cf1e53015e0176eb9d7e1bf1d09ed0588f57c0ed7871e05b7c0d4925fbaef2f7a2b34ca8b15e39ae0860ed44fd03f1a798d7ecb87e077f95a8d8 SHA512 781f60392fc569680735f0395aa737e47620f06592808652cc1b289b14ba4278c3083794170442565cad064448d72bcc52026b57a8354fceb6723aeaa033687b
+EBUILD kmbox-20.12.3.ebuild 360 BLAKE2B 4c2888b908bb267a9d28ba6cd701e4a6d8f8c3c46bd7890bbc5ec006d59ce451d125f1f60efc548c6ae7b5ca789c06b918aec8177f18d1b65b392fc2e39646aa SHA512 131268e0cb8d89323fe3b10dec5594ef60436bb1b3e65fd929f87fa92a58c007b3c8a92827dfa96605b3b690c0b772cd0f3c97ec504732fd8296d45084ea1733
+EBUILD kmbox-21.04.0.ebuild 363 BLAKE2B 79da5c18e82ab856ef60a7da3bd1d6f850d8be3753ab2379b9cb8440405e57ca33061dd95e9acafd92a9c69cf4c9636c1b73a9c65285ad4b9e33169a2efebdac SHA512 7d77f92a817dc6769d49b268571baa61af39b0788a9c0847d4a2d3ef014b66bd7e181f0137ffea35e74e9e5488ae1b9bcaa89e02b4d02526861ae018769696c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-20.12.3.ebuild b/kde-apps/kmbox/kmbox-20.12.3.ebuild
index 60d5ff84f72b..9fed4aa0ecb7 100644
--- a/kde-apps/kmbox/kmbox-20.12.3.ebuild
+++ b/kde-apps/kmbox/kmbox-20.12.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/kmbox/kmbox-20.12.2.ebuild b/kde-apps/kmbox/kmbox-21.04.0.ebuild
index 9fed4aa0ecb7..60d5ff84f72b 100644
--- a/kde-apps/kmbox/kmbox-20.12.2.ebuild
+++ b/kde-apps/kmbox/kmbox-21.04.0.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 9b16883779d3..4dbd566849f3 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
-DIST kmime-20.12.2.tar.xz 150928 BLAKE2B 6ad3783a43af23d1e3fb288622e123bfaf45d90e38830544d1fdc869951acb12a402e49110f69bf704215e993725361178abcb7deaa70b2aef2528c730d8cdf6 SHA512 9166604af411e92a863d29c362bc1e2efd98a4388c4f20e20ad2244a363832a6012a77ef2e57f58ded0276e38e9a8afa43f9db00b676b54eb8c4dc3b3ce17e41
 DIST kmime-20.12.3.tar.xz 150872 BLAKE2B 8e9339304d2fe7bcdca5fcef459c253d91ea15206554e04e01f7a9a12e798370f468f72422179b83afc64f97e74acb55df8f5434e5d13f3e16e7dbd6006138e4 SHA512 8c472b64ec4633a31a53dc35f6609802cc9d15ebe035c64b162a0a1839d4ecc6a7252be380d5125039cea5b10ffaac67f30e2d1a35c005b81f57505505a00cea
-EBUILD kmime-20.12.2.ebuild 407 BLAKE2B c730aceb1d5852a8c93d916975ac08d5338ed213532d89ead9ad3249cbee78119bef13115426a54feb2c972f442e0e36c593983ec055ed711f6329ab6eb409c2 SHA512 8a05e1e6247e92f9d24e23fedb93ab7b6333f529ab7c27fda2948852ab3fc139a42d390be12e9b097c7461a18a50506d6570050d5476a4f799f6a82992cc2f7f
-EBUILD kmime-20.12.3.ebuild 410 BLAKE2B 13795980210b862b7fc1f4dae4707db1dbc48e7630a3ec8d64db10f5dbcf5a62d7fddd4f943c764acbd10604a75ccb47bff63e6714f723495eb54a9a3c5643d9 SHA512 50812a92d4fdda13c308ff76c78203c2ad7fef23926bc8ba5f252eca3491ece9ddc98403aa3f7cc67da29625724eb1664653a8e9657c7c556a20253867734bd5
+DIST kmime-21.04.0.tar.xz 153672 BLAKE2B 3b587f42dcadb9fdf616778910f3dc7b7e1213b490809971c79d21d9bd4ada4f24949d3604d9c787cd9a3ec537917946bdc163377b5b2f44de3995e68866d98f SHA512 24d2c5febd5ab45b459c21c5cae74761e6e5ddd23947aaf3f234641566e259a3af17f1ae13ee068121638accd463115a4bfa3af61763a3d08bd892cb949cf17f
+EBUILD kmime-20.12.3.ebuild 407 BLAKE2B c730aceb1d5852a8c93d916975ac08d5338ed213532d89ead9ad3249cbee78119bef13115426a54feb2c972f442e0e36c593983ec055ed711f6329ab6eb409c2 SHA512 8a05e1e6247e92f9d24e23fedb93ab7b6333f529ab7c27fda2948852ab3fc139a42d390be12e9b097c7461a18a50506d6570050d5476a4f799f6a82992cc2f7f
+EBUILD kmime-21.04.0.ebuild 410 BLAKE2B 8aa0c4026bf18fb0a6d073a335acf7458557ab8bb00665fb5559a5c18ddeaa4767663874d2c28cb9ec162eeaf74151923acadf6f7615efa5ad57dc01bc930268 SHA512 8b6fb0cbea44c65096d60c1c99c0fa3485f6730cbdd15d97b9bcb194d7b43375a230cc5cf4fe410e17126aac7f084c43813974f3dbb636132bbf10adedfd3333
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-20.12.3.ebuild b/kde-apps/kmime/kmime-20.12.3.ebuild
index 4ca7bf9ad8a4..16f273ca1b5b 100644
--- a/kde-apps/kmime/kmime-20.12.3.ebuild
+++ b/kde-apps/kmime/kmime-20.12.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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmime/kmime-20.12.2.ebuild b/kde-apps/kmime/kmime-21.04.0.ebuild
index 16f273ca1b5b..b7f50be49663 100644
--- a/kde-apps/kmime/kmime-20.12.2.ebuild
+++ b/kde-apps/kmime/kmime-21.04.0.ebuild
@@ -4,14 +4,14 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.75.0
+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"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index 83ab1d763429..6ac9763f354f 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
-DIST kmines-20.08.3.tar.xz 957424 BLAKE2B 914f8383750892d83c41d5859d38e5a1cbc932feee912206e04df601b5b6c0f7d07daac05420ef1ca72d412807796c948fb5d808875ab2f5d12b03175c805cea SHA512 f8e20428a70c1831221394e0304f0b8e8b08ce5251241741c404e7fe4329968af164c957487427168f92e119ef75e6b9eb5e75289f6812b5972253d1f69b9e19
 DIST kmines-20.12.3.tar.xz 959492 BLAKE2B 6b155ddd86c7ea27c37b2e3acf0bb6b3ae176a14325545a82da5abe380605082dd7576e88b74ff6eb928b76434c10f43c857c7a722a0d48a44fb86f356293099 SHA512 ba714171e9b58a4c997e98c35463dbc679673990d2ec8769b8007cea1164d512273e3d40ef94484c3034be935d5406ab386bb70e4e5739727a615d8c0f9cc22d
-EBUILD kmines-20.08.3.ebuild 911 BLAKE2B 8292c9990441a3031d31fb1e91ad15575ffdf73a0090860edc44b101e5f485d33a12a09cc6248e66c6f85cd8ad21d30e07b3db4e7b317b1c3aee68bb279b6ef8 SHA512 fc48cb6bd2eaf26961cadf70cee70a76887c480a8bb183920ff324fcf04af7e06fb884f736c33cf57cd721e06b56d1b2e314741889f4f78e4e596ef55911dff4
-EBUILD kmines-20.12.3.ebuild 914 BLAKE2B 8dbe8907e01783423068cd0df78a396fff2edd2c7ba4fee46f5276ba12181bde1f14febf26699a10c971134aeb30678c582ff291e3f6a13dc8a3de22a438e6d1 SHA512 35a7cb8a02f33c7bcc2bf6b3bf4a7d59a3d195c5df7e2d782d32241d064b4b8b1498b687d6c4b748245b1d84cd456229df31d85be54bfd6a74b70066401bbf71
+DIST kmines-21.04.0.tar.xz 959108 BLAKE2B 584a600eb1d1abedea812a1c69ac5cc64beaf1e4abaa22564a81af1993c200fe166fb353bcd7838f613dbadec21e58d5da36607f91dd712d6d63180238345d9d SHA512 402964599b46f54890191dc7edff09be07fe9913deaf37713a0d52cd8727f80d228e25e6732e5b9ec98cc6a13ee6e8b9800197294ac080781b7acff3a5594137
+EBUILD kmines-20.12.3.ebuild 911 BLAKE2B d5b5bec851fb0de1b867c4f5fbeec75a942724be998528545d8223da73f0c30c6b86ad916609355bd391b0180748313260a269f676fc9cc45164b0d5c002eb83 SHA512 83d290296a4ccc0532c86a2a32b467d73853aa81782d8258a889d8685bd5ebb89e066e22010ce240f588759324536fe352adaa3e8e9fc468f2bdf5847017ea0a
+EBUILD kmines-21.04.0.ebuild 914 BLAKE2B 6ad02eec2485fdec56e6ab90cff13041abee695715ba14c0268235fc77affe98ca3c1886b97c91004a239ab3595b90187f2293f7ef7a6eb35dc8b6d2c613156e SHA512 152a9370f17885f4fc36d98adbd2b65c8112e259281317f490fb3a372d9aa303e0f80a964a7c849dfd9e4ed85fc9fd113fc400003e38f025717a527dff9734fc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-20.12.3.ebuild b/kde-apps/kmines/kmines-20.12.3.ebuild
index a4ee6c674deb..371d038b849a 100644
--- a/kde-apps/kmines/kmines-20.12.3.ebuild
+++ b/kde-apps/kmines/kmines-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kmines"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmines/kmines-20.08.3.ebuild b/kde-apps/kmines/kmines-21.04.0.ebuild
index 4c4475a43c35..e322a2dbc70f 100644
--- a/kde-apps/kmines/kmines-20.08.3.ebuild
+++ b/kde-apps/kmines/kmines-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Classic mine sweeper game"
@@ -16,7 +16,7 @@ https://games.kde.org/games/kmines"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index d7cb9a91aa5f..aa044cf2a756 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
-DIST kmix-20.08.3.tar.xz 1107672 BLAKE2B 3cc1f4b555a29aa2ec042824ca7b6db22adf886f352d67b923a6cb82f95f0526875c15e94c7bfa6714083a25fe33df68709e1b788b4886f0b046049652759a87 SHA512 76fa76c85060430d924bd322d6dffe9ad61b8036560c2382e6327c005a0ab70c05459c4ec6591f3456da3a84c09cb930ae3f145beb80c4c9f4a37f8514791c78
 DIST kmix-20.12.3.tar.xz 1150476 BLAKE2B 1c5bd4f3ecaa1a58b2ee43c31993e1bfd02d69c6f1173a79e3ccec8cd9a215a7f0524d7c5c5e78b4dc692cfa27dd7b4e458a687515c210058770d8aae4b75ebd SHA512 cd261b9b42e81187136366a8cfcce7296d576553e8ec541785b5d53f9529cfd570af43c952dc0c36a5d3ad22abc56b02dbe040b7aebf5e9353b0ea3e670a6480
-EBUILD kmix-20.08.3.ebuild 1436 BLAKE2B a08c3712a74dd9b47570a9575aa7c2912a5dc7d66ef64b6e1cc17823971c014d0284836358ff1461af781f6768119733afdf5f134a86dfcec9e92a0db91ff216 SHA512 c8334a2bdea3450348fd1d1e5cb9f5c832d35d3308b0305c9f7e5193dcb28b8800bebd2c7fd56da5500dc0cb70d42bac8c9573ca9af847479b8577737f4ebfd0
-EBUILD kmix-20.12.3.ebuild 1439 BLAKE2B a1eb37a62a739d963d10e6b56d1e5bd1c7b1c4c83070dd7b38a9abbbdb84b10b6469dc474db1f7c59ed30686c2308bafdc48cba0f9360de18aaa4e000bd14d31 SHA512 e868e28291c56c7fa55a9eaac1b91868f9b2f553ef33b5179d0c3ae4d834451193896fdddc65e6e6c2d38cc4288621ccac3005464298a23b4ca920f008a9a7c5
+DIST kmix-21.04.0.tar.xz 1151276 BLAKE2B 59cf992c92b04a6b589a7c20476ca93324fd1e8c623562bb97609e16ba01cd4e213dcca4fae185a4592a432e1c8ed079c1b31fe4315af347ecfbfab611c24dc3 SHA512 447754bd4fc919ea7c36deadf839dc014cf20791b85545b01ed7cfb84d54a26035dc32d93b2a31466f9556be81eab4445e95ecd65e2507c1f060b9b40193b609
+EBUILD kmix-20.12.3.ebuild 1436 BLAKE2B 42212e2ae78307407f093cdb15e2a4d0c063ef491f3437207d56d958123492109d0ae11d6bff8e916d9c9c5676278c5a41ccee0a5ae0809d1d0ce136fca91b92 SHA512 b7d0de74562b8ffb762d5bdaf2b661d6cc047efb9601ce0748cd3cc20f3565f48d9c2899b10f3ee252e2061978172cb64366b72783c029f12f1fa7ed4c599f4b
+EBUILD kmix-21.04.0.ebuild 1430 BLAKE2B fe40ad0bd7bf8487f88e202ee85a1e69ff26fef955cb6373deaa4663f512e9bc80a40894b9bf33746781b7d15ed71250118bc13002cb9dc21c74b1549c8e2ece SHA512 076e96d4f9d2884e81e86544320ee57a785e561057f4e93cbdb7b7cb75f8d059ebcf32be5e7431df33ff0a00d5d7f1b3a6bbc87f12ed44afecd4a05355030e3f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-20.12.3.ebuild b/kde-apps/kmix/kmix-20.12.3.ebuild
index 090321fe0586..ec42604bc6e2 100644
--- a/kde-apps/kmix/kmix-20.12.3.ebuild
+++ b/kde-apps/kmix/kmix-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kmix"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="alsa plasma pulseaudio"
 
 DEPEND="
diff --git a/kde-apps/kmix/kmix-20.08.3.ebuild b/kde-apps/kmix/kmix-21.04.0.ebuild
index e3f38c7cc0c5..b01c0c681901 100644
--- a/kde-apps/kmix/kmix-20.08.3.ebuild
+++ b/kde-apps/kmix/kmix-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="false"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Volume control gui based on KDE Frameworks"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kmix"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="alsa plasma pulseaudio"
 
 DEPEND="
@@ -47,7 +47,7 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package alsa ALSA)
-		$(cmake_use_find_package plasma KF5Plasma)
+		-DBUILD_DATAENGINE=$(usex plasma)
 		$(cmake_use_find_package pulseaudio Canberra)
 		$(cmake_use_find_package pulseaudio PulseAudio)
 	)
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index 59a9a15a6c00..f96371ba21d6 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
-DIST kmousetool-20.08.3.tar.xz 116100 BLAKE2B 2bb52e10bc473dc4e48855d62d66207de0bfa5032534b228a31faf5e0ca6194e59ad6a2c51e06c1312c6910d29c3b3ea1094d1f61cbec0144dbb457dc44f748d SHA512 12a1e9e82500ebef3d722e193ff148bc1873aabbc82de101b69c1a5102ac70cc922b8b117ce416b5200019d4965339ae23b39db2e00dad4d04f45074666edca4
 DIST kmousetool-20.12.3.tar.xz 116760 BLAKE2B af0cade62b7409719274b377c62e33504927597d4204434a4e02e7665260cfbeeb40ea0cf7177dbb513804c1f3cce520bfa2977c2025fcd237dd659728df285a SHA512 8b0d7a4c9a83a4b4c0fdc97016356f1aca195c6728802b182491421a71fb9dedf41bf4f8e5c4e0f2042cd46d972fa07492911844251117fc821a37ad03663c1d
-EBUILD kmousetool-20.08.3.ebuild 859 BLAKE2B 122e70a5c0f4216ef460346ff458d9b67e97bb40b92aabf7e3a2de4e7072228f8202d09b12c58fdee7c43cda46ebe93b36da6a16e549d51866464e12d0d56683 SHA512 01c09f5226a5e1f5cc9ce1392cd3d0a0654c184e46875977af56e370f16f5f5dccdefc9de45d35e3dae6affe34c0e360ace8317be0cad0e09d3893918a44bdd1
-EBUILD kmousetool-20.12.3.ebuild 862 BLAKE2B c596f5207136e7c8148b041bb591020d324a59b6713d93b3a3da4cf200e7c3ea807fdd3f7cb7345a7999710c63a3389da736a936b5857663c5c65ad3418c53f2 SHA512 21ca14d47f0e7e687668758eb2f3199a31d3445b8eadbab81c944ede8127e93adc84c545d871bc322294f178d702a2bc5170b35aac54da08b64f3225d7910fe5
+DIST kmousetool-21.04.0.tar.xz 117288 BLAKE2B 5031b3d963dbcc03f08562afa9a67e9a4daacb5e1d9c7f709db316d49d2b52e3ea70b939857e85b5188c7489f3bf073147729b86d14dddad432e336bd5882af0 SHA512 d295eb86d150f41a0ffaca5892a98d15d4ce84919464d388ed22606e54af982b77104474b0846f782d01aaf6a6c66b90a1703026ed932a72806e661bc6693709
+EBUILD kmousetool-20.12.3.ebuild 859 BLAKE2B 9f472390966d68337f3682f5d07e4ff2b29d8a1fc9019c947db40d88bde209f78b8ed8a906b7d844494bd2455e361a652dd28ed3d7b9d72e7e5f85f32b0a086c SHA512 8ddc7c22a4b8b2ffea2a4e1810721902de41c1d708171037f2d04d28bbe6feb1b9fbeb70023ee747ff1ddda062a8307c096aa9e1a00f672d76280cfdac9cfc59
+EBUILD kmousetool-21.04.0.ebuild 862 BLAKE2B d3850afc66554c562a06f98be01eb632ac0686a86c778c13670d89a0dd99b67d293a538f2153e9ad9fa2db86ae5e3ee3e32b2f48841963953cac024629464393 SHA512 ec57061c9a1777903b6f3574a02dac460e4d801036f0a5041e559f98945ceb2fbf41c6aa436e98ec7086cebcfb98224a95ac6778a14da02d1039ae669dd78781
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-20.12.3.ebuild b/kde-apps/kmousetool/kmousetool-20.12.3.ebuild
index f9a9df94d66d..9418a9909282 100644
--- a/kde-apps/kmousetool/kmousetool-20.12.3.ebuild
+++ b/kde-apps/kmousetool/kmousetool-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kmousetool"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kmousetool/kmousetool-20.08.3.ebuild b/kde-apps/kmousetool/kmousetool-21.04.0.ebuild
index ed0099606556..fa0cdcb816a3 100644
--- a/kde-apps/kmousetool/kmousetool-20.08.3.ebuild
+++ b/kde-apps/kmousetool/kmousetool-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE program that clicks the mouse for you"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kmousetool"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index f72c5572aaf5..10c61fc179ab 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
-DIST kmouth-20.08.3.tar.xz 2083972 BLAKE2B 9c14e725e02602028c1b4c5ddacf38a2b125d85f5ee1fab0b9beddbf07aff4743c04de62c70efb5dd7675d268c61c9ecc4e6c47714b569aa80f984d20f868d84 SHA512 69e1130f3369e6f10e55a4c3908779c2cd3f9b87b6bb774b7adaa3987dbd2d1cb8c846d22704e67615af8a681bc84435237faabcd1c15cdcee8fcb5f936200a2
 DIST kmouth-20.12.3.tar.xz 2086596 BLAKE2B b74a6bf5d09fe4257ca29dce765e5d8e0976fff225ddf7d34df029e8b834bfb550c215d8bad3aae633f8c8b0c50b1c866ec54f81a4b1211c439984d49a82b035 SHA512 2e9966dc0aee562bca227570b2f27789f1b15b41bec581f4fff99de43b9dc01ba088d9dd54968c9b4331c0977de67f8328eb40651ab02262db2ec61022a170b4
-EBUILD kmouth-20.08.3.ebuild 888 BLAKE2B e5e8549418b705875059b900e0370a7f28bbfd3726212f651e03d6490356717db7b37845e2fc4b41d661b21c1bdb4f9a73fd79be87e7141636a908faf717b9f7 SHA512 1d78452236a0085fd8b55f6ef8381c5d9e48ffb9d4c900614abc6304260e475bc623b3c0861d532b010f359a06402b0c3f2cc2451f4477da3be9921b7d9d5dbe
-EBUILD kmouth-20.12.3.ebuild 891 BLAKE2B 482b6908d09075fea8afc31ffa3650a1657e8228459f78f313cfea7f7a6ad94861c63a161c47dcb49ce9668252431125329e12aa2bc8f007dc7227d352f2dfa7 SHA512 07c4dcb783bee5075cc707e3e097b89c8d214e1c494ed022003ec9802815dc9793f29716aa2686aa8ea28423f0d3f8fe4e86cb287be9bc3b9593d8d6eec541de
+DIST kmouth-21.04.0.tar.xz 2084052 BLAKE2B 4a2078c7513e837c9b32df82dcab73ac410cdb2e74db5da69b357e6f1fc2aa153e1edae96f428eadfe6f0e37e6f56290af26c981d018cb08fa6357506ec241f8 SHA512 56d071b95dc47f1bbce0b1a0ef8c976cb4d8550950143df5dad61895afd72597c59ca42d79c5cc23cec1737bb5bc6ab12c12650f7de013bcf3ad302414a21927
+EBUILD kmouth-20.12.3.ebuild 888 BLAKE2B 406f130390728a513fa722629d810919dcb1bec6b1c49ba843414f33ef461873af80268aad3a932cd1fc534fbec6d4006a542e2a16d955b39edb95c0edac4d8f SHA512 3b48465ab10ec834b270d450a71365a6176bfc179992d14329f28b6a851842b7e7ccf0e2e9300953461d6091dfaebf0b5f612520acf80c7197e81bf760c79c5f
+EBUILD kmouth-21.04.0.ebuild 891 BLAKE2B 4b0778864c25e08a772ea3ec0da38cca6ab762a676cdfd4641230a7be93e263a5972dd70ad70589141a7a53d6f3d128b45bb1dc913bfe9cb6080fbe1c424c06b SHA512 5e42391233661f50b4453558a0385af3b2ed5d2dfa96d45f82a6630a0aca10bd8266b1c73f98737ee8834ec89eae9fa10198f39041b6f03acccb4db1d357eb62
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-20.12.3.ebuild b/kde-apps/kmouth/kmouth-20.12.3.ebuild
index ec616624a261..aff4667a7be6 100644
--- a/kde-apps/kmouth/kmouth-20.12.3.ebuild
+++ b/kde-apps/kmouth/kmouth-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kmouth"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmouth/kmouth-20.08.3.ebuild b/kde-apps/kmouth/kmouth-21.04.0.ebuild
index 402be2e7a757..5b9459f8d11a 100644
--- a/kde-apps/kmouth/kmouth-20.08.3.ebuild
+++ b/kde-apps/kmouth/kmouth-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Text-to-speech synthesizer front end"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kmouth"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 9eab1b707347..de9009ba9bc7 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
-DIST kmplot-20.08.3.tar.xz 3055528 BLAKE2B aa54287371fd2c4076f569e7f5659b01654706ceaa86eca08fdddca5419849ca5ab6c68ba9f5659537b743dd806183074ff98972a5dd3537421fceb72ab207f2 SHA512 1c38cf10fb378ba5384802048da007a351cba8817dff1233c2364aaa607660a757cb1bf67429df9104e01b9c6e1706f98cb1095a553ebae61d65f5c1c592dbfc
 DIST kmplot-20.12.3.tar.xz 3055808 BLAKE2B ac61b5ef1d14696e3d0cd328a2212d03faa7e4ecbe2e6376d286c797e7b3e5a0bae4f9852268168438492108e273ac92f0423b96a70428598629aeb64942de7d SHA512 438ef6cb8c76ab943d517fb177bed8d28874a6a1696fffa8b15f8dc9992c61279ebfa583f3fdc20d4b1bd48ba120f0ba9800e693a58319feb5dce154d950b3bd
-EBUILD kmplot-20.08.3.ebuild 1057 BLAKE2B c20825120ad141c92f17cac5d2e59fff05dbd9ceeb8adc742031236538ea0cbaca310dd2b3b5d84a11f408812023ec76d6a519904765d5ccbc10bf14ff9dad74 SHA512 cb0a6cee8b43f8e6ec98a6cba439f14c4838d64cb2626d2f28bc669163b6bb1d106477d15c07e024ca785730242edde7fd7533b63e1239d7b4d6e22da52f923a
-EBUILD kmplot-20.12.3.ebuild 1060 BLAKE2B f4f5ac2fac493b263c78d2fe94ea39369f83f6031ddddf52675c949c88e9d8e4c2853f03e48bd3ad144ae6748c55f8428f6f9d7dd0f80ce53601824220843493 SHA512 9e080da1f95ba2e4b2614699ba9d19d7acfa5eba96ff8eae1a3b2ddcd33cb258e27859b05df00ec2e28f2a8bc2dd53fc2927fbd382ee82e57ceda2d52cb36a02
+DIST kmplot-21.04.0.tar.xz 3010660 BLAKE2B 494acf3f86cdf0719aa86872e7435c990a8eef4c03f6c66fb618e0e555dbb675d22c923e431c3c7fb5633c5cdef888679c2c7e967dc6e422a7ab78ff5cb78e8e SHA512 f2d12538dcfa42d6f0d74ce9078d207124eb7cde66f20fe429e1f782594f0eb53e042c8ab1fe3bd31263ff5a2201c189e12c09d862241eaf9d813eea6772bffe
+EBUILD kmplot-20.12.3.ebuild 1057 BLAKE2B 8fe010bce8036ef03794c0f11c02dd94637287e37c1cea5e7a1e73f68cb9bb4daf0e5ff4b9b4c0a4c1eb205514ed13be7ef5e19dccf1c8cae20a48750f8f1013 SHA512 136504f666018cf43b4fa586e873b4a32b1ecaf25571c3a3129d58a911ff603e8f90e61a83c12c23e5c88e65b4442a360e3a3d3a84b5d3017f9f2c7f40ea8b7f
+EBUILD kmplot-21.04.0.ebuild 1060 BLAKE2B bdb891c65a90f77a312aa16c4db384c8f3a8fc0815d8628e0a68f0ed13689ac541532d71ba9fafc2449fd8c4244fbe6ac8d1681ff6c8113185b989bf6e461cc9 SHA512 c5b4b3937d29a7a0aa910fc695f769792f69b83142eccaee6aa71b200f39fc9b0d0c1a8ef5e4bd0e77d530715ecfac5980105c4e9f519fb9770dcd5ad0cbfa12
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-20.12.3.ebuild b/kde-apps/kmplot/kmplot-20.12.3.ebuild
index 8f8d5df5d76e..6e7bf53fb8b2 100644
--- a/kde-apps/kmplot/kmplot-20.12.3.ebuild
+++ b/kde-apps/kmplot/kmplot-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kmplot https://edu.kde.org/kmplot/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmplot/kmplot-20.08.3.ebuild b/kde-apps/kmplot/kmplot-21.04.0.ebuild
index 87226e7dbaa6..24e006ff21d3 100644
--- a/kde-apps/kmplot/kmplot-20.08.3.ebuild
+++ b/kde-apps/kmplot/kmplot-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Mathematical function plotter"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kmplot https://edu.kde.org/kmplot/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index 3b3163c03654..a3265149cf2c 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
-DIST knavalbattle-20.08.3.tar.xz 1287652 BLAKE2B 333cddf3e7946b5b1ac53aee1f300f31fd0954f7613ff472fbf3b5340ec9f4c31274f61ae1644c1a6b6bcb917a9ee4a4184c322ed1ae275ee9bc94ef152af99a SHA512 bd36032f6fe4ca089e113db5e23df213bbc34f7c34cfdfb498b31f502cac836947492960fb884afae10cf02af536fd0110872b8a5c5012faf40fe3cbc565a8d9
 DIST knavalbattle-20.12.3.tar.xz 1290248 BLAKE2B 5180a33e3bef947122a5ce26935f2e87c52b5882408e270531e148e72f7c389e86f34c810909b4387b7655d3eeee01ae46a196ac4c43c640ee24b62dad3d0bf2 SHA512 015414551b0b365234243b8dc1b250513aede658d62908fe85b6d370dd471d10bc65e79c5f31ff1d03f9e05d6ea2387c116d1808df106097ab0bc21eaeb8cac8
-EBUILD knavalbattle-20.08.3.ebuild 1029 BLAKE2B cce38adafae9d24845a8820f4e09ba07dc6cc1e640a1c97d2addb8020822f13c4d927470035c05542d168ef8b3444d4c0e291a825646bb372eaa327b1d002244 SHA512 a4e7ffbc9ed5eb059bedc0b9771192fba9adf73c2e51aa402cbc46c04564a4a320e3bc40d53651b2bde63f491818a1a3c1a4d2ad74616aac90ee01752c26b57b
-EBUILD knavalbattle-20.12.3.ebuild 1032 BLAKE2B 940bb6cc3347ae43c2a18260ec082defdcf9d65198a43ab8a5e6550263ba13167f81e49e0e2edd1773236126b9285dd3872a466fdcd633e524d7f362a359f57d SHA512 f9f243c8817b30f4de532a8e193cf16a937c4de9e984a35d397a2be23e5e698c0d98397f0596f53d0e0c46fb3f8ffc8213497280038be04c3ed3e9a5a62d8913
+DIST knavalbattle-21.04.0.tar.xz 1366736 BLAKE2B 91c0691847ac05e44c3009d57571318b051c09a9ebbc635abedb120e25f37cafb24434ec5b36f3aded9266c7f1fb307a62a7621806cae034c632204cccc63207 SHA512 b85806d2766d395f832289c6df1a3504883ea028671253a01efdbc7263ff762b00b0a022fa4362d63f6c5c746200132f570ad77ba5c6289422fc38780df60409
+EBUILD knavalbattle-20.12.3.ebuild 1029 BLAKE2B 363d9b5e76d3f268b0a2100eafac775bfd683ffd690233268f8fd69db7544cf578aff555bd576ecfe3ecffb62757af358d33419fab3206a6a320f8761d4d04dc SHA512 e987fec3622f77ebf27fdbe0f4408db207fae76fc82e870676d4d03284571b625fcd3ea2e119d6e76c9800f64be7b14f1fdc04b16b4f3d87033f2604ab59507d
+EBUILD knavalbattle-21.04.0.ebuild 1032 BLAKE2B 458611da464b3951dc659a1d3925b446cb50496e3c98a2d68c390c090912302ede0620496ecab45fb7a99a4e5a96d7eb6e4c496cd9e0bacedcc031db271598e2 SHA512 0bb35a40b0e5cde46c828dc42176230fa965e3c8a4c7616d7d56c4916a4df22cdd52e2978917caf84b3d24eb2a68439664d251f3c38e77bcfb6d7348f902c9dc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-20.12.3.ebuild b/kde-apps/knavalbattle/knavalbattle-20.12.3.ebuild
index ba784c352793..feeb3f506573 100644
--- a/kde-apps/knavalbattle/knavalbattle-20.12.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kbattleship"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knavalbattle/knavalbattle-20.08.3.ebuild b/kde-apps/knavalbattle/knavalbattle-21.04.0.ebuild
index bb520a949510..f3f3d6b3e520 100644
--- a/kde-apps/knavalbattle/knavalbattle-20.08.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Battleship clone by KDE"
@@ -16,7 +16,7 @@ https://games.kde.org/games/kbattleship"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 762f62ebbc09..118e1c982a93 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
-DIST knetwalk-20.08.3.tar.xz 1267688 BLAKE2B 823946e1ea24d367447d8c4b869070270319041b24ddd1e8bf3af9baba97e45be6ca6d860d168f82854a1eb73e14cddd2912b7d8b95d617d42829626a10f1ee0 SHA512 fcc4c74af37022e79c860cf5382798623ae9bf754949e970bfe2cc2d38cc677027896a662aae1be5e49cde88a51dd15ac6db48f2d6fa5e1c8fcb29003a085c99
 DIST knetwalk-20.12.3.tar.xz 1267580 BLAKE2B 1ebb98fae97a56cd77633055d24c71a1395f58629f3ff0762d273f24307e62265f363280646ca2aac784b5f1f9f099e90761dc02d93e402703b5e64fdb9dd0ec SHA512 510ca6b0a7de58cbcd2e51cc3ec12c3ceac13e7cf03d1f1f0399a3d91b92deac4ebdba1528a62a0d7401b2bd60b2eae2b540727209d3bfed868d11a2ca1201c9
-EBUILD knetwalk-20.08.3.ebuild 1008 BLAKE2B e5c5a7500018879be6ec6d272c8081764e0f8903b410c53e88fb6eb8e9ae241c74159bc686969ed3de85a23f983664c89c56053e3446eff1e5884bb467a84c9d SHA512 9f3d82d67c0442999e01ad4d30cb1bdffcb7900eabbbc71e57b03809ec3e6954cd7a6be259c63053209c18b658832b746b10a06a145a8af9b38597c3576c5066
-EBUILD knetwalk-20.12.3.ebuild 1011 BLAKE2B 9a62b64e2ae7b086d778d699c2cf4012fbc74c1f83614456faa066ecb9b99b7e2b850be791aec79b40d714bebfb5c91ec1c8b6791ba77c5a4639a82ffdf9ac4a SHA512 1906859d689ba4e07688d90d9bf52fdfe77fd2d78d6f623e7f349c412023140e916b4e2d57891dbe2c23692e43e05847a8cbef348daf94238f9a854db04c4fd4
+DIST knetwalk-21.04.0.tar.xz 1269676 BLAKE2B 6a3c985fe736d5fe9747674508bd9d1a137faa4b64fb2febfd440b842f9425111da953dce2d23e15fe36ba1d5a7c31af3120c1e8293464a30f657036072f5617 SHA512 24974ab7387ef6d4cc0c2279e3be03f2b8ac5395fba1484fd8814cbf731d9cb1c56487620ed12e8499399e39ee6fa18787b023b4a3f4f51ed25edd324a2733ef
+EBUILD knetwalk-20.12.3.ebuild 1008 BLAKE2B 4528b9aae621ac2f5b919ccae6c5fa4a91571013fd722c3a7210c7dd2057cc3c6b30db774bdf7968cdf8d5c500cf7e131263b9dc701e3379479722242af9d1c0 SHA512 42829359fd541cd86d01bf70cfafde62ff3bdfaa5914936d46d157da10ee6293d313d63ac86ebad47c8fc1e448683f250b9868fb087019bc1548c089d8666f8f
+EBUILD knetwalk-21.04.0.ebuild 1011 BLAKE2B b0047c1474614c7d94c84a4a43a222a7ab7969e5c4592ba8db30e464714d392f2416deaca2a56b04879d3929ed52006d392d640332f5c9f6acee08bf7c92020b SHA512 6a3b0a55c004108e45da5744fbc0a989801909c3c77915bc5e3570600cc10e95c30a4e4d5a52dc036a7b62608d78e7efa40ec091dec0717643d3af75e102927f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-20.12.3.ebuild b/kde-apps/knetwalk/knetwalk-20.12.3.ebuild
index 237d9fe6f27b..561dbc144e96 100644
--- a/kde-apps/knetwalk/knetwalk-20.12.3.ebuild
+++ b/kde-apps/knetwalk/knetwalk-20.12.3.ebuild
@@ -17,7 +17,7 @@ https://games.kde.org/games/knetwalk"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knetwalk/knetwalk-20.08.3.ebuild b/kde-apps/knetwalk/knetwalk-21.04.0.ebuild
index b51aaa1c6728..7b6a09dbf4ae 100644
--- a/kde-apps/knetwalk/knetwalk-20.08.3.ebuild
+++ b/kde-apps/knetwalk/knetwalk-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.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 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knights/Manifest b/kde-apps/knights/Manifest
index 749aece00d39..772d7f526751 100644
--- a/kde-apps/knights/Manifest
+++ b/kde-apps/knights/Manifest
@@ -1,5 +1,5 @@
-DIST knights-20.08.3.tar.xz 3534664 BLAKE2B 6731ffb53be26c95972152b4438ab2c8fb5d24fa3f9d5de17575deabbe41a52139b717b88dee3b8087ca2d6d10ecb4a0a022952615bc2ede9d2ec1605f4ebdec SHA512 048973d06cc4c5ad5e695ce3061fbfea2e137e241d9b8c31b7e7c72ac09a7e54d1ecf9350ee77d7a711c0745ceee0f2d836f2af7b0e4c54f7b718c5cb1074354
 DIST knights-20.12.3.tar.xz 3535008 BLAKE2B 662a432ca348246efbd286f4c033cfa9202fd0df6c4fc05042ae8296afff74f0e87eef39949839d981924e145e4a307cec5558f88bc9f5c4ad953f1b58ad616d SHA512 d2db270091dec8079976e2c31b11ebb9eaa113d734528f2d8fea0aa58ff0efd467ec8e67d528bb32ea038fcc1429cbff15c8193bbcfd493e3d5725609ce5d4f6
-EBUILD knights-20.08.3.ebuild 1448 BLAKE2B 2836014e2968747cddaca6a894ab7e9fb71a595aa88739cc49d25c6fa03e7f29b55f1875f2f218c784027a18198645bc5b84a2da2d12b3add0131f4f39872f7a SHA512 d0d07fa0e8a07e3a308c0bb8ad629cebc630a19b2ab9539694e857711cd8b0252586ac23155a372ed82a538da920aadce5d357bd41953e88fe07e44e4f642b5f
-EBUILD knights-20.12.3.ebuild 1451 BLAKE2B 076c25eaa752c3c726d5ee85fdaab3dd2fef4bb50ae44a3118d2e4c9b9c644d75869f2c6752736f64e6ca00420569334d2728843bff36569a7979999fbf73957 SHA512 3d5f50b789bb9374ec8b4adee744105e1a40e18f4d71235a24f273a1724054681a28e57d52d4b8cc38376a5bb4f100967e63f0f475a0361dd8b73b02596e68e5
+DIST knights-21.04.0.tar.xz 3536400 BLAKE2B 9a41b9e653ae5782f41cea2129f2de8c740353f2bdc33f7850f7c608e9c49d8de90ed8f106700a6af7eb50f19724072fb3395ed56386a92ebbe170401ecae340 SHA512 c48d50a31ec1995c66993aae9663afeba3b0c99b364c7b4f45a43ca97692c9733376afba3a43aaa3b51ac110f917092f153603715153f3f23b0f9ce3697d1dc4
+EBUILD knights-20.12.3.ebuild 1448 BLAKE2B ebabf95541c1af826425b8504cc251f05962bf6ca6bff6fe46405932ca0836db876e7029a98cf26dd0f1466930d469a0ca477d1f9d2f0e5f3b6278cbcc6006f3 SHA512 d92420bf57e68be343da6b027de6d779dc92990f1e61d416a03fcad40934848e58ec635d30ba63a59d86a4dd0dcdc16f0b3f01be90b2d3646e9107a3c1fa51aa
+EBUILD knights-21.04.0.ebuild 1451 BLAKE2B 31d14ad585be62d8defb44a57fcbab7d36a985ecdc0032ae03b56a4484c25400b503b80e5141da3031b431ea8cf37d39dbf78e062bef4c36abb292b994635ef0 SHA512 da54c4562741fc4c3f82b7af040315aed84aef0a58aabf98ba57d43bd274067c6c91d2b552ecac4a717e1755c7e386903f106effe131cc0e3f876ca160ae83e7
 MISC metadata.xml 437 BLAKE2B 9c89e54279e181045c5bfdd8cf6586306d84fc37e5f087ba3f3e2db62430ee6654cdc0181c3690105a6ecb33ad584f827e96585314a25e0b5016b1ed51d43885 SHA512 89b588c23e621805fab8a15724dc03ae8eeed23957fe19415c9846ad027ac80a1cebfaafaea0e6fbf2a27c785c4e6dfb81892bcdee1b40ac6af7cb5f8350e0d5
diff --git a/kde-apps/knights/knights-20.12.3.ebuild b/kde-apps/knights/knights-20.12.3.ebuild
index f962b6ed6291..a0a42cc8b51a 100644
--- a/kde-apps/knights/knights-20.12.3.ebuild
+++ b/kde-apps/knights/knights-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/knights"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/knights/knights-20.08.3.ebuild b/kde-apps/knights/knights-21.04.0.ebuild
index d5bd76e0b215..45ccb1ca0248 100644
--- a/kde-apps/knights/knights-20.08.3.ebuild
+++ b/kde-apps/knights/knights-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Simple chess board based on KDE Frameworks"
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/knights"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 10a3106b528d..01bb7e389087 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
-DIST knotes-20.12.2.tar.xz 329504 BLAKE2B 7ec1c2fc977c44c71a5e8fa9fe85c505e04f0982a511c5cd31de018d3f6886861dcf2ea1387a17f5e9d7be843f0538714d09403437e7974184756f05cd2ef2a9 SHA512 f6aaa00da95e77055729f4fd74b207cba96bb2a99f7a21f3c6eb14eeb3b1bff44206839ebb1a18fda92079b45324a6597b5e248a96078b80b3c85bb1c9102ec5
 DIST knotes-20.12.3.tar.xz 329536 BLAKE2B db0c7e87a7f9295bad77877fb1d6b8c0cf80f27fd55d4560ccd18149a903b9adc02a66ff92604e829b53144d196ba5e93f0ca3bfbec2c20e8c08d3543115d80a SHA512 077cee2df4165c619a12ab05f2d6289e750a54606a62d09dc2747a45a97e336acdc908e84b81968b983963c712b3597e5da3a9c60a26cab488912a5420dede14
-EBUILD knotes-20.12.2.ebuild 2141 BLAKE2B 7872e7a487646a6bf1be13ed1b5ae83f752efe4633ff0453eafa209eed43e658d360da9e498ccc0a63c7f410ecc97e3015ade91093d2995e41e670627b9e640d SHA512 2d7f2262dd11f462f4f7aa93d017d3273699a9e2092ae1b9bd643cb7eeb247a1faff90611452d93c26187d362f2bf89aebb7f029d241f76d38ab3e1411c312a6
-EBUILD knotes-20.12.3.ebuild 2144 BLAKE2B c32ebcdbaa3bf9fdd5056492f24d44771191988a0c3e5feb26be3eb75879e06a1f634e2c38193f23e9190e5c2a0ef292aaca4cb120f536469bdacb1c72ff6db4 SHA512 b4a19d796af619d5b93f04814cb96c24b01f995f2bbcbb19183c33cff44e852fa2d1ae482157d89fc2295f48c5af2669008f751e7e3da2fdc2c6ea49254b56a9
+DIST knotes-21.04.0.tar.xz 334492 BLAKE2B f6740431dff5313bb149ecd1468bd693dc419b4a851a5c3b1b5f52f579ef34481b9c5d3a0b88676f1fa2c08ebfebda8d7658da57623bb636e172124ce0ea6b51 SHA512 1c97c770a3e285bc7ed5823c6736dbf7b5df32256bb38919003186fbdcb42d07915dc0183690d7fae8c805741cdc583efb7814d0291452bc47701bd06ca85d02
+EBUILD knotes-20.12.3.ebuild 2141 BLAKE2B 7872e7a487646a6bf1be13ed1b5ae83f752efe4633ff0453eafa209eed43e658d360da9e498ccc0a63c7f410ecc97e3015ade91093d2995e41e670627b9e640d SHA512 2d7f2262dd11f462f4f7aa93d017d3273699a9e2092ae1b9bd643cb7eeb247a1faff90611452d93c26187d362f2bf89aebb7f029d241f76d38ab3e1411c312a6
+EBUILD knotes-21.04.0.ebuild 2144 BLAKE2B 631a3edd517058fc2310a35083aee44774d93cb023ffc413be599504b1c4f3eec52361d69130fc74c7c2ec414612331e9aa5b6fda74af98965013a209b6b0bbb SHA512 5bc04e8e34c59fe39cfe471b12729098b88b7446b20af70b7118991613cf734b91c61e214f2bb1211bd9f9d96a66c62fb3646151e33d999068201d00f33ab036
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-20.12.3.ebuild b/kde-apps/knotes/knotes-20.12.3.ebuild
index c739590c9af1..172faf6bb269 100644
--- a/kde-apps/knotes/knotes-20.12.3.ebuild
+++ b/kde-apps/knotes/knotes-20.12.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=""
 
 DEPEND="
diff --git a/kde-apps/knotes/knotes-20.12.2.ebuild b/kde-apps/knotes/knotes-21.04.0.ebuild
index 172faf6bb269..87cf91f43798 100644
--- a/kde-apps/knotes/knotes-20.12.2.ebuild
+++ b/kde-apps/knotes/knotes-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -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=""
 
 DEPEND="
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index 9cf016c2e9af..c8d78059eedb 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
-DIST kolf-20.08.3.tar.xz 1030032 BLAKE2B e2221c762b5614377b9d149f49788a52246ee3bd8ae8114e0b81fee9bbd05428099558fdf240f885d92bcd258aa150934c5fc162ea9a20503b924e65c75b7a55 SHA512 f84f064b20b0e2a459fdee2636de74eb77a48198091b6dfaa1b2cb81e766f1314aaef18ba5f593ef3a4b24e5717963360a5173725363470276b398e9a3931bb0
 DIST kolf-20.12.3.tar.xz 1029796 BLAKE2B 8627a1be35d72670dce3ca3727ea7768f9f9225962aac9b22f3beb97e2cebd89a3c5fa909d4284a9815b561026f76642346b7addc6c390b8f6c0e124762575ca SHA512 63f78174da9aa76bed51128b44900e52b314daf2caaf22e1f7bf2233b58e999a34e508354c46b20b26ba95908eb690d3cbe20a425ad6e2661a8ee5fd373acb63
-EBUILD kolf-20.08.3.ebuild 984 BLAKE2B 5fb5e2c46e1dbee88398ac7c8ff66b808ac4c62f69299762979e7c028162ce173513c2d8a0c4d870b6d30f805641de2f96059676ee26de069ef9dc43d3daf029 SHA512 d62dc98944bdca51edb014fd0b368efec8a496028d9ec200c233dd42cbd0c19e5e1df573a684de3c29a3b81d9eabd3892e290f50fe9b18ef98018fe08f536a92
-EBUILD kolf-20.12.3.ebuild 987 BLAKE2B 4aa143e558a109d14ba3a7357bb474042f67310826e878675c0d9e67c85b2ad97883f784b09e1c4ddd7eb0ba62214f5bcfe0cb585c03a94cece1f4f247c18bbc SHA512 8c3084ecbc6ad22e813436b92cf772ac57f244fc361da5b5a7b0796fcd24c0b4f63f506c7b0576600abd5e3fd55fbd5733d55643462a6259f8639389e58e12ec
+DIST kolf-21.04.0.tar.xz 1034140 BLAKE2B d33af040943915f7855a7c31801cd9b2db31f85d0b350407fe5950c3c9699af89164eba5367a2fc7c089c4c48f7368d2f7c5aa58dfa4c2c12f710b2e3ec0a40e SHA512 6ce321e0abd352dfa11ee86ed2bf828850cd3f5aa037151b77a61d7f18132464d53038a9c21419cbd96ab7ce6a7f14a247966b74e56cb86979f5915b9f271b77
+EBUILD kolf-20.12.3.ebuild 984 BLAKE2B f2214a658786907753751027a48f54544935511a5185feab60784e42536e85116b29f6f8ca1e8e62e6baf65dd2648ecba1d28b15fb962dbfef5a66ff006a0bab SHA512 4adc41a4e8a81b7e9ebd6a5b017c8988b6af8f6ffbfbdc1427bb947bb0dc8b73f20cca1a1cc77fb5b04630043005c0912c608c8f8414d521bf7882bd81636346
+EBUILD kolf-21.04.0.ebuild 987 BLAKE2B 62e58c7549c2a92f0767f9b54952cb9deefd3ddb898051dc62f6b744580aad829fb2cabbe4c0c7638c2bbe07594b7e349fad8512541a33bd58f3a352efe7bf89 SHA512 3f029772f723600a4541af05d339e4f13c70f1379f02d1a5ef1425151fa737912a57f3574d7cc504a54e9bc2a64eee48710a044578c0963489e4c8eb0d9740f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-20.12.3.ebuild b/kde-apps/kolf/kolf-20.12.3.ebuild
index e77f169a3f33..feb30bb85b9a 100644
--- a/kde-apps/kolf/kolf-20.12.3.ebuild
+++ b/kde-apps/kolf/kolf-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kolf"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kolf/kolf-20.08.3.ebuild b/kde-apps/kolf/kolf-21.04.0.ebuild
index 7975490a3f34..9ac18930d17d 100644
--- a/kde-apps/kolf/kolf-20.08.3.ebuild
+++ b/kde-apps/kolf/kolf-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Minigolf game by KDE"
@@ -16,7 +16,7 @@ https://games.kde.org/games/kolf"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 97f769a64376..4d75dcf6fd60 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,5 @@
-DIST kollision-20.08.3.tar.xz 288736 BLAKE2B bdaa9627fbb2a9076d21a78e63ed59f7552db679558bfe6aff33276b4207331c46d789595eaea3538f1cec7d912633ac8e28894ad3dcec73ea1836d87ca9465b SHA512 8e4f3c9789fd733c82a4cf8e6561bfb49a9c79df23e451de530c1b3c6e869544b84854f421ce11a403b8e0822af3880a5d5fc04704aee6e00e1f5a551ae111b0
 DIST kollision-20.12.3.tar.xz 290660 BLAKE2B 4848aa71659269218966bfae9dadfb3a20ad7ba48f6908cfcddb3ac39234f2d55688e1039eb8833c138f37c32f8184af05dd7aefe7d7213611948bd276c1f8af SHA512 e1c019efd9fbc99abd67fb70d81ef12f2846e6d7c2e2c8283a78bce7e96ca9b70ff430fb9556a7a7c26ad8fffffe8989311df1285a34b39c74a394112aec8fe4
-EBUILD kollision-20.08.3.ebuild 803 BLAKE2B c5341a76b703f72abffbc4320f0af444629195f5b61c711142c3d0289a82b240e5a7105a4f45ca8da99c674a9b01a34374e8f4e4b486db406dfea69d640502fc SHA512 f1965729b7348893350c4f5135887ab88abd354fc2df1b8d3cdea98b53f78a227f408e5af04d2b5c7883315f31455a85b439e211bcf78572a88eaaadb360d350
-EBUILD kollision-20.12.3.ebuild 806 BLAKE2B 0b82cd1f1ed0dda1a8a63b40c3e874b8bed2c572be98f798336d7c4687590474eeaa27d3a3f106b5d457f53980578a24e9b4ed1b21d8bbe1b4336d087e4ec1ac SHA512 79021cd400545d336cd4c0d72e3cd2dcb846bdb4114935c60ee576c5fca7981e4cb6de5b09b5ecd3ce48696904e777493d6f9387115b248c4061070f149f1ec5
+DIST kollision-21.04.0.tar.xz 290424 BLAKE2B 14434b70a57ce8f8b6aedd44532dab87bee0c93fcc9d9ee8929fae673080c277ed134c5ea7c0342df85a90311207b6f362f84a8db3c440a394abd00a36d2a0e4 SHA512 1da46d8e991328e6805657c10a5412bfbce7c3911a0d634930ec7b459f06102a09cfe714543b5827b948a01e075555c86ce6e155a37862990ef5dcccbbdd428c
+EBUILD kollision-20.12.3.ebuild 803 BLAKE2B 35689fb4a0961ebda29ba52bcb54a6ab4f4295544f311396967bb0d22fd663e5bade878ba5fa0f71b54f1e6ac00fbdb3934f2b566d08030489e3013e7972b065 SHA512 4c896c323dccf52431ce9955ebf7665eb594f2481a583e10a03205f3cd2a6589060f568f2f5f626f1cfc4903e3a29af92b3328dfe15eea15ab204ae658ffb236
+EBUILD kollision-21.04.0.ebuild 806 BLAKE2B 9265b3b3dcd2c1f3b7f181e8fc90505d32ae1034e1b79619a97fd0922f68cecc22d8bcebe79da652943958182048db726778265e53321e5cd070582c30dbcf70 SHA512 c6e2973e8ba056fac78603bd64f504f43eb9775cd09950823738b08fd72eefe9d463f8b61771ea70c162a2bdc1aa030f0e481a214036c7b6afd585e51a892543
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-20.12.3.ebuild b/kde-apps/kollision/kollision-20.12.3.ebuild
index caeb4f49dc59..53f1546f3fc0 100644
--- a/kde-apps/kollision/kollision-20.12.3.ebuild
+++ b/kde-apps/kollision/kollision-20.12.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kollision"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kollision/kollision-20.08.3.ebuild b/kde-apps/kollision/kollision-21.04.0.ebuild
index a130428fe765..260b01b67d0c 100644
--- a/kde-apps/kollision/kollision-20.08.3.ebuild
+++ b/kde-apps/kollision/kollision-21.04.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Simple ball dodging game"
@@ -15,7 +15,7 @@ https://games.kde.org/games/kollision"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index 302632ff76ad..a86b955d7f27 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
-DIST kolourpaint-20.08.3.tar.xz 5686628 BLAKE2B 6155d5c953332e44a3ec44b604fa1c780f8407e826c10ab4900968a30705e059272d0c6a0c022b3804fd0f36b041e41390fd3d93900e401e6492b6e35ebb464e SHA512 ed891626b0638bc6accb511467e9135bb50420d1ec26913940435f763fd01575af2ed6ac7a3a4256d657045a9211ffc665d7ec87606d7760125b8ebd6814b69f
 DIST kolourpaint-20.12.3.tar.xz 5686472 BLAKE2B ea2def24c9b10f0513786022ce9b4b5a804777551e94591ed6a2e5048c4e3e6f8ca30523a63b5013ea20c2f6163637a2002206f39d6c20900ed2ffe68a59948a SHA512 03a2312932fbbb0a22bc2291b12af639c4cf2895068d25efed4f2307fcc124ce6d22f5580eb3ddcb4501c18dbfbf4c88572cce106c9795196afc117099157fc5
-EBUILD kolourpaint-20.08.3.ebuild 1145 BLAKE2B 203bd467962af7b5997d7cd09eea786c078cfe18512e4b2c9f2048b85b0d6b0309eb0031295d2df388275e0ba45483ff2d3957472cfebcb9249ab5a671467f82 SHA512 4db6b507cca0f7e806550af8d9c9916408d2800f4386a31fd0e5157858257963a2d3e39b51f735266558f084748cbe60ca5076fa251591f96d774849f940cbe5
-EBUILD kolourpaint-20.12.3.ebuild 1148 BLAKE2B f34a355efbcfe7d1849253e33e6eafa0ca357977c9af01a05539dfbc4f6d9d23bd38c5d93770fec0b8c573aca05efc7e60afb82679bb365ce061aaa765306eb0 SHA512 683e3825cc40041e8533a8c4b8ce759d465a67bebcd31377d143a86bcb581a84d780ac63252ea4a1ba3beb344c75648c913c010e30b974a091222b1bce366c24
+DIST kolourpaint-21.04.0.tar.xz 5691016 BLAKE2B 8d092f084eef3201c0537002537d6ad5202de4341015c863d309625908db1f0df03aee82c1ff5fb0779efb27210dcf117dad4683164ee1157c27ea10b827557d SHA512 5fb7532fbaa889928f0eb7ad0e93e41af11970771a11931b5141b79d58f4e4dbc951f2fa1147a30bb53ab6354b0db200d5fb60813a31d890b1e39985bef06af1
+EBUILD kolourpaint-20.12.3.ebuild 1145 BLAKE2B 53f840b87b8b37e15febebd37d47bb1d7dbf1e73a68a1d0ce3c941b0fbf3a9605e788752ed93a87593a2d1c4981e17b8f15b8bfd7df28fead7e0e693a7d41f2a SHA512 f8f6a81d3456dce6c1dc18e3912cbd00000be6f904e02cb4e02a27259472a687e6e5a7454428d9f891d8436c4e6f26c662b3881a44cebb4d9709f36d3a228090
+EBUILD kolourpaint-21.04.0.ebuild 1148 BLAKE2B 4552887518d8d0627c4e4c16236cf00788ac4c87e90bba06e8ad5e965b8d60c13d56a264e716dbdb1daacd91288f5655751e24d61bb72754ece6b7753d996459 SHA512 d10ed0ecb05d638bdd81eae7b1572ce4d36097c09516d7e9b220e8644e65960f835331ba44d6730316e812e6916c3aee775d8710d43e278bddb82d941de82ff5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-20.12.3.ebuild b/kde-apps/kolourpaint/kolourpaint-20.12.3.ebuild
index 3af244261a14..f53d1295d9be 100644
--- a/kde-apps/kolourpaint/kolourpaint-20.12.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/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 x86"
 IUSE="scanner"
 
 DEPEND="
diff --git a/kde-apps/kolourpaint/kolourpaint-20.08.3.ebuild b/kde-apps/kolourpaint/kolourpaint-21.04.0.ebuild
index 443c49c73bde..9721b3cd3198 100644
--- a/kde-apps/kolourpaint/kolourpaint-20.08.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Paint Program by KDE"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/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 ~x86"
 IUSE="scanner"
 
 DEPEND="
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index e7094c32152b..41aba10abb8d 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,6 +1,5 @@
-AUX kompare-20.08.3-qt-5.15.2.patch 1479 BLAKE2B 1389a0c1b4639941708cc3adf7960d3bc571cb1b19766e52de90f04a4eb7a3657987f635a4679bb68b4b831965a07d8100dd3eb6b137eeb9388c07a97c490bde SHA512 6205ca6c89690f0b28d37146d9604ae55e6664bcfd8b2305c4f0df260bbcde5a541e130014e049148ae86cd035e8eaea1b90cbf04f2cb3299e76309c00b5f764
-DIST kompare-20.08.3.tar.xz 924032 BLAKE2B 65940af6a4ef81ff0cdbf5b2e8ffc7b7ddf4b1baf71c5f6e7c7d55409085cfa7820e8b742f8d6b520cdae4c08585a4ff77bb3fbfa97710d729ad2f9f5c3492ef SHA512 0cb169296924e4dad2967052472fd7095092478819ba0925d82482f0e279719b2e29e75db9e732602cd845261918025ae9cf0e024c8ad0a250c04abe022deb4b
 DIST kompare-20.12.3.tar.xz 929648 BLAKE2B 14c2dbf52dc4075d4a57a39ab1f2c56b18d155abd24eb14f685fb2db365c1e2230287c8eebfb681f23b1700eee214a4dbef3f760283e2c096ce4a77454817f87 SHA512 0da525fd73629d3d092b0a61c8cae610989981ed3cf6ec5d47b94ee1a3a443ac37ec18e8c56f1888b03a480fe6a127e9711bf0f5a983febed3126dcd8787386d
-EBUILD kompare-20.08.3.ebuild 1149 BLAKE2B ec389ff787c6b6fb7c196e535f7652f813b7c0734c80dd37ca5ceedf8a2eb8c38916c3da0c221b48305792ecddba3f7d1e3370bd73cbf1f4258179a1efc920a1 SHA512 ea8219929bfdbd30cc627fa990c4c85fe18ff4d2299924e1aae64bc67ba57037d087f55979064cc3bd14b6fda27db2ffb8ef323f1e720da9585ca217a0939e14
-EBUILD kompare-20.12.3.ebuild 1104 BLAKE2B cc51573e668ab56785bc8a46edbe84668f9f6c3c0b041a840372f4b27e0e47816c1606d0975b771c351813a147848a979b9ee17258d813dbb0589851c7e221b4 SHA512 842045ca7c6226a779367c9249af471fb17a09ae2293661e4220c5b821b3532418cbadf04ad802f9f2830d97db203e2b961fa0a56fd037f45ae8c71fdf79f71f
+DIST kompare-21.04.0.tar.xz 927076 BLAKE2B 148d4f68d5d28285dc94f2a953d6cfe7ce36c0809275f5f244b2ef7cbd5664862ff322f2889b083cfa0ff8df70ddb374b4c446b8fa97ceef3b76f8068f005c5a SHA512 e42f8b5a8d5b90f283d9f8bc8dc00143725198198996f9d96e38619a632e26eee18da7b4b05fb827fdd1b85fc84f4ea53f96673289eff9db7fba1480936707a4
+EBUILD kompare-20.12.3.ebuild 1101 BLAKE2B c76e8d58ab8490faded364adb0cfc0546c23d9a6c57dc1f47613a14382596aef6eccd02b73c9ed1b7ddb10f601e7414773aa44058d29687e01d270133b75aa9b SHA512 6e7ae3db3fc0005fe02a4de048e25475b25e347b8b74201e3eb21f475eeb0cc5b6f2bd107a52077ea944f3dc10f211baace3deef8333bdfb4004edfeb16e7485
+EBUILD kompare-21.04.0.ebuild 1104 BLAKE2B 0761a5d0df2b931b1c57475925f257030d96624e0d4b2ae58cf7ab2e941f99b7bebbcc50baa932ccbab98615a53da83ad62b9531f93335c9e8227175bc28abd1 SHA512 1b9a390b27ff33a52864e433a2aa689153e8a4b3797b27c4ab3b8976380a4358d4a925f15ae10d06499071ced39c2be01ed28e3555b2375427b5f7a53b7c598d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch b/kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch
deleted file mode 100644
index c29f957d70d8..000000000000
--- a/kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 68d3eee36c48a2f44ccfd3f9e5a36311b829104b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@gmail.com>
-Date: Thu, 17 Sep 2020 22:12:57 +0300
-Subject: [PATCH] Portaway from Obsolete methods of QPrinter
-
-setOrientation -> setPageOrientation
-QPrinter::Landscape -> QPageLayout::Landscape
----
- komparepart/kompare_part.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/komparepart/kompare_part.cpp b/komparepart/kompare_part.cpp
-index 42d3120..88346d6 100644
---- a/komparepart/kompare_part.cpp
-+++ b/komparepart/kompare_part.cpp
-@@ -26,6 +26,7 @@
- #include <QMenu>
- #include <QPainter>
- #include <QPrinter>
-+#include <QPageLayout>
- #include <QPrintDialog>
- #include <QPrintPreviewDialog>
- #include <QTemporaryDir>
-@@ -610,7 +611,7 @@ void KomparePart::saveDiff()
- void KomparePart::slotFilePrint()
- {
-     QPrinter printer;
--    printer.setOrientation(QPrinter::Landscape);
-+    printer.setPageOrientation(QPageLayout::Landscape);
-     QPrintDialog* dlg = new QPrintDialog(&printer, nullptr);
- 
-     if (dlg->exec() == QDialog::Accepted)
-@@ -625,7 +626,7 @@ void KomparePart::slotFilePrint()
- void KomparePart::slotFilePrintPreview()
- {
-     QPrinter printer;
--    printer.setOrientation(QPrinter::Landscape);
-+    printer.setPageOrientation(QPageLayout::Landscape);
-     QPrintPreviewDialog dlg(&printer);
- 
-     connect(&dlg, &QPrintPreviewDialog::paintRequested, this, &KomparePart::slotPaintRequested);
--- 
-GitLab
-
diff --git a/kde-apps/kompare/kompare-20.12.3.ebuild b/kde-apps/kompare/kompare-20.12.3.ebuild
index fb71bb9713db..e147328a32f9 100644
--- a/kde-apps/kompare/kompare-20.12.3.ebuild
+++ b/kde-apps/kompare/kompare-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kompare"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kompare/kompare-20.08.3.ebuild b/kde-apps/kompare/kompare-21.04.0.ebuild
index bd56709d12e2..703c079bcb2d 100644
--- a/kde-apps/kompare/kompare-20.08.3.ebuild
+++ b/kde-apps/kompare/kompare-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="A program to view the differences between files"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kompare"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -38,5 +38,3 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" )
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 97936678d043..81adadd87a7e 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,5 @@
-DIST konqueror-20.08.3.tar.xz 7173112 BLAKE2B b68467dced20de117d1f0d6974d88b19b9b93f82529c2bebe295b4a4159d600b15db4d1ade32ac8aaf99c5450e4b08d0337155fb2f94f3e99fbffbeb5e021656 SHA512 036e1a7ffc9452eccb334931d754c9d7a0e173b83127711579dcd636537d4d272aa70ff7442c875106098ea26851f305f004d5fa5fdce91b5e06a76ce4119430
 DIST konqueror-20.12.3.tar.xz 7241896 BLAKE2B 0fd3e4fffe57cbd56bd953901617fee15d264ba4d4c709d2866ee01516cb00d15a2888e8e174592245a35f58fa5c4b7c10391c450506a23a4851e72dd2a3c4fc SHA512 38008dbecd9a22ff9658cb6b72092245b408288388b4c3f8077cc958d0a1dd5be62f24e05f3802eb5aed718ea7d5f902e3c6e15a52846661e3ffdd41c0fc7370
-EBUILD konqueror-20.08.3.ebuild 2568 BLAKE2B 589635f13e391eb27ec59d3c8520e0e838f73fb8d301a6f78f4ff2c4363b89101f144f55375e93e9f6f0197add7ea5fbf81176581fff1272d04674a013402a2c SHA512 8744220edbd8e1f26ea281cbe985f9277df6cccf0b215bca05f416c9c0940e7c6fd4e13de3d7bf7f414f95fad13c63961fbc219407cc97ed6b23824d5dde0ee5
-EBUILD konqueror-20.12.3.ebuild 2483 BLAKE2B 3d94f0c11a4173ffa3db928ecda0c4ba943c3e7af8ca86a563f6053f84274cd15457845423465d843aac83874a83b8c311b22c7288c7c8f4494d45b8873047e3 SHA512 d691213a54c406a0f1f28ea624f000676352752c356190521d8f91094910b2e7d1e87b85e530c3839556f630064722554fe9f77067d899b4df2e0c4c6e72ed37
+DIST konqueror-21.04.0.tar.xz 7254208 BLAKE2B e5a66530b9a57dc46db477aed8e72eae6fbfd93797fbbf2fd93856d5b727b3d6e29929709defd0a460020fa7fdd74b0ecfcb4dfc132a9568c607abdd32d4307f SHA512 5362cd558054177fd980df599108ab9450c6e05d9138f356a63af86e12d07fa87d4643e0a087511102307bd346b5da4c7b2de70c94cb472987858c87c7e12c40
+EBUILD konqueror-20.12.3.ebuild 2448 BLAKE2B ba3a218a4802dccf819a63097d4d60ef20c8153ce60e543bea99a2a70ebec22de7a514a0062516227cd4a88e826e50f676cf1aea26926b31d6a4660fb49a0787 SHA512 9fa311aff5690a9297c4a817b6bc6e9cc47f780abc4fcbfbca3ec8640b68b70ca28ac26ecb78f718232b42723653fb1d9686afd90a6cfb0ce78cd0e3b695887f
+EBUILD konqueror-21.04.0.ebuild 2451 BLAKE2B 7a4a267bee23bc45af9ed4780574afc548cbb7bdff65c9e3de9f04d63086c3b767412cb59f620bafbb57628e4fa8fe401045aa3757ebeff7dc40982d157637c6 SHA512 5237d261518b1c627e7e8857895a8dcc66d78066902c6e4f3480f89226b3b8b2c633fcc829fcf22ee37ed438b6ac7253c4d0315e957f3e47faae6a52ab45b678
 MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955
diff --git a/kde-apps/konqueror/konqueror-20.12.3.ebuild b/kde-apps/konqueror/konqueror-20.12.3.ebuild
index 64777e0e8ceb..a36dd103fb84 100644
--- a/kde-apps/konqueror/konqueror-20.12.3.ebuild
+++ b/kde-apps/konqueror/konqueror-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/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
@@ -79,7 +79,6 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
 		optfeature "filemanager component" kde-apps/dolphin:${SLOT}
 		optfeature "SVG support" kde-apps/svg:${SLOT}
diff --git a/kde-apps/konqueror/konqueror-20.08.3.ebuild b/kde-apps/konqueror/konqueror-21.04.0.ebuild
index bea98c51ebbe..890e26b3fbfb 100644
--- a/kde-apps/konqueror/konqueror-20.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit flag-o-matic ecm kde.org optfeature
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/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
@@ -37,7 +37,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
 	>=kde-frameworks/kdesu-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
@@ -80,7 +79,6 @@ src_configure() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
 		optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
 		optfeature "filemanager component" kde-apps/dolphin:${SLOT}
 		optfeature "SVG support" kde-apps/svg:${SLOT}
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 94c9e37718ea..ffc41eb27652 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
-DIST konquest-20.08.3.tar.xz 665808 BLAKE2B f607edac0cd991785337dbe635d3a5fe7d6a2b82877300e759fc5f08a6d6d8b58059ca4333e858380648da48d36ed73a02cc8fa39dac2d497ee1d1b0a36e0e63 SHA512 2ef50f0722fefd8e43789fcfd2e0ca397028792492c2286b042023f8b4cde22116954d782b8f05e61cc8c67c1ffa6b6f4fe0acb5825bed0356fd52253c0b902f
 DIST konquest-20.12.3.tar.xz 666152 BLAKE2B 4e376170a0284c791a14ac14c369056515449fe3a7bd041e07fc4838f5ffe59caca54749fc38925931e47ebd172e14285bae5b0368762b81ccf9598bbfea43fc SHA512 331571276a7318bc5ed04f0860d2918d5c9b0461bef66ba8185d1be2a09e3606e02bcf46479ba24e3cabf35c834c687fb195d4d347b90b5f72903395aedce113
-EBUILD konquest-20.08.3.ebuild 897 BLAKE2B a4b0db7e2a5458772f2dbb1d37b874d45f8056ba550df274dba77fc2cecdbf3c8b722406d444c3ab4c31346e3ef6417d95785e39193bc8363b4b7ba3c37eb6e0 SHA512 7414a74539effb294c2964a346c8c6b43fa66d91047e84770629dc27d27e4a343919b6722cc64b7c9e422639125e45f467325a5fe3182ab7d93532412a587639
-EBUILD konquest-20.12.3.ebuild 900 BLAKE2B 86cf915f109bf7b8161a75d49bc2414c6b73e615ad9b59b987e68620dbb31b10ea61dc3f5be58dbd9ca9b1f086abea070d4630c496322e8a5e1a6366d8c22652 SHA512 64ec241ee4b35348784a482ce93564899c00913f5169f2be13072ddf3933cc622ca6ed315f1cc42a2159bbd71b9bad90affde2c4905d223b554c90d5d585b303
+DIST konquest-21.04.0.tar.xz 665736 BLAKE2B 8a2e6dfb5956e9af92bda2ee9476159f3f73d74008544418a523155a3b415ac0054e911523cc75bcda4e88021a993c73dcdaebef349d16c7ffd15576a9a1a6ea SHA512 478a3cfcf1e90c7a44bca2bbfc1253b77ef3b46dba9b8f6acf3892dad6cbce0447cb88711012da9f38e6206a7836fb16e22e8a0d2f885f98550c8c1dddb68bcf
+EBUILD konquest-20.12.3.ebuild 897 BLAKE2B e459195f81e0181408cb307e9f811aa58341094c679d62c5de3c28f88c605164f00aeed143d0112b0060942f007f98e38e02f329b9ec030d32e16ede8a97044e SHA512 be2d8ada5d0eacb9aa3402757d673078c8badece3ce5c2b6b9ad198aaf9bdfc226a2445684c7bc1a5594ce8fb7bac43f800767e3fb839a70ea059f40fc23e64a
+EBUILD konquest-21.04.0.ebuild 900 BLAKE2B 7acb70cc65ba8ba63770586d2a2af4d9be930b2fcb75e03b40f5420a140a54bd5b8410a1aa9e3261704849e31312b2877e1fdc3255dee9a8108b3a04944a6384 SHA512 3eaf42302e6bb437a1aface0ce23acc0dae07b84aa244d50b45fc4acc706a75fc54786a302e3ec51ad32140ea5e6bae1915016b18f6ac79f95176db2fbe7d60e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-20.12.3.ebuild b/kde-apps/konquest/konquest-20.12.3.ebuild
index ac0537fcb1e1..d70ca783094b 100644
--- a/kde-apps/konquest/konquest-20.12.3.ebuild
+++ b/kde-apps/konquest/konquest-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/konquest"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konquest/konquest-20.08.3.ebuild b/kde-apps/konquest/konquest-21.04.0.ebuild
index 5ed2894d344b..14ff10ed7dba 100644
--- a/kde-apps/konquest/konquest-20.08.3.ebuild
+++ b/kde-apps/konquest/konquest-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Galactic Strategy KDE Game"
@@ -16,7 +16,7 @@ https://games.kde.org/games/konquest"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 000397db8d3c..ee03c41242ef 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,5 +1,5 @@
-DIST konsole-20.08.3.tar.xz 1212868 BLAKE2B cd3382e8df7f71639e11464a0cf28c087f28f8720c8631aac1970b827f6c377b5c86a9c38e93a5566bf9bdf7b4d36efe4691408e18657dc9566d899bdbc62205 SHA512 8025548b02523c58d4f98ea8950b1001a0223bb8c53d506928707f97d96a3ca4621c6fa6fbf14eb9ffdbe1cd171b4aa9ed2f8c8808eafa166d0f6764f590a5cf
 DIST konsole-20.12.3.tar.xz 1250536 BLAKE2B 83d4af770e42feb9fe96dcebc2cddc6889d98a7d6ce637fde6f8665ce845430e2118b3fcb34ca6448025a397826f14804442a590f1ff4ca62383768af7007a30 SHA512 a48eaa0080b26369f5f163f3ae345bca7f35aa06d581ecc0bbeca54fee2e9b900a4b648f940a67f506ecb00dba971220f1c1c7a699efcbb6e27ee0932c27e37a
-EBUILD konsole-20.08.3.ebuild 1768 BLAKE2B c7a75d4410444e4d8b6d1f676ee178005a2ba06acdf62d94b8fce4eaedddeab6d86bb91d0f915b10a93a066b4417a982ca1d53319f830122fdee4b368e853be1 SHA512 7fbd1923dfd5ad5422a89a65f4679d4d86b9643853fa2325fbfd4677ae10f3ef24b250387eec47ad68e869ab54e2dcc583d23addf35402b6aecbea161f28139d
-EBUILD konsole-20.12.3.ebuild 1771 BLAKE2B 9117472b5ad2fb8a8cbd64869302d0552a454fe657d630a43e50b3ab4502dacd05953796ddb4f22d911097bf09125205c83918f8f00421b5115aa898e67eaf30 SHA512 5430f1468dba5d2d640ae721f2993aa21219aa5e575693acacd9407114cdfe1f55b06e645ee9c379f12513c8e0f76cb170f44a41c5f6886bc0ae267dfa6f51a7
+DIST konsole-21.04.0.tar.xz 1276124 BLAKE2B 40617f81d8204e5c8a89a21bf47338c4cf9c14c6a7bc68b696d8d9ad6613fc54c0f19684aaf2d99ff54774cddd97e9393517877aa565383d1df051e9471e535f SHA512 35cb9822c442bc3dcec0539451f2bd1672c27ea522a2dc412e7cffbd805497c58711a9035e2af3ba5cb804dc42da5563bb3a6017774d22000870bc9e7450402e
+EBUILD konsole-20.12.3.ebuild 1768 BLAKE2B 2ce4ebeaf5696ee86053793f877c8a48a912de4adddafbe69dfb61b561b1c253421784a7d70a3129653cf297f09571aa5fb1c85df1accc53690279274eda75d8 SHA512 30af05b642a7f7c4afd2a92d20cec2085f0f4c7a07526e7edb996f850718fa951b9354d5f6467cd4209d3c69468db3a1767827a14a546847d13a61ce75f3f8db
+EBUILD konsole-21.04.0.ebuild 1801 BLAKE2B 8b030795ca90844c899e976c7885171267998999b160b4a5b674831f176cc34d68463d639bc6117850f33caec121553299b54527dbc9b832dcd4b6f3e2e7bbe3 SHA512 965f20dbf5ea0d534e41dab070bf1e23544df94d98a4af715f2fcab3309d6481f6596a6a38308749ec3cb2ad237f8429a2a535a526947f27d21469d0289d7d7c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-20.12.3.ebuild b/kde-apps/konsole/konsole-20.12.3.ebuild
index cbbb0403b710..b539550807b1 100644
--- a/kde-apps/konsole/konsole-20.12.3.ebuild
+++ b/kde-apps/konsole/konsole-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/konsole https://konsole.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/konsole/konsole-20.08.3.ebuild b/kde-apps/konsole/konsole-21.04.0.ebuild
index f2b53daf9ebe..701329615e79 100644
--- a/kde-apps/konsole/konsole-20.08.3.ebuild
+++ b/kde-apps/konsole/konsole-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/konsole https://konsole.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 DEPEND="
@@ -26,7 +26,6 @@ DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -52,6 +51,11 @@ 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 a94fb9eaab53..741aefb41450 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-calendar-tools-20.12.2.tar.xz 224864 BLAKE2B 137a0d975242b2e419007ebc9be0eaac55e5f024b708c78fb773158695a0bb0b673657b8634423826eeba03cfdab75ff7e85bcc6ce09e33372a0927490d0b9b8 SHA512 12ed3517ec1a308bbb80691bb1fccf29a2a44c9715436288f51aa5eeffee25c3842d6664c1bfbe7c2ac669806d5ae0f0123bc1dece279953abd95feaafafff81
 DIST akonadi-calendar-tools-20.12.3.tar.xz 224860 BLAKE2B 0f03e653c6cde40a1288fe24d92d612e238768fe38f9c10e7ddf0a20c18cdc8ce44c85e416a0535bf45a8730dee33358a8027a2c7a67442e98d65066de5c3109 SHA512 5890454e49f4cfb04e3edb4895eb4f4f7abfba691185ccc9b9b3c3efc3d675cfe8c7b493b3378143d5da552ff784a391fd194c7107e4ddd11434aa3c130e5d56
-EBUILD konsolekalendar-20.12.2.ebuild 988 BLAKE2B 54dcb262eecb185862eb4d649f8769c3876c5ac22f1dd34e660475ee9aa2db549811fe85c0d1d576a51a10710a1d21537c37ed5c2450ecd2da8e124017486664 SHA512 48e91613ddab34df79224278efe0ae758d8c1b53b94d7565e8d44687471f31e26f98405c4000b2da76e247a0dd892d83fe7e348249ea6395cabe82d81acb38c1
-EBUILD konsolekalendar-20.12.3.ebuild 991 BLAKE2B e969332bc9c7d9a2e416bf41cfe74986247ed971d0c94cd7852b119a830c048c677be839455415aa0f4f14896b69901108ed05e2903a67dc04225b25b00729eb SHA512 ac8c9f01e15bbd7053902ae4ee8aad6e13afbbbe09b6828356ba9d418df823023dcda472040e992bad280fc18728f06cf19ba6f3a5ce25cb54e797807e248949
+DIST akonadi-calendar-tools-21.04.0.tar.xz 228368 BLAKE2B 559106c1042eccddeea6c311faeda95088f9dffde304d59bacc1cc49cd8a0ec66e9875249c12813602e02ad09ea6dd94b350a7c056e7e5b8f769a5f7af3d9d90 SHA512 8f159cb3fc41b26bec66fc4499e19835a6935d84cb7cd9a95468b7f2fc6dc72de848b0ade88b83780946c222f8130bc90cac8de879d0cb669d5a9a060085098f
+EBUILD konsolekalendar-20.12.3.ebuild 988 BLAKE2B 54dcb262eecb185862eb4d649f8769c3876c5ac22f1dd34e660475ee9aa2db549811fe85c0d1d576a51a10710a1d21537c37ed5c2450ecd2da8e124017486664 SHA512 48e91613ddab34df79224278efe0ae758d8c1b53b94d7565e8d44687471f31e26f98405c4000b2da76e247a0dd892d83fe7e348249ea6395cabe82d81acb38c1
+EBUILD konsolekalendar-21.04.0.ebuild 991 BLAKE2B 27495fbfdfca956a8e625e8ab94a9506a03635d4efe3bcf01deeb1727e5bc4112f2348b7428449a73cadeaff682e2b7e883f15bb1688d0ee3e4a79abb7ffc8a2 SHA512 d2b66906f9b578f6c4b261eae849642215e377bb24649c717e2aa3c18c2925c459296e5cffca5825b816d40d84bf7762f68da9249fed9051a3f5ce2643ad98b9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-20.12.3.ebuild b/kde-apps/konsolekalendar/konsolekalendar-20.12.3.ebuild
index 64a6a8c373dd..712823cc8e75 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-20.12.3.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-20.12.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/konsolekalendar/konsolekalendar-20.12.2.ebuild b/kde-apps/konsolekalendar/konsolekalendar-21.04.0.ebuild
index 712823cc8e75..706a5c6fb40d 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-20.12.2.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_ORG_NAME="akonadi-calendar-tools"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 inherit ecm kde.org
 
 DESCRIPTION="Command line interface to KDE calendars"
@@ -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 9032f8202bd1..5534ed4e11a9 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
-DIST kontact-20.12.2.tar.xz 790952 BLAKE2B 8d5a126d62e1d1cc151705bc2ac843625d866b1aa70d63d012341343dedcf0664b0c3e40cb99561f27e71ed4120357c2d9dbf0705673e74ea8dd9161d31c4d83 SHA512 52adbf4f201eafa819b17a88be5e409de5a06bb34e755f57c638b2cc315936fb7c8214d3242f2cdcc62924f44c416215acb1bb4da1a43641d996d3eb4ce44e19
 DIST kontact-20.12.3.tar.xz 791076 BLAKE2B 1f0e9fe2abb9486049a9aaac9d0c70d51e10a80e32e2be2ef5ca42d3a97c1e63c4d57a28e167e4452577d088ad99e86cb0c20ce93eaae06afd6c7b40721ab489 SHA512 a957917a175b2fbf33bd15788e1c9e93520e13fc7f9204b91d317e9c99ef03a76bfa71a5e1651b24f24d3cf8ac663e74b964362f65515073170d55ac335eb23a
-EBUILD kontact-20.12.2.ebuild 1449 BLAKE2B b5a4347a7e1739d611182891818210de92d6740cf1068dae776f7ec74f194ddbd2e0ee54a1aa9367183a17d91fd54ad29c67bc2b67d258f3a371940284787727 SHA512 45d3b09761546a791093b9ac7125fb8e6791c03c9219e236064e9c633e121a769bf00d21d70a830ef1c91339324bc3a8f4ed18253d2a1f8c6a2c26dd81ae2089
-EBUILD kontact-20.12.3.ebuild 1452 BLAKE2B c44ff73078c7882e09b02733992b97923a7ddcc1e5697e43437b2cc29c3d6576d1ed889fe820f3c81734af5ca3ae12df8450898ee1125ff1ff821bc100420fc7 SHA512 3d43464f9370d608b32a0a4342b31902f1a55be9d1bf133af7f5dbdc958337c388aba715cd9c7123f7ce9ddf7cd377fc09b8350bc0138ef98ec61dd7eb3586fc
+DIST kontact-21.04.0.tar.xz 794412 BLAKE2B 3e44614913c54335dba652e60f98be00b58577a861cab3a45b98a20c70c396a61688f6a76983186186f97d9b216740ae2d683179588faef3eb9681ca2e0290da SHA512 0ce725ce483e3678b87d0281dde3df4ebb66e33a3215a133078d2492aeed827ea0ba78074829d634cf31f99d60a30c2abfcd786eaf2572a7dafc051c55baba52
+EBUILD kontact-20.12.3.ebuild 1449 BLAKE2B b5a4347a7e1739d611182891818210de92d6740cf1068dae776f7ec74f194ddbd2e0ee54a1aa9367183a17d91fd54ad29c67bc2b67d258f3a371940284787727 SHA512 45d3b09761546a791093b9ac7125fb8e6791c03c9219e236064e9c633e121a769bf00d21d70a830ef1c91339324bc3a8f4ed18253d2a1f8c6a2c26dd81ae2089
+EBUILD kontact-21.04.0.ebuild 1452 BLAKE2B 9437f2d524fa9d67fb05342d9761c36ef1c753990339334dc6cb55719793319b2d982e7bade8f928785427e9b75812be195825eb241e72199bb799719762b64e SHA512 dd042fbbca7fb8bdec59be29df092a244a6163c80eb70b40465661e91721245c6257b33501c2f79d32949cfaca566f7a311438babdf33bb4c78188030cc8f2e7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-20.12.3.ebuild b/kde-apps/kontact/kontact-20.12.3.ebuild
index dbc00e1e0fa4..77e83bad0295 100644
--- a/kde-apps/kontact/kontact-20.12.3.ebuild
+++ b/kde-apps/kontact/kontact-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/en/en/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/kontact/kontact-20.12.2.ebuild b/kde-apps/kontact/kontact-21.04.0.ebuild
index 77e83bad0295..b8deba9a3ec2 100644
--- a/kde-apps/kontact/kontact-20.12.2.ebuild
+++ b/kde-apps/kontact/kontact-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/en/en/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 28ba6d8fab1c..6306b9fc508e 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
-DIST kontactinterface-20.12.2.tar.xz 36072 BLAKE2B 4281849413b64fb3e62048b0a8089453071c617ded3dbbe97d055d4eaeecd5346a36538e2c2d14bfd74ecfd1f051278d203ad008c92f4ecb84c6571f00e58ae3 SHA512 dd0ca6de301206e661ef217209fd4bc2b9c925eb2d191487931a3a187d6d511e661cc76767ad102a1fca6c6e0d73e87291beae99e165552447bb578c19c4eac2
 DIST kontactinterface-20.12.3.tar.xz 36056 BLAKE2B 0e8c31f1c7a0efca3f8e77b1cc577098aaf64ef21e50eca96dd292347ec9dc5eb2306313b30a8d210dbac4dcc29a32366c8259da1d985fc94dcf5a084f154724 SHA512 619b68a856e14795241e814cd148660477c320a10ee26f198aff83f0828861b718dec542cc28c161de0a771c5b36c4241585d2e67c17959ad04def346438b71b
-EBUILD kontactinterface-20.12.2.ebuild 711 BLAKE2B f04847cf4d4c9a276c73cd02e455b66c9f201680afd9139bc86bcdd2303f0af9ff77bcb1dfe8faf09ad526bad33b178882fe47e1b00501a5a28aaf210386173d SHA512 5afc7c99e78f422ad273ca56b07502f0cad91f92164751b928c8fa0b7bc1f5e4936fa27f6b378e2a78e4bd2f5388d8a3c0be6888771684c5f08839492e79f8df
-EBUILD kontactinterface-20.12.3.ebuild 714 BLAKE2B ec29a361b1b2f46451332ae272bb7acc9f9330cff0d4c0b856771052cdce045e32b5d51941b1470852cf92edd15278e8a3c55f962c4add97bfb1c5c2f584ed8e SHA512 b5f448fb8bcaeb5b064cf2415af8135cd1e8ef4162ac31d51c27cbaf5b1a6a4b7a2e0d0952b98441223a8b737c5c2e727ab03bbbec02cf94c4e62f242ddf6a83
+DIST kontactinterface-21.04.0.tar.xz 39912 BLAKE2B e7546e697a83ab5bd8927f0ad331c3cfd5c2e932b30bda1e39dfe56379e7e284fbb15c64ad83b35cc52290f2cea2d3286dd06860cda94f896ee2a1f4cb74cd86 SHA512 16b414d13f44f46993bfe45606ef732529163f8b4e405c092bb0feff3c8e5017c26bc02b2658f37c20c9aa93524a789a747c66e95f54577306083abccfe3dd33
+EBUILD kontactinterface-20.12.3.ebuild 711 BLAKE2B f04847cf4d4c9a276c73cd02e455b66c9f201680afd9139bc86bcdd2303f0af9ff77bcb1dfe8faf09ad526bad33b178882fe47e1b00501a5a28aaf210386173d SHA512 5afc7c99e78f422ad273ca56b07502f0cad91f92164751b928c8fa0b7bc1f5e4936fa27f6b378e2a78e4bd2f5388d8a3c0be6888771684c5f08839492e79f8df
+EBUILD kontactinterface-21.04.0.ebuild 714 BLAKE2B dd88ac0db1c0f5b7acc23c14c5f19e2a8c95a631f1f8cd31454cd8b6b052067517579bcba0e740cd3e47953177601809c4ffcb42ca11d27393961ca2cc7333fa SHA512 fe2878841663a10dd8b2facfc2d90b2334ebe371a0033ae08345dfc919bb2cb6b05165ccdc1fd8bf52943d2e1d95d7972c32308db9061e4c8bd26c9094cdbe55
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-20.12.3.ebuild b/kde-apps/kontactinterface/kontactinterface-20.12.3.ebuild
index 13294a8e276b..779d7c25edcb 100644
--- a/kde-apps/kontactinterface/kontactinterface-20.12.3.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontactinterface/kontactinterface-20.12.2.ebuild b/kde-apps/kontactinterface/kontactinterface-21.04.0.ebuild
index 779d7c25edcb..16443cfc72a7 100644
--- a/kde-apps/kontactinterface/kontactinterface-20.12.2.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-21.04.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -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 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index d5f0097c7fab..a40d9a94b82e 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,5 @@
-DIST kopete-20.08.3.tar.xz 9385476 BLAKE2B 5c465bd4d4408a396910697dbbbb87d64b826317d34c0d9e6fa1683df21b3cb02a605af32473fec5a50f87d0d22068cb90e66584c0ab1816410fa2c4c81db7cb SHA512 c888864c11ed108ca2f8b49b35d8354c6619ed5b9295be2680c89647ee78c76163f1c2b8aec8ee5effb8f0179d9539ced39094c603d41f9cbf4437919c1162b4
 DIST kopete-20.12.3.tar.xz 9380060 BLAKE2B c9d1f648a924920984f9ddfd8e5d174f034d3621ecd0468debd3689ae3261da32de2beb297513064bbe23477dc4d395371e02761c287302854f582096eaa2984 SHA512 0948547b0e67e67bce1165beb8099ba4c57e3803dfcb37fd6d547e132a449a484bf523f3312aca8cb4477cae8e8c984859313bf0b72bd70799d46e40e510c9fd
-EBUILD kopete-20.08.3.ebuild 4597 BLAKE2B 42d9f3d1d9b8322f36125dbde7eb874f449c67829df41e696f538e11b2e98cbf34019cfeffafb4bdca456767e16bbdebf8ff5ae8ae9645be391679090f7bfd6e SHA512 5872256074c3fd9650442446517e9d8f533fb18cb1672bc24f9d1b234f6eeacf74e17b80706bad8c789e9e25ff4a4a97d02c1f13aa7bb430b3f4e1dcfb4f5e68
-EBUILD kopete-20.12.3.ebuild 4600 BLAKE2B 59f8fe445da5cb48f4537b8a3683e4bc53b76d9218bda7e61b6b3323905958c3b0d2c8d93f2408e97f9128a3f71f86621ce1b1c549b86e6b0a4afd4a49cf03f9 SHA512 b983d79e819e3ec317d7f74572571ffb204aad2680b6e60054104dc9c2fdcd37686e873893798e5aad1f0f5b87b359e879eb55d14e725fedbc7971e119234806
+DIST kopete-21.04.0.tar.xz 9414048 BLAKE2B a1e2aded6f9082c582f5a232d2a6de98fc61656668c4dcbdb2e7e5734ff5d966814f7c46fb2febdc555ec3bb6f0018b9cd7e7c5b28b63855bc5d8016528282d2 SHA512 8f515210b24a7fe9efd26b702e1318adcb3b62ea4803f177b292f8a3283300e0e2b4a86a3de993819974c80767ebfe1c0522326423b227d21b57aecd1055c7ab
+EBUILD kopete-20.12.3.ebuild 4597 BLAKE2B 6276c231a161f7673e5b5d81e4dd05a4435635c672485c9c747a55e833b8bd847e4ce6e6c495c2fb34eddeca522129dc8ac1d3dc5986d510ca9639374b7bae1b SHA512 c1fd4f08e45bf7c25be4c9b28c0601961199dd82deb02006eecc86c7e754de67ba28c50f6b6f31b5e32ae7e650ac2618007dc11f853cd9ec719e21fc34236db9
+EBUILD kopete-21.04.0.ebuild 4600 BLAKE2B d2743a4404ce77a26f3ca8b9bbf48f6c24b71acb699ac87380bd12da13f553beb34464984d6fec9054a48314fb6fb185e6303c33408597bf9c36e136d999fb5e SHA512 01950fbe67c27103c7281096fcbf64d180c56da292d21f07f1fa75530e49d352a35aa8e14e853ba53219c0ca6cc35631bd343fe2a4d0ad24cf1102378ea8bd26
 MISC metadata.xml 2102 BLAKE2B 8d82dc772819389b671c1661ad0be0f97703668a6a940c2e142163f4f6e06c110e6d6146144d12ef04b37fb6eb06c57d0bdb766f2c8155848174529111933f2a SHA512 5ca6a22e974c0cb1a24d0dba5ae3f5ff2a860354d653b800655640679c179b90331f436b4ab62338e22e01e145b7c7df2cb9bba82ad8d02436dbbd044d1bfef8
diff --git a/kde-apps/kopete/kopete-20.12.3.ebuild b/kde-apps/kopete/kopete-20.12.3.ebuild
index 1a9c0849bb93..cfed64589cad 100644
--- a/kde-apps/kopete/kopete-20.12.3.ebuild
+++ b/kde-apps/kopete/kopete-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kopete"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="ssl v4l"
 
 # Available plugins
diff --git a/kde-apps/kopete/kopete-20.08.3.ebuild b/kde-apps/kopete/kopete-21.04.0.ebuild
index cef1a12bbac0..0f4b665dba82 100644
--- a/kde-apps/kopete/kopete-20.08.3.ebuild
+++ b/kde-apps/kopete/kopete-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kopete"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="ssl v4l"
 
 # Available plugins
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 5c60c5a8d997..a60b873b6c6e 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
-DIST korganizer-20.12.2.tar.xz 2246456 BLAKE2B f4126345fc0cdaf44f31cea13621a821677f45710803fa34bc818b6b5aa086b2776cc6a67118f8948f09c05c06e0132e99d42b9ffe2ce64f2d3c8451d98730ef SHA512 0170efde8e906ccf9f68bf18a08b44ba49a04bc75211ba8c328b6960b7bbe2e33f58eb614825bf318685e4f5aeb579c214da5b60b7fe478a989f56c4fb31beab
 DIST korganizer-20.12.3.tar.xz 2246496 BLAKE2B 7235c2cfaecd2368ce555c24d3742c8ea406b94bd53e642791d4ff7121bf0d1156e581f186d57daa11c40d4d3357ef7c44d1aaa3d9535ca33f9289df04f821d8 SHA512 3b8b7026704acb1afcdf83d3a0c8e0ea01ae4a2ed6f3667a7e2fc504cc2189395b6967b7b7ae36dcd0b92ab88451c6ad5e786a9b5f5cdee594cc03a9a328f974
-EBUILD korganizer-20.12.2.ebuild 2797 BLAKE2B f3eb82c68b93df6b889d4696dbc7052acb94cd527ea28f6e64ef655e1fcdc3ed5e50f1ee643b38ce1f5ce0a4e521a2b264eba1c86d9e4170d8c8338e7d23fc4f SHA512 5ad7603708e4690010093393cc5382524d9c4d569ddadc61ae36eeef4ada6c0bee9f1df4cd03ea1acd299234c586591cb4a6aa93fef6ac1b9c0052d106a279e9
-EBUILD korganizer-20.12.3.ebuild 2800 BLAKE2B 1ada38a1e8cb414ecf03c5a1e953269fc4c0204f8abd6850dc3e2e0ec8b71248f11b52d8a8336c234c7da95674a4d2628f2e6d347e87cf88a563d822e24cf83e SHA512 0a5b255979a235d9112bbdcff9762613a2237995d341446f0518803d7c8a9c7c2eccc2c9e3c07a3280fc6e1011f16aa9e14ea36ca14aca1d3cc76740e9dde099
+DIST korganizer-21.04.0.tar.xz 2324568 BLAKE2B 6161f43db2ad5d9661ba9a146d395ca32f0cf75ba7fa385cabf060a25ecbdf8987a330bf2d4170517edb9eda948ebe3eef8e60a98a136555a524ad2b65d286b9 SHA512 cfc3eecf3e29780dfc9fcc95be7c966446d08c6330f266d9d5513a98c460c48e423a82907d6bc77ff1598d87862f4a772fd88f5facdafe99ba5dd159f456028f
+EBUILD korganizer-20.12.3.ebuild 2797 BLAKE2B f3eb82c68b93df6b889d4696dbc7052acb94cd527ea28f6e64ef655e1fcdc3ed5e50f1ee643b38ce1f5ce0a4e521a2b264eba1c86d9e4170d8c8338e7d23fc4f SHA512 5ad7603708e4690010093393cc5382524d9c4d569ddadc61ae36eeef4ada6c0bee9f1df4cd03ea1acd299234c586591cb4a6aa93fef6ac1b9c0052d106a279e9
+EBUILD korganizer-21.04.0.ebuild 2800 BLAKE2B bd20d88e76b427d68dcac80a56d282076421a01390025b7d137012dd28efdd36fb2404333a38a2df68a04a7850a0ad2f5f989418face5b9a292b3deb2c58d507 SHA512 bef0fba5080771bcffa6a8fab69a1df0982ef965990a1c20806b63b2afeb9c1a2ef50b63161846ff9b578ab606fa7e46bf3033fbb5649a8b55cd480a3f80b6ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-20.12.3.ebuild b/kde-apps/korganizer/korganizer-20.12.3.ebuild
index 3bfc463a4e46..50d67663f6a9 100644
--- a/kde-apps/korganizer/korganizer-20.12.3.ebuild
+++ b/kde-apps/korganizer/korganizer-20.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/korganizer"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry X"
 
 BDEPEND="
diff --git a/kde-apps/korganizer/korganizer-20.12.2.ebuild b/kde-apps/korganizer/korganizer-21.04.0.ebuild
index 50d67663f6a9..9f6a76847877 100644
--- a/kde-apps/korganizer/korganizer-20.12.2.ebuild
+++ b/kde-apps/korganizer/korganizer-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/korganizer"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="telemetry X"
 
 BDEPEND="
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index 30790f974bd2..9a32e70f0e22 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,5 +1,5 @@
-DIST kpat-20.08.3.tar.xz 3585132 BLAKE2B a73a17c5f14b328e1125194285b797f09de37afc24485c3b53f5ba803e58ca5eb1a80118ab93b69097f9e70ba15bb7730964c5bf983afe53bac8726b98dcddfa SHA512 773df8e2b21119c027067a386426dad3b818abd340c1fffafc59d87f2026536367a27436a2cf18475ec0e5c8ec967a7bc1288f21e78abe87fec0fb83f1094387
 DIST kpat-20.12.3.tar.xz 3584892 BLAKE2B 89f8c74adc23a7b11ae34a790caad61f12939d2dcefbb7e9d7ebc162e8331e78082e2809171704647c0bf7739e8623f7f2b2e3f61cb13a745787da91aeade85b SHA512 d299fa951e171aeb45ca2b543e2eeabbd8451311446e685573c8306f5e8a34c0caba7017f2523c7286106a48f51f9f19f3723d71a2df8a19d9d51c21cfdaf23a
-EBUILD kpat-20.08.3.ebuild 1114 BLAKE2B 3269ad442a36543155531bdea7a39e50c3c06d87e98ef4b0e1c0f212ab0812aab08219110369315f7eca597e5ed187ab29adc87a1c260a20d465e9d50322c2a4 SHA512 2eb671b4caf6b314bcc51be2c54021b6f6d9526fad91889c79243d58611d6ad7809e62b221fe11bf8143b04d53d7091c74ee383a462c35dd5b95d2069a2c1b9f
-EBUILD kpat-20.12.3.ebuild 1250 BLAKE2B ae25183708dd96a7ece5d205988e9da1ea5ed23f28248f52a90efec5a281ed2d3e4d82d025f2c938af1307bd34fda47e35e290bc71968d1bcd476f1cdcc9a90a SHA512 43d0b27d64fecf3a7996f72caea6883ead96afca09e4034d4725a169bbde496f589c20aeda7433e03f46666343fc011412f147b4923b2a260c46a2c05877d635
+DIST kpat-21.04.0.tar.xz 3648792 BLAKE2B 7762e26628b68baf5e53b7cbf0afe1c7585cdc87c7a72c6cd447fa437bc4b57b4df07ba516b566e93104048c2b4e3378585bab946ce273b6f9ed8c8f34bf2dd4 SHA512 f5d086e6369929860fbdf31fd1213981c952039ca0e841539f042553bebffac991b33c52aba7f4b73bf88783da7d85d296d744d48751f5cbd0598cf2ef9ca685
+EBUILD kpat-20.12.3.ebuild 1247 BLAKE2B cb3ee625280e767bab4257b00b7e2c41101ab06a7dbb50cb8fb3242981d3b159f67c9eae351ddd319859dc183bc477f840d846b73cceb92b8d7bdfef46d282ad SHA512 8f6e13354fea83f5213da97265b405070716c16a498a802bc4d40925b65e0e91699fb9856268a791386fca3f358b09ab60acd418c81ea9cb514427ff3a96187c
+EBUILD kpat-21.04.0.ebuild 1250 BLAKE2B 1d1e3fb06619ac058508d05b246406b263c57a190e577e59b428ae351860806000a77bf8f6c311b4ddeccb3915e0c11e86599816d940e077e3c51db915714720 SHA512 01d0fc8add628fb2ee54e458b41ecd20c3317542de70ffb126d97279e661e5145190725d744d6aecc069c4176618aa2f1529b2172ec53471c520b9271c45e755
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-20.12.3.ebuild b/kde-apps/kpat/kpat-20.12.3.ebuild
index 71dcd0feae83..0fd231f5396e 100644
--- a/kde-apps/kpat/kpat-20.12.3.ebuild
+++ b/kde-apps/kpat/kpat-20.12.3.ebuild
@@ -18,7 +18,7 @@ https://games.kde.org/games/kpat"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kpat/kpat-20.08.3.ebuild b/kde-apps/kpat/kpat-21.04.0.ebuild
index 0092ff1c91f1..41cb3ab0ed5b 100644
--- a/kde-apps/kpat/kpat-20.08.3.ebuild
+++ b/kde-apps/kpat/kpat-21.04.0.ebuild
@@ -7,8 +7,8 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.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 ~x86"
 IUSE=""
 
 DEPEND="
@@ -41,3 +41,11 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_BH_SOLVER=OFF # bug 733502, requires unpackaged dependency
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 48431971e129..383af75ea15f 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
-DIST kpimtextedit-20.12.2.tar.xz 201248 BLAKE2B 8ef6a248f86ff4003a28e6992b19545d75f5be33c134d6fee75cbd5bf5f048a7a2d6902c61627342ec856df07d994f93c22b9ec697a0d487320463e84f77d4dd SHA512 680ceb87a508d25b34f2c20651e44381e3d631797cfbec30646497e2a1fec93eb600f10509a35815931faaac8305d73b18aa9cba68065e1a79dee0d10654e52d
 DIST kpimtextedit-20.12.3.tar.xz 201292 BLAKE2B ec0e0e1b22f2f061ce7bb21dd26ba7015cb85f1cee39af8d4ebc62bcb92a06ece7a803c4a865b3fba0b0f9b501c274651e53ef2b63d83dfff0835886cf68cb29 SHA512 8a62f79e909d4d434766151b5a53f024252fd6feca94bead809ed5f2a5b81a544563bff15afdcc3c9b280ba51e7f96bd643b490d88c0e28dd7fa378168cb1469
-EBUILD kpimtextedit-20.12.2.ebuild 1023 BLAKE2B 1ee0d8f23b0957a3add29afcb5ce9d77ae15f2bcdbca5ee0233c67d2861935e1bbfb35147b8f92f9f8105f937cbcf212d255c2eedda08db35790038fc447d2c8 SHA512 f4e16496e37087fea8b7819af5a5f13f551bcde337dfbab1c8be3b157aadf5511a5da7d3ead9846c56d2d6f9b71eda01de2fa1c5971ed33ab5bb9d56683c7021
-EBUILD kpimtextedit-20.12.3.ebuild 1026 BLAKE2B a6d77c41ff0161d6d8d4ab38e6bb65c59482f8e88bd124e87e7152315768fa6623dbc0fcc44746ac91d64e16e28b4c9b049a0638e923ed74dacbd558adc8c6bb SHA512 9f4bc71275a302a1a2389cb6fc0d39d827107349bfd105c64a998d69f399ebd8ba1e56771a632d62a5ff024b62060fb9b7932b06962cdda9327840bd6986b80a
+DIST kpimtextedit-21.04.0.tar.xz 205080 BLAKE2B e628c5384424379bdb757ea37bc5acba67f8a414d73a18d1c9e8639122aca59f0717e945e89d8e78ead907cd423ab90682b35e6666e14672067c871d7e0cac23 SHA512 e546d431c326d0a0e3504248d99ac0dae4213e36e3fe1c4bb6ad8509e0198c33d9aa277270a4b341e519516d0b23aff1ce3cd8abce815d57c4c04d15a5b1509f
+EBUILD kpimtextedit-20.12.3.ebuild 1023 BLAKE2B 1ee0d8f23b0957a3add29afcb5ce9d77ae15f2bcdbca5ee0233c67d2861935e1bbfb35147b8f92f9f8105f937cbcf212d255c2eedda08db35790038fc447d2c8 SHA512 f4e16496e37087fea8b7819af5a5f13f551bcde337dfbab1c8be3b157aadf5511a5da7d3ead9846c56d2d6f9b71eda01de2fa1c5971ed33ab5bb9d56683c7021
+EBUILD kpimtextedit-21.04.0.ebuild 989 BLAKE2B 79772323ec3512f0f417143e8f6b1d4ef82247b808763ebd2d48fa5163d3239064e0974cc2e5f8145f68416a4e4e6a5cd6a541ad78398ae8d5fe0592badbe164 SHA512 b63fc2d79065cff544fd5b388f751714dd4a8e2d28cd7952df6924cb825bbd2760aecc2deef705ddf450dc0f289a2164e7d37f30b042feffe605984398f5d9fb
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/kpimtextedit/kpimtextedit-20.12.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-20.12.3.ebuild
index 1f515663b190..f3df5b26a4a6 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-20.12.3.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-20.12.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extended text editor for PIM applications"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kpimtextedit/kpimtextedit-20.12.2.ebuild b/kde-apps/kpimtextedit/kpimtextedit-21.04.0.ebuild
index f3df5b26a4a6..2b835be9ecbf 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-20.12.2.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="true"
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -14,14 +14,15 @@ DESCRIPTION="Extended text editor for PIM applications"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+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/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -37,5 +38,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
 "
-
-RESTRICT+=" test"
diff --git a/kde-apps/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index ae78197e253b..c94549ca7d8c 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,5 +1,5 @@
-DIST kpkpass-20.12.2.tar.xz 23448 BLAKE2B fc39aeabdb73118aad1fa7222e726f24fed743da5b27fe94b2e178c53e7fab20e04d3373015160e0ae73d0c6a51fc5231a97860d2ace55e42caf1bb91a45b6dd SHA512 a5b858f802131b84632fc1c898a76d414b12ccf341a0a0f7a0850555b91a2e1a26528e6833c084fea49dc1b4054735311a318184afe580e87979335cc2690267
 DIST kpkpass-20.12.3.tar.xz 23448 BLAKE2B bbc558cf7429e171bb60cc754aba324f9efa43749c0f03a8f00aac78eab1a1f05d03782098c17531edbc7ca6db9ab1545bbccd739178230c35e4db0019a2747d SHA512 3a2b1e82e0078a99ff171502d38195e8366b665db3d927c385319a5faf5f1c3bf5d2dee9c8791acdf73e06a52a06e59a2e1d9deacadde767271f6cd37f6c00bd
-EBUILD kpkpass-20.12.2.ebuild 472 BLAKE2B 8007902fb89362fef1ba7038d469b4a97c85181d4b0320d641de62e30efcd4683615f7b5f779f9720d3bbaea0b294d12014e8908fdbbdc53897fba27cccee492 SHA512 55084a75e5fb0c2d27d6b2f2ea9ee550e7b6bf2644dbb35c8bcccd26319280cce3401130f7509e2a139b9d724a443926192928a675c10f4d0dda704177b6eda9
-EBUILD kpkpass-20.12.3.ebuild 475 BLAKE2B 86fa7df4d957774712cb4167f83921de4ec8dbfbd47c10d61dc934dbd419fc0ef37ac6b4fdb33013b6cc70add7558bdf2d295338766ef20279c95073a5c59363 SHA512 960dc93b7ebb84ce96a7d4be0282ebe1fc8bcaa963bbacb3847783df0edbbc4af234c6a2bb405104aac10501669d012a5d81b51cb61dcbf4543bb0e4c2f96a12
+DIST kpkpass-21.04.0.tar.xz 27360 BLAKE2B 0afc5b4bae7fe20d708984afda8cff473c8b54a66806c795013f4caed3af320d0b7faa44306903ff59f97696634e3d92a9dbeef1bc3ccc588f3ef0fcc69e4b18 SHA512 d9a4b2e929eb89c2318a02ca409ed805fba417054e0fb36286d3b65911074dfc0c32a52cf8471be333e7c4bd5e21b67b028b4cb5e57c290aa5ac45377b332916
+EBUILD kpkpass-20.12.3.ebuild 472 BLAKE2B 8007902fb89362fef1ba7038d469b4a97c85181d4b0320d641de62e30efcd4683615f7b5f779f9720d3bbaea0b294d12014e8908fdbbdc53897fba27cccee492 SHA512 55084a75e5fb0c2d27d6b2f2ea9ee550e7b6bf2644dbb35c8bcccd26319280cce3401130f7509e2a139b9d724a443926192928a675c10f4d0dda704177b6eda9
+EBUILD kpkpass-21.04.0.ebuild 475 BLAKE2B 48731fd71a88487782f1fa2527f1bb59d8fc997b3ef1d33098aa4315c324208421f8aa88d53b1d2da6168329404c92bb10147004d5a65c091e5b6be496411f1e SHA512 83791e943ad9eaea6b4f62edfc621acc1c6794730bf53e3b96e5c473c1c1e1087d4f5f1cc583e3ca2fd81a3c3ce500de8f6596d025c4b884d405ce65b3d3a766
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpkpass/kpkpass-20.12.3.ebuild b/kde-apps/kpkpass/kpkpass-20.12.3.ebuild
index c6997dcfa7d8..b7b5eea883ad 100644
--- a/kde-apps/kpkpass/kpkpass-20.12.3.ebuild
+++ b/kde-apps/kpkpass/kpkpass-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kpkpass/kpkpass-20.12.2.ebuild b/kde-apps/kpkpass/kpkpass-21.04.0.ebuild
index b7b5eea883ad..a7ec44be7080 100644
--- a/kde-apps/kpkpass/kpkpass-20.12.2.ebuild
+++ b/kde-apps/kpkpass/kpkpass-21.04.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/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 535202671ab1..ee6365f53f7e 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
-DIST kqtquickcharts-20.08.3.tar.xz 30132 BLAKE2B b17cff303bdb62cd1ea02eb6e116b45339a3596c1c0d8b5fbd81f48ae450c4e5adb0937e8464ddf8330e4eb9c7fb4a8b59a9b03109f882b61921de1f18958e0a SHA512 9f29cd2356473d98eaba13e8fb5716a2bfb4d029766a207021cb19432d22e05ffa6e3f501136216d07e7705e258eba7ccbc5a6633bbff0b3d854b731a15760c6
 DIST kqtquickcharts-20.12.3.tar.xz 30080 BLAKE2B b3ea86c409806c8024fb27beb6aaf3d2760ab02d3e449bcb8d0ec45f473020606dc3f9e38b22e8e36ee2e0e617d178e7f69a95dc168348c2ff7a62c3be17ab4a SHA512 e3b02ac20b20c9c2d85f3006efb654af42154baf2d215373296bac1377aee889350cdcc2c6d0642d419285433352923fc280e72d6375127d3646d681ae3276cf
-EBUILD kqtquickcharts-20.08.3.ebuild 383 BLAKE2B 4ce7063bb8927dc4ce3e526ca56b44e8e8e3e7ef6e56ed987895d8874dd1cbfab25cf5a1c9cd3ea8b72674378e101ce29b0738875de69e09dc4891e73247ef38 SHA512 5a5c85ffc64a2d02e6fdaef5626085e1f597427dc07ab3936c94fb9e5738958435dba6c073a27f1de074d27a168bd3fee906d5aa9cd5a5d1c82754509b3d93ef
-EBUILD kqtquickcharts-20.12.3.ebuild 386 BLAKE2B f582910247b3b26af8122ab57d8559846976924e2343bb0d1c9b5a3749f1d623e67d085e36f461feb0092a12dff1285e84d959ae5d4c3eeece9c987f32ff138e SHA512 1b18b7b4fb6d0b4bac6d687c4e74e79fa777173e84504976f782e9ffa5c38fd327d47c6ea77eef80c8fa0d8849314bc6fd7f2165be05977dd29c7dfe2c55a7d1
+DIST kqtquickcharts-21.04.0.tar.xz 29936 BLAKE2B 631e3a30c3119caeb2f80a2c2de49e03e3f617e3327e15c0cb7449dda27e6d0bfd20923d826875f85ac86360ddf26fca4b4891f3b7549789ba75040ef4e17bc7 SHA512 8764c2d8267b16ba4e0778250952a1d01260c7ae4190741edbecc29458c227b7af876fd30290b1b24a437889abefdb38c367b21d020ca009fcf540cfeec14fcc
+EBUILD kqtquickcharts-20.12.3.ebuild 383 BLAKE2B 31a11a843ae6e87a5ec739efb0de0d319b67fde33781a981dcfbde59643cdc7ddd92c4bacea531f7d93ee477f30edcadf8098a1e228015f7f6e9256fb61c1009 SHA512 b70044f5f988742e3770929fea6e4eb32629d4bbb12d4efd0c86dee187e2f3d457d58d4964e1d7731c5f24ccf4536f2e77d9e75fc1198364efdb1ecb8e837beb
+EBUILD kqtquickcharts-21.04.0.ebuild 386 BLAKE2B f582910247b3b26af8122ab57d8559846976924e2343bb0d1c9b5a3749f1d623e67d085e36f461feb0092a12dff1285e84d959ae5d4c3eeece9c987f32ff138e SHA512 1b18b7b4fb6d0b4bac6d687c4e74e79fa777173e84504976f782e9ffa5c38fd327d47c6ea77eef80c8fa0d8849314bc6fd7f2165be05977dd29c7dfe2c55a7d1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-20.12.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-20.12.3.ebuild
index 85d519acf2d0..174e67dff4fe 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-20.12.3.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-20.08.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-21.04.0.ebuild
index b1661d331406..85d519acf2d0 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-20.08.3.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-21.04.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index f4ed2b9c1b7d..90488fbb125e 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
-DIST krdc-20.08.3.tar.xz 1564296 BLAKE2B 4aea277256abd89bb22c8e2d889ead66c587ff073bcdff08e9c05cad49386a2e58e8adb65e285e3f79846d15aa9f411ab5e785b4947c6cc588b1b489df9abda2 SHA512 3481e543432a4e0aeeb60218b95911ff27455172617acd3a7c11cfdda7785bf0ef5dd5b8e5fab88c5a7e134537ee7888ea4a1fc9a33df70c8a0cdd495c298ff2
 DIST krdc-20.12.3.tar.xz 1564652 BLAKE2B a98c021fcaff3b654a2da6c8c80eae0b6876273085aa78e774bf9470d3608a55f6cb7c5b841c49aa4080bb5aa2769fcb7cf80d396546b5191aa91a2c276d79be SHA512 bdf9fd7fd0be6925e6a547d2473ec78d073cfd252595996715f1216d1ff86a2792c995e708aecc4d9273dd605463bd769edffaf6543d0dffc0af910174789e4f
-EBUILD krdc-20.08.3.ebuild 1400 BLAKE2B 3d7ae3cdce85c684349d203c10224dc08d17f401d55a229f177fe178676cc5e1b223f5019950202678e2068809aa65227937c46e27a0e3da54f435882d739288 SHA512 bba50ac70620f224838d32497f5ae29a579d412a4efa05f0cd52ac445e1e06d15a53c65065f758e1a1b0a280c248ca03c8d0a7968000c9d854278151793151db
-EBUILD krdc-20.12.3.ebuild 1403 BLAKE2B d8cd049197d675e01c1a8103a4e02c7f29227a3c7fe4c173688f9170bb3d5756dbf0bcaaff62d5c2a359d0ea9b0424c93ab68aa51a9354dab601e0418aba490f SHA512 56c6896db867bbff9394d99aae55ef9a85862430a9b9ee0e4d71f95d6323c118d201f0dc70af2331f36ab87abb00e5fba2e32aa2f84d09d8591d23c655f4c768
+DIST krdc-21.04.0.tar.xz 1568412 BLAKE2B 075991e6d9f6bb07ed1e922e5b4f118584671f8f9f608990ca46cad63a0748d43df5df10fd7e335661c9c89b9b8ecdc2c5dcd8decc34a8d8a758754698b47b0a SHA512 90032d2c47e431fb13276c6426c65b70de90f8158d38a5f8ea36f21b6ef7b81158de90ab337124da88fdef85a73ba6471e4f2587839a8edfd59ffa6e0ae8ab39
+EBUILD krdc-20.12.3.ebuild 1400 BLAKE2B c2cf57055f177df47ca6c39013e53227aad695664fdf60d0ffd549b6b1d2099ca1dbd55df932119cecb3d7ecf0736c5ab694febe361e3e35dc7a5c5bf09b3fd5 SHA512 3e530e0daaf265b13c4801b9cd62d61fe2719a6f5420ae1a780838181361db91d90642c9e4f601b86ce629140748c7bde9c6d79a9ebb0b9a75935b564185943c
+EBUILD krdc-21.04.0.ebuild 1403 BLAKE2B 7ee357a6ffc3e207e3739bcb6df7c6b776c7e46e316a8ae3488a04d1e820fc5c2f2050587442707623ff573afe32fdac8767ac4bf59021aedc2cf4ce445b12f6 SHA512 d9dd77775aa8a18ab6966e332ba73eeca0318771b9814dca31a8a037c24e478cfe3b15a8d6811e6bcf23eb3a03ba08626f3e334eb16354d347222b03e640f622
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-20.12.3.ebuild b/kde-apps/krdc/krdc-20.12.3.ebuild
index 3cfc80343108..136489e0df33 100644
--- a/kde-apps/krdc/krdc-20.12.3.ebuild
+++ b/kde-apps/krdc/krdc-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/krdc"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 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-20.08.3.ebuild b/kde-apps/krdc/krdc-21.04.0.ebuild
index 96d898b4f10d..8a2fea467d5f 100644
--- a/kde-apps/krdc/krdc-20.08.3.ebuild
+++ b/kde-apps/krdc/krdc-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="optional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Remote desktop connection (RDP and VNC) client"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/krdc"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+rdp +vnc"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index 02a522a8c31f..87887229b8fe 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
-DIST kreversi-20.08.3.tar.xz 953152 BLAKE2B 6ffb801c0ac7c56dee9eece09e8db49c37022f232d831da2b6022a3b02f177b031683e628abe98b0ead70a99bee70f436a4d68cf13334ea804c171bf60888bac SHA512 81160d93de686d9389431411a25a55d5a45cb72bee0dc239cc870a5131e1f073fc62155414c934f1e3baa1d3a4e0de46b585777a027aa05ba98fd9cc0939d76a
 DIST kreversi-20.12.3.tar.xz 953588 BLAKE2B 6147c4e529ea3be0f678b24767c8d2c29b4db4c711923f350f8c31e2251b0359e4a9e311f7e48c05a4e549f6256027f84b791675bf3f638f72199480730101c8 SHA512 300704489db887d3738491a7dc0b62bf6d7056c803c778ea48bbb086c71b4c57a46517fe4350379982c2b6effd8fa8bfe109e506957905f168c341eb51e0dcd2
-EBUILD kreversi-20.08.3.ebuild 1065 BLAKE2B fbbb7a04ba17d883d7ffe745e114bd9a884dcc046931ebb0ab9dc2288ef60dc89c8e99959c5ff2e15ad04ebdbf8d088da59f7be61da12d171120d229224da96b SHA512 899233de903250d0aed307a22bd862bad02c2d1dd7d377b65d08b8f2d1587929ff1dcd4ec00d3a0dbf6727d4afd363169c99957ee2029756d928c7fd57036781
-EBUILD kreversi-20.12.3.ebuild 1073 BLAKE2B 1cb51f683576798fa5ceee326da8f2304ca6a2ad993bc31302718ae05d669f1668017730c7dff513976a8e9fb6ee22f2128f227e82d96f2ccc2c48a15ca68710 SHA512 ed79108ed2415c55725038cb55572fccd952a3fc3ae928286a23a3fa74eea7173fdf74873351b370ecd1bc4cfd6d141f7e05bc6c8e2e1521de37173ffd5a279b
+DIST kreversi-21.04.0.tar.xz 955432 BLAKE2B d10e9aa4b52ecc03eed297454597dc0fb078bac120da452007ed9abe8cc004381928c5787a1cb1e6e84b09038bdf33eb11c5774b44a54f59dd9a39888b7199dc SHA512 a28a2ba8ca07219f4a44576164f4a8ed5ce096c7d5dc01696a0e66035dc30e2e25c421198cd47d553bbe1ccd3a1488cddfade6ef86c77e0fafe0aba0914fe3d0
+EBUILD kreversi-20.12.3.ebuild 1070 BLAKE2B b73ba49c78a1af7b62908715482691fdd10c50dfdef850ba7c7f0269e9e375e94b1937aaeb373a98365b14870809c45da25c914749e98df1100ee4f193aca1b5 SHA512 08d9a07fc8c1befe2cddae6c7f785124d138012f3aef00dffe3114a7706b4e2cd184c56c9549761be1ee7b243e69f9f4ef40cea77a06a692422bfb4a08b153e2
+EBUILD kreversi-21.04.0.ebuild 1073 BLAKE2B 7a41056f1dd5b730316d0cb8578d2e2babd27eddb31572649d3cced7fed79eb9a5a6706d2efe87395b13d54861b2a0d1a6be02fd6c586b933d88da477f51b96b SHA512 2deb5fe797b16c964d48553bd0da6cd11fe984de3af2dae8c38444cc931da4874526b70467e189adcc1c5e09253d86d19ce7296d72b22488bcf8c7c64585235c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-20.12.3.ebuild b/kde-apps/kreversi/kreversi-20.12.3.ebuild
index bf536cc56774..a28e79a9fff7 100644
--- a/kde-apps/kreversi/kreversi-20.12.3.ebuild
+++ b/kde-apps/kreversi/kreversi-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kreversi"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kreversi/kreversi-20.08.3.ebuild b/kde-apps/kreversi/kreversi-21.04.0.ebuild
index fb4fb561a793..1d0af442aad8 100644
--- a/kde-apps/kreversi/kreversi-20.08.3.ebuild
+++ b/kde-apps/kreversi/kreversi-21.04.0.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-ECM_HANDBOOK="optional"
+ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Board game by KDE"
@@ -16,7 +16,7 @@ https://games.kde.org/games/kreversi"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 092454fb28b9..7e954bbb6c2a 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,5 @@
-DIST krfb-20.08.3.tar.xz 1282352 BLAKE2B a04e48a5475df53ab643656ab6259731ac1839456de6e6e18a4143dd2cff76eadcbc47ebdaf6d3ee2e54cc873f1b27a8ed5ca8e76773f6aa0d7c3ccd8f921530 SHA512 0b03908537afc65aa43543741683471236c97c34b4ea0bef5dd4b05cdbb3469f408e21fb1d2cdc83af37ccbb8e6021ab90f619cd4a693153c4c40428a93e66f8
 DIST krfb-20.12.3.tar.xz 1280912 BLAKE2B ddb95577a65c5b8071a6caf8537c8e2986b36582d8c9ac369d3f514f62484392dd612f38c1e23866f38ff2d040d4150952419788dbed731f4b617518e9abca2e SHA512 f66948288fbf78adf893c9c53c76acd6eb36e805d6603d912e4cd5d7ecd6fd7dedfa421a072aff989b51b312041793b4a6c3d2a16dbef50a9a1f7014c558b5ab
-EBUILD krfb-20.08.3.ebuild 1387 BLAKE2B d801972651891d002a42f96b8d8baf5353209722129967da048f5c946b6eedd04c324c9de144a49eb71f5beb94a07341ab25f5d260c7e7393b34f0388bbbeedd SHA512 30d29ef29b8d54fcd8c0b6191c72f9bad7b35ba07357f477ae1d0d7fb9937a1e283d7a4fffd676e7c483c78bd7834335cc6ead3f1bc2dd8265f46694ff889a34
-EBUILD krfb-20.12.3.ebuild 1390 BLAKE2B ed9a62bb6ed2e51b7159404f4a76eb6ff0d4d8d72dfd2d09d1c54152b393c0ae79f5be2bc605ac603a42ad9c6392550d4ac3413daee525ed97286de566012518 SHA512 ee8c7ef4565359ea6e4959db2b4d909f426905ba821a054d60b47f3953b03f9938ac201610f20323b73bb5be0ff965527f31d1a136e57933b057470467c273a0
+DIST krfb-21.04.0.tar.xz 1283128 BLAKE2B d46e9786f7297175447e64ddeb4c61a2a1f6b645d3fbbb8ec267f55a01717f80df1e54d6682534c75fdc933404a0408e8c841a9c81600069b8b9c4d2189febd1 SHA512 57acd4ceacf796707f7b73eabcb7853970f8c28bb124c6b70f1e2a63d12148f9c441e935f01bb2e32092a7bf460e71d20b224f73eb1335af99d8ba1befb0981c
+EBUILD krfb-20.12.3.ebuild 1387 BLAKE2B 98fbf3f4cfcbdb72684dc92234607a1944182645aad1c74538de03a2be35ff37eb5579616e510e20c325e5219a7650b5d9a6169d5d96eb4e2d32a2433fa9325c SHA512 5e81458c5c138f1c762c29a672225bcc64ede0f62983a74804a5254292f195c05424e97db02a1baceb7b7e4800778f605b4ed8b813a9d5b928d1b68490377629
+EBUILD krfb-21.04.0.ebuild 1390 BLAKE2B c301cafabf3b6b630d27b70ff1f4255e70d09a9695e62f9a79cb7d4da02d4aa82b9b2ae0c5e4496bc25acf4deec81415d9db99be56cdf98c76054d7b28bd5127 SHA512 f4d738bf3d27db4e46d93a93f6030fbfb6968ce487e91f7cb6b62adda00abb41ca9a9a570e49440ab24f6edcff4fff54ad5c4a844e5e2020678566e6833f222d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-20.12.3.ebuild b/kde-apps/krfb/krfb-20.12.3.ebuild
index f04b7b636cc8..85c097394f3e 100644
--- a/kde-apps/krfb/krfb-20.12.3.ebuild
+++ b/kde-apps/krfb/krfb-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/krfb"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="wayland"
 
 DEPEND="
diff --git a/kde-apps/krfb/krfb-20.08.3.ebuild b/kde-apps/krfb/krfb-21.04.0.ebuild
index f477778688ba..cd93b639a7cd 100644
--- a/kde-apps/krfb/krfb-20.08.3.ebuild
+++ b/kde-apps/krfb/krfb-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="VNC-compatible server to share Plasma desktops"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/krfb"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="wayland"
 
 DEPEND="
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index e15e84f45252..a02168d08070 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
-DIST kross-interpreters-20.08.3.tar.xz 151304 BLAKE2B 23e33a2dced1ff0b088bf40e6ac66bc985082c9e61a786d3dff90d4c518b9cc3f18194dd14f18ef759a9be4fe476b2d4a791feb2a338548c26b771804ee4be00 SHA512 5b5ed4420024cd11c925c0ecf36fe8c8ac8c667bd9e1ef26a8e902de83b174c2722d30ed1a164aaab7687d5e34383dd040f9a98a38dd9852fa6bc0cece9144bf
 DIST kross-interpreters-20.12.3.tar.xz 151292 BLAKE2B 71fe7ac36c989a24a1a8121b41ed46406aa95792a92f2fa6b91a837d4b81c5c6ddbc1e47218660d914282dce7828ea3ad37539614b69df2c8ab1865c467934cf SHA512 5b2017c32779315cb3b726d36ee508d3fb56e4ad69e7ff675388f5d9819eb255afde74810796b8493df06c7073e5d284ba58776567449d323e3e5bd2af42f215
-EBUILD kross-interpreters-20.08.3.ebuild 611 BLAKE2B b47826750962fcd87e82c2caf7c4fe970739c1b1543aac950f879308d183c30b0d9084d4dd1effde999a3e6c6efce89cb18d2bba16a9bb237abbc52a72cf3d97 SHA512 8f7a71d60b232cabfc5ea52958d75563152de6b22e01dd4ea8ecbc6237b398d6a45ff8219487559ce684318c224d395389484e9bdc2b52201d80a3d526e37171
-EBUILD kross-interpreters-20.12.3.ebuild 614 BLAKE2B f3414b815cbb0e0e30b249626601ba785aabe2f0f8f79933fdf17f010fcb06a83fbbc966b292b677357f05104d7edf20765545b42feb39dfad88717bba03af7a SHA512 50595e19abbff379ee563e1e1e695b60dd6d97687b054334d861446472c986bd77691f073bfe58783c7eb57be22418f1e611567d9b4b64116da65f732be013de
+DIST kross-interpreters-21.04.0.tar.xz 151572 BLAKE2B 1a8038b19525d66e384388b7b2be35bce05779ed09f574b4130082f4ec07b0cafe7b452dbc6139a758ba195d41f292d3b07ee7ee7d96e660d11ed30fc751608f SHA512 6865bb172e9933a0a006edab4a0236f588b98512456fe745792fb28dcc0f3ee375de94ef96dcaef3160311be41959b4e0e13b01e53523039c1874e7ff84a3b31
+EBUILD kross-interpreters-20.12.3.ebuild 611 BLAKE2B 8fe0e2794553110b548eb89a4b984d5c7d58b2d3b9d1441d6a56b395b8a9e39bcc95d906c5eea258509e24e518d6efae21bae4d448fd54305d82e56e11e48563 SHA512 b8d6231beee10eabfd83c3646d3776e0ab0cf2efdfede1d8d77668e3c6e97ea9edaa932fb553c9cf873fda70393a63d9fc15b62d2925b716c3d3842c757331d9
+EBUILD kross-interpreters-21.04.0.ebuild 614 BLAKE2B ac1de5cc190a9f3ad9ffd4b9db07b107a6a6d5a31c1dc451d8da2ef835b79147e4c1859fb6f9bcbd9af09390f36cd52e9613c357b2ece5ff21627fd80241a6a3 SHA512 2e4596291a6e9f8da9d64bdcae0032cb0ff25b43af7d3589200f4a1849588fdcdba13a05dbd87afc79bb5c117b4a79587ecd3aebb34d1639bb406221a75a28e4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-20.12.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-20.12.3.ebuild
index 5a6e4b5aaf3e..71b9027316a2 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-20.12.3.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kross-interpreters/kross-interpreters-20.08.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-21.04.0.ebuild
index 2326558fa1dd..d0aaf1cc3b66 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-20.08.3.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-21.04.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 USE_RUBY="ruby25 ruby26 ruby27"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org ruby-single
 
 DESCRIPTION="Kross interpreter plugins for programming languages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 74ad2a734250..2db5e7f94ec6 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,5 @@
-DIST kruler-20.08.3.tar.xz 272476 BLAKE2B 726894aefd49a51cfa15d84e27bdcee20782ed6fb94b7341bbbb79dca3ff3aef21b61bb99734e1348e2b6c7f231a5ad81c7ac63b1445a81578297668a2212439 SHA512 cee0650767400ed49ba4912025170210d02cdbc2acb746515e1513412f62befe14a832725fd630a288d0c2c784308696e8f20f1ee9fd2492bbd236141ac0f772
 DIST kruler-20.12.3.tar.xz 272396 BLAKE2B cc0c6cbcfe1ae2d4445175ee5019800e9ee9f1e1db1c8fe91ed7e7a6e0be8167663ca8a18662c1d36532567eaa87f0a77f4f0163d274828f552d962985b9cdf1 SHA512 2facf88204295321235b65975a1147b1e8e1d1f1ab9219bea635807bd9e6d3d060adc5a0e44d074132aea4a39cd0aeb4647b4f19692950484bd2b3516ca57b01
-EBUILD kruler-20.08.3.ebuild 936 BLAKE2B 65baf0832f3937dd9b3c5f272f70becce14463a28660e7de64a4a0b738f1126e3f3382ee546bcb398f1cbfc87c60dde40e52f8641f453a35eacaae1bfd768d9a SHA512 6d4211c5f84922a90ade4daf7435086872aaefc769eac9b3764dc5c4812c829504f073e778aea3f31c8338536747fc534364d25b37d2ac18842579e3a2999082
-EBUILD kruler-20.12.3.ebuild 939 BLAKE2B f52e0ef93d4cb9e201c468aeb0304e4aa04177c504b13af7818e5a8c4b07d05b605834f1ea24fdca51479ac599958178be286e2053ace817a09ddb41ec9ab2d2 SHA512 3f2f446bedf359fa031506d6fbf505d42413a35f95150a6cdfddd32e0eb20bb3ae56459f7aebce1462cb1a6c340e73d2dbde4b61978c029ce4b517ad41db33da
+DIST kruler-21.04.0.tar.xz 272928 BLAKE2B 1aca9ea4f2bf9635f9b8697aca7c98174e257e3a4f8f43a4cee4257f00047961341d62a67cdf21921b2b18e56af6b583454c5021f2fef1cf0d4a529ea5702323 SHA512 a4568cbf00d63a228700be4aaabc2399723fdfa41b912b9defd0982e9179f281daab3f6698fe17eb2e43942cb7c1fc3340d8ccc629bb7fdaba26802e0951f29c
+EBUILD kruler-20.12.3.ebuild 936 BLAKE2B ab7221f0d9fa6471dba8d340afd8f77e3b73e349decaf8c612c04222ec45150452efdbac7875ea94ae7f27d62cea0107087c7cc9006e0db3c9da459a2ceae94e SHA512 32eab2b100be3b2366554b1e09656ba6081ba329cc1fb006dedabff1e338d6082003944425c76227f365e893c619b5272c861c53cdb7779cb9cea364e3ad3bf9
+EBUILD kruler-21.04.0.ebuild 939 BLAKE2B a55bbdb00648bc9ec421d226bb432405d446e7263c532734ca46d67d1c1972a407d324ab92ba17fb9c1fb795754d13326eee35bbc26873de843c0e235cf31b8b SHA512 6112f063667220ed7c03f4a4306757f75a34306ec89d0a502b34c07609f1d3463d20a66eb59252b1b1366baff348f72f6ab7f5900beb49daaf69a66a8562811b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-20.12.3.ebuild b/kde-apps/kruler/kruler-20.12.3.ebuild
index 768c34c07f5f..e989e4dfe0b4 100644
--- a/kde-apps/kruler/kruler-20.12.3.ebuild
+++ b/kde-apps/kruler/kruler-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kruler"
 
 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/kruler/kruler-20.08.3.ebuild b/kde-apps/kruler/kruler-21.04.0.ebuild
index c8095c4b7bd9..b1824b6b7fc0 100644
--- a/kde-apps/kruler/kruler-20.08.3.ebuild
+++ b/kde-apps/kruler/kruler-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Screen ruler for Plasma"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kruler"
 
 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/kshisen/Manifest b/kde-apps/kshisen/Manifest
index e9f7f749f604..b9e3726db2d7 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
-DIST kshisen-20.08.3.tar.xz 826980 BLAKE2B 7a1f5e29a448ac7667cbbd91ff188d335e68660eb3a8a22817c1beb5fe9d809711114571f0f8dd7f7e8dc9bde2d5fdb6491b6b867fa254a6ba0e7a0e8de1de96 SHA512 3d1fddeff2e1dc9a10edd786b50f4c1f82b11c0a6389b1ca79befecd5642ea62c6df3c7999e902a67e9815cf5a0118289769894a6ed6ce27ae82c0da749ee468
 DIST kshisen-20.12.3.tar.xz 827336 BLAKE2B 1f587496f98b1989985b9c7c48c21b1738dc1258768bdbd0ef89296540243a6882f5ca59ed3062c637742d522f278535975140e9e2d367a543085924df0d7475 SHA512 32cf664a6c4c5bf20abf9d025398d45a4e37eb3693df337677ae23dc92f508862332f992c2d4a318af42fcc12abc4dcf2068c44633135ef66a7683cecbfe1581
-EBUILD kshisen-20.08.3.ebuild 948 BLAKE2B 00a3e986eaad35565ba9761023277f7fa85d5444818c5869f8c0515282cc047f627ed981f1b64b9ed12ddea122e2ce5516e388cb4eb30412c6fd96f224ac0a83 SHA512 b5f4eeda29931f295ee187e57f17f72cfaf07854e6511b946098e503f4a8d1f36da31815ce463d13083a10d2f51975c14924a24803fd05d10a45ee94c00e21c9
-EBUILD kshisen-20.12.3.ebuild 951 BLAKE2B 3e8634611b66371544d6ac499496e7c1ff3c370782dbcafb49d793649f92390f941b869c7e74815955f9077fa73722f7fc84ec80db4aa02e0785d11b90540fb9 SHA512 7d4cb0ce991c669953a91275e1d88e46652f0091db3529ce2d94131a4d9fdd01894107bbc42ecb4bd18ebe3d8bab9b038dc935f5dcc17aecd8096b7fb22e9f5f
+DIST kshisen-21.04.0.tar.xz 827724 BLAKE2B 2fac6dd95c42f3b0a5973e3d0b22550d593db208727a956ef7fe7e969c6c2aa8928816dd05708bdb6b3ef37c66c9ac93793751d804da3f437bac5926c0d81ea3 SHA512 5a33d45b757266a6cad366acb179e0fe1e519e450c503f0d2ced81595f92e51ebe59101d0931c67e223c3404ee0c358decd68ea27fd99ee5162bb7a04317c1ee
+EBUILD kshisen-20.12.3.ebuild 948 BLAKE2B 86ecfa8fb4a59a3a8f3377d949c60f20454d0858dc96fa0bf22800ad7281a724e969d4d4b51de73c1c42ba77686f3cfde6f1e8dcdae538f37fd5dc3a5036a6b7 SHA512 9c842f3915d881f73a7318a767d6770b24fe70357fe5e262956f8c2e8dcc48e84a73b23bdf478ffddefa361194c7ec5bd4c0adf22b782d983c3268930904b497
+EBUILD kshisen-21.04.0.ebuild 951 BLAKE2B c4d1b0dd9621f9683df94483c7e1bedc426efd9f52447cfbd9bd6d37bacb7bac86a03e782bcc46777acd97f3c0785a43e3a28cd6c87f8894246b198198934cc9 SHA512 c60e1b3e71e8d6361256dda6bf5d7aedf4d1a5d5f2c5c1c3402c4f28602352386cc5093bbcfdff2d1e2a4e96e6f05e374b87abe73985f417e250ca839f748f17
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-20.12.3.ebuild b/kde-apps/kshisen/kshisen-20.12.3.ebuild
index 52dffad32ab3..64d20d58eeea 100644
--- a/kde-apps/kshisen/kshisen-20.12.3.ebuild
+++ b/kde-apps/kshisen/kshisen-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kshisen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kshisen/kshisen-20.08.3.ebuild b/kde-apps/kshisen/kshisen-21.04.0.ebuild
index 72060a74ef34..888dc172a52c 100644
--- a/kde-apps/kshisen/kshisen-20.08.3.ebuild
+++ b/kde-apps/kshisen/kshisen-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Solitaire-like game played using the standard set of Mahjong tiles"
@@ -16,7 +16,7 @@ https://games.kde.org/games/kshisen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index e7869b434824..0913a165f4c8 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
-DIST ksirk-20.08.3.tar.xz 6992288 BLAKE2B cea655267e438521d41d289ddc35dc8c1febaf7997449e78e3fe12a70f67c3b6be5483a8deb2f4af4aaeef65aa20322662fd674dc3eb27df033dee4881f0e4f7 SHA512 48f6f14d382d3832d241679d0a076f34d034546a24b479e5ae14aa26c9c8a551255f4d1e95b281f1c9dac2f8b975248408de84af8ee1c00095de3c3fd65f9303
 DIST ksirk-20.12.3.tar.xz 6993564 BLAKE2B d20e6828af332a1decd1bd79c4277cf5e05ffa75facad0350c03420f0bc0dcea7226ca1fc47b29e3be0915fcef68c8cb67b5e72c183e8081f7a5d53879c89dea SHA512 f45d4ba82435f9e76349ca1f6218e3d1cc6e1d3025f86db4bfe0ee724129ad96bd71e9b0b6d21bf60a5e19f460e1b9b7c9a3d7c6c0f229e9d5cf4600bff18672
-EBUILD ksirk-20.08.3.ebuild 1145 BLAKE2B 0d77158d0e2f8e27d44f3b0b0dbb73aeb70596de9637ed99d5b72efeb98170a8f45f1a9c8d618fc44744cb77997c971047729490a819d9b38b5ae0cdf5943e99 SHA512 5aaec8fcea892a9e5d3f8cf98a85f3824f8cad3e6fdadbaa451e6d188c5a378c86e1b0acf27eea0645e9a5d51e30270cc6f4cdb3be192719aa54273e41377061
-EBUILD ksirk-20.12.3.ebuild 1107 BLAKE2B f343afc1dca57b4e78f5fe81ecaac6bee689b2d912de60c45e8791b9b0d2377554667efa72029607c1e113d842a0381d6ec2e3b036a8ab467afdbf326bdcf7af SHA512 0287702e449a49e9a19ed8e65eb6afc110654555f2e72f02fcdb609fc5a159a84c7e8338e4aa62a5b88b7bae69fb5e1c1dbdb3dcb371ac046c14b44aa5a85904
+DIST ksirk-21.04.0.tar.xz 6996308 BLAKE2B 7eb5262a3402ddf276306dbc59b1ebc648b1b648eac84cd2edba55edbd65b4561e6289684324080c7eeda8e8d322fa1db158427c43f9f315d07ee90fb915d8fe SHA512 ac78f9066e34ffc99df43ea50d973fcb16ba0abadbc400d8cb5cdca6aff81efa00cb63ed8ccc5fc8e4c5ecb5ffa0d4cb1209bf7e829a493c1aaa2d3e0a54c94a
+EBUILD ksirk-20.12.3.ebuild 1104 BLAKE2B 74075e2e685adf3d838775b85886d5ce5d4732198e0e85281f46cb8365daceacf0d3a02be49acc7510fa078f6988bdf2399a3290280c4c1f592e402cb97c5b6a SHA512 e61ec0f1d8ac3937293e23f3380cae671623ff44fce2f8d2e27aeac699f9b95a7d2046a3d03c36ab9055e73c84f87f07121a81e42da99b313e5448dda15a4bfa
+EBUILD ksirk-21.04.0.ebuild 1107 BLAKE2B 36dae12d8340e5c126e94fa4b9c4c237ebd0445df8e063fdfacf05e056485a2ad444d690a26bd49a1ba2b0c902f33cf2e1e8c3d528548b4614fdc72c8f8541c0 SHA512 051c79ea18d6faffa85de862f2c2a44f98b62848d0d664d8d5dbc44a2ea3c0e67f70e71c88d7d3c5307a7fb34aff731459e2ac0e5572d5d6f396375cb610353e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-20.12.3.ebuild b/kde-apps/ksirk/ksirk-20.12.3.ebuild
index 6d2a7a5b7fe3..4695b4a33f20 100644
--- a/kde-apps/ksirk/ksirk-20.12.3.ebuild
+++ b/kde-apps/ksirk/ksirk-20.12.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksirk"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksirk/ksirk-20.08.3.ebuild b/kde-apps/ksirk/ksirk-21.04.0.ebuild
index c0ccc4c739c3..ba6daa79535b 100644
--- a/kde-apps/ksirk/ksirk-20.08.3.ebuild
+++ b/kde-apps/ksirk/ksirk-21.04.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Port of the board game risk"
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksirk"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -32,7 +32,6 @@ DEPEND="
 	>=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/knewstuff-${KFMIN}:5
 	>=kde-frameworks/kwallet-${KFMIN}:5
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 03578ae6d791..1180d44af920 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,5 @@
-DIST ksmtp-20.12.2.tar.xz 43092 BLAKE2B 74a757a58687d4c76d6a6c6c9c5931ff01938c206d482bc9a02d00bd46fef942ad5fe785b6e2c300dee889509cda1ed489355c3ab2f00e65efd039dd53856a84 SHA512 d336777948705f4d79ba6ac2c428caa467da8d6b0853defd8fb42a150c10dd25ef0258f41ce2549212e27dabca58e17eddb0d6425d2159e3d21eafaa29e369a5
 DIST ksmtp-20.12.3.tar.xz 43124 BLAKE2B d4c6e1a50a98ebbd1387f98b0c5b6d4397af533898093cf5a5bb1718ae8d575e2c78c1a7de52d64b019ff4a831bb3d2c82c2ccd8529dac256d564c124e6ecdfe SHA512 813b742471f35a9ceb851e3b4fecdce578532b0754b45afd9e1ba1cd1c33b5ad06f40399488f65a9753af61af674c3c6ce9956307b61be5f2661ddabb53937fb
-EBUILD ksmtp-20.12.2.ebuild 602 BLAKE2B 1b7bc60db3ff905f7ef2db18dc0660ad4cd00b9314f527b6c20fb2c62c62e8bb344da5ab59e9ed48672bb8a41f6e709bf4dba2cd227a9a4042142890284bf6cc SHA512 5a6c566bb18c06d9650f12b1efc505688cc69a39bd1925fc634e916bbb99f9f347874a51f1158930d86a0fdb99ea668241537149f1752e1b4d374412ff9be3a6
-EBUILD ksmtp-20.12.3.ebuild 605 BLAKE2B 4f1bb3e48dc0efd8c4b4b59213927c51e42af221c0eea9b6584bec44ae5b38b0e37df04efc22b06ddcd7a761ee1bc0cd9e48ef8da27a98483b7a8aa0905f1c85 SHA512 566746b5638405eeb54409dbf58667d7949b59c12b65aae216a06fa7583cc8c46621a3d3f5de8f6cc3236e07ac7de12f61a627d1664318236d33ff7c91d247ec
+DIST ksmtp-21.04.0.tar.xz 47100 BLAKE2B 4fe19f123557a221d2cb741c24ae16afd5ad1b0363bce4b98553bad55717c53e40cc8c25b61d2ca560c9b4990407c1ee4a1ad5d6e6e770b3b7547d7bcdb317d4 SHA512 31f65e29dfd2faa07e0cadcaec383b756ce0eb6bc5cd1b32e8b04773299ccf062a7811fdee4cef02a26b4fd03e4b40852de0598b43b85a5c54c61f86af7ad7f2
+EBUILD ksmtp-20.12.3.ebuild 602 BLAKE2B 1b7bc60db3ff905f7ef2db18dc0660ad4cd00b9314f527b6c20fb2c62c62e8bb344da5ab59e9ed48672bb8a41f6e709bf4dba2cd227a9a4042142890284bf6cc SHA512 5a6c566bb18c06d9650f12b1efc505688cc69a39bd1925fc634e916bbb99f9f347874a51f1158930d86a0fdb99ea668241537149f1752e1b4d374412ff9be3a6
+EBUILD ksmtp-21.04.0.ebuild 605 BLAKE2B cf4e7ce42eb4f0db5187aa7e55c82c3b5d1404b5230df9046c167a9dac70a9ddc312bd846473c8810d9920a97f941edd58b94a288f03f741504bc993ae490dc5 SHA512 849c0199daf584b98bd20a2098aaeb7c2c1393d19214ff8c75c1d71a0eb1d903511886f397b3a0b59fd200c025a685affcc7ce883100a5f8aa522b2c128d52aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-20.12.3.ebuild b/kde-apps/ksmtp/ksmtp-20.12.3.ebuild
index df2365e79226..804cb09bc357 100644
--- a/kde-apps/ksmtp/ksmtp-20.12.3.ebuild
+++ b/kde-apps/ksmtp/ksmtp-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksmtp/ksmtp-20.12.2.ebuild b/kde-apps/ksmtp/ksmtp-21.04.0.ebuild
index 804cb09bc357..d52f49c95d86 100644
--- a/kde-apps/ksmtp/ksmtp-20.12.2.ebuild
+++ b/kde-apps/ksmtp/ksmtp-21.04.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index 4a0ae7a718e5..8178f7852489 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
-DIST ksnakeduel-20.08.3.tar.xz 543940 BLAKE2B d70766b6618b79f68e59431fa253be62b87a80cad6361e3929d687eb81ed884505629048cd46620c1e1630682f6127829dda15ec888331793a93e9f8889e3d7c SHA512 29e5245aca40b44c0cf0680776c5db6e9a061161b46730fcf9c6c93c57830e06da3a447d780c786ad184f4f48d414f0c17871658e2295f39e569a35fb07df4a5
 DIST ksnakeduel-20.12.3.tar.xz 544212 BLAKE2B abcb3622d923aab7bfb53940e1679b143f1a9c5bbada1cbec1bc87f4acb6169e1e1767d09e49d9590deebfe8911909ffea8f192bedbad320cd06aa06abd0a411 SHA512 6915dbb658b85bcc647a70ee45a99bb07437424966256cac4efdb2d3dbee625a832f0ebeae1ee6f6138356d1c0baca42cca7fa2a80c668686480634fb350b5cf
-EBUILD ksnakeduel-20.08.3.ebuild 929 BLAKE2B 8d4a774c6d67e28944feb981729a9da3b76351cd3da49fa2c0ce3a4c3ab1e14be330b1144512082d904cd0a4b7e4241cdb203d6f13cf209c9329db9086f179e5 SHA512 2b98d082c215d0221d99d8052de32f62277f6d5c67d5e5af4153f681c59c59580acc08a360ac27a67e29515e854caec77bf83f2d340002c57e52489f9eaa1cc0
-EBUILD ksnakeduel-20.12.3.ebuild 937 BLAKE2B 841633a34727bdd297dd9f4364982417d5e3628bb641c2a7d2d0bb998dc58063c8369e6bc2a037b807152d1fd8c1e7ca5a13b3796fb55751fb4167924e58bcc5 SHA512 761f02c5be42e8c7399da2a5bc182d365471213f059511dbafe37398614030eb1c4eeae73bec4ca7fcf82361660a82048f598af788c886f7ac39f926efbc914f
+DIST ksnakeduel-21.04.0.tar.xz 543720 BLAKE2B d16c6ef0abb6bb53689f16116caf9237690e8d32d17e25bf67517feebdd4c51668edd5ac612adcdb63869c802854696572ecc3e5581c80f156853d588b896e1a SHA512 70de00e717d9a8db7db72cfab575c5d82e42a88e49cf627b9e3a44418d8f114f9dfad0e46bbfc6c5f8ba3774c203809144cfdafb3be66e11842ea55a3fca9087
+EBUILD ksnakeduel-20.12.3.ebuild 934 BLAKE2B 08d374cc25e951828de5c889bae034b4fbc7616ed5bd72739f92d6be65b6e1bdf886a9c39f4a9964bd460eb8f68907bd338a83165a0aaa1b69c742f7c4868a71 SHA512 a6644da19d4510897e5339b4c4c1afdf6c5c52f5ec2fb6b2fa05e9c089ba6db9685ee94cddb5b9e12da48383898710cd4bc3ba3cc5c39a342bb720f0f0a834e1
+EBUILD ksnakeduel-21.04.0.ebuild 937 BLAKE2B b7793dbd0539e5b8f86c19efd4f3acb6eeb275be78fc12b84d7e06624267847d17e6d95f869b320ad4fe7cffc3059340bc7d11e140d272431b48c13724a8bd50 SHA512 65de0452186b76357da7afdefd9a7f2e0821fe882ccedaa5584fe3edb0702f9f3957f0872ecccc0dd71a83dbfa199492d820a2b91c280cbe5131bd43d489e84c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-20.12.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-20.12.3.ebuild
index ddb5c2124913..4feed49529f5 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-20.12.3.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/ksnakeduel"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksnakeduel/ksnakeduel-20.08.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-21.04.0.ebuild
index 1bdd368ebc10..c98a7c25bf0c 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-20.08.3.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-21.04.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ECM_HANDBOOK="optional"
+ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Tron game"
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/ksnakeduel"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index 1ca0cae6725f..38c600b60a79 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
-DIST kspaceduel-20.08.3.tar.xz 617684 BLAKE2B 0a24d756857e376af666bbdf55b3a8f65ae858b7121bc89a3efe56360c8b0cd67aeaedd909a338e758ee75776ff3ca47b8d53c7f35451c0be3cc2bad605c7e70 SHA512 afb272fc92c54597c62ad58d0f730d2ca992e916044b2954aabc6d2517f72b9691ce300c9c56592f5dc148f3378318da19e13d4520af11d056b305adbbd13272
 DIST kspaceduel-20.12.3.tar.xz 618104 BLAKE2B bd4f091b37751e74e589b98350ebb6d35f2da8223075b0808ba28f49178bf59b5e521224ebd1fdead79129c4c5b70c64a242191eeefed68615c6e9c70f6ab8b6 SHA512 87c42bba9bc7c677e72ec62ad1255723ccca9b1acd6c840e83ed355ace40c95e605fedda6279b9946088fe94d0727760ee29b810e6fc9c0c353d2f357e453f3d
-EBUILD kspaceduel-20.08.3.ebuild 852 BLAKE2B 9ff18389c037541ac97dc4a053333b44f457339fd4736d7642d8ebe4121a491c628c1c26ee72cc4148e5e95d6d5a74ebbc12ea4b82f1ea2d9b79adfc700a08d0 SHA512 c87bddbac90fa43f97f19bf6cadb64f0631dac1bae6c9b01bc129b0fd5618675ef9789f35fc083255b4127e473d007f6888d10a370c5f9ee7b04231c0dea121b
-EBUILD kspaceduel-20.12.3.ebuild 855 BLAKE2B d7677e0d49d68daf805281fca2e13eff6ad98547126b5968941d17e9a40ee98a059aa1c16d4c6ef652742336a5032e634b3a9723ae37cdd11bed2e743c13f544 SHA512 d080ca7e06eabcfb58e50fa48b57c8edb015d53782b5388bb2f9e17f74208446599ed402f91bb5ebdcb0f476cd595661af394cd3ed8fbdc1ff948986f49d0b38
+DIST kspaceduel-21.04.0.tar.xz 617708 BLAKE2B 4c0690ac9c5415f6a5155e3b57965ca2d8b5c89c019922997671a19b4cfaa6ee92a5138038877ca405248ba63dafdecc83abe3ad141f351f8726c22079b46ef8 SHA512 10abfd7b0b024243a0661048a78fae9a2f9b65466a59c0082cd7823b0834323a0c46c26a96a4e3b69909f2c30e370646a4f9b4083b8552423dd6033843d33bd9
+EBUILD kspaceduel-20.12.3.ebuild 852 BLAKE2B 40afaf635e17633697d179ec2806a676e87a25902bc82cfc252519d89a3ad29f9e3ac1390a12ede9b252c886486e3d22f5ff363f80e4556b79be5d320024a104 SHA512 0169320fab7521f364a5d32517027f757e7d075ba461dcdd350bb5458958932c6754cb3fa3972a5dddeb6993626348bb353abd49b51b2911e86d7eaa9d9c6892
+EBUILD kspaceduel-21.04.0.ebuild 855 BLAKE2B 3b9e45f85cf0db66b641dd6a747f52262d9450204bb828102e35bba6d5a6e4914a8398eb332e5e8de87299bf43d9accc21e69bb6613e521444cd3a2513a1609b SHA512 bcd2bb2bc1bef44526c0a410191d153f79c57c8c9cc615e8067d0254a7da39977540ba8f5c6835e311814ce2f43112001dfc2620cc8ae82b28bcabd69b5e3ee9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-20.12.3.ebuild b/kde-apps/kspaceduel/kspaceduel-20.12.3.ebuild
index 9a2dddec8923..c318de9acdee 100644
--- a/kde-apps/kspaceduel/kspaceduel-20.12.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kspaceduel"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kspaceduel/kspaceduel-20.08.3.ebuild b/kde-apps/kspaceduel/kspaceduel-21.04.0.ebuild
index b38c273bfee3..e486cbec7a60 100644
--- a/kde-apps/kspaceduel/kspaceduel-20.08.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Space Game by KDE"
@@ -16,7 +16,7 @@ https://games.kde.org/games/kspaceduel"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index 983f685a06d2..a715170d0aae 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
-DIST ksquares-20.08.3.tar.xz 266700 BLAKE2B 33ef2480e2e81bc5ed98016c851d7b7a7a51dc95f067626b53ab17fc127f3881776b76e1df269fa1f327cd7d92526a61885eb65ec566c37e1419483fea24a608 SHA512 8e18af8c182b0752e19d8ab8d7d7021036c68a0577240812b9b559d022778f335c0c0e1d11806869580b6b4a89082bea8288e1e0edb2612ed2ead1bd4eb54c3b
 DIST ksquares-20.12.3.tar.xz 266692 BLAKE2B c2db15eecdf68d41c9c31f67240326e7a165e122826d67e8c4b412254bb06402b2c46c5dd812699a36586417c7157fc2ef34a7a10d1fcc1fd25f16a73168dbc6 SHA512 a2b89b21e463bebd1951cf13502640fcd35967a74526bded57883a64ee408fb2eddfe47ae6bcb171c7f4f1d8dc7adc6d81dfc94de99eed7e3cb3e0b5612d23c9
-EBUILD ksquares-20.08.3.ebuild 891 BLAKE2B 8e909645afe8b2f64d72fcdf2d7057a0543d05292cbe47f9a77c40fc235685e8aa4ff43ca1948b0b4a67e8a79f1c5baf1b0da7bf438acfedb41c91e5bb72f05a SHA512 02e9a07cefb4ee8a8d60f06a0580b3aad4eacd5efc16cad52bcc754d82da5f366cd0b8258c4714708e30cf8e4b5d8376dadb376cead0173920b03eb704c252e0
-EBUILD ksquares-20.12.3.ebuild 894 BLAKE2B 8124a5d56d9ee6d86689d0026db322f459af3995df3d21c92d27f9e708e6e624ad2479257413b602757ab489afb6554be7b7fb83ad1b87627d21d0307cbabcfa SHA512 ae55a4ce17560a73af8cf2e7c3f5856b2f7b217b67792a743987bef5eca11a793706cf9960e3ecee3cfc162412f63b6a424a77c0740351ec8ad0630d2316b96f
+DIST ksquares-21.04.0.tar.xz 266352 BLAKE2B 494cfd0d1090a313223ef635ec5e72fe655f55149d3e8440d5103ed9556b4ef16d2085d6b3f6fb9aa3dc431c33439474e7ba7f7ecbee0d22fe671898f58fc374 SHA512 4e434bbd86983ee28c2f5d0ef4d79fa4770c58b687268236f11be8f7a001b926cec07c42b7099ceb38a389c3b41652d106d6579415eee15351642e01c8eb3158
+EBUILD ksquares-20.12.3.ebuild 891 BLAKE2B b97c599dbf3410bb3fd79d7578d5b47bc49290719c558bd59a96ef10e27ee842126322f457fd350f7b9b73f9dddca7d5a445ed4ca2ee581c75d18d0b5c5a9fd9 SHA512 ac84770e54eb6cb97879e50ce74b8c3d0d6d74d0a38d25c965c78de09246acc708bf48cae0482dd4574117e4299ec1551decf933979511b3975a4f61c880f3e3
+EBUILD ksquares-21.04.0.ebuild 894 BLAKE2B 34842e276787b5e50cf08cc76be0a81979926c8182c1635f79534730906be21756883160e270eb9b5f6919b75e8797d319f6fa0164276ec14c88a74b1943d8a8 SHA512 bcee3d6db3341737c655c705bb25780f4be6a59bd21a43f5843b91475627059a583843e5e47c6b15a50ae035d0acc9716c2cf09fe246fe0f0f9d7b1863328711
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-20.12.3.ebuild b/kde-apps/ksquares/ksquares-20.12.3.ebuild
index e81945184fd7..cd7a13e12cad 100644
--- a/kde-apps/ksquares/ksquares-20.12.3.ebuild
+++ b/kde-apps/ksquares/ksquares-20.12.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksquares"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksquares/ksquares-20.08.3.ebuild b/kde-apps/ksquares/ksquares-21.04.0.ebuild
index b562ba8d2328..af8d6744b983 100644
--- a/kde-apps/ksquares/ksquares-20.08.3.ebuild
+++ b/kde-apps/ksquares/ksquares-21.04.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE clone of the game squares"
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksquares"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index f95a3515c5ff..79f0ccfb2b9d 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
-DIST ksudoku-20.08.3.tar.xz 1668796 BLAKE2B e8ad97343954825cff8da0919017a008ca60cc38aab5a4d09cb5ce6443883951448c88aae2ea4febccf1eaa2cb1eeb0061e5730df1c4776467d9c2fb061492a5 SHA512 bb1183dd5118d5169df430582c0548a7018572866e5f5d72f047e6cf2d03ad3cab97281854034bba74dc3ee5fc130c1d2e7647decee5fbb7b66830b4e2122abf
 DIST ksudoku-20.12.3.tar.xz 1676484 BLAKE2B 1c105623303cb7f6ddbc5f4edf080eccb961c2563973237a79a23fc9dc54f74eba27f43ca75698c87697435c09aab52ae8b00d8f52ebc75223db5971953da030 SHA512 3ee16844478ea8e70b606eda689279ae428423ffc758ea6876fb78ee3ad43795a44345c1314f0db0cbe8f98029f48bfeed9dbba1548d3160bf9f34e294e8c550
-EBUILD ksudoku-20.08.3.ebuild 1355 BLAKE2B 1d0ffc424f6bf1013aa3d8bda97dad1a080b5e227a2e9d89d08b8fa09266ce7d61cd13895c7367f14833af746fb90f2ac939d51feed4260f9e5e71ca03c433b5 SHA512 1572e97c2cc4a317ad32a7124e4d88b7368607c17d91cff6f1547ae3ffb3d2936d6d45dc9c2cf7424dfc78b4534a7105c2be234628970a60d71c36f7aba8ed25
-EBUILD ksudoku-20.12.3.ebuild 1322 BLAKE2B 6765739e40a9776cc13bbb067b2cbe502c6087922f4efc5ddd9d31ac8cacffc62a4d10d1f70eb10a0b89f13bac542651f2a0af435e88691ef109e833ce8c02c7 SHA512 7f8400ff4546de5043a8119f126cb72bc7e0fb1ee700d4c303574bc2315a54c3892145b3a67c6f0c743ef7f4b9b5ff55a5450b95ba4c2617b4a0d0cfd1e8a177
+DIST ksudoku-21.04.0.tar.xz 1678496 BLAKE2B e8d20fabf4a30e7798d3a938e0aa3ce9f989a58d25592d6b017cf16d425db6d3d303108ac3392fef32c026e9de22b98e49fe175964cd11c6b7b23f722c128b5e SHA512 f58de3c9b40af060d4c39c2ef610581427836de07fe38622ba2b41469b5cdeef36315fe5fcfeb248571302d82603dbccbeb25c5cab3ece6a6cad74e1faa67905
+EBUILD ksudoku-20.12.3.ebuild 1319 BLAKE2B 12c81d13ec1ebb62d5dd67d679295c38f8155b10d25aed3f30f32dd4a268f54830b030c4bd84b77dd8a44d5bb7e4b60c97096547e8e2d1db7ecc3e5263298451 SHA512 1f4d4d017229be25f3f6c79e3d1d338cdc65ed8e8ddae64fe0405b8d1ac3c18b5b5ccc0ef693423b7f47ff64d62d3e2eb0c1d5d8572f0cdb940bfa09cea78eb9
+EBUILD ksudoku-21.04.0.ebuild 1322 BLAKE2B 4beeb050be979f57c2351bfa86d21478f0269fd9be28627e24938bdec8409da320c0d34eadb2fa38d5183a1d10a066089fd2e789cacbc408e3ec1e39a622870b SHA512 27be3fd8467e3b71160a2fdcac118809a74d7aad9b6b1e0bc2c158a77d3a8caee2b9dccb6c229b766526fee6e336ebc9c80b1adb835534019fb081b947a6a832
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-20.12.3.ebuild b/kde-apps/ksudoku/ksudoku-20.12.3.ebuild
index 2f5c02c9a9da..cbfb1e8f8b64 100644
--- a/kde-apps/ksudoku/ksudoku-20.12.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-20.12.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksudoku"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="opengl"
 
 DEPEND="
diff --git a/kde-apps/ksudoku/ksudoku-20.08.3.ebuild b/kde-apps/ksudoku/ksudoku-21.04.0.ebuild
index 8e792acc434f..31f63dcc5ce8 100644
--- a/kde-apps/ksudoku/ksudoku-20.08.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-21.04.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Logic-based symbol placement puzzle by KDE"
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksudoku"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="opengl"
 
 DEPEND="
@@ -44,13 +44,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	ecm_src_prepare
-	use opengl || ecm_punt_bogus_dep Qt5 OpenGL
-}
-
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package opengl Qt5OpenGL)
 		$(cmake_use_find_package opengl OpenGL)
 	)
 	ecm_src_configure
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 4089a45876c0..9178728b340d 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
-DIST ksystemlog-20.08.3.tar.xz 1936020 BLAKE2B 3d1ab5dee63dabf2219705f9c24afd3f1cba9b4e2b43d7f0344fd2d64354bb32e39aeb142ef09266bfc4f7382e048c1f27c7ca560e310d3cb11c56f80e51279f SHA512 8b5d3e787e17470caa8df1b616fa944efc1216570acdfa8266c0a25921f90c6205ba4f2aeed42b1164c46e069a6a4607949b3a3c4d15531b8cf050eebceace0b
 DIST ksystemlog-20.12.3.tar.xz 1938596 BLAKE2B 9d3e36fa65e73b370cc174b7b1c47946b567d9f7350a03929d458f32845cc270fa8010b5ecc9b1781a4d394b2b88c32468fd6b460bc95f1dd93e69daa348d6bb SHA512 a7b7d5bdeb7c118469888adcf5c0856758e0a0802d76f6bc8b3afafa7df2de7df7810f0ba73d8867b4bd55003b6c042a6b76e3292f28f1387247fd5e6adc5faa
-EBUILD ksystemlog-20.08.3.ebuild 1523 BLAKE2B 7f3bd70c18f49cf1a0fd227b4d71fcf8584d5d942c8635ee14ec5157d1f8c6321e979e61d488420a527de6845befb2a4bdc4a680bf01fe0a4486807bc24e8dd7 SHA512 c961a47adc69fdf6ad9d4ddf267ab8522d1083d0b51f4425348bdff07542abcb31feffa40fb332b5e5859b7ffc8af4be8cfe60d79e00a4f842296ed91d55b33b
-EBUILD ksystemlog-20.12.3.ebuild 1571 BLAKE2B 19c6c6b9f224e4c7b866a0b82c63488a9216f768b583d5183656eeddcec6d60b17b958dc17ec96634da9ae7d1fdda3aa8a41f523d05e01bbc519d18b1e8b3083 SHA512 c4ac793c7b20f789e7ad8b0ac89d2862e2e87a0b7e7837edeeb875e8e779c8dac491672f348fd18d91f0bfaba9e8c38a7b10bc909f32c848a3b84e3af88a53c7
+DIST ksystemlog-21.04.0.tar.xz 1954412 BLAKE2B 2fc9e4bb6df9c0e4bb3ab669249e43b96b0802bdf17d7326326cbf39d664900e39eb643e1240131ea993ee93ae2167764a3544eb7f31f2693ad69bedd29f1ca9 SHA512 86cae582d01c83e909de6db76df5417f1a7303580d87dac3d26e5b6e7467185fa7a6a36f7a26ffd9b26116985c4d80c8f1e055efa1763353c54a1caa63fd7a57
+EBUILD ksystemlog-20.12.3.ebuild 1568 BLAKE2B 9db384b7bad70dd1638202eede075fcf6b50898e24c3e0354a4529dcf2fe5d1ca15ce1f2b4d8b226c3b8b654343787da0b20a3d1b9cbdc0e0106a22c32b4956b SHA512 32e4ef2c16b9b7c22c0ec089f3a02ee4da3757dde9f55fa267adb037cdc6200a7da946a01e3f92a41d5c3d099be52e89ca03d8b91405a95981908b56744798b2
+EBUILD ksystemlog-21.04.0.ebuild 1607 BLAKE2B 0c47bdc3bc8f13ba1dd86be620e2c7fb8744214544aab32cacfd5e7a981b4531c8fcb0a9e4ad2c51960f1be6c72029aaddcc3cb1e2a5add8f1c67a72430cae96 SHA512 acd388a9bb697c895446012845ca5be9868f4dd8c5336c1eb1d5302fa2f60ace113bff98c7a97fe86f3d4ba50c6b355f29218381ad4dba13af5aedfc1e45052e
 MISC metadata.xml 357 BLAKE2B 2004a9f41fec27cb3e4f75c4248fbc4b46a4ab7c52f2d23fbcaa3085e1580b0dfe9ad9980c2b7af0670a7b56860111235fbc21298a2647d5bafa0d2be0bf95c0 SHA512 ba2d8f62d75eee5e8edf3368ad54c0d4b347b92279c2de5a4d326536bf670c82e419490a3972731b698bff84ff10908c939ba7a416f4ce4de335eb914df4a701
diff --git a/kde-apps/ksystemlog/ksystemlog-20.12.3.ebuild b/kde-apps/ksystemlog/ksystemlog-20.12.3.ebuild
index 88c15e052cad..1c0cb58ad78c 100644
--- a/kde-apps/ksystemlog/ksystemlog-20.12.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/ksystemlog"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="kdesu systemd"
 
 DEPEND="
diff --git a/kde-apps/ksystemlog/ksystemlog-20.08.3.ebuild b/kde-apps/ksystemlog/ksystemlog-21.04.0.ebuild
index edde82dbf5a7..bf6009dfb665 100644
--- a/kde-apps/ksystemlog/ksystemlog-20.08.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,8 +15,8 @@ HOMEPAGE="https://apps.kde.org/en/ksystemlog"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="kdesu systemd"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="audit kdesu systemd"
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -34,9 +34,12 @@ DEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	audit? ( sys-process/audit )
 	systemd? ( sys-apps/systemd )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	kdesu? ( kde-plasma/kde-cli-tools[kdesu] )
+"
 
 src_prepare() {
 	ecm_src_prepare
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 43a421329f0b..ccb5b7fbd080 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
-DIST kteatime-20.08.3.tar.xz 294392 BLAKE2B eeb30e54d8618d538d32d46ddaa9c4b890099fe517bdef14acca6372de9a20d8b39f0c38b79b88892d6b76afec5c05f3a8cf90646d67a7abc11a73752bb4f90e SHA512 be129b79a7ba652e8baed2d5e8f8e09be948c1ec1386fa7e5e8460cc1a53200d163217eb85382f9bc926cbe26f5d6560aa23b062bcca3b0ff7adedb14cf38e9d
 DIST kteatime-20.12.3.tar.xz 294280 BLAKE2B 541c8ac13046080fff0c729b3ecace678d5a6d185c64473af35e61f6296886410bca2e591f8816f49f25b3fe7d4dcd396b1ff9d50eccf54be29535217c57b990 SHA512 98d6e376b4ffd156ff0b88d1b1f5574361cb9f92ce4365df62adc408a85c38aa965455db5088a86505a7139af690e9a3fcab4d06d5827470f28ce05e1da82eeb
-EBUILD kteatime-20.08.3.ebuild 858 BLAKE2B c11edb44704141a495ee46040d94b7e306c90e7df9ce12896b2d87b09497f11b754348e12e015f23feb6a1fd069f2304426c75952807dad276aa1eef45eabb39 SHA512 a8acdd4a9f7f29f864e9c01fe6b6de6ccb022109113f6c3fd931c96153e2a7b5c5b5133bf69c9da5402e641f06e774e69a2b526b7e45321a67783015362b1336
-EBUILD kteatime-20.12.3.ebuild 861 BLAKE2B 7fbc0e868aff7fcdffd395994fdef5c946e34007fa70e2a7c5c6afe8795558816bc50f5ec480928471cfd4bcc8f3045a39db4cb27169afcab7b1d8ccb82e11b1 SHA512 af93cf579f95c1338f41eb8f3add721f963f08c7b25073629a347884a908c29399e638e514c94692ad9d364ba9d81573df67ea1dee18161b13afba93b4f394ad
+DIST kteatime-21.04.0.tar.xz 295324 BLAKE2B a95ea6fe5e5d3a326edea04179108b9870e5953758d2aeb2c97e78da938e12f92b017fd2762407ef8efb4933a3e382e579cdbd8370c9c9781738b10de4f1aa92 SHA512 46d5c3a72366e9ef71ece6e3d6bda86f026305706477a7f6e08f66d356e7a980eed7634d5b664a78c0b30a829a89b039b6f2cf7ccc69b5d55b4b284b3c908b2a
+EBUILD kteatime-20.12.3.ebuild 858 BLAKE2B 82ec19dc453b5020747cbb17ee38116554a94947aa9d6e4349b8ada838d29f4f019779821ba098bd2c26b2a69772cbbb4182a7d60dbb2b54ae3d5179c8d2978c SHA512 a0decb2f1fccf101602a527b8c88ef33ba70bd21d97aa3fb6c09aaf9dff77360e45a31ef6a4edc97587b74532433c865b0587bde0f0c6dab4edcad90c82ff13a
+EBUILD kteatime-21.04.0.ebuild 861 BLAKE2B baa4fd133b5b12789de14a25c9517b34677b979995efe0bdcb7850fcc6f0123848ed2c8056c23e0a2bda57f6919c4b5b6b92a59d35e2b24f246d5645f8cba648 SHA512 23ddd3e7b21e5b6ea92125e7eada0847b57d07fda589cc19c3128a3eb1fca7de47f69bf58f24af678d2aaa1e40686e1a88750214cad9c4da3dc21014f32c1b71
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-20.12.3.ebuild b/kde-apps/kteatime/kteatime-20.12.3.ebuild
index 54521d115959..7b92368050eb 100644
--- a/kde-apps/kteatime/kteatime-20.12.3.ebuild
+++ b/kde-apps/kteatime/kteatime-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kteatime"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kteatime/kteatime-20.08.3.ebuild b/kde-apps/kteatime/kteatime-21.04.0.ebuild
index d80c995caf6b..c3be030f55cf 100644
--- a/kde-apps/kteatime/kteatime-20.08.3.ebuild
+++ b/kde-apps/kteatime/kteatime-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE timer for making a fine cup of tea"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kteatime"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 5e08ae2a68b0..9d0ecf12385b 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
-DIST ktimer-20.08.3.tar.xz 385496 BLAKE2B c55a60f0bc67ac395cef04b186789649c52b14a1c62a3a75998d28ec71bd4b56e8b8e0324a3779d017b5796cd199b9edac5d3e13c03fa6f2fd85e619da581046 SHA512 4e77fe7cf82b6eaa4b3565f8a57b18738f22941c6418c8378d8e215dd11b80b45c576ca5954400b8e9373e03ce61cad096ee17f91a32f3128e6f84c235362fcd
 DIST ktimer-20.12.3.tar.xz 386444 BLAKE2B c1feaa5a4a2aa8b13c24d1328985dbdf8b3903fea3ee571da4832c2dddfa6f87222f42851077c41fb7c9d77bcecc7ebe62c2f9d3eb7ed7426c893a00b16ede82 SHA512 3c278640bf5ce1340941f957ae7ab9050a9ba7b93a25ac9111f73cc01bec49b49a872363a6ceab03d0e893c65ad8228309903fbb993baead896a81ec389ed93b
-EBUILD ktimer-20.08.3.ebuild 823 BLAKE2B ff34265d661649d3fbd463b46cb4cb18ac79d3e730465e6fcf6c935fb907303bd2f16862a943ac22c3eb2de8e9bcd8d8fecd32daa42f14e1e77f942a85f61668 SHA512 a77695183a7328d371ff737cc38b27ad6a6be66f7d880a8ee62fab5e3c46bb3aa35d4d479592fa74cebbcf8bb7cf06eff6002d37843067973cd974ac1b5bc1d5
-EBUILD ktimer-20.12.3.ebuild 826 BLAKE2B 9ce9e6a0ce196bc2c6973e77864247dc16f2ba73130ed560dbff8d184f5d53c80d1c76ecf258a5724d47f585cfeab93e70340894bf1395d48f5cbeec688d15ea SHA512 e3538dde9bfcb28d146fd06899b637e12b927b1aac63f9b2fb1dddc29d2b012f373718499540f51ca512099394108bfe8117921a69d508f8546cd628316bc35f
+DIST ktimer-21.04.0.tar.xz 385972 BLAKE2B 717df328032f1c1ccb2afa7193c72392bfd51f42c855199a4203999a8b61042cedfbf2437b50318fb1003e178242783f1442142837ae1ecae8fa1bb2b77af4b8 SHA512 62d6b4605e700dbdb575ecb47d84dc0faa53d607a8a7ee8de40e257fff34437f2bc149792c821a11edc83adb85b770ed97c5e37fc02522e246ea79f7671d6b0b
+EBUILD ktimer-20.12.3.ebuild 823 BLAKE2B 9e7022afc0f3b56351ab300ea7d203909f619b68f8cfa63b00d52d2d72634d0ca2b87eb9f9b9748546c47a7722b9b26b4a7b1783853ffbc63a8541b91e84c4f7 SHA512 c28caba2174059554a5f70e4f1d8d7d563cc8e2fe53b89b96a9eabe09ca0e363c1d33cb602d1ca6487fc12868fe8aeabc55c1363f0d6b96416f0eeb4cdbb50bc
+EBUILD ktimer-21.04.0.ebuild 826 BLAKE2B 7bb671821246bc7cb516301ce80f4c185cdde34d805549302153317ed71ae7d4a776e25ba08434d7e61507523596704b5a0369011d8295ad95ee8669f0e66acf SHA512 d822e1ec0ab43b96765e4e64c0af0e42a4f1aebed71dc49bcaf7ff6da00a2d67bf5a816addc573ba2926a3e709952a92c1468f79fa6c66a887f8f6b4fe6a0e50
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-20.12.3.ebuild b/kde-apps/ktimer/ktimer-20.12.3.ebuild
index 8edd3f3022c8..5bde9ce4593c 100644
--- a/kde-apps/ktimer/ktimer-20.12.3.ebuild
+++ b/kde-apps/ktimer/ktimer-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktimer/ktimer-20.08.3.ebuild b/kde-apps/ktimer/ktimer-21.04.0.ebuild
index 873d91d34d1c..80c043db3ad2 100644
--- a/kde-apps/ktimer/ktimer-20.08.3.ebuild
+++ b/kde-apps/ktimer/ktimer-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Little tool to execute programs after some time"
@@ -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 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index a28e2997696c..0444a4f5991c 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
-DIST ktouch-20.08.3.tar.xz 4943004 BLAKE2B de25f9da88931b2b0ce6c2bb1953350cd4b9102385c1317f844b63eaf1f51d9af713274199c0aa4ab8c627e27fc49028e5ac3de5b819d370d3276106e3ac4193 SHA512 7611ccc2132cf02bbb1028feb0a4a25fdd466dde8cab36a3e6d2d711d8f71ebd04a2798fee87fb1225c7fa5e7fcd5d9a3fb7aed284729ded838a71026fb03d1b
 DIST ktouch-20.12.3.tar.xz 4942444 BLAKE2B ee1d5c0fe9836d6725eab0ac73d242b2340616f8c2247b841c0cc2bc9ffab58cc848b668c3600f97d57cf3f7efd83761cb529961e8d35f3d86ee6a54236e5040 SHA512 33041f31a910182969f20c98e33393cb53142e0ae69fb5717d1d235a3006ee931734a50a77f9d0336b801984ae0ba3e7295f46de82ffda90fa3003a0634ba968
-EBUILD ktouch-20.08.3.ebuild 1633 BLAKE2B 61a9debf85af1c507b0bb3ca40d1536664c9d52bee713335ffbb0c49abe7e7d1132d209e5314cff48658caa40dd10883c32902fbf557b4565e84d29d0e7c4799 SHA512 0996c1c5e5d0043027488ccd610c2e676a0920760b2b7938182dd626044d45c6a4777acff4dbbe8f1f32486bd5457b88abb18a99f73b83423ca77cee062b6262
-EBUILD ktouch-20.12.3.ebuild 1594 BLAKE2B 7d23ea2deedad2516ba4cd6b90f0b688e823225e9ba98a72ce9c7d32ebb384484dc70ebffdee8de456061b90046e86f546c0b8ac392116447745bf7330ea6332 SHA512 1b83c7235b6066d4bd16922f9b134a32b36cad4b59d4f09421b1663187c82fa114c5ffc564faf3124c63fb67d59eff7a3f13d793d51934ac361ad1c319e74296
+DIST ktouch-21.04.0.tar.xz 4944184 BLAKE2B 002b1a029c51aaf7a45dda9ff9f054299bb1fc1432810d9c9d858fcf524d9558e3d86d56144a96f65eda06630be8b0d2e0ce6f4b829e26162da1399b343037be SHA512 efb2364f9f0c55f670d3b99976c5c9f4dfc8a646c88481d475816f54c88ecc6dbdc49b028d2ff36e7848baf62553bfbe3ec5938a5f16cf9c84265e23f5eb8a9f
+EBUILD ktouch-20.12.3.ebuild 1591 BLAKE2B 6558b9c9c91cba2d503921f3ab69ebdf59f9bd0c9371071f85d76b6d494b64694ced11c9fd162f980270e6551bb4db8c8cca3da816309efcc2fa72e685b478e0 SHA512 61523149199d8427e27cc7298c29ae50ce3eca8db05be5b014ddcf254358af02c2b2006670ded25ba55f91c85597ba01b0fdc6833ba21826303daf18bd283042
+EBUILD ktouch-21.04.0.ebuild 1594 BLAKE2B 45f5fd6ece06e369652034d99cfb60600182bca48115e907d3941a6838e88cbe83c08876e45789eba840e0e4c2123400efd16d546fed9b58bea23a2122943631 SHA512 53577b8570f541480eebea2e6d3754f560b6ac5e45e73c988acf24d36d4c0fa211d43bfcc8d4960c11bb0e0b0402fbeb71c97764fe5327011d441a082a3a023a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-20.12.3.ebuild b/kde-apps/ktouch/ktouch-20.12.3.ebuild
index 8dba413c4a4b..39ab6b745536 100644
--- a/kde-apps/ktouch/ktouch-20.12.3.ebuild
+++ b/kde-apps/ktouch/ktouch-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/ktouch"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktouch/ktouch-20.08.3.ebuild b/kde-apps/ktouch/ktouch-21.04.0.ebuild
index fc3db8be2092..6852c8d85a28 100644
--- a/kde-apps/ktouch/ktouch-20.08.3.ebuild
+++ b/kde-apps/ktouch/ktouch-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Program that helps to learn and practice touch typing"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/ktouch"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="X"
 
 COMMON_DEPEND="
@@ -30,7 +30,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 034a2d2a5f1c..59f05aba2855 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-accounts-kcm-20.08.3.tar.xz 262152 BLAKE2B c34bcb3d0c11324eb4453be04267c2df9edeaef1bb95813f652e4eda34ee1de0d0f6a84b928afcb06aa3921cb73e8e6f517a2f3b2b17cc5665c018dd293efdeb SHA512 582efbdfbc16e27ba09aedfa2ca263802379b87410815adb2e55f3acac122a4009ee827115ff8ae01b28e0a2bb0248b9a8f92326c63e92c1463c18ae094edd16
 DIST ktp-accounts-kcm-20.12.3.tar.xz 262196 BLAKE2B 6e2d421babf2c3210ff17944e365c40cd02210cca4c9032fcc10d8664cbab27b759332576cb1dd157fb6543beb01339f765ebb96708d2fa368f7051901d8282f SHA512 97bcc25bea0b680b25b8874fb66eb916dbde8ea4d8e16159cf8ed80f715245863d62cedd73f6969369d70efa8c0635ad7b72945e4e1fae1bea746b6410d63c4c
-EBUILD ktp-accounts-kcm-20.08.3.ebuild 1598 BLAKE2B 3162b89bd36792d6adc30570675ef76195a9eba6cabe6a6b8962d82d708a171e7b18f5a378535c39bc27c3ac594f26310979af0b2de7e66eefe86bcb6748dd98 SHA512 f54bca66155c6a84f99810d693726008bb86e15e3d2a00fb25bf8d16160e0e636fbc3de9af4366cc67ee861addcfdf1b464c140fd6e80fae3ddb69bb3fa62b6a
-EBUILD ktp-accounts-kcm-20.12.3.ebuild 1601 BLAKE2B 04b294b76db3a1b846a2b9e42a40434092e7f9c87f1f9c26c38f24b82f3c122a6057b96e35f1a99578e9c0f51879fc9906b84c594d73bdb87815fb05befb97a7 SHA512 4324f0db28be79b37f5c265d0b6de41f30234a5a3eb7496f95bcd519df8e94d846264caa6ef713d565f5fb876dd9d744a3b0b33aa821e7393eda5c2261fbccb8
+DIST ktp-accounts-kcm-21.04.0.tar.xz 264080 BLAKE2B 7159400df0c59c5b41393996ad352009aa0ec8cd20f0474b5da8ad3b82f9afeec467d39c9ed1415bb1cf3d1aa7ff8a0a460c7c9d17221688467b4979f719598e SHA512 efedaca1a7f840ac45fb7e83d9b1e62dd9d649e0bab6a216281587b4b28354863b7580a458f89298bc26fe690ed618abc09c96db02f16fc45b2b49a997090992
+EBUILD ktp-accounts-kcm-20.12.3.ebuild 1598 BLAKE2B 2916a451ca4b3f4a2ad3043d09e7dae9745d182bae8c4736caab80db4541cbb029e38bcdc759d668b5db0a37cdb219f9d5b46aebd897116ec84fb12895adca03 SHA512 4437d0c018c29755e17fe0cbee7e45322d0a9e7a712ef1c5136f895bf712ad1b87c1e7f1117c48874242ee9e7c766e537bf13f7de7f022166148a9f51e3ab31f
+EBUILD ktp-accounts-kcm-21.04.0.ebuild 1601 BLAKE2B 40943f36ffb53734be9917da9a4dc74e438820a91bdf27decffed86ca7abf5f3116bf37de4ed331a5bf64077a93e10626ff33a91c42772369bff6bdabb09a363 SHA512 462b5d632a1a902638467e9a7b2cc5f90228775ee1af2baaec359edb568ae65f0e111749235c11b1515b9048cf4d8920ad3cfab87ea1e1b4b919c11d6c8538d8
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.12.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.12.3.ebuild
index 7e687ebaaa77..f8cb4c33453b 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.12.3.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.12.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-20.08.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.04.0.ebuild
index 9a1334afa1f3..e6b034a0a4a0 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.08.3.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy account management kcm"
@@ -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 bc58d72f367b..56435a338049 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-approver-20.08.3.tar.xz 37344 BLAKE2B 80283810dd22724d792bf867db29fab5af39c813792ecb0251e8c964add8df0335d0e79410a60171b98a950e0eec1c07d6db30c988dbb3608d48fb970905baba SHA512 df4a451a65d3d17f6f06affcfc0fad72ea01073e6d694480ea0e52953d3eeedf55975cb4188db5a78726a8725f038002408e000dd3139c75a5f750d3d70d95bb
 DIST ktp-approver-20.12.3.tar.xz 37304 BLAKE2B 7ec4406f026fdd8c8b9d49a21449309af8675605a88d057144941475373206fbcfe0e7349fadf760aba45b7fb75bdcc895a395735e587f2145e0cc17db4f66ed SHA512 0f7c578a69ff8820cc1447ea311842385c1678561b4881bd3bcc2dc988fe12a812d499d0714b123599906e3b75d5eac4f2102ddf309b037b5614935bc41ea0f1
-EBUILD ktp-approver-20.08.3.ebuild 761 BLAKE2B 3c906b6001fc37d1410cf2c02fa3bb5baee3bb3c80729cb75f10fd545d3784b19da852b49c2b0cc6121abc50d87ac3024639cf37d8c7d4adf5aac189c1fad6b5 SHA512 d7b971d23f319d106b154ecc0af66ed6c678ce7b4a9458e0382fc1cac836a0ae6b634ce5694b7eb59e9a0c33c45f169633d6187db253be81fd108ca0cd006678
-EBUILD ktp-approver-20.12.3.ebuild 764 BLAKE2B 62890a30b24fed10afa3e55dbd749255070cfa31587b165494e0ef4ba54028e86a23d27077b030f5e0101d19af7c9e597981a1cf33bff01c9488052ab597b72d SHA512 670330b73bedcbaf62dde96837da48b0c61ea7c051e1a44ed7375ca8584d72e8b1ec251424853c54b468ac4e02b97c3067f0dd4715681892fc540f27e2b31013
+DIST ktp-approver-21.04.0.tar.xz 37484 BLAKE2B 70194fd3f328a4349efc34d5d899fbc6d3cab12f90b9caffa441d0116b54c9f15ccf6bccb09cf3580c7d6b57759eaf3eebd8c6b9d922da386d663cd07feecbab SHA512 6aab520a12e47afc1162620702510bfec0bec515cd3ac05cc4727d1a4228f693c703fcea9b183335238e5fa9979104cec96f0f3c01b2a85bebadf1c2f1892e18
+EBUILD ktp-approver-20.12.3.ebuild 761 BLAKE2B 10a415be8c5ba6037e47f49d4ad99c5ac882e089ceaec50d49c76b54475f00b46529c0886d17c4d852883c06a96ac8ccdc273750e2c4459cb788105c4b189564 SHA512 847b8e724d7f5a115da598a523fddfc1b1381e4e8290ada33ebf5009be7c448244437c1c13dd9890029695591233422b9b30b9c50efcd0e755563a6b290c79bc
+EBUILD ktp-approver-21.04.0.ebuild 764 BLAKE2B 09391e9cfe1d3cef204e2a30b5d134abaaa6e6bc5ae80e1c6f6de6b0452c7e851f70558d1dbdefb07f9150f591dcc63ad4aeba39d4409cd81c9008215f46f6e2 SHA512 bc508058e3a89030de9437e7c6ffd56f3f5d65066f0498ff0c0d59699c10bdc2d36596d73a4be9040a64e184368aaca4a3d04735e03f66ef90353ee2c26dea98
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-20.12.3.ebuild b/kde-apps/ktp-approver/ktp-approver-20.12.3.ebuild
index 38097d06c8c4..46eef30b1124 100644
--- a/kde-apps/ktp-approver/ktp-approver-20.12.3.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-20.12.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=""
 
 DEPEND="
diff --git a/kde-apps/ktp-approver/ktp-approver-20.08.3.ebuild b/kde-apps/ktp-approver/ktp-approver-21.04.0.ebuild
index ff200224844a..e9de69ff368e 100644
--- a/kde-apps/ktp-approver/ktp-approver-20.08.3.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy notification handler"
@@ -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=""
 
 DEPEND="
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index dada0b397b60..8b972fdabfc9 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-auth-handler-20.08.3.tar.xz 46368 BLAKE2B e951c09138e335315481cf8f1d9a209e6849e5704e39378539d2b4663e8882e6f5e0d525b8723f93fb39f1a47ffdb03dd56dda75c4f7f2fe57b708ee8af3bc4d SHA512 f8cc0a952d92c695da6b22a60fc525b10c63b9f43062fb62124b163bc3aaf8c6d2204b50c4b924c46ba61290b73c14de22363382b063bb24bf68d077309b33eb
 DIST ktp-auth-handler-20.12.3.tar.xz 46328 BLAKE2B b34383d810f38bd428f604160cbefdf1bb809c955e6333d9e3c01329e628dcc70dde1215fa3217c7da83ee57238f400e9b28433cef44fe5a98289b29bd755abd SHA512 226f101d6d947d5d29e749336c9f5ed084ea416a534eaefcda4df888960eed1841189317e93c8b2ec05558a68a57be75f6afd31256bea97ddbf8257d542f68d9
-EBUILD ktp-auth-handler-20.08.3.ebuild 929 BLAKE2B 1f28e9497118ee056f1710cd92c3fbeb03735ff917e7645f95c6099c9795773b5cbb220ef90881730f14224010c1f5743014fda976bfe667c1656a321517b1b5 SHA512 5720aca43cf7b513f7e43b2b08b6f1fd602fa7a0347b7ddd9c44880060c67d5d574af839c1c1fd4aad01ee56eaffb8a1b56802805aa0861e3630e395134b3465
-EBUILD ktp-auth-handler-20.12.3.ebuild 932 BLAKE2B 565929173a270e5d2d7c602dfd6f65667f28b8fbad4b5a6e470edea414dc985af2a5399e3b4b8e2a6f2a0ed9fced4ef8f25c8c1a50a96542b99d591d48ddab6c SHA512 9c06bc9ef77959089f2be567a0c2b646eaa455e7c986b1e5e781a61b1a2fdfef039415b21eef4da4056916bab094fca14980e8a626c651c0ac8d1209c92c0748
+DIST ktp-auth-handler-21.04.0.tar.xz 46656 BLAKE2B 09dd55e2e9a02fb9779380b0a3d59ba663d1fa04a8cbc755aa950c9ce47f5b5483f2d2e88299a6865ed37e88f225b94a2287db803fbc247acd7cc8fb613e3938 SHA512 c6937b5332a5f60e9baa030404206f3513912516c86863735e4709d8bee60e8b99614b38fd5c74dd6aca3b9e5b314b3cb635e33bb3fa66afdfe260301bb9aa1e
+EBUILD ktp-auth-handler-20.12.3.ebuild 929 BLAKE2B 8ce4fa3c6217a8dd560182d9ca0c9ce4d2552fa800876759ce449e3e364a8892755de73dcaf2d8706d98a7e8070a38e7f0e201524741b7da06e5cfab02db4769 SHA512 c162a9bca3a88e3dce1b92ef6440f5a4d4564de0b9cb56837503711b23f9611d9cd07d2031c6cf513cdf6d1a9033fe8573c8034411cd1e18248ae488caa196a3
+EBUILD ktp-auth-handler-21.04.0.ebuild 932 BLAKE2B dae10210ba2ed97986057d97dc2ef987361e44ec2d569a69a2f9c2e4ea542cea6a9e369a589840510379e7f20ac8d4c3de9ef4de70be42571c2526d78301bdb9 SHA512 27a1f26a636b91c6c8183d55fc2f43b1ca103de10448e9471db3efe6b2cef85435970239e0585272268ef871ca543e9d8379030c84de108752d8757ad4b2b3db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-20.12.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-20.12.3.ebuild
index 6518070ce830..c7b86a0ce8a7 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-20.12.3.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-20.12.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=""
 
 DEPEND="
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-21.04.0.ebuild
index 99e5dc6abee1..bd7112963f26 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-20.08.3.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy authentication handler"
@@ -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=""
 
 DEPEND="
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index f6572ea0fcb0..3c82a457803f 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-common-internals-20.08.3.tar.xz 449648 BLAKE2B 575d1ab5ec25102f3256254fc3969de8b298f665aa54129198e7b11bbc7fc16a4e4ac47ce30329e61e6e263d1bac613f4f1df24e27cd8f28ac0efd4be2137758 SHA512 aa574c04b0d9aad8a736eb8263ff83596e11411fbe63eb11702df455bbe93ff5dded5148ad1733875a0d1e9c0b2519aa141a59a0006e674480e73338ecaaadbb
 DIST ktp-common-internals-20.12.3.tar.xz 449572 BLAKE2B 5f7d28a9b0ff22dffe2f6670dd4a2821f0d305741e5334ef88960907e4571e1053e4b6ef5f4d897751ec6fe4e356c2a7535326e5d63a8d7e5613c003cba4d465 SHA512 217a4ec724f0a6918254637546367ecd52f5f0688bf754e582b6e8596a58a120e5e19a9933af5d0f4d4d2cac207edce4b55a602f8e3ab1493a21e071ca135b49
-EBUILD ktp-common-internals-20.08.3.ebuild 1711 BLAKE2B 7a1cc07f784775e74954bc98221d14ad536eff4a7ecca924277ff49be01002578bd58c70b70c369d6fbd271e16453199143f446927c9e55c919c8e8fd41ee156 SHA512 55f0c6069af1bf79602b147786eb0cd957132e11ec084b3634732701e7e0ec30e9f91bfc9594a143b2026fe54a83b0665530abf114f4bd01cef98f67f3d6afad
-EBUILD ktp-common-internals-20.12.3.ebuild 1714 BLAKE2B f4a1e001ddae4ea97b911d1553b5114064a744db9bca2a30b98cd2d71bc628842e0bb8155377524b2318fa07d1da7485adffcc83bd7517936e2c6ad0a199d248 SHA512 a560306062a53ef7cab07ad234fef0d158bf6fcc3b02976a9806c8639ee44ad1772260ce96bdae9fa0fe921cf51f98e783596760f9bb46d991e77cbb2e2be869
+DIST ktp-common-internals-21.04.0.tar.xz 450660 BLAKE2B 9fb839a80d52a7cce4731de777668bfb3ecf896cbf132db03768db90b7bc120357e13019b597e76cd194011d40ca14c1453647ad77c936a58650eaa79baee08c SHA512 5f061faf2a89c7cc046e6da3686406f0abee5a7f6de2919937e904dd80c1530657378d1dee85980ca540c243da541f9d979f078318fbf545b9e64f218aa1300c
+EBUILD ktp-common-internals-20.12.3.ebuild 1711 BLAKE2B dc4ecaf546efcc29c09a7ec060d5d2640bc3772bbc4e8a3f44ebdeb7215cf721f98e3d8127a3435d17b13a45dab422aa28198b951ac138a16bf27c30760f310a SHA512 d34105ed351cf2e698ca0767d72c7f6044c49ecac811ad2be9cff7381494aecbca6ba98f11a1bfae5f750bfd0ca2d0bfe6ce262520d2212b2ea40fa07dbcb95f
+EBUILD ktp-common-internals-21.04.0.ebuild 1714 BLAKE2B 4c71beed06c62a0c9d86967e1a686cd4d4e716ad7302595214698c16f98b26321f41c971456821469e573f78d16f737968edf90ed7728610571d4427e514d4da SHA512 ad657665ea022b339a5c9dfba754051c92fca2524f636cadcfaae129c9591e627e2223f6e711ceffddc14c6065e0ed2f596db084202b7ad7016e55edba4c5ce0
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-20.12.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-20.12.3.ebuild
index e002ab0fb81c..fa0d44e69d42 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-20.12.3.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="otr +sso"
 
 RDEPEND="
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-20.08.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-21.04.0.ebuild
index 7fa1b99adfda..3c5b725d5448 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-20.08.3.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy common library"
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="otr +sso"
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index 6b859b182b03..973c75b4e9b8 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-contact-list-20.08.3.tar.xz 150020 BLAKE2B c321d59ec73af0492a818f298fe48ab1392d0c1eec9bb9b1e6aab4677886c49d72b5aa85c58758fc23f9831934bf17b282f7bac1fb166073ea5a438a13db93ed SHA512 abde3521f7bd57e79d650fff56ac960487b421680cfcebbf079991dfd355c661c9215ac63fb808dcc23ece38fa596f054dc16073c5ddbb97921c1c96cbbd6ce1
 DIST ktp-contact-list-20.12.3.tar.xz 150320 BLAKE2B 9bd482ee79600f6dc37c224a6901ccaf8b31d924b1ff63f6a304f4b92454e12d869c271c16d003812876eccaf6f9b2d0037aae1271098ca07a3b0d5b22ae52a5 SHA512 54e946c452bf0a7f22c4b1c679d99f76024f39e13c49bd6c52365178b6a1a1df8c76d6e223e1191def79ca36140b6f5e683c35320705e4854c9c09099f8e2da0
-EBUILD ktp-contact-list-20.08.3.ebuild 1183 BLAKE2B 34d394b6fcd105d2673a67b0c6610f622f7fa2df451881ed15a89312fa3d913457ed5784d75c7c1d391aac66fbec60653d0f69859d669e62346bf65dfc3c1fe0 SHA512 8df9a9599d13c889dd34b363a2a11f0cb8a2b89a75ae10efa919cb8bf142e39e3650792050935cb4a58e7b692598000a40c501ca1bbf1b3a625c99bda8df419c
-EBUILD ktp-contact-list-20.12.3.ebuild 1186 BLAKE2B bb6a96806094120431cc5d6a674f3cd20c32dd77ba1530b43b68e711ada0ee0a01801647eb60ffd98e06d66ad2e3e602f0e970a6ee12ba2a4e74377dfefc6089 SHA512 2245f2b6d499d411d0de355c84ccc0a99e9cbcd9429fa545bcc105588179b0ab411e247f5b4bed6af27395e5b32f3e70e979ed322e5861d62c01c7a2eceff2f9
+DIST ktp-contact-list-21.04.0.tar.xz 151152 BLAKE2B 28ce33816c714bf6425bdd443e022e363e1b188c5632b4eccc470087baf51699c0e2bc4f2ee1eeec26130e740e2f97433dcab6f215a6920439cc7c5aa720ad48 SHA512 373aa5f2524ef756e050845e2dbd8142d7fe2b9d2a2bbf2dc4448fe5fc5df3a1ad449a23ecfb6675dd07577b721a2fd609d3862e0ea60ee3efd02c5eee93983b
+EBUILD ktp-contact-list-20.12.3.ebuild 1183 BLAKE2B 6b5b7583564d49636db380e8e2b3cab258a208e84b1ad5a60bb5eb025e6ed5267558f9dd68eaac02e9c4de724766204881d294d3cb8d0b5bebcddb2dee724ea9 SHA512 f25ddaf9900326c0cbe6f3be9bb2f66f98f7c60a2d7a568d82dac063e398beff2835d60ff354bc2f702db954df909f497340570107013100b3374671dfd3fb59
+EBUILD ktp-contact-list-21.04.0.ebuild 1186 BLAKE2B e39e6866a14514007a1afcf828e392b44f0d4e27ee43cb85b7f96b8f51e536298558fcf4a45bd370706a0403fad4fed7cd172758691831d541d045ca59ad7321 SHA512 9653a993245873b16e0458e576b063e2ac6dcca757b2462dc0067d4a3d87d4d45fd2838ae8dddcc3661e76c8ba98be647761d5399366e6f087ec32e5ff82ce8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-20.12.3.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-20.12.3.ebuild
index 67964c12d348..487971807238 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-20.12.3.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-20.08.3.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-21.04.0.ebuild
index 1f05d8b74708..70e60446a67f 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-20.08.3.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy contact list"
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index 4278a2c24145..e6e44c055e27 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-contact-runner-20.08.3.tar.xz 42940 BLAKE2B fa7397f8718736ac51fc3588c6b60701b422207365320fed9d9467054328ff206d81ec67af08ff2433fbfd256bbecbfc0b893b78df8ef511c8d5311ebb177b39 SHA512 8e7b9acb088795863589e1e1549fe012a4a1d721d9a1eb0a488ad1badb250a4c0e7bf0fc0f6b7c9d5e51ce313f0a6aa2d5ff1ba9f4d851ee3e8cb20f620ef032
 DIST ktp-contact-runner-20.12.3.tar.xz 43084 BLAKE2B daae9c0c2fd9898df4797ab0bd09daf903915a46a8f3d2544330f58f889a3a7d2f8582a5a500aa9baa8585c13d6e5d6ba5f024050c4a68918239ef9fb5543923 SHA512 e714c2d7f9274d1f5689f140a0609ddb5bd1e9a0d3760b3f04e656c74b97a9b32090044940a49689801a2fa749ccb33b79ba58ef413be6a7a22343432305c6c0
-EBUILD ktp-contact-runner-20.08.3.ebuild 675 BLAKE2B 49ec2c0704c6c2af422a0adfb66d9e7b173d7d4847147fb820b296e4324d8ed23902ae6be1a2a3e46dde00e7f752ce099c6176c5d28155ccf312c416ed4aa1f9 SHA512 8abc042103e9fe8dd9c9ef2e959d179632817ae2dc97cc184ae076c5805e24b91072583e232d2485816b1ec694a41c9f663be2adc39bda562e541727e1e3e5c2
-EBUILD ktp-contact-runner-20.12.3.ebuild 678 BLAKE2B 7725adf74d127a843ba369927a380a688ee080a5340b344d4af67584d8929e45e76eb2a0e984e2198b6f32d5cbcd338ec289c257a662e97d82cd84c11324a25e SHA512 c1960c847ff9fdca1717f959694869badc59421b2ca3aed119edc6613feb108b60d601663056228e9f845cc44efd382e4d75cd07cafdded424cabf7de1c3a825
+DIST ktp-contact-runner-21.04.0.tar.xz 43240 BLAKE2B f2632a9c5c38c47e3660da1554e0538124ef828edd56f14e29755aa6d9b675c9281f62b2c324d512aaff4ecc4a08d292b52fbdfcd9463ca09b6c19717c308641 SHA512 fbe258038c075e0e265d51f1024e8837db068d573f7d75ca2e7091fc75182f818d07e9a6ce5a839581c2def2fd6b1d8de68545c11751658f8d6992f7a4be59dc
+EBUILD ktp-contact-runner-20.12.3.ebuild 675 BLAKE2B 1390d899eb948e06fde044f6f13e448ccb1f65a87701dd6a05808e63da8f4f96fa4d6e914e2c47ebf5f254220f606b899fd471201a8cf87c3b61c26b13f5a0e8 SHA512 7842edfbc83e6337071db386364e8afb86e3184aa7b760174c68a43b334fc56f46f7fc0f14280852feb21b786286fb53a7e8d3356b4d76b6527f4fc3c0e7f66b
+EBUILD ktp-contact-runner-21.04.0.ebuild 678 BLAKE2B f4db1f79809eefac306a53aa232354c196ef6f866706ec939902259cb610e591c73ccb667cc03542ec29dca6d5c5cd163cf00b6a264f7aabb51e7998044a90fa SHA512 02418b36fa500fed8cbe5392aef0c77fe2a37a948f34b01a05c940332996ac031c60ac8b4e7d7a98f612b70d9b86b37f88e922ea5572dd21777d1dd0b570dbbc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-20.12.3.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-20.12.3.ebuild
index 12c02dea45f3..69abb592a118 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-20.12.3.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-20.12.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=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-20.08.3.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-21.04.0.ebuild
index ba3e605f13e6..3f8279df76d3 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-20.08.3.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy krunner plugin"
@@ -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=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index e1e1c02cf30f..d7c00821ba04 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-desktop-applets-20.08.3.tar.xz 43684 BLAKE2B 332e56f38d1866926a42bcfb8e5ef7ec2d90ba1446fed1d687359d437311beea9d7cb3fa84c6901a51e7a656aca5ddd84844302ca8264259e0cd55bb2ae39a1a SHA512 01f08443be107c86d5c8ddb8c127eecd375963ace051934f61d31d547af0c6831f637e70d2097c33984eab166a57a0990f08b8d55d74ba83d3b46f9ca2f7722b
 DIST ktp-desktop-applets-20.12.3.tar.xz 43704 BLAKE2B 90d8304eb8cdd20635359b947f91774ad28668aa917571d9ca1f616b06c5a1f3d63876497b0c500e989c907b53f542114eac3926e5a19bc900eb0ab1139cb93d SHA512 ef99274d65cb0bbbe1796402230472f243f331285ee69e316394c6a37fa87939c8a803b65ec68357328f39226517103c98f270258c5c7c9d3470865ef97dc325
-EBUILD ktp-desktop-applets-20.08.3.ebuild 615 BLAKE2B 32da2b9b9bf2ae91f66037ede537a6d1880569907e1093f9b894ecb044935ac5836848042c61b53f790a57f56d9c6651ff29e388b4c212e74f78449040826f1c SHA512 4aef66da8cec040904a0fb0716548431e4173f798dbe3290c66a5dd188dd82a56190a03151b3de0a255e94bdbe262e61b517ec955670fda921fe404216ba832b
-EBUILD ktp-desktop-applets-20.12.3.ebuild 618 BLAKE2B f0f041fce91b31d58ebf7744d11366284acfa36c62cb021debb2bb5bdd810cff0a271e97af056b18592b54397d130ea20bdcabd9c550b337b3a5f797db5645fa SHA512 cf5d336b13bfa85379da1cd83f9839fc5c4ff68fabffe806ae032ad2c5abd4807207641d85e2bb63503f09b4b2c75d3bb53cbc0eb35e603f9e22dc375014fdda
+DIST ktp-desktop-applets-21.04.0.tar.xz 43656 BLAKE2B 0f307715452e9691da4d36b2e31a974a3543ac4b206b395e58e0d9caa7ac019998d208a8f34013fac3c5d9b56c573893c53339bf0dec92b870f2ca1aad4e06b1 SHA512 7b4ca829a6503a42adfef711420bb27412bd487bfac81011902cfec87c50c85c3f81a4145cb45695ba9054f38854d518c4305565c8c9001212c4e2d1f34c1a1a
+EBUILD ktp-desktop-applets-20.12.3.ebuild 615 BLAKE2B 7202371c37ac36aab9998de03a38c113531b822d63e3ccccdd29623e6e8716f21950b236574612ac0ad4448c9a607da37a9d6f46d163486cb8e60135a9fd3689 SHA512 3ac835b24e15222f2c4028ba7a680f96f893593daabf934c1455401cab8e2ace114561464fae8959c1014850fb0f3db401c90f72d43d993ec53ccf84ea53ad43
+EBUILD ktp-desktop-applets-21.04.0.ebuild 618 BLAKE2B 9390935c582a285186613a3f78e602876d7690437f163bdc0cc434b490a82628eeff4b590f5a032168a3f871d321dc284e5cb5992718660c5710b336ca457e8d SHA512 cf2d885f8d64dbe1a57f5374400a4c26d2c4f38164d4b792ac6ffe9e848da1b7c87fe964478a1251c11fe2fbd449e54f0cc55cfb67e3dfe2d442613c0d14d097
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.12.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.12.3.ebuild
index ee14fb0fa828..2140d4ff9b88 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.12.3.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.08.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.04.0.ebuild
index 163fbf790e6f..830c362ca307 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.08.3.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.04.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
@@ -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 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 2bd0604e9dd5..ddb640c5e13d 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-filetransfer-handler-20.08.3.tar.xz 46248 BLAKE2B d8494017fc10f7be275d284b9af460f84f1186c0bb944d3153401397a3e37e0089dbcf572c9d129e424c874adee09cf50c97c93ed8b55c80019c3b7cf4c54cbf SHA512 8d9d2a4939ee0d8780dbafa4b4df7bc04e8a661dea177784be24140dce313667aa9ca2a0e53e23db8ca03030ed6a782ffc51d120c79b9fec7fe08e12df28f5d1
 DIST ktp-filetransfer-handler-20.12.3.tar.xz 46208 BLAKE2B 341e042981ee093125dd31152e5f65a8f83b94dd626a8f905799e0128f5687f068f4d1e15cbd52e65b0a3b22422c78d1449f48e4b14a5f68a9290b907210fcaa SHA512 b1482eaa8e18d3a0238d3e885d3f6d3398487f772944239bc807ee0309adb4ee1bed010dafd7a9bc149eab39085e4689c6f75d97bc5ce43ad17bf1b38453091c
-EBUILD ktp-filetransfer-handler-20.08.3.ebuild 691 BLAKE2B 2cfdf2908b87adb249da380fa7deb499b0d513780f2590cae275f3f02a347b7d301b1f7fd5fa5197f2b97d2f4ddaee2e4ef8eaa1f0c555cb8c868a3e4056bcbd SHA512 5238606876368902de0dcc2417c78a41971e0afa084a8cfb400d179266a562a344ff93babb7a488765a0dcbda4b28899ac441e69d9f6c026fe176c2cf0c24b98
-EBUILD ktp-filetransfer-handler-20.12.3.ebuild 694 BLAKE2B 7dab05f87cf5c44fe2c46d24facf188497190610ae14873ae4750a3d3aa033270a5c919f2cac391bc0d9da7d6a19014b1f77843fd75bd8263541396478a9f312 SHA512 effaf64f9825147d30b3d733add25c1009dbc3205fc57241378c0f2ba4a5df7bc775c96924de672166ccffc7ab5ff1eb9db85cd94aece84a851364676344a849
+DIST ktp-filetransfer-handler-21.04.0.tar.xz 46424 BLAKE2B 69fffc78ed1e324f9155a74e69c98d24e6a1efa497655b1778738a86c88d5d3a7159bb4c0a50bd5bdb959d6c04fed39e87bd2b23557e5703f0b650ea997676b7 SHA512 abcd5e4d8b91f0d661af2d3e6f1bea0415b6da9405f6e85e5536bb28092cbd12fed9247b37ebb2ce087e9bb68f8e44576409a0e82d709272b70958f16c7f1beb
+EBUILD ktp-filetransfer-handler-20.12.3.ebuild 691 BLAKE2B 99ea8fe27c2db16a888df4a2dda9873469af198a98157c664e505e172b721e3e37325032bb7f0bfb9e37b86c6f84798b2fde1f226cfbc0ea22551b8e04ddfcb7 SHA512 c816edd3d7efda2e3172e469e878f75804182636daa8ee93292186adfddac2f4c412b25324de7b325e5ea69182f2ca877f224cfe995ce51e9b51077501a46ef1
+EBUILD ktp-filetransfer-handler-21.04.0.ebuild 694 BLAKE2B ec5c88ad08577f849e766994fcceda93f47b6cf34af7016128be09195c4aad7b55143a91970501ec2405496c5554bcadecefffa754ac3ef4ef97144c19cf63ac SHA512 a22824bf6030502a73817b11fd6dcc6dbb37a16ce5238481ff61e6d86251bdf949269ed2a267f917dafb6c235db7e33dacb75445d09680c7d92e2d256988ecab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.12.3.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.12.3.ebuild
index f9146c389011..2b45d6d28132 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.12.3.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.08.3.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.04.0.ebuild
index 2e089cf29de5..e1c864299142 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.08.3.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy file transfer handler"
@@ -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 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index 8bf58b9d8414..b3f8236cef94 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-kded-module-20.08.3.tar.xz 98480 BLAKE2B 1a8e535d578ed086bf4b01dcc7ba6fb908493f097dee640a5388af65cb7c371c0f2492d6f8f57f459e8ed5d6f4cbb242c2c47b34842fe0f7a28c50887f4900ae SHA512 8f8c58a4f055d2b4a4e40e991b2c2026b1954f289a1eaefd7058c7e5eaa51d4591d15b785137e15f36264e203af37894fde5dfd93fba27977d3c8c707a49c2fb
 DIST ktp-kded-module-20.12.3.tar.xz 98312 BLAKE2B 70951217e2881c48af5862ce876df74dcc9a4ceba519c0f88bf9ae0a99b4bf5923f9d68950a84270206988a3a19913ad69526b43a724c15c879b6c16749515c5 SHA512 17ba3d45ce0931f42de09cfa4b693e88e77ef67f08ae35faf56f5d4d7fdefe28501be554c7ea279d6b1183ecbd46a99552e7316b19e2e85a3ec5906a2c285b3d
-EBUILD ktp-kded-module-20.08.3.ebuild 1107 BLAKE2B d72585cff4138a4083a0884536f1f38afc73f6606c56d5375f54be585ba50cdc19a7dc18ca6ef122bdafd15f0e6e98fe83bf98f7eaad3024936c4500ab927e71 SHA512 3b54f513c8029a71762130485f4fc080691c794361cfcdb9da58f54a6cf95f361ef06c72abb1883796bd9ccda2241a97a1176b898bbb2ceccfd58e1368285ee0
-EBUILD ktp-kded-module-20.12.3.ebuild 1110 BLAKE2B 15d53f33415944a075db11f1bedceed4dcfe83408754f6ddda6a38f4de8be5b188cf2b7a258fd84857da9a2ea4aedb6f651f069a00c3bdbc60502cbfeb1beeaa SHA512 82df4611bf8e2b7e2d585e1b546552e6eb6b086e8300929241618beb5b66f74b4b1a0b4f658ad51a81d4508167e84ff6544333fc3dff49d1e671514c47f73b99
+DIST ktp-kded-module-21.04.0.tar.xz 98884 BLAKE2B 063421d634d321f719cf78d04a8991ab2b5dd803bf39ab586d664b0369dc85d0b03d0ca13e3f5db406c9771c53a3c5266a57f55a974da1b040faf36fe20e46d5 SHA512 098c12cb66126599bb024162657e96428abe085f1813eb850d4d844db9418c327987deac1801ec0c0bd7d39f8ca02871ea80ae1631a9bb98b672b7d31788b589
+EBUILD ktp-kded-module-20.12.3.ebuild 1107 BLAKE2B a6d24f1fbbf5629aca6e497c2643031d6b0f5d7b32e590298ecd031c7c948a90feeda6a430012f4c218e14064657e8730429a26e6182c807d88e571d9c946903 SHA512 00c5f481635216b5fb6262108e9c5e3a481b25f727a5d11e455b6b84d6390b3888d390e11810168b26716d92c58e2b9898db2b609120c0876b01cf2811a1b725
+EBUILD ktp-kded-module-21.04.0.ebuild 1110 BLAKE2B b6eb1a5031e6699b8142c220ad052f7e4bc16d10d3ea12e3ee8a7af2f25949a1ed6da2472b2bfd5d99b2c019c4aab1fbb173551b9d86a19e41f97e3c0acb136a SHA512 4b48405bb90d67f5d9cfe1a92981cc07266184c9c6b4532f30870217ff69598d0f430e0703ee4fcbb81b330d25f3553b894b592e15c3e3daee464aec610cab39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-20.12.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-20.12.3.ebuild
index 70a66d474ce7..3b35252e54ed 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-20.12.3.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-20.12.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=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-20.08.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-21.04.0.ebuild
index 4c54812d33f4..c102eff6d523 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-20.08.3.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy workspace integration"
@@ -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=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index 8a95a9ac3750..464b88caee48 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-send-file-20.08.3.tar.xz 27824 BLAKE2B 739aa72b1cda196924b4e2a072e590df5ac7489447cdea13d94b7aa26ab44eaa32d579bb8374c0b90c03daba0738dbb6126d31123bb639d82e00cec4be64d11f SHA512 bd7c2a2f20376ccecbabd41f87c0b5d45564eebb77fa9eadb7f81782562c7645203f61dd8797a6ccb9d5c4eb19c0922ccdf553245197700fc7cac3293ffba2e6
 DIST ktp-send-file-20.12.3.tar.xz 27816 BLAKE2B ff30f0d69d4a9c9bfcacd226c3261dfc9df7d998ab5e265eb2a6cdf183ad3c0797ad55469384df69f9c2e7b3bfabd551d3937c3cadbee90d22e670db0d20453b SHA512 4b5766f38cc4c83a61f0d7dc8acc112e844eb3159b4998bfc9deca8df7020182273e5fcaf25bd0543c451d38ab8cd9345906ac8de5e9cd2f31732f53a7152a80
-EBUILD ktp-send-file-20.08.3.ebuild 916 BLAKE2B 7f54d7978e5fa40a51f14340382905928b3007655e46a7193c3d86c835cc53aac82def19ec3571f6204634bcbce7c9a6267fc8840da732901a10659ae56540a2 SHA512 b620acd72c15d103055bd1478e3fae47d324678a8375c6b42960c4892954d3248110262760d68af3a676b95e31d58f5e855f9817ee6655a172a29abd6d87b073
-EBUILD ktp-send-file-20.12.3.ebuild 919 BLAKE2B cb68ba9c65f479b68c0f2f61dcfa81fa75b11217a362a92c8347b6fb6b04c80be71f96ad038f46e37dfbe7baad95f054a2a4f24076c212b8257aa6e6a67bb21c SHA512 325822db2dc20a281356e02986cbaf26c467ad2342d7d111a9e8cc2719daeacfcde2422f0cb977ce36edadfeda58ebec1225fc49b36e019cff759cf986d963f2
+DIST ktp-send-file-21.04.0.tar.xz 27924 BLAKE2B 79ac87199aee3603a51d6a4ebe31e9c6268b9a76576d6ad3321b8ead3afae71c91094b6285431b5f02b6b83814b79c1903ad28857b08dd1932322a92f2c9a2c3 SHA512 d24a10bb59c0cbd99027307d67adbc801d5d5a6ef75fc1f4a834945bc49b621c6954f3b6665523723cac8993612e811e1883d2268933b35bdbc36a7465d01a05
+EBUILD ktp-send-file-20.12.3.ebuild 916 BLAKE2B 30a141ed92832c5c5fc339d13b0dc0c5886e43b02817ac0f9d4d50712cf9b76f0e9edd890585950c7436c402bc16564c87c2617d4a3e392982f5501ed12a7f94 SHA512 6fcf4157a59f8bea5ab2ed4272e1f0117f9d34207e496094ddb5be5ecf9baffc6b1e161ae5438dfe5ab8ee50c90343030ba2c9fea9939feb7764841ddbade545
+EBUILD ktp-send-file-21.04.0.ebuild 878 BLAKE2B fc1cd65d8139debd4a59b20132294019a6957bd8d527a3d3d6a307f37e26efc1911f8bea81fb72bad6b20eca8eced4d0b9d476b3c479f4817decfb82d9dce098 SHA512 b10859af0f4ac7b6249532d5fcf2b6e8c0150a738dd5f46d2eea3c1d6b72823522018f2506de6c81bfc9ee38caf227d2443e1d4f5abb9d8115978d2397911655
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-20.12.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-20.12.3.ebuild
index 9beb1176af90..a2e22a054199 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-20.12.3.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-20.12.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=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-send-file/ktp-send-file-20.08.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-21.04.0.ebuild
index 5855159bd858..3c267bc7e3a2 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-20.08.3.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
@@ -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=""
 
 COMMON_DEPEND="
@@ -23,7 +23,6 @@ COMMON_DEPEND="
 	>=kde-apps/ktp-common-internals-${PVCUT}: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
 	>=net-libs/telepathy-qt-0.9.8
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index 6610b14fd978..3079ce2049e1 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-text-ui-20.08.3.tar.xz 470328 BLAKE2B 4c31ff6eee9cd2899913e6496e87237a3a833c8370a6c091b4dacfabd07697e915b59809d00cd5d80326e51189cbaa96a17f5d636200e44b81086ce8dee59760 SHA512 d8ff61d6348edb491dc4bf9f4c8bd3e3e0035c57e9b9f94f6314136931e25115b64adbc36007c7a97fdb55f8544335fbe85532d7807a03cdde3c899947bd212b
 DIST ktp-text-ui-20.12.3.tar.xz 471704 BLAKE2B b8245e4e791c8ec6eec832bd2f14fe499a5654cf14dd373d2428b168b75caa1cc6e83fa3199e03a23bc65f47fa34eeda5d419dc69c58c0e3a88def0b27d80e8b SHA512 0c2efcfc3497f2ec7f44389d5a10eb601b6fb2616d068ae6e4d99483a34de4f2537fed77ff0c7934561e980267e511213cca30d2bf2da1fb507b4789db944f5a
-EBUILD ktp-text-ui-20.08.3.ebuild 1637 BLAKE2B f46dd8e63ea568b03f03b6fefbdb1f5ed19d45f2a7acdd8b170a4608a214e2c036c1fe4238acc00834cc8cbb6cf36132fdd43db194b10ae583dd27d956c277d3 SHA512 17ef877e4d0a73993a0ea9e2d5026d44aeb396c279b84fd5c3c484f780a23477d8394547c62dbce311701a8c64e71dcc696128efc71271ec6cfedd26f244bf4c
-EBUILD ktp-text-ui-20.12.3.ebuild 1640 BLAKE2B 9a879fe7b92d381510c8988651e6c81e641b94bfa141115d2a8d090c1f36d9c07dcbbf5322762a4208dbb5af0014366dcd16953d6c5220fecb736a80d9c10d8f SHA512 ef86c5006fc77ac7d877fdba357678a2e94e272053b0d569c7dbd12f150613a096a24667fc3692b7928eba65a0f945bf3da602d0ad01f6a99254e907fd59a140
+DIST ktp-text-ui-21.04.0.tar.xz 473200 BLAKE2B 597a311b54e39291629ffb7527aecc05d7112880e1a7710b6d0b5a8071a8dcf2632f9bc6bfa3ffaf753ba96b8c748f21c9cc132af8d0354c4367c3b0602ad955 SHA512 7917d37227445979ebaf735af473e1d7383984c7aa3966b152962efe9fd7cffb9b4231622534670c50285372ff1230ecd308dfd70f0396b6141d2e11c6d175a2
+EBUILD ktp-text-ui-20.12.3.ebuild 1637 BLAKE2B ab10d20f42e8003945c7d82f67b31c7d5e263ec36f76d7822c6a4cdc5f0bad6826348b5a3e55589160db1fea2b67654b6f2e6eb4d217e3c9ae65f8ca7edcc8df SHA512 41dd2fe72ed72f7469ece1294ee48cce4e2f811e21eaec91caa3a752fc3e6420b7746d435921b1484ee848db3aa964ee2d7f663131f71598218fade4089f23c9
+EBUILD ktp-text-ui-21.04.0.ebuild 1640 BLAKE2B ef0fb88389a967d1637e3323603e02295881be7b173cbba2514fd4659fd55a18c9f0cb2f961971181ef620f087e7a2f36dc377d60f4e22afc12080bbe9e4f3c6 SHA512 aba1a587973f8dd14f3468b8f14bc39521c152dcec80e7cc31e87b7c3cef281093aabdb37880297c029bd8ddff0283f2e63a72f844c07804ff592ae3dead61c7
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-20.12.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-20.12.3.ebuild
index 1a911b4e4971..8754bf079a8b 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-20.12.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-20.12.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-20.08.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-21.04.0.ebuild
index a24ae7fee82d..7616abaa249a 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-20.08.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy text chat window"
@@ -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 afeecab913ca..84631ec59c45 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
-DIST ktuberling-20.08.3.tar.xz 70706504 BLAKE2B fe7058c3ef29c81953a50f5648543491ab73d4fac12e4d0a0e4591408f6e852fdbe7f8d95cef145798e765408bffa5066e20b95f49a2cf163051c9cfe7f01237 SHA512 84fbf32cb7e71e64499dc88bf9781cae3089c7019a3db1c8aa10b4cf58ae971dcc828132f768a107ccabf4b080aa63b5b9099a62585f7f598ca348e62ec98ddf
 DIST ktuberling-20.12.3.tar.xz 70712392 BLAKE2B 048618e1acf907ef74787d4ab88edde2badd5f2513ad65829a527e1bda966818b9d74003d91d7dfe57f6ce23b97370f1f87af37e7338c99f9dec187bf9667e15 SHA512 ea6d1dd04f53cdb4bde868ae478b7368e1c1147a73d7e5179133ad47ad2bc9a823d61c11bfd5cd922c26fd169a2ea4c43e4f9fb86e13a6e12f4a92f4974cd8b0
-EBUILD ktuberling-20.08.3.ebuild 1105 BLAKE2B d90b62130067f996aa3485705b6e0be63d3d718e8ba6b5b4b0200b10e22bad57e131f22e5237599ec9c9328c46f660e9f8acc530989efa87e107bb717ccfd089 SHA512 0af1bfb21561ae7ce860017cba8bc9b4bdb501ce1086320d42ccea94e525aedeb81ea5a389120f4cd6830be5632a7506c2e3f9e5668d1cc50e90691ab2648c20
-EBUILD ktuberling-20.12.3.ebuild 1108 BLAKE2B bf0b2a88eb1962e39f07caa8f7efd73d301d4f41ccf27f0fd5a1534129e83aa448210e60a964b2f50d2afd9f373252cbbd3903d3c239193b0a422ef31edfdc84 SHA512 01ccf4d65851c4c51dc19adcbed2d67206b3a6ad3658af87dc0a0738b71dfcd2364354f4072f6b691602575bd203aaf381fb39f24ce898101902568f08b6db8b
+DIST ktuberling-21.04.0.tar.xz 70758508 BLAKE2B 2c553d62382ceae78274cfc1d11af19c5283253ca73ad1f0c8d0dd2fcbc43d53c32dba509d2f3b254021b19a7b6d1b961f6f84af46cbab39ccf6596f293102c6 SHA512 56af3bd6ceb5aa79212a2ac2c154f1f6183118b54b8a403a18e89bfcfe7eb45827060273e0b4a5f179d3b1ec8309c1fb823e595bc72ddfcc2541699ac37e4b33
+EBUILD ktuberling-20.12.3.ebuild 1105 BLAKE2B 88ac71c26a8ec8077b7fea3b80587760a3b8632035a83f3dfee2bc082778932dc4d6d6d6d702acdf838b8e8354cdd02c18d5b832600f94d1fbb4a69fcf58003f SHA512 18211b13d2dbbdc8611d419bdec86405a32c2e35bdc984eafa530040c301b7521400c04115b40df16e9896d3d9ef11ebee37f6eaca9a1d335edb6d4d3b4895c3
+EBUILD ktuberling-21.04.0.ebuild 1108 BLAKE2B e1403ecf86fd269276c2624eb83849981a112ff6d44cf79a657ce028306c02578a4e2a99ab6eaa40186c436c59afe9acc2f00489f6172033ce27ecafd236c5ed SHA512 a25d5b7565741d99111c38eed1a9098172cf14b671ae9ee2a17a058a078423e65e882b7787115ac28f4e3f0dc60912e515f84253c3736f786ad8614e75127804
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-20.12.3.ebuild b/kde-apps/ktuberling/ktuberling-20.12.3.ebuild
index 17b2ad2ac0fa..0eb94c477385 100644
--- a/kde-apps/ktuberling/ktuberling-20.12.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/ktuberling"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktuberling/ktuberling-20.08.3.ebuild b/kde-apps/ktuberling/ktuberling-21.04.0.ebuild
index ea140a0f7870..feaeb8436680 100644
--- a/kde-apps/ktuberling/ktuberling-20.08.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Potato game for kids by KDE"
@@ -16,7 +16,7 @@ https://games.kde.org/games/ktuberling"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index f85f69141560..92cb8916c11f 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
-DIST kturtle-20.08.3.tar.xz 1837212 BLAKE2B 641452e211401a5c97c0145b4db8a5cb018b6183c75a6ebf5f94bda4f2e998142be60739c03231db08f9354ff7a4084e059562dee5f8e5bae35b27f1b6abeb22 SHA512 3389eee520e485f72533bd599c1caa241fd47343ad70c332e3d06540ad9ed2fd3bf6c578f95a7e02c860e6594a800a1b65a84c9d980942dce9ac4d25ee14f2bd
 DIST kturtle-20.12.3.tar.xz 1837380 BLAKE2B 6e69a7b42b32e3e81369ad94b3bec0968f588c31c23753466bfff9e54a700c0523d144a4a0bd161f2bf7cb61aa8ad996e00e2d7306bc8f06937ebd34251afd8f SHA512 a24ed68ca908693b76cfac731c39fc51579c3a26eddb08800ec8064091c7a00b5964078546754524d739d89ebcb11966d1246bd0044aef0b6167fc3094c57570
-EBUILD kturtle-20.08.3.ebuild 991 BLAKE2B abb9c4b6d2277e73ead51b96281cfaed7b27f46f3ef607515249e3de1eb389a3cb66498a81563c234b40d94b088b75e2c9613bf8ac2ca4d32dd001447b750d20 SHA512 cd46421b28e879f326b47828265041b6dae26b8fee59b18153e205cdcb56d3bc1cb013328ed4103d1b8a2d886d382aefd555a288d7edb1f3c8b3c46fe2c8f41b
-EBUILD kturtle-20.12.3.ebuild 994 BLAKE2B 7a4df1bfb7ef0bf69d60765f55524a6bc9d3eb5b76fd26a1d7ad05b938516c624ccf7dda98d3484c8476560a9d3c188e2e3268e6fe839a663863fb659d26df60 SHA512 47867a5e139070a31a56e49fcefd67554089c98af5e5a0b3d887fe804f8294b49fbf79831074161bcd592e295545bea8f442f16367fc6d044da06f0c977158c7
+DIST kturtle-21.04.0.tar.xz 1838548 BLAKE2B 07d906797aac22b07e5f27fa36842d65cf5b69d9487ed7637a4d7b19da5e26660c967df0c057654eeee817548a5467984a87bd8d1e853865377453f4c2cec015 SHA512 39c9915817365bcd0f64ed1bae94b3c76ba6cde8366ef4de778af09d1a2f150ec2ad4333478b9d2062be49d28b8fc19bf820246a6ab62219204a3b46e1042952
+EBUILD kturtle-20.12.3.ebuild 991 BLAKE2B 8aa8b94966be26d1c9f802590c25a8c210c877b3e3311aa7df864b5c8d09eb8978ea0d5c5dd808bc89ae3567eb042b46ca3b06ae00f75b03a638845cef0e630e SHA512 58aa3c3bb6ac3b085f8e680989fb1fb65eb23836435fa1889436039ac2397789a0f2e9e5e21e184bfe2af2b7acf02440363923082fdc5a8f6096e76768bed26f
+EBUILD kturtle-21.04.0.ebuild 994 BLAKE2B 342821283a5142d8c7fddec6e368c0afc69c5c8888113043e8bc698d0e3762497ba1706ca8d0c3882ad880eb93cb5b0d64458e88cc39d206bb3c72f4fb67159a SHA512 6c0a10ddf125c8baf45c80855e29803024bcd54b30a359ddabf0c0e185334bbdfcac478ad157cc0b4eec05916b4c12918491357208734392767dcd3e1233af65
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-20.12.3.ebuild b/kde-apps/kturtle/kturtle-20.12.3.ebuild
index bf6c0e045ab1..48663b5e8eea 100644
--- a/kde-apps/kturtle/kturtle-20.12.3.ebuild
+++ b/kde-apps/kturtle/kturtle-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kturtle https://edu.kde.org/kturtle/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kturtle/kturtle-20.08.3.ebuild b/kde-apps/kturtle/kturtle-21.04.0.ebuild
index 7ab912bdc869..2dff5f6bd2ec 100644
--- a/kde-apps/kturtle/kturtle-20.08.3.ebuild
+++ b/kde-apps/kturtle/kturtle-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Educational programming environment using the Logo programming language"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kturtle https://edu.kde.org/kturtle/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index f4993188e520..df35304b41ef 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
-DIST kubrick-20.08.3.tar.xz 332024 BLAKE2B bb50aaa62d8c5c06f3b19d3f54c966394e10b94a18e586557af44a0716f52b660ea3f0f7c11bfa3d99257bc02539ab7e32fe8b42984d6cc2098054b88ad3c713 SHA512 3bb049cde9f09b36e357550f71e3f9297cc1968dcfdc5ea3968bf6b591cb3a2041aa03d578b2b72b32e7658fa4fd6b1afc0d0ae36f16a8db4b67bd0267eb8c4e
 DIST kubrick-20.12.3.tar.xz 339644 BLAKE2B 7b4a0eb179273765c3532540ff088bc698e9a01ee1384697a0ba40a27c10c1f5e0f36617b48470b2a1af7ea41ef1d781cb2f480921ef9beeeb183c9c8d7f5f2a SHA512 bd0e22fcc299c065d64ec697a248cdefd57dac0e0c2487f5cdbd15c952a87b0873df588fcc7023a68c8f839199d00582fc39621e91746093ea409a83402bb7bc
-EBUILD kubrick-20.08.3.ebuild 876 BLAKE2B 436ae6834e461fcde49b042da0c555ec0db6881f98e54a236d38dd5e3044dc4e74679722962f832681b39f44d9fbb617c952a741fb5e0c0886f01554c7c4f475 SHA512 05ea5f5a3e06d203e95b7a9bb200b51af7979009f4db4a8d9d8625f617c7e5bc29df8d39e9911baf3c6498a98e3f7306f2924232c24b12fddb2d52280d0f3d7a
-EBUILD kubrick-20.12.3.ebuild 879 BLAKE2B 41ca160d5c9298f59857dd6e1e3e385fe017c62cd850928c3f676da26b57b56d3aa0255caf8c7e18b7cf0676e793d472910c32b64d9b9381a178e2f5312c0ec5 SHA512 61b7bcb524afdba8d3251376ac18da32cbfc10dbb9162f486370fdb7586f49223c6e01aa8b85f521a1f833b7cc65536743e55e32240e11cfde3484e3c9475d99
+DIST kubrick-21.04.0.tar.xz 341240 BLAKE2B 5d6ff044c862b35c3a567e4f61d6c371138173dd3261e26aa0242eb7698bebcf9f43fe7eaacb5622aa49963d51a694469488e48bf03c89fb754f0822f449e4fa SHA512 ffcc15f8ad54a15e9bc2c1c41fa32feb58685271b96b252680e06e4cd55ff0d469b3703520b262f04918a909b3b1d2116acefbbcd2142dacd6e8f4d1246ff12e
+EBUILD kubrick-20.12.3.ebuild 876 BLAKE2B 03a070f3a95c8c211eb6ce10aa6afa081ae2c14de05f0b1369b4fc84645ce4e6012735b5b749ab59b1c77ed58d3b246cbf0a3bbfe4faba8a516c431405e77de6 SHA512 15936a1055724b72719856941b6920af9fc162c006bc47b55fdbaa0bc5873701abf0975e5ddf54b6ea289d2a3aeedf87993a809ddfa1c3bec896011c8d607a9b
+EBUILD kubrick-21.04.0.ebuild 879 BLAKE2B 18f8fd02780706a3dcf83e2af31995290d0af197fcf8cf79362e1f4cc8b33e83e82fb6e85b4b82a1f7028bdeeeb20e1d10c78f68f8b4cbcdb48d5be88bc74d27 SHA512 cc75ca808a67724a435572d7afb0367285d1be5d014d82a73a8fb69ada777c8f5692a37c052e7ef3961085addcddceca5a470c52bcc5df99ac1b15f5aef2e5dc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-20.12.3.ebuild b/kde-apps/kubrick/kubrick-20.12.3.ebuild
index ba042c139ebb..5d45d2ad6b0a 100644
--- a/kde-apps/kubrick/kubrick-20.12.3.ebuild
+++ b/kde-apps/kubrick/kubrick-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kubrick"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kubrick/kubrick-20.08.3.ebuild b/kde-apps/kubrick/kubrick-21.04.0.ebuild
index b3b2c62b2aab..198966ab77f5 100644
--- a/kde-apps/kubrick/kubrick-20.08.3.ebuild
+++ b/kde-apps/kubrick/kubrick-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kubrick"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 376fa83a635f..679a33e71403 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
-DIST kwalletmanager-20.08.3.tar.xz 773736 BLAKE2B a4975d5e295781a917ebb3d9d9877fe770288dbd065bd9c9e5aef0e7af17577b78cc998e14a73bb5e9954764efdeeff9ac0a469c7dbf7f929dbd85e7b30149d3 SHA512 afe5d8cc99fe9a889510e5ab65660b8c8dd5962d75e70d8a149d2be3d8e10c4914b7b2b62d3cb42a9e18f1f5d44a17a593c3314b901c838fccc8a7292b74c97c
 DIST kwalletmanager-20.12.3.tar.xz 773840 BLAKE2B d5d9ef32a2033d2bef90452eb77e578dcf3c094777f71bbcdba459cc21f746fe23fd7e5ca03c87755fa5505c3ebd943ac58c89472d903ff046ba786f0e4db4ab SHA512 6cc9cb53813b4dc0e5c7c74a3130fee51dd85c4de9f78e4d3c64d40c4b2ed2b134a24f5fe10d67996077f57c4032a8cf2481e418238c5e5ff73c9f0d9657a6a3
-EBUILD kwalletmanager-20.08.3.ebuild 1409 BLAKE2B 42ba136b40aed6622f1bcacd7bd175d8666cfed93f008c20905fa8324b127333011e9e523307d7bd432948a14edc2c5e5ac129acad61800f2af3fce855d59abf SHA512 5023c08088043c271e7ed71c700a5d6e4e95a5cac1a15073b9db349684c173654cbf8930c66e4d00a566492983d936253d928b49f194191cd477277f74e6082b
-EBUILD kwalletmanager-20.12.3.ebuild 1412 BLAKE2B 93e661222eb0513bd1ad87e3b0d7ee8469de269fbfe8d342a6974496e443dcd4bf3c96ccb34482f0c4e61b74dfb660b5db9ecd3f4bdfb85579ed4cd998f5b4c8 SHA512 73aac436f06030c717933689fd8b2040f6fb47dd3a2d3a815684ab05215a7c5a0e75db02422cec38077e05edb0d9a00f34e98200f582674d7eee14cfdc9231e4
+DIST kwalletmanager-21.04.0.tar.xz 782468 BLAKE2B 88483fac71ef39083513939044632c17700713b54b4a3cc9486783cb8a3a67b9f8699b5bd62b247d7b2fe4197587a804acbf03dee14eb58ca6d8a55337aac994 SHA512 cd0234cbe7bb366fba3bb8de95202b3a84d919d78345bd8737f714aeff5218ef11851d3e75ceb5154385743b2836e2d557b79aeca0b96f77f12004d7a9324ceb
+EBUILD kwalletmanager-20.12.3.ebuild 1409 BLAKE2B 5daf2f7f539288afadb6bcf7bfd8a9a52d2ed5534d526867e3fc507aba4f2ee37b873b0d33cf3ade9bdc5d69253814a44094a9d4a1c32ebd4be05fada874f087 SHA512 628a037d90cf79154889ce4f4384906b9f75f3ae7d0bfe583e6161c5a22e7c90c5e7bcf2ef5560350d646b1b52ae336f9a0c423848d63d286d3bdb1a07c7339e
+EBUILD kwalletmanager-21.04.0.ebuild 1412 BLAKE2B 9cc6c7fd0afff17da0ea27c3c2af9a62be72c5ca6b18416b8e14d1666658a1bbbc4544641de4d0019df80fee2b67c9fece2c3aacbf3f409a38340dff951385cb SHA512 950348327c71dccbbd2a4cce7523c85904ce8ec0d58f64c12d3d10106e3d825adac7081b035677b8b8a2e2040a2a9f354f5680f49c1e0fe9ab432c16f1745e04
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-20.12.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-20.12.3.ebuild
index d04ce3393ee7..78a3310f7b4e 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-20.12.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwalletmanager/kwalletmanager-20.08.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-21.04.0.ebuild
index 886b1ca8347a..9f0a2ae3139e 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-20.08.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Tool to manage the passwords on your system using KDE Wallet"
@@ -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 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index 85a36cf2ed0d..4bfae0ad7c9d 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
-DIST kwave-20.08.3.tar.xz 6878552 BLAKE2B 1708bc448399b7fd71be9cd21ae949efdfc1f3d871fcfabd4330150ed91faa65acf5dda50c81c2a0d275dd252e324af09c051d8be6873f1cdb21428ba4d33206 SHA512 63829dc2b39e8c78168f7c436dbc60334fccb92ba5c18b37f3e91b117ef9c3c53cb4957862362841986f25cf6cae210cdb9e2dba74d8c9ac486756ef675d98c4
 DIST kwave-20.12.3.tar.xz 6911104 BLAKE2B 17cc2c5a1b14b8c46548fc3d8c65a37c5f42f49a6656f54cef4549d5b8fbda08f3e491a11a5c46e328c3abc6fbcb4e09dc45529fe14e7a78ab031b1d0937cbdf SHA512 9854836fc328dfded8494c03137d940c8ecfc0409e0f8ea85b34d51fb1f7d077c3f3e9e8e439acdf9da66037de0da65dabe8db7422b5bccbadcbaff599e9893a
-EBUILD kwave-20.08.3.ebuild 2076 BLAKE2B ed853a3e1effda61e6c4c74371a78116596b97d915cb0e2f86d5d8ef814c1621d6038ce9eabb59cfec201baf2c958fe7ccf145c14462e8500233b6a75517e797 SHA512 e103b90e524dbf93e032f39bebfe0f10651f416c9abd59c0c52bc428cff097c983e871658475434fe7c9ecc5369d1deb9916726a846118d4344fc8dd44df9336
-EBUILD kwave-20.12.3.ebuild 2079 BLAKE2B b699a1eac035fdf65588a4649043546812df221cc6b1045b153d9fc3017fbc5c3b8e4d37546c222f7d7b507092239a46d5d58520d81d542bf8eddc2437b6a096 SHA512 1e1993ab474cac24bbd9fd17a3cf9d2505092c17e58c9dcc6511c458a1afe49f8860640a07be0c6e5daee308d178bf7b26c3fbb5ae7cbd8c621c0c9a2709152c
+DIST kwave-21.04.0.tar.xz 6880684 BLAKE2B 619ac081b912de78609cf6cbe77d6d6831a5bbd2a52732e685550a16a26c2f7e733e08d462b08172a91bf4dc49a22a50275e2642966da2cf590cb1d2639502ba SHA512 84e704e96b39d7685629c6a90c59b99b6ea44ce28525c148c79ba7442254aa5a3603e626b8e33326274e12903995b560cb89d288120b7d0154306bb62d180f7a
+EBUILD kwave-20.12.3.ebuild 2076 BLAKE2B 247be1ea7d11d525c50d36af1c7b9edd4b0d9e491f21d600e1f0df0f421c13c83522066e9951e8b21de89188c40162582f903cba431bd778c720bbc1c92b1fdb SHA512 43f48978ad49e5f1d0fd06d6c3280d3aa4ae421a4fff6ea87ddf6eee76267e5aafdf3db6a33ec3efe0f7feeb2fc1f3662a0597ff18ce10c4e4070bc2b9ddb241
+EBUILD kwave-21.04.0.ebuild 2079 BLAKE2B c9fc7f03c32737af397c4384b66a242617f7769025e6fbf52712b2bb75ca28ae7e5546a806a4b25f854494fb4ab0ec9307897e34029f894ddd6c6cdd2ede5b01 SHA512 1a9a685d8b19d0b1d3e0f8df78a0ef2c7c637be52e2d325ffef378bbbb357ef3a5755c6d3c662461349d1f3b970d93ecc19f976f48e3dc9d56ed027d3d8b262f
 MISC metadata.xml 690 BLAKE2B 6ad89adcaf160c4c895ebd8a0e1d4bc388dad90803b16673e66640cd3974bdbf608f64c2f97e7e1144c63372b951cebbc7e168985c3945775f08a300d6cbd177 SHA512 eea8bd3770532b13c64608cf89873c65abfbe31392956fb3e244abbd5675b1e920329f3e13befa9563878e8a2f7fbc52d0178045e5dba9ca76d2fc95fca1c4b7
diff --git a/kde-apps/kwave/kwave-20.12.3.ebuild b/kde-apps/kwave/kwave-20.12.3.ebuild
index 19b40de55648..58e30efdb23e 100644
--- a/kde-apps/kwave/kwave-20.12.3.ebuild
+++ b/kde-apps/kwave/kwave-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/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 x86"
 IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
 BDEPEND="
diff --git a/kde-apps/kwave/kwave-20.08.3.ebuild b/kde-apps/kwave/kwave-21.04.0.ebuild
index fc0111913711..ca7d1cee7548 100644
--- a/kde-apps/kwave/kwave-20.08.3.ebuild
+++ b/kde-apps/kwave/kwave-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/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 ~x86"
 IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
 BDEPEND="
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 517f9a1167c4..a007101ca65d 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
-DIST kwordquiz-20.08.3.tar.xz 4187476 BLAKE2B ebb76141212d84d02dc64100b7582fbc5bbc9e3b22efdd6686c83892f2d47d894547d7f4f57a3ef52f28745c6dd77af7202a97cb44b2989a49f13e4d56a6d2bc SHA512 59dc0d24a6434e9bdb9da7aefd21c0e03768e5420f60c829f2e26512c34277308c8418a078e14d08eb00365bcb462fa3e2ea5f077f25ea2ff8be8a7bff1058df
 DIST kwordquiz-20.12.3.tar.xz 4187776 BLAKE2B ac3fa74db64f93338ba77064e8223bd3272198d94440569b91f4250f302dff49a9088e70e6d9f7a0281be8c79f467f9c12ac2241a81a2b661f4706a3a43eee45 SHA512 2192c8e0b9bdd9d26ed5b0596baa208450bf31b89855c106c125b63465ec505e61e180bc05d60c36809ac93cc31cc9ef814e3636d8a7833909332755aced3872
-EBUILD kwordquiz-20.08.3.ebuild 1212 BLAKE2B eb41ff507b6314f678b880b45adcc9155bdb858582ad3c8007e01d894ba2cdc84e0a4724a425072234918373e5ffdb33fa512a7ebbb3fc19763012d98322e0af SHA512 79b2c18845f9d00dd46cdd4d461725424db2c53de67c7030a70e9c4bbc8d17c34ce0ee4d85376c78bb51d7b73c035bcaa1f92713313fb03e59b672c89bbec31b
-EBUILD kwordquiz-20.12.3.ebuild 1174 BLAKE2B 958e6b9bb611a9726d4c27dc8d49eaa4b3f50002df5a29b52b70f60260ee811812de54989a4bd056dd614de81330dd2c8596ca50fb20270cc5060e4801fdbca5 SHA512 cd9bf1a3680c3aac600a905d4c7e382b4dba2f3e9ee70c5b5ea5bed3b5fbf896dd8a302bc54f12a9e2d8b9f269676749b57b024f66b2d906a5d66d1bc489ae49
+DIST kwordquiz-21.04.0.tar.xz 4189888 BLAKE2B 73c2ba2ca0d9f5302d903f58082be11acdfb68086373b3e177d6a0b185bec709eb8f2d4efc475488dcf5cfd8f2242b2a33fe7318ed302f2fce34c4e022470d01 SHA512 0d0318a65116eb99370d6ae6a97ef341f4609356fa6b350ece65aaf52aff7f2262756d8592921cdd99dc8e2b3f36b4d0b4e473c197e9b95da3ae360e5908af59
+EBUILD kwordquiz-20.12.3.ebuild 1171 BLAKE2B f08f63b807cdc3a4a413ef713002f0e1ad753cb63ccc5ee697e8c30c591a314125a9e54205ea603d36ad72a06c772039ee2fa0e267a5cb21c0155588ded77f40 SHA512 1df674f5e73dc0145710ce3b13f17dae14312fa6b595e91e060483df4315abd1279701275e1fcb2a85c01f213a2dba911cba8f079cc1d0d68e0e0f502c08a7cb
+EBUILD kwordquiz-21.04.0.ebuild 1174 BLAKE2B b4213f636ccde4cb2dde2bfc45fa61b9398b38242f655031350c411cf26a3eab7827741fb631a9d51c27445f8f2b249bb0be99dba637334284a449d78619a6ec SHA512 36826d7181936fc1e320a21007f9a7d2052622a17402a56b939a5b43fd15503c06b0542be54f4980d6a6aa990b46f39e1f610854fc8c24a0413012e9320fa5b6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-20.12.3.ebuild b/kde-apps/kwordquiz/kwordquiz-20.12.3.ebuild
index a23ae02b1b8b..a5f96e461a1f 100644
--- a/kde-apps/kwordquiz/kwordquiz-20.12.3.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kwordquiz https://edu.kde.org/kwordquiz/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwordquiz/kwordquiz-20.08.3.ebuild b/kde-apps/kwordquiz/kwordquiz-21.04.0.ebuild
index ede77d5bd398..e97f51b3d5e5 100644
--- a/kde-apps/kwordquiz/kwordquiz-20.08.3.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Powerful flashcard and vocabulary learning program"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kwordquiz https://edu.kde.org/kwordquiz/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -29,7 +29,6 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index bafdf7b98257..71b14421b8f4 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,5 +1,5 @@
-DIST kate-20.08.3.tar.xz 5853216 BLAKE2B 8ad6f14e98e44355731497dd3363dab51e3f1658feadc398ba03629c13acb648f1a84e573bb200040008c0f3226f0ec1b6414a0975cf1ccc2cd1bfcebce1e125 SHA512 bb514f92a65ce7ff4e3552f16a400d10b30703340f779a1318403035900f32b2fd5c1da2ca0714632d49ad35da15e0f7e05a17bc008cd039388e89ab4fac3bd2
 DIST kate-20.12.3.tar.xz 5949012 BLAKE2B e35c4da5426772286abe54156babc0de09fbdf8fb5c7505714637ad427e3a694fd541ca7b17e99ebab22f9a19f2a8893d34098cb625fd0e1c0f0b6b920acd62f SHA512 545ec2a48ea6ec737011602b20ac2f60a0f9db0a5e55e0b232f9fd7c10b7e3f54d2a346be7e6341537758a3f8f94868c4083a6d2d10b572568f5c56c9d3aee9c
-EBUILD kwrite-20.08.3.ebuild 1452 BLAKE2B 90baa970f5ef7560823badc6ca723f6b0911331dfa0de2265c46216ffeb252233e1b105b2a0ad4943a9e759f773134ce753cac708f39cc5c49a3d16f7d91ea18 SHA512 214720c68f463c6620f49dbdf7390f54484cef4de31a148056adc3014a3c8fb82d8cdbd59eb3388e581df015a797beec1b52cef469e77710700c95079d08f8af
-EBUILD kwrite-20.12.3.ebuild 1455 BLAKE2B b3621d1395312295730f324843fc39f583dbc391758fc694828a28fdc046482b2e107fe384ee8b277aa33419aecfb9881dcc6f1e354db4732a2e77f628bd3dbf SHA512 22c8efe36532604a9e0788902185af44a6676f5737c86592c5aed395a4d833742c5e18bfdc236e61aebc5a83aa78c62e4eca75f76dcc9059e511a89034eb3beb
+DIST kate-21.04.0.tar.xz 6940360 BLAKE2B ab4fdcb46cb9729e70537522387e3ab8fbf9808fd25453e6fd1aea5fa8a9aa67e5fbd44f4b68341b65da998e2412e24500cd009df10df5462ec2be55f137b988 SHA512 bc610758597bb2e800e8797c9c25eb0d227040dc2cf5b6e522dd019839f205b4ef05dcf2801265a4ce2743221054061b3002e31bc5e65470ef056afb96b834d9
+EBUILD kwrite-20.12.3.ebuild 1452 BLAKE2B 3c22d4fe9f5b59afab602ac0eaa65eb8ac628a84b53cc6a44b055153ae0d627aadb9943c409402183a21d29da413e2f6777ae6eb06c00c7726c522a96ade46b6 SHA512 f0890f204ffe9efd78c1a05a86422153a7aaef7c83ac130c13ce594d9da9f176b82a06341282e2f8f4cde308484c68c195a212e91fc23a40e937057b0fcb1ffe
+EBUILD kwrite-21.04.0.ebuild 1455 BLAKE2B 64f4d18c3aed6087c09c5512dded8a971579894fdcebdd6070b054adf9204dd51deebb65fc9a087798dbd05e527ac20d36db906f584ca66e7e0f3ae770c29263 SHA512 773f77f12b3dba7a25e4afd29de8b1e82a0d8cc2ba2ada8e13025db49f48bcc7d26b7800c343bff227e1444159710de6e29319f2e70d225667aafc81579effc4
 MISC metadata.xml 372 BLAKE2B 80ff693fe7c7c67aee3a23b6a658a150e33589f9a42df15e7d1956290947555993789ee023345b585fecda3ae828b9d99107aa72b15a6dbaeaa806d0bc2fc2f0 SHA512 3c9a012ef2f6e23889c5c73b3c418e9e60439ea3e3a58995eb8a8b730bfafa5659c7cdb848d0b340f1456828105d92e85c9cdcf55faf22ac676d2d377a004093
diff --git a/kde-apps/kwrite/kwrite-20.12.3.ebuild b/kde-apps/kwrite/kwrite-20.12.3.ebuild
index 93395f75072e..4b6664ac2796 100644
--- a/kde-apps/kwrite/kwrite-20.12.3.ebuild
+++ b/kde-apps/kwrite/kwrite-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kwrite"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="activities"
 
 DEPEND="
diff --git a/kde-apps/kwrite/kwrite-20.08.3.ebuild b/kde-apps/kwrite/kwrite-21.04.0.ebuild
index 840262196b29..8361fce42ed1 100644
--- a/kde-apps/kwrite/kwrite-20.08.3.ebuild
+++ b/kde-apps/kwrite/kwrite-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 KDE_ORG_NAME="kate"
 ECM_HANDBOOK="optional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Simple text editor based on KDE Frameworks"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kwrite"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="activities"
 
 DEPEND="
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index bdfb82b9a860..0fc86384a5d1 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
-DIST libgravatar-20.12.2.tar.xz 31124 BLAKE2B 86912421ba998f8a151c730e32b2b95de61d43d26c34b675fc079cd01ea74fee273638d00558fd121d33a977c4019112e1b96e1f8a36f455e910b5cc1c136522 SHA512 4c5d9706d7f4530fd6ba27134855e1c033af245f72aedfa87045939bf92e6c4e35a87ebbc0fff0d4982f1295c23e65fdeadc13a1530343a213cb4ffed0693a7c
 DIST libgravatar-20.12.3.tar.xz 31160 BLAKE2B 449a467ccadb3cc01a6ff03ed621e78f7f63f690605205f45677b4907261829221a20b89f8e7eb8ffe05d5ef02d79ccdae9bb8f6e54d8d4835030442601b57f4 SHA512 920e4db3c9c2813cb02b8324772494b600865372ae6fa4ab7e883e013c837c04ce55b2b8cff74e00d89f7afd3eb7120e10e80640a139d06d05d0646be0fd6ee0
-EBUILD libgravatar-20.12.2.ebuild 822 BLAKE2B 2bffca71e80b8f1b8551ed7466585b2057828a74b4246a9a99b5c466eff2d88829fc2d8c6d28f7c78cd57dfec0d707f7aa1b6a067ba721ccc7ff9a2cc3b59262 SHA512 d23f43dc6d8761a05cb5de7f87c187ab8a470d464f458b1ce02751e0b995b0a4f02452b054357868d97f9411862e0928ed68e082459775d3717d525dcadf34d3
-EBUILD libgravatar-20.12.3.ebuild 825 BLAKE2B 1be3f33ae19042e8efdb56c2a7c90fc5e39017cd38b4028e943580f4680cb7385b71c8b88d0c3729069b470df24b9588ed733513d753074470501c7c0316293b SHA512 8fff918fde0bebe365834439d6fb9258f2bbf2095508ced956169cd6ffd5db157f6c0b54de45fe1b07e53be41a7dbf3b13f7a9249c43212a34aa6f23790eaf45
+DIST libgravatar-21.04.0.tar.xz 35296 BLAKE2B 93795900f1e126714371c7e932a5f1bcf3cf74090b0d69a9d63e177ecb8cf2c3fee4bf22e20c093aea96857a50879eb6d8d3e73d5e28c22a5db7bb6694d90169 SHA512 21e53f156c2d79d1811ec8f5a1aa23975e373db821e9995ec1841c32c5b26323941e2f0c70a7b4442203b96f43e10f7b10ba856163d81e28039132b888b6fde0
+EBUILD libgravatar-20.12.3.ebuild 822 BLAKE2B 2bffca71e80b8f1b8551ed7466585b2057828a74b4246a9a99b5c466eff2d88829fc2d8c6d28f7c78cd57dfec0d707f7aa1b6a067ba721ccc7ff9a2cc3b59262 SHA512 d23f43dc6d8761a05cb5de7f87c187ab8a470d464f458b1ce02751e0b995b0a4f02452b054357868d97f9411862e0928ed68e082459775d3717d525dcadf34d3
+EBUILD libgravatar-21.04.0.ebuild 825 BLAKE2B fe5ba2687cf76ce3fc75ca620fad56850e8d6dd4505e7fa476237c8f4958891f6c140ef86a94f1506d09682088938cc1120e922e428db7fc208c418de739b3d6 SHA512 84d5348f119b538bd2f6d446d129272e581bb028e4129efc6069e9733a4fdaa2cdf8eb0db2c1fb9c869b40ec99d665ad48175f016fcadf40a1ea734034b6d1ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-20.12.3.ebuild b/kde-apps/libgravatar/libgravatar-20.12.3.ebuild
index 7cf6687095a1..41f1649bdb99 100644
--- a/kde-apps/libgravatar/libgravatar-20.12.3.ebuild
+++ b/kde-apps/libgravatar/libgravatar-20.12.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/libgravatar/libgravatar-20.12.2.ebuild b/kde-apps/libgravatar/libgravatar-21.04.0.ebuild
index 41f1649bdb99..6f566c67bfef 100644
--- a/kde-apps/libgravatar/libgravatar-20.12.2.ebuild
+++ b/kde-apps/libgravatar/libgravatar-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -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 d777d3d50e82..cb9b4515e2db 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,6 +1,6 @@
 AUX libkcddb-20.12.1-unused-dep.patch 1684 BLAKE2B 6089b00f04b370ff3a23b7604da284b5128aba90e959d8350003ad5945b111a3dc2804ff52d6170c69304f72e4aabe74bfbd2a639c71f328b0e8929dd712f095 SHA512 46aa91b2abbd47b1e49f1c51878437c16e6fe8ddadb19d257c7cdf5881f36f18ccaaca5165e9a818729aadde1fb3bf0577bad885a2a3f5967d02db7940740c04
-DIST libkcddb-20.08.3.tar.xz 425284 BLAKE2B 8300846872e4984876a4f872abea71df9a189ad317c2b8fdce386bb21be2e548a3487858944e71eeaea402f8ef81c44e1d3d1ac1e4af460770c370da1d2a66d6 SHA512 9ce75fd66d541b38408ec67810b27dee9b7939f306d6b6b956aab489c5887ef13d41d8ec95802b859f8a4d2605422bb4aa00467dcaeedcd22f149727b84bb1c6
 DIST libkcddb-20.12.3.tar.xz 425180 BLAKE2B 5dd7c8c75c505d3eebe4ec0bac3a342779fe4af3db56b7f87cb4ed5b0f8d55d8aafa5b0911f415b2d871df4a6d9b276112853fdde0bed4538893f84eac58ed89 SHA512 7659ccb25555a3c9ae496f7ed695a69bd6ac7df1002c94379f5e637a85673ca1194311b8aa04c2b53a2d3b9f41013e38ecd33403ba5fe66c1afc473cefe08af1
-EBUILD libkcddb-20.08.3.ebuild 1150 BLAKE2B 29933978aac8e6582f917f5e6591eb9424389faba78b1b3cdae5236392abe890b1c9c178e5b5a706d46fffb3edebffb2ec0a43ced1d46e146d5de9466dd772f5 SHA512 ffd4754bf0f106f1978ed19ba43a931d71cd3c37d1e46119400e10ce354ddc371ac80923191df7d2939c2a7c1fb0071d147eba412fc521820c88daa64339b369
-EBUILD libkcddb-20.12.3.ebuild 1132 BLAKE2B 73f67a0480dc092e21b69df469ff5d71b20e77d43663ceb64b95797cb3761c6c4071e1a8420d58ddcd118e706fdfad2ed594e722a8c06644e631369fb1617289 SHA512 1e8d6740d40592dbfdc6209e6b4e4122b4a25369b610b60b7a908c37d44a9ae39d118a9ca242d46e4fdce8c4f202991e8969705fef82af056a187ff3dd0ed51f
+DIST libkcddb-21.04.0.tar.xz 424436 BLAKE2B 0ccaa5fbf5f7932c0048b103eef539c3bdc9543effbdc1842db03cb3c8f2e431fc161a50891bcff92b72bed9f78ee3a4a1d5ffaa69312451adf248604b1d6e80 SHA512 489e95d8e642068f8de37d7711916b44fd91d1ae89b488c99b5e1a240e98901b8c24dd26d817ba5a2cf8597c57ac266af8a485a1ed240696f3e23ba5f78b6405
+EBUILD libkcddb-20.12.3.ebuild 1129 BLAKE2B 9ef03539de766ab9b235d2a7a41084c5e2b560218a6b61e44a4af5ad250f65ee50f2afb32fb47b8dc17f5e8fc82fbb48ef3228a921ebb7289b2d9560abcb1c61 SHA512 7165f458cfbb4f7b5d892623861685c098b20b32ea8407fe9225e53dbafa437f2f510792d55f21ae50713ebbdd19baa56580b3addbaa7a551905bae8c1615e56
+EBUILD libkcddb-21.04.0.ebuild 1074 BLAKE2B 79122a90899ea433bb5ff82890e19e41cf90c19286dc7d1d5b3e15a34b44f42d1793d8ade0535592ab5fd4c48c79286eada96e8ba8b31ce9766dda8fb76629dd SHA512 ea311defa60d5b36b0597a318ee0b1116ce1af89335107f86f9c9182c9ae22e2afcc06ce5993505a3f9e5b945190ebe20d64d35de4ba320d5b7a325fc45859d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-20.12.3.ebuild b/kde-apps/libkcddb/libkcddb-20.12.3.ebuild
index 55d88ac06a61..7f29d02bc669 100644
--- a/kde-apps/libkcddb/libkcddb-20.12.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-20.12.3.ebuild
@@ -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 x86"
 IUSE="musicbrainz"
 
 DEPEND="
diff --git a/kde-apps/libkcddb/libkcddb-20.08.3.ebuild b/kde-apps/libkcddb/libkcddb-21.04.0.ebuild
index f8285d27ed98..b014baa69231 100644
--- a/kde-apps/libkcddb/libkcddb-20.08.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-21.04.0.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE library for CDDB"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="musicbrainz"
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -37,12 +36,7 @@ RESTRICT+=" test"
 
 src_prepare() {
 	ecm_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
-		cmake_comment_add_subdirectory doc
-		popd > /dev/null
-	fi
+	use handbook || cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
 }
 
 src_configure() {
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index cbb8f0ffd9bd..46f9b8174acf 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
-DIST libkcompactdisc-20.08.3.tar.xz 96576 BLAKE2B 916e409c7b79b55cb4ccb36f9955f181ccd6aacd272639260babd005d9d2ca73e55d93de6d9779a0aff7194d9052636dbdd5f32ee9b2a05977e1cc702f49fa28 SHA512 2218a29f371d851a1209deae081249f6704a90208d7fcf5fa82d1227d1353b05d8e26b40b4abbed9dd85280d1a9704dd091546cbc155c196ba8893fcaff326ca
 DIST libkcompactdisc-20.12.3.tar.xz 96728 BLAKE2B 2194d8bac9dd07283a6defcc32dcf53ce3a081bd04d8f9e1c174d96cff813519b99e760ae6393bfe1d30b943250b931f1b761c37983bb21a97b47741a8aa5323 SHA512 cc586d297970304bd845ac8948912753e22d9de8a22e039c6f0a25083c8601bfd21ff831d863786f6db58c990a75f942fc3ce3d3c49bdb55e9a47a2dfaa6192c
-EBUILD libkcompactdisc-20.08.3.ebuild 637 BLAKE2B d64462deff419224de5118223d7f711d0d0bfd75f06e0a59d965419d4108e98fff67ddcca18d643643a681a6bb24045dcbbbdb5cbf67edc1b5b34ed6a17298f3 SHA512 ee29d223144e2ca319a452d707955b168f44a01d491b7cde6d1094cee0660fb80a07a1bdc24f6dc0921695dffe8cea6187ccb082b0e4559c67a1b1d0b7e4a3a3
-EBUILD libkcompactdisc-20.12.3.ebuild 640 BLAKE2B 71b441c585ff2d1a3cbd0a0e78935591c9f1a035d5b6e80d5aa23bb975549ba563c31b82284e8e0647868f49343d2b7bd7c60c6524c639cd2aac5a173621ecd0 SHA512 27fc3523b0509e831c9e403902080901c5fd7d874fd967acf2279433aac41be354bbf8910ef7b5b906ca30e8e128bc390310a9f464efc7a9af05fb1fbedbf9b7
+DIST libkcompactdisc-21.04.0.tar.xz 96696 BLAKE2B 2ff6d74c9dca09a3b95826adea1504d463f2060c00f29dbb4efd1e8006d388545a04cb07886a9e53014627aad8503b411f78ea974c6f6d14b4a1683c9745990c SHA512 eaaa343f8b901318d1a6001dfa151c2b5d176babf2ad1551d0cac7f9a0d7f75ba64d249c4680f18d7561750c89002a7c2bbca3e3a20fad703a76f8ace25a6021
+EBUILD libkcompactdisc-20.12.3.ebuild 637 BLAKE2B 2b9d6632251a8b3e5ffa438ee206003d4f27661d69ec002ad5f47fb110170419b7fadafc17da866cead42512a7ec59c07d5323e4394ccc6fa0fab954f1762bb2 SHA512 737bcda4b8622cba9b740ddc74ec8a08fcd827002156a80bf88ecee98cd427b2ad9b079c6dc2706d309d453526b812ac57af22dfa75be0bad0931cecb92b4957
+EBUILD libkcompactdisc-21.04.0.ebuild 599 BLAKE2B 812033d1cf320bcc516258c635d26851c83849476a203213b20124cd0d364e9e3ac3fc010ca9cce6a42b1b5821d9c606f3d42be2dedf405bde59150471e7754f SHA512 68baccc39571db5c4b0d59de5ec0dfd900d3d45accc9d4dd371a70ad925277855b5d2d22d9339e6f5c5f0b274b00b46ed357229dcfd39984f8d18af563fd98e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-20.12.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-20.12.3.ebuild
index c32d0037983b..2f71c4dbb94f 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-20.12.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-20.12.3.ebuild
@@ -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 x86"
 IUSE="alsa"
 
 DEPEND="
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-20.08.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-21.04.0.ebuild
index b4641e5be1df..3bc6c48ff948 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-20.08.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-21.04.0.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Library for playing & ripping CDs"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="alsa"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=media-libs/phonon-4.11.0
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index c86df5733e6a..694abcf6e52f 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
-DIST libkdcraw-20.08.3.tar.xz 41968 BLAKE2B 52818772af930f7dfe444c11bf73f2f99f0120537af4427775ad1aefca5fcf09501122e219ccf5735a03c611166debd6eabf5b42992965b9d6edd8f325d62161 SHA512 b8de2f04315b25951d53239896f23a24e0cd43802e583eae5d24a60b724056e0cb0c2bc2d847e987ba5009e7a185d8c0820fcea0dd9bd39389e9b1380ab18803
 DIST libkdcraw-20.12.3.tar.xz 41956 BLAKE2B a8923c7430bfc0d309abaf3381edb55905921c205e3dcb736b56d7ef54f9249d8bff49b3724fe3a4ca51863ae257ffd6541a3cae1712b59bc887c8cb8aebdb69 SHA512 a1b89a1c4732958c4432830e5b0ff10cf447c702740d43d70a0530e04d5ca8efc3638a41dc74d7280357af867a0443e35c0ab758e1ed6fee22695aa4551ea039
-EBUILD libkdcraw-20.08.3.ebuild 358 BLAKE2B da18d9aa1dfef330a960d9d610b2771070f8195ef525bf8420bf165a9f51484da05e061322a2101947d09bfff3d65b1e53ff0f3c90e0c86a3acbff0f480c7ee0 SHA512 613bf6dd57b50a44289a3a41c0ba72c7b5cfb3692099b98b1c6c69b9dae6772a8d553b3face52f3c6fa42d37943edb2721ab17c4b94588de7b7cc71538b2dc7e
-EBUILD libkdcraw-20.12.3.ebuild 361 BLAKE2B d6a5712461a844854768149e6e83e231e9e36e6a0b624721d89c1862de0a1ec2ad3bd3654ad2879fc7d536f17965b610561d8b595f6009c885416699c60cd2a0 SHA512 ddcdd22116999a5328f2f51af1149981229a2d91b390af96c4db6aafbb5c8ada9c699110b98b7a81bb3209fc92b2718154857e305961363ac7486e0a07ca5de9
+DIST libkdcraw-21.04.0.tar.xz 37204 BLAKE2B 35fb01e10c723367085c352050e6497343849b148b83164a30de7e174d878a6eb8b7ffa66271a0c6773648fd4dc4a06f231afb102233f3cdb721171798aaa8fa SHA512 b770d88460f00d7581adfe20f5d7a666b5c002088a49b550e44b1fd1fb7dba4be857fd0ce30b5fdefb23acbb2fd8845b9989ccec795467bd8d1f4eb5a267e603
+EBUILD libkdcraw-20.12.3.ebuild 358 BLAKE2B 5c10569ee6c391389ed343beb5d26c64ffefb91eee8970f75d2469e247b7dbfd4075279b9d828d0057078680d8f0d6a0f46e3e3fb0719825b81eebf3a2b7ec3c SHA512 1e09358a49a44381be56393567f13c3e3263442c3db985c27ea4df851c4cff3839965571c965cd1d7d54e142ea691c458f37f8a80db183f4cdeaa707cde0da47
+EBUILD libkdcraw-21.04.0.ebuild 361 BLAKE2B d6a5712461a844854768149e6e83e231e9e36e6a0b624721d89c1862de0a1ec2ad3bd3654ad2879fc7d536f17965b610561d8b595f6009c885416699c60cd2a0 SHA512 ddcdd22116999a5328f2f51af1149981229a2d91b390af96c4db6aafbb5c8ada9c699110b98b7a81bb3209fc92b2718154857e305961363ac7486e0a07ca5de9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-20.12.3.ebuild b/kde-apps/libkdcraw/libkdcraw-20.12.3.ebuild
index 0a3e859dbc8a..6bc5b767cc2f 100644
--- a/kde-apps/libkdcraw/libkdcraw-20.12.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdcraw/libkdcraw-20.08.3.ebuild b/kde-apps/libkdcraw/libkdcraw-21.04.0.ebuild
index 043708f48f92..0a3e859dbc8a 100644
--- a/kde-apps/libkdcraw/libkdcraw-20.08.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-21.04.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Digital camera raw image library wrapper"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index 9fb8b1ba7375..a6497c2efc86 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,5 +1,5 @@
-DIST libkdegames-20.08.3.tar.xz 6391180 BLAKE2B edfcc6084730708f5bfc553212a4e9fe399d781812523a344eb3119c61225bb38bd019266bf39c99287e48c9bf3d8effcdacda73c56c46d4b4018948d7421bec SHA512 83a6f990744db08e539722d469be0368507b075b80c99891e351e8e05acf52c5958247fa8772188545f7844c896dd4a7f0160379959677f554e35b6ded3367dc
 DIST libkdegames-20.12.3.tar.xz 6389576 BLAKE2B 9d7be68bc6509b99abc5b4a2b06edfaf89737fc589c5503f255560b9cbbf8c00862fdd10bc1d3cb557644b52a0b251ddab81a3104b996e092a2656f171f115fe SHA512 a9b02c395b8e025f68b43f7bb5219cc3407ce6bbf9342c1542c53bf80881354f5410820f3f97dc496cdbc7dbbfd8c72e15b0fd07ea504235f40c9e3cd4123756
-EBUILD libkdegames-20.08.3.ebuild 1470 BLAKE2B e5725fdb34deb51c095cb71bd452f9662f27bedb9df25f00d82f0f617ad77bc8907238fe3028167a6e42c0bf40156f098a3c324aa709a4a8085293ceb0488ddc SHA512 25cecf04d87f7df86628959135f5505fd379cae85b999b8baf594773aae8b877133af2de669421a27eb6a9cdbf21b9f496f01ea54d9d934c421a761fa47e4d97
-EBUILD libkdegames-20.12.3.ebuild 1473 BLAKE2B 747ec8ef2e81ca7c57f6d0a83715befe109c48273e79cec5b44cd1fae4ad9e85d0df5697162ff388b8dbbd07361fa0efe275b727264f6a67a1776a5f9de91c30 SHA512 288f6c57410d23c16fa633c742922a9ee3c82cceba72af6a298b9c25931ad7bb365e814483b066eb63a5e60ba756a60469755eb1aeebee79e032fd8522095349
+DIST libkdegames-21.04.0.tar.xz 6390828 BLAKE2B d5456f4b0f5c47dbb712aa08d1ec5516f7ea7ad830fb5f112a5951ebcabbe666b8b2185ab6c7f42165bee5b109fedd6e681f89cc8a60415dac0cccd160b11080 SHA512 96c39c7083f5576308d4f64ae3a237d72defc7246b54ad993a9fef9be196d48480f2d59491db182631c7372730edf69f66b6bf08228363e25a51c32cdadb5b9c
+EBUILD libkdegames-20.12.3.ebuild 1470 BLAKE2B 0b82045f8fd46874203a5017798bdacbdb43c8b0035b7e46bbf6001c43d277fefe2f6551688a3e72da2683f44e1c27d1eff75fdc02673893758178a589647b84 SHA512 edfbb4550e1b6d4173307e8425df5285e733e901e4a4dd13838479a09837192b3324f698f56630dec7f35bc65078e0621ca4a8013b2c01f6c63f8afc319b5301
+EBUILD libkdegames-21.04.0.ebuild 1473 BLAKE2B 887478cc6bceede1de0a587ffca30cdc5a9e88496a06b71f815411cc3a8b167cfd2b40c84429f055f8311acac048cae2e854c7d1a1441ecc9ba089e8f2d3da67 SHA512 dab8a4eeec25e692286306ce385ea6bd2de2588ed2fd090d6b22212221e9659e19a9d1152e58df14e2f78a689780e53fda81bf43da07eac55ba6f82778bc0b79
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-20.12.3.ebuild b/kde-apps/libkdegames/libkdegames-20.12.3.ebuild
index 272f3f1622d3..66ec1b97e0b9 100644
--- a/kde-apps/libkdegames/libkdegames-20.12.3.ebuild
+++ b/kde-apps/libkdegames/libkdegames-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdegames/libkdegames-20.08.3.ebuild b/kde-apps/libkdegames/libkdegames-21.04.0.ebuild
index 512985ecf35a..f654013665a9 100644
--- a/kde-apps/libkdegames/libkdegames-20.08.3.ebuild
+++ b/kde-apps/libkdegames/libkdegames-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.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 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index d01a5569fc0f..4eb91483f7c0 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,6 +1,6 @@
 AUX libkdepim-20.12.1-unused-dep.patch 1208 BLAKE2B bf799fc0c6fae2c87761a02a3c3fcd0829901bd264aa818e2b0921d7f1f7ddb3ec687daa93941acb9ee0a2019495455e150fd8e3b32daf2086af10e0c3d0e393 SHA512 55cceb528bef90c9f5352c1e2f8a04e5a2cf2652e6cc36240498fb899829c4b212f8768c5f451e1f342348f360ae4ef3018eb3ef637521760dce4fbe4ca6e645
-DIST libkdepim-20.12.2.tar.xz 238548 BLAKE2B 0f859d3e081b4b26f96e0d66844ac68301ba4c3b4f59e22f8648f575cc4048fe682cf82233fa75a7d1c80c5c756ff1efaf6ca2a947d1d71616af48a315c037ba SHA512 fef76bd6b086ffe7bf232d6d742583a4d146c3dda31c15799708b86d23f29fa175dfce86ac084ced2cd107968dd21116a8f5e776e0ab67347ca6a62c35e4d877
 DIST libkdepim-20.12.3.tar.xz 238528 BLAKE2B 4187e09fd31348d4c0d8feffa72e394d7777af6897cf80605cea7d3672acaf651fd0646378c9b9c87469a66cfb9475ef2a06f5395e28a9cc5a0e2a9697f97b06 SHA512 9d491c72cc5ab5745380b3381b50a7d2e94dc6c5b8d52fa36f26d8ba7666635a97b412294211f7dc032d5aba5bb4ce97d499e22218f11cd6f723d051e452fd74
-EBUILD libkdepim-20.12.2.ebuild 901 BLAKE2B 1668c8e957ea6ef12a6dfb96b8db7d21fd0ee8910334c06f2610dcb09f6a72473ffe422ace04d8b413929a6e2525adf0617bdc05e853ab10ac87e87280623167 SHA512 9bc5216a70ed4309a47cb4e8a31e8423449312ab26fab8e80e0b48021c5af02ec6a26fbc61110dc01804bf8718dbab4ffd1d948fb1ac3384e6abb33a5ddf2564
-EBUILD libkdepim-20.12.3.ebuild 904 BLAKE2B 6290b6f75ab366112d69d946693b94865e08832e079e8084aee5dfb425b2ef0e0147085b261b74ad93ae3279aa9b0dfe6483328d5e6102bb687f3bdd7d7459d9 SHA512 8dcf4f4ef833e66c007e8a4a735db708976acdfaeb4576d6d5ff7d7c542df34ec441c634c1b750bc5c311565f090907b35516018af6be95f13cf58dbc3d2548b
+DIST libkdepim-21.04.0.tar.xz 242276 BLAKE2B 973fcb26a5332d59e457f429b5db9b7524f0df35f7ca914b2254573913ec48e3aeffb99c3aba57ce9f80d12bebe4631495d6014e9b6935241d8b31eb56a5f173 SHA512 771aee627003063a4447f835e99fb04c91cea868b7f87cb27e5abbe42efa6395179daa0cfb43bda733f0aa9c43df3e6aaa1a18cf3195ebc0fd426c51e6a0e527
+EBUILD libkdepim-20.12.3.ebuild 901 BLAKE2B 1668c8e957ea6ef12a6dfb96b8db7d21fd0ee8910334c06f2610dcb09f6a72473ffe422ace04d8b413929a6e2525adf0617bdc05e853ab10ac87e87280623167 SHA512 9bc5216a70ed4309a47cb4e8a31e8423449312ab26fab8e80e0b48021c5af02ec6a26fbc61110dc01804bf8718dbab4ffd1d948fb1ac3384e6abb33a5ddf2564
+EBUILD libkdepim-21.04.0.ebuild 846 BLAKE2B 3c7624d98703c106b33a6dde17c0ccf0200945f7ae057cebfb291315373f234c6c7abdd2ace6112f10ce5b24775c527e97d455a649902e0ce2183b5b0c816f3a SHA512 5bc2b75f21b0d8519f6f3230aaf90667a5cc4e594ec1958ce22562725a8530f4f506167b026335d4490db3feea29a137a3ee42c5ce7fdc6c05d78fb15ffea3a4
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-20.12.3.ebuild b/kde-apps/libkdepim/libkdepim-20.12.3.ebuild
index f815ada55283..88400a729a8a 100644
--- a/kde-apps/libkdepim/libkdepim-20.12.3.ebuild
+++ b/kde-apps/libkdepim/libkdepim-20.12.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=""
 
 DEPEND="
diff --git a/kde-apps/libkdepim/libkdepim-20.12.2.ebuild b/kde-apps/libkdepim/libkdepim-21.04.0.ebuild
index 88400a729a8a..9bd22162aeee 100644
--- a/kde-apps/libkdepim/libkdepim-20.12.2.ebuild
+++ b/kde-apps/libkdepim/libkdepim-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -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=""
 
 DEPEND="
@@ -33,5 +33,3 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-20.12.1-unused-dep.patch" )
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index 72973d3e9fdc..2c36ab36cd25 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
-DIST libkeduvocdocument-20.08.3.tar.xz 214996 BLAKE2B a30b2ebf0120b2b284afd7b6af2056d96a7a04be4d86e60e7fda0a622153c576b74d484f32a8607186d8bf865a3cc58a5c7704460e4eda47671675b0b367bcec SHA512 9f08fa2d9a06d4537fe3a5c96e0b7c9c54d6b0a36fb19c5ced9310a03263e06934597857c49efb446cd0581d1282d257563da47ad8d3e7be6275a29851ab2f7d
 DIST libkeduvocdocument-20.12.3.tar.xz 211096 BLAKE2B 64b89f8f1741632d96bb6455133c2c513a46a1870f5feb6679a22e37a7f760133320f074d5916a17f2bec31faff42908ae5df5ae5ff393540a47c8b512c399c2 SHA512 6ae7dfe1e22c0d412efe3c2d10f879b2fa9f853c4f9bcc41a86f4ad0d6031a8be57423cfb7b8badd666cff7666cfff535017882231d589e00d1ceddca6c59684
-EBUILD libkeduvocdocument-20.08.3.ebuild 505 BLAKE2B 218bad6aaf5910c41fcd44e6a7df3095aea4f5ef4acda191f69f995c17d2339321f139958e8541c4d3ac53863bb2afed7e03ee4d1c818ef9272a791391cbb3fd SHA512 3d65f50518317e35d62d1a31435c432176cb7f0e878fabdc60f87f2e4ce5b7013775d91b219adae0f833be7138b4d551e2b9999b4ca76b7d080042e9918ea471
-EBUILD libkeduvocdocument-20.12.3.ebuild 508 BLAKE2B bdca17e412d26551ad310b8576d25334371018ddd39461d9dc92430e73c74042108d3ab4e3ca3adc58c5717679ed23bb58ede9fb22b18cc6404be149170b6849 SHA512 52f89e4da081a8bca43765a86515a7ad5aacb8b574209fc974a863199191ac193bd005b0723f15eb14957bd80cdd50a577e8b3b4c505057d7331095bec29a5fd
+DIST libkeduvocdocument-21.04.0.tar.xz 211368 BLAKE2B 5ab1b2da26c3e5b996a8b3fdac1def835c6104482b9d167103b808c61febe56240c2fb78ad5f8ffdcd63762740611da28be04de5f88b387f420f47d54a0ffcae SHA512 215967ac11ed7684e6aa0b36915461c1bcdebfe91dce0f5863f8d82b17c027e9648c35f42ca48ee20dc6912f271265e591438b02878b6fa6bc745ed553b0b09d
+EBUILD libkeduvocdocument-20.12.3.ebuild 505 BLAKE2B 99872f55f95ba8cace7444ba387e4785e3edb0fd4a82289e512522a13bc142c873e5a3bfe6a34b17adfe3a10546ff1727634d11a0b9afc1a4a92d442c386eb92 SHA512 bd8b6d8f9cf32a745e231b4d4d0c64bf08a59e7890384e278728c7eadc0fc1ac5d5f32073dbd4dc6bbdb759811fecafd9c50d25244ae818f8fd340a9cc2a977d
+EBUILD libkeduvocdocument-21.04.0.ebuild 508 BLAKE2B 9500bb0eb0c0f13eac498090e0582d5f3f685d3410550a7e0f5881f9159bf822c16a23e82028313349a7e5dfdd652c522473778cfedf829347111da278dc163a SHA512 6e140c6197c26cb3049b33f2c7c97bad4644af840bbac8a99bc7e1152eefb7010395b32878d8f79a3c367549e485b14318b319034bdc02d6f2d208bf0b6fd3e0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-20.12.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-20.12.3.ebuild
index 42352a57c2b7..aa1d46b3c8f4 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-20.12.3.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-20.12.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for reading/writing KVTML"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-20.08.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-21.04.0.ebuild
index 52553e9b0f28..f231af33dda1 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-20.08.3.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-21.04.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Library for reading/writing KVTML"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 2bb4a42b9c16..8c0657d411ac 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
-DIST libkexiv2-20.08.3.tar.xz 64728 BLAKE2B 8ab07824181c7b21717889892cc76fc31e3735beface7b76dd2287e8c27c4d85cade468177d13a52b5d9da2a0b3407eeac9082f918403d218be4b1fb9ff83971 SHA512 ebe6bbb04923518ccf5e7621d434bd5accffd4e8f798a634c5ab8f63cbcbe58644db1ae9da2d263265a89803207da3c79cec0cb96b84d289170898e56d822ce5
 DIST libkexiv2-20.12.3.tar.xz 64724 BLAKE2B 1534d240592d3ef545e48c4d1f00acb40a556966dedfbade2a683d2b4f53a1d7b943cf623b64746c90fedd36bc8f650e0c80f2427d44fc68d57fcc4dd1884069 SHA512 35fc12b5f1dbe8aa533370627529eb46aec05085c71cd5dc2858fa9b52413afd5d706c099ec2e74e7827bd7f5fdfda323e1475b599ab67fe78a4a5831240e217
-EBUILD libkexiv2-20.08.3.ebuild 354 BLAKE2B 2682eb5fadb41e5fadc8e881aa43e46e218b2b28d10baf2ca728985e17c6f0ecf46a1259c31ea2a3c8d0febbf6a5cab5c122786d76fae93c1ce61c97e6aba2e3 SHA512 61fdcf09465004f71d0d47e0ff4fb1e5c79e8d70e8a2101fbd0e6ae9482137596ddb263c4eebd80fdf96bb8a72b8f4c15476e645d627dc46dbcbb2595574b6de
-EBUILD libkexiv2-20.12.3.ebuild 357 BLAKE2B 1e0eca09926de3a29ddcebce0415932861933095171666626addda7fbe327fcdbbc0b77b1defe833db88d122209aaedb4adf5dbf578432a76dda83ce7585c3ba SHA512 9788378312a7335e69df548700ff41fce5d8c64e05e05e8562874e6c8f2902546317dfdc3f13c0ded7bb9a3358c6b017c16b94202b0352e4480f7a2af10faf0f
+DIST libkexiv2-21.04.0.tar.xz 60276 BLAKE2B fd070e689c9b2c463d7c33d768587e7ab4f9dffbb885c14f6d14d041f83ad7b215e9c404a6bb787825a15a14a1dfc095ec2c5df30f38660a73e70f17a0545b53 SHA512 6646d58179724b70e7a5858e60cd44582ecd202fa2da983c3958db07053769221deff50b91ba8eae2df12953ebfd5368efdeec3af37c696ecb9a70d4d36956c7
+EBUILD libkexiv2-20.12.3.ebuild 354 BLAKE2B 58e5e1fd50812ee00c510086a5d6cbdb6ed59b72b7ba62b18740528225fbb4dd0de719e0d0d28949f6b9c8def55b2472c78d27c01f452fa956125ba4faa6475c SHA512 ab11ef2335831ee5d900e9325ca9221b506e1785dbcf5b72851d069983ff67cae4f301e6dc56bf2c18c227a97543089f8262bd02ad249fe9b8498dd54b8ea52b
+EBUILD libkexiv2-21.04.0.ebuild 357 BLAKE2B 1e0eca09926de3a29ddcebce0415932861933095171666626addda7fbe327fcdbbc0b77b1defe833db88d122209aaedb4adf5dbf578432a76dda83ce7585c3ba SHA512 9788378312a7335e69df548700ff41fce5d8c64e05e05e8562874e6c8f2902546317dfdc3f13c0ded7bb9a3358c6b017c16b94202b0352e4480f7a2af10faf0f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-20.12.3.ebuild b/kde-apps/libkexiv2/libkexiv2-20.12.3.ebuild
index a816779c1252..81813f956c9a 100644
--- a/kde-apps/libkexiv2/libkexiv2-20.12.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-20.12.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wrapper around exiv2 library"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+xmp"
 
 DEPEND="
diff --git a/kde-apps/libkexiv2/libkexiv2-20.08.3.ebuild b/kde-apps/libkexiv2/libkexiv2-21.04.0.ebuild
index e1cd1b1c5b98..a816779c1252 100644
--- a/kde-apps/libkexiv2/libkexiv2-20.08.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-21.04.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Wrapper around exiv2 library"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+xmp"
 
 DEPEND="
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 5307e32ea6b3..253bf829d905 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,5 @@
-DIST libkgapi-20.12.2.tar.xz 246020 BLAKE2B c934898d8832c0264919a313d25d6a74a7a377dbd5575926ea6bc6ebbe8870e37691b307b058b67a5ff09d9bbf2db759b4d98d93d347a239315500e7f95d5bdc SHA512 0350eaff72b192219553047781e1ae79bc794b9519095f812a1c8efe3e9d33c3dbb5d9db07bd28a39132adc4543627e2c46a866aec9f8710ef2d35cfb0a1f697
 DIST libkgapi-20.12.3.tar.xz 246100 BLAKE2B 8032ac37f983c14e16c37279bbe14718cbf3ff5123db01dcaaeef2fc5b67454ea638df44b668f92f9c00a3ee8578d9b5dcaa00604ecca32b0b5ce14d8a81015a SHA512 5376773bdaad0970abc1a9fd43fc904eaf39601c56fc626f2d08fed5b2b48ee0df79c18a33d9426913efde048642b4ced59a29cb5532a0e4661e565beb30283d
-EBUILD libkgapi-20.12.2.ebuild 760 BLAKE2B 9d3b7ba26dec2806dfbbc083eb5ef4924b900aac5d25b9b297bf96b121f6d0f3065cebe1e5fa93e6912cc9d474145a4aa97559ed066020b6a58f02ba320a5f06 SHA512 f2e578e67177d5fee67e91a762c8edb318f7784a525454e4f365c54a19fa27f325a13345e1e4c2b22f034facbdfd39fac63d42d07bf9c69ab6f5324cc5162497
-EBUILD libkgapi-20.12.3.ebuild 763 BLAKE2B b80d1308df096b0ca2325260177be83b2c8e48cd98608ec150539e66c1de33419f58693dfbeecd6ae53038c58fb31bfa6030a1f7a4124645034fdd79ccb08e7a SHA512 a827eb73fddd9d4dbabcc1cae77c5eeffd5eadc11102cbba926e96ceab017524fb2a8015c3005930e4a314bb1e884ce3e956598ff084002e4d87b96ac515e901
+DIST libkgapi-21.04.0.tar.xz 249508 BLAKE2B 68012146f751c13520e73f94d8d9619eec54c85fa9d14146d220762671ad58a3a83a64ae30a6704ff749b084e5e657822f92cd55eb8bd48330c89f4a80e7d3b2 SHA512 93330f7e3312db888acb0cd083d2d75d6effe62733cdca0ee519ad3e66fcffa88a94e5fae7d93413ee87b84ab06983c7aeba315d063d27fd1aa00f0bc13ed2c1
+EBUILD libkgapi-20.12.3.ebuild 760 BLAKE2B 9d3b7ba26dec2806dfbbc083eb5ef4924b900aac5d25b9b297bf96b121f6d0f3065cebe1e5fa93e6912cc9d474145a4aa97559ed066020b6a58f02ba320a5f06 SHA512 f2e578e67177d5fee67e91a762c8edb318f7784a525454e4f365c54a19fa27f325a13345e1e4c2b22f034facbdfd39fac63d42d07bf9c69ab6f5324cc5162497
+EBUILD libkgapi-21.04.0.ebuild 763 BLAKE2B 54da50c1037dda477ed5ffcc4d7e5ec92773e5646851a17bb9c6e320676d3556651c1559d855513fa902807693383c35b9c73244d38d36e1c4c763ee8dcfb356 SHA512 613dd0c36357fcf9992a9ce359c5ca2f10908e46e3eb6b8395b832d01a82c9cd0d60bcd8343696f0b5dd1198f75e8d50cce9e6dde28f97bf8cee3800bf756a91
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-20.12.3.ebuild b/kde-apps/libkgapi/libkgapi-20.12.3.ebuild
index 9f09231fc49a..1f8552178b95 100644
--- a/kde-apps/libkgapi/libkgapi-20.12.3.ebuild
+++ b/kde-apps/libkgapi/libkgapi-20.12.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 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/libkgapi/libkgapi-20.12.2.ebuild b/kde-apps/libkgapi/libkgapi-21.04.0.ebuild
index 1f8552178b95..f5c38dfc608c 100644
--- a/kde-apps/libkgapi/libkgapi-20.12.2.ebuild
+++ b/kde-apps/libkgapi/libkgapi-21.04.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -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 ~x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 80721d709887..538f2315b229 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
-DIST libkipi-20.08.3.tar.xz 103596 BLAKE2B f51af1cf60f8309a2ef6c938785dba7744001715f665c1073b9b434276cff561cbcd190fcc0fe7034a7c730acdf4371cf718fad652741dbe6b5ae6e088a620a6 SHA512 7ec92073717fbdd0e5e2285c48dabf68fc1fa6e3fe5039d8cdd2400625bdf0d35ccbcd4c179ec2d972525a00ab7230aef85e501c0b0ae4a4486f55b3eea40aea
 DIST libkipi-20.12.3.tar.xz 103628 BLAKE2B 72861287160fab80538784cc1ced1ce90a5907776aee917723d38565a3101d2480db7894f884b2d69372a985a14c72681c5659bdeb61909850feb91dc673963d SHA512 fde2b5026423b39a55e182a85ac0f1c8ab187ee24a68bd5840f1acb9ce16cb6b8fd633572f017b2f8416db598679f0b2022338a91c3a027f918fd59928f55368
-EBUILD libkipi-20.08.3.ebuild 569 BLAKE2B 6c0f01b48a6f6db3ce9cce44a720589a98cfe2318763126a911d278a0f74b38b493766e0836b314c860cf2d255fc860b88ce7ed55b9094677c9c3c02cd3124a4 SHA512 2234e9b8daa09a865635f18bf0fc487ba39c82b46e6c2e7199623cfae48a6ab5c3380fbe6386978f904c27ab0264cc1fa44ce659b168d980f691f6bb2f923343
-EBUILD libkipi-20.12.3.ebuild 572 BLAKE2B ca140ee4d2adf8af17dacd60db48e4f7443ad97ae528f90987fb53d489d559228f24ed18b78d7f48171a3ec5b2b71495a961efb28dd5b0c90439cdaf5122d126 SHA512 3c19c3978618140403044a6d0b9e26f0df0548365605f6ae3f9a97a9163f9f304f9b037c33d0da1b4d299861e1d142830613f994f3ab0ffec0003115861ac11d
+DIST libkipi-21.04.0.tar.xz 103432 BLAKE2B 0cc58be83684c29f5156ed7a8f8d5eef3c09a4a979dfabc174844f094c14fde86e9e0c44238b7d253b31ea790d3e08556dff76bd48649cb16bb95761e5e01cc7 SHA512 f626b2a0083783dcae50d52e7ef77542cfa818a0d9612dfe2280d4d926bf3a39d3170480951c6c396e1c122c07358d2a044ddfbf841b454b0cb0b5d6ba0cefc1
+EBUILD libkipi-20.12.3.ebuild 569 BLAKE2B aaa6a7c01a40ceb33e41bf7997c6d9bd153489947bd0625de2d12ebd712eff2b55d3375de815bb1b19b7db9bd0143ff5097102a4320f51667d978af979bd664c SHA512 9183639803c519e77117224655dcc4538b515c90ad4aaf6f1f2b715efd57424516f022d212451e90842606ad54f2c89a3c9445b085f7087bcdefe5cecb3028ad
+EBUILD libkipi-21.04.0.ebuild 572 BLAKE2B 37680df8559dc294621feac1f0cb3563582cec63828c4a5462fb827e2e83495ce139e3ff83868339457eecdb7697207cde767f2a8b3cae35092f0a72af7e9ad5 SHA512 6b8f29dd196104bfe35591bd95192e7a20e764098e76da0e566a787c96d3545cb6b3984edda44c15039e54873960cdcb5520f10f01065714b7d020fdf7dc4753
 MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/libkipi-20.12.3.ebuild b/kde-apps/libkipi/libkipi-20.12.3.ebuild
index 0020cc81c03a..2117eaeba298 100644
--- a/kde-apps/libkipi/libkipi-20.12.3.ebuild
+++ b/kde-apps/libkipi/libkipi-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkipi/libkipi-20.08.3.ebuild b/kde-apps/libkipi/libkipi-21.04.0.ebuild
index 3ea6f6e3349a..07e21570c664 100644
--- a/kde-apps/libkipi/libkipi-20.08.3.ebuild
+++ b/kde-apps/libkipi/libkipi-21.04.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="A library for image plugins accross KDE applications"
 
 LICENSE="GPL-2+"
 SLOT="5/32"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 6af9d288b0c2..f389a28d5f27 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
-DIST libkleo-20.12.2.tar.xz 358600 BLAKE2B 1b1802adf16605d6c8e3ce8fbf4e56a353cea5e3cc07a060dd78d8fe4f5adf2e1ce74c12942e803283a07fb9db237fc049a3bf1adf64f59337dc79e71bc31bb6 SHA512 38b6bbbecf37327ef8ce55f9d14750c4fbfa8ca9712d73906f13e42ca3e199e6fbe2b9dd28afdeaa239aca73cf6608a12246472238e235eee099305d9c48be50
 DIST libkleo-20.12.3.tar.xz 358540 BLAKE2B 393da453f558670d448304f79f381ff948664422bfc49f89e706fe4e70b0b2ebc46eeb3b5039718c1822e0815d0fc08628ec50327d3e408077351d8f675f8a43 SHA512 006b6074f6e77fff1e95be7ea209042306b5dfbea6e99ee0502e78cf37709e1d8e4e02deb3011a434712dd98d62b2f1fdb5bf9140913def8075ca45e67e45623
-EBUILD libkleo-20.12.2.ebuild 960 BLAKE2B e712e645d3daeaff62bba6ae1f933c4fc0dcb18cde123379e16bb0dbd79a11b21a266b3ce0f54208416b846762917bc2315c16bafd798565560695354a4ccb53 SHA512 aa13eb3f1e40d070e447324a17052a6051ecd5576234dcbac90a85ebc6cd2200fdd686ca525b7245aae793987f95b5e6af15a193e6629c1a7f6ac02c75c4dddb
-EBUILD libkleo-20.12.3.ebuild 963 BLAKE2B e689a80f302044ae088a3ccb36758601a7d09237ab010d3c7aa05e8cf2885120b6b2533c0e0c82230ffddd66fc6c27f8525c16139f87425a19562a7a508a5fd1 SHA512 b54e7c71d0686110545d07459bcbfb8aef827218e7e35990cfb6bf35cb5b587ccbd03f71624fc44144c7ad363382815b8966f375cf058c9b31ed70fde492ee93
+DIST libkleo-21.04.0.tar.xz 371844 BLAKE2B ec18322d1ec2a3fa5ddd0540b4e330a8edda685b85d02ec713b6c5d557c3005ef48ceb33e8806d13c5fdf07d80d43c4cc29396fa1911c4bd1e0b0a79d01d788c SHA512 02cb008bc5d6fa15da04bb832c947f65a69d13adf7693bb32a31366579f34875e4a1f8fa1c219a9fb740b784430273635eff7bc2725ac64c4f359a984bdf77f6
+EBUILD libkleo-20.12.3.ebuild 960 BLAKE2B e712e645d3daeaff62bba6ae1f933c4fc0dcb18cde123379e16bb0dbd79a11b21a266b3ce0f54208416b846762917bc2315c16bafd798565560695354a4ccb53 SHA512 aa13eb3f1e40d070e447324a17052a6051ecd5576234dcbac90a85ebc6cd2200fdd686ca525b7245aae793987f95b5e6af15a193e6629c1a7f6ac02c75c4dddb
+EBUILD libkleo-21.04.0.ebuild 963 BLAKE2B d7160023edb697767c5f8e6e5475431cfd17664747e45a9ce59f16a591b0d580accdc582dd757e3bc5f8b9c250576da622a6aea5859ea8b15ebf49af1ceb3fe2 SHA512 53e591f4714fdd2fcc9f01227096de735052255da3d39f54a5c73dffe37b792f2fbab223811eaaaf033c5318c4b10ec8489c5a35f0e9c290685d26789d201034
 MISC metadata.xml 368 BLAKE2B 971372ca098974cb69299f52e0b44e479517a0fb2f70b6c23fe762d93675674d62e46d5d4faea403edba12828ffc0c32fa274d287d1c71ff499df69d2e52a2d3 SHA512 dbef1e7970af1f4cc05ea180f5beecab9288d5502c365d2dcbdc418a67868baa9245bae8ae0c9d637ddcb3f88a03061285fe144a3a117c722654045fd7a4a58d
diff --git a/kde-apps/libkleo/libkleo-20.12.3.ebuild b/kde-apps/libkleo/libkleo-20.12.3.ebuild
index 55a6164c2090..7405150e5372 100644
--- a/kde-apps/libkleo/libkleo-20.12.3.ebuild
+++ b/kde-apps/libkleo/libkleo-20.12.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for encryption handling"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+fancyviewer"
 
 RDEPEND="
diff --git a/kde-apps/libkleo/libkleo-20.12.2.ebuild b/kde-apps/libkleo/libkleo-21.04.0.ebuild
index 7405150e5372..46f818e5afda 100644
--- a/kde-apps/libkleo/libkleo-20.12.2.ebuild
+++ b/kde-apps/libkleo/libkleo-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="false"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,11 +13,11 @@ DESCRIPTION="Library for encryption handling"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+fancyviewer"
 
 RDEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	>=app-crypt/gpgme-1.13.1[cxx,qt5]
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index 065b5a8d2aa3..22b0e4737644 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
-DIST libkmahjongg-20.08.3.tar.xz 1690708 BLAKE2B 81a71ccc32ffccfd034f0024e38bc44b4f01178fbf0c57ad1143680d35b11b9eb0c618d7158d9c6b87787e515c950af7cdfc033d5173c20719f0e8138e85e8fe SHA512 1abd6e9eb3922a5b6cb97b410b2712a7f172e9cc3ccb8f8f4a15f89f6e99cc952966421c0ce44ae79198fe7175cee4eb180b710f2f2f12fa91f3747ad1123e47
 DIST libkmahjongg-20.12.3.tar.xz 1691308 BLAKE2B 0d845abaf8878a09ecd00f2cef0a89861f3bbf09f4ad793fb1316c8bbe570ac23ced668e3b8ff1a0c0f5a39cd3146e15c64e4539e85d55bc1638c9ca914c741e SHA512 c4e35ec5f60ab6c401ba278e69ff2d46ccf16fd6a5f88b1dd1fa4914c030c52c7a055e473a9fb14e87ce0ca9ba36d2229ff57fe985bb9fdff29285d43e98df0e
-EBUILD libkmahjongg-20.08.3.ebuild 652 BLAKE2B ee7fdf840e500ea702c9ace907444e6fc0fd526a5ff4fa6454fc631b297daa456e995077efab62ecda47d678ef70eec542d9a5f9825ead9781612a04b865ec41 SHA512 4557323c78b553605865f5cc81515b38fba346de355558085897454193db4d29e85eed330824511bda29f9a80fc90a8568086884bfebecd7ff96f485a69b0f8f
-EBUILD libkmahjongg-20.12.3.ebuild 655 BLAKE2B 83c8887e60f1785d411f2619237b5d6bc63330925eb3e78dded62c1ad0cbd7162827bc630e55bc7d3a9ed2ef6f72c77041c845566a799a070046b8f9555f4416 SHA512 6c5155aa33730e2134d87f5a28e27adff045d3be0f3c8c28d2906175582065baf82e1077689a8c5bb1b483dd8a85e49239eaf279c714f57edfdefdd4009bfabb
+DIST libkmahjongg-21.04.0.tar.xz 1679416 BLAKE2B 70554c518a68818a60de9a441631625d3929a7f41e1644574af8b8c8a6d352c1fbcfa57b8df4fb10a74d50e56f6406583bb5aa3a2f8c958da96977cf2adb98a4 SHA512 40c42f0820108918488a780c4c2f5e2661bb8ed87dc86890febd43e160188b0fe8d9879fa9bb7c96a07e4903f2f16ee66cee961e66f69a1d2d7e657e2e9351c5
+EBUILD libkmahjongg-20.12.3.ebuild 652 BLAKE2B afea68c16ce20b31b5253d6b2b6d6e09089fb9164facc9337fcc2e84e587520563ea0782243ad753304f0c8ce6142a74f6d056f24234a49346eaf473207c9827 SHA512 b3ac9074e836ea56aa6fcd5a9b858d0f68b378b00c66ab0cd6de165953f900c41d7f759cfdc23680b4d1c34241f974bd4ac0807e8768cee37d580d2a2d8b41fb
+EBUILD libkmahjongg-21.04.0.ebuild 655 BLAKE2B b03ede3faf8a019b812a0189d16ba9e835fda57ed9b5281f43a887d97acd968fbaeeff27f8fa8fd233eab7098227892a8d99f515e6f079de3ccc08eb259b915d SHA512 68fbfb2a5acb3ed6862164277684263c8154cb29fa5db7ac181159ae5cb233edc12f2496e58e4a60f41957fb72cfab83775e9b97621e90b0bd392d24d9dc8df0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-20.12.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-20.12.3.ebuild
index 1359020bdbd3..7c6c4f86d811 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-20.12.3.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkmahjongg/libkmahjongg-20.08.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-21.04.0.ebuild
index 25dfa45be0dd..40d7c1e58a09 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-20.08.3.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-21.04.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index 1964335d3ab3..ceaf222da138 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
-DIST libkomparediff2-20.08.3.tar.xz 162304 BLAKE2B 676fbf373492ffc752240b4c162dce0aafec145a254cba360c4e66eb3ec0651aeddd426dd66f01bc8612071604dd4f3051ddaee47464b8c549e3910cdea90338 SHA512 828604632329ac34d0ffe36bf518b5260d0fe94057d9487ed4cb00284140c8d111a6f6f5523daf13580e658549dccac1603a3262c253afbd6100a7153be3becc
 DIST libkomparediff2-20.12.3.tar.xz 159344 BLAKE2B 47c64009b1e401cb762e249468934a49be28663041bd6d37fab1db11224aeeb82e09581b53d819677808bfc7957c783c120b59998041c61397e3346b283f5d85 SHA512 5b790d2c0ce5a73f3b87711df7ee501122e5672f4985487436968791e6bcc8a771093e755c7cb58fb4e589e50422be9b404438ab706c60e5bd88edddfa289618
-EBUILD libkomparediff2-20.08.3.ebuild 660 BLAKE2B 75769f9bdc08bce92ee267fa0ec9963976ff501f4fdfa6f15074139aed81204915517a726b96d966e30c4d41e96910b1c545990214cede121dac493816c41b13 SHA512 7c4ac7596492298954efae87a1c209dd36b68225d4c5a6e2202ce4c1363e037ab2ff04356a2b295dae8ee7cc7dfc43da7fea895a168a227c2e5553375d7903f6
-EBUILD libkomparediff2-20.12.3.ebuild 663 BLAKE2B d95c8848c32cf80f9f1c1c21a2e978f1df278708b66d7569cadb52f2d19383d41d6d194bd2fcba1b858ca117c0282cf51cb54762b2375c7b40fdfdde90932ee5 SHA512 f95b9b63fedf64b9482adabaefb46a395ebdaeb9ad2569e14b97212af78a932a9f409ae930ac09449075571db90a724ca8e3e59bf96fda037674943721872c59
+DIST libkomparediff2-21.04.0.tar.xz 159376 BLAKE2B 3143dc8ccc5bff146895893d85e6ef68bef8b6b59d210d6ba047bf16afa5806e50fd20363b1a628682383354e815ec1095981e582551957aad4f0d4d81f30246 SHA512 57a702ce32891ba6203c03bf3e2207286cf953de1c31b02826d690dec146cd2f05a5c2b2cd7c1be163507aebab5882d6c26cc703d378d4fb74c43d6c015f9900
+EBUILD libkomparediff2-20.12.3.ebuild 660 BLAKE2B 650e1ce37f9ef64f19f017120d5f75857e459fe2b6ee7d2183b4f5fdf1a0f55a864abd81a21d7bc06b51f0b89469509a0a2d68d19e3d32d3ac56ea7a3617f242 SHA512 48d4075753d4065bc5727f774ba424c771abae636c9f6f8cd881ad83c9d2a89be3997e538016f15569b5ca1449fd67c46ced07e390d1bd294cdb13592eda23b4
+EBUILD libkomparediff2-21.04.0.ebuild 663 BLAKE2B 9bf3a3db9625e9501e2243e20d8a661a0bcbb020d92968db3bd88a8dcbc846a2355718449ce87b180854981c21d85f97d2b207aa495b9c47e193b2c53bd4c618 SHA512 bccb72d519b6cca731b992a0248aa925f31521533ae50bf6edeecd8fd73576cfc255d80713b08dbc546608bc3767ba36679e34ed557a16655a4bd0e2e4b742ea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-20.12.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-20.12.3.ebuild
index fc08279a87f4..3cf31498767f 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-20.12.3.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkomparediff2/libkomparediff2-20.08.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-21.04.0.ebuild
index 49eb8f519bee..d77d042bdaaa 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-20.08.3.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-21.04.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE library to compare files and strings"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 8f950188e88b..7ddd8b482c30 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
-DIST libksane-20.08.3.tar.xz 145200 BLAKE2B d737ce2929e1fdf0960c0f31f336b84a5e408a510f74a8e456872e735ef26858d91e0963e4594f7b25bb286e3380fe66c013389e218ea56200edd33c7aee5f7a SHA512 4fc6d4b96bc195deee1390148ec63ef31e05d7a663f26cb209b18ee157a12623d02cd43a2d9a72105874c6bdcbb2d083e29419e3017f7bc6fc283fd460c498c8
 DIST libksane-20.12.3.tar.xz 145464 BLAKE2B ba3cd3dc9120e16b340be16ef9657375ea8ee0e6957b8e4bec0fbc6d137a05f384e7f82148d410aa55604258e6b533018893610c9db4d3d98beb4909ba48b292 SHA512 c0fa893cd8e18bfb9c9372b43378a4cf384984359f92c5a433e0ab78c56c17a7a68927e0492155ed376e82e52127ee8cf077bb36a7feb5473aefbeb2dc62f9f0
-EBUILD libksane-20.08.3.ebuild 709 BLAKE2B 53623a3f72490ac7cb61ae972991e6b3eb9e20712db11788503c8fda0e285221c78f25b006fe78115297e4b1daa4bd271f349d5b8e50619d3d0e6d03e1b39171 SHA512 899985fd51ce306e243aaafec52b099aeca0d2ac6909b350c8f0a6e1afca249cb1a1800b6cc16d19afa62908362a5251daac257a8bbc0e64227e38c9cbaa0806
-EBUILD libksane-20.12.3.ebuild 712 BLAKE2B e46dd6ba672fbaa5ddadc046a2f20a35e9029855dae0704136d0708f64b33f64e5a2ba15106b0dfc821c3efd0c8ea84effae9893b5d93ffd86f4e1b9e57226a3 SHA512 3ef15cf2fd48fd6ca8c723ff6a054f74ca18bd48dc6bee327c9fe860fed2a342f13b079d6112f8131dd613d6653d8615568bedfb5b1e4b5de3ad54baa1ef3f29
+DIST libksane-21.04.0.tar.xz 143776 BLAKE2B 22158e6b6ff87f82bd5c060d7fe11cbb9c011901033c243f51b0a152d62404a63f00074548524a9ebe51237db2681ec017cb0b6a14b284eef569cf7b521f7730 SHA512 93949658f609dd223043ab81c84e0de196abbbecdd45fcf98069036c70fa91747421c7cfc2c32b164a115eafd5dbebb98f4914df97970985a107f1365ac14fd4
+EBUILD libksane-20.12.3.ebuild 709 BLAKE2B e53b47361df067940dfb8c4a2b038ea0abff201c81d86b915986bf89394a7ee06b3cfd650e294f08d64bfcee104734c53574fd7d8b481255f6339ab525f2d5aa SHA512 f7209bfce602f6947b978626c1e5cd90583ac645e2f5a6dcbe52c3c5f372deb2eca6a4407f50e2abb8468ccb8dfd61cb4c92cc978bfe73c537695829b227b776
+EBUILD libksane-21.04.0.ebuild 712 BLAKE2B 675ca910123c9b1fc7397f97a9702afc1734d27eda18f1dd3f41a032d71903fc031c389a8d4e7068b2b1a1b76ca9301c08fdfb767e474b608b07899786e7107a SHA512 696a94e7c7d8dc1d1b2488eea41ebbc38568bd747466a69b8b27d6a753446b51617b1f8f8b08a315fc2b2a24739163a972b92726a76fb17b380924214e21ec81
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-20.12.3.ebuild b/kde-apps/libksane/libksane-20.12.3.ebuild
index 51a55d52c4c5..ddab71277055 100644
--- a/kde-apps/libksane/libksane-20.12.3.ebuild
+++ b/kde-apps/libksane/libksane-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="kwallet"
 
 DEPEND="
diff --git a/kde-apps/libksane/libksane-20.08.3.ebuild b/kde-apps/libksane/libksane-21.04.0.ebuild
index 621a15fca3f3..9fcf807b7f3e 100644
--- a/kde-apps/libksane/libksane-20.08.3.ebuild
+++ b/kde-apps/libksane/libksane-21.04.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 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 ~x86"
 IUSE="kwallet"
 
 DEPEND="
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 64a315e04e2c..0d303dd78753 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,5 @@
-DIST libksieve-20.12.2.tar.xz 558380 BLAKE2B 50efee16805c4d9acf4f9760c4e9c5adee2f7d9041bb9755c91395240519c71eabe7eb28bb8962d9fb68233672754f9183edd89296320cb23f1fd6e3c182308a SHA512 18a44446a390cc5f682e36fa282ca34637e6c245fea32bd23f1aca9bdbdde1301d666b6576b88b37f665bafedbd85cf62a9c87f569548a1e2b85be25f989d6b5
 DIST libksieve-20.12.3.tar.xz 558368 BLAKE2B 8bec3f84661050bbe67ced76e3cc40d0fd9e05516042c31d3985f8805c2e38f9525bafec684baa6fcd4fc4bed9e56ed012a85968facee49622dabef7d5d7e4e7 SHA512 0782de6b15000e97194c111e6b692721eb89e0414b4e854f8ad9bf989ad03b6792b4ae9af39549521db2f4d4c69ee07508c283f666c74d64ab5a7c51eea3091a
-EBUILD libksieve-20.12.2.ebuild 1406 BLAKE2B 1aaf734485b7847fcb0082a7fd20cd8fcaa4bd74818e383c602b175b3dfaf60989503e47b846d1eca245895397ac9b4bbcf218cc76ec480bb8ea5f8aa1700230 SHA512 eb534ecbf15581046eb789e8a1c00d05efb639e797712ee82031b166bc8c065ca62eff92e794f90e3e14d4a2ec4d3d8aa0db4397437c5330cd8efb05123422e3
-EBUILD libksieve-20.12.3.ebuild 1409 BLAKE2B cff8e3ecd81cf4c11d587f070006a4e8f337afe1adfa981df49d59b683200e691505ce87e9345662dc0dd9361e8e2e73a9497e8ff85d83fecaf981e10d7d10d2 SHA512 319c9d8452701d9f0780fa17fc39a1334eae1c5f5c7564ec32bdc08d0ef78092c8e2060902589d932034d20111ed2e83602dfbcd3ddcbb1080f0f3f25709bf3d
+DIST libksieve-21.04.0.tar.xz 564684 BLAKE2B 1ca1a14a94156fccb6592f08fbb8198a0a42eddd9c24627e6ec78ac4fbf66a75e900f571b9ecf6b97b319febfcfd20e23ae26c5eda3dad0098e5c8f7aa9d6d18 SHA512 b1ba31d4d3ac9f7c96f307da259a0648961034d08cf8090b97123e3d9519536728420d6dded3f0ed8d212f0b6b4be7311137fc620bd74c2e0981258dfd4857dc
+EBUILD libksieve-20.12.3.ebuild 1406 BLAKE2B 1aaf734485b7847fcb0082a7fd20cd8fcaa4bd74818e383c602b175b3dfaf60989503e47b846d1eca245895397ac9b4bbcf218cc76ec480bb8ea5f8aa1700230 SHA512 eb534ecbf15581046eb789e8a1c00d05efb639e797712ee82031b166bc8c065ca62eff92e794f90e3e14d4a2ec4d3d8aa0db4397437c5330cd8efb05123422e3
+EBUILD libksieve-21.04.0.ebuild 1409 BLAKE2B 4a1a5582cc1a832df6c8c97fcb3da1cd9f3a98777c5a0f289cfa2ce1a612e3b614b118292e429ef5a61df31494274ccc0cec369cb719673ae687a399226eaaca SHA512 c78c1391716db1f66a9a2b3d173a00ccc7db090f2865490279b6e6f81db8511f1efc0406896778602d420684ad6f1ce15994a6e5d3e82c5881fbd6bbd38245b2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-20.12.3.ebuild b/kde-apps/libksieve/libksieve-20.12.3.ebuild
index 108a92c7ab14..0f3ae90ee9ab 100644
--- a/kde-apps/libksieve/libksieve-20.12.3.ebuild
+++ b/kde-apps/libksieve/libksieve-20.12.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/libksieve/libksieve-20.12.2.ebuild b/kde-apps/libksieve/libksieve-21.04.0.ebuild
index 0f3ae90ee9ab..b74bf26bb410 100644
--- a/kde-apps/libksieve/libksieve-20.12.2.ebuild
+++ b/kde-apps/libksieve/libksieve-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -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 35e54d943b95..6c095065cee4 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
-DIST ktnef-20.12.2.tar.xz 299868 BLAKE2B a6b8c67bdce00e4a392f80fd666af6aaca0d5ca85fab28681d2bb323c68d7755e576467eb9243c6ae383f1ffafc3f657ec6338d995a5aed023c7a1d130b4f40d SHA512 d59701455f7f9fcec54d2698fa3f16e508766e098f0b14e96c5cad8921428f2f43ef4cf627330dc3b1809b91ffadd5481feed645d4f1e29f7c16225a73c315e7
 DIST ktnef-20.12.3.tar.xz 299852 BLAKE2B 3ca027e7a7156215b4399f4e0e41c725c481802ecaa980b801e619447c59820b5d15f950bf6c4478daf1f5e389f1956d60a6b475695ebea05e9af86e1d3be61b SHA512 b6173d2db8e76060c470bd1cf4679d1763d586dad5d84de88a64b744c499901322f09548efa6cafd857680a491d18a83912c80da3ebc1d349a683793368418ec
-EBUILD libktnef-20.12.2.ebuild 545 BLAKE2B 899c524c366a750f1cbd1d1c0437919bc126d2fb7f320537030d45fa128245f9a81b54108647a2c7f7d38d530e3198d401b529b1828020e35f1295905b86eb74 SHA512 d21804eaffabc888b4add33d9ae58bcccd079f7b4ffb91ad6ba06a84baf33f0f6ede16d7482b5af8e9d72d72a2f0cf8bfa09d3daaafabdbbb24d45f2840206d9
-EBUILD libktnef-20.12.3.ebuild 548 BLAKE2B 48889c0aba231825e8624dfaa5b4d9926b0f4a1bf3b70c9c74d8f859b6ebba13dacaa09454063f6c42286c8f739c1962604d2dc1b5ac214a8cf113d175dc1418 SHA512 7d7389a6c3d747bef2a049e1bc92482b119561ec459ccb3694c58858fe19f5c4716a656fb7f6cc46078bfe2245fa57be5f49eaa9ce2bc668c7021726b34bcec6
+DIST ktnef-21.04.0.tar.xz 303748 BLAKE2B 89713a57dadba0bb1c1dbed63d9c0ab997782c953f36bb327d06fb21ca3cd3c9cf407f13c281b319e9b77104aa5dbe38f81998d8f935606539d0b246d15d3895 SHA512 935c8f463a9b4883e9487bb5e458a2c418013bd45f663ffbc0f406287246cff0b8c3b2ffcbc1c41ffb6a9b5561671cee5cf9d9383198e62c7c71184a21c73516
+EBUILD libktnef-20.12.3.ebuild 545 BLAKE2B 899c524c366a750f1cbd1d1c0437919bc126d2fb7f320537030d45fa128245f9a81b54108647a2c7f7d38d530e3198d401b529b1828020e35f1295905b86eb74 SHA512 d21804eaffabc888b4add33d9ae58bcccd079f7b4ffb91ad6ba06a84baf33f0f6ede16d7482b5af8e9d72d72a2f0cf8bfa09d3daaafabdbbb24d45f2840206d9
+EBUILD libktnef-21.04.0.ebuild 548 BLAKE2B 008f3cf53f7aecaa9624d1bda5b12c756c0604c5f7cf4c97fb046ba51ef4d9bd84e5a92e898794da2839dc5b9f0f2493ad50ad2f7fa5454ade3a8d144f80f49f SHA512 1a49b1c76f543a18882bc835af2a596f834f8d4939f4b2e5498b26922983eca1a423b2737aa12cf6ed84e1b43e9de6405073cadb1d3c0d096125d661e22bb18f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-20.12.3.ebuild b/kde-apps/libktnef/libktnef-20.12.3.ebuild
index 9630e971e3d7..0c2ac2980a32 100644
--- a/kde-apps/libktnef/libktnef-20.12.3.ebuild
+++ b/kde-apps/libktnef/libktnef-20.12.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for handling TNEF data"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libktnef/libktnef-20.12.2.ebuild b/kde-apps/libktnef/libktnef-21.04.0.ebuild
index 0c2ac2980a32..2917e8f138b9 100644
--- a/kde-apps/libktnef/libktnef-20.12.2.ebuild
+++ b/kde-apps/libktnef/libktnef-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_TEST="true"
 KDE_ORG_NAME="ktnef"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ DESCRIPTION="Library for handling TNEF data"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index d32af1a96b79..3661f121cd04 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,5 @@
-DIST lokalize-20.08.3.tar.xz 1987496 BLAKE2B 7928bd191443d517722fbd6753e71c9c74b105b9645d51a97787f6f4b62d93dbbcef2cd2304fba5a942bc4c876bee0eb5a0dea3e8480856d4d3fb50ca8f34660 SHA512 20b102b262f5fb595476ef0dd226b362cc16ec7cc3e5935f9a993fe01ac8f959baf788feaa6fd040c23a73cb64edfda667b3d03b1eb079c022797064ebef1ced
 DIST lokalize-20.12.3.tar.xz 1995860 BLAKE2B 1d53d6e99936d284567f48439fc84a95edcc8c971f4732711ea5c45f39bc4a698ba5f7883ad0411e1e069a08d35630f37957e92e1ba11aedc7fb643b4c217102 SHA512 dd12526cbade8a71d0c0a395ebaba50b00a5357c3cdc68779520da1aec7a0dc2d87f29504f45315ccf5108346b60ab0df235a80c000ece9d9f5d434b91829cdf
-EBUILD lokalize-20.08.3.ebuild 2007 BLAKE2B cc9298b121a139a9ce5df3f2daa02e129589f10a134e4fdea63ce1bc9ab554bfa47618a865662426d4397c6fb1a0631defea2b512dc6fcd858123cfc860c26ea SHA512 fd950b9175eaed51c9c7be4580c6c0e8cabc8c287ae50b038c9cb4d9f555ff1c2fcb78a81452fd6a4fbe90b7260934e08320bae3d8118af2de117ed01a4db5ca
-EBUILD lokalize-20.12.3.ebuild 2010 BLAKE2B b3aee9c90e2dedea1da0f2c44f0d30c94821d5532b7d2a14e82b9d21bfd5ad7ce85ff0bfdb977bc67191e16f4edd299203d09471be1be3dff7786986805962d6 SHA512 7139d2d214a7545c6357252e0cca827e7d5785bd73f9ed302bc6d6ab89e1c951dbd24f318289a3109c9b1dde870298e17d77fc29da432037364b19965caebe49
+DIST lokalize-21.04.0.tar.xz 1993192 BLAKE2B 4ec8d28eaa08f2e6526f0adcc6c658f356e4fc3f54d7afc89b076709b80c7b98ba835c8070c892f7a62ddfd8d2df1560a42ae2c36e8b83a2308a58dcfe89dbef SHA512 b2c090ab0df105626415b3e71ba202b37701715080845cb97acb19b4b29f1958b261ee378acfa14bf11a8d93ad7e7bcedc1dec3fbbb280dfaaf2a9fa1ff44fe6
+EBUILD lokalize-20.12.3.ebuild 1975 BLAKE2B a13d2f6c3b1bd76b41f81ac181a12cf9915bb715b86dbfe453fa45d7037c369c9a51760a641abdbda4e953a4d1cc058a8eccf57ac35d195c6e5711afb337ac3d SHA512 8b8ad57f3268599f7f5c5754d3adea69a58524d7b60f4f68dd91b1fdd91900ac67462069f5c29a829605e49951dd559fb540c122d9bf095a9bdab46b8a09a059
+EBUILD lokalize-21.04.0.ebuild 1978 BLAKE2B 5b0856eacac712526588f9c730e3281b386667cc143900370fc5233dda9aed449a198e10ce9f8d1e397100d4c49529eb76bd70f6e8e81fd574b0843ca3abeb56 SHA512 66dee80031a6c453862279181c74b25dcf8cfe9cdcb58bdfe0c8c7c65b213680d1f46e818e89954e72fd0d5b029ccb8668700dd6635c89f8964d729e38ac9fa8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-20.12.3.ebuild b/kde-apps/lokalize/lokalize-20.12.3.ebuild
index e6fb3ebaa306..8ecd245031ea 100644
--- a/kde-apps/lokalize/lokalize-20.12.3.ebuild
+++ b/kde-apps/lokalize/lokalize-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/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}"
@@ -65,9 +65,8 @@ src_install() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
-		optfeature "Autofetch kde.org translations in new project wizard" dev-vcs/subversion
-		optfeature "Spell and grammar checking" app-text/languagetool
+		optfeature "autofetch kde.org translations in new project wizard" dev-vcs/subversion
+		optfeature "spell and grammar checking" app-text/languagetool
 	fi
 	ecm_pkg_postinst
 }
diff --git a/kde-apps/lokalize/lokalize-20.08.3.ebuild b/kde-apps/lokalize/lokalize-21.04.0.ebuild
index 013a786c6807..f9df508899c2 100644
--- a/kde-apps/lokalize/lokalize-20.08.3.ebuild
+++ b/kde-apps/lokalize/lokalize-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit python-single-r1 ecm kde.org optfeature
 
 DESCRIPTION="Localization tool for KDE software and other free and open source software"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/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}"
@@ -65,9 +65,8 @@ src_install() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
-		optfeature "Autofetch kde.org translations in new project wizard" dev-vcs/subversion
-		optfeature "Spell and grammar checking" app-text/languagetool
+		optfeature "autofetch kde.org translations in new project wizard" dev-vcs/subversion
+		optfeature "spell and grammar checking" app-text/languagetool
 	fi
 	ecm_pkg_postinst
 }
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index a05936212888..710cc7e8a0d2 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,5 @@
-DIST lskat-20.08.3.tar.xz 1224744 BLAKE2B 3865177f85400a45dd94cf4442994c37650f26f0cf1516964eb1f4cf7011f350be3ffd992517c98634b321b72bc2833229ca5d90658671d781e04209655bbacd SHA512 ecb9264decb6e527ccfb3220e1bbeb1ea4d7e1f9e3152c8eb98a08bef72104156dceb0b9821f84ac448abb335e2afe97a965d7c001306f21f6b0ac1e31deb353
 DIST lskat-20.12.3.tar.xz 1225308 BLAKE2B 5648d5a4a9c6d34c03c19b2eebd36b62c659b3606c15a04d5dcfdd37dfd6d9f86ecc707c4a86cf1cc15ae29aa2795f8c9dab605c346ca153e3d4c207417a27a0 SHA512 8e06137de8ad315cd0c885c382de0e7f85d76ace3d99a110e7d3f17e9a03011ebfe392c6236a9ca8523079d635421d4fc9fa1bcc0865807fad8a65b1d8093759
-EBUILD lskat-20.08.3.ebuild 840 BLAKE2B ebde5a5a6d7b254e03c016d905f965bf443bec85deb1ad4155793c2a51406bea6ac8e77d8b61d2867c006e0eb07ea3e4c0116005910fe79ea91fd25a58f28b9d SHA512 5a87894856f0f63d0da86b193d5b684c485d6a8735a9ee06526523bd2dca39dcaa5c0d17b6cd264e7238cb67186a82e4c739377010765579ffb0f4c603e51d79
-EBUILD lskat-20.12.3.ebuild 843 BLAKE2B e67bbf3c00dd0ef61fda434477da53ec0f9e3a46a95c24e34aa1552d483f62ff1274e0456333467c6da0a09fc8e9223ce623084553704b0c172110b05b96c364 SHA512 ecf9d491cf1cea2d84f04b4f06c04c6e7e076362fcce354101e6a43ecb46b50e3e5a87988714aa884a03c811dc2abdab4ab5949fac793ac36c96df46b912749e
+DIST lskat-21.04.0.tar.xz 1222484 BLAKE2B 9226c891a9a725304797e91b0b76546ab7346e4331677ba7129b81fa4311901e745cf52def22a10d73c8f1bdbe5e6261085c20c5c9788954969ab5abc1acf9ef SHA512 7a5cc2b3000a0c800b4c30f2f2d0400e9d6d0ee40808f5830a04863917e208205358b4dcc852f89d7915388eac2276354bcddb16c260e7e71749d562133aa7b0
+EBUILD lskat-20.12.3.ebuild 840 BLAKE2B 54cca57fa5c766a821aed1d2f6b2ac14b65a839467b95840e178f0fabbc69b62d14426bafb7a350f6d67d6d8ad8688df72805ad605b78113cb026e342e7e1c25 SHA512 2ff04dd576934184d4b3b6a1abc86d20e6d60ee10a80de0c545d00923561b0edc0922d54c985ba0acc89ace53d325be605bf10c6b53ddf19b3e025da0913ef5f
+EBUILD lskat-21.04.0.ebuild 843 BLAKE2B 60d5a43999e015e045185aab5bc131601fd88a0d1b3882bcca87d75c39efe1d88698467560976471d3f19ce251f14e80ae9a7b5bfe985d8ee12ad06a73b2a95f SHA512 54667e3b2ae9d20e256f6c627863f8bb95aa29ae0e9a67277e10b364374df90df6fdd170888f4ca36841158680359f6d32efa47c215077efc23d8b5c6eef44c9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-20.12.3.ebuild b/kde-apps/lskat/lskat-20.12.3.ebuild
index 6f14205e0d48..cf6027ff7eb6 100644
--- a/kde-apps/lskat/lskat-20.12.3.ebuild
+++ b/kde-apps/lskat/lskat-20.12.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/lskat"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/lskat/lskat-20.08.3.ebuild b/kde-apps/lskat/lskat-21.04.0.ebuild
index 6f0b91f291ba..733de49a2464 100644
--- a/kde-apps/lskat/lskat-20.08.3.ebuild
+++ b/kde-apps/lskat/lskat-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Skat game by KDE"
@@ -16,7 +16,7 @@ https://games.kde.org/games/lskat"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 31aa18aefa7a..6458173a429f 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
-DIST mailcommon-20.12.2.tar.xz 723900 BLAKE2B 010a1e65b53c45dc0f91b51efb337f8a2c0450186e87b2c017470d7887c74a32eda1a834b9ee8a8df54786d058861c3fe29c75a9cb54912565a963f49e84de21 SHA512 22d161ea3d7330b02b5b21ab71864e3be7b067fac5518317471c7b1342b2a5115d5a5cae273bd5783788de4fd61ff82a1ee41c802900978b7cb38b14b8e78743
 DIST mailcommon-20.12.3.tar.xz 723876 BLAKE2B b2c2ea308d5861af066d0d00e46ca50981b2d572e89be48c50b953bbe6009ca1c107f25211d40c843060006a0651eeb443516cb3c2c4eacb17514cb617892d64 SHA512 348c8ed4db7e4db234adbb1eeadccb2cbc85e59d47fca607b834ead5b6f65a0c62b9c1396bd34ee4eae91cdb95b5fc52b9caedf3b23d5ffbd9efbafd6e56ed32
-EBUILD mailcommon-20.12.2.ebuild 1759 BLAKE2B 4764c15c24799ef9c0b56a7b57a8ef9f3d7fe6024ae83911bdc15b78ba37207d8f3b1fe13f63ca8ee215e25583584729dcad813dd4408b64406640d2e332f8bd SHA512 4316da53ffaf88ab8be02a98bdfbe48007da715487a6aa927b61531d6232a64352dd40f660df0e564c45439455290f2a85a06a5dda85002f109ef9c1e4300fc0
-EBUILD mailcommon-20.12.3.ebuild 1762 BLAKE2B d8f5c84ec3d78cfe15836f03232cc548430f6662dde0b4c7364dc772b3114aa21a32452b0fc90cea8b2feb4ae4122933cadb15cc65c20cf2c5d8ece44dcbca2c SHA512 fa7363ea4ae076b3d06f5c80056903a7b07b57d4725c7f7941eb0cf3b59310fd981fd2d700bdfcdfb7d1cc8f99c268a0ae4f38c78fee42f29379b6f562a087d2
+DIST mailcommon-21.04.0.tar.xz 727228 BLAKE2B 19fb8dc8c06b04038814389f594bcefcfe3d2a54141681cfdab494256aafe454b3a621138129c80ea0d745c0fbc48ec5df758d011d9362dfa479cad57f1bdc7b SHA512 27942bf63205fd34e5d5a7145b4402bedbec5c09367f071ed54bce9e8263ea154882770937d46014afc73cf97b56e8a5794b139fb6794aa13e74bf5518a9c27a
+EBUILD mailcommon-20.12.3.ebuild 1759 BLAKE2B 4764c15c24799ef9c0b56a7b57a8ef9f3d7fe6024ae83911bdc15b78ba37207d8f3b1fe13f63ca8ee215e25583584729dcad813dd4408b64406640d2e332f8bd SHA512 4316da53ffaf88ab8be02a98bdfbe48007da715487a6aa927b61531d6232a64352dd40f660df0e564c45439455290f2a85a06a5dda85002f109ef9c1e4300fc0
+EBUILD mailcommon-21.04.0.ebuild 1722 BLAKE2B 681f51a14680d0d7e09083c220c2ad4603d2b549eac9cf6af09fcbf7787a44d89e2668f1cb399c8e90d21f5eab45a75bd2e6d5b697b06c05aa241f858b754106 SHA512 caa9ff948dfd56fb9fb814a3fbcc16591f9350eae82e536b5622974aeac6d9434fe59fe59aa39f32429f0150e836c0263a54ccfc8bc4290bfce4de827e94436e
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-20.12.3.ebuild b/kde-apps/mailcommon/mailcommon-20.12.3.ebuild
index 9cffbdbc33ba..6f8422e1f752 100644
--- a/kde-apps/mailcommon/mailcommon-20.12.3.ebuild
+++ b/kde-apps/mailcommon/mailcommon-20.12.3.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=""
 
 BDEPEND="
diff --git a/kde-apps/mailcommon/mailcommon-20.12.2.ebuild b/kde-apps/mailcommon/mailcommon-21.04.0.ebuild
index 6f8422e1f752..c8241fff27a0 100644
--- a/kde-apps/mailcommon/mailcommon-20.12.2.ebuild
+++ b/kde-apps/mailcommon/mailcommon-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,12 +15,11 @@ DESCRIPTION="Common mail library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
-BDEPEND="
-	dev-libs/libxslt
-"
+RESTRICT+=" test"
+
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -40,7 +39,6 @@ DEPEND="
 	>=kde-apps/messagelib-${PVCUT}:5
 	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -60,5 +58,4 @@ DEPEND="
 	>=media-libs/phonon-4.11.0
 "
 RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
+BDEPEND="dev-libs/libxslt"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index b4219e681b4c..83e5fb1c0e2b 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
-DIST mailimporter-20.12.2.tar.xz 548636 BLAKE2B 39080c6a8cf829e0a4f4e72b09d3fb309abd7013a8cf4ae3f26b0be8040e855a3e56ce3ae9bbf492e1342073d687615961b0b686f6afcb21839a62e32d3e53da SHA512 a7ed6b2d6acd322c1fbfac5a6bc0d370715a1cdcaf615647fd908e06bb058f9226f20c04e101f01d520f31c98c0ddb5b05404119fa1db9b8e474e049a0056de8
 DIST mailimporter-20.12.3.tar.xz 548588 BLAKE2B 1bde81c122b311ea5859b21e0f2ab8f2020db6325c5ce904260764999781c3cdc404759cd25b92dfc28ccfa9b21d33fe49da1945ec1fdcf5b09fce5e0fcf9a6b SHA512 2952c7f7bba61dc7e36bc877516aa6d46c5ec75b998f2f080a5d40d7f95ee553c97b8cc950a36b03929a57063b7c9899dc997e3397fd574c0278b01ffe2b4994
-EBUILD mailimporter-20.12.2.ebuild 789 BLAKE2B 243ba38c8341e5afa99a02ba62c3379077cfb7e1e369aa938ed2b36b504189f47f5c970cd10ec161e2544455a137314450fb07abccaba44fe2b47ca254dc0e21 SHA512 8d7680e0e006de44140e7f5305428bc9787d6acc243d43742980c5ceedf3557401de29cb4361c8e90b8732145737cc2390fa0f0de2511c4c1b9d319fcd8a0cfb
-EBUILD mailimporter-20.12.3.ebuild 792 BLAKE2B 4da34b126833825e869f4f1bcf55b0eb5c94ad6d2ba6f9e64dd40d23defda68f182c67e0ac204b4380d89a60dfe3a8d4e39d20da7865da7ad9d93b662bec4754 SHA512 2f58055cccc73a3bdc928a246f2d3fab2f142422470d10010918c1625cbb9c5c0d9c8d61159d179e9efaa7a6a95a53c83baf1609c9e9f9e97b6d09fbc5c033ad
+DIST mailimporter-21.04.0.tar.xz 552884 BLAKE2B 2c5fb83e37d85b511c6d395d3ff1d48bc0bbed89b966f6d498649f31d9bcb52b7de27a7edaac2d4a264b6550c9b19d8c125399d4fdd41178114b707cea5bd05e SHA512 da0f82b296c2899d6e2a45f5f8585af4e9b3273db388d2a315880eb9236b64e9a64e74478e0fd037fd9d2ecda824df77d6fba4df41e1f91cfc9ffb29b4231dac
+EBUILD mailimporter-20.12.3.ebuild 789 BLAKE2B 243ba38c8341e5afa99a02ba62c3379077cfb7e1e369aa938ed2b36b504189f47f5c970cd10ec161e2544455a137314450fb07abccaba44fe2b47ca254dc0e21 SHA512 8d7680e0e006de44140e7f5305428bc9787d6acc243d43742980c5ceedf3557401de29cb4361c8e90b8732145737cc2390fa0f0de2511c4c1b9d319fcd8a0cfb
+EBUILD mailimporter-21.04.0.ebuild 792 BLAKE2B b926110b90ca3e690152e87eacee41f1d931eff8511efd3bb1b3ea97ef758b2886c6658c6f09746f1e27ad08b982b2bb8b8fafbda86180fa5a16283e2d8eed09 SHA512 ee4ea1df369cf16d2276ec0f5d034b8204ab95dab33cd25097fbd8e118a70f8b2ed700dec04ab98b452551931906a2c92555209d240cc74c3dab7df890920b89
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-20.12.3.ebuild b/kde-apps/mailimporter/mailimporter-20.12.3.ebuild
index b8153ecb3344..5253b4f09d64 100644
--- a/kde-apps/mailimporter/mailimporter-20.12.3.ebuild
+++ b/kde-apps/mailimporter/mailimporter-20.12.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/mailimporter/mailimporter-20.12.2.ebuild b/kde-apps/mailimporter/mailimporter-21.04.0.ebuild
index 5253b4f09d64..a92dde7f6100 100644
--- a/kde-apps/mailimporter/mailimporter-20.12.2.ebuild
+++ b/kde-apps/mailimporter/mailimporter-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -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 b83a19a3468e..df22ab34a2d1 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
-DIST marble-20.08.3.tar.xz 52191936 BLAKE2B a7990d76d6df1333b5beac62d82e4e10ad55fa2513f579d4d169bd24e54e8d2f4132847d9544dcbeb1205b4bedcd193792332434c64c97cf9eb1180f6bad9b05 SHA512 0bffe97a14fe74300eef8c94a3d14217abba6602fef86e07c799d52970e37047576defd4baeaebe9171ff3915f35c0a64ca2e46d233fde834c8bd5dc3f15ebce
 DIST marble-20.12.3.tar.xz 52242116 BLAKE2B 70d16d5d9e2e51fbdc8c9331e55ac1efa85fbb11e79443f8a977ccb804184afbed8ddcb7e7358ee41f61201036bcb9553f1f578be51401e118d928ec5bdf9263 SHA512 0dc69ce2dafac196d3b494bd29a268f879e8bd14ae916454682289822024d58e077e4972588cc6d51284459f2fc9aceacd4e1e8a8302f987556e20a7acaf172a
-EBUILD marble-20.08.3.ebuild 2621 BLAKE2B 712cb3696459b0e58b6d28fc8048ec3b3b848284ef1057d831af3e2e82b2b52505fba68b35dda3a2ad8baa9c82103cc21534d109131e78c3172a00a96b5e3f40 SHA512 ade08fba6df6222d95cb99694085dd20084c71a4f66c6b2174a1f1f23a4e1bc93ce82bf48c78ff11d875ea3cb9c39d451fbd242a1de6cc6201696b6c2dbd7f61
-EBUILD marble-20.12.3.ebuild 2700 BLAKE2B c8045629292170bb265a024e6463307568a42c9ba2d0124b50b893feb7aefb2caa3aab2bafb53f0a182825bb10f29720231e44e21593809fb0936913aefce2ec SHA512 003af6b8444574e363c4d52204bad4beabadad639e92be929a1e813f6dcb9cc21371800113a8ab8f59d9829b217480d0c1e566ff6b680866e03a8782cb445555
+DIST marble-21.04.0.tar.xz 52373900 BLAKE2B 813e7a3677c7d721b5ed6e037a0245237969aec77d0292bef8dfae5fa04b7aedc35a2a0f69a06a02a7e252efc4ca9e7f5a0b27ac69a7b99b31be696126a7d2a4 SHA512 ef012f9f831bfe7da73d10a33bdaf9a6bf07e6d7b10ff25ead944cadbc1535be558f945fa065f1f4d8d5210c19fb4d4cb5b5be9e95f493c5992709fbc6e81f69
+EBUILD marble-20.12.3.ebuild 2697 BLAKE2B 59bac185fead02c46f56d402b2283cb0e32afba0add2c78f9836949490093d662093c98b5b42cae28567ee2fe09a0d24a8c2e1cc928827c250b606eccd41f01e SHA512 2cb9e241a4ffb1402a6dd7a5046e2a636bc5b29489e24439c72be94e03b4959fe4482e211ecc5267a6bfab581664760132fdca544c570e67ba13da6b5f2690ce
+EBUILD marble-21.04.0.ebuild 2700 BLAKE2B e89142db07919d788491301bb8865447766583abab248af0eeb16b679351bed32b0997b9c02341f899d15bef560996e8e35a9e3a56427a9ea88acaf44bf4568f SHA512 34aed2b6f84f2be67e5f290bd4bcd4f469ec51ff509676e93f6d598801f9782c68fa66b389433dd9743e7913d5ae24c9bd04920ccfc497cc0c676ea0ec820a15
 MISC metadata.xml 841 BLAKE2B 8dbc10f99d3de79755bf67d12e5ab9e18a56f4207385161754f89265a71ee9da5ec276fb3aee431a91294b917f0031c736f86668d17cd9e9e9e45352fd5f48c3 SHA512 4f1557cef7ca36f318e628a72efb68e2916608f1cda895e140d9b87253dd55402bf6ebf170daba715d3195d89b6224214e6e3b9fff9c4df707565aba13467703
diff --git a/kde-apps/marble/marble-20.12.3.ebuild b/kde-apps/marble/marble-20.12.3.ebuild
index d85bf874ae19..5cedda6983ac 100644
--- a/kde-apps/marble/marble-20.12.3.ebuild
+++ b/kde-apps/marble/marble-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 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-20.08.3.ebuild b/kde-apps/marble/marble-21.04.0.ebuild
index f1581b300d5c..898a19e57325 100644
--- a/kde-apps/marble/marble-20.08.3.ebuild
+++ b/kde-apps/marble/marble-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,8 +15,8 @@ HOMEPAGE="https://marble.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm64 x86"
-IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine"
 
 # FIXME (new package): libwlocate, WLAN-based geolocation
 BDEPEND="
@@ -52,6 +52,7 @@ DEPEND="
 		>=kde-frameworks/kservice-${KFMIN}:5
 		>=kde-frameworks/kwallet-${KFMIN}:5
 	)
+	pbf? ( dev-libs/protobuf:= )
 	phonon? ( >=media-libs/phonon-4.11.0 )
 	shapefile? ( sci-libs/shapelib:= )
 	webengine? (
@@ -80,6 +81,7 @@ src_configure() {
 		-DWITH_DESIGNER_PLUGIN=$(usex designer)
 		-DWITH_libgps=$(usex gps)
 		-DWITH_KF5=$(usex kde)
+		$(cmake_use_find_package pbf Protobuf)
 		-DWITH_Phonon4Qt5=$(usex phonon)
 		-DWITH_libshp=$(usex shapefile)
 		$(cmake_use_find_package webengine Qt5WebEngine)
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 12e97b55ca4a..5bc8b64df431 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
-DIST mbox-importer-20.12.2.tar.xz 24772 BLAKE2B d90529baf92a2ea78f026cf03cbdc27390c1044c774df2e8d2d8bd0201eecd7786d328fa7412b34a04b89886e61ebcd3b7b4136d02bd293fd56937a5cd2ca49a SHA512 e751606ecb47692d27ffc5b0c08b1550dc6eb769d42051ed4c05f43a07e21701bb7387078239c4c201aa21169eee26309b64f1fac53f0943cb529136e4195313
 DIST mbox-importer-20.12.3.tar.xz 24760 BLAKE2B c02d7e11f575624c83462e746017c400f4f9378eb2b817289bb344e83a4ebc5ed2547994de0223c9f55089a6c8bd541e131dabc231bcbbc402ebdeefda75b16e SHA512 0907a158a2830eb08455270dc52ccb03c24c595435b372eae58291f36b92270ff6069391264100db13b1da8bea642858ac88b7a0540989ee6e1888ba8ddbf237
-EBUILD mbox-importer-20.12.2.ebuild 922 BLAKE2B 2ba955427a1761935817104b74a057310220f7bfe560ee34f30e465452bd4c08e5adcc90fde430e1cd4c7c4162bf4c477e9cfb4e269f9fbbab2e06cd6bdbd060 SHA512 c902f3abdc2a65a150a0c3d01987c37cac65df2ef37f041cfb808f91974a451a0f775a7e954c3894e942450b7b563daa8fb874f4da789cb54f7369f31e422c7f
-EBUILD mbox-importer-20.12.3.ebuild 925 BLAKE2B 28ab0e3ff6cb7a292c455be9921fe5e524ffe03ad082939b953517d6b6d7a148e7fbe848ac2e7a72b61b064207b5f6ac5c608acc8861ef22d1f8f6602272ed18 SHA512 187eb85ca42b5b7e5a8ad088d57cd76f7d8b204c4eb5fba17aa9347d69ab358a83ec59445caf4f29b0c5297d4f4f7708c5602246f325bf3017717201fb5c2f82
+DIST mbox-importer-21.04.0.tar.xz 28712 BLAKE2B 80a01f81709ab5c1c4c8711aabbe7829471efc147d6bf452ee0783328bc88d63ccbbd558925c377f76ad4d7df7c7376fd9ecad778536b6a7604d268acd94d9d2 SHA512 8d512fc77f37e3294de7c5d9ac0625e34b729207e90ec34c3280a4379d74c6b9d77ef070884e13a1712f5950b570f31304472ac5c80104e13c4fa3cab4598328
+EBUILD mbox-importer-20.12.3.ebuild 922 BLAKE2B 2ba955427a1761935817104b74a057310220f7bfe560ee34f30e465452bd4c08e5adcc90fde430e1cd4c7c4162bf4c477e9cfb4e269f9fbbab2e06cd6bdbd060 SHA512 c902f3abdc2a65a150a0c3d01987c37cac65df2ef37f041cfb808f91974a451a0f775a7e954c3894e942450b7b563daa8fb874f4da789cb54f7369f31e422c7f
+EBUILD mbox-importer-21.04.0.ebuild 925 BLAKE2B 5786cdcfa9787f747e1cffdf20ad5cf87894bcccee25895f3f85b8ac721735ee2cdba92e4c3ea6a717fa3cef01db129ab5dbfedce39df702f7cbf0f5ab12f5ab SHA512 a508acf3051d409be5bcc04ab8d5938a5c1c0fc17ff01b13a9e55596a66eb9246ed89a3dbce23a6499203c61e41de222b41054ae1345a200ce86eb57f9786e16
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-20.12.3.ebuild b/kde-apps/mbox-importer/mbox-importer-20.12.3.ebuild
index 7267d862251d..baff0019624e 100644
--- a/kde-apps/mbox-importer/mbox-importer-20.12.3.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-20.12.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="
diff --git a/kde-apps/mbox-importer/mbox-importer-20.12.2.ebuild b/kde-apps/mbox-importer/mbox-importer-21.04.0.ebuild
index baff0019624e..8b3a86dba250 100644
--- a/kde-apps/mbox-importer/mbox-importer-20.12.2.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -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="
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 4c114d1b8575..061442b495cb 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,5 @@
-DIST messagelib-20.12.2.tar.xz 10542352 BLAKE2B 5aba18dff341f18dd30af8fd0f76434319496f5e4d7edc047e24e865ed325f33b6651b7329c592183f641dab107bf7a9f6a4ed344cfae07d63167caf414a661b SHA512 bc75d49ea1411dd75d35150757b9f1993e4e1b4ca1347bebbdcebc8c029dc18ccd43e83abcb375622a2638997c0346e15d08a9131b232c1032430d27bc71ff89
 DIST messagelib-20.12.3.tar.xz 10527968 BLAKE2B b7d1b33232ee5e24392f2c66b5179b7e536e5aa0bc511c81af15500666fd15ab92645733e56797741e06caf1c08ac9af2bf0951d05aff1a1b73424c09901e335 SHA512 bd7fbab82cc53d141e27e6148a9b957603beef508ed10786fe3052df94e27d23f424ea3cdf8a6c1aa412ecb999ec21c3b61705dcc29d85ece2ccfdf4c4ff159e
-EBUILD messagelib-20.12.2.ebuild 2169 BLAKE2B aa49250a74f94c9505225ff92ba5d1334a4b1bb49db228f143138e6ecfd5210c688ae71a21d0a1179d70a63b8551bed28ad20409ee82af9fe3eed95e1283247c SHA512 73327a50f583f8a5ddd679f0b692587305225c869698f775956d62885daccbcdf5917f4358e59950b7b5146421b89e23a606731cea678782d7bc71863807cdb1
-EBUILD messagelib-20.12.3.ebuild 2172 BLAKE2B 1a235fe9846ca985322d8c6a88436b85604ed5aea44809c63506c64baac06549a27237987b07a59d5cfe2d021bbc1575dca58827e1577fc09cd73ab6d496471d SHA512 3461fc8285b75c4f2948cc53fcb139d8f69adf4b802217f4d8550f7b81382ab8beadd3df4a18405d56b9668b47202a0d62b1ddeddddc444c9988662c4697202c
+DIST messagelib-21.04.0.tar.xz 10640768 BLAKE2B 76a0f326da111ffce33d249444f6e1d86832bd460e0f9ef6aca6164379babf2d0718a1f41f6014e00158c25250242407388c5cf25cb40aefbb5cd8e7ed183d41 SHA512 9b0bc20764bdf353ffe76d16604ae14a6047d5443044ffa87e0ad508bb32e1b1e2952b4bde686d1a44a327f4e751460be56f0e6f757a40c0a6b6b7f061511ac1
+EBUILD messagelib-20.12.3.ebuild 2169 BLAKE2B aa49250a74f94c9505225ff92ba5d1334a4b1bb49db228f143138e6ecfd5210c688ae71a21d0a1179d70a63b8551bed28ad20409ee82af9fe3eed95e1283247c SHA512 73327a50f583f8a5ddd679f0b692587305225c869698f775956d62885daccbcdf5917f4358e59950b7b5146421b89e23a606731cea678782d7bc71863807cdb1
+EBUILD messagelib-21.04.0.ebuild 2172 BLAKE2B c533800778f80594ce3dfed83644039fbefa5208fea84e50e4b79ca6cb3d044c6709c29e8ecce8424b118b338bb3be0baf4d3aedaa2dfc302c263dec5fc572df SHA512 173a34b33fb98bdfc2c5150e985514954480f85cde998e879d1b23e38486e76900f3eba4c6fe545f7da4963b513b97c6c4a952353318e1957374f98961a559f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-20.12.3.ebuild b/kde-apps/messagelib/messagelib-20.12.3.ebuild
index 6bd4ccf59a35..55c8a8ec4d74 100644
--- a/kde-apps/messagelib/messagelib-20.12.3.ebuild
+++ b/kde-apps/messagelib/messagelib-20.12.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/messagelib/messagelib-20.12.2.ebuild b/kde-apps/messagelib/messagelib-21.04.0.ebuild
index 55c8a8ec4d74..f16d4a7a38a1 100644
--- a/kde-apps/messagelib/messagelib-20.12.2.ebuild
+++ b/kde-apps/messagelib/messagelib-21.04.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -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 94d3fdd7ada2..cbea9d337345 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,5 @@
-DIST minuet-20.08.3.tar.xz 27723088 BLAKE2B b8118949b272bbd92e8fb5596bb2dc6da3055edd74fd7b29ddb99610604cb5d09c6015678cf70ff2ed6e05efabee852f035ec52fd26d197c4af0acae13500a53 SHA512 121040b207ab36f7e2c92c0e6b5bad91de9f12cac8cfa10149ad369ea0c55d4578d3fb3f27f10ae2f055e5ef50d6803b007758f409ac1f6ecc6ee4e0a2fd0926
 DIST minuet-20.12.3.tar.xz 27731932 BLAKE2B c1638c069161f9ace3f4515ea5260f138b03e13f591e8e4eeaeb8c2daff5a754f3b516dc952fca74d784134940aa08dfeb55ae78620b781ee54c5fda42d83227 SHA512 17c92dd49e729f075eb37b205990c098931b2fce56b200ede20293c0df7ff833bb7492b7bf629e7de408984f7cad6986efe060a02577b11c07abde407b462a6e
-EBUILD minuet-20.08.3.ebuild 673 BLAKE2B 49eb52b82b10e0e556dac27bd8a2e39444c7777b99d3c30c6a1f11ee49dbd77f8dffa22e6e6b58866337dc147e773b6de0e498d2debd5ac2cc866e15d0245eec SHA512 08ad4f0bca5d0ffb0906640e60edce71ddec09119363264af1208a65eeee68482fd739db929595502b17f059b0407d955827b7dc055e5bbf76b3ee3f220c29a8
-EBUILD minuet-20.12.3.ebuild 676 BLAKE2B ef701bbe988d35fef0a2247098ffcfd1df4a39064c2d53658bfbdc024d2c76b86b77800e6f699f3968d900f07a9ef036b79e767bfcc80b31a6ef8873b4d3e559 SHA512 12b4a56e49b7de8279fd3e9182f927fd20e3ceff65e04ae6be50dc8c4a1d191aa2cbd1db397c6f868f4fabaf9562d1ce68c967183607e661a9f45872b61adba3
+DIST minuet-21.04.0.tar.xz 27724432 BLAKE2B 066abdf791fa4ba8e2d90d3a67131b9ac12714ea9bb31398cfebc4de6e82897d888d29fa7bcb946914bf85c083ce745224e72f14e1e99a32d8bb4f3efc03cd98 SHA512 0709ebff376e87a12224551a54f86a4e6a5118244153e0885735710f5f4b0658c99a6bb5c0b3d3e19135d04ad3478cf05080771a08b3801f2509bcb3ceb39421
+EBUILD minuet-20.12.3.ebuild 673 BLAKE2B dd512ec6e2a26d11e4c78fa975c330b34511c449ee146c2e17b59e99e731ac936526af8e7a37190bfbb4da4ee61a9e50781291cdf8ef2554db7bda12635d6d2d SHA512 6995cce97718b2fad9fffa9cd5744946ad5d2f3b99f57f44140650acc6a76998ee962162983a4d495d835a34c0424814c613930455de8541d7f00f1624182794
+EBUILD minuet-21.04.0.ebuild 676 BLAKE2B 678f8cf452d711ddece08e1b48b407df0d551b17fc0a8ced433d2b61ae298a86afefa0005212dfa377cc86cf82cf84e5a71f9bc09b05358ce806f1de08bc74d6 SHA512 ffd6bbfabc65169a595235bfc4da5da6b01a940286da5e8a9c6600ae069ed6146d152a45c40e82c3b4cbbf40d9152ac5e5f2d020b7ead8f3b4489ee9b1c81c13
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-20.12.3.ebuild b/kde-apps/minuet/minuet-20.12.3.ebuild
index fbdc8c707dfc..9c8b33769d76 100644
--- a/kde-apps/minuet/minuet-20.12.3.ebuild
+++ b/kde-apps/minuet/minuet-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://minuet.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/minuet/minuet-20.08.3.ebuild b/kde-apps/minuet/minuet-21.04.0.ebuild
index c27ec0ec01d8..aba9ebe37637 100644
--- a/kde-apps/minuet/minuet-20.08.3.ebuild
+++ b/kde-apps/minuet/minuet-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Music Education software by KDE"
@@ -13,7 +13,7 @@ HOMEPAGE="https://minuet.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index d9de9bbbdd89..5fb0dfa6826d 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,8 +1,7 @@
-AUX okular-20.07.90-tests.patch 6660 BLAKE2B 4adda1438641d31fee4c770bee0970b33b940c3a943f2c66d4c9af819e39f01515837d3496e2595737312de0f0e13ee00cdc0651c1b9d91a7f10bd907bf0a63b SHA512 898a552b401db6abd50cff591fbd3df6f533f70e4e99842570e5c847e55efbe29c464d640f598cb4fcbead445175ec96ffd70809088f58cef5fefb6877535f43
 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
-DIST okular-20.08.3.tar.xz 7520168 BLAKE2B 351a3d786b5451473aa8e9e155cac2a330890fac0acc34e5c897a7faca03844211ab721083408c338df681759f6d5986219395fb54397b185b75512b9f0f618f SHA512 15bbd2fa2f8d836e80f2fa30d0fbcb6e7303ee2bfb12ebc305ec7b51f046cc0f66a3abeb94458e60f1b17dce7cc964d679d038207766c2d941a238a32b663573
 DIST okular-20.12.3.tar.xz 7884780 BLAKE2B 8ff44f3f60ea6f9c8b0b2357727a56aae9cd77fd408c60cf8282b41f2e286420747c11bb669e3bf52192481ad56dc3ee9125ba2f777432b423b6217249d31c7f SHA512 f64eca81bdbd163b2780037026c330259d5dd7fed7a175b06601742bc6b98c25f26463d72764e5b77878b3c36df4f4657d4cd5349f389786a45df1a5fa9cda45
-EBUILD okular-20.08.3.ebuild 3251 BLAKE2B 901fe5620225f3af65cab367ebfe79f05c13148ec24530a105e4154c495ed895db04207104507fe72270e100dfdf4221d75f5ad276b5c1b80cd6c4a78b7437d8 SHA512 b8c21192146fa99c0e683018c22a8ab13d2f107f97624ff1f8cce403add99095d845c5e1d7136cf71be63fa90fae36e8ff3a626ac3c333dee3d8dcede3ea0fbb
-EBUILD okular-20.12.3.ebuild 3158 BLAKE2B 050d7bd31e7c68758a7a0e6e84bfebd38d02d330e6faacd575c604205a373aadf53b07838f0888b29311b4fd5b97d96625e8584c9dcac42f24830ead50112979 SHA512 d18c22e3965f80e60b723e64b9e2cafe3638c3ec067465aac8ab55b8d6ee3b020f47a390f2b902edd7bb63d6f3be42bfdb3bb1905c525aecabe333d6019ccc50
+DIST okular-21.04.0.tar.xz 7936552 BLAKE2B 95e06ccbe55a8d7b774e89191d0aca88ee235b8b6a2a750be286a370bae57b98387170b722bac113d320c6d8e6964a5d213c016f51d15e64c37fa5bf9a0f6443 SHA512 81b1dbacbbcd76e92e7204c322fabf863e72f959ca6e1f68e1f8d3e6ae8f24ad04987f62bc206b97a7b7aa43b066ab9c3bc630a1bb47c30432183344942a296f
+EBUILD okular-20.12.3.ebuild 3155 BLAKE2B c500766d769d755cbb5153af16cc83318f716b3dcab7fbf1d751d036d352324f95052c8aae0ee5088191a7a5af6270a269e2d1899cbf58208198da2d23195cae SHA512 82ce0f91ba3f37885ca7d576d047aae9e9a34b438e89677cc00d1c28e47ca927dc32a0f104db15624da711a75c7ed8b9307c72d924a2608f7fa365ba9a8bf09c
+EBUILD okular-21.04.0.ebuild 3162 BLAKE2B 98e759e80efa1ff0c7319da4bd0619f37578fe2362f32423965aeeee5194fc5b36a63dc14fccb4fbcd4aa1cdb5f2eb09944fd302f740af05f02c08b49950b4ac SHA512 3e14edb8d554630f4ffe15dbd65e9f26c2d6647dcefd0431f7925d28a35f4d36b0e1e72d8b84fa48fc2445452477c5264ff0ddb980467ce3394a175cfac3f27d
 MISC metadata.xml 930 BLAKE2B db4164556c6c5f69c136f226dd436e813a8095196d468cbbbfd2052086c6d1d4b29a9908f85b49838ad44046a3446cb073a45887defdf2ff509b49c4688dac00 SHA512 570c388b5f08484354a15000a1f098ed327b5f5fb40d78801fa746d09fe28eb3b63bb3b735549ae6e6ef7abdcac94652946c45e9b26acd6bf9ebc4058d41759f
diff --git a/kde-apps/okular/files/okular-20.07.90-tests.patch b/kde-apps/okular/files/okular-20.07.90-tests.patch
deleted file mode 100644
index 6bd229fc3851..000000000000
--- a/kde-apps/okular/files/okular-20.07.90-tests.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From c675ba8bed1e792f351fabf3ba040a86138f9f84 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 ++++++
- generators/kimgio/CMakeLists.txt              |  6 +-----
- generators/kimgio/tests/CMakeLists.txt        |  5 +++++
- generators/kimgio/tests/kimgiotest.cpp        |  2 +-
- 8 files changed, 28 insertions(+), 23 deletions(-)
- create mode 100644 generators/chm/autotests/CMakeLists.txt
- create mode 100644 generators/comicbook/autotests/CMakeLists.txt
- create mode 100644 generators/kimgio/tests/CMakeLists.txt
-
-diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
-index 9d82b9394..b3a33afe4 100644
---- a/generators/chm/CMakeLists.txt
-+++ b/generators/chm/CMakeLists.txt
-@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS
- okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
- 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 9245a736f..5a2c487b4 100644
---- a/generators/chm/autotests/chmgeneratortest.cpp
-+++ b/generators/chm/autotests/chmgeneratortest.cpp
-@@ -34,7 +34,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 9a07c7183..316c93152 100644
---- a/generators/comicbook/CMakeLists.txt
-+++ b/generators/comicbook/CMakeLists.txt
-@@ -29,13 +29,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
-+)
-diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt
-index b8cac76df..49f893bc1 100644
---- a/generators/kimgio/CMakeLists.txt
-+++ b/generators/kimgio/CMakeLists.txt
-@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp)
- target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
- 
- if(BUILD_TESTING)
--    add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--    set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
--    ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
--    target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
-+   add_subdirectory(tests)
- endif()
- 
--
- ########### install files ###############
- install( FILES okularKimgio.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
- install( PROGRAMS okularApplication_kimgio.desktop org.kde.mobile.okular_kimgio.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
-diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt
-new file mode 100644
-index 000000000..f31bf3fe8
---- /dev/null
-+++ b/generators/kimgio/tests/CMakeLists.txt
-@@ -0,0 +1,5 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+set( kimgiotest_SRCS kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
-+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
-+target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
-diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp
-index f2e50641d..a24f7af80 100644
---- a/generators/kimgio/tests/kimgiotest.cpp
-+++ b/generators/kimgio/tests/kimgiotest.cpp
-@@ -9,7 +9,7 @@
-  ***************************************************************************/
- 
- 
--#include "../../settings_core.h"
-+#include "../../../settings_core.h"
- #include "../generator_kimgio.h"
- 
- #include <core/observer.h>
--- 
-2.25.1
-
diff --git a/kde-apps/okular/okular-20.12.3.ebuild b/kde-apps/okular/okular-20.12.3.ebuild
index 1e8621eb1102..94e509a4e049 100644
--- a/kde-apps/okular/okular-20.12.3.ebuild
+++ b/kde-apps/okular/okular-20.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/en/okular"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
diff --git a/kde-apps/okular/okular-20.08.3.ebuild b/kde-apps/okular/okular-21.04.0.ebuild
index 588f832c2b36..f35d778a4575 100644
--- a/kde-apps/okular/okular-20.08.3.ebuild
+++ b/kde-apps/okular/okular-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/en/okular"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
@@ -55,7 +55,7 @@ DEPEND="
 	)
 	markdown? ( app-text/discount )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-	pdf? ( app-text/poppler[qt5] )
+	pdf? ( app-text/poppler[nss,qt5] )
 	plucker? ( virtual/jpeg:0 )
 	postscript? ( app-text/libspectre )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
@@ -71,15 +71,10 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-20.07.90-tests.patch" # bug 734138
+	"${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138
 	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
 )
 
-src_prepare() {
-	ecm_src_prepare
-	cmake_run_in generators cmake_comment_add_subdirectory ooo
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DOKULAR_UI=$(usex qml "both" "desktop")
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 00d49f1ad268..8aca35a6e18e 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,6 @@
-DIST palapeli-20.08.3.tar.xz 2078736 BLAKE2B a7e3c741c3f62803c289ae0e5b1558afef1ab7ea3de95120e6504da23a6a7d0850568c88e250942dec48a165ad71ff30324df82166387f37d710077c1c821520 SHA512 b9fc3113da2800fba3b65f2e593ed3b9b078b0defcbb0db7c8c11127f3f1d2c5776918aee96e4399a8c5436e6aff8a09de7bbc35b13e4910f7d4f612e5b42210
+AUX palapeli-21.04.0-bogus-dep.patch 650 BLAKE2B 6cf92efdaea5d69c0f5f10bf08160144cf2b9ff9af438f5e3e4b471c4f4a6cf09f850ff6e351c739120934ec9964e2f22b35b16563a95ba81e4626bf93240299 SHA512 ecd52dd3d8a93252d6f2418babad64a27fd2ae14c4f59759bf7c9a91a04dba3c6b7da8cb86158d915d3779ee65ebe324cd0fdfbd6fe5b918323fb7536121e9ff
 DIST palapeli-20.12.3.tar.xz 2078720 BLAKE2B 18952513649553814abf17d45580251057dfa528c7cf142382ad6c90eba5bab9227b1cdfe7c818bdc71b93cbee3b2cb28b74cb0241d74a893feafcf3ae6b7e44 SHA512 f26efc3e724afdaba0826495cb14f8aff913dc6a6922e6a4734bf4177f572ef286a5d5c2c0926e2804a3c7429b64b07ee8b48917272af0be018f023cd7ec6a02
-EBUILD palapeli-20.08.3.ebuild 1060 BLAKE2B c16b0760acb569bb0d1f36be0b9ee8774e602d0a70dbf8f106d64066591d06ca84ad8ce205090b8fd2ad0272cf5dae43b5458456274d3d49d074244970aee4a2 SHA512 1e0e44a0bb7810cc54e734c03cd8093063bc2e1dbc5b3c5b420bb8ed29768dac629a9af4b17cd07d829e2375ffd342c95b35e51fc01575da7ce3fa7e847c05a7
-EBUILD palapeli-20.12.3.ebuild 1063 BLAKE2B 743a1ec9a1f6bec8af8c0d194134c0f22e3a580fdc19d1c464f61396034c33eabb96e48f7c66c5067ba82c2cc0f9416ddfbefc6d553d8150a1d9da7437c877f4 SHA512 0952705e40faf98f172428481336b00c747ee98bb5f3bc32d4f8244c59a030d777002cc328e7d0ee5ca00c31b395fbdfdb4e6f233a6709b3a6ce7ff35b7545a3
+DIST palapeli-21.04.0.tar.xz 2076340 BLAKE2B b1989c7371ceb25e4fffaf5b1eceecd29e18482c65812f71de373a734df7a9760aaa68a179d614192e9b927febe34ace03d3a5b397eb1f81de33fffcfa6b8be2 SHA512 4792981b09d3e6b37e9231568a29197709dd90af459dd093df656571fab7b71647ec33e9b1355f6ee72a5fb41f89f6975bdc12860aa6915a711b41f8fbde9b44
+EBUILD palapeli-20.12.3.ebuild 1060 BLAKE2B 138c4bb85665cb5f3669d7c7ec29b67558a5fc65c071e67ec657ae3f4468156d4359c473d270660a93c55c24432ae3ada7c06afbb41d41461311da660386bae2 SHA512 61eef80bb44309f83613e157e1752ee08b581b883eaf86bacb5492bf5fca265bcace65e60e378ca8031f0e5a438fe979c97202e124b8fd4ff8842e692364b9fb
+EBUILD palapeli-21.04.0.ebuild 1099 BLAKE2B 606eae1b20bcda769b0e8a500a02570ad3215244328825a2108dcc49187b470f275a939be4924c9c5411a3b473e2378048742141bca7f6d699e930be2c752e66 SHA512 893d62ccdc72f6cf26505439fd7206280e24989bf311e9b3ee1e022b3c01db23a5273ce9ce251657dea29c5e6261569c91cebfb344fccd1c3534cface74f8d32
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/files/palapeli-21.04.0-bogus-dep.patch b/kde-apps/palapeli/files/palapeli-21.04.0-bogus-dep.patch
new file mode 100644
index 000000000000..94b8a76f32f7
--- /dev/null
+++ b/kde-apps/palapeli/files/palapeli-21.04.0-bogus-dep.patch
@@ -0,0 +1,26 @@
+From 30ff07fd12c0767ed033e71d2226053115963401 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Apr 2021 18:34:37 +0200
+Subject: [PATCH] Drop bogus Qt5::Concurrent from target_link_libraries
+
+BUG: 436132
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 06607ea..349ac64 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -63,7 +63,6 @@ target_link_libraries(palapeli
+     KF5::WidgetsAddons
+     KF5::XmlGui
+     KF5KDEGames
+-    Qt5::Concurrent
+     Qt5::Svg
+ )
+ 
+-- 
+2.31.1
+
diff --git a/kde-apps/palapeli/palapeli-20.12.3.ebuild b/kde-apps/palapeli/palapeli-20.12.3.ebuild
index 70ae4859c9db..fce6ae814f22 100644
--- a/kde-apps/palapeli/palapeli-20.12.3.ebuild
+++ b/kde-apps/palapeli/palapeli-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/palapeli"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/palapeli/palapeli-20.08.3.ebuild b/kde-apps/palapeli/palapeli-21.04.0.ebuild
index d58ed88c51d4..4619490129b9 100644
--- a/kde-apps/palapeli/palapeli-20.08.3.ebuild
+++ b/kde-apps/palapeli/palapeli-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ECM_HANDBOOK="optional"
+ECM_HANDBOOK="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Jigsaw puzzle game by KDE"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/palapeli"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -36,6 +36,6 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-bogus-dep.patch" ) # KDE-Bug #436132
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 39fe3076e556..6bf55b1c1164 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
-DIST parley-20.08.3.tar.xz 8842444 BLAKE2B e3d2d9552384baab9734700da7a5bff4d5a24d23e1cfdcb4659ecdedcad22fa4bc26ec86d8666d47ae15af3349dc06f80c61880a96c47d17e709c8d81414afd3 SHA512 b7d2f9fa4534a5e5749028f54b0374a271e0b443b4be6a7c905f16542553c02eb661928b25bc373cf9f556cf09c2ea88b4adbfd535df32181ee6c0ccaf16619f
 DIST parley-20.12.3.tar.xz 8842064 BLAKE2B 178a714610b9b68c2a993937b7109e4d82bbd173f90de9b3836ce7e8620f17cb46c0964e50e47f621d867e5ca83ee6994501119d98f33af1ee279c1ae1530ec3 SHA512 60623069078a2944e7a83798293a78ed7fac7feb5f37527cb978fc4a8a63ba613737ed0d8a24972ed92393476fa9e83ec83d3c41f6d879797243d966d6784d87
-EBUILD parley-20.08.3-r1.ebuild 1634 BLAKE2B 0926cd4e573e0f43439f45e573335d87ccdb659d9e502a293401ec941c4c3edc5e53a119211e877d088f0b41659c497d9dc25b53a5e11601c84ec7574fea4fc2 SHA512 c8bb754229c6f4be8a8f0d9cc243439dc138eb3afc0f52f8f6d557c0cbd0e8a3220f190ff9ca7443b1419b4f7ffc68fb99317adfd1d8773efe6d59cdeedc2b6c
-EBUILD parley-20.12.3.ebuild 1637 BLAKE2B b459f847ec21a8c95daddd311dfa70b63045edf9474b4c1287a91217d598c1776257c2f2cf6940b105efc54c4b6f8cd60527ac6dbb717ae14d7f6a320f800300 SHA512 822c07fa44beac00000fface43d8b873ea7ed3b331e827a5a6950766818fb3f00688b6402277487b265aae904aef43f8dcf262bb1c066cf18907ec42deff9e1e
+DIST parley-21.04.0.tar.xz 8844472 BLAKE2B e8d05c8582dbbdf21a6be8e1b8c177b39fd102a9b9a4702fcec9057b9a0522274d5d942615607f91274fc9209e39e44ebfe93aee3a547e7bcfa9131998253443 SHA512 d5c22a3bac2882b1959f5ef53533b1dc16621275d6a08efa4e473964768909d277f1a0c2fcba2cdfe20602a079dcdd041bedfb66787ea377922c6fdc8c11b437
+EBUILD parley-20.12.3.ebuild 1634 BLAKE2B a736cdc4c4a73776c57798c585736425fad910980730e16fd38ed1a3cd890143685d127a339144d2e63b928f3c25b176d21f7168af187172b0d92267e72ae490 SHA512 a98a94d8ab237c1867d8cfb6fda65c079702699f9c65875e53e5dd24c1b953f0fc9dd27022d3c8467e1a7098b433f128851fbaa18b1830f965b85d615bc9738b
+EBUILD parley-21.04.0.ebuild 1637 BLAKE2B ee4e80d73e6c29cbeec17383954c0f00810c04a1dd13e52c4aefeaad218ced9f36b755bcb590dc1eaaea7c203634c6f12da67811d98c876eaf426b740d5ff25c SHA512 b824ab42daa981600c5966716560e1483a715a925f713a82d3ccff6d957a514629ab590404d1bae0e76286a96bd065e59dd2b1da4c20201d63f2025b54c51517
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-20.12.3.ebuild b/kde-apps/parley/parley-20.12.3.ebuild
index 4586e86bb1a3..526149e4ca3a 100644
--- a/kde-apps/parley/parley-20.12.3.ebuild
+++ b/kde-apps/parley/parley-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/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-20.08.3-r1.ebuild b/kde-apps/parley/parley-21.04.0.ebuild
index 7cb545fab6b2..c230f05413f9 100644
--- a/kde-apps/parley/parley-20.08.3-r1.ebuild
+++ b/kde-apps/parley/parley-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_HANDBOOK_DIR="docs"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="A vocabulary trainer to help you memorize things"
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/parley"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index 1f0222855b06..76fa7e7745b3 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
-DIST picmi-20.08.3.tar.xz 1367300 BLAKE2B 0ee12673896566ad280fec8645613048762e8936f5eb0cf205b153812d15aa30ec5c5e0aa1bce49039cd3948877e52b96ea350d87fb67b84933984ba6ba3403e SHA512 efbb31736614da07c69781dcb3f717855ecf6d13bc1ca1af4df1ae5f91d99644fe63e3f445eba1af679e75d4aedf6744547f8b50962a848cc7a31d06101135ed
 DIST picmi-20.12.3.tar.xz 1367556 BLAKE2B 258171a75184c9c6c4e8e7ad978bb5bf295e3d9ac8d111487555fbd3e01aae27b737aa74eed0b21f570b2d592a4a190d9869167eb0dca87d7f35477606d8a4db SHA512 46b269212a425a62fabe97d06f272bbc050ae7b288629ef4ad0597282a0fe8481016aeadd94e6b9971cd90317308032a6241d8f95bdb1c24a6b6601375aa64c8
-EBUILD picmi-20.08.3.ebuild 1057 BLAKE2B 3edab0d88b428a1031891b988ad5dff0ddc620597c32edb927d2f30cce69ccb1c6363651cae88361f123d507fdf01c3968b7ba5139f6c3b5b279bb31acad8eb7 SHA512 3010b95159059dacdd77a6497991ae4b495d2cd845c33bca58ff9855dc0fb98350ee89d275ff2805c10499f4cdf4ebd9f3baf6070d8fd73fedd11b609d9936da
-EBUILD picmi-20.12.3.ebuild 1060 BLAKE2B b3c94c4881cc4df8eb7c21ea18b746320305147dfddca3389fdf01fde78b957f69f2120b33fa61f3e4f2c6d45b94bb49291c02464f2901b8c4bf1e1a39cc3846 SHA512 56760d1ed187f298ebd0a6da2e9cc348339c60c2cb295aeeeae4dd28d7ad3b2fa8aab4a661afc62849b36f3c45b247eac5cbcd43025c410158f3465b404c0f95
+DIST picmi-21.04.0.tar.xz 1369132 BLAKE2B 15833dfc055ec1c0af0b1e849348fcabf2051f04079e6e362fd68491b531f0ebe5628e285addc12714925c07e04ed057af6211bb4da4182860d6b4186a05ed0c SHA512 339b6cf780d1a9973300a6b2ffcf33bf9f997c4d2d3205f2713c434c47a48b65078d660415108cfbba14919a8d7ce1ca1832cca43c3d2dee2186250b30c09861
+EBUILD picmi-20.12.3.ebuild 1057 BLAKE2B 07d8eb96b8ef81e4a19167d0290f0c413d019dfe128b55ef58905e39295731ab0e1b93378c3dc69e0a30980899cafb62a4a5c7e90cf91ee005a1be96b6f0f354 SHA512 c9f7962bb4ee7cdbae79f05ea83061b7b102d067948b1ccc7ac4f882c125172a4295c6a9c2ff764c79bd7ade83f9ba13939653c286994643010bf8b89abb3f2a
+EBUILD picmi-21.04.0.ebuild 1060 BLAKE2B e2bea272a2b1b48233ac910bf9ac54ccc7573cdb8a819720b98d590ead2195154b96b40746984419aa2c892d2d99adcb7fb13abca3a9c6fa4c6d354d61fc712b SHA512 5cef7052bed17549036f8ff68d7dcc4e100a609574c56acf395445129428b922a01ab48a27fe0b17dbadf562828c096ed2215d492cb70971a6c15662cc55e9bc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-20.12.3.ebuild b/kde-apps/picmi/picmi-20.12.3.ebuild
index 3678d9dbb098..bc8227cc4c65 100644
--- a/kde-apps/picmi/picmi-20.12.3.ebuild
+++ b/kde-apps/picmi/picmi-20.12.3.ebuild
@@ -17,7 +17,7 @@ https://games.kde.org/games/picmi"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/picmi/picmi-20.08.3.ebuild b/kde-apps/picmi/picmi-21.04.0.ebuild
index 89f51ccac4b9..f2fcfa5f2d9f 100644
--- a/kde-apps/picmi/picmi-20.08.3.ebuild
+++ b/kde-apps/picmi/picmi-21.04.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.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 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 0c3ac87c4a1e..82f23651b92e 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
-DIST pim-data-exporter-20.12.2.tar.xz 400376 BLAKE2B ed88c2292c3a5cc70a0382cac11c77a891fe71755e2a2ab962cf2d8aa7244a6222b30759be572a58682de50f3d50a05591141e8f1147373ef6947e27fe8c4598 SHA512 a213183e6f7e6086de511c3f8171de52b705c7097c85dd149ff912959b420df20c3ac5fd96c61687dfca20e1fe6745e48e0884deba914c3cda1274db36d7d153
 DIST pim-data-exporter-20.12.3.tar.xz 401632 BLAKE2B e86bfc2b2d49a5525bdc75e43d455ff40e36dabf1bc1677cdd673991613d39c19d2cd2b1aea200dc1e409b0b29c0f7b3e62a181d4fb22cc8a2719b79291659c2 SHA512 d9b96081967f6271908624b303fcb358ebabf90fad2aa731f2c0e67e421921f47dfbc054d59fbdea875c3719407a717c40fd708fe915baef179dbe22c3242129
-EBUILD pim-data-exporter-20.12.2.ebuild 1650 BLAKE2B 29cf82ffb999ed7e650195d7af44a245c78c2f771834412a575c4b7f5d567a8315bde9050472ad2c1be54c93a00df7ec6171b1d18d0f83507422f2e44b2eebe9 SHA512 fc979c5c55ba17ca7ab53c37292912f6336cadfabd2a71d2288df809780073df314e79e131aa6056dede138a9a740356dba58977f663af224dd502c7751765a2
-EBUILD pim-data-exporter-20.12.3.ebuild 1653 BLAKE2B 6c81519af9e79419eb8ceaa3408b311e3d453bb7e2a9bc7c67db12c4a00ff95ceb6129c62cd75d6ce0969aa2b1a71f3c3fe04d42b281881d0b39ccfd6ddd7d85 SHA512 5861f7f0e3424ba31f15748c2d5ae6428e3f8c428353f236aee3dea1aab81f313a29f6aee8f743e71f4a625208ac80bf33735efa37098bfa976e0236cb1d7221
+DIST pim-data-exporter-21.04.0.tar.xz 398676 BLAKE2B 79b070dcd2b7ba142e777230b82de83c3741d425311a8d5a3cee6c1ed163c01ec5788c7c8c714e3e7f79e58814e50c41ed6a3f4afbbf6cf49c720fbd34e62b8b SHA512 8261fa8f3c9893dd5b15d65eb2e2685c56e5e6ad179bb84f505e972f9374c640d428ed433b5f292f115949969e00fba45b98617c155948112d50f2882beeeec2
+EBUILD pim-data-exporter-20.12.3.ebuild 1650 BLAKE2B 29cf82ffb999ed7e650195d7af44a245c78c2f771834412a575c4b7f5d567a8315bde9050472ad2c1be54c93a00df7ec6171b1d18d0f83507422f2e44b2eebe9 SHA512 fc979c5c55ba17ca7ab53c37292912f6336cadfabd2a71d2288df809780073df314e79e131aa6056dede138a9a740356dba58977f663af224dd502c7751765a2
+EBUILD pim-data-exporter-21.04.0.ebuild 1653 BLAKE2B 1bc47485a13d613711867eb9c3e0f5477b46d1d5e1ed48f1f3049cea7e0f34fa0fdbd955c9f4e85f1eed854373d127dbfbf7bb6cb1ca62e24f9febf713a133a4 SHA512 951cf6c88605e7f252a38cdc00325fbf1c588721a388e681a468b95baddb738641f3d3773b1d51a1456e1812d0db94e37df4cbb25627fad8f772c403b243d585
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-20.12.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-20.12.3.ebuild
index 81a8615d4826..30091bea2315 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-20.12.3.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-20.12.3.ebuild
@@ -17,7 +17,7 @@ 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"
 
 DEPEND="
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-20.12.2.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-21.04.0.ebuild
index 30091bea2315..eb13f2c6507b 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-20.12.2.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -17,7 +17,7 @@ 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"
 
 DEPEND="
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index e4195eb1e31d..9fce8d7daca4 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
-DIST pim-sieve-editor-20.12.2.tar.xz 455092 BLAKE2B f39d1436f9121d0a0e1e78ce49db91fe3dafde6f09303bdf6a58c22ff480f5c160b655ac7d24f572202ddf291e29f454873b70f943a582a5daf8977fe1a8b42c SHA512 466bf9e5411ac33737a416108583c8e6cd3497f740457d8dfbaafd1ce57a45184337a894bbb0bb5a52496a0ce93104596c3835376be11f94d78382da7a41b24f
 DIST pim-sieve-editor-20.12.3.tar.xz 455152 BLAKE2B a4a28aeaf3a1ef2b612ae69f4503d1456f44af0e005eb3b36b99e4b75e7e394ac4386915ead419646277f106b57e6f889cb3fe86c3e1e79eef3bbe0abd57b6e4 SHA512 27270916ec2c41e2222ed1f5248091b19e6569564f82ff56d75204c81a6ad1ea7c0d6dbc907e2dc4d1a02f032162ecc443915f936f1577b0245f1b40d52166e9
-EBUILD pim-sieve-editor-20.12.2.ebuild 1460 BLAKE2B 77bcb9e6d9350c953497b38d3df53ee4b19c1b2dd8b93e80220c277ef82c5294c0e6f7b25b78d4f6614c9a180f13a8783474cd30b31fb652caa11882ff05cb43 SHA512 c706c453440dda3b286be108b1b383e624a7817cbc6e87417e50905c13fb1931702c757510c2e746148d146289e31803042e0fe1696ea96cc2cbe5954a022f96
-EBUILD pim-sieve-editor-20.12.3.ebuild 1463 BLAKE2B 83c1d7425ad3a254614fc5dbf66f62def9b41c652dbec5e6c8c936d03d035369e2bdca5c9019da9ddd76bf3664654400e722e3de3267f11a6b84841e6867d015 SHA512 4cb850edf647c9aae8e282dc6a14d28b675ce852ea3700652525de1e9111957b0be0e4cd0c127c24fcd410b67d0ab0b3dccd327e586349d539c27a7ab14b06e0
+DIST pim-sieve-editor-21.04.0.tar.xz 458088 BLAKE2B 267f17a9c9370d816632362da6c20469998fa9a70ac7cc4045de90756ede71b7075b3f76a40ce18cd1ef153e353c72519c9183afec03396c2096e6376cf3ed1e SHA512 da1f789685abe41d9d8d4a17c0c70c6f3fa5bafd709809f4bcd005fdf3a903a3ffc7000892e98928cfa52b19cbadf1a4feb8a7ae1cfd6da944b9a9d053bbb8de
+EBUILD pim-sieve-editor-20.12.3.ebuild 1460 BLAKE2B 77bcb9e6d9350c953497b38d3df53ee4b19c1b2dd8b93e80220c277ef82c5294c0e6f7b25b78d4f6614c9a180f13a8783474cd30b31fb652caa11882ff05cb43 SHA512 c706c453440dda3b286be108b1b383e624a7817cbc6e87417e50905c13fb1931702c757510c2e746148d146289e31803042e0fe1696ea96cc2cbe5954a022f96
+EBUILD pim-sieve-editor-21.04.0.ebuild 1449 BLAKE2B 85e205adcd577eaa4072d78f89b67d47548d249cb71be24d015dfe81cad7ab8b10da44520dbed63761f9d5c52f4bf37e37bc83de9415480e9505033ffc4f3a5b SHA512 b148be9a2d7a0a6cd6148225b7f1d0d7f1e9be67460bf3e7f74272ce5a2b26b3040940c89cc06296a2320892479c11be2aaaf1770c6305705f3cda55c7bf886c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.3.ebuild
index 09f58bd5a5c3..5c0c92fed6bc 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.3.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.3.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="
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.2.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.0.ebuild
index 5c0c92fed6bc..f32fa623f8b2 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.2.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,10 +15,11 @@ 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="
+	dev-libs/qtkeychain:=
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -39,7 +40,6 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	telemetry? ( dev-libs/kuserfeedback:5 )
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 54b35b33e161..7604105cdf6b 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,5 @@
-DIST pimcommon-20.12.2.tar.xz 364268 BLAKE2B e979c3b72cc37c443d7bd29323c4277be1625e9635f20f16e90d8ebc0a5bcfcf343f91d6d88a26f25337583d270309aa66707cff141073e278b87faced43281a SHA512 268ad53f8cf44171be339e6ab4a6608581f79e7c4c08fd22f4d8ce698c20281580ed4f25a956d6b0449753273bda7b6c6d40d44189eeb5cd7c479266c706c960
 DIST pimcommon-20.12.3.tar.xz 364304 BLAKE2B ce571e9b57089b34caddfab9bac4f26916238b98c2853d5b69656fb56b0fdf656f4e81e7a479571c687a25027764be854c868705ea8fc2ec0844c826cd2a22f1 SHA512 f016b68ca9f768b7e3c506034f2d9d8e13e2325aa3291ded274cb8d71abcea521051180342a9b6ee4488ad54715da729adf48c0f2ab562030622dcc64de96df0
-EBUILD pimcommon-20.12.2.ebuild 1724 BLAKE2B 333abe758556fc07efddbec1f3000ce1eb5ec469edf3bdd3caa37f38932c7cb363d1a1295b9e13e7174df12ec5f9f57c6ff4743fb9f5de4cecaac52251925d7f SHA512 2a3c4778bf94b3ecc75e91d0d723bd8af83f8741f97b5cf89e30e4b823b4d6ce8818aa1cceb4f786904ee861e0c5ab5dbcd94a6efcf85925b468f4ca900fe0f7
-EBUILD pimcommon-20.12.3.ebuild 1727 BLAKE2B ab5025f819a7b5b989d16427aa57186fd253f33970b14e523827832c9923755c21c706cfd32d5b4e7d0813ccd1a9fa2b8d5256dfead2bddc0a2bf4aa20cc5c43 SHA512 6096e79de44b7bf67f110e583f92c538c77f96fa981b1df2c3aea0a8d66ee0698eee72cfaae138881db277a87d1bcfe6a7cf3b4374cbf49495fd8fa119abef5d
+DIST pimcommon-21.04.0.tar.xz 369352 BLAKE2B f2a5217b8dd2ca6123ae9c252843836401086b2621cc9c3ae6299c3a22e01eed258c98884930022e7acf6223d05da79cadfc64000ab642ae0c0a89057c966619 SHA512 6c130aa592254089cc07c9d8a83ac7a08f3a34361270a49d073325b738e6329fb59d32ed454fe5b07fc49958d89bd21c3255eb0c6484a5b4c0c8f8f1088617b2
+EBUILD pimcommon-20.12.3.ebuild 1724 BLAKE2B 333abe758556fc07efddbec1f3000ce1eb5ec469edf3bdd3caa37f38932c7cb363d1a1295b9e13e7174df12ec5f9f57c6ff4743fb9f5de4cecaac52251925d7f SHA512 2a3c4778bf94b3ecc75e91d0d723bd8af83f8741f97b5cf89e30e4b823b4d6ce8818aa1cceb4f786904ee861e0c5ab5dbcd94a6efcf85925b468f4ca900fe0f7
+EBUILD pimcommon-21.04.0.ebuild 1727 BLAKE2B 452e163de6dec2c93ba949aa664756614d816f262e139434275a99e5f801e453323badc68f33fd4f26ca46c4f558120a3640d31409b6f44452d7e86537a65cae SHA512 a4a811247fc02639b4d95457ca3ea5afb3ea432909d8ddc1a11fee31ae93ef7231ce08a66c139b57487968cc83acbceb36cca6180ff32adcbb84d95ae52b6b01
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-20.12.3.ebuild b/kde-apps/pimcommon/pimcommon-20.12.3.ebuild
index bf95871a0c8e..d282c2997b4d 100644
--- a/kde-apps/pimcommon/pimcommon-20.12.3.ebuild
+++ b/kde-apps/pimcommon/pimcommon-20.12.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=""
 
 BDEPEND="
diff --git a/kde-apps/pimcommon/pimcommon-20.12.2.ebuild b/kde-apps/pimcommon/pimcommon-21.04.0.ebuild
index d282c2997b4d..2f11c0bae237 100644
--- a/kde-apps/pimcommon/pimcommon-20.12.2.ebuild
+++ b/kde-apps/pimcommon/pimcommon-21.04.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.75.0
+KFMIN=5.80.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -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=""
 
 BDEPEND="
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index f32e7406e39c..d388296fb6e8 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD plasma-telepathy-meta-20.08.3.ebuild 981 BLAKE2B 21f9e3bf5691e2164e678cbab71bc07bb1c82a45610c323bfca308f84f5bf5d7ca118572c89065e8438b3fe645edc72c18ef0feb18faa7934309eda12dc49c04 SHA512 83314fed4541d7dcdb206f6e346e3153d600e3e8d9feff2cf4de0b17812d2b2546729c084f01bcd8afc3b0d1bc3cc4cccf26f93c58033600c7385e3cfcc6e015
-EBUILD plasma-telepathy-meta-20.12.3.ebuild 922 BLAKE2B 2d73d322b061cd9b9685089340e946773ce49efcdc5e35b4c93e53a0f8d867a94f5dd5b988b141552c2213e77eabd954ac34c1a074b74135bcfce449aa39ba27 SHA512 70424b1aed5e86fa90e8f3c0b61bffbf9cc383900e4d12e3d5bb9d82f9c3d3bfd49947d04448e948a3772b4d30a4f8da2cf2cf8cc0067abeedcad3f9fdcc20ca
+EBUILD plasma-telepathy-meta-20.12.3.ebuild 919 BLAKE2B eac14f096d35e38d013f3ce0e9c22d6789ed4c9283c091d6649be5eb3c988d3a18d9e3d22ba2b2d09428092bba6dd541147a0790658be73a53a28c724e81c0e1 SHA512 16d5447f93f7be39ed619da5ac843fbb8a58b342def5cc60f225102c8d28007ef1eb57848944ab1c4a28270ec6dab8dab56b15dde16a43824b354d5eaad66a84
+EBUILD plasma-telepathy-meta-21.04.0.ebuild 922 BLAKE2B 2d73d322b061cd9b9685089340e946773ce49efcdc5e35b4c93e53a0f8d867a94f5dd5b988b141552c2213e77eabd954ac34c1a074b74135bcfce449aa39ba27 SHA512 70424b1aed5e86fa90e8f3c0b61bffbf9cc383900e4d12e3d5bb9d82f9c3d3bfd49947d04448e948a3772b4d30a4f8da2cf2cf8cc0067abeedcad3f9fdcc20ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.12.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.12.3.ebuild
index bd57c061107a..a4cb5672b62b 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.12.3.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.12.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-20.08.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.04.0.ebuild
index 48ebc5914058..bd57c061107a 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.08.3.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,8 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="gstreamer"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
 
 RDEPEND="
 	>=kde-apps/ktp-accounts-kcm-${PV}:${SLOT}
@@ -23,7 +23,6 @@ RDEPEND="
 	>=kde-apps/ktp-kded-module-${PV}:${SLOT}
 	>=kde-apps/ktp-send-file-${PV}:${SLOT}
 	>=kde-apps/ktp-text-ui-${PV}:${SLOT}
-	gstreamer? ( >=kde-apps/ktp-call-ui-${PV}:${SLOT} )
 "
 
 pkg_postinst() {
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 6ae1894b0d5a..c99e96eef74a 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
-DIST poxml-20.08.3.tar.xz 43272 BLAKE2B 1f81403d2544b21fb12168d4961d2f890d62a832226887a26486dbd3a62b29e7f346a7c6b7366b5b6c18415638cf1136140a54f0a30cde3802918f2c34a0f057 SHA512 ce3b3344fcf1bacd44b481c84a7a0041c97686169ebd6e29af0f0de8d2fb808556bc52b930b222e1d87db8275892d1d22770ef0df888180e1be476852157ae6c
 DIST poxml-20.12.3.tar.xz 43224 BLAKE2B 348b9a0ac90b2865befb840453448072a78bb661bc33f1d01f593ef50c4895f58db3253a7d8f638bfdd3d23df91a2b03d531c2df3770a54303cb64fda5bd1a0c SHA512 b96c21440018d3adbad0d8acb1a054e147b167398e98238cde90a27337891fa0092304c2cbfce786ba473a7eeaec44c9010911dd55763626ecefdd7377ee9e8f
-EBUILD poxml-20.08.3.ebuild 409 BLAKE2B e7997a4c509c2de5b4e9fb8c51baaa3017135f6e7fc1df38d019ff0e7c8d0919992a111565bc79a3ce44fb3177c1fc9dc4812f9983584c3160e993c387e16a6c SHA512 1e49d602cde71fff79b01f04e39ba1c88e8444b8f01448f9bc8362e8654e75b9943c515af39115033ae5dfd01447274fd6b35d5cf13380ef17d51a7f982c17ff
-EBUILD poxml-20.12.3.ebuild 412 BLAKE2B fdd503cedbd21e297c3d5546c446908f0cffb87a79b18686c7de816adbc6e481b6a2d47b7cb5abc6f55ca27238ed2e1277431955a00a5a92f067e19d5bcc398f SHA512 6debe28fe0121346bd8805fb66fa9bd609d22580eff4502d4903567d3338e8f2aeb56c127e7daae0d4bf81bae3ff24aeaca1d5338fe65863ec69b81abed1f3a4
+DIST poxml-21.04.0.tar.xz 43552 BLAKE2B 5fa0afe273580e1d39ba927684aa119a4fd641e893570cd820b662a436f178d278e027c6be91232c6841b18ae965e682def60650e108ade68012cfc40430b572 SHA512 448be68328031fed5b61f8db170ff29681929a7822622acd53934f0c728d9426770ca62c084a94f10f296063f962e00fbd385ad1632c1f991f7b275a88bf4ac3
+EBUILD poxml-20.12.3.ebuild 409 BLAKE2B e44956fb6f363ab6ee88a386442587d7f35ed73a05f280886ec45170a79b7bf3691516127a64fa72d67e3475bcea1bf9bc7f006c35150dadb037af9a52d952b1 SHA512 f29398570744814b07ac3dc9a738f2c99f937407bf53a9fcb9c215fe48ef6c11dd2959dd4b2ffcffc9f9437c668635f0a0980d011292f2f1778dfb8d204312bd
+EBUILD poxml-21.04.0.ebuild 412 BLAKE2B fdd503cedbd21e297c3d5546c446908f0cffb87a79b18686c7de816adbc6e481b6a2d47b7cb5abc6f55ca27238ed2e1277431955a00a5a92f067e19d5bcc398f SHA512 6debe28fe0121346bd8805fb66fa9bd609d22580eff4502d4903567d3338e8f2aeb56c127e7daae0d4bf81bae3ff24aeaca1d5338fe65863ec69b81abed1f3a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-20.12.3.ebuild b/kde-apps/poxml/poxml-20.12.3.ebuild
index 75837ed709a3..53f8c5bfce65 100644
--- a/kde-apps/poxml/poxml-20.12.3.ebuild
+++ b/kde-apps/poxml/poxml-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/poxml/poxml-20.08.3.ebuild b/kde-apps/poxml/poxml-21.04.0.ebuild
index 1e63943d542b..75837ed709a3 100644
--- a/kde-apps/poxml/poxml-20.08.3.ebuild
+++ b/kde-apps/poxml/poxml-21.04.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 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 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 094e6587d431..cd98d25ef6b2 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
-DIST print-manager-20.08.3.tar.xz 258776 BLAKE2B 5fbf41b0b324732fe998891fee24cc0d9245868d1f73d578d455899e47524fa79eb8368f90196705e865f6d4d6d582dac427344b952075f2c3e989031de67242 SHA512 776221318c2eec2564cfde63b58ac4f89c7ce264b69d87b15c85a7681877fa81fe8a967d23619730e64c49ca6b19551d7fb4c22e66d7c1d0ff3b4961dc72744a
 DIST print-manager-20.12.3.tar.xz 258640 BLAKE2B db91464792bcc41781a73b2ae34f6a5b2df74f525367dd7668e0ba5b9261edadd8860bb9a1db38fede2313c5e18597481574fc06bd752fe3b7a887079e7d6590 SHA512 21030ecd3951cd1889ff4eb5a4998fc12f148d481bb66b8b7808fbcc5f38b1129e41e7e6d51ddd0ed2207c255be4c483d8960e05b02aed3f7691df85a7d1ba86
-EBUILD print-manager-20.08.3.ebuild 1823 BLAKE2B 0bfb41b0dcfea9078bebcd6271d0edd67c927c1529671b6a040a00f2e928a45bf8cea08fb24f588b3ea4ae688e13591d731a46946e0d6ec2c75694b3adbf499a SHA512 d4f77d3b4b619e55546fd5be0d8183b9f850ce4a48a8bdc1c7c2c6ffec40de9580145be86b947e53bf5dfd767fb4db2b4886aa0e022eabe60a1156dddf2ae999
-EBUILD print-manager-20.12.3.ebuild 1826 BLAKE2B d22d4ff546886faed575b3d6f84af713b99e1f49498ac9f8acf5513c83626be18676b0b9b4a166d5a93d43401690571df7f3abc17b297bd89341d1726bcf44d7 SHA512 62dec6069899ad24260575d4037010616749862ee1b1257a0a61f04a246a6f35ecb42a27a1a11bcfe23e2d7ed49237ac6d8a740c1b109905ace400a641740dec
+DIST print-manager-21.04.0.tar.xz 259104 BLAKE2B 32e2324dd776f29928da16bd0ef95b72dc05c219b1d8c1be9e89f61566f0fd909e741efc621e10236c79b123faa82500609fd29d7b9aef84193dbb19c0c30d77 SHA512 3d3567111c28905e08748e864fda87b93cec2d2c42aedb996966c6cb8299ba1df32f4fbec7e3056c88bee5193f27fd1c70964c2e423602853da17bde34ce8d9a
+EBUILD print-manager-20.12.3.ebuild 1823 BLAKE2B 79355eaadd1efbc9c59942d0fab690436c89bea43c3a17fa695c9eb4c2839a1e5fc5a4a627e9e5c6c88d224c9252577efbf5a10fce434534ff183dee230474a0 SHA512 060501be5ae7c08ffafece05f9f14843631e6b7af46ef46e3a5a6c976b38e67d0994a14e40a783c09a44e09727ceaafb2eceb7d07691267d67918fa727a1f8ef
+EBUILD print-manager-21.04.0.ebuild 1826 BLAKE2B cf22e700483fe8c0367bb57a9acaa76555d9db42ec3732bc93f921b4b8bddc5530bb82ab9171470a8876e813fda08bf71ab5dddca6811de3297d2f022f0516a7 SHA512 19a55c08e2b3932a7fae6b35316cc9a7ed20f1a99307f8df1c343db044162a0730cffc6ab177f7d66865b749fab6021bb6edffd4e54d4798ab6ffd50b8489598
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-20.12.3.ebuild b/kde-apps/print-manager/print-manager-20.12.3.ebuild
index 7183a1a9818b..16290cad01ca 100644
--- a/kde-apps/print-manager/print-manager-20.12.3.ebuild
+++ b/kde-apps/print-manager/print-manager-20.12.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 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+gtk"
 
 DEPEND="
diff --git a/kde-apps/print-manager/print-manager-20.08.3.ebuild b/kde-apps/print-manager/print-manager-21.04.0.ebuild
index c5ffdb15960a..04986407dc84 100644
--- a/kde-apps/print-manager/print-manager-20.08.3.ebuild
+++ b/kde-apps/print-manager/print-manager-21.04.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.80.0
 PLASMA_MINIMAL=5.16.5
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Manage print jobs and printers in Plasma"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+gtk"
 
 DEPEND="
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index 9e7c9610ad4f..c2a500842961 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
-DIST rocs-20.08.3.tar.xz 1498184 BLAKE2B 0488a62dd830e92cbe525379e53e0eb8a32334256ca30453549adad681df4e28d6bb05eed852e751e124003ede2833d5b78d4a3aab5e550334674811d6ca1804 SHA512 9eb5df64bad994f03348c86139bb156da856411ce4692a8d095c5a6410a9253a3e4a458ae7d3d3c18e6a56877728866e3c563d58c60a90658f9c0ea52ecdd15e
 DIST rocs-20.12.3.tar.xz 1492376 BLAKE2B a751c79a0766b1d0534c76b2fa635a1458796d6188162601ee0f4b586115a82760cf6adf699e4e4824e6e0a4a67fd9cdc6ec721f9373f17ff23a2b2bfa1acde6 SHA512 12bd3c8c7c7e46a9da630fe722a2ac1db58a03a8686c2d6c5a852da204d84e9ca071d2a812caeab0915214983d755175bee592c712cf2f0fcdbcf57be29cf8a3
-EBUILD rocs-20.08.3.ebuild 1343 BLAKE2B 05bbefb36d9a2c7c20eb42184bb5ce0602e7703df7b6522b8cbd0e6fe079805ccf94a9519ffab560b4963cb051d6c19398c7aaa8b0ddd218501168400cdee86e SHA512 e0cde3c1e58e716e3ebe8c6c2690b7d93e9c54051d5a61c75393daf966b52686d951f8a2419e9377e96a013dcc64c3e0903a012639e3066873f61a06bc9bda0f
-EBUILD rocs-20.12.3.ebuild 1304 BLAKE2B 9a898682ab0926bb0e339dff6edbf86da9787876c807b66fac2dc40fc45c2eb6cb7011e6d7b6cc14e6e5e7875199398d9ab43549a6c050c8f731257ebd77bd15 SHA512 7cd92ad881e16b0e2c06cabdbba96ad0a07a647ec4959cc7a08c5c4c2af163553b9e085a6ccbbe1e85cec550805f5d9a33c65ff36abe7a40b1ee51c5234151fe
+DIST rocs-21.04.0.tar.xz 1542124 BLAKE2B 58ef58c81dbb5ae1d5d1da93c987bf01e514f7ea31594cfa08c0b31493408f1d1874205fcc93f36b63cc1f190a544e5323d87ce2eb1ca9c96ed549ee4a438d50 SHA512 0e013f1ceb66712da17a853ac4c66e15b17ac93779d8fdf72dec4bf5a9d52544d38f26a523dcb88913184ba8f67eee3b04243ce574739b1e5c5cad3c6c8ed5b0
+EBUILD rocs-20.12.3.ebuild 1301 BLAKE2B a58ca76867011a5f6946f5f2ff53a82fd6e0d1a146ed94e1349b6782e40bc00817c1b669c353beba0cbacb81c3bda1cf6f80e3c3923f0408fc1e124fa35a4a68 SHA512 234904ebf2dc15bcf2d7852d13de528ababaeb77c05b86c4fd9bd82a587506bd1305fc15b2460e9cca7efa21699665d6e25238f9cec751abaa595ece3fff12c8
+EBUILD rocs-21.04.0.ebuild 1304 BLAKE2B 910cd36b5d004023b59785edb51cd0cd1b88a506749576867fb57de3a4e3efc75f2a2b1c293d13ddb515a26a7c3a023f1efee5981a58210e5834fc611e3eafb8 SHA512 4621925abc4a6b1c4aafc9f5697777f399cacf57aeb2af7d585de04fcdc17e6526d45d2093ab29bbab2890527f37dc708acbf3303a5976523897c242c9c47828
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-20.12.3.ebuild b/kde-apps/rocs/rocs-20.12.3.ebuild
index 82bb3567d545..b5e96d16a463 100644
--- a/kde-apps/rocs/rocs-20.12.3.ebuild
+++ b/kde-apps/rocs/rocs-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/rocs"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/rocs/rocs-20.08.3.ebuild b/kde-apps/rocs/rocs-21.04.0.ebuild
index d46552b5183d..e16c6ade01ab 100644
--- a/kde-apps/rocs/rocs-20.08.3.ebuild
+++ b/kde-apps/rocs/rocs-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Interface to work with Graph Theory"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/rocs"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -32,7 +32,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index f7de94441b1b..d9d59f913f93 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
-DIST signon-kwallet-extension-20.08.3.tar.xz 10704 BLAKE2B 97480248a5d16031da0fd0c8f4e0e45baff8f1b905cd4753c98e41343e4a25ff2dfc3d81f1ae97722ee5f8d3451e0b5d3c93e6021c5928bec60206132a57a203 SHA512 11fa05427dfef6839d1c3c6d0ee538baa7d449155b93eca485f6841e6fc8c867a87c0f7a32dae0b259f16f180cb6c9cc53c192194b464113d75b172a5a4df6aa
 DIST signon-kwallet-extension-20.12.3.tar.xz 10700 BLAKE2B 3cc19c19e472e4a14c12513bce10e79beedc8c7d9714c0dd589f7f4f6b3ebe4710a12257a646b450c217f0a25319687f3cc292bde86851c49ff9ef4b0ba53802 SHA512 ab8789755435dd7263cb780169bab0b9f562b33ecf948d46a513713c54b301584287493dff4a07f73584eb089ad498fdef62252a28154686a307b05138f5f5f3
-EBUILD signon-kwallet-extension-20.08.3.ebuild 375 BLAKE2B 3d3a62c8bf206e23836d8f506f1f0a130e95302291b58efdcaa2e9ce607b9ec5b825ad674b3d84982d2369d183c3b6a7dba5c6a4f60671413907efb4ea3abc3f SHA512 945a4a7192e0789fbb9b4ef4dfd8a750dcbdf0b88e76f558c673ccb3277f66d80fe83b8072adbed7335af5ed3c1ef5352b7159e00efcc8dae6e6507071a60ea8
-EBUILD signon-kwallet-extension-20.12.3.ebuild 378 BLAKE2B 4ffd89a0e978e8e168874c7caeb04d2ecf06bf4dfca26b3f5960588663310374061ec6da99a1f0a0a4fce9c35addf6791327ffdc743be086d49cc6ed7884e820 SHA512 7d0825b2c32bceccc9efceeb8e85c47eb962edae8f31ca1bde4b33e8a03b4eb8e1d2692c2bf1f4a9b58b0e55c33f39495ef8b5f753b5d33f1d74c6382ba99301
+DIST signon-kwallet-extension-21.04.0.tar.xz 10776 BLAKE2B bad28d0d4bdd8efb694216f51a38917cd9119653df38d8b95e6c6a1189d636d6ec0fc19c77a0bab3c8a92933b3e1adfa25b07f2b49e17e7fa28596994e8c52dd SHA512 04af1200e7b82d6ba9bf0614accef2c3288e77b9c62cd94fce4486120ac91b3cb83d72b7d30b680a9d7c6cdb835bf20e9922fea28d11adfde9acb2f52e5258a8
+EBUILD signon-kwallet-extension-20.12.3.ebuild 375 BLAKE2B b72243b6328828cf9777d5ea3af3dab651ed0f3cb8ed26b1416472f005faeb765dfc665f740518335f2e5b340132031226edaa9018622626803d5a193fb078ac SHA512 6bc5534301e8cf98a39753ccdb04fe4749f62c2596abcc39973857b48b6021c023891c83f46bad861f6f715e69bc8130eeaa7ae3e8fe1ea7c90e741603879707
+EBUILD signon-kwallet-extension-21.04.0.ebuild 378 BLAKE2B c3c6230f8f000c981947149d876ad47cc834d4c3f434e90b065ccc7aeee1cea2e85a7dce82ab4734e84ac4cb71bc0ed1be41725f77eb3498f395120a3c931635 SHA512 97e4ab04bf76fee617bea3cb75cadbbc2ae9192aed47881a3794fdd4dc389299501134e7650a060ebe8c7e149e805171e01fea18634a0726205db6dec5198fae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.12.3.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.12.3.ebuild
index 30d7d7cacf26..1f2f259edd86 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.12.3.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.12.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://accounts-sso.gitlab.io/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 DEPEND="
 	>=kde-frameworks/kwallet-${KFMIN}:5
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.08.3.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.04.0.ebuild
index 8428d44c657f..950f53cb38db 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.08.3.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.04.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
+KFMIN=5.80.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 ~x86"
 
 DEPEND="
 	>=kde-frameworks/kwallet-${KFMIN}:5
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 21516c3f3c1d..a288c7bb6060 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,6 @@
-DIST spectacle-20.08.3.tar.xz 1156220 BLAKE2B 3ebf54668fda63db6c1d938beedd287d7570749a6f9c6de89752d42abb7fe75687a6e3135a0fcd8f86b741a286518040627b2da0fc96ba029dfd1e1ede9a04ef SHA512 baae34ae4c7b3811e008ae8c1c2d6d6603fd39533279cc3ed79d4a38fa6cb3879ece30bc9ed1b1a5163691dcb2adea7e8cd3d655788f680feb94c38ad53610ac
+AUX spectacle-21.04.0-implicit-dep.patch 1179 BLAKE2B 62bd639d12a32b6faea613608160ada4854dc780b999e7b98204eea36b82f3e001097cb9c22d08056cd5765e43139daa9c02b7c74d79e745aac0d3021b5ce85b SHA512 d2257372821524a471ad75617df2f631a73f7b9a09e59adf1775d60fd0bcff393df16382a5fa9b109a7ffa8ca5684639ee565304a99b854272f8ab28570dbdaa
 DIST spectacle-20.12.3.tar.xz 1170540 BLAKE2B 865c4f7a2b8a3edf727f551c64ce35847a880023773b72531ea324addf5f0ac327261a87e35cdea6ec1f7eb4b75d2f8b86c3d1b7fc7719959623653ebe542a93 SHA512 4749916ff1557d89c3a8aeae06ce2da4e3f5bbbc3495a588209d797453b265447a857266889a81178f33b12631f6ec29be7a65a3f98f27de604c198e997795dc
-EBUILD spectacle-20.08.3.ebuild 1584 BLAKE2B 376e19a3c18b18179f6d3b20cea9c1826169aa6e81ff3739ba5cc25418cdec1990f2e85d68e5a0236dd03d1b2f813ee11e5edab097bc9a749e7778594a6cd87e SHA512 8eb0e28f8817101a1399d3e5e878a288a6b986bbe3b0e6939b2667f4fa8f17545cfed77814f1bba8b2e540b53243dd0ce78481a8160f575d851fb2d9867b9ab5
-EBUILD spectacle-20.12.3.ebuild 1978 BLAKE2B 362c37da9d8fc117e1fdcd73f8bdf3159a1473a1e6d4573db6b8faa96d26232c051f46ca9753217c259d028c71a7c1ee0935cff22ab5404298ab3b9d72a84fc6 SHA512 1fb00ab07fcc6bd531c7208efe0fc762aaa5865f494e61e13002bd634428a1e10a6c7f6ec5fb0cbef764a596a1f9fffe690b76813a67a29c0ec07ab07b447dc7
+DIST spectacle-21.04.0.tar.xz 1168056 BLAKE2B 02df7c3bcb3926028a78c1efdc22690ffff429e4b3fd6087127bbe7ce96211b192d88460a1336fe84591fda0f4995cc808e451fee1b36b207e3c4dafd2acbbd1 SHA512 40ccfe9f3f0373cfdb3a16fc215536520da4ce2a9bff8cf5e4924a24e6b5058a209a55261d77bb5d9d645245d139ffdb9f89dc2dd5d569f80be55fe4540caa62
+EBUILD spectacle-20.12.3.ebuild 1975 BLAKE2B 5933946b6efed08711611b9ce154bbd7c55d079f896cbc49fcbfb505b01a36aa5a71e30d76e1cf73b0ffded0ddd4bfae6522a2e72b6a3d3aa5492f10369088b2 SHA512 12f01c735fd0d47924f11cab6eef72c31895cce10e60314d8ddcd348cba7a9148b06fc5b2296e331896021e6b4030319197337fcce1bb6809fb8f572d21af38d
+EBUILD spectacle-21.04.0-r1.ebuild 2076 BLAKE2B 1e968153435344a7e183eaa43ec8a4342e6c09d0149cdc11d45cabb7849150d5169e127e5325c9c7aaaf5b77d4e6cc31d7bfbcb7e26bc77254a4d056e25e9e78 SHA512 e52e72286093fd75b0ce7376dbd01123c623fba0c1e36f8cf86ceb3deaa0ffd1717c6fcb3ae840b6d63eceba52b0f21df30784cf810fb4898e4bbca0df090485
 MISC metadata.xml 558 BLAKE2B 304071c16927d1f17fb0b30c3bc71ac9cf707a9cb06816957a8382b3eaac9083d3456b142bc3e0dc745588f14641e461c20b13840258997c85b84bbdaa5659e8 SHA512 0cc62fa4faa18491636dd37eea421cfc880e8997101420e15a876e070c6c14369063f6785d1f0474b3d79fc42860455fe4ffcb90db9f7a61e0492500d19aaa44
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
new file mode 100644
index 000000000000..572cc501aeb8
--- /dev/null
+++ b/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch
@@ -0,0 +1,42 @@
+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-20.12.3.ebuild b/kde-apps/spectacle/spectacle-20.12.3.ebuild
index 7fb30afe4ae4..79c370708c65 100644
--- a/kde-apps/spectacle/spectacle-20.12.3.ebuild
+++ b/kde-apps/spectacle/spectacle-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/spectacle"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+annotate kipi share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
diff --git a/kde-apps/spectacle/spectacle-20.08.3.ebuild b/kde-apps/spectacle/spectacle-21.04.0-r1.ebuild
index 02307a838eca..5e0fd6932847 100644
--- a/kde-apps/spectacle/spectacle-20.08.3.ebuild
+++ b/kde-apps/spectacle/spectacle-21.04.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Screenshot capture utility"
@@ -15,13 +15,16 @@ HOMEPAGE="https://apps.kde.org/en/spectacle"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="kipi share"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+annotate kipi share"
 
+# TODO: Qt5Svg leaking from media-libs/kimageannotator
 DEPEND="
 	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
@@ -43,6 +46,7 @@ DEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-cursor
 	x11-libs/xcb-util-image
+	annotate? ( >=media-libs/kimageannotator-0.4.1 )
 	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 "
@@ -50,8 +54,18 @@ RDEPEND="${DEPEND}
 	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-implicit-dep.patch" ) # bug 785403
+
+src_prepare() {
+	ecm_src_prepare
+	# Unnecessary with >=media-libs/kimageannotator-0.4.0
+	sed -e "/find_package\s*(\s*X11/d" -e "/find_package\s*(\s*kColorPicker/d" \
+		-i CMakeLists.txt || die
+}
+
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package annotate kImageAnnotator)
 		$(cmake_use_find_package kipi KF5Kipi)
 		$(cmake_use_find_package share KF5Purpose)
 	)
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index b9d9cf6637a3..4e40562859b2 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
-DIST step-20.08.3.tar.xz 952000 BLAKE2B f7d8aef7a59bd8b06816b2844ec963d1ee24389f43643b2ffabccb740dc8daa9715ba0a239861aecb27b07d4b3af9c5a1de7f8180347144a4f4f3cfdcc3c932a SHA512 d75d72afa0706676740bef46ef1df097f851e83db4886c8410e1a33835655108325bb79f61802d6733beb733af0a2ab6db9423888b01f5d779ab4402ae02730f
 DIST step-20.12.3.tar.xz 958852 BLAKE2B c233e726bc208e4aafb38dde481d7154781894d6112c3d3133f7a4cc8280cb2d21f474a0e9cedfea7683b4f4bb25f9dbafa115def4e6dc002418edf2c4833387 SHA512 d5971012711b3e8c0e9a85844babf26db983efdfee77dc112f419979d9f8fca9374c81fc8612511928b1bc4cd7b3a385ff821739fb6e80f77c60d37194bc78a2
-EBUILD step-20.08.3.ebuild 1569 BLAKE2B c5b4b308b3e4a4d4ae641f09577271975abec4a299185633f71688e55ad9f58acc4b2d57c6a8283e26b9cd45b63d40c9a45c8bd79927dcc177ca580188946421 SHA512 9f9482864636fcadd3f48f75d8b8e367ceb618ee6096a344b03c0ca9b9c02bbcf6d8809ebc655e26d6d6ac389d27bc8ea96dda746a170cffbc4f5ca6ac290491
-EBUILD step-20.12.3.ebuild 1441 BLAKE2B 02893cdec8c5f1a1488ddaed593cddf966657f5c1770a8d6eef776bd2e575ff325852728a636a5c50bb61d9d6de0b675a46ca340ba6508524ad7a324ed005d5d SHA512 e40308a47ff387f2bd79b1c1cd7a48293d3f53bcaf099d002d47d3c388e1e53b0204802929a0f7aeed0f8644cdbdd85611190ff67598e9fc8fadf06bd1b2546e
+DIST step-21.04.0.tar.xz 964072 BLAKE2B d616f11415112c47b168d7c87da0f00d105ae706dd18683041686754d2b804e43771e732af54d51a557ea5b1308b2bc0512037d153ca6ed004c8cd9c9ed9a8dd SHA512 df3d5ad7aa5ad6814bbc53be27ea64cf07b84474dea7b654b324ccf54a8e5e06f8a5a74999f7a24ede8a9181a65a892881c9a6714b20a83f0fd0c6c9d98f56ac
+EBUILD step-20.12.3.ebuild 1438 BLAKE2B 71218df8736b5e7726ba59b3d0263b09522e7327d35de764b49b06e9b151353f021506a49024f2384542c1c5b3c86c156923ac5034c8a745c7f31aa2beed959d SHA512 1386481ba4b61b16dca74c6a1044eedfd0007bdc688fc7433ea034bff1da43d0df3f9b7939155c60a1283de162a08871a132e28a5191e1fc3da2387848106e6e
+EBUILD step-21.04.0.ebuild 1441 BLAKE2B 94f4e75f13dbc195fc1cf5b4bb084f2eda7dd5de5e3adb5aad9a7582696d7c2cf64537f7ec15019093a211624deada4e0189ccfc10530aa1c563e4d7787e0604 SHA512 530e7b6bb4d3c4a988e42d9a358599fd7abfa1d9d1d4ef3a1cff1cccf3749cf491b17525513e9feca5634e03cb373fd1f3e7b8ae88a75f5850619fa56cfdbf3d
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-20.12.3.ebuild b/kde-apps/step/step-20.12.3.ebuild
index 8b25c2a9a762..8a902ddc14a8 100644
--- a/kde-apps/step/step-20.12.3.ebuild
+++ b/kde-apps/step/step-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/step https://edu.kde.org/step/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+gsl nls +qalculate"
 
 BDEPEND="
diff --git a/kde-apps/step/step-20.08.3.ebuild b/kde-apps/step/step-21.04.0.ebuild
index 95fae9a388a3..6bfa42a47700 100644
--- a/kde-apps/step/step-20.08.3.ebuild
+++ b/kde-apps/step/step-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+ECM_TEST="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Interactive physics simulator"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/step https://edu.kde.org/step/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+gsl nls +qalculate"
 
 BDEPEND="
@@ -47,13 +47,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	ecm_src_prepare
-
-	# FIXME: Drop duplicate upstream
-	cmake_run_in stepcore ecm_punt_bogus_dep Qt5 Test
-}
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package gsl GSL)
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index e4c236b7133d..1f8430b4791d 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
-DIST svgpart-20.08.3.tar.xz 21132 BLAKE2B 509be7c8e9a9086b5c9f1e88c4aa36d76e740692e06c3f8218800d1c6c00a56d4249cd7c86fa5fe02fe110cee3240c5ab48b90149c228850a2dd5fb751d19130 SHA512 2922411c3f1aa9ec9f84f7cf99b9d72d4e92456b139f9d5c363e18f04bca497acca03b258c89cad73bf51a513e239851ccd8ed1061621645fd125a209b275dfa
 DIST svgpart-20.12.3.tar.xz 23348 BLAKE2B 90603213def1786b0f75b5b987612f66c0bbdba70d931eb7b16b6fade1058e38e6df7118fb225041409751d769915c6be2ffd4089e60d040d2dcc1d6637f21c9 SHA512 4c7dfc802a4a24d376d18c749743f1e8e248dd26f7794dc482952a9fc969c7c547ddb5462ec5dfdba9229e1f56f4c0886417b3422819beb9ae911ab75d4a4558
-EBUILD svgpart-20.08.3.ebuild 576 BLAKE2B bf6b3872dcf2d3f2ae7958ccc94840bba16b37d45db460c6a4b12da0f7113af57c1769fcb5b641cfc462357f81c2371200b7192b7d96522a05f8a7311af8dcc2 SHA512 85ac07612212916d00aaa992a49c32471089503f6cccef818c07dd1561b594ace876e85c192f4af7d95edda9bf042c2358b069832a1fa34aac199b0b64675950
-EBUILD svgpart-20.12.3.ebuild 579 BLAKE2B 876219fc2ef314c71c4b9241b1829a5682ddab7c998c9dabd2bbb3d83735763ff47330b49bee76aad760f86a6978500797ebc6b355e5eb58084e93611fc4adcb SHA512 4dd5eea0647e6c263e587422a1a512f2989e5a73a4e383dbc1075b42a7030bbf7ba81bc80342fde3881ea1136dad95fa4df8f6475bc50d4b45d0a861c1de28e0
+DIST svgpart-21.04.0.tar.xz 23832 BLAKE2B ce1625ef5ce240b5166f97e19e6bd513de6cc240bd943c3927dc626638ba3de69933d7e6e97c6f46b8f8a877522df38c86cedddbea03a1b079ab289b6c47385b SHA512 baf46f38141fb4d55db5929cd4041f45c9b8c2319ae5a2152d6e71b5e9683e97f4966141445d4b1f0354b3435e3a2b052a7b8f7abd9f108520de72e181b2f07a
+EBUILD svgpart-20.12.3.ebuild 576 BLAKE2B 014c0e414a49ec0da999f78838d4b8450c2b043af0d54d625a8563f548c76ec851d12f065f32865df24e778a9b7e7ec3f0eccebd20f83a8beb6a976989d53939 SHA512 8ee555f716cb37c49368de3f1b5e95d4b5152dfd3374061ab3d10b61c82bccda15742a63893d5758a2c421ebdb642564109b12e72df8797fe10496795be5feb2
+EBUILD svgpart-21.04.0.ebuild 579 BLAKE2B ee651a3d8f9c100fce62ef48179d504bca435576561ccb96bf03d7ca140b4d5f36d27d8b3db4ce0fd47d3e68fe9319c16ba7de17ed8c00b62b1e83e8c2a0be5b SHA512 8089a946b496e6bd0b44a3aa94113fd5fe12aae6c7e294b750d8f9bf0a8c275ff6f19965647e1510d335d34a81b8828a28811cb9777aa25173bb1adb81b2c35d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-20.12.3.ebuild b/kde-apps/svgpart/svgpart-20.12.3.ebuild
index 97b08b45f19a..ce309b77c84c 100644
--- a/kde-apps/svgpart/svgpart-20.12.3.ebuild
+++ b/kde-apps/svgpart/svgpart-20.12.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Kpart for viewing SVGs"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/svgpart/svgpart-20.08.3.ebuild b/kde-apps/svgpart/svgpart-21.04.0.ebuild
index d1fe77c554af..e383e448ffbf 100644
--- a/kde-apps/svgpart/svgpart-20.08.3.ebuild
+++ b/kde-apps/svgpart/svgpart-21.04.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Kpart for viewing SVGs"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 60440567cc12..f1431f79610c 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
-DIST sweeper-20.08.3.tar.xz 371880 BLAKE2B aaf749224afd896156fef011c123e69dd8bb62b896807f5226c83810ecf5daf124cd44404d419abac78a9e331542464167096c1ddbcc2e3139307aef09a392b3 SHA512 fd4e1606c14c89efbacc549c3c54a835223602382d73e59321210ce93d652c2db85af61bae49b6ef013d3491338415b1d6a325fae2150b583f890f46c9d522aa
 DIST sweeper-20.12.3.tar.xz 372484 BLAKE2B 18ced322ef1864c2870bd0b15bddd8eade04edfd3d8bd1b8fee43acba2ea1d1c09969907258ecbd746b2a6b48fe04f3942c5c8b944574ee366eda5ca2448f5c6 SHA512 0bcdbb48f89d6ca0b5d034c85c8e05afc79299af39363a057b107208c06ebf71f9b9adfe498af028078dfa36c9dc3229fe95b2c123b698d9c0a3e9830d825148
-EBUILD sweeper-20.08.3.ebuild 1012 BLAKE2B 6427a0aa7a5d453c07f385df4f907f9a555a478f9ec0c15e1706842042cb38a649a0dbd78c360febd6e8fb63b73cc7647d1bb3820f70d685763878c2941ed4b6 SHA512 4ba6ac707c28a827b5c664edcc945328fb6d2f1ffb01edd290a5d970dbf14612c638d10c09b8daaa817e9e37fc1190ffb2da3e883661bd54fda3e357066b9cb1
-EBUILD sweeper-20.12.3.ebuild 1015 BLAKE2B 670b15448861de81457bae5c2976f56f096a8a3e96b1181a30fd0c6dedacb5712c296aad5b083aff2e58abaad0822e32d974f96ac4afc5884eecc28e6685ae32 SHA512 49fb8b1ae814d9ee1c37cfc5f5d9d7132e5b3fa729aae427a14fbdeecb857d4efcf2a01536d76a47a72bc01ec2b21ba062064ba306450ceabfd21b2420762108
+DIST sweeper-21.04.0.tar.xz 371912 BLAKE2B 02a13c5fcf64dc3d3e26c9a09434c2dde255c6b9ad39ae749b6a869a628190193ca473b47fed11fd030e53b659cc7621e2ad44f2d9ba353c423db80096a1eda5 SHA512 9429963bd28b588e77dcf25c2b3d49b9f5d34b2b89c12f62e0b9a4c68d94680ee634a1090d3b8683eaf752a1899767442f31c14df3fe881cd532cef6f03a0067
+EBUILD sweeper-20.12.3.ebuild 1012 BLAKE2B d8316e107ef2861f5ecae29835046da424cbb24ed344b49097c58bf04650705a2996b3bbe8d9323400f7d1a34a9d6fd04da566079ab16a56bb8bee25275e84f8 SHA512 d76f70ba82f696047c0dba0bbdd64a16ddf3b2bd332586959b741f8d35f9d9b2c8043cba412997b084b29a2dce716b65286630f5de608363143426570a5fea96
+EBUILD sweeper-21.04.0.ebuild 1015 BLAKE2B d56de643c2e983d6df70323128d02f1dab2e7aadd7fdb56264060915ad4b1056159d3202a97987c64314b51c395eaffed20855ef9639ac6fa151e13a6d143536 SHA512 235f81178d2b9dc8b9ac3b8d91ba3d81e3a44d51ca8385fad5b671142521b7cab59a71e3672fd742d3cf9c2fb6de29586b40ba3465a98cf0bf0de21c64d677ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-20.12.3.ebuild b/kde-apps/sweeper/sweeper-20.12.3.ebuild
index 50fc505c1333..2956022a25a4 100644
--- a/kde-apps/sweeper/sweeper-20.12.3.ebuild
+++ b/kde-apps/sweeper/sweeper-20.12.3.ebuild
@@ -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 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/sweeper/sweeper-20.08.3.ebuild b/kde-apps/sweeper/sweeper-21.04.0.ebuild
index 8771e6cf652b..03627c2bb951 100644
--- a/kde-apps/sweeper/sweeper-20.08.3.ebuild
+++ b/kde-apps/sweeper/sweeper-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Privacy settings widget to clean unwanted traces on the system"
@@ -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 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index e90a7ac65643..ea954ac376f5 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
-DIST kdegraphics-thumbnailers-20.08.3.tar.xz 46852 BLAKE2B acec96611a35406b315be9beb3f83f2a4c85ceefa9a88b514ca0a6b56aa05d5198f941b1072490de7f75d1165cfaf178c9bff5faa2b5fb09354a602537113384 SHA512 360e3196de408234d226e0c580f6f713087d876535bf238cf1c56554daca97e712ae65b131a25dff77f5b69845c5a06f2e69b8d7e4b227d30f222424b5704546
 DIST kdegraphics-thumbnailers-20.12.3.tar.xz 47048 BLAKE2B 3744e6f2db37ca480e2e63d9895f207c0a45219650e40f0c2748158b4ac39773f5c153163a2eb190cd818b5c77ca5f2a1414736be8b3704abdbe0efb3a1cf2dd SHA512 f6f31b3ff14f81a9b7d8e25ba7be4c6def72815cf113c0f6d78b5f9568f5fc31d707950d10ec314406bf92ab94284492277046d0d476a8a94542b76b6b0f927a
-EBUILD thumbnailers-20.08.3.ebuild 711 BLAKE2B 15a777fd87b3532dd76798eee908558594605483d86bc0e1120a8ab88a05731847a5b6e40b79ad8f63771ef1ed0235b0a7dfe465e180139351636d6fde782d22 SHA512 f5269f002942e13e5913bd7814f15eb9f8445ab149d1d1f065ac4ee458b9c2af7961d9101944b755824602982bb51cdecca823f9a784f5a38e9c9ed5dcec2408
-EBUILD thumbnailers-20.12.3.ebuild 714 BLAKE2B e4893a00d66bdcd2f86a0f48813eaa520949d700029752546921e9254c35be11e1ccb2c71f5f4dcd517dd5c927396aba278f4fd75b2d0d9a3f92dab1f62455cd SHA512 1bdd3fab015bc14e1d841352fed51328044749ecbf12ae49ac11c239e442f4c5c7425eb7a52a25a1ee75497393e0ca327592031338b4dbb6de27fdbf25f21a28
+DIST kdegraphics-thumbnailers-21.04.0.tar.xz 46964 BLAKE2B 214e6b3f68d6e7c1639fd744535fd1e06ff82479f32f58f72924f35b32e9213d638ea79268e7be4e3e18e4921bdf61109fed0cf4552e23cf5ea378b2f7478f40 SHA512 7eaab438a2e86e8b890203726f1f83ecc1f1a9b59ea759696a94983d9b977e4197d2f0db6ca31ea0e0d8bf653eb5d12fcdc9fc3f4f0393c82080a35005991823
+EBUILD thumbnailers-20.12.3.ebuild 711 BLAKE2B f68011ed58ab43ba8b82521ded210e5878b9271266a5e7da7617a6e35556be53e137e8641893d206cf036eb974eb88d11819722317454014754d5e1bf5b8e291 SHA512 0c097fe2180a249fe1c237ee7c0b410615eabe58340c2c8cff32957458ea6e5e15aa0caf19344ba86414eba38f7d3a7ac3115c6a05eb37f5d8c32375d358a04c
+EBUILD thumbnailers-21.04.0.ebuild 714 BLAKE2B f55cd05cb4d1561a37a27bda8668aa87f240716f0e7addcc2620185b5416e14b646dd5a7cf011e64052d7fd814c14c9f2cde1d24884517828fea19d6f4b9a302 SHA512 16b0bb9596d512af230de795b3a2df6418ea84cce0ab909983163e59b1054d010c7c1f7c606ecdf9bac5c13708dfb90226b7d36c7e38bb721e7037a03b17201b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-20.12.3.ebuild b/kde-apps/thumbnailers/thumbnailers-20.12.3.ebuild
index 1d25f04aef75..df35c84db8f7 100644
--- a/kde-apps/thumbnailers/thumbnailers-20.12.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-20.12.3.ebuild
@@ -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 x86"
 IUSE="raw"
 
 DEPEND="
diff --git a/kde-apps/thumbnailers/thumbnailers-20.08.3.ebuild b/kde-apps/thumbnailers/thumbnailers-21.04.0.ebuild
index a2d576324aed..f87257dabb2f 100644
--- a/kde-apps/thumbnailers/thumbnailers-20.08.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-21.04.0.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 KDE_ORG_NAME="kdegraphics-thumbnailers"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="raw"
 
 DEPEND="
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index fda5d83ecc3b..b99bd2fb6232 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,9 +1,8 @@
 AUX umbrello-20.08.3-gentoo-docbundledir.patch 1990 BLAKE2B c629fa51a4d701576e2c5bc870d8368851773687b93309a02986f2cd3140089c435a2964edafd1be930796906295bc8ef1477ba8c9837f560f986ed07ae19358 SHA512 9635b33d0aa612eebbbed37f82812b5f1ea8edcc6bfd0a8749e667cbc718d3ed56568397a6db43838a84f04085682dcd5c3a8a272b92bd9ee9a84de30a2f2d40
 AUX umbrello-20.08.3-no-qtwebkit.patch 3168 BLAKE2B f3908ac2755b70b611182b9b92bf8d08124d11bc0bc690d2c49bb40fd498ab9a0cdb55b0dbac54d0a355c322ac65ba611c48d4a11a27d498ede1f3f3f251ca43 SHA512 6437226d9d3970f6ac8e9b0a53546470e2235021a3e1d4d3339202ba1107259f26ef817760635f40a4cf3ff581f301f49a665c22ef1f070236885ef25bfb24a0
-AUX umbrello-20.08.3-unbundle-kdevelop-php.patch 2791 BLAKE2B 45720ff9807504dfe85c23bf3a5db57212d77e8f6dfec3fc3fe7c99cab656ddf27c40fcae6853ce43282bf499a0b0418c73028a86aa55186188123630a4b594e SHA512 504fc9bffd1b5ebeb9c65349027de25bf0f54fe9e85a4a145784464a4b463a1082f67e5561d156e9a96715330c5d8a414d8e20f3e6d3d1b52097a2ddf9705010
 AUX umbrello-20.08.3-unused-qtwebkit.patch 900 BLAKE2B 6457e81527e8fad652bc9d41f190806c5aae0ac047975d7ecd0309190ece1ac10980179362dd0703822786da1c809535d14a9ecc9f164caba0b1e9ed2ee721b4 SHA512 1194a66b427fdbd85e50d8c658c150b06253f89f6aded75a627db7c259621496b0021ee18d792b528a28e8ce2e2782b9bd06e4c49f721761a10fff853e81164f
-DIST umbrello-20.08.3.tar.xz 5555108 BLAKE2B c8ccc39d43f061d78889776e6adc6d1a07a67608b8cbfc8c18e8f94a3d1608b3764c15d496538bb76db2672cd6bdfa8158b30a24f38f3c40e8b18dfe72262155 SHA512 541d637cd892f5b162fa88e3380c9ed4c9c175d5479bb1947b415b8fa59a419fd90eac2e47d939ec3d9b7b43b14fbf6777683f884b7ff10e7dee85eccb59f813
 DIST umbrello-20.12.3.tar.xz 5555804 BLAKE2B a923d4f4d952dbbfc8166b2ca2bff990a4ad8652762277c3f16d4c37ffd26c1761a3480d45640c2821b0e85633158a90d82358afedc11fae98b2d5e58d0e7f57 SHA512 619d83ffd307be57fc8f3dc935dde6bdeffc60186ab675b8f2e530bb6a125ec1e03fccc49772c6d4cc120b3280e56f28344cba2627c3b955f9cd338cd071da6a
-EBUILD umbrello-20.08.3.ebuild 2045 BLAKE2B 17a42a5774c26b6dc11c52fb2abcc5586a6a375a56d65eaa5ff23b071cf84cb55763c8779c0b795c226ffd09d8ee5f494c1031087068f4918cc91c8a9580d3ba SHA512 c58721830bd401e991d61314f68b5b1241bae8b9d42cd368f649752f1b42efcbc8de925ce1e9af6ca9100940d6b3727e0bfaf7de86db6ed7a7ed89806fe3026e
-EBUILD umbrello-20.12.3.ebuild 1998 BLAKE2B f619c5e26cad3834aa662cf5a4a51044e6df469f75844e372975d51ec69646072a54c6a169d394084ef268f6ffeb86b2f05c1a47bf87e2dad9f7dd1f24e42569 SHA512 965b1b91eaf0226daa06a1a931cf97b16d0a3b529c957f6ff0ea46893303bbcf82ab7df8742e36c0595fbd546bec002e4ed14ee32c9b4b3cacde1d9eb8336f20
+DIST umbrello-21.04.0.tar.xz 5568700 BLAKE2B c68487e8e5db3da201003d923ac7f717f749110b22efe08d7e7476a7ddc79d1aadd8863a3ed7ee78dbd838d4e0afbfbe655925818fec72cfa4c9ba02f53d1b26 SHA512 b14a90afea1e33a4c5c3a3b8f9a9589a845afa278c8e3e165542be36ddb1ecd28abe4f678c753e34a85e92fba65d98f0f9be34b1976d1c52edfbfff87432e379
+EBUILD umbrello-20.12.3.ebuild 2045 BLAKE2B 00c1037f3d087c19a949650f090168e76310a24754df5de2ba964c4e584e2b142f444ea231dc5b903a51e863daeb4253e952a2d714f5ac0ad5c22b228426edec SHA512 10f23ef3b8fc5f4653b7d541e7f4510638de270df8c23e1af47ee903a2e5e6c9d00675ddba9476c006ef2fb4263e09da7f7df81e820badc39e36dae8c42cf725
+EBUILD umbrello-21.04.0.ebuild 1998 BLAKE2B e4f2bb6106b938096f71e84764f83140cf098437e5ec305401f73d5776e54a8da0d925606e51b5771bfed9ecf024529ae74d77cca643a60004e911526944d513 SHA512 d3a5603ea0be9c3b8eca90bbc117752553271f25818758844ee9346380b846686edcaf0860d9c4ca02a5715955a0e891bb7b954e3df9c9457d74fa16b27d5708
 MISC metadata.xml 390 BLAKE2B c631566eb3c7fa8c1826b91e33c209ac431b66508b21e457166e291d15cdd6c5ca45203f148f011926625fb1a1daea875b696c2b7088b5d568e7292c63e74ac1 SHA512 cfce84a2844d675cbfd3a9546b1f95bc2aec863f2bef680d8c6fa8ef2323614d7e678e3ab411ed33d0b072e3820d44ef1e343d3570c4ebb0fd8e492dd82e4813
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch b/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
deleted file mode 100644
index cce395a837ff..000000000000
--- a/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 57fef3b1d54959d5b719469c7c67e1d3e7be49dc Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-Date: Fri, 30 Oct 2020 08:32:41 +0100
-Subject: [PATCH] Add support to use external KDevPHP packaga
-
-If no external development package has been found fallback to embedded
-version.
-
-This commit adds an additional optional dependency for the KDevPHP package, which
-named e.g. on openSUSE 'kdevelop5-plugin-php-devel'.
-
-BUG:428460
-FIXED-IN:2.32.80 (KDE releases 20.11.80)
----
- CMakeLists.txt                    | 20 ++++++++++++++------
- umbrello/codeimport/phpimport.cpp | 19 +++++++++++--------
- 2 files changed, 25 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 221c04e31..398415f09 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -129,18 +129,26 @@ if(KDEVPGQT_FOUND AND KDEVPLATFORM_FOUND)
-     include_directories(
-         ${KDEVPGQT_INCLUDE_DIR}
-         ${KDEVPLATFORM_INCLUDE_DIR}
--        ${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}/parser
--        ${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}/parser
-     )
--    set(NO_INSTALL 1)
--    set(BUILD_PARSER_ONLY 1)
-     set(BUILD_PHP_IMPORT 1)
-     add_definitions(
--        -DKDEVPHPPARSER_EXPORT=
-         -DENABLE_PHP_IMPORT
-     )
-     add_subdirectory(lib/kdevplatform)
--    add_subdirectory(${KDEV_SOURCE_DIR})
-+    find_package(KDevPHP)
-+    if(NOT KDevPHP_FOUND)
-+        set(NO_INSTALL 1)
-+        set(BUILD_PARSER_ONLY 1)
-+        set(BUILD_PHP_IMPORT 1)
-+        add_definitions(
-+            -DKDEVPHPPARSER_EXPORT=
-+        )
-+        include_directories(
-+            ${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}
-+            ${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}
-+        )
-+        add_subdirectory(${KDEV_SOURCE_DIR})
-+    endif()
- else()
-     set(BUILD_PHP_IMPORT 0)
- endif()
-diff --git a/umbrello/codeimport/phpimport.cpp b/umbrello/codeimport/phpimport.cpp
-index f45f1416f..f714dcbad 100644
---- a/umbrello/codeimport/phpimport.cpp
-+++ b/umbrello/codeimport/phpimport.cpp
-@@ -39,18 +39,21 @@ QTextStream qout(stdout);
- QTextStream qerr(stderr);
- QTextStream qin(stdin);
- 
--#include "parsesession.h"
--#include "phplexer.h"
--#include "phpparser.h"
--#include "phpdebugvisitor.h"
--#include "phpast.h"
--#include "tokenstream.h"
--#include "phptokentext.h"
--
-+// kdevphp
-+#include <parser/parsesession.h>
-+#include <parser/phplexer.h>
-+#include <parser/phpparser.h>
-+#include <parser/phpdebugvisitor.h>
-+#include <parser/phpast.h>
-+#include <parser/tokenstream.h>
-+#include <parser/phptokentext.h>
-+
-+// kdevplatform
- #include <tests/autotestshell.h>
- #include <language/duchain/duchain.h>
- #include <language/duchain/problem.h>
- #include <language/codegen/coderepresentation.h>
-+#include <language/editor/documentrange.h>
- #include <tests/testcore.h>
- 
- namespace Php {
--- 
-GitLab
-
diff --git a/kde-apps/umbrello/umbrello-20.12.3.ebuild b/kde-apps/umbrello/umbrello-20.12.3.ebuild
index df705db6634e..358f8ac234aa 100644
--- a/kde-apps/umbrello/umbrello-20.12.3.ebuild
+++ b/kde-apps/umbrello/umbrello-20.12.3.ebuild
@@ -16,9 +16,11 @@ HOMEPAGE="https://apps.kde.org/en/umbrello https://umbrello.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="php"
 
+RESTRICT+=" test"
+
 RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -52,7 +54,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-20.08.3-no-qtwebkit.patch
+	"${FILESDIR}"/${PN}-20.08.3-no-qtwebkit.patch # TODO: fix tests, bug #774219
 	"${FILESDIR}"/${PN}-20.08.3-gentoo-docbundledir.patch # fix hardcoded path
 )
 
diff --git a/kde-apps/umbrello/umbrello-20.08.3.ebuild b/kde-apps/umbrello/umbrello-21.04.0.ebuild
index ac0fd86af5da..20c68b3b625a 100644
--- a/kde-apps/umbrello/umbrello-20.08.3.ebuild
+++ b/kde-apps/umbrello/umbrello-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_QTHELP="false" # TODO: figure out install error
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/umbrello https://umbrello.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="php"
 
 RDEPEND="
@@ -52,9 +52,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-{no,unused}-qtwebkit.patch
-	"${FILESDIR}"/${P}-gentoo-docbundledir.patch # downstream fix hardcoded path
-	"${FILESDIR}"/${P}-unbundle-kdevelop-php.patch
+	"${FILESDIR}"/${PN}-20.08.3-no-qtwebkit.patch
+	"${FILESDIR}"/${PN}-20.08.3-gentoo-docbundledir.patch # fix hardcoded path
 )
 
 src_configure() {
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index f2c460f501ff..4259ee88e8fe 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,5 +1,5 @@
-DIST yakuake-20.08.3.tar.xz 381328 BLAKE2B 645538055977d42c37cb18d03c4512b9b11b6a289dbdea4f635348fff05e991e600e775e43f7968bb3a516fadc0f75abb6d8c07475adab3e29dfdea7fbfb03c1 SHA512 54cab72921686165047bd5dc8cc3052be90a75b3afc4aa81846f44cb074dcfba248eac26638e21252681ed272810dd5822dce9e031dc736d19eeda25bba3fc7c
 DIST yakuake-20.12.3.tar.xz 382104 BLAKE2B 36d10ac7193b0be54d24d1bdcb751a8c6d09efe82408ffd2a2e6acc33df11858afce9f649a270fa22bac55f34761d9bcac7eaa94b1a5394e5a461e4aead9826e SHA512 d4cd8a58744b20c5183b8683fea38d4df319864d9ced6b8c1acd1a46f1a3beae38f157562966d43ed136d23083eeffd89949c92ec3813d93b187ae61689c4781
-EBUILD yakuake-20.08.3.ebuild 1545 BLAKE2B 8e86f89bb721f9f1ee43872c39e6f62ac22907e88f2b3a05d10dbf8b3b371385c4c8a1d2a52c51dceaed8954a695c9b3762c2b141905d35deda21ce3a7a72fe3 SHA512 f15eed237b50505c834e2bb97b71d436bfbbd2b9100c0178fbf9d7d793ed5b8058cb0530f337a66525d3c2786ca4720b58d0076c7ff3b6d39f8014542a8553e0
-EBUILD yakuake-20.12.3.ebuild 1548 BLAKE2B 9b5e7ade71a8e104a378a5db79c1d5feaf662681bdcb498c9af53c8efa5fed0a4e6f7773a4c3ace14f5c4405b616c4001f8df422a6f76a4f0126ba1b4843d4e0 SHA512 6945685b556fd03edbc9780e04ae20c6f071f2ac3668aa7857539ca257aa4d7e3d13e821a80d6f7953d66441bfc3de3e9a7700fc42bc8ad5a7611e69850d78d2
+DIST yakuake-21.04.0.tar.xz 391672 BLAKE2B 1c26f24561b0e1fd932588c831c0a58060d923ed08387d740cd610dcf9259cd31de58614175bf753399b61a9ac33d88ecc3e24bfea1617402bcd9e3354620716 SHA512 f0cf8b49a09b3c43f4852eadd71493129498763b6ebd4e883c4cfd3e956aa470de00b92b36949c42585587073c880b81c9c91766ce118e7be7721b712329eead
+EBUILD yakuake-20.12.3.ebuild 1545 BLAKE2B 46a1a918d92845380569d0c3b60a3da9d1c5a14be37a21805e6eee93720fa6905e7dbefb0862c5a077dc094661c32a632a647001395539f15a6a3151c6d8f95f SHA512 73d7be3f7e9faab194ff1e9f12cf3a0430a8b9c4155cd975681ed9630b2d5fa093848cc09eba57865cb5eec5625c719a5a153b4bf106e64d80de8ebe46b67793
+EBUILD yakuake-21.04.0.ebuild 1548 BLAKE2B 2c549b0ff29c98fdc9ebb18ada1eab5bb22c9288e36a7c31a1b974c8d0d56ef0578e20793edd0bc1b7986242c7cc3b1d3c367ae5202675492c9c54a5b68f2299 SHA512 ca521a9905ed62c0b83045b6d8f249726878bc1b14e0bdbdf10bc7ddf4587503abee3793d3076567540ab15d6051b413ce172da380a52fbfc22c5e949d5b1d6d
 MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-apps/yakuake/yakuake-20.12.3.ebuild b/kde-apps/yakuake/yakuake-20.12.3.ebuild
index cc5b15a0848e..a6c433a2295e 100644
--- a/kde-apps/yakuake/yakuake-20.12.3.ebuild
+++ b/kde-apps/yakuake/yakuake-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/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-20.08.3.ebuild b/kde-apps/yakuake/yakuake-21.04.0.ebuild
index 33829c4f9169..ec11f826539b 100644
--- a/kde-apps/yakuake/yakuake-20.08.3.ebuild
+++ b/kde-apps/yakuake/yakuake-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Quake-style terminal emulator based on konsole"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/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 18a45ddc450d..8eaf92e18eec 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
-DIST zeroconf-ioslave-20.08.3.tar.xz 43092 BLAKE2B 8380a03d90cce530102cf9e267d3f7fdc1da91c92aacaae7ddc398f231d26ca60672b095dfb3c8c77a7a15e98767e6eaa4026e284b22440003f2937e1d51e383 SHA512 842e2ef3875a62115883db39b3481f1fd4883ff958eef9bff7cb61395fab7d1bf05470898132ebe3cb4a8f17b85eb65b4c2bc8ea39d3a83414a3a456e25520d2
 DIST zeroconf-ioslave-20.12.3.tar.xz 43424 BLAKE2B 17f3af54ac1d8214ccfdda23455ff8b559b848250b11abd1f1edb8f2e367e3f4c1fce34cfcdfe7604f8061b0e41038de5b4cde6c8815ffc363cc6ea50432e653 SHA512 ea2588ec08910364811c6aa2c7169e13fca3d822f04277d99b662d3a55476002928138c64d803e9768ddf24e8d266934e457d510f3b1628b9c2e9383646a85d8
-EBUILD zeroconf-ioslave-20.08.3.ebuild 577 BLAKE2B 42da7693f3c31f9fa32a29f2c985752bf22940e22ea7ccfdcd0d29f79d8638c2ccb25863a30a24456ed3a603790a3fd796335414207ff59c23fdf13baf76dc17 SHA512 b8fa6925f367514564383fed3cf369e2c8ed0aaf75197d1599b0251d19c44e1867180af64cb7bdc1d47be8835acaa0343098b8a54e0412f72d77eda312e44af8
-EBUILD zeroconf-ioslave-20.12.3.ebuild 580 BLAKE2B f091eb6a51b20ba0d8555c54b10a62c79cdf647f3a327029741d621417ab5dda6b22a2c7290f4deb7c8cd123fb82a0c798ba9b457c5c2e03c2c847e41bd40283 SHA512 6858f37179a5e74bc275b5f9be4a68346e36984dd5a51b1d276b269818367c161b1b0a3a25cf2acc71a017a3f46d25fe52216290a345aab0a0126429fa710cee
+DIST zeroconf-ioslave-21.04.0.tar.xz 43320 BLAKE2B 8d397cd6295412082465aa609477d59f87f9b5ab38b1ea2a669e4f4aa15ac0d508874a9eaa3c28459a34f07f897e8ae7543131284c0b57633739c5cc98451e04 SHA512 c4474b0692f3b9d364c524535a5ca84dadeefe5fe9a656c94974b405b6bdea3d2a693f36ed046e63e5534357a62c0e00cb56cbf6f499e2c8706ca35dc818d0b7
+EBUILD zeroconf-ioslave-20.12.3.ebuild 577 BLAKE2B 6bf3c4e38d92f05b4c90fd8eea2f2256430eb743f371ef01f13c975594303a240d07b7c5ccfc2d9378338432caac4baadb63e000a88511184b760d2fb4f5293b SHA512 d7594deef186ff0933107bdbbbcbcbf18c78de1dfd315566212c3b046cd491a3a4a7d6fdacda86307796c7b2ea5169e35ab6621b7e209aad2bb99626a52b0258
+EBUILD zeroconf-ioslave-21.04.0.ebuild 580 BLAKE2B 47f5c047484d6926fa47e5d5c782044493c91a84b16bde3adf581f792284bb43086e445a10d7f532ab6fc7bae98b00537d040b53a381e5b1d17d0f1bbf5bdf60 SHA512 1e7564405286265e470d7298182a8c6e54591584ae5115d57edfee1838edeb3c576ca37de0eac1e26c1f9f2a1f71ee5d0da3883afd581cced3454dd64cd68f90
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.12.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.12.3.ebuild
index 7a23291b650b..7128648fd9a0 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.12.3.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.12.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-20.08.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.04.0.ebuild
index bf5558f4aef6..d1a692a5b1cb 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.08.3.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.04.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /kde-apps
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)