gentoo resync : 03.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
commit: d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree: cf61513204d97974179580065e85df5c8009087c /kde-apps
parent: 463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
167 files changed, 125 insertions, 3256 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 6b606610f422..842a01ef7815 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 0bf6da0043ca..9af5ba9cee77 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-calendar-20.08.3.tar.xz 344600 BLAKE2B 0f478e41b7b43119c6c1fc4abcc7bab2d7c7e48ccdf83d97471cb34f6364beb606dcf09e61e838c8601b7d0834bd4115c2273db11a3cf319b03dcf7aebf9581e SHA512 f9b48dd1f8820ddb4a3c1259b20eeb814ffd0f0209407cc0412c21491b42f4744b7fd09e9a0e56249f5e8cd9c8d29a0265ccf46607a6617a1b605b2e20f15c02
 DIST akonadi-calendar-20.12.2.tar.xz 342764 BLAKE2B 0c71a7a2f5949eff8ccd0c93d31f4c332d04015b507477f6d03d06ac930622ac9704794a18ae7fc263eeaee3c6e3550f7d4bedc62be90e275c11b412adef9263 SHA512 80d7d9e77d176c157e885d1229fee07def248728679d5fea90124518aefd6f998cde4a2a22a0b5087c49547ba4fda3811b1a6980a920c47d13bc9039a17e02ae
-EBUILD akonadi-calendar-20.08.3.ebuild 1192 BLAKE2B 51c70a372cf4ef0f694bcd05d49cf7387cb5163d731da32c566a6f15b6fa4f1ba76dc7e78219b86c8ec1a125f5bbfdf0318fac5b534569952a978c663db7ac9d SHA512 493cc3f46fd14432b22db1a50f7f14dd3a8c2b2c2c779e3972726c170e50974e868d213adbf1f200af6525f693e0c68a32638b61a9f00aaa3c00a7f4b1fcc305
-EBUILD akonadi-calendar-20.12.2.ebuild 1195 BLAKE2B 5cb81619de057bea4db1bcd2a19e8e8d8c75e921115c027fc85b3faf2b0b9e2e1f3b6345f27270041bf13e4e1366c946cff664cdc6289d968eef2a13fa957dab SHA512 81d8027d3a8afa9d6e9d73808254472826a0e5e529730327cc10fb8d6c54e60605038585bc2e5349d91daaa0533c7db6265d046cae2b06a89b302d2a0151c0f4
+EBUILD akonadi-calendar-20.12.2.ebuild 1192 BLAKE2B 0c2d06768ec8b1bdd6064497e207dbde6e764beb953522e0813572d35c1e310daef1aea48e3551c977e4f10ed2de434a26ddd060de6046a8daa946a8b67b9a84 SHA512 10690eb300a6a1eabd165043fc982efa2a017bcff1a36d16471a21b822533771e0d91d355d55ce3ae93c88a26d563f3b292a12bfa852ac6eb6cc37077e5ace8f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-20.08.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-20.08.3.ebuild
deleted file mode 100644
index 2b6af811dee1..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-20.08.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi calendar integration"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild
index c0cb12f6b932..909df4b925d1 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.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-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 57c1ba76f997..db1051e1f455 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-contacts-20.08.3.tar.xz 409772 BLAKE2B c974d8b48c12bce036f833089f8a59eb523b65d3cd8e9649bb573eaaa7fb5cfd8fa56a7842dafd67bc816ab298c942721c4cc1ef0c5c4ed12d8a2fc40ba62f94 SHA512 1b6d10a4cce9b84092673f5779cbd1db71beef86887ef6c809174445fbc13d7a0b6d8417eb54e3cbd10504ed12155d53e148a7667569b9458e900eebd16ce943
 DIST akonadi-contacts-20.12.2.tar.xz 414208 BLAKE2B d0cdd880e6a05422afed82d7ec0d69424928c9bc9a2d7ff1565fb89163d5f4842388cfc8a6805bd052a0aa06f2fd895f34103809f9e4c7072bc0c569594a14fe SHA512 9e6bb8162619a484fffe822d448ab3aae5199c5deacb2ce10ccfdafb025b19e1f1a3aa0241f013c261205f6e7c9b7501c755589d69b082d3bc00d5d6fb58ccb9
-EBUILD akonadi-contacts-20.08.3.ebuild 1151 BLAKE2B 7b7ecca96580251ccce65fde58ba4fab0dfc140db1c58eaead4e86248682ffc8846bbefa2dff04fecd82d5d256b69124616ed9a69d2239cd01a35538814274e3 SHA512 ff71fa0ee4282118ae9ca1eec990eb2799afbcfdfffde3a6525f7c206add709f7117555313012910c098f214a0976ba4fae831978b9d9a83c63f31726041357b
-EBUILD akonadi-contacts-20.12.2.ebuild 1251 BLAKE2B b0d5171e5b40169dd3592789670bd90b2e4f4e20ef3994c950e2a3d969782e7e311a3ae9389a1b18d3326b02c73604eb2fc96a2fb9164d8c0527d6905fec499e SHA512 8bffc7cc07b25e72116d74e5ba163ea2a684e8851d183e44341e2fd9c92df322ab2b387eac524e6cfc50a433dcd0529419a4296de12b8386c48c9676b7e99ead
+EBUILD akonadi-contacts-20.12.2.ebuild 1248 BLAKE2B c754ac64599dbc6aa85c11a7ea6f71b1c47f2e1b6a1a98f67c4d50d1f361ea72ad63addcdde009d48319f82f374ef1dbeec3cdee228ce65098068ebce8fbeb21 SHA512 e785fe326869bcee0a69f8c1754f7d954cbe2a2d0553845e9da275cba4132a10926fc0625be3549c432ea7dfa21e8047cb468b29f030745fd86d58bfc7dfb6e7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-20.08.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-20.08.3.ebuild
deleted file mode 100644
index cbb86208bfea..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-20.08.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi contact integration"
-
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild
index b546743d414b..f42c78dd86cf 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.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-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 0d3e7a76316e..96d9ee1ca2f1 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-import-wizard-20.08.3.tar.xz 506104 BLAKE2B d11db50eaae05cbf1fd7e6322d3e56ef9c8b6738107134e6db6417f1d155e4d36d623af50569126a7fe43cced56e8001e2bc8b7fce2a743d52ee30567ea59be5 SHA512 d0319d42b9ed4eef654c1bd2728c17919f3b04c806b12ed01c872ade5094309f0fb2dfd01462e1ec860515f8a989470549da8aae2e933251e69951f067b12da5
 DIST akonadi-import-wizard-20.12.2.tar.xz 506672 BLAKE2B fcb9c46b509787d68296e96ad55e960c994ce4bcc87e7d541a8ead254378433efde46339565e01894949ddeb69378078e469e21833a49b8406fc9a64fabd0d2f SHA512 459014c383e62566b85535468ea0ac2970315248b98cf2aa7b5581e01a799ad35aa0fb5488e66e71ca3e6a1d94eb3dc1421e9ff638d2b87e8ec7dc3b6461906b
-EBUILD akonadi-import-wizard-20.08.3.ebuild 1195 BLAKE2B 6ed3f7f96750d50c5256d9334e3ae3cd9970218ac9fa4d97afa981bbb12ae872947abaa724d33d8a86f994ff369547b37d1fab89fb41f80d2b47e8ac87f70ed7 SHA512 9093d4880d8927c9600cb66c89b84876f4a4369e5a4c7cdda5aa26e29032398925fe57eeaea4dbbf7a78edc70671da36a6296c803fd74faa183599a95751efdc
-EBUILD akonadi-import-wizard-20.12.2.ebuild 1235 BLAKE2B bbbfc9a86b3d1eb40b986b3a091f3723613f7733c726ef1667597810b3da98d472aa451b1ad6d826d6fdcec8c9572b0d4ce8a74b4a657256da913f76e66e25d4 SHA512 d798904dcca4bdb81d18f443314dfc6859a69bdc75708c0ea872e1f09b5f6f5a8988e6ab13404693545b4373cd95dbe5fc9a9b5d06d65e6629efdaa042307f83
+EBUILD akonadi-import-wizard-20.12.2.ebuild 1232 BLAKE2B c590de3398d4c23cf84d5194643d0952f53e11079c47056bb065c02616455047f0a565774e12635ea86e2d2023762dbbf6af329dc4c4d0a790438938675e8352 SHA512 0a450c695316c029bd27f4d50e306bcb17a41d79e8cb754fea8c136fe7c0b281879580ba58aa866f9ea6177f18ae00e4c0c54e3916d948f6e3b035c4f3ae6bff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.3.ebuild
deleted file mode 100644
index a045325c928c..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild
index 9b0d68e29440..2a87744f374d 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index c07875721f1c..58063db0d6ff 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-mime-20.08.3.tar.xz 137936 BLAKE2B ceb9e46da5ba1cf62f3d47c54bf60ed0ab25d20a4006dc6b9f667f1b7f449cd216508de4a76a04784f686383f70447467144e990a564e10c3af214ac9a348ad0 SHA512 d5f996f5e8e1e1c148d7b78e48d88d622e190881cc522fbd3cb0bb683888ba037ac9f84d5ba964eec356ff1c201b88e5339351d489a8647d8cab5fef22a882a1
 DIST akonadi-mime-20.12.2.tar.xz 135892 BLAKE2B 29ee94c335728ffd815ddf75a4b9839707654a4894647e097398b7c148cb211e2a19ca951bfd4c249798e248c5b97bb256bd02615c10a7a6c266f551929783e5 SHA512 7d4aadacdeb2c9627bea5494ca3d986365af1aea3cb87482e7d671edb4aa3055a6069709bb57bdf8cd3a4e291160af548044ec42f2e3c3aa2dcacfc0ae018aaf
-EBUILD akonadi-mime-20.08.3.ebuild 884 BLAKE2B a439ad340e4e8dfb5ec21df9e002da557ae945789262bfa9726b432cb61dec05fb29f59687528c09fac7968df06466521ec9046515ceaa9fec97810296c2186b SHA512 b3ade6b7820069923beb2fedac8ba471aa71786997f66a42674fbcd6172bb73147f9981ff0d53c6ac161a2401347b0c532b17cbcea6a3380b209c4863493cc0c
-EBUILD akonadi-mime-20.12.2.ebuild 887 BLAKE2B 14725e23fc997b0cc8f504d3f489d04c27f579d291180dbe8c0554355a7a6c39722b5d57a6debc3d61e28032bbccebb03c57dc16ddecb68b548f92614b995b62 SHA512 3f489f46bb98933b184c88185e5d612a93a2d6ef11f8b55abcfbcab47ea93309e975a6e74112fb08e5bcd241fa8c946e42d5e5e288f4148239ee422ceda00d60
+EBUILD akonadi-mime-20.12.2.ebuild 884 BLAKE2B e3624d8fc1fc10c5caa2ca4a34beac1e15487ec1af17edca91222068dd47576c08e99221e6b14c51b7a823e2d1d06e2060510683917d6a862d5ffdb1bb0ec88e SHA512 441ac88e6424ba6f40043b6b00f5bec28e5d06b2f9aa043e55aaec8855d3786b607d5715503f5e20640d1b2301f308e9ada2f8659b8926d7ad239454a693faf6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-20.08.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-20.08.3.ebuild
deleted file mode 100644
index 2a6c242d5996..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-20.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi mime types"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild b/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild
index 610e0e0a9e08..ad9c82303281 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-20.12.2.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-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index ad0ec8b8412e..a895ab2120b3 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-notes-20.08.3.tar.xz 22784 BLAKE2B eb88c528218d2853f8182f37fbb0f93bd34b78a76a5cbb03f35983fb79eb1361c1bb8836c8bb65fc106530d49b5e7e48cc3e7633b1b881b741561d0c8f49f618 SHA512 7b38bfa0854da839b40c455a87bba59574af5ebb69019ce4f58aeb2811df5b652e34aaebd942d8a9f5519e8d93faaa713a2dc8298abffcf4b7af41cca1416cf6
 DIST akonadi-notes-20.12.2.tar.xz 22916 BLAKE2B 54928a4adf67d4e6afb6692067e177f634142bae2fa0041663c6154bef5bcd2ed051bcf0a1a597d27d9d4685ca18627f001401e7f7b70eec802e64468fd896ef SHA512 30e4fc0753abee49f69c5c0727b123ff8bf2e8e8c127043895e6f3a221f0cf1e6bf5ca89ed87687d83184e082c8cf7fad7f490f1bc5678317cac8c18d2e83b49
-EBUILD akonadi-notes-20.08.3.ebuild 468 BLAKE2B 84ff4d478cc5a373fb576e38fa2f86b13b588c6faeb0f7db6ad1bd487bbb28d9d21c9fae81646513d4bdc33e73c1f71a612a87520b1565ef711b7b3447eb66f1 SHA512 5a5cf8b1765c285f4573dbd4f5889f5546a7ce337e1deb15c3195b22c9c9848fb5ba5ca01b632c9c226044bb4fc87cceb099c4146fdcfe75fdc684d596d999d8
-EBUILD akonadi-notes-20.12.2.ebuild 471 BLAKE2B 5a33310167beb681572e361cbdf414ad9ede458c91c9a793c4e41b0f7aca7ebf3e8ec6cc645079f9fb8ffe6b2af348977cc4531601fae629cda260568756a5fd SHA512 cadaf6901f0142c96c4c1802f09508b6c8a50199643a2cd6811a9f472cfaf24a60f6eda23c52b52c7c61df385584642bb26109df83e7d3a344fb8fc6326a461d
+EBUILD akonadi-notes-20.12.2.ebuild 468 BLAKE2B 111837329a0247ea9dc34b70577b1d3386ae6eb72cc44a0a4b159ee729f39f837eabe95b3face9488eb0f7bd4fb87af5ff3e0132b35420d8ce1eabb0344b62cd SHA512 2b6e7fa79282cd1d5e40831eb2d12cf3bbc0f726d3521f045c7c277eaeb2cf0f2c42bc8bca1100925413a6939c24d56fe5c9a083bf339924f0caaf5f8e37588f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-20.08.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-20.08.3.ebuild
deleted file mode 100644
index 16e6cb72422c..000000000000
--- a/kde-apps/akonadi-notes/akonadi-notes-20.08.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi notes integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild b/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild
index 0b141def05b6..bc1ec9fcad70 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-20.12.2.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-search/Manifest b/kde-apps/akonadi-search/Manifest
index 22432844a88b..0bdae30ecec6 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-search-20.08.3.tar.xz 94772 BLAKE2B a1ab156b0306dc543eff92711a7c3e3d94fde423a16fead67559b4b01b937178e549421d41dd486e3f68e4743c13a3667d7f432b656d990f02cac6edb0968a1c SHA512 db6246e428bfbe77239089e1bc4036b99dd8c070a70a995c698785ab202e5f975e30a7e0f36ac3fa41c859b928821f626f545c2be21479ffe5809e83068dbee8
 DIST akonadi-search-20.12.2.tar.xz 93988 BLAKE2B 42b62605b4dbe27dae073761ccb78e6063b65fc9ad934aa77065baa380e4dba38b38062f30ac800ec9546697d1b10b275f1bc0ca21426ebe16f5d8e399560720 SHA512 cbb9bb579b0545198ebc145d41ca3ffdc84a5cdab00941ef133c5d2fba2e720eefdb4ea52edfa065bcd2baffe5a612c15058fd5d7a2106c8728ad4ff6e531de0
-EBUILD akonadi-search-20.08.3.ebuild 1301 BLAKE2B 00c6815e3aac88e7483b8a0ebb485207a1e048ee35b0a6999327f0a1f631b7746fa85d92aa6523b6f88d5a957ed244f327640c4fdac65a46ba366d4e39ad5ac2 SHA512 ad76831ebbd2eaac684fb83f353a6223c2447c396dd514b69e8447c47ae93f389a62f9946fbdde54e5c9a1aacfa74662e9bfaa857e1dac67b66da66a3fd37a76
-EBUILD akonadi-search-20.12.2-r1.ebuild 1304 BLAKE2B 62f40c6accd6e1743935f8657adf7d3c7e12fbef17b7cce360c4aa979b00bbf28555cc19352ca24327f355be795effdc262cd47ceff1d4f0b8bb1bc869417965 SHA512 de7cd43541b59a7f7233c521ea718e3ec58d86f8e6d3f9e2371ec61d4e47dba7682469a513ca6c1251ba8407e9885bb18ee4927c9116fdbb5c22797419badf3a
+EBUILD akonadi-search-20.12.2-r1.ebuild 1301 BLAKE2B 85e1806f1e1d7f12404d315de50a0c74a4deb716c4d6aec4ce917fe902014a7506d5c35b8c942fb2a4122815b945194eace519bf40339d5a081802c9ec428c90 SHA512 e63b03fc6aceb77ff80c556bf01ba6d6d59248a68580c2c28225148ab5ad10d539746056a36f17892eb18871a53ba09d0d225ade082f3c81f68b1d2c87569f5c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-20.08.3.ebuild b/kde-apps/akonadi-search/akonadi-search-20.08.3.ebuild
deleted file mode 100644
index 10513b4e2695..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-20.08.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://invent.kde.org/pim/akonadi-search"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RESTRICT+=" test" # perpetually broken, bug 662378
-
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-RDEPEND="
-	>=dev-libs/xapian-1.3:=[chert(+)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	test? ( =kde-apps/akonadi-${PVCUT}*:5[mysql,postgres,sqlite] )
-"
diff --git a/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild b/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild
index e8429904b4bf..55be7024c781 100644
--- a/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.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/Manifest b/kde-apps/akonadi/Manifest
index 55495b05ece2..f76fc4c88fa4 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,7 +1,5 @@
 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.08.3.tar.xz 1591360 BLAKE2B e237fc3307ae3cd785e29da9c2177832f1cff523ab3dc46279813c9ae152ac3a030649e6b73e8d566332f478992d6441457301355c2f6abd180c4db8c8d48011 SHA512 2d278a6189732e7c68a89321356915413771f1b4b1e3fb5a491b02f0000095163cce61278cc4f7f8b17759c1d71b3e3c08dbed0c89f3fe26be21da14adbbf720
 DIST akonadi-20.12.2.tar.xz 1593452 BLAKE2B e3d058a43685a8b8bf92ffbb169f1c17b8e831712567a4ef8eba6ef1eee6321ae45f82a72a4c44a71835b65c18075497d26c8802b7a2f0a10c9baa21efefa65e SHA512 2c21db5d6ab6b8d9cedabad2f726fd518ba8219db3cb6f8f72820edc71ed72efa31efcb2c4cd8ff36e52e4c0a38a97dd890789bf6816ab524f0568892254523c
-EBUILD akonadi-20.08.3.ebuild 3694 BLAKE2B 5c829b9c1ed6ffe603d7eb24b6d5b24affde82fb174c053e238ec79d57400fee1ce27c027ea6e02ff873215598de6bd62c18496f8b39e141510dd9ace430fd63 SHA512 c8903c0eff409708558e65eafd22a7348c95ecdd06e190ffe6fbedd48a22fc1ee7fc2a10894bf42d70e3066732b374d90ccdbf412e974612622c1f1bda943866
-EBUILD akonadi-20.12.2-r1.ebuild 3754 BLAKE2B 5dfdb255d2e419ce749cd0376c60789d3b21f50392bbb76f1892ca3ec7ded8126a8e88ad3fe13ff71e263d14eb15956c728379386c80452c100796850487aeaa SHA512 156e410a4bd58a4175bcada4232d25db5130f74d80bf130c01958b8f689f8f3f8307d61464cb0d5187713bc09cd9fafda722e198e253c82bce563106c2d415eb
+EBUILD akonadi-20.12.2-r1.ebuild 3751 BLAKE2B 969d2aad7e56fa8fee1fd4964789657a63f606e705f97f26d599110762b789f65c074f0e30d8900e47d5bbaa25c82dbaf68b4313f5489c3567fee4e752dc982b SHA512 4d497021179b8b05d9733502f24be27a05c9aca4ec7e4d91e4abe209901c36feb6690fc8fe7ff5128e43d3e575a36dc90f0f7c518bb9d7236da53676924534f5
 MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e
diff --git a/kde-apps/akonadi/akonadi-20.08.3.ebuild b/kde-apps/akonadi/akonadi-20.08.3.ebuild
deleted file mode 100644
index cd1506e09ba6..000000000000
--- a/kde-apps/akonadi/akonadi-20.08.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+kaccounts +mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	kaccounts? (
-		>=kde-apps/kaccounts-integration-${PVCUT}:5
-		net-libs/accounts-qt
-	)
-	sqlite? (
-		dev-db/sqlite:3
-		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
-	)
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	# reverse driver check to keep the order
-	use sqlite && DRIVER="QSQLITE3"
-	use postgres && DRIVER="QPSQL"
-	use mysql && DRIVER="QMYSQL"
-
-	if use mysql && has_version ">=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\""
-		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
-	fi
-
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
-		ewarn "or PostgreSQL in your user configuration."
-		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
-	fi
-
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake_use_find_package xml LibXml2)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	ecm_src_install
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are:"
-	use mysql && elog "  QMYSQL"
-	use postgres && elog "  QPSQL"
-	use sqlite && elog "  QSQLITE3"
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-}
diff --git a/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild b/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild
index 3c234d906ee2..c0e9eb4ea8cc 100644
--- a/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild
@@ -16,7 +16,7 @@ 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 )"
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 7adac3cc3ba3..41cb4652d6bf 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,3 @@
-DIST akonadiconsole-20.08.3.tar.xz 195032 BLAKE2B 589266d05e295ab80c891937faa204fad3ab56d4f6cbffcb2a435b93fed407be03c95cbf8c8a9ef2e74f2fecae16b41b74555cf878aa051515ddbbacf2497932 SHA512 2770bd9a89f3e64d82d689301392285ccbd580edadceebb83ba5c456fd9fc1a8149cadea3b6eb14ba9a8d7e68c1c4308957df21111d721304dc6268fece3dfd9
 DIST akonadiconsole-20.12.2.tar.xz 198012 BLAKE2B 1cbbb43d7d20d45a5afe112345b1a4a17b1492fd128e885c61925d9ef7a34a3347f3440ab577b6d81309c378ad6ddef9e56d8b2beb51a68ad4c412bed99a8fff SHA512 f4b33bd2b8add0e09beb5443d6360d2bfd226249950233d8dd44e1e408e199e3d3e625e2b6a1e0d4b6c756371c2b1ee5e486394ca4b2bc47e48e476e0711a6e4
-EBUILD akonadiconsole-20.08.3.ebuild 1481 BLAKE2B 2c1faa25a97340dea357d9ab0947949b6a60149ed6e28820f69b0bc5ecda89b8d167a7fbafeecb1c50530053cad418ad71c2d1b1b464eb2141d64698dfb541fa SHA512 8d9974818635e94445b29a340d729c05a11dcf083058c2e7678dd86d476211314e99a6fd7c1a1f23507ab0ae5a673ffbf46dbcd6cfd1d674b6722fe2e411c620
-EBUILD akonadiconsole-20.12.2.ebuild 1484 BLAKE2B 257fc6791a2ad5f6a1e0314b3aeeb6c48874fa2248f1674a37bffeea90bf8916b65aa84a83eb505feaed1fb664e592b6194e1ce17c7adbaa46bec7df05306c88 SHA512 ee1d198eaf88909541fd249a6d29c8035143d38ec0e7ece0a92fc3766783d4b0849d3614ddd743e53c408acbbe5ca833b1a3cef64d626502f357ed5199bcfce6
+EBUILD akonadiconsole-20.12.2.ebuild 1481 BLAKE2B 70365c62cba2bd3bf2b3c6c6a0d18af426004bdef57962acdc727fe38152865792b89386ae2e15df95d8126ff91353bb672d74f3a4be47a9a35b86a63216fdaa SHA512 b87cf2d33cdcaf8634f7ee0c808657d9f39f246e95947750aadc8286a1e021e2269df0f7c7649cfaef32e056f5b9c53380e7cbd68c4906c29bd72b2cc4c80390
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-20.08.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-20.08.3.ebuild
deleted file mode 100644
index cb5a1ac88cad..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-20.08.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
-
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/xapian:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild b/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild
index b06d71b02a82..402f00b62a0d 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-20.12.2.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/akregator/Manifest b/kde-apps/akregator/Manifest
index 61b8ddfb8118..9d00bdb31663 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,3 @@
-DIST akregator-20.08.3.tar.xz 2204024 BLAKE2B efe9b4acf8140eb018ce0b414f3829da2e4622348a54d43dc6707dd2a140eeec5bddcea1f33a04b8e3a96b312363d041b49d653597ff0985e9a8e2a1a8c89a02 SHA512 6df49879061e7163ab7c433929cfcb1ebbf2f8a974b7df9247c5576dd0e7aae4b8288daad2e65b0f302e0d208ef01de4dff838264b812f5f6d584051e3ca5c11
 DIST akregator-20.12.2.tar.xz 2205104 BLAKE2B 56a05146aca50a419a659c93bbd9b8c5903e2465f80cd5125a01be14f53a67d1d9da6e7e7b2a97550ec86d28e85431f8f56392475d7c3f371b9c86754246ed17 SHA512 b8fef0b5f4a825d8854373810f173dc0c3d9e95007f6e96647d8b537801910f572d7b8593801137b078cbd754447e70af08c1ff3c2863e733be10dcfbc4c0913
-EBUILD akregator-20.08.3.ebuild 1727 BLAKE2B e47c5ec2ad89cc7c6a85deb97fd842e529e6177c571d50ebc046cb9fd40f2cbdcad79b6f90570e0a60ba00d9fde5b7204e98287b3ed6aa815ef20fb09bef9386 SHA512 f57ce80a77b9c8e81494bd11f993ec81b56653ed78ad24d1529dd52c32ac7a96c9aaf3948e8d01048c73535271446d7f2ea2c2b573a5d0e87b80b2c5e7892fb0
-EBUILD akregator-20.12.2.ebuild 1730 BLAKE2B f55e06fe6861a10c9a85105c098c831f2866c0fc0c1fdbe03ebc88a1529ed98e535ad531bf9f061a88755fab8ccf334dcef49d8022d20a0e52cd58ba9081e9d5 SHA512 73cdf61fe918fa243cfe2d791784b0f011a7586f9b950a0538b358355d9fa20c1717e0abe80fc1e210c5a718c43191165c2ad86770d8ad21bddfe250fa69b50f
+EBUILD akregator-20.12.2.ebuild 1727 BLAKE2B 56737a4663211a79cf102f67774c62c16444bd95fc1ed33f9ba9c803fe3e11b27239b4f96e5ff98d9799dc62e681c1197e2b97b1b23a49009ed918bf2d128310 SHA512 2c4fab22348188ae0947d2b48e52560f72563e9e4b78e8df4b2f12b44a99323470b96b87d92354f6b588b89e96270e8e61d0f65c3505fa3438dd4cc9ea2808ef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-20.08.3.ebuild b/kde-apps/akregator/akregator-20.08.3.ebuild
deleted file mode 100644
index 43aa546717ac..000000000000
--- a/kde-apps/akregator/akregator-20.08.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://apps.kde.org/en/akregator"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syndication-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/grantlee:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/akregator/akregator-20.12.2.ebuild b/kde-apps/akregator/akregator-20.12.2.ebuild
index 3fce873a34ae..2f6b14d2bdc9 100644
--- a/kde-apps/akregator/akregator-20.12.2.ebuild
+++ b/kde-apps/akregator/akregator-20.12.2.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="
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 5ce6a514b467..cfa2c3a6fc49 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-calendar-tools-20.08.3.tar.xz 228576 BLAKE2B 53d3beb42c766f0ac47ea54b5294b61680a6e712ed624489b7df2c182f014ec07fbcb81bd47ab6a2b045515a7d85f7efd1616b9aa672338e84b80258d98298b0 SHA512 d8dc7fbd74cce1081f2398d1d5478e08cd0b7e9c4aed5dc89b3a54b43e0427526c9a47f7304667b796bec2cb53d0f17d4541345f647165f50edfff44c7ee91a3
 DIST akonadi-calendar-tools-20.12.2.tar.xz 224864 BLAKE2B 137a0d975242b2e419007ebc9be0eaac55e5f024b708c78fb773158695a0bb0b673657b8634423826eeba03cfdab75ff7e85bcc6ce09e33372a0927490d0b9b8 SHA512 12ed3517ec1a308bbb80691bb1fccf29a2a44c9715436288f51aa5eeffee25c3842d6664c1bfbe7c2ac669806d5ae0f0123bc1dece279953abd95feaafafff81
-EBUILD calendarjanitor-20.08.3.ebuild 1085 BLAKE2B 6d37462a0934e63725d63082ca09d1070bdbd07696770bd62cc8bdd3b69a472b4e7298ee653e2129e37887910866d838d47155f9001dce28466801ebfdf14a3e SHA512 2b42044f7bfa62d4fb6fd9d5ad6e9eb9bada728b265202d36b1f7d58773b018d277cf9bc71b9d45fe053596d119ab51ddb412f96d160f558d78d133cf5d5954a
-EBUILD calendarjanitor-20.12.2.ebuild 1088 BLAKE2B e15f34f1408698f80e8e3655f3d763cf704142cb90ce03db9b7329a33b5c9088cc41ebf604a1af81a6c21c3bae1dbad785694de7808dce7a833c6f89aaf9c7bd SHA512 04355cd8861abfea586a284d1a2dccd2f9bbce4de7db7f813f92a89ff03b70d1fcaab27a71a33dcef1f0e6fd5626eaed278713e8d6ce87c1f19d37acfb9b1ecf
+EBUILD calendarjanitor-20.12.2.ebuild 1085 BLAKE2B 1cbd02f4d8eb4ab4468b3650c845cd5c35a56677fd8ff4b01d011bf6847bdb04c9009c53300f6293b28759ffc066ab74080bf98b6f6793d7138321949c7af69a SHA512 53157f89ab676ad494354aa5d2aa9be60492ef4ae3f4d2b424cd9d66969cc3dc53ac399bf0a79990771de73f014387a94b8ef74af6c004546bcad456b593f158
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-20.08.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-20.08.3.ebuild
deleted file mode 100644
index a9da3e17b958..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-20.08.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="false"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-
-	# delete colliding konsolekalendar translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/konsolekalendar.po || die
-		rm -rf po/*/docs/konsolekalendar || die
-	fi
-}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild
index 0ee234b1a929..6e6c5bf7979d 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Tool to scan calendar data for buggy instances"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index b60db719a9dd..981467e62df3 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,6 +1,3 @@
-AUX calendarsupport-20.08.3-qt-5.15.2.patch 9234 BLAKE2B 6c4e33ba2f28077d68f660539b210597bf915559125b8b9078554e2d559443a0edfcfabcfc67328e5c5f20145d1182de1cab3a95e11b2845d902de8e3a880107 SHA512 ab4428b95fefd022bea802eacf312ee2cc0a143d44728d840d16e2634d01bc87ce63070ff82c19fcf3d07a682c1cad7e1320feeba96b5837291a4421d27d0fe8
-DIST calendarsupport-20.08.3.tar.xz 661708 BLAKE2B cf7ef77afe14db2e5eddd48617f47f3d32c93b6d2697ed35f8dfacb73ca50d39e04ab459f8fb5ba18f48068034828c5d6fdd1af2604ae97586bfa4bac33b3029 SHA512 dc1f1eb8b633f19edf841e9b4d50b78afea9297918a4b3d8bab47352b53caec2737566504c9487fe1e36a01873e6e4bda8e257f997742d244d276992ddcc77f5
 DIST calendarsupport-20.12.2.tar.xz 665200 BLAKE2B dbaf358e0295c27f663b87f91598a4aae6449f37bd470648f8416c69e654b8db39a37c9429c32ba204232118e7dc67cf3a1ef7927fdc2b84a04812620e0499f8 SHA512 63878598f52634e6dcd4aca527dd3f6278b9d2569b169d2a81a78d31b2cce632b45713da8fd4b97d241aa041fd9805a909b59aa2c090f6b55e685fe60e2f8cde
-EBUILD calendarsupport-20.08.3.ebuild 1309 BLAKE2B 48d9be2fdf5d264f8e8196f66a7bb9afa843cf0944a5eba19ab183cc8e49099fa9fe664d201b6ed1fb9c1fb4b6f2ad4433f421f62a5ddbf881d021e560bcb113 SHA512 072af5a079dd5a9687764bcf8abe5c67905fa076494b803e69b2b1e1da002b4e048729fc7c6b7c3f2ac051907c0207e27a53d4fe46ac63b5a5bf32aed4584751
-EBUILD calendarsupport-20.12.2.ebuild 1264 BLAKE2B bb855a1615eef36dbd4b8ce5fbc394a8b4410440cd5446de0b5dca3f1a6f7291c20303fd735c78451b02d0e0d2629be71e7957db0bf6165075f4f5ea208df2d7 SHA512 2e68b344362d18178aee2813c5d88c9e8ce6996c72b6c853445e21ecb59cddd5df675ba012f2098ea6ffa512aba6319169e9d97834c30dbc972a868a1d94f227
+EBUILD calendarsupport-20.12.2.ebuild 1261 BLAKE2B 49c14bef54245e290d04dae12690dd1cc97aaa95da9fa9465a2e47ed2a0c07541378fb7b6e41b1df356e621a312801c3b902fb4054d2d5bd7dca36fb269f7c1c SHA512 3d0dc16fc5ad074a75837c09585d5de6ae8e78195e0cc75b6dbde463ab7b31c6d4a56176901155086e4b8f742989eba3ec1c6f724f6ae4f3fd07ea97fdb1eb0b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild b/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild
deleted file mode 100644
index 58478c498820..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-KFMIN=5.74.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Calendar support library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libical
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" )
diff --git a/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild b/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild
index be894e0fd1b4..85d97b997ff4 100644
--- a/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-20.12.2.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/files/calendarsupport-20.08.3-qt-5.15.2.patch b/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch
deleted file mode 100644
index af94c2e7a0de..000000000000
--- a/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From b4193facb223bd5b73a65318dec8ced51b66adf7 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Wed, 9 Sep 2020 17:26:46 +0200
-Subject: [PATCH] Port away from deprecated QPrinter functions
-
-This implies changing from QPrinter::Orientation to QPageLayout::Orientation. The actual values are the same tough.
----
- src/printing/calprintdefaultplugins.cpp | 14 +++++++-------
- src/printing/calprintdefaultplugins.h   | 10 +++++-----
- src/printing/calprinter.cpp             |  6 +++---
- src/printing/calprintpluginbase.cpp     |  8 ++++----
- src/printing/calprintpluginbase.h       |  2 +-
- src/printing/printplugin.h              |  4 ++--
- src/printing/yearprint.cpp              |  6 +++---
- src/printing/yearprint.h                |  2 +-
- 8 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/src/printing/calprintdefaultplugins.cpp b/src/printing/calprintdefaultplugins.cpp
-index 862b74d..e3d802d 100644
---- a/src/printing/calprintdefaultplugins.cpp
-+++ b/src/printing/calprintdefaultplugins.cpp
-@@ -805,7 +805,7 @@ void CalPrintDay::print(QPainter &p, int width, int height)
-         QString line1 = local.toString(mFromDate, QLocale::ShortFormat);
-         QString line2 = local.toString(mToDate, QLocale::ShortFormat);
-         QString title;
--        if (orientation() == QPrinter::Landscape) {
-+        if (orientation() == QPageLayout::Landscape) {
-             title = i18nc("date from-to", "%1 - %2", line1, line2);
-         } else {
-             title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
-@@ -1050,14 +1050,14 @@ void CalPrintWeek::saveConfig()
-     }
- }
- 
--QPrinter::Orientation CalPrintWeek::defaultOrientation() const
-+QPageLayout::Orientation CalPrintWeek::defaultOrientation() const
- {
-     if (mWeekPrintType == Filofax) {
--        return QPrinter::Portrait;
-+        return QPageLayout::Portrait;
-     } else if (mWeekPrintType == SplitWeek) {
--        return QPrinter::Portrait;
-+        return QPageLayout::Portrait;
-     } else {
--        return QPrinter::Landscape;
-+        return QPageLayout::Landscape;
-     }
- }
- 
-@@ -1099,7 +1099,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
-         do {
-             line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
-             line2 = local.toString(curWeek, QLocale::ShortFormat);
--            if (orientation() == QPrinter::Landscape) {
-+            if (orientation() == QPageLayout::Landscape) {
-                 title = i18nc("date from-to", "%1 - %2", line1, line2);
-             } else {
-                 title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
-@@ -1126,7 +1126,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
-         do {
-             line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
-             line2 = local.toString(curWeek, QLocale::ShortFormat);
--            if (orientation() == QPrinter::Landscape) {
-+            if (orientation() == QPageLayout::Landscape) {
-                 title = i18nc("date from - to (week number)", "%1 - %2 (Week %3)",
-                               line1, line2, curWeek.weekNumber());
-             } else {
-diff --git a/src/printing/calprintdefaultplugins.h b/src/printing/calprintdefaultplugins.h
-index 4df72f6..3f62d0b 100644
---- a/src/printing/calprintdefaultplugins.h
-+++ b/src/printing/calprintdefaultplugins.h
-@@ -53,9 +53,9 @@ public:
-     }
- 
-     QWidget *createConfigWidget(QWidget *) override;
--    Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override
-+    Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override
-     {
--        return QPrinter::Portrait;
-+        return QPageLayout::Portrait;
-     }
- 
- public:
-@@ -166,7 +166,7 @@ public:
-     /**
-       Returns the default orientation for the eWeekPrintType.
-     */
--    QPrinter::Orientation defaultOrientation() const override;
-+    QPageLayout::Orientation defaultOrientation() const override;
- 
- public:
-     void print(QPainter &p, int width, int height) override;
-@@ -222,9 +222,9 @@ public:
-     }
- 
-     QWidget *createConfigWidget(QWidget *) override;
--    QPrinter::Orientation defaultOrientation() const override
-+    QPageLayout::Orientation defaultOrientation() const override
-     {
--        return QPrinter::Landscape;
-+        return QPageLayout::Landscape;
-     }
- 
- public:
-diff --git a/src/printing/calprinter.cpp b/src/printing/calprinter.cpp
-index 182e0e3..10e9db6 100644
---- a/src/printing/calprinter.cpp
-+++ b/src/printing/calprinter.cpp
-@@ -126,13 +126,13 @@ void CalPrinter::doPrint(PrintPlugin *selectedStyle, CalPrinter::ePrintOrientati
-     QPrinter printer;
-     switch (dlgorientation) {
-     case eOrientPlugin:
--        printer.setOrientation(selectedStyle->defaultOrientation());
-+        printer.setPageOrientation(selectedStyle->defaultOrientation());
-         break;
-     case eOrientPortrait:
--        printer.setOrientation(QPrinter::Portrait);
-+        printer.setPageOrientation(QPageLayout::Portrait);
-         break;
-     case eOrientLandscape:
--        printer.setOrientation(QPrinter::Landscape);
-+        printer.setPageOrientation(QPageLayout::Landscape);
-         break;
-     case eOrientPrinter:
-         break;
-diff --git a/src/printing/calprintpluginbase.cpp b/src/printing/calprintpluginbase.cpp
-index e96f3b2..9db198e 100644
---- a/src/printing/calprintpluginbase.cpp
-+++ b/src/printing/calprintpluginbase.cpp
-@@ -232,9 +232,9 @@ void CalPrintPluginBase::setPrintFooter(bool printFooter)
-     mPrintFooter = printFooter;
- }
- 
--QPrinter::Orientation CalPrintPluginBase::orientation() const
-+QPageLayout::Orientation CalPrintPluginBase::orientation() const
- {
--    return mPrinter ? mPrinter->orientation() : QPrinter::Portrait;
-+    return mPrinter ? mPrinter->pageLayout().orientation() : QPageLayout::Portrait;
- }
- 
- QColor CalPrintPluginBase::getTextColor(const QColor &c) const
-@@ -326,7 +326,7 @@ int CalPrintPluginBase::headerHeight() const
- {
-     if (mHeaderHeight >= 0) {
-         return mHeaderHeight;
--    } else if (orientation() == QPrinter::Portrait) {
-+    } else if (orientation() == QPageLayout::Portrait) {
-         return PORTRAIT_HEADER_HEIGHT;
-     } else {
-         return LANDSCAPE_HEADER_HEIGHT;
-@@ -356,7 +356,7 @@ int CalPrintPluginBase::footerHeight() const
- 
-     if (mFooterHeight >= 0) {
-         return mFooterHeight;
--    } else if (orientation() == QPrinter::Portrait) {
-+    } else if (orientation() == QPageLayout::Portrait) {
-         return PORTRAIT_FOOTER_HEIGHT;
-     } else {
-         return LANDSCAPE_FOOTER_HEIGHT;
-diff --git a/src/printing/calprintpluginbase.h b/src/printing/calprintpluginbase.h
-index ff1113c..b3d41ac 100644
---- a/src/printing/calprintpluginbase.h
-+++ b/src/printing/calprintpluginbase.h
-@@ -108,7 +108,7 @@ public:
-     */
-     static int weekdayColumn(int weekday);
- 
--    QPrinter::Orientation orientation() const;
-+    QPageLayout::Orientation orientation() const;
- 
-     /** Returns the height of the page header. If the height was explicitly
-         set using setHeaderHeight, that value is returned, otherwise a
-diff --git a/src/printing/printplugin.h b/src/printing/printplugin.h
-index 57afdfe..73bf467 100644
---- a/src/printing/printplugin.h
-+++ b/src/printing/printplugin.h
-@@ -140,9 +140,9 @@ public:
-       config settings), implement this function in your subclass and
-       return the desired orientation.
-     */
--    virtual QPrinter::Orientation defaultOrientation() const
-+    virtual QPageLayout::Orientation defaultOrientation() const
-     {
--        return QPrinter::Portrait;
-+        return QPageLayout::Portrait;
-     }
- 
-     /**
-diff --git a/src/printing/yearprint.cpp b/src/printing/yearprint.cpp
-index 3287ca6..e57a1c4 100644
---- a/src/printing/yearprint.cpp
-+++ b/src/printing/yearprint.cpp
-@@ -82,9 +82,9 @@ void CalPrintYear::saveConfig()
-     }
- }
- 
--QPrinter::Orientation CalPrintYear::defaultOrientation() const
-+QPageLayout::Orientation CalPrintYear::defaultOrientation() const
- {
--    return (mPages == 1) ? QPrinter::Landscape : QPrinter::Portrait;
-+    return (mPages == 1) ? QPageLayout::Landscape : QPageLayout::Portrait;
- }
- 
- void CalPrintYear::setDateRange(const QDate &from, const QDate &to)
-@@ -131,7 +131,7 @@ void CalPrintYear::print(QPainter &p, int width, int height)
-         QString stdate = locale.toString(start, QLocale::ShortFormat);
-         QString endate = locale.toString(end, QLocale::ShortFormat);
-         QString title;
--        if (orientation() == QPrinter::Landscape) {
-+        if (orientation() == QPageLayout::Landscape) {
-             title = i18nc("date from - to", "%1 - %2", stdate, endate);
-         } else {
-             title = i18nc("date from -\nto", "%1 -\n%2", stdate, endate);
-diff --git a/src/printing/yearprint.h b/src/printing/yearprint.h
-index e59bf87..cd46a50 100644
---- a/src/printing/yearprint.h
-+++ b/src/printing/yearprint.h
-@@ -48,7 +48,7 @@ public:
-     }
- 
-     QWidget *createConfigWidget(QWidget *) override;
--    Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override;
-+    Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override;
- 
- public:
-     void print(QPainter &p, int width, int height) override;
--- 
-GitLab
-
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 1aafe7c3968d..b422bedffbc6 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,3 @@
-DIST eventviews-20.08.3.tar.xz 445292 BLAKE2B 41fae6233d333a99fcecfc7f4a75acd1edd92b4398f6c149d708554b1a93377ed708745c98d9309293e6b1015b60be1d1daa5873749b333f322476f58057066a SHA512 a7fb4750ce5ac6f490a6cfead314e72334500c45b886fd3f24843bbe1eeca94aec340411217db9f223ed1546ceb09fdac8866249ba1e1c25fc0b67f9bf9a6e91
 DIST eventviews-20.12.2.tar.xz 444096 BLAKE2B 937d4a1d390536140af60fe11a0cb8725b1ba7aefb89bba2984890f6fe4433e5e6a708c2e4b0d4461a003fbd276691a14ade7deeb86de4e48fec4f0f6bd35d56 SHA512 c76427eff7f14db5b58529e6c62ab1606e68fd90ce397f2d1b44013ea2d6c19761bf8b3900acee16a4aec29e6c5082a03ed349409063e0dbfa933bf68000732a
-EBUILD eventviews-20.08.3.ebuild 1201 BLAKE2B e7b71465e5db8d9abbdc7ae1a4d3b3a359da77c44bd7ba10ecb2cdc9fd327661e31b13d90e91f8a815873c3640c94c5a90ca0946e310526c3678bd001b3c7f70 SHA512 8e2adf2ca47ba08b7c8a5f670c15f957f7f70ad0be247b3ee98cb6c4ac5e13b66c700694da3a3bda7dd0152f90025e6208def3635d1d63d1078460dbfef1f758
-EBUILD eventviews-20.12.2.ebuild 1204 BLAKE2B 5862a81ee41af7c7a6ed2ea05e63b0e4f49baf65697b9fb90b123e4adecee923bc1e50af66d3c765ea7838270841217afc2f417de7fb5d956afc6d727509f90a SHA512 d1919daecfb86014041b0368377c1bdbfabda6d4da2df092650139b8d57eaf3114746893354722d60f24c3671af345900f5609270229774bb78ee35b5160b70f
+EBUILD eventviews-20.12.2.ebuild 1201 BLAKE2B 2dc6e8e2bc71d77e9d1dbc096355b7159870259968fa2418d8cb0561f6734e3449c1272be3ea4f86997760afaa3c5e567339b241f3f503610e0f61a6aef60dae SHA512 71a3c5a21e4c490516495155e1f166b1607795d1ab0baafcc8015daa5b8ab2170163b6bd7e71cb0085a6d884a742fb9c7f66805d2047633ce7d1fde976657ab2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-20.08.3.ebuild b/kde-apps/eventviews/eventviews-20.08.3.ebuild
deleted file mode 100644
index 95975bd39c9b..000000000000
--- a/kde-apps/eventviews/eventviews-20.08.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/kdiagram:5
-	dev-libs/libical
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/eventviews-20.12.2.ebuild b/kde-apps/eventviews/eventviews-20.12.2.ebuild
index d83fb4df63f7..38e701200e41 100644
--- a/kde-apps/eventviews/eventviews-20.12.2.ebuild
+++ b/kde-apps/eventviews/eventviews-20.12.2.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/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 72a6c75fe324..9e307275bc92 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,3 @@
-DIST grantlee-editor-20.08.3.tar.xz 111832 BLAKE2B 49a0f3f0e8d5c281a9ccbd6e19fea17f77080dea7ff1b555ab52ca898042179ee9b852e5ca5a8b6509e45813f823b885d6adf3cfdee5dd3ab7235de423dad29e SHA512 908b0e1071731b458e8ee74ffecfbc482805086549b4db09893475f011b3659727b5381fab781a2a7edc5d17083ec1ac9a1cd56960e5cca6e20d2671b69bf0b2
 DIST grantlee-editor-20.12.2.tar.xz 107480 BLAKE2B 6363c03ca0b020dd411f689a539002af822c09f0a1c2d63d131acf634e649db603c69b9ec13c3472052910846041ff62f263092332a30538d93d0fb3d1cca336 SHA512 b430d535b3c0e15c32dea5ac7aea73cd3d2353f84972fb3cdeb6c5f5d946fcc9b3058d175e998cf1b8d3dc9db5b16251d0c8cdf5d15cb710f0f7fec6ba3d4132
-EBUILD grantlee-editor-20.08.3.ebuild 1264 BLAKE2B c5d72bdfc9bef7141c7b9799070c508335e98ba0d3c6bee2e5c33a8c09c715e1a529494f1c7f468192973c49a1998b547c105036babf1382c3e14aab3161926b SHA512 a1af9a29cc92e8cc58a79bff6585455e4b566e7c6111d57b71655960c04e7e0879b8460672b5b211ecc13f6b27f1209df080b5e3a4a21ab416d11905787c333e
-EBUILD grantlee-editor-20.12.2.ebuild 1267 BLAKE2B 1360084c00bce383a2b4b8bb9b276939821ca562adb29cb9a11ea72a01d652095051fc09c0d9d6665c4b736210116ea952a408dbb36b560378fb92b26ef7c15d SHA512 c96f30a67a9d288c0bf457649681706d051cb6b8137fd166b740171ae7b3db871c01e278cc917d0f1664c0d74d46ba5ed7f63cd6d836a9745d06f1f4e998d342
+EBUILD grantlee-editor-20.12.2.ebuild 1264 BLAKE2B 053c90baef7fdc08a99665784258fcfc88d97d67670cb20246399881e50c65ed63fd0501cfd0ef5c553fde801bebd117c0bac8ff28dae6242cc630179c27021a SHA512 fd65644ad30a59d3794ee670d548d024204bed1873421589b52d8a4586839fda1445fb0fe530daa69def553014ef3527a2d5a326830c9d103eadaba7752cf6e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-20.08.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-20.08.3.ebuild
deleted file mode 100644
index bbc82fe0c2d0..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-20.08.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild b/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild
index 14c95bd7e7d7..2c70baa0c538 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 00bcea9f3bbb..3fc9231491e2 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,3 @@
-DIST grantleetheme-20.08.3.tar.xz 56280 BLAKE2B 8bdb1257d1315201ec9b2a4a4911d0de0de4e5902ed21477a9fbf1ba1bec40b3a3401b3a7e02932dac113cb590a9e374c987b8a39b1736795ea341fe9c683427 SHA512 2ef1cf5986a2e5956d888090c40760b5caebea4357e55ec6cd19679ec6e7fa3c683d7e57ca9bb21f60728b3c1cce73e95367e0584b7d587d4b48ec350cc3d048
 DIST grantleetheme-20.12.2.tar.xz 56536 BLAKE2B 58a15b4beed8b2712bb6df6c7645cd41532b873422145c13e1b932faebecf30eda57bffa5fa214c58b3f994727341c2808b9e0a681cddcb5f2857c45c7347f80 SHA512 6f587ea30e4c5954fd09bfdacb5ebadb406c333ce04758e99ff31d7b219eb65c3be68d426f8677ad6816c38e409717f1a77fec4d4d97797fa3ee525d72380979
-EBUILD grantleetheme-20.08.3.ebuild 825 BLAKE2B bfb3820cfd6008071015e01d2d6923184b9ff09d96262da05eee5f4fd5e2a26d32b22928c3eb7f530ed1a2740becf29b6d47228a0a81a8ebe4a8d519e7e862c9 SHA512 3fa254a0c4b46e17d8b9e403deec8081e486786a9027fc774ae53dff28e870127c65be75d581923b05bee2367ebedfa337de1e328ab18fe6df5938e56d4e2939
-EBUILD grantleetheme-20.12.2.ebuild 828 BLAKE2B 880ed10f92ff87f0ff258dc7cdfab00602c1e5297c10895453dba44b228b6cb3e0a924e94bf74cd5a09fd891189eb929e860b7bdd23edc819383806924f348be SHA512 705a62dbbd6baae3947460326dcf1cfcaeac42ec202c133e8f7c99c4153af1610f57712727938fc1c16be53e33422f833f04399431d9a841ff337e33cc058b9e
+EBUILD grantleetheme-20.12.2.ebuild 825 BLAKE2B 26c6a21af3b67b6175d7f6f439f0cb4ec94b37b88ec731d75c0ab7b892a7d124b46d785f501fdf4df6f8f70508269daa9e4215c2a97079efde7017bd39cab178 SHA512 bb9aabd48ebaf27996308bbf319a19268bb239bc5f565379ae1d378ec8036440c3e0321360f2d8122d7470b448d5fc87d612a3c9a704e0171dbca62de1138b5d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-20.08.3.ebuild b/kde-apps/grantleetheme/grantleetheme-20.08.3.ebuild
deleted file mode 100644
index c799d1fd5382..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-20.08.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Library for Grantlee plugins"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
diff --git a/kde-apps/grantleetheme/grantleetheme-20.12.2.ebuild b/kde-apps/grantleetheme/grantleetheme-20.12.2.ebuild
index 55ab02ade230..662f50179731 100644
--- a/kde-apps/grantleetheme/grantleetheme-20.12.2.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-20.12.2.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/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index 5b915b133113..3baac3c78d7c 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,3 @@
-DIST incidenceeditor-20.08.3.tar.xz 543076 BLAKE2B 7990a6aa13098f92d0ab8b767c87592011f55e2847c7b21aac8a324a70c2e4cec8d9d5763760feb785b5eb8e3801cb862ed9f1e1aff2c30811f301c606f7a8a8 SHA512 d471a646ecb5a3ba9f0e932baa0fbccf2e159d7b69fd797003dd60f526bdfcc63dd7145bc335c3d850ec5934ccaaac52e682205f55a668bf93f713e575d5b5d0
 DIST incidenceeditor-20.12.2.tar.xz 546144 BLAKE2B 2a7ee26b398347595a26b4a74c2dbfbd3c99e3cf576b484497b418b7522c9fe3ed0c218434da79b2fe72063224ab11add669e02dd033529f24a02cbf001f429b SHA512 4c28ccdbc7e389a26f93072309626966570392bb05af2457c8a8c73581f7ca9e04d030eb7d4bc45c16a5545218e928d66575cd9f5fb2333131be136f3b52c0ad
-EBUILD incidenceeditor-20.08.3.ebuild 1568 BLAKE2B cdab655889726bb320d6b7d320c7b5cb9bccbfdefb6a4c736318087bb0c582b439c49086cd5bd71d750a24f44390c98f494db578e164a01c7dee1f482e6c26b4 SHA512 9bd95d1756457fec98c8eb1d726a54bd021301e21b5e35d6e2645912c70551152ac25bff3b269608055024efc5547bd77dd10ef99bc3dd19e3ebb2cffc857e77
-EBUILD incidenceeditor-20.12.2.ebuild 1571 BLAKE2B 0a6dd9c2d931b0215723174e1d06b15c9a89fe6d9dcd006de83625b4432274902923f67ddfcab7aa5ae569dbe6807cbc6f05088e75be5735cbe9defc56e312da SHA512 63304b3fc4628821d16d3dce85344605402d33a5fa327a9dd1c1be9447d26aad087ed80f344aac216d0cfbb77e365a07c6e97d951689ada7aef5108e3cccf0e6
+EBUILD incidenceeditor-20.12.2.ebuild 1878 BLAKE2B 3e8ef837ff891798e1d0bf5688d3d7d53836a5bd366f1136b782aa0f48dbe6627f507e1973aea214b5442a90108bb3e9c137b41907a593ab3f25cd535e5989b5 SHA512 c2decbf0782791fdd58622bc0a965ae5b192bbd943f5a608ed988a9391edc82ddb72b15dd9f2acf1f0d73752d722a2b87ee10dc3e663390ab445dcd91e259291
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-20.08.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-20.08.3.ebuild
deleted file mode 100644
index 6000ab94f038..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-20.08.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Incidence editor for korganizer"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/kdiagram:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild b/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
index abaf121ed4ad..72a8cbb949a6 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
@@ -14,10 +14,10 @@ DESCRIPTION="Incidence editor for korganizer"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	dev-libs/kdiagram:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -52,4 +52,18 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[postgres,sqlite] )
+"
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+
+src_test() {
+	# Paths exceed unix domain socket limit, bug 770775
+	local myctestargs=(
+		-E "(akonadi-pgsql-incidencedatetimetest|akonadi-sqlite-incidencedatetimetest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 052974a50d9a..fc0dd3f7fdc7 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,6 +1,3 @@
-AUX kaddressbook-20.08.3-qt-5.15.2.patch 3034 BLAKE2B 36c5c81b6e1764fe57eec1a465e1258ada25234e6f89d1d5bd247f26d57f5dedea2b07ca77822e6e7a1afe06fbe2432dbb92f4c106f01ab3d3a33d2377a32d4b SHA512 ad7c53a13f5a21d21380d53767c483d39479cf63b889596f61819d2ad0c4289fbf57f300098e4063a76eb0c43356433b52505ed9405f032cb3ed290b8af5f2d2
-DIST kaddressbook-20.08.3.tar.xz 3168192 BLAKE2B d7776c19b4cbe6eb0a1034b25c1ba4efe26d965091b749dd3691557d8202bf8ea13afcf9125454aeea986394b8e23ace4af4be7a38512a4a860639c65c90ab12 SHA512 ff63a0a0b5f8d45bfde0a41f15157bbc338aceebc9455b70626a3baab5b294b24951f72c9c110f356f04dd0f5f1ed191454e1b11a13ffe10df95d99efbf6f052
 DIST kaddressbook-20.12.2.tar.xz 3257200 BLAKE2B 8c5c8a31400533d145999b9d574c44d9466854da3480746d435d4d556db603ea4baf52a5563a96972281db9453d7d0212183b018a5b4d7f4fd75def79df0374b SHA512 fd7e8213db1061807b3ad509d92627282d0782af9c528d940a493fecc50c1680b97170d38d00d4b044722a598d4c5717a2561ec25171369f672518d24c99911b
-EBUILD kaddressbook-20.08.3.ebuild 2130 BLAKE2B c9501d04436666316273d5cc62f93397fcccfd98c7db14580732c277bdaead7bcd841b4def04041204e3f13299e65fd2fbcfb315904441af96901d32fcda2183 SHA512 b8ebd00d7ae3c56ff373d75c5b8c6b49a0276e19e00cffb9ee61685eb81e4d44a015086574ac6841ab4409177c560436e3243c43baa9aef003e99c8d18933aea
-EBUILD kaddressbook-20.12.2.ebuild 2045 BLAKE2B db08d58d11d4c9b7dbef7d6083ac816cf10196da30f739f52d2d9472a1af07f8ccb1cf08dc4ac9a852ba011e61c258bc29ee40103ed2b30f4c018d945b498ffb SHA512 6d9aac005438eddb26097cd0e1b2e4493a1737c981a60582d636fa42d7b1bb01fab5062eb00dd67bfc79d99106a3b1bac0a6840ec840564f7c738f9bf4d21269
+EBUILD kaddressbook-20.12.2.ebuild 2042 BLAKE2B c497ea8b798007ab6df6b8e294bfaf98c9bef6bf053601886067520c871df4c797560692be55ce16b59cb6de97929372cb247a207a36d49dc7a96834788ed57f SHA512 6dcf4be47615b8f95af2c5ba9e87c8efeb6a8c26f3e933e3a4a8097f12d76b66a34a512cbd59cd9c6361941f236311ae226e9c61828fb2d4cdd69c9adefee73e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch b/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch
deleted file mode 100644
index 888febed0fa3..000000000000
--- a/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 8aee8d40ae2a1c920d3520163d550d3b49720226 Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Sun, 25 Oct 2020 18:22:58 +0100
-Subject: [PATCH] Compile with recent Qt 5.15
-
-More QPrinter methods got deprecated there. DevicePixel no longer exists
-as a unit, visually Point looks pretty much the same though.
----
- src/printing/compact/compactstyle.cpp        | 2 +-
- src/printing/grantlee/grantleeprintstyle.cpp | 2 +-
- src/printing/mike/mikesstyle.cpp             | 2 +-
- src/printing/ringbinder/ringbinderstyle.cpp  | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/printing/compact/compactstyle.cpp b/src/printing/compact/compactstyle.cpp
-index d950a963..71e74c0f 100644
---- a/src/printing/compact/compactstyle.cpp
-+++ b/src/printing/compact/compactstyle.cpp
-@@ -168,7 +168,7 @@ void CompactStyle::print(const KContacts::Addressee::List &contacts, PrintProgre
- 
-     // print
-     QPrinter *printer = wizard()->printer();
--    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
-+    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
- 
-     progress->addMessage(i18n("Setting up document"));
- 
-diff --git a/src/printing/grantlee/grantleeprintstyle.cpp b/src/printing/grantlee/grantleeprintstyle.cpp
-index d7afe8ef..49b5e494 100644
---- a/src/printing/grantlee/grantleeprintstyle.cpp
-+++ b/src/printing/grantlee/grantleeprintstyle.cpp
-@@ -38,7 +38,7 @@ GrantleePrintStyle::~GrantleePrintStyle()
- void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
- {
-     QPrinter *printer = wizard()->printer();
--    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
-+    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
- 
-     progress->addMessage(i18n("Setting up document"));
- 
-diff --git a/src/printing/mike/mikesstyle.cpp b/src/printing/mike/mikesstyle.cpp
-index 9f698c53..81a4bd6f 100644
---- a/src/printing/mike/mikesstyle.cpp
-+++ b/src/printing/mike/mikesstyle.cpp
-@@ -107,7 +107,7 @@ MikesStyle::~MikesStyle()
- void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
- {
-     QPrinter *printer = wizard()->printer();
--    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
-+    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
- 
-     progress->addMessage(i18n("Setting up document"));
- 
-diff --git a/src/printing/ringbinder/ringbinderstyle.cpp b/src/printing/ringbinder/ringbinderstyle.cpp
-index 60a39c86..5f600d6a 100644
---- a/src/printing/ringbinder/ringbinderstyle.cpp
-+++ b/src/printing/ringbinder/ringbinderstyle.cpp
-@@ -159,7 +159,7 @@ void RingBinderPrintStyle::print(const KContacts::Addressee::List &contacts, Pri
-     config.sync();
- 
-     QPrinter *printer = wizard()->printer();
--    printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel);
-+    printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point);
- 
-     progress->addMessage(i18n("Setting up document"));
- 
--- 
-GitLab
-
diff --git a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
deleted file mode 100644
index 4a9f7e41299e..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/en/kaddressbook"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_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-20.12.2.ebuild
index 2bf21097d8c8..c0eb71bdae66 100644
--- a/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-20.12.2.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="
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 2d67a6a1ae1e..9030d3b98b02 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,3 @@
-DIST kalarm-20.08.3.tar.xz 1985344 BLAKE2B 6a6f44d9479370834c89dad00aca7fcbbf9c0f655450b29e0cc9bad0a5376946f24d36554088afcc2ec279d530ca6c43e31efb079f09808965ff74242053f137 SHA512 d564922bf41f176034535fd795d25eeabfbcd8e7eea115c29e5c0f1a2313de5b33406f87e1f7e705d7f814b9a2b826ac4cf7ac50723bf90beea5ecc92c750496
 DIST kalarm-20.12.2.tar.xz 2080628 BLAKE2B dbb9109f6ed67b08cd57a575cd008bff7eafded5a64a49b13e507f54b0f982a202d9673e958c8a80cebab9df3c19ad6513ee6f8aab9f93791e8d8c7ce7cac614 SHA512 ff3b86679a98aa3da30691989b90bccaa1b400b5d11e6e8c2c730f999d64146c0913c4b321da7fd20a6e409c5200dad2a997036bffcb380957e6ec1b69d7f898
-EBUILD kalarm-20.08.3.ebuild 2332 BLAKE2B 9fbf5cdf5f0dcc785f7585148228b9f43f40f6e15dd344569a8d6281d2b97c0dabc7f934ddd5da78cbbe73f1d7c987344902db3c22500ec69cfd6ec8785bff1b SHA512 68879b6710a8a13ca0022f6a66bf0b7ae361be4269da2c0aa27a056967c3fa60829614f57eed028669b045d1cd04b8b36f265b9eef5f28f89f35d8d90830c9f4
-EBUILD kalarm-20.12.2.ebuild 2454 BLAKE2B 405117c92e6bee1aa79b08372c692ad88f9736290d6893659d67f45b3937628ca1e2d938146c42517f13896d147b830de11090c1f9a2727fbd0a8f4290b52597 SHA512 099605278843edced28c9bebcc5ce216baf0a350f4cf27618e743101c3f811a415bd7f82089baea19d9344c8f578b474ea6a708b0e3ef04030768de55703fa25
+EBUILD kalarm-20.12.2.ebuild 2451 BLAKE2B 644260e2b192ffb4c083c725e687ab37b858f2fbceb83c8111c6bcda76e1837d1b61541949e377422a5eb691bb4354ce27882ff9358b498101097b85d229c419 SHA512 c724cf1fb79fc44baabc3c7e83962d2441508e5205b117e09942d4642a05c799372674c507d24a50e3b574f1805452b5e73ea60687cf6b699722ffb2479fb167
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-20.08.3.ebuild b/kde-apps/kalarm/kalarm-20.08.3.ebuild
deleted file mode 100644
index 65e000e16906..000000000000
--- a/kde-apps/kalarm/kalarm-20.08.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-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"
-IUSE="X"
-
-BDEPEND="
-	dev-libs/libxslt
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kalarmcal-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kalarm/kalarm-20.12.2.ebuild b/kde-apps/kalarm/kalarm-20.12.2.ebuild
index 2e220c77ac31..b5da90eae87f 100644
--- a/kde-apps/kalarm/kalarm-20.12.2.ebuild
+++ b/kde-apps/kalarm/kalarm-20.12.2.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/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 99716e317ecc..9780268219ff 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,3 @@
-DIST kalarmcal-20.08.3.tar.xz 575188 BLAKE2B c565d1fbd134fc7a6c06691730e23a75bea2a5e0e24d7e0924d492821f931d96e5ba6ad18eb58779a27fea3f9715a9166f3f275fae0452f5b9ad369e47f974f7 SHA512 a0bcd1aa8ff46dbd6b58386538a78741eed1252b423c6f22e15a43c3131655918b1f97512fcd9d9fef06d7c7f192210db9ef7f442eaf3c2aa46b0ed649108e22
 DIST kalarmcal-20.12.2.tar.xz 576636 BLAKE2B 0b0eae2df5bb31d285c0c484133e233f1b1b42b34c99bd45fea5886e550f1f1669799f0f0661b133a183990fb7477ab017f0baba4946ddf3b63850ceaca80600 SHA512 af5522ff68bda3f6443aa3049f2826d85567fec77adf72721c79f4a1767272ae8181e663e1b904b7c49953630185df37f4b50999a961f964caa65911653038ba
-EBUILD kalarmcal-20.08.3.ebuild 766 BLAKE2B 6e7b49d3a500ed4e27f3dd2d579cb151ee4cc49c1d7859397615cd94dcbaa16fa79f5ef81cb03d1405f115229e13ba9f09fe5e54d8c457d4557212985366460c SHA512 6222af921371bfd113edaee93a51ed2661b07d2a5ad016e58ed8f7ec05d8136bc6ab7fc4d3ae5506982b0ad57ba24662398b016c163ee26148a2d3b195ec298b
-EBUILD kalarmcal-20.12.2.ebuild 769 BLAKE2B 090e136aa449f07c1250227ce3881d1aaf520cad6dda52bb73e82077d69271efbf87baeefe64eda65b3d1ffe564ec887d778e9104044d119e68879f646a79a79 SHA512 767b9fe1e15423959fda52193e35fca77a24fae656c397718ef070c9e23a432502686eedb5eab7b656aa5a700cce1ee9d169b69abf167a37c731763b98daceed
+EBUILD kalarmcal-20.12.2.ebuild 766 BLAKE2B 94e92106e1dc6638bdf94bac4f559fdae7bfb7ad2315c84018e7722f777978b32ea33785cbc8a8be8be70c510e80fb17a39f1eabb7ba071f548acb417d52fff6 SHA512 648ff277149868b9adb515eb9327d5794ae59c23cccd48a02305e09138cd3ce7b309399d65f36c1927038bc75d0c23df69ddf54cd33b8a44c8dbc7d0900f39d9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-20.08.3.ebuild b/kde-apps/kalarmcal/kalarmcal-20.08.3.ebuild
deleted file mode 100644
index ea2571f0e7f1..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-20.08.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-"
-
-src_test() {
-	LC_TIME="C" ecm_src_test #bug 665626
-}
diff --git a/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild b/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild
index 1ad9db797272..01b92b99042d 100644
--- a/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-20.12.2.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/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 4de68ea44952..b040d3535e72 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,3 @@
-DIST kcalutils-20.08.3.tar.xz 324796 BLAKE2B f7d140d9fc4a28ffd71e5ddb7ee480d1b4a02af2b423cbee1dc3212984d3ef8c119325d231cd28da838bd721ecb18ece8f627839d01f1f09cd9d5e0bfd97d282 SHA512 6dbfde1ee9b245514ed09fc4e64d590c405bc7690087099600e8eedf6e9160eaa2b4e74e640b5bf51bca7ea354652446dfd9685277ace194d4ea65572eeb224a
 DIST kcalutils-20.12.2.tar.xz 324624 BLAKE2B 180837b6f461b41a9915f96ee202d84681340091e2f2093a4f6d46757f67a04d8f2adf9252fe7cf10652d8b61d6ebdac0119f153015f3b201f17cad3727843d1 SHA512 ed4a2dbd9dc866809c5c2ee7befe9070d1b94b02d5066e1bd0e460ec2f633bb7040328bf0f6a0df128788b203eac0866f129a34f27ad391d279ed99ce9c7e8b9
-EBUILD kcalutils-20.08.3.ebuild 974 BLAKE2B 6a2203cb40c0a44bb3aa367ce51b489f70055a0c96a2173a6cace497159ff27e8de88ed0199c212509ad3f16d56b4b870fb726ca10fc6ce582eec234a177f884 SHA512 1e5230baa4052fd05d4bc80212425abd9d28fb6558eae32f6b2df6616eebc30f7ef5812d4f258a1d2bab1f06a8976ff56e7b15e32c005fe43ca14baeb5cb8b49
-EBUILD kcalutils-20.12.2.ebuild 977 BLAKE2B f611eaea569f4a83e83e03686d5f940b3d2fac39c7e639da7f8822f9664fcad06c4432a4e56a4549bfa6c0b7913c96c87aec259ef47384934bcb7b93e364a01a SHA512 7bdd3ca27b742f8b4497937ed316eb32bbfdcca27a8b052eac627cdbe81403e27463d35bab399c21ac73634a126dd27e9b396dbb6322a7be1b94a995c3e0c184
+EBUILD kcalutils-20.12.2.ebuild 974 BLAKE2B f39b69e05d6b2c399d9f0a0a1c85280d3e23784b6a3ef909d5568fa428f2eec49d9d5da70e04144e7caa803b3b9c4ff4830c92eb5d54621e11d6e84eb2fd86e7 SHA512 6da0290904f155230a72bc2dc1dfd4c566428c3e25dc153e58a73e7833462492f91a7fd6e3a80fc1a8abe423c86bad2f3fd69aef7bbe2965c734e9b291aa892e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-20.08.3.ebuild b/kde-apps/kcalutils/kcalutils-20.08.3.ebuild
deleted file mode 100644
index 96ef8ecedd06..000000000000
--- a/kde-apps/kcalutils/kcalutils-20.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/grantlee-5.2.0:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bugs 653616, 711666
diff --git a/kde-apps/kcalutils/kcalutils-20.12.2.ebuild b/kde-apps/kcalutils/kcalutils-20.12.2.ebuild
index bb4bb6a682db..607945f11100 100644
--- a/kde-apps/kcalutils/kcalutils-20.12.2.ebuild
+++ b/kde-apps/kcalutils/kcalutils-20.12.2.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/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index f79b480b01bd..975fc21dbf8f 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,3 @@
-DIST kdepim-addons-20.08.3.tar.xz 2071996 BLAKE2B f66800962d6f42d7205ee718b639b22f2865f6e0f1b36a7c5caac7074affbf83bb5540e9ac6e3cb5587b6b129eb69e8d156f5b6f2f8bf90e11c00f08bb9adf01 SHA512 c788f3aa204486491747ca976268347b8b916c84670e58087a009d0cd153be9a199c09434f2e884d26d39f92728210e97ac4e9c74f20ba6fcf37c6e83276980d
 DIST kdepim-addons-20.12.2.tar.xz 2145492 BLAKE2B 6c143977f8e645c9fde13fb5453c292cc8b4068721cb82beac942dfa571906648b03e49e0aa69e37c8042d4a3c0cea4b5befe48716adc736b7bdbf03b0c6b4c9 SHA512 33ed5c0e6444c292f78767c32778ac11a4d1e567c7fde2c85ab10016ddaa7adef7d29e2c75635b1538abf0e6f59eaeae0810b3b122c9aeadc0de407e476c7797
-EBUILD kdepim-addons-20.08.3.ebuild 2440 BLAKE2B 7b58e0b6390e94215ea0cdf002e67ed679e1525bbc7e661edbd6ac26886ed03fff7ac1e2fb9b502e401344bc1cba8bf7559c5b3a3753eb183dcc439ae462c4dd SHA512 62243ba8915f195c977df13a9c19d6fc862f3fe41742dbb1695f9a74582c90cfc44d140b616034f7e7fef94a537edc8f9d588833530c68e377ebcadc932080e5
-EBUILD kdepim-addons-20.12.2.ebuild 2507 BLAKE2B 1768157c83c871ee763e91cab0edc1d706a754fb54de876185452b31cf66b7be797f7b035fc5247415e84754f51a665690f8c02d2321f236783cd470b0730a07 SHA512 788378f2d46ac6df425c9fc52ce8646ffde2d3be9d249e1ba0429ddfd08ccc9284853658d383df8afd5ed4ab6f31baa937d4f174d6431062ed8f7a65518de432
+EBUILD kdepim-addons-20.12.2.ebuild 2504 BLAKE2B 08da26f0bd40893ba038fa59e334b13c3913612ef564b1e7d6121c76ff710d024fe6229656afd249f8caeb2877270f8b6b811d40eefafc113fa5c2007dd55ecc SHA512 05c45241c34f455c3c855636452cc617dcb0318989e2cb6e047e1ef5f814d3bc12ba3e7d25c9f149afb590d198470e6dc1a72370bfe62fef9bf4842c385d661c
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-20.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-20.08.3.ebuild
deleted file mode 100644
index bc9c082334d4..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-20.08.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="importwizard markdown"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kitinerary-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
-	markdown? ( app-text/discount )
-"
-DEPEND="${RDEPEND}
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package importwizard KPimImportWizard)
-		$(cmake_use_find_package markdown Discount)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		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-20.12.2.ebuild
index 16a173a9f36e..9acc125594ec 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-20.12.2.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-20.12.2.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="
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index 2212bfd40e5c..506295398721 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kdepim-meta-20.08.3.ebuild 2564 BLAKE2B 65b326f96e28e2fbd24a2eb19c2b6863c82ad66321c4182fdd2712a139ff6fc10032b9b3bacd4c1dfdc909ee7a25a8ccf2fba594da71a952ecd2c7fae2910727 SHA512 0ce9033c685af79cd0385c6cfe0fe65ad137bc83a323b6507562bceb4c25cac4859850d68cc3e0253e824f53963e1d8c6cc2b27c1972df4c2719bf06542c4ddd
-EBUILD kdepim-meta-20.12.2.ebuild 2524 BLAKE2B 84703e2d46414d5789e169f14298e863aa8e90bee7747f2b75698ab7d0f22f3b17206dae9d185b8f2888dfac986f3b57558e1e9dfa7ecf5b505afb6ecb5ad6e6 SHA512 3246eb59d7ac72c3629f1362c72a7067f68d2a4698bd2cd6f057648bf58e2cd0986dfa6f1f9022141ff2851e3c377f89cfc92b3b026e1520023d7e0d26641b52
+EBUILD kdepim-meta-20.12.2.ebuild 2521 BLAKE2B b540822a9a8783d21c7b69f5fb207ddafc442d6c6865ea30d8ad69cf1a98a86627738ed8a8108cc681380389a98eb7af6c115b9f814789b8e2674ccbc4942d46 SHA512 e34de1f5ed9aaf2a6f24e46992b9974a986efe2977a9961eae0ac39093ad5e7f06e8f5ce068ac697a61d62525518aebd70ecfdb9de63d8393874cab7cf25ffc4
 MISC metadata.xml 650 BLAKE2B 27e2fa91fe17cd24da17294c2c8a54cd4eee5342c07d8a1a7ad1515d9c52bfe47fe938f3c96e4e2d1ae9b99e2100de9252e180d55458a46aaab03d46725ab9a0 SHA512 dff51eb660ecab8f80e9d865f9e2a9ce5ace1cea6ff322cd2b71af2e3ce83e45d0ea3fbd499a37413bd9572853b90fe860a040d3e3828836ecf842872a4eed88
diff --git a/kde-apps/kdepim-meta/kdepim-meta-20.08.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-20.08.3.ebuild
deleted file mode 100644
index 73ae704c0919..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-20.08.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="bogofilter clamav spamassassin"
-
-RDEPEND="
-	>=kde-apps/akonadi-${PV}:${SLOT}
-	>=kde-apps/akonadiconsole-${PV}:${SLOT}
-	>=kde-apps/akonadi-calendar-${PV}:${SLOT}
-	>=kde-apps/akonadi-contacts-${PV}:${SLOT}
-	>=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
-	>=kde-apps/akonadi-mime-${PV}:${SLOT}
-	>=kde-apps/akonadi-notes-${PV}:${SLOT}
-	>=kde-apps/akonadi-search-${PV}:${SLOT}
-	>=kde-apps/akregator-${PV}:${SLOT}
-	>=kde-apps/calendarjanitor-${PV}:${SLOT}
-	>=kde-apps/calendarsupport-${PV}:${SLOT}
-	>=kde-apps/eventviews-${PV}:${SLOT}
-	>=kde-apps/grantlee-editor-${PV}:${SLOT}
-	>=kde-apps/grantleetheme-${PV}:${SLOT}
-	>=kde-apps/incidenceeditor-${PV}:${SLOT}
-	>=kde-apps/kaddressbook-${PV}:${SLOT}
-	>=kde-apps/kalarm-${PV}:${SLOT}
-	>=kde-apps/kalarmcal-${PV}:${SLOT}
-	>=kde-apps/kcalutils-${PV}:${SLOT}
-	>=kde-apps/kdepim-addons-${PV}:${SLOT}
-	>=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
-	>=kde-apps/kdepim-runtime-${PV}:${SLOT}
-	>=kde-apps/kidentitymanagement-${PV}:${SLOT}
-	>=kde-apps/kimap-${PV}:${SLOT}
-	>=kde-apps/kitinerary-${PV}:${SLOT}
-	>=kde-apps/kldap-${PV}:${SLOT}
-	>=kde-apps/kleopatra-${PV}:${SLOT}
-	>=kde-apps/kmail-${PV}:${SLOT}
-	>=kde-apps/kmail-account-wizard-${PV}:${SLOT}
-	>=kde-apps/kmailtransport-${PV}:${SLOT}
-	>=kde-apps/kmbox-${PV}:${SLOT}
-	>=kde-apps/kmime-${PV}:${SLOT}
-	>=kde-apps/knotes-${PV}:${SLOT}
-	>=kde-apps/konsolekalendar-${PV}:${SLOT}
-	>=kde-apps/kontact-${PV}:${SLOT}
-	>=kde-apps/kontactinterface-${PV}:${SLOT}
-	>=kde-apps/korganizer-${PV}:${SLOT}
-	>=kde-apps/kpimtextedit-${PV}:${SLOT}
-	>=kde-apps/kpkpass-${PV}:${SLOT}
-	>=kde-apps/ksmtp-${PV}:${SLOT}
-	>=kde-apps/libgravatar-${PV}:${SLOT}
-	>=kde-apps/libkdepim-${PV}:${SLOT}
-	>=kde-apps/libkgapi-${PV}:${SLOT}
-	>=kde-apps/libkleo-${PV}:${SLOT}
-	>=kde-apps/libksieve-${PV}:${SLOT}
-	>=kde-apps/libktnef-${PV}:${SLOT}
-	>=kde-apps/mailcommon-${PV}:${SLOT}
-	>=kde-apps/mailimporter-${PV}:${SLOT}
-	>=kde-apps/mbox-importer-${PV}:${SLOT}
-	>=kde-apps/messagelib-${PV}:${SLOT}
-	>=kde-apps/pim-data-exporter-${PV}:${SLOT}
-	>=kde-apps/pim-sieve-editor-${PV}:${SLOT}
-	>=kde-apps/pimcommon-${PV}:${SLOT}
-"
-# Optional runtime dependencies: kde-apps/kmail
-RDEPEND="${RDEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	clamav? ( app-antivirus/clamav )
-	spamassassin? ( mail-filter/spamassassin )
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-20.12.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-20.12.2.ebuild
index 96540f8bfea5..6f04a2b45178 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-20.12.2.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-20.12.2.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 005e5fa6db38..4e884bba1ce9 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,3 @@
-DIST kdepim-runtime-20.08.3.tar.xz 1754672 BLAKE2B 6cfba7756489bbf86025637fa0943342359f081771843b73394c822f62ed7b5aef70546acef200544ac5037d603836c718ca7e81e8ef25808767fb4462cfc386 SHA512 98a3623b3973e7b7c194ef1ef986012e0dfddb4c74c3fddba23cac928a73e6f6b634883407ec56ec6f613f8830112389f3c9eb19c89a2164178f2063be72d623
 DIST kdepim-runtime-20.12.2.tar.xz 1801616 BLAKE2B d1db1893a3f87392ecd345976735545a90188aa6b0156b3728c16e08dd3ffd35648345509cb8bce65f7a939708b45be6b8849a8df2ec48f0ae6275efd8982b07 SHA512 234751643730d2ef2f7e4988ca1cf364c30c23997f5e611ef24b09745ee497742210af21096fe2301bca1bdadfda2e7cf47f7ace1627b79ee8d9f8cdd2ebac4e
-EBUILD kdepim-runtime-20.08.3.ebuild 2482 BLAKE2B 0b4317882c72cba2a02f637f4d39cda59780c0db6b7cfbb89a2ccd0b093a46360794cb6947f61b5f10771a6a0268f24efc7a6fae878a123fb6a33b2268c4d728 SHA512 1b8b3d2c3d26e457ac08f89fa0a3b1737cf277d43b49159d879a6bdfd4b4af77c262f5e093878e8fd98662167a9c26adfc56281f9e211ae198229b28efd7777b
-EBUILD kdepim-runtime-20.12.2.ebuild 2522 BLAKE2B b8a5a3408a10fb9171ec8fe5a437da3742ccd3f8ef242c3d1b64b9238099cedde30f00c5b02bff8d557aef8ac09148093af0a2b11984723d5b26c9554d77550b SHA512 c5cab932c09b199b5ff18fd2e9b1899baa00e33943898f13cb41347e58fa1eae4a807c569a0c8b55c4f88cfb14a02a45b900ee9439a89466722b673351e24c70
+EBUILD kdepim-runtime-20.12.2.ebuild 2519 BLAKE2B 542477f8e1c46bb2b8ab050965db9ad7db4d436b7af6c2228b28d37b43b0e4120ce021bbe3a92b48409aa5d5bb870a1c419330e9f57764af65957458477b1375 SHA512 b0cf8c585a5d6c0dab912f8e5441ab5c640f4783b81f05045bce32c584c9ff43586442aa55bb5defe66402aa668aa1281a1a16924adbcf5139506da8d5893638
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.08.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.08.3.ebuild
deleted file mode 100644
index 3512281b89c8..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-20.08.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-# TODO kolab
-BDEPEND="
-	dev-libs/libxslt
-"
-RDEPEND="
-	>=app-crypt/qca-2.3.0:2
-	dev-libs/cyrus-sasl:2
-	dev-libs/libical:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/kalarmcal-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmbox-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkgapi-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdav-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild
index 51e789f92ae4..78109648bc76 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.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/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index acdda664c8d8..8de11fa33452 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -2,4 +2,4 @@ DIST keditbookmarks-20.08.3.tar.xz 190688 BLAKE2B 204439435cfb216c552c74fe827298
 DIST keditbookmarks-20.12.2.tar.xz 190688 BLAKE2B 2a415c496ec4e3efb7d712f62223ee95b793fd6c4010bd7db96212537e20ff2010af1ee8069e5873fc15a8bdd875265e60f7a6e805c8adec7c02add308dcd75e SHA512 c9a348d7877ac03d0be3776739fd88d67cf8afed630c824306e1503f20a3dcc6147245da9cc68befd0a64017baa84275e7d1debc3b9029774119349bba0c6750
 EBUILD keditbookmarks-20.08.3.ebuild 1161 BLAKE2B 9bbae5a28989e1d9be85c3cbe24f096607a04dab0d0b2278b1bc2550e1bb7d7da772e50ccf7a9af2032d1289252ba6d1f114c13d5778a28c8aea8a36819bf920 SHA512 88775603fdaed651465d41d47b40fe2f8febaab4e2f597ba59dc5257798605117bf38c1278c8c7c3af25e5f507ea7b1dd555c86cc1b2dc71817417610110c947
 EBUILD keditbookmarks-20.12.2.ebuild 1164 BLAKE2B 3a6f13d9310cd3b056df2f9ace518132cfd83d4cf1eff1fec0b72d127c93590db47dce5578a98c556d7a636377d47726bda7b4c5b5e27fd0f718f5dff71b65cf SHA512 1eacf2abf619443c0a876c24ede7f6e45c83b96bf602a87cf94e919ce8d429b719d4b2c4a34202231a40bd5fac503118f9b7841eb1f6b010a34419c4a5c7140a
-MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/keditbookmarks/metadata.xml b/kde-apps/keditbookmarks/metadata.xml
index ac7f14a78a1d..2fdbf33d963d 100644
--- a/kde-apps/keditbookmarks/metadata.xml
+++ b/kde-apps/keditbookmarks/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="man">Build and install man pages</flag>
-	</use>
 </pkgmetadata>
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index 68596dcbfc4a..2464d9f3f22e 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,3 @@
-DIST kidentitymanagement-20.08.3.tar.xz 151216 BLAKE2B f82931f29e9e18e8e6d5da112a27bac31ef8e846483381f56ef21dd61f0e2e371161b4ac3d3d6319f1ce7ac407948023e37d182aaa7872b739dfa5a02aa9c36e SHA512 ad7ffbf8d948f052ba24dc887ab7f6d259be277e13452451b09c2fb79358650bf91cee714358c4bcae00d5c6787d5ac95028e114823c6b4557b0b8d984322b93
 DIST kidentitymanagement-20.12.2.tar.xz 152092 BLAKE2B c23b6d9eb32f7c85d742a323166acad5b544cb5920130536a1df0ae44a87df9f78fc7c7348557cfa1ae6d60d771417fd4d47ebbb75fef06c66f0b0ca4eca9d5c SHA512 8a7544376b475b533d618c40fa3acad42a817f147492dc31dfb1622a727db9912dbedd8222c46c05bd11cfe4dc09b53dbb47f6252cd3965f2e52cee62a532ac2
-EBUILD kidentitymanagement-20.08.3.ebuild 858 BLAKE2B b7f3f01f646f54ddbde4fd4c3b41e3144d965cce2043c1a199580e35c11e349507afbbd0049ed6fe2926ee9da1f42fb67f0a82d566dc15ffcb97b97e4d6da3c8 SHA512 811c6769fdc1a361ea8289c5f015a6a299f807a6a142daf9c888b9b8b09adaf8d297b78c2d999e7d49df6d51f14dc8e49df81e7a230b4ac4beac76028c4d8c40
-EBUILD kidentitymanagement-20.12.2.ebuild 861 BLAKE2B c25ad0c8136efc42e105dde2503ab26371c09e455a7801878916ba7bf16a15a365ecaeec355d13b4b661f3538fbcacc3591a342076666b271314ae9f2abac604 SHA512 9eb0a6dda58b5af2e8c63bb61cb9e4193ecc0f12d8d91ba331050dc061171b3d7f89fb5d88cfb1b00cfb325221d6a7345d4815a53283a58c0b451e8a08d6a6d0
+EBUILD kidentitymanagement-20.12.2.ebuild 858 BLAKE2B f24dbd50534c999516117207bc085ff97b725385557c75c7961fd7c14f160a73e627b42fe2bf64e76bb4d97f9ada7b2de6972577e0b085c9e6e1aa0470bcab94 SHA512 2ffaf54919072688e47a2d23f8a6d565a7470ae57e9c52c89ed299d2c319bd14cf4474c7cae8fea227cd02e799ed8493796d61627c5b0af3e67d2e27f2a52441
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-20.08.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-20.08.3.ebuild
deleted file mode 100644
index 9a91376f4ee1..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-20.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for managing identitites"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.ebuild
index 055f58f6caf0..ddfde1583b45 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.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/kimap/Manifest b/kde-apps/kimap/Manifest
index 081c7384399f..85ac5bbdc4b6 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,3 @@
-DIST kimap-20.08.3.tar.xz 120264 BLAKE2B f26910d0a599fad9509debac0a11c2cdf4b8733a3b50f89bdfe9ce2dae8004fa916a428fe73a911ca6e157e4571522901183913614f32dd4124bd4a2897e711c SHA512 c4213042b2b6ceb11986a7af962fe8e7c6de488e06456118527bfcab2b63f68ebc1e66583c8bdb0614156122fcba21d0ec24bd6e9965b689f0451d2f1016b9c8
 DIST kimap-20.12.2.tar.xz 124672 BLAKE2B f03ac4355a6c34af2a249e83d726c0120c12d1a7344e9232aef78adbd3f0f9aa11ffa4610d063fb17c724d7ba335bfec3ead08227994a5796c4ed17a108c5066 SHA512 8017720c029aad508b0f32aee0a338785e72566e20eba03a07ec0644c77b929c90049247988e684e52d34f00025c88b41e36e1acbd83c625a1769fa651fa5317
-EBUILD kimap-20.08.3.ebuild 850 BLAKE2B ce5cf1a8d1bdcfe66e71cd2861652ad3eb684e5512fc0c2fcf8aad819db834db8c2b521638295e8b627057659f66df4a107c3ca2cfc16b77771b93dcccf526e5 SHA512 8cf852a7cb4c1c5de133a0b3fbbd62b0fb99f801afb261ad83ed18d4aac573e5f717e420d282241454de2566e69e2fef722bcdedc620d622f2e19519fd4343e6
-EBUILD kimap-20.12.2.ebuild 853 BLAKE2B c194bb6c77d25ab0bd15eef439c43adba4f9f8a5dfe997dcdd20e3c748769e9f02fe50a2386f01ca70c386c1e7402c7644a687c4139a607774324ca35ac352d8 SHA512 9cd29a91f3e803b6905720eade853b646d6dd4825971f4f66523930b09da62206d47d268cf74664752284d211247af048b91167ef19feb385ee6c75cb1c58b78
+EBUILD kimap-20.12.2.ebuild 850 BLAKE2B 8cebcfec989d3bb53396234813daff6341744887fc0467d16b38c17cd81d700cd06092b8d4d205b6c2bed2ac323894ae474bce8878add2afa3bd2d49be01e923 SHA512 5e4d2a23d4f676163d16a325137580eab6ca162b7c1418dc5e8e92f7719c54fb6f13d383310e74094e9f6a2d6936b5e722673dfefd9f754cf1dd12c8b195fcc1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-20.08.3.ebuild b/kde-apps/kimap/kimap-20.08.3.ebuild
deleted file mode 100644
index a30252b125c6..000000000000
--- a/kde-apps/kimap/kimap-20.08.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Library for interacting with IMAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-# TODO: Convince upstream not to install stuff with tests
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
-"
-
-src_test() {
-	# tests cannot be run in parallel #605586
-	local myctestargs=(
-		-j1
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/kimap/kimap-20.12.2.ebuild b/kde-apps/kimap/kimap-20.12.2.ebuild
index 6553e8cae07f..fe7782838823 100644
--- a/kde-apps/kimap/kimap-20.12.2.ebuild
+++ b/kde-apps/kimap/kimap-20.12.2.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/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 0f8b16c3aa70..3f0fac9fb9e6 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,3 @@
-DIST kitinerary-20.08.3.tar.xz 1756240 BLAKE2B 2c25e6befd0f3924fb80c7ec5de6526b1f45e663104fc8e3637456354f25984a2bc3d4d00c94f163781aa9e55f365887774d586f01ef1c5e9d27bc3cdbfd2e8a SHA512 d48dbb2153662352f7abb0a615f4a88b5f55c783e9aaab92b38c65b15dd22c4f7ab328e3d372ba8a23620711676785f7aaf69b50aa3c73d46adf15045f53f4ea
 DIST kitinerary-20.12.2.tar.xz 1814612 BLAKE2B 68401199d3415b02a087f24e20e2c6772a8c66ebef0122788c189de8c4084337e31af42b8e842605d5062b59cd2303921d20680636ae4f4a407ff03e6426949a SHA512 58b0d3832cb04c024d6e9f41b60d0f7679aaa5aca96c21a6dfca6309d1e1e24f7d5156ee04938b0ac5d5dda463483f96e272abfcb3b6566a9f64238759c1d228
-EBUILD kitinerary-20.08.3.ebuild 1044 BLAKE2B f543b62aa9b97f13c9426a229f8ff571bbc6621d9be047e7f4ed6e8fe5d1df2d0cd4a16ad5b997b1f419cdfdc0e82f56ce209b9cdf0b8816a4b1ca7115f2d70a SHA512 7b7caa7a62cabaceea2122bf03937b7c59ad6b72375dbc24dd9311d2e449fb6fba3e87d0bb31ec2c62b4ea3f3b5cb789bda81fca3eff81ab33759b932e36d1b0
-EBUILD kitinerary-20.12.2.ebuild 1011 BLAKE2B 1ac67283b5570f8718a0614a20dc98640b41292a03c87e6719f0575c8867676a501d071e323caf3ca30dadee9247cffe76777040dc3333b328ed7f5e2da3b276 SHA512 e6c0bd76945215f630da3a41932eb3a32214da7a599e15cb79bdf1e04d84b93125ac2fe430eca633ab2e3b54875425e9eb9eb041a2d4917dc8f9e6eeabad84fe
+EBUILD kitinerary-20.12.2.ebuild 1008 BLAKE2B 0bf0ded43f4e4950c63861fa5aef12ded07c1b37fee83a9b57def548f6b999e55201bc1cf9d2bd75c0d762b8cef27c43775a014b88cedbda2bd335d290fd9740 SHA512 ffd703710b6e8c7e613c7dcfc892d0b83e13931917d054ee8b75e3ee83f01b25dc6e84657b3a34c8ab722e3443f9004ef212c03fcefd49e1fbf7ad933408524e
 MISC metadata.xml 385 BLAKE2B 3831c360aacb09127cbaf52b779ff5b17708424dcbdc59d3c40739cae4742c9d22a95222aae7cbf188e74ddffd22ac58275440ede013b6c18c2f6b8a148bde5f SHA512 3bca0a73900f8dbdd9baf83b3e108d73e074d5713abfbfb5d4ec2923104096f516f409501e05fe9c42c59a949eac333d36ecb1e31b370a2810d7eeec515e86b5
diff --git a/kde-apps/kitinerary/kitinerary-20.08.3.ebuild b/kde-apps/kitinerary/kitinerary-20.08.3.ebuild
deleted file mode 100644
index 4cea276fca34..000000000000
--- a/kde-apps/kitinerary/kitinerary-20.08.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+barcode pdf"
-
-REQUIRED_USE="test? ( pdf )"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-	barcode? ( >=media-libs/zxing-cpp-1.1.0 )
-	pdf? ( app-text/poppler:=[qt5] )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-18.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package barcode ZXing)
-		$(cmake_use_find_package pdf Poppler)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kitinerary/kitinerary-20.12.2.ebuild b/kde-apps/kitinerary/kitinerary-20.12.2.ebuild
index 7281ebfe73be..40bf4c7fcb6b 100644
--- a/kde-apps/kitinerary/kitinerary-20.12.2.ebuild
+++ b/kde-apps/kitinerary/kitinerary-20.12.2.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/kldap/Manifest b/kde-apps/kldap/Manifest
index 9eda3d2bb390..d7a0a908bc01 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,3 @@
-DIST kldap-20.08.3.tar.xz 164496 BLAKE2B 4698c187b194243786608b0dec15155a2477ef040eb225297287965c4f0c3f4a20c1dfb322fbeeabedd3f78044c7accb17c170b142d6b5242a3ff7cc589b4f1e SHA512 7572ea28d415d184950c1d358e420c7ef22030b0aee8e423b5e21349b7a8ac97c22143e706b0f167f3a7ce5e7dcce37b1309d6570b22e0581055bfdb63f26917
 DIST kldap-20.12.2.tar.xz 164608 BLAKE2B 1bb7e65eea8be94abb4d1506208730204265abc6a572be87e5146b578b17679b4afa70a3ebd1b6d948680df37a2f8c6211690ebbb7fa8bd71cb332b109433e61 SHA512 8576fed449efcbe1a49b3d473807d4ab64d0a64a490ea60dfa8019e69a94ce3dbc555c302b8310714febe9c3bac0ed1d8bd0b1a4eaf3ae41d42505deb47bf099
-EBUILD kldap-20.08.3.ebuild 663 BLAKE2B eae113f55aac946567378c20f05e45c0a7b0192f6503a5debf5e00284859a39eef077b44c7dcf5e4941bdd2139e5f6a9b693db936c6438358bad3913c51040bc SHA512 093ba798cd0e075a3cf102a9b67abae771d121428059e78646d33fc2cdaae19a02a8b5ea2d6e28926440371bf7ed3d54d85cb7ab18088f563a5c129807104062
-EBUILD kldap-20.12.2.ebuild 666 BLAKE2B c917413b36aedbe5e2fad7395d8b12354bc232dffed88dc9a2e2386d1e3a06750d93b48bd6c5ef6ff0c6276b7384ab399193496963c069b385dd97160ade9c2a SHA512 2d8cad60616bd657f92dfdcf027131517b0aef84a513927796b3f0b97fe97f6f0c897ce9ff21e6272f6a8774683f0ae8a7e61cf5595eace2a358273f32da7dde
+EBUILD kldap-20.12.2.ebuild 663 BLAKE2B 388c2498b74bf8094d3ddfd4c77c6d2aa74100666869d6d1a88a7c79a421f090039d1290a3d737163bde4563ae51967e851dff1ef6d556b4633db6e7d4ddc758 SHA512 16cd24268b8c058a4eb1c9899d19ec60492b03f5e5f195d0efb97337488b57da340d426c7dea38a9effef7c59bb2e51fe68b7aa67355c6eb6ed3274e63420984
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-20.08.3.ebuild b/kde-apps/kldap/kldap-20.08.3.ebuild
deleted file mode 100644
index 260c8f207999..000000000000
--- a/kde-apps/kldap/kldap-20.08.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Library for interacting with LDAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-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}"
diff --git a/kde-apps/kldap/kldap-20.12.2.ebuild b/kde-apps/kldap/kldap-20.12.2.ebuild
index 95541b7cf054..88048114b272 100644
--- a/kde-apps/kldap/kldap-20.12.2.ebuild
+++ b/kde-apps/kldap/kldap-20.12.2.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/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 516b025d0e36..bf21f651836f 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,3 @@
-DIST kleopatra-20.08.3.tar.xz 1944160 BLAKE2B 1c610913a330a04420a04e89b6760d55ed47f911f7b5830d793a8723b702eddb6748475ab44487cf7a978c1465db868251ecdee9e177e88dc7637827aa4fc67a SHA512 c3c2de5073eee0a21114d9b3b4ed335e6fd7589b28bb82494c840eb53ffe347e4bef15ec54353cac0149bbd08297d05c2c1bac3bb5279260e66131b2249f1bba
 DIST kleopatra-20.12.2.tar.xz 2000248 BLAKE2B 08fd582025a8a467dfc178e6f03f03be640e51a592efe7de3b35b51a5a5c234678a2344135c0475cc1359ee3ea4946d798233e6de112bb3ce52e7ea25e0c31d1 SHA512 23216e413993e61bb1ddb86df4dfb96e2d2b7b2beb27615bf4d55082fdbcb94c61cb3501d5678a30e99d3a414ad1fe3776a08800333a9576098d4ad41f03f797
-EBUILD kleopatra-20.08.3.ebuild 1475 BLAKE2B 978c3d4fea4a466fd660198709c0bf2cd5523b585283001d447abeaebaf5f98a0531043036848b735737bf0d4d508136182368b3e8e26e97d20b00de41162885 SHA512 520ecbec2f62b6067a9bcefab0e4db891cf4f9358908a38e93382bf917b3351fa139759d11ff162643d89355c264e1ffba89f2b980dde57937f4c62bc848573e
-EBUILD kleopatra-20.12.2.ebuild 1478 BLAKE2B 2b95872a9b5bf9f9bc22fb3d33b8ff0866e99c21ee9f3510e1011d5a122f684df0a405a666220f47bed01c73738b81df36551443f35842d9f719cb73ea3263fc SHA512 bca123030dd0e4195a06e0c9e5d2ebc253e5a87249de01ac5222c2526c841db979cb3b7de426b60851dafb44cf1db5f75dd25c0f3d80e321792ed72edccb0dab
+EBUILD kleopatra-20.12.2.ebuild 1475 BLAKE2B 8f0c1330c615b849a030855a7c9773781c5ac1e72b25888a6bd4fa54ce780e6f33093675fa5c6769a1c85c795ae22de5ec04ae74fa5741d0efbf5509b2dba4d5 SHA512 71291ce7ab1a6540d724dd839b61a8c8a54feb390794c08f90be5299aa7a6080a358ef3a24cd89fdcc6540e00f50b171f1da3950bb37ac4732ab9cffd40f4f95
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-20.08.3.ebuild b/kde-apps/kleopatra/kleopatra-20.08.3.ebuild
deleted file mode 100644
index 803886d95041..000000000000
--- a/kde-apps/kleopatra/kleopatra-20.08.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://apps.kde.org/en/kleopatra"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	dev-libs/boost:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
-
-# tests completely broken, bug #641720
-RESTRICT+=" test"
diff --git a/kde-apps/kleopatra/kleopatra-20.12.2.ebuild b/kde-apps/kleopatra/kleopatra-20.12.2.ebuild
index b68c917e49b1..caa291dca796 100644
--- a/kde-apps/kleopatra/kleopatra-20.12.2.ebuild
+++ b/kde-apps/kleopatra/kleopatra-20.12.2.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/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index be09f49267f2..6636eaa6178d 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,3 @@
-DIST kmail-account-wizard-20.08.3.tar.xz 161832 BLAKE2B 01e23924f4728e8a24a83a17a49ef556f125fadeae5da01df57eb0bc3446d387cded535946b33051fc814be06ae46ab240c811c07cad2c238efc71f789bbc38b SHA512 5526e55c8ec49473f41245cf5ebf18997ff4db20637d92fa6db8e20f353a95f255ec69ae03b6eeb9b0ff09180e78260af7392806f931f10bc105dc2dd5f102e4
 DIST kmail-account-wizard-20.12.2.tar.xz 160272 BLAKE2B 543e46692097b0c0737551c025141a14ab046edcdddfa5ea0d626d16a45c1f8c4b49f20b5aa6803473e272cf454802fcca9bc71e28478f7ef2fc0da4c68307d1 SHA512 621e45cfdf7d59a1a1008214baa84af9d09c8bacbc2ed3952d2cf735809e5eaa87fec4781060007eab4087a9aaf1e5c095b369316dbdab59c914190f472345cd
-EBUILD kmail-account-wizard-20.08.3.ebuild 1586 BLAKE2B a2545eb3ad4d82b0471fade12b881920797f52018f118da9711a75f07861be27f69126e241dc2b50308e8917598133d4c4035832805681f77a00dd2acdcfd937 SHA512 2b8796f653254b85bec6e4d31c3b93604adc8a467a9f31fd0252482348a366204c1b84e0da36fe4d93969c7ecfe30af5d9f53d2039853cf25abb0e44cb6e3b07
-EBUILD kmail-account-wizard-20.12.2.ebuild 1589 BLAKE2B 6e7bd672b944062abb6a83de394cb7342db595095489f16bf5d16c4703a43ce8318f4d8c264089b4da07fa13defc6fa232703efafa382cbe3aba6d640718d3ae SHA512 a1d9206223d8284c4b3059182284106735d3ef6e102d9b80911ead4025f7a9894f5ed312870f38a1e08773ffb4531b8a6dd598457960474a7aeb02c8334bd89f
+EBUILD kmail-account-wizard-20.12.2.ebuild 1586 BLAKE2B 6447853c5087029c32f02f9e64fc8f48851c46e11038b41b8a54b0cfae076e67d8c7431f41ab606fb788aa1995911492339cfccf1bcb01b3553066a0ba181452 SHA512 207a5895a033c0616d6be993a45d460e1ff2cee466792d63a2edca4bb4920f5fbe81bfec6bfde8a08bf1d0d4924e9d21342668271bf153779827a7882bfa2075
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.3.ebuild
deleted file mode 100644
index f321712f3835..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.2.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.2.ebuild
index b7e7f5654963..8c34ab9cade9 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.2.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index c342294517f4..3ef84e6bca4e 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,3 @@
-DIST kmail-20.08.3.tar.xz 5157880 BLAKE2B 58c3ef185f08c18a514fb281746c4148d0cef56fec7dc85234ef3ea217c4eca04da5cb044cbf1455478ec84d5ae4a3854e2a7ea061f30e0d700abeb4e3afc626 SHA512 88b3bf94702a61d3082106ca1fea08df6a2231493f62adc92138e2beebb896668aafd1271f20cea5ca0b45e545400fcbcbd42804eaa5727d192e6908f310b3f7
 DIST kmail-20.12.2.tar.xz 4671468 BLAKE2B b95329724286f690a990a100bf88b5c743ac9e06688fe1e8c7208fffb0fe3a600b68a61215d2761a1edabfb56d95264765e790db1156b2c49349fcbfd93077ee SHA512 f6b2b217c95b844b8a4ed3c254a798310da411b6a9bc911378e087c6a150f83d76ab0c7d27bb337b5d5713f62852c3c646f2f8d5a1ef4cd44f7250be38a71945
-EBUILD kmail-20.08.3.ebuild 3431 BLAKE2B 89a8f11ecb8892ad1eb684f7ad8f931035e5513eba6eb97785b4716f52af8d45bc0ae94c17166323590ec51d1ee6225a13f94f058b2d24a26910bbe40fbf0dd6 SHA512 6997f5253b748d1a30ba37434336a9652ff524f921b1ae96953b3790896701f426ec3e7bcd1714663e47d7d585cefcae68e49963398d8da1def6d41be1ded72f
-EBUILD kmail-20.12.2.ebuild 3434 BLAKE2B ce3f7d8114688c17843b982c9865120407ea5ac07cda2ce083ee5062d5dfea28f0c94590e71b046b6f4744d86f72423c81824425556b4f36de3495a6eeea65c1 SHA512 6b87e5d7bfccddbf82718f3f9943eb6f70bc2c5eab59a5a52c8e70150044e1b610e48f21031702e7dd64d52867285f70af791056c986ba679d06dd669ffdb742
+EBUILD kmail-20.12.2.ebuild 3431 BLAKE2B a2311087df478180bb351552bee6e24442513f0b526c5ffd7b7c7dc2900a6af366bd943c2fbd444a0ce83a18809ec37c503541c60d8c8042c18e9126e4971b44 SHA512 5919b130db0efd512c617b351b0b7ab994862a5e4e9166d0001192163cee767a76bdc90c1e781975a19ab2e2f969b122e0e1ba9f9d7dc08bcaa847fed83355fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-20.08.3.ebuild b/kde-apps/kmail/kmail-20.08.3.ebuild
deleted file mode 100644
index d0884ed171cf..000000000000
--- a/kde-apps/kmail/kmail-20.08.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-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"
-
-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
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-	>=kde-apps/kmail-account-wizard-${PVCUT}:5
-"
-
-RESTRICT+=" test" # bug 616878
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_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}
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/kmail/kmail-20.12.2.ebuild b/kde-apps/kmail/kmail-20.12.2.ebuild
index 453b9dbcdede..5b1a935b2e84 100644
--- a/kde-apps/kmail/kmail-20.12.2.ebuild
+++ b/kde-apps/kmail/kmail-20.12.2.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="
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 3ef423abbbe7..f5d0c3e15536 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,3 @@
-DIST kmailtransport-20.08.3.tar.xz 168268 BLAKE2B fb5b72cbd25ba3bb4baf4cb9cec15c92ce681a699def0ac299aeb8d92dbd66c0bc10dc23574d36279dbfa2a404eaa718d678561ffceb136c454b936e5cca8b24 SHA512 48613c60a270f61bdbea57107f419bdb1530776e0321d2f41dba2dc8dd70b52946bd1ea84dc957dd06e8091d16f08b0bb3de1f58cfcae17ed486c5abf2c56173
 DIST kmailtransport-20.12.2.tar.xz 168128 BLAKE2B bb98fd98b0e3bac7bd77e754e36ddac0b0f47c5785e45f8b244f1c54bb50816f92e38cc8d777ac55addfa4cc94b21a9f0409b8e94f8dc18461d1565a3e610843 SHA512 3697c2b3a9025ba0df9d6fa608bf2a634f95702c0188fe2a6625f13ae536a16f7b8c4347ea682d85259bf6fc92aa46054d245a822b8577282242fb02f6b2b1fa
-EBUILD kmailtransport-20.08.3.ebuild 1035 BLAKE2B 0c5d3ccf91e8f544c6ee05d4cf9d58c16c853d8cf9f08667005e57b992b0bd5ac5b5b77ee2fb941ea567c232b8a8cb8c53455174f4202058942fde54874741ca SHA512 67cf94dd6594cab4f891010d9f187a83c3111ce8faa35035284c2a543a08cecdae9f9369d96a0afd187e86c18c94cc577efab95ec7fa64aa5042f7ab1b66b9e2
-EBUILD kmailtransport-20.12.2.ebuild 1038 BLAKE2B 982308e241b2647586ce492e676296b7a26f1a3dabbd760b8d730d709662295b456154a7069017a71c106a2bfd222ac12c52e201b114ba144c3ce9a659a6fc12 SHA512 81a20daf49f8d560087aeedebc73ed137f5e5bc72f997afa76b95caa288a067364b1bac7fcd39ef956699556a0586b77dff0a030af9bec0fe7ec19677f1412fa
+EBUILD kmailtransport-20.12.2.ebuild 1035 BLAKE2B fc9b58af02bf40342b2c0f3a37d3ad1af3089fe680b6e6380d04cb5e7faeca8f3c3b49c374dc1c3182e171bb213b9ead8551cd383798322741d5ac1ae6da2e0c SHA512 13261b79e4af534f8997c411d835df4ec6a7810dcecd4f5d05352e7633d25618b249a30dd199af343faa5be4485793ff18c0d69caf1a990562cc184ba2bc5087
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-20.08.3.ebuild b/kde-apps/kmailtransport/kmailtransport-20.08.3.ebuild
deleted file mode 100644
index 7fb197215f62..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-20.08.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Mail transport service"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/ksmtp-${PVCUT}:5
-	>=kde-apps/libkgapi-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild b/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild
index 4b9075c7fcd1..8a980c8c20ee 100644
--- a/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-20.12.2.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/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 8a59cd680863..26bba14826eb 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,3 @@
-DIST kmbox-20.08.3.tar.xz 24800 BLAKE2B 27a025ae9493f03cf47c0117e9a44b3ee951bcaa2ca5f57053b50fd3ab4a7baf9e518e4922eaa9697444a933a6ff004f1d58865f39e3ed021eefb367e6676102 SHA512 58edacb2ef03efb1d51a143793839a5fbdec293a97867edd95b481e6b7bfb22f729db6ad156064ebbdb30a45be99ba9524bdace707b5a69d6fad06a2d702b629
 DIST kmbox-20.12.2.tar.xz 24788 BLAKE2B 388433f58ae3742af5792e4a0b758b77a60d5b4daeb61ab713a09b4c145265617659df1f7f566db00d7774cd2bb28cabac4920581f9ea90971ffe67b3c450a98 SHA512 02838f06d9866e77de79463622b9cd464ae2847362cb63ab8510b4fd8a5033fa49322dd554b8b8b5fe6fdea4b6fdb0aa3f4e8374a00e7c5c74d36e0571f420df
-EBUILD kmbox-20.08.3.ebuild 360 BLAKE2B d297f3247875a66988e54db8cbb60da2c2442d704c963c27d0f4078ffed2f1d7cdf22977ede190933fb389ba1bdd13ac8e92499aa559a45be28a20dc8514d6b2 SHA512 f9089d1b5979a50cd33637de702807fafa58f7db1e7a0ec478b008df0135f8f5f24a76f23bb78e8cced90d1e7d872801a418814e9ea936a23dbf4261e99b3ce2
-EBUILD kmbox-20.12.2.ebuild 363 BLAKE2B 79da5c18e82ab856ef60a7da3bd1d6f850d8be3753ab2379b9cb8440405e57ca33061dd95e9acafd92a9c69cf4c9636c1b73a9c65285ad4b9e33169a2efebdac SHA512 7d77f92a817dc6769d49b268571baa61af39b0788a9c0847d4a2d3ef014b66bd7e181f0137ffea35e74e9e5488ae1b9bcaa89e02b4d02526861ae018769696c7
+EBUILD kmbox-20.12.2.ebuild 360 BLAKE2B 4c2888b908bb267a9d28ba6cd701e4a6d8f8c3c46bd7890bbc5ec006d59ce451d125f1f60efc548c6ae7b5ca789c06b918aec8177f18d1b65b392fc2e39646aa SHA512 131268e0cb8d89323fe3b10dec5594ef60436bb1b3e65fd929f87fa92a58c007b3c8a92827dfa96605b3b690c0b772cd0f3c97ec504732fd8296d45084ea1733
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-20.08.3.ebuild b/kde-apps/kmbox/kmbox-20.08.3.ebuild
deleted file mode 100644
index 8aadc8cf217c..000000000000
--- a/kde-apps/kmbox/kmbox-20.08.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org
-
-DESCRIPTION="Library for accessing MBox format mail storages"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND=">=kde-apps/kmime-${PVCUT}:5"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmbox/kmbox-20.12.2.ebuild b/kde-apps/kmbox/kmbox-20.12.2.ebuild
index 60d5ff84f72b..9fed4aa0ecb7 100644
--- a/kde-apps/kmbox/kmbox-20.12.2.ebuild
+++ b/kde-apps/kmbox/kmbox-20.12.2.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 3b7dc1b85292..ec1f83125dc5 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,3 @@
-DIST kmime-20.08.3.tar.xz 151700 BLAKE2B 5321b88142bb45f76fee52c6f583dc4ed491b20715c7fa8e4b0b9db8b1608c9ad5654e48970bfd461786f3d66b92f120a816de5601cb7922903a7834a7415c06 SHA512 3dd4314960d5dceed08206a8d997f38b294de0244fcf3a7f4859f913401ae86f5bc8cc598d9b7cf132373704e499c1eccc13e9dd11bfda0b8a5b04a66421b65e
 DIST kmime-20.12.2.tar.xz 150928 BLAKE2B 6ad3783a43af23d1e3fb288622e123bfaf45d90e38830544d1fdc869951acb12a402e49110f69bf704215e993725361178abcb7deaa70b2aef2528c730d8cdf6 SHA512 9166604af411e92a863d29c362bc1e2efd98a4388c4f20e20ad2244a363832a6012a77ef2e57f58ded0276e38e9a8afa43f9db00b676b54eb8c4dc3b3ce17e41
-EBUILD kmime-20.08.3.ebuild 407 BLAKE2B 75b262a94588a1342df122860818f693d754c2967f0fe5afdaf98edf7290765864c659aa8c03d5ee0002adb5a1b8cfebbe9596264734fe3d00829175e0902c94 SHA512 13b6af03fcbaa15c36b89a96da53dbd8478df18a4aa232c78931076a431abf85eb4144eb9b049f2957bfa8aad6632f22be55013f3d8f70ffa39a240bae642eaf
-EBUILD kmime-20.12.2.ebuild 410 BLAKE2B 13795980210b862b7fc1f4dae4707db1dbc48e7630a3ec8d64db10f5dbcf5a62d7fddd4f943c764acbd10604a75ccb47bff63e6714f723495eb54a9a3c5643d9 SHA512 50812a92d4fdda13c308ff76c78203c2ad7fef23926bc8ba5f252eca3491ece9ddc98403aa3f7cc67da29625724eb1664653a8e9657c7c556a20253867734bd5
+EBUILD kmime-20.12.2.ebuild 407 BLAKE2B c730aceb1d5852a8c93d916975ac08d5338ed213532d89ead9ad3249cbee78119bef13115426a54feb2c972f442e0e36c593983ec055ed711f6329ab6eb409c2 SHA512 8a05e1e6247e92f9d24e23fedb93ab7b6333f529ab7c27fda2948852ab3fc139a42d390be12e9b097c7461a18a50506d6570050d5476a4f799f6a82992cc2f7f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-20.08.3.ebuild b/kde-apps/kmime/kmime-20.08.3.ebuild
deleted file mode 100644
index 5af999cf1431..000000000000
--- a/kde-apps/kmime/kmime-20.08.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.74.0
-inherit ecm kde.org
-
-DESCRIPTION="Libary for handling mail messages and newsgroup articles"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/kmime-20.12.2.ebuild b/kde-apps/kmime/kmime-20.12.2.ebuild
index 4ca7bf9ad8a4..16f273ca1b5b 100644
--- a/kde-apps/kmime/kmime-20.12.2.ebuild
+++ b/kde-apps/kmime/kmime-20.12.2.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/knotes/Manifest b/kde-apps/knotes/Manifest
index 469578851a9f..09d7618f71fb 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,3 @@
-DIST knotes-20.08.3.tar.xz 322452 BLAKE2B cb07719d7623549d63c0af6232923a7b522db933920af0f24208acf3500412386a73b755d42ba3195ffdf1ec1ca278cb9dfb01fe70c237b6cdc0c2ec2007d8ea SHA512 79babf26d257775fb150e3c424f876e29461257780204605cb5c8af8fade803fb112217489ea69a90923fb8a2b7a08cbebc75a9d1836bfc3b3cab9fe8f8fcfdb
 DIST knotes-20.12.2.tar.xz 329504 BLAKE2B 7ec1c2fc977c44c71a5e8fa9fe85c505e04f0982a511c5cd31de018d3f6886861dcf2ea1387a17f5e9d7be843f0538714d09403437e7974184756f05cd2ef2a9 SHA512 f6aaa00da95e77055729f4fd74b207cba96bb2a99f7a21f3c6eb14eeb3b1bff44206839ebb1a18fda92079b45324a6597b5e248a96078b80b3c85bb1c9102ec5
-EBUILD knotes-20.08.3.ebuild 2141 BLAKE2B 4954a6d75da35b1771cf4df1c7d8bb372eaac1bf6947d66b7062c171ae10c7ccdd465a90312f21d3bf865a3dec3f749c2b753f8713d98b58fa6053a35bbc2149 SHA512 fc60d83069e6b67c3cdb2a2e72f851ab13e106cbddc144260b092c4dd385a000cdd42d69e8d41ac30c9e51d1c9cf21c69dbe68ff8b159809d17f7179efbfb62c
-EBUILD knotes-20.12.2.ebuild 2144 BLAKE2B c32ebcdbaa3bf9fdd5056492f24d44771191988a0c3e5feb26be3eb75879e06a1f634e2c38193f23e9190e5c2a0ef292aaca4cb120f536469bdacb1c72ff6db4 SHA512 b4a19d796af619d5b93f04814cb96c24b01f995f2bbcbb19183c33cff44e852fa2d1ae482157d89fc2295f48c5af2669008f751e7e3da2fdc2c6ea49254b56a9
+EBUILD knotes-20.12.2.ebuild 2141 BLAKE2B 7872e7a487646a6bf1be13ed1b5ae83f752efe4633ff0453eafa209eed43e658d360da9e498ccc0a63c7f410ecc97e3015ade91093d2995e41e670627b9e640d SHA512 2d7f2262dd11f462f4f7aa93d017d3273699a9e2092ae1b9bd643cb7eeb247a1faff90611452d93c26187d362f2bf89aebb7f029d241f76d38ab3e1411c312a6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-20.08.3.ebuild b/kde-apps/knotes/knotes-20.08.3.ebuild
deleted file mode 100644
index fcfb0c2c981d..000000000000
--- a/kde-apps/knotes/knotes-20.08.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://apps.kde.org/en/knotes
-https://kontact.kde.org/components/knotes.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-# 	local mycmakeargs=(
-# 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake_use_find_package X Qt5X11Extras)
-# 		$(cmake_use_find_package X X11)
-# 	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/knotes/knotes-20.12.2.ebuild b/kde-apps/knotes/knotes-20.12.2.ebuild
index c739590c9af1..172faf6bb269 100644
--- a/kde-apps/knotes/knotes-20.12.2.ebuild
+++ b/kde-apps/knotes/knotes-20.12.2.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/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 659592a5ac44..8c0982c2f753 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-calendar-tools-20.08.3.tar.xz 228576 BLAKE2B 53d3beb42c766f0ac47ea54b5294b61680a6e712ed624489b7df2c182f014ec07fbcb81bd47ab6a2b045515a7d85f7efd1616b9aa672338e84b80258d98298b0 SHA512 d8dc7fbd74cce1081f2398d1d5478e08cd0b7e9c4aed5dc89b3a54b43e0427526c9a47f7304667b796bec2cb53d0f17d4541345f647165f50edfff44c7ee91a3
 DIST akonadi-calendar-tools-20.12.2.tar.xz 224864 BLAKE2B 137a0d975242b2e419007ebc9be0eaac55e5f024b708c78fb773158695a0bb0b673657b8634423826eeba03cfdab75ff7e85bcc6ce09e33372a0927490d0b9b8 SHA512 12ed3517ec1a308bbb80691bb1fccf29a2a44c9715436288f51aa5eeffee25c3842d6664c1bfbe7c2ac669806d5ae0f0123bc1dece279953abd95feaafafff81
-EBUILD konsolekalendar-20.08.3.ebuild 988 BLAKE2B 2ac628a1f558ba847f708f47fa2654cac4bb29ad378cb813d54d0a01742651d6754029a6354ea5b3075f956f0b5b8a0d85f3579dbe206637c534d6f999ea53d6 SHA512 dd09ae2458d2a535b5285641ec746b7934c7a423c8b401ecde21594e7baa3b1c54b027aaf2cbf7d63bd47bb028a7365dc4c479c4a98ef5bdf6a75cab837b5dd9
-EBUILD konsolekalendar-20.12.2.ebuild 991 BLAKE2B e969332bc9c7d9a2e416bf41cfe74986247ed971d0c94cd7852b119a830c048c677be839455415aa0f4f14896b69901108ed05e2903a67dc04225b25b00729eb SHA512 ac8c9f01e15bbd7053902ae4ee8aad6e13afbbbe09b6828356ba9d418df823023dcda472040e992bad280fc18728f06cf19ba6f3a5ce25cb54e797807e248949
+EBUILD konsolekalendar-20.12.2.ebuild 988 BLAKE2B 54dcb262eecb185862eb4d649f8769c3876c5ac22f1dd34e660475ee9aa2db549811fe85c0d1d576a51a10710a1d21537c37ed5c2450ecd2da8e124017486664 SHA512 48e91613ddab34df79224278efe0ae758d8c1b53b94d7565e8d44687471f31e26f98405c4000b2da76e247a0dd892d83fe7e348249ea6395cabe82d81acb38c1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-20.08.3.ebuild b/kde-apps/konsolekalendar/konsolekalendar-20.08.3.ebuild
deleted file mode 100644
index 91a7022834bc..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-20.08.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-inherit ecm kde.org
-
-DESCRIPTION="Command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# delete colliding calendarjanitor translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/calendarjanitor.po || die
-	fi
-
-	cmake_comment_add_subdirectory calendarjanitor
-}
diff --git a/kde-apps/konsolekalendar/konsolekalendar-20.12.2.ebuild b/kde-apps/konsolekalendar/konsolekalendar-20.12.2.ebuild
index 64a6a8c373dd..712823cc8e75 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-20.12.2.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 65e074f018c1..cf1014dd808d 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,3 @@
-DIST kontact-20.08.3.tar.xz 794980 BLAKE2B 9d4b324360345ecfadc3e3163436086379abdc27c3477ed37300e42754b35269fd1765669d4a243cf36701b7e784bd423e60d3f122b4f5e436f3b7710744a16f SHA512 b90207279a2f344731c5c9caae45bcf5a4c0eab1cb13c364f9bdbb2e76127c016b0a422f3730e10cd15345a3241345e535f39e88a46e946b87130e856978b857
 DIST kontact-20.12.2.tar.xz 790952 BLAKE2B 8d5a126d62e1d1cc151705bc2ac843625d866b1aa70d63d012341343dedcf0664b0c3e40cb99561f27e71ed4120357c2d9dbf0705673e74ea8dd9161d31c4d83 SHA512 52adbf4f201eafa819b17a88be5e409de5a06bb34e755f57c638b2cc315936fb7c8214d3242f2cdcc62924f44c416215acb1bb4da1a43641d996d3eb4ce44e19
-EBUILD kontact-20.08.3.ebuild 1449 BLAKE2B 661060a79d55cf230d477f286159f7fcd2e90f59ebdae5cfff75e7ffa1646514041fac9d6c7d65a7d5fb5c01482582ff239466510dce087b8b4fcad393cbf760 SHA512 567b0b2335233bd5f636fefc0cf05a36af4620df9d8fb4962080e119fd7aa651f5c94d733c3fd8cb8539a8d6e552e4c2b2b04d74d92e2b155521f5acf3b2026c
-EBUILD kontact-20.12.2.ebuild 1452 BLAKE2B c44ff73078c7882e09b02733992b97923a7ddcc1e5697e43437b2cc29c3d6576d1ed889fe820f3c81734af5ca3ae12df8450898ee1125ff1ff821bc100420fc7 SHA512 3d43464f9370d608b32a0a4342b31902f1a55be9d1bf133af7f5dbdc958337c388aba715cd9c7123f7ce9ddf7cd377fc09b8350bc0138ef98ec61dd7eb3586fc
+EBUILD kontact-20.12.2.ebuild 1449 BLAKE2B b5a4347a7e1739d611182891818210de92d6740cf1068dae776f7ec74f194ddbd2e0ee54a1aa9367183a17d91fd54ad29c67bc2b67d258f3a371940284787727 SHA512 45d3b09761546a791093b9ac7125fb8e6791c03c9219e236064e9c633e121a769bf00d21d70a830ef1c91339324bc3a8f4ed18253d2a1f8c6a2c26dd81ae2089
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-20.08.3.ebuild b/kde-apps/kontact/kontact-20.08.3.ebuild
deleted file mode 100644
index 08b6a682b088..000000000000
--- a/kde-apps/kontact/kontact-20.08.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-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"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontact/kontact-20.12.2.ebuild b/kde-apps/kontact/kontact-20.12.2.ebuild
index dbc00e1e0fa4..77e83bad0295 100644
--- a/kde-apps/kontact/kontact-20.12.2.ebuild
+++ b/kde-apps/kontact/kontact-20.12.2.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/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 6e6f9e571bc3..28cb3d1a0071 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,3 @@
-DIST kontactinterface-20.08.3.tar.xz 36032 BLAKE2B caede603ec9179f0116da9f4a8648e66e72ea76dfd5dde0a0a9790b232b69cdb5147fe3fd14dee6d8be639c29fea662464b05841fc2942437854c3c2eddd74c1 SHA512 e7d53e1dc5623c0adcf8761f004447956dae79e66a9ef43e63aa9cf936b64c63257a1d5a1ae34403f5bec969e3f6387d2be2e0c24f1f02cfecddc47141707b55
 DIST kontactinterface-20.12.2.tar.xz 36072 BLAKE2B 4281849413b64fb3e62048b0a8089453071c617ded3dbbe97d055d4eaeecd5346a36538e2c2d14bfd74ecfd1f051278d203ad008c92f4ecb84c6571f00e58ae3 SHA512 dd0ca6de301206e661ef217209fd4bc2b9c925eb2d191487931a3a187d6d511e661cc76767ad102a1fca6c6e0d73e87291beae99e165552447bb578c19c4eac2
-EBUILD kontactinterface-20.08.3.ebuild 711 BLAKE2B a775e3137635869a5700ee44ee61af70b5aca9e00c4cf6a42c6aabf8817b14399093f3405945eb54f77f383e76b7c7570c9991fe75387f1ef48bceae7b88bfa0 SHA512 a274da2088810975c8f599bfabfb3a51fc8548f51d106bab17efec9f438b3c232b4e2a91104ff9e98bd3e01b89d5643081880064cc876475b6f922111d4c7bd5
-EBUILD kontactinterface-20.12.2.ebuild 714 BLAKE2B ec29a361b1b2f46451332ae272bb7acc9f9330cff0d4c0b856771052cdce045e32b5d51941b1470852cf92edd15278e8a3c55f962c4add97bfb1c5c2f584ed8e SHA512 b5f448fb8bcaeb5b064cf2415af8135cd1e8ef4162ac31d51c27cbaf5b1a6a4b7a2e0d0952b98441223a8b737c5c2e727ab03bbbec02cf94c4e62f242ddf6a83
+EBUILD kontactinterface-20.12.2.ebuild 711 BLAKE2B f04847cf4d4c9a276c73cd02e455b66c9f201680afd9139bc86bcdd2303f0af9ff77bcb1dfe8faf09ad526bad33b178882fe47e1b00501a5a28aaf210386173d SHA512 5afc7c99e78f422ad273ca56b07502f0cad91f92164751b928c8fa0b7bc1f5e4936fa27f6b378e2a78e4bd2f5388d8a3c0be6888771684c5f08839492e79f8df
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-20.08.3.ebuild b/kde-apps/kontactinterface/kontactinterface-20.08.3.ebuild
deleted file mode 100644
index e082be74fecb..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-20.08.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for embedding KParts in a Kontact component"
-HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontactinterface/kontactinterface-20.12.2.ebuild b/kde-apps/kontactinterface/kontactinterface-20.12.2.ebuild
index 13294a8e276b..779d7c25edcb 100644
--- a/kde-apps/kontactinterface/kontactinterface-20.12.2.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-20.12.2.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/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 0ce5fb65fe74..1b5e96d1c55f 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,3 @@
-DIST korganizer-20.08.3.tar.xz 2251956 BLAKE2B 689f10e6fb94e507c1622984145f816392a0986e7475b7da92676db05a498bb9095598ce13be9f219fce69c63b81ad061664a564c8e5b76cf7252cb0b5c2eec0 SHA512 6b53da5d7ac2614e82c19f78b788eba92ba9e77bcd2bc7384e0d558fb9ec87ec09fb6a2033b1f70fd81c1f1e646249d64308a5cc02157939cfaac517354c1723
 DIST korganizer-20.12.2.tar.xz 2246456 BLAKE2B f4126345fc0cdaf44f31cea13621a821677f45710803fa34bc818b6b5aa086b2776cc6a67118f8948f09c05c06e0132e99d42b9ffe2ce64f2d3c8451d98730ef SHA512 0170efde8e906ccf9f68bf18a08b44ba49a04bc75211ba8c328b6960b7bbe2e33f58eb614825bf318685e4f5aeb579c214da5b60b7fe478a989f56c4fb31beab
-EBUILD korganizer-20.08.3.ebuild 2760 BLAKE2B 80c80afe5f27504e76c0592906bcb71b161b95f4f6ee7cdab1e9b24a3c1facafd7d9c7131804e004e87318ab7ac278b4519f583dbd81665843c89a6807c6873c SHA512 2e20d6dfdd3654cea374b5ff7a384f5d4ef264f1922c8c0bcc1e3737fb448a4d48fde67b6afb5930a6d438263fdcf8e036e952c9413c2a716899b153a51cb0f0
-EBUILD korganizer-20.12.2.ebuild 2800 BLAKE2B 1ada38a1e8cb414ecf03c5a1e953269fc4c0204f8abd6850dc3e2e0ec8b71248f11b52d8a8336c234c7da95674a4d2628f2e6d347e87cf88a563d822e24cf83e SHA512 0a5b255979a235d9112bbdcff9762613a2237995d341446f0518803d7c8a9c7c2eccc2c9e3c07a3280fc6e1011f16aa9e14ea36ca14aca1d3cc76740e9dde099
+EBUILD korganizer-20.12.2.ebuild 2797 BLAKE2B f3eb82c68b93df6b889d4696dbc7052acb94cd527ea28f6e64ef655e1fcdc3ed5e50f1ee643b38ce1f5ce0a4e521a2b264eba1c86d9e4170d8c8338e7d23fc4f SHA512 5ad7603708e4690010093393cc5382524d9c4d569ddadc61ae36eeef4ada6c0bee9f1df4cd03ea1acd299234c586591cb4a6aa93fef6ac1b9c0052d106a279e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-20.08.3.ebuild b/kde-apps/korganizer/korganizer-20.08.3.ebuild
deleted file mode 100644
index a52e09b5d66b..000000000000
--- a/kde-apps/korganizer/korganizer-20.08.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://apps.kde.org/en/korganizer"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry X"
-
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	telemetry? ( dev-libs/kuserfeedback:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/korganizer/korganizer-20.12.2.ebuild b/kde-apps/korganizer/korganizer-20.12.2.ebuild
index 3bfc463a4e46..50d67663f6a9 100644
--- a/kde-apps/korganizer/korganizer-20.12.2.ebuild
+++ b/kde-apps/korganizer/korganizer-20.12.2.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/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index ca899fcaabbc..f0c8ec07add7 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,3 @@
-DIST kpimtextedit-20.08.3.tar.xz 188856 BLAKE2B cf99ad277df9d9f1c3de1d5147fe3bd90df6a126c06f2d078fcb99e57ebc597bbbccae4eecdd2ec469939debde45c663676c4bda7b5704e31e9625d27c741d6b SHA512 8a893740e27ffe7c77df454a1355d384f5d257bedd5db0929b51acae4cf64d7793cb46e156be0aac95d2733170089a3060388a8237e17040fd3ba7d38cdf8d6a
 DIST kpimtextedit-20.12.2.tar.xz 201248 BLAKE2B 8ef6a248f86ff4003a28e6992b19545d75f5be33c134d6fee75cbd5bf5f048a7a2d6902c61627342ec856df07d994f93c22b9ec697a0d487320463e84f77d4dd SHA512 680ceb87a508d25b34f2c20651e44381e3d631797cfbec30646497e2a1fec93eb600f10509a35815931faaac8305d73b18aa9cba68065e1a79dee0d10654e52d
-EBUILD kpimtextedit-20.08.3.ebuild 1023 BLAKE2B b48f8cc2ee81867710351a31b822479c537bbe49270272310d6ce22b4503cf54f48a8f84e52934afb996f7a63899cc0d6df48f43c2d194f4e2a1ea3854252be0 SHA512 d22c35d967c9ccfabc42ad574691c5f3c54cf32d7e66d67ff719052bcca5688a1809d1a87d22133c41ceaccc5bef47414f07c31c19fc00de37df75e6b2fd144f
-EBUILD kpimtextedit-20.12.2.ebuild 1026 BLAKE2B a6d77c41ff0161d6d8d4ab38e6bb65c59482f8e88bd124e87e7152315768fa6623dbc0fcc44746ac91d64e16e28b4c9b049a0638e923ed74dacbd558adc8c6bb SHA512 9f4bc71275a302a1a2389cb6fc0d39d827107349bfd105c64a998d69f399ebd8ba1e56771a632d62a5ff024b62060fb9b7932b06962cdda9327840bd6986b80a
+EBUILD kpimtextedit-20.12.2.ebuild 1023 BLAKE2B 1ee0d8f23b0957a3add29afcb5ce9d77ae15f2bcdbca5ee0233c67d2861935e1bbfb35147b8f92f9f8105f937cbcf212d255c2eedda08db35790038fc447d2c8 SHA512 f4e16496e37087fea8b7819af5a5f13f551bcde337dfbab1c8be3b157aadf5511a5da7d3ead9846c56d2d6f9b71eda01de2fa1c5971ed33ab5bb9d56683c7021
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/kpimtextedit/kpimtextedit-20.08.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-20.08.3.ebuild
deleted file mode 100644
index abc9e0f0d6b7..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-20.08.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Extended text editor for PIM applications"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-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
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kpimtextedit/kpimtextedit-20.12.2.ebuild b/kde-apps/kpimtextedit/kpimtextedit-20.12.2.ebuild
index 1f515663b190..f3df5b26a4a6 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-20.12.2.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-20.12.2.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/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index 90e9e33da702..36845892d4d8 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,5 +1,3 @@
-DIST kpkpass-20.08.3.tar.xz 23364 BLAKE2B 94e43c7b70b41a812424236fd17d6a7630df2d854e114e49244b9b23f4d99cd05fba43629673a8122ed44c7072810c7a93f15b075a9492f0c91012d84a86a77c SHA512 f32e8a0ad16dc0e271203c86da2902c90352ef436cfb4dbad88e4abd3a5fc60ad873bf0798a678c0d3d793b723ff2006d667c4ce6750d4760d7e55b9f9b2dcce
 DIST kpkpass-20.12.2.tar.xz 23448 BLAKE2B fc39aeabdb73118aad1fa7222e726f24fed743da5b27fe94b2e178c53e7fab20e04d3373015160e0ae73d0c6a51fc5231a97860d2ace55e42caf1bb91a45b6dd SHA512 a5b858f802131b84632fc1c898a76d414b12ccf341a0a0f7a0850555b91a2e1a26528e6833c084fea49dc1b4054735311a318184afe580e87979335cc2690267
-EBUILD kpkpass-20.08.3.ebuild 508 BLAKE2B 2deadc4cfc4778eccd1a4927b5f2c22cb3273e5423b43d88617a2af0f553eafba32090378e1498bf12beb1e79acb92dbbeba51e72eca3ea846e9ea8a40116458 SHA512 247728323f4ac7b02986b82e1f1533b3b45ad85cb1c9ab19230b2d55259a2df2d0790739ba0f49a19e61f82ef3b379b089ca769c2e5119e5172d775fd7d61f5b
-EBUILD kpkpass-20.12.2.ebuild 475 BLAKE2B 86fa7df4d957774712cb4167f83921de4ec8dbfbd47c10d61dc934dbd419fc0ef37ac6b4fdb33013b6cc70add7558bdf2d295338766ef20279c95073a5c59363 SHA512 960dc93b7ebb84ce96a7d4be0282ebe1fc8bcaa963bbacb3847783df0edbbc4af234c6a2bb405104aac10501669d012a5d81b51cb61dcbf4543bb0e4c2f96a12
+EBUILD kpkpass-20.12.2.ebuild 472 BLAKE2B 8007902fb89362fef1ba7038d469b4a97c85181d4b0320d641de62e30efcd4683615f7b5f779f9720d3bbaea0b294d12014e8908fdbbdc53897fba27cccee492 SHA512 55084a75e5fb0c2d27d6b2f2ea9ee550e7b6bf2644dbb35c8bcccd26319280cce3401130f7509e2a139b9d724a443926192928a675c10f4d0dda704177b6eda9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpkpass/kpkpass-20.08.3.ebuild b/kde-apps/kpkpass/kpkpass-20.08.3.ebuild
deleted file mode 100644
index 8e6ad53295f2..000000000000
--- a/kde-apps/kpkpass/kpkpass-20.08.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library to deal with Apple Wallet pass files"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-18.07.80
-"
diff --git a/kde-apps/kpkpass/kpkpass-20.12.2.ebuild b/kde-apps/kpkpass/kpkpass-20.12.2.ebuild
index c6997dcfa7d8..b7b5eea883ad 100644
--- a/kde-apps/kpkpass/kpkpass-20.12.2.ebuild
+++ b/kde-apps/kpkpass/kpkpass-20.12.2.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/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 83abaf093c78..de605569db6d 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,3 @@
-DIST ksmtp-20.08.3.tar.xz 42436 BLAKE2B c203c4be99b25ec3dd29c17d772da381d5a24efcb54b524fdb4fd69dc5d572076d95db331734a2b1d5409ff35d3570f2263666ec4395b44db481535704059d5f SHA512 57f549f1e37f09d656ea338688aec663fe56b08384f57d1cea5c5418c073f1ada90941462bbc279619ebda7243a961c7017e686ccc89f076e0d68c20307d4eee
 DIST ksmtp-20.12.2.tar.xz 43092 BLAKE2B 74a757a58687d4c76d6a6c6c9c5931ff01938c206d482bc9a02d00bd46fef942ad5fe785b6e2c300dee889509cda1ed489355c3ab2f00e65efd039dd53856a84 SHA512 d336777948705f4d79ba6ac2c428caa467da8d6b0853defd8fb42a150c10dd25ef0258f41ce2549212e27dabca58e17eddb0d6425d2159e3d21eafaa29e369a5
-EBUILD ksmtp-20.08.3.ebuild 602 BLAKE2B b7df712ad420f2099974c78b44279e86448b53816c460f5e7c71bc16a35e85e3725a4bc52c39aab2fd7db364fe668205ded915ea389c5ee53f7442295c21d8d5 SHA512 643a09aba0f95ca09bf8fb271f59ce670191d54d44ed4ec89b6930cd99c849fd6b35ab44052743d65f5aab851b8e5c66e2716a2f58b31dfa896438df5f15f528
-EBUILD ksmtp-20.12.2.ebuild 605 BLAKE2B 4f1bb3e48dc0efd8c4b4b59213927c51e42af221c0eea9b6584bec44ae5b38b0e37df04efc22b06ddcd7a761ee1bc0cd9e48ef8da27a98483b7a8aa0905f1c85 SHA512 566746b5638405eeb54409dbf58667d7949b59c12b65aae216a06fa7583cc8c46621a3d3f5de8f6cc3236e07ac7de12f61a627d1664318236d33ff7c91d247ec
+EBUILD ksmtp-20.12.2.ebuild 602 BLAKE2B 1b7bc60db3ff905f7ef2db18dc0660ad4cd00b9314f527b6c20fb2c62c62e8bb344da5ab59e9ed48672bb8a41f6e709bf4dba2cd227a9a4042142890284bf6cc SHA512 5a6c566bb18c06d9650f12b1efc505688cc69a39bd1925fc634e916bbb99f9f347874a51f1158930d86a0fdb99ea668241537149f1752e1b4d374412ff9be3a6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-20.08.3.ebuild b/kde-apps/ksmtp/ksmtp-20.08.3.ebuild
deleted file mode 100644
index d9ff616b8cea..000000000000
--- a/kde-apps/ksmtp/ksmtp-20.08.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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
-inherit ecm kde.org
-
-DESCRIPTION="Job-based library to send email through an SMTP server"
-HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksmtp/ksmtp-20.12.2.ebuild b/kde-apps/ksmtp/ksmtp-20.12.2.ebuild
index df2365e79226..804cb09bc357 100644
--- a/kde-apps/ksmtp/ksmtp-20.12.2.ebuild
+++ b/kde-apps/ksmtp/ksmtp-20.12.2.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/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index 1173971f1d70..b7ed677ad340 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,3 @@
-DIST libgravatar-20.08.3.tar.xz 33564 BLAKE2B 1add9453d5e685d2d370c7fe79138a0cc00f66ae5e89e0f7eb77d4c9e72b9978819ee6541b037ae033ee494d497f17bc5f07b949cde88c90df3e6adc93af87b0 SHA512 f17d6f78bcf51bc9d9f00745e430845fc7ed3540e92560db40583cfbbfc74fa7310e68a6694cb49f60c731315411b5784e338a9d079ff13d4706889e3464b871
 DIST libgravatar-20.12.2.tar.xz 31124 BLAKE2B 86912421ba998f8a151c730e32b2b95de61d43d26c34b675fc079cd01ea74fee273638d00558fd121d33a977c4019112e1b96e1f8a36f455e910b5cc1c136522 SHA512 4c5d9706d7f4530fd6ba27134855e1c033af245f72aedfa87045939bf92e6c4e35a87ebbc0fff0d4982f1295c23e65fdeadc13a1530343a213cb4ffed0693a7c
-EBUILD libgravatar-20.08.3.ebuild 822 BLAKE2B 422f0c8e2a97da6f83f12efb7937977d4a86f55508eda6cf2d8c1d3def6bd1009ed4abafeb7823c55bed43bf83c8031d2504e1c7857cc015018e5107e0bcc10d SHA512 fbae30a8424f32e2e8a150b1fbc00484eb65174852186b92aafcc71ed0263459dd672309175b99a2cf1b8dc7b9194dd16269d09578d9a7a4d2d87d89e7099cd0
-EBUILD libgravatar-20.12.2.ebuild 825 BLAKE2B 1be3f33ae19042e8efdb56c2a7c90fc5e39017cd38b4028e943580f4680cb7385b71c8b88d0c3729069b470df24b9588ed733513d753074470501c7c0316293b SHA512 8fff918fde0bebe365834439d6fb9258f2bbf2095508ced956169cd6ffd5db157f6c0b54de45fe1b07e53be41a7dbf3b13f7a9249c43212a34aa6f23790eaf45
+EBUILD libgravatar-20.12.2.ebuild 822 BLAKE2B 2bffca71e80b8f1b8551ed7466585b2057828a74b4246a9a99b5c466eff2d88829fc2d8c6d28f7c78cd57dfec0d707f7aa1b6a067ba721ccc7ff9a2cc3b59262 SHA512 d23f43dc6d8761a05cb5de7f87c187ab8a470d464f458b1ce02751e0b995b0a4f02452b054357868d97f9411862e0928ed68e082459775d3717d525dcadf34d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-20.08.3.ebuild b/kde-apps/libgravatar/libgravatar-20.08.3.ebuild
deleted file mode 100644
index f026bded1eae..000000000000
--- a/kde-apps/libgravatar/libgravatar-20.08.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for gravatar integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 624584 - needs internet connection
-	local myctestargs=(
-		-E "(gravatar-gravatarresolvurljobtest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/libgravatar/libgravatar-20.12.2.ebuild b/kde-apps/libgravatar/libgravatar-20.12.2.ebuild
index 7cf6687095a1..41f1649bdb99 100644
--- a/kde-apps/libgravatar/libgravatar-20.12.2.ebuild
+++ b/kde-apps/libgravatar/libgravatar-20.12.2.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/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 95341d1770e1..8e2d7d41eada 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,6 +1,4 @@
 AUX libkdepim-20.12.1-unused-dep.patch 1208 BLAKE2B bf799fc0c6fae2c87761a02a3c3fcd0829901bd264aa818e2b0921d7f1f7ddb3ec687daa93941acb9ee0a2019495455e150fd8e3b32daf2086af10e0c3d0e393 SHA512 55cceb528bef90c9f5352c1e2f8a04e5a2cf2652e6cc36240498fb899829c4b212f8768c5f451e1f342348f360ae4ef3018eb3ef637521760dce4fbe4ca6e645
-DIST libkdepim-20.08.3.tar.xz 249656 BLAKE2B 0ccd3d3620dace60a18424f268861e8053ff148e96137f61327d854c5c6144fdfeec7debcd16eb7ace3e97e184d2a37712ece53dda3137ed3869b43077b004b1 SHA512 d9e9d90bde82fa7c5692ee4c67318b580983932aecf1efa30edeed01aa83718be7f40c278c5a6197156f3d71ada9a376f5aa07a32dd8cf7eeb1608f54b37645a
 DIST libkdepim-20.12.2.tar.xz 238548 BLAKE2B 0f859d3e081b4b26f96e0d66844ac68301ba4c3b4f59e22f8648f575cc4048fe682cf82233fa75a7d1c80c5c756ff1efaf6ca2a947d1d71616af48a315c037ba SHA512 fef76bd6b086ffe7bf232d6d742583a4d146c3dda31c15799708b86d23f29fa175dfce86ac084ced2cd107968dd21116a8f5e776e0ab67347ca6a62c35e4d877
-EBUILD libkdepim-20.08.3.ebuild 951 BLAKE2B d9c8c0db428ce7f47047f9fd4288c8f73429b576f269ee24c53307f83d43a28cbfc7af522dfa1fe344a023a194a88e7542b2d595ecd3a13102c1da4a7e22ffc8 SHA512 686feaf22ce0deeb0503ededaf77546c31b30c3a53d1a292581ae844a6851c78bad9662d1339ee559f4ec8ae140903db6647e720fa0ae5f7fa84cf85033a6a48
-EBUILD libkdepim-20.12.2.ebuild 904 BLAKE2B 6290b6f75ab366112d69d946693b94865e08832e079e8084aee5dfb425b2ef0e0147085b261b74ad93ae3279aa9b0dfe6483328d5e6102bb687f3bdd7d7459d9 SHA512 8dcf4f4ef833e66c007e8a4a735db708976acdfaeb4576d6d5ff7d7c542df34ec441c634c1b750bc5c311565f090907b35516018af6be95f13cf58dbc3d2548b
+EBUILD libkdepim-20.12.2.ebuild 901 BLAKE2B 1668c8e957ea6ef12a6dfb96b8db7d21fd0ee8910334c06f2610dcb09f6a72473ffe422ace04d8b413929a6e2525adf0617bdc05e853ab10ac87e87280623167 SHA512 9bc5216a70ed4309a47cb4e8a31e8423449312ab26fab8e80e0b48021c5af02ec6a26fbc61110dc01804bf8718dbab4ffd1d948fb1ac3384e6abb33a5ddf2564
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-20.08.3.ebuild b/kde-apps/libkdepim/libkdepim-20.08.3.ebuild
deleted file mode 100644
index 8678d670b046..000000000000
--- a/kde-apps/libkdepim/libkdepim-20.08.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/libkdepim-20.12.2.ebuild b/kde-apps/libkdepim/libkdepim-20.12.2.ebuild
index f815ada55283..88400a729a8a 100644
--- a/kde-apps/libkdepim/libkdepim-20.12.2.ebuild
+++ b/kde-apps/libkdepim/libkdepim-20.12.2.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/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 4ed95975c0c1..0d940885e8e2 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,6 +1,3 @@
-AUX libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch 1048 BLAKE2B 749a388aff619216b076975bcddaccfb13f33a41606e3ca93dd7bf53264269460ab38ff1493bdd3e1085cf57c13186b82da0cad079b7e0725e43d39a49156444 SHA512 55f0a8a18334d5f0d9dfc1fad782ae723f53a663aa505ee87876a2f233cfba57b7721615dbbeb00162d1219983ddcbf3bc96452e8fe3dcacc23d9b92fea89ed7
-DIST libkgapi-20.08.3.tar.xz 242676 BLAKE2B 86b04cea376eb46081632fb571bdb3a67f4f44f3dd6c8a3af0144598634417ee39defb445324f33969420718daa999f43c5ea5d9c01634a0ec944bf457219fd7 SHA512 de7062632660777074f4d0d8b754b072c7f2b0550260e994d1db3e99d8f258f2507ad605d91cb6c465794ced92b740a742ab99947737edea73fd928c087d4388
 DIST libkgapi-20.12.2.tar.xz 246020 BLAKE2B c934898d8832c0264919a313d25d6a74a7a377dbd5575926ea6bc6ebbe8870e37691b307b058b67a5ff09d9bbf2db759b4d98d93d347a239315500e7f95d5bdc SHA512 0350eaff72b192219553047781e1ae79bc794b9519095f812a1c8efe3e9d33c3dbb5d9db07bd28a39132adc4543627e2c46a866aec9f8710ef2d35cfb0a1f697
-EBUILD libkgapi-20.08.3-r1.ebuild 964 BLAKE2B c0b64df147b671cd0195741608dd6ff4371ebff462501607379b7d3a2feb8d4445d0ee149113776acd79714077a1b589e6b8353aa870076302c5e45bd71ae2a6 SHA512 bbf84ea6f0e690c627fdde90be1206e2f8f8b62b56e4072a23b4459db3808914093fa258d6c7a11d1171f3a2cdd4246a88572d556b76345c196772606b97124b
-EBUILD libkgapi-20.12.2.ebuild 763 BLAKE2B b80d1308df096b0ca2325260177be83b2c8e48cd98608ec150539e66c1de33419f58693dfbeecd6ae53038c58fb31bfa6030a1f7a4124645034fdd79ccb08e7a SHA512 a827eb73fddd9d4dbabcc1cae77c5eeffd5eadc11102cbba926e96ceab017524fb2a8015c3005930e4a314bb1e884ce3e956598ff084002e4d87b96ac515e901
+EBUILD libkgapi-20.12.2.ebuild 760 BLAKE2B 9d3b7ba26dec2806dfbbc083eb5ef4924b900aac5d25b9b297bf96b121f6d0f3065cebe1e5fa93e6912cc9d474145a4aa97559ed066020b6a58f02ba320a5f06 SHA512 f2e578e67177d5fee67e91a762c8edb318f7784a525454e4f365c54a19fa27f325a13345e1e4c2b22f034facbdfd39fac63d42d07bf9c69ab6f5324cc5162497
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch b/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch
deleted file mode 100644
index 42cd78136ad1..000000000000
--- a/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 570c0fd731af9ca4cead249d1db6133acc21f7c1 Mon Sep 17 00:00:00 2001
-From: David Barchiesi <david@barchie.si>
-Date: Mon, 24 Aug 2020 12:04:17 +0200
-Subject: [PATCH] Remove duplicate "gContact$groupMembershipInfo" value in mock
- fetch response.
-
-BUG: 419629
----
- autotests/contacts/data/contact1_fetch_response.txt | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/autotests/contacts/data/contact1_fetch_response.txt b/autotests/contacts/data/contact1_fetch_response.txt
-index 7b22c91..89fc0e1 100644
---- a/autotests/contacts/data/contact1_fetch_response.txt
-+++ b/autotests/contacts/data/contact1_fetch_response.txt
-@@ -44,12 +44,6 @@ Content-type: application/json; charset=UTF-8
-       "$t": "2018-03-25T16:37:29.565Z"
-     }, 
-     "xmlns$gd": "http://schemas.google.com/g/2005", 
--    "gContact$groupMembershipInfo": [
--      {
--        "deleted": "false", 
--        "href": "http://www.google.com/m8/feeds/groups/MockAccount/base/6"
--      }
--    ], 
-     "gd$structuredPostalAddress": [
-       {
-         "gd$country": {
--- 
-GitLab
-
diff --git a/kde-apps/libkgapi/libkgapi-20.08.3-r1.ebuild b/kde-apps/libkgapi/libkgapi-20.08.3-r1.ebuild
deleted file mode 100644
index 99b60fac04bf..000000000000
--- a/kde-apps/libkgapi/libkgapi-20.08.3-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	dev-libs/cyrus-sasl:2
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-contactfetchjobtest-w-qt-5.15.patch" # bug 754159
-)
diff --git a/kde-apps/libkgapi/libkgapi-20.12.2.ebuild b/kde-apps/libkgapi/libkgapi-20.12.2.ebuild
index 9f09231fc49a..1f8552178b95 100644
--- a/kde-apps/libkgapi/libkgapi-20.12.2.ebuild
+++ b/kde-apps/libkgapi/libkgapi-20.12.2.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/libkleo/Manifest b/kde-apps/libkleo/Manifest
index f429316e13d2..627f95f97ab8 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,3 @@
-DIST libkleo-20.08.3.tar.xz 355120 BLAKE2B 3c5f14498e98e7efb8b6da302979294a0fc8ff9e13fe3409072063557ae6a9bc57f7aa9df03ef3e979aabcb63a47032291001c8aaae3e0b234cbcbfe14977e8b SHA512 9c8c7d5784f47a8edc411853ca8fc0922b494c1a3036c9d354514468589fa28e8a2b7cc6e1726955ccdc4074588f859d3ea70b258f7c198c09cd1fe3e689477b
 DIST libkleo-20.12.2.tar.xz 358600 BLAKE2B 1b1802adf16605d6c8e3ce8fbf4e56a353cea5e3cc07a060dd78d8fe4f5adf2e1ce74c12942e803283a07fb9db237fc049a3bf1adf64f59337dc79e71bc31bb6 SHA512 38b6bbbecf37327ef8ce55f9d14750c4fbfa8ca9712d73906f13e42ca3e199e6fbe2b9dd28afdeaa239aca73cf6608a12246472238e235eee099305d9c48be50
-EBUILD libkleo-20.08.3.ebuild 960 BLAKE2B 65ee1b4ce2fb2a4231627102fe461a6c30c894cf491a66782f11dae7f2087858d584ad4580e4034fdf56de7b10c845e2d52da3cbf1b41884b2b73b11ac4ddeac SHA512 7c03d839244bd6f346711feb13a51c4ba6bf8b58cc0020910931a05189466e50ad443b25384dbeb0c8b5406bdccc6640da1ec63ab443b6c13e687e632e9f1b62
-EBUILD libkleo-20.12.2.ebuild 963 BLAKE2B e689a80f302044ae088a3ccb36758601a7d09237ab010d3c7aa05e8cf2885120b6b2533c0e0c82230ffddd66fc6c27f8525c16139f87425a19562a7a508a5fd1 SHA512 b54e7c71d0686110545d07459bcbfb8aef827218e7e35990cfb6bf35cb5b587ccbd03f71624fc44144c7ad363382815b8966f375cf058c9b31ed70fde492ee93
+EBUILD libkleo-20.12.2.ebuild 960 BLAKE2B e712e645d3daeaff62bba6ae1f933c4fc0dcb18cde123379e16bb0dbd79a11b21a266b3ce0f54208416b846762917bc2315c16bafd798565560695354a4ccb53 SHA512 aa13eb3f1e40d070e447324a17052a6051ecd5576234dcbac90a85ebc6cd2200fdd686ca525b7245aae793987f95b5e6af15a193e6629c1a7f6ac02c75c4dddb
 MISC metadata.xml 368 BLAKE2B 971372ca098974cb69299f52e0b44e479517a0fb2f70b6c23fe762d93675674d62e46d5d4faea403edba12828ffc0c32fa274d287d1c71ff499df69d2e52a2d3 SHA512 dbef1e7970af1f4cc05ea180f5beecab9288d5502c365d2dcbdc418a67868baa9245bae8ae0c9d637ddcb3f88a03061285fe144a3a117c722654045fd7a4a58d
diff --git a/kde-apps/libkleo/libkleo-20.08.3.ebuild b/kde-apps/libkleo/libkleo-20.08.3.ebuild
deleted file mode 100644
index 7a5887dade04..000000000000
--- a/kde-apps/libkleo/libkleo-20.08.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for encryption handling"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+fancyviewer"
-
-RDEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/libkleo/libkleo-20.12.2.ebuild b/kde-apps/libkleo/libkleo-20.12.2.ebuild
index 55a6164c2090..7405150e5372 100644
--- a/kde-apps/libkleo/libkleo-20.12.2.ebuild
+++ b/kde-apps/libkleo/libkleo-20.12.2.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/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 8bc6867dbf10..82f12e61ee25 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,3 @@
-DIST libksieve-20.08.3.tar.xz 560144 BLAKE2B c2b03d38045909a3adb2ed65650d593cabf66734993eb1757cbbf8954e4c587fd720cc53e3f3821b10d147bf2f6c0608c9d9c10d1a0fbcc606dee582103bf81b SHA512 419d142bedc36b3cf21b3808cb95dedd17e3ffa859327b45ee5b5808c8907c08e164f0d5e9ef9bbe617a331352275a7d6d3b375689377e26962e22cf558f7505
 DIST libksieve-20.12.2.tar.xz 558380 BLAKE2B 50efee16805c4d9acf4f9760c4e9c5adee2f7d9041bb9755c91395240519c71eabe7eb28bb8962d9fb68233672754f9183edd89296320cb23f1fd6e3c182308a SHA512 18a44446a390cc5f682e36fa282ca34637e6c245fea32bd23f1aca9bdbdde1301d666b6576b88b37f665bafedbd85cf62a9c87f569548a1e2b85be25f989d6b5
-EBUILD libksieve-20.08.3.ebuild 1406 BLAKE2B 4fd3b149b480f3d2693979265bcadff0ba942221af1d49cb5c694703729d275d099141074f85644e5aa126076433540256dc476aa0d8ec0b0839fc335d6e668a SHA512 e8ce74a2e79cad269f5508114544e42d84fc8921a22af4803d376c8b157aa156626da8596f8c515c7362c675da8e5cc893ae436832d7b51621be06f67f241e89
-EBUILD libksieve-20.12.2.ebuild 1409 BLAKE2B cff8e3ecd81cf4c11d587f070006a4e8f337afe1adfa981df49d59b683200e691505ce87e9345662dc0dd9361e8e2e73a9497e8ff85d83fecaf981e10d7d10d2 SHA512 319c9d8452701d9f0780fa17fc39a1334eae1c5f5c7564ec32bdc08d0ef78092c8e2060902589d932034d20111ed2e83602dfbcd3ddcbb1080f0f3f25709bf3d
+EBUILD libksieve-20.12.2.ebuild 1406 BLAKE2B 1aaf734485b7847fcb0082a7fd20cd8fcaa4bd74818e383c602b175b3dfaf60989503e47b846d1eca245895397ac9b4bbcf218cc76ec480bb8ea5f8aa1700230 SHA512 eb534ecbf15581046eb789e8a1c00d05efb639e797712ee82031b166bc8c065ca62eff92e794f90e3e14d4a2ec4d3d8aa0db4397437c5330cd8efb05123422e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-20.08.3.ebuild b/kde-apps/libksieve/libksieve-20.08.3.ebuild
deleted file mode 100644
index 04f2f1697224..000000000000
--- a/kde-apps/libksieve/libksieve-20.08.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-	cmake_run_in kioslave cmake_comment_add_subdirectory doc
-}
diff --git a/kde-apps/libksieve/libksieve-20.12.2.ebuild b/kde-apps/libksieve/libksieve-20.12.2.ebuild
index 108a92c7ab14..0f3ae90ee9ab 100644
--- a/kde-apps/libksieve/libksieve-20.12.2.ebuild
+++ b/kde-apps/libksieve/libksieve-20.12.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 9a188966b715..85a83e0dd787 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,3 @@
-DIST ktnef-20.08.3.tar.xz 299888 BLAKE2B b4ef35c3b9d4ac3548f981527a073f8fcc735414af8a81efe3996862868f2087638cbe771e9dd0d975bf7880728bdde9a54842ef9c225728c2fa598dad035268 SHA512 9838061585a177d7487f5ffc022e99420b8d429eef7df660397dd5792beead18fd301a3ca1e1faf85fd3a4ed01508d99cd5fcf5ab6babf85f475239ff3e8dfef
 DIST ktnef-20.12.2.tar.xz 299868 BLAKE2B a6b8c67bdce00e4a392f80fd666af6aaca0d5ca85fab28681d2bb323c68d7755e576467eb9243c6ae383f1ffafc3f657ec6338d995a5aed023c7a1d130b4f40d SHA512 d59701455f7f9fcec54d2698fa3f16e508766e098f0b14e96c5cad8921428f2f43ef4cf627330dc3b1809b91ffadd5481feed645d4f1e29f7c16225a73c315e7
-EBUILD libktnef-20.08.3.ebuild 545 BLAKE2B 1666306f44a53cf0c04885c558be360bed91a565da9dbe4dbfc50c0435b7a02791ffd6efc916e46f2e7d4423357dd0d8a45c397f23b30ee4cd69a86eda16da82 SHA512 88273e64f4285fd8bb5ef6520a1554d59045ff2f8591bdf3eaa5361e796992adaeab335b75f5580330defaa93380d78ca1fa5a39a33855a4848abc48a4a72567
-EBUILD libktnef-20.12.2.ebuild 548 BLAKE2B 48889c0aba231825e8624dfaa5b4d9926b0f4a1bf3b70c9c74d8f859b6ebba13dacaa09454063f6c42286c8f739c1962604d2dc1b5ac214a8cf113d175dc1418 SHA512 7d7389a6c3d747bef2a049e1bc92482b119561ec459ccb3694c58858fe19f5c4716a656fb7f6cc46078bfe2245fa57be5f49eaa9ce2bc668c7021726b34bcec6
+EBUILD libktnef-20.12.2.ebuild 545 BLAKE2B 899c524c366a750f1cbd1d1c0437919bc126d2fb7f320537030d45fa128245f9a81b54108647a2c7f7d38d530e3198d401b529b1828020e35f1295905b86eb74 SHA512 d21804eaffabc888b4add33d9ae58bcccd079f7b4ffb91ad6ba06a84baf33f0f6ede16d7482b5af8e9d72d72a2f0cf8bfa09d3daaafabdbbb24d45f2840206d9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-20.08.3.ebuild b/kde-apps/libktnef/libktnef-20.08.3.ebuild
deleted file mode 100644
index 0dddb6ef8eac..000000000000
--- a/kde-apps/libktnef/libktnef-20.08.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_ORG_NAME="ktnef"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for handling TNEF data"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libktnef/libktnef-20.12.2.ebuild b/kde-apps/libktnef/libktnef-20.12.2.ebuild
index 9630e971e3d7..0c2ac2980a32 100644
--- a/kde-apps/libktnef/libktnef-20.12.2.ebuild
+++ b/kde-apps/libktnef/libktnef-20.12.2.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/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 5150d6b28d49..de3ee9720fa7 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,3 @@
-DIST mailcommon-20.08.3.tar.xz 708792 BLAKE2B 19e1d512e0264b212d85f34d911193d8f0f455f18a51b90cac3fddb7b373283ba42598e2012b3a585298bb00bc907ab09ed94087e5114da3384b8a55fc7ec609 SHA512 b7f21ff44fb2a9735fc870217fdfe947adefe08228dcab16caefe25d429ba19d431c0774b73860fbd9a45e591e749c49e6bc6db479327ce21bb95ed505919056
 DIST mailcommon-20.12.2.tar.xz 723900 BLAKE2B 010a1e65b53c45dc0f91b51efb337f8a2c0450186e87b2c017470d7887c74a32eda1a834b9ee8a8df54786d058861c3fe29c75a9cb54912565a963f49e84de21 SHA512 22d161ea3d7330b02b5b21ab71864e3be7b067fac5518317471c7b1342b2a5115d5a5cae273bd5783788de4fd61ff82a1ee41c802900978b7cb38b14b8e78743
-EBUILD mailcommon-20.08.3.ebuild 1682 BLAKE2B 729228802e786ec47419527c92e102d1eefbc2cf32b51f7f74660ef9057c3cc964d44cf2ba1e1feda76bea936dd49dec3daac4a0261bc74faa2b83d1b2f5a55f SHA512 de65f0fc6e22aea2fa3598942ea3f7f0483b96ad8605c314243b8b271b456758db1c5df2b26ff465f6e276d322d3aed5a47be2ba508fcc9f2169972cc90039e3
-EBUILD mailcommon-20.12.2.ebuild 1762 BLAKE2B d8f5c84ec3d78cfe15836f03232cc548430f6662dde0b4c7364dc772b3114aa21a32452b0fc90cea8b2feb4ae4122933cadb15cc65c20cf2c5d8ece44dcbca2c SHA512 fa7363ea4ae076b3d06f5c80056903a7b07b57d4725c7f7941eb0cf3b59310fd981fd2d700bdfcdfb7d1cc8f99c268a0ae4f38c78fee42f29379b6f562a087d2
+EBUILD mailcommon-20.12.2.ebuild 1759 BLAKE2B 4764c15c24799ef9c0b56a7b57a8ef9f3d7fe6024ae83911bdc15b78ba37207d8f3b1fe13f63ca8ee215e25583584729dcad813dd4408b64406640d2e332f8bd SHA512 4316da53ffaf88ab8be02a98bdfbe48007da715487a6aa927b61531d6232a64352dd40f660df0e564c45439455290f2a85a06a5dda85002f109ef9c1e4300fc0
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-20.08.3.ebuild b/kde-apps/mailcommon/mailcommon-20.08.3.ebuild
deleted file mode 100644
index 9089aab1a701..000000000000
--- a/kde-apps/mailcommon/mailcommon-20.08.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common mail library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-"
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/mailcommon/mailcommon-20.12.2.ebuild b/kde-apps/mailcommon/mailcommon-20.12.2.ebuild
index 9cffbdbc33ba..6f8422e1f752 100644
--- a/kde-apps/mailcommon/mailcommon-20.12.2.ebuild
+++ b/kde-apps/mailcommon/mailcommon-20.12.2.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/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 2fe9aa4655a5..6fed713297b3 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,3 @@
-DIST mailimporter-20.08.3.tar.xz 541548 BLAKE2B 901b641c2cc77181d0a6de9eda52901fb06d2b69ca4d114225035a8ff2508cfabb9121a32679b28a40e4a77ff02cb9e4ffa714e5a2c35ca16c96d6a4c2b56a86 SHA512 0aa095a4304bd20c928f79ad0e8d7edf2fce7b750244bae4f7ec4b4aebc31f81b1010e910fe3619355639f731b2026610023509e4406d8439c1259df331c6db4
 DIST mailimporter-20.12.2.tar.xz 548636 BLAKE2B 39080c6a8cf829e0a4f4e72b09d3fb309abd7013a8cf4ae3f26b0be8040e855a3e56ce3ae9bbf492e1342073d687615961b0b686f6afcb21839a62e32d3e53da SHA512 a7ed6b2d6acd322c1fbfac5a6bc0d370715a1cdcaf615647fd908e06bb058f9226f20c04e101f01d520f31c98c0ddb5b05404119fa1db9b8e474e049a0056de8
-EBUILD mailimporter-20.08.3.ebuild 789 BLAKE2B 0dabff525c1881cdfd2e67c489f47a6a4c0b73b4ec2c75e7500288d6b15067ad37818bca8356be1001aac7f29fd1382127d455f213c5f694e6a1ade3df25e8a3 SHA512 46323da7ef53aa003d201d80353615cd837c20fcce80ca4de58156e8d625a5c4052139dc2fe0d29544c1feebcaafed40f3ee9c06f4d5417969e74140d6e41f1b
-EBUILD mailimporter-20.12.2.ebuild 792 BLAKE2B 4da34b126833825e869f4f1bcf55b0eb5c94ad6d2ba6f9e64dd40d23defda68f182c67e0ac204b4380d89a60dfe3a8d4e39d20da7865da7ad9d93b662bec4754 SHA512 2f58055cccc73a3bdc928a246f2d3fab2f142422470d10010918c1625cbb9c5c0d9c8d61159d179e9efaa7a6a95a53c83baf1609c9e9f9e97b6d09fbc5c033ad
+EBUILD mailimporter-20.12.2.ebuild 789 BLAKE2B 243ba38c8341e5afa99a02ba62c3379077cfb7e1e369aa938ed2b36b504189f47f5c970cd10ec161e2544455a137314450fb07abccaba44fe2b47ca254dc0e21 SHA512 8d7680e0e006de44140e7f5305428bc9787d6acc243d43742980c5ceedf3557401de29cb4361c8e90b8732145737cc2390fa0f0de2511c4c1b9d319fcd8a0cfb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-20.08.3.ebuild b/kde-apps/mailimporter/mailimporter-20.08.3.ebuild
deleted file mode 100644
index 2fb184ad3f87..000000000000
--- a/kde-apps/mailimporter/mailimporter-20.08.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library to import mail from various sources"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailimporter/mailimporter-20.12.2.ebuild b/kde-apps/mailimporter/mailimporter-20.12.2.ebuild
index b8153ecb3344..5253b4f09d64 100644
--- a/kde-apps/mailimporter/mailimporter-20.12.2.ebuild
+++ b/kde-apps/mailimporter/mailimporter-20.12.2.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/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 84e9b6321223..bbd154e55bb4 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,3 @@
-DIST mbox-importer-20.08.3.tar.xz 34756 BLAKE2B fb5dcec096e28910789d059eb7e6e5db27844087386aea05bb4211a876c71b18a5a303bbd87fa73bbf9b9f6bc1b9ad79582c0aab52b9fbf4484e34952d7a8872 SHA512 1b5c2c413037137a69c05855bb31927c6c64ae2ece0e68bb585e719b3cfa1c660a8bbf7c664f242ed21e1e88d1977388c5ccd4b0c370b6b9b2108360780f5ce9
 DIST mbox-importer-20.12.2.tar.xz 24772 BLAKE2B d90529baf92a2ea78f026cf03cbdc27390c1044c774df2e8d2d8bd0201eecd7786d328fa7412b34a04b89886e61ebcd3b7b4136d02bd293fd56937a5cd2ca49a SHA512 e751606ecb47692d27ffc5b0c08b1550dc6eb769d42051ed4c05f43a07e21701bb7387078239c4c201aa21169eee26309b64f1fac53f0943cb529136e4195313
-EBUILD mbox-importer-20.08.3.ebuild 922 BLAKE2B 918fadba5f47647009b1ff322763a965ae6c289fdbf13315c70c393844e7dbfe3e0db686021aa71fd37e0a0dbee3483d202d64f21d25d4465210e8518b7944cd SHA512 0e44dfa6d97711faa01613e8f5a6b5b44394473517c66412372d6d00635ead04c1d7c1dd7b3ee18e27bc0271f1425800d1a14f569f0dde57b8252955013be753
-EBUILD mbox-importer-20.12.2.ebuild 925 BLAKE2B 28ab0e3ff6cb7a292c455be9921fe5e524ffe03ad082939b953517d6b6d7a148e7fbe848ac2e7a72b61b064207b5f6ac5c608acc8861ef22d1f8f6602272ed18 SHA512 187eb85ca42b5b7e5a8ad088d57cd76f7d8b204c4eb5fba17aa9347d69ab358a83ec59445caf4f29b0c5297d4f4f7708c5602246f325bf3017717201fb5c2f82
+EBUILD mbox-importer-20.12.2.ebuild 922 BLAKE2B 2ba955427a1761935817104b74a057310220f7bfe560ee34f30e465452bd4c08e5adcc90fde430e1cd4c7c4162bf4c477e9cfb4e269f9fbbab2e06cd6bdbd060 SHA512 c902f3abdc2a65a150a0c3d01987c37cac65df2ef37f041cfb808f91974a451a0f775a7e954c3894e942450b7b563daa8fb874f4da789cb54f7369f31e422c7f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-20.08.3.ebuild b/kde-apps/mbox-importer/mbox-importer-20.08.3.ebuild
deleted file mode 100644
index 88d2ab350d5d..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-20.08.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mbox-importer/mbox-importer-20.12.2.ebuild b/kde-apps/mbox-importer/mbox-importer-20.12.2.ebuild
index 7267d862251d..baff0019624e 100644
--- a/kde-apps/mbox-importer/mbox-importer-20.12.2.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-20.12.2.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/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 427db667cf1c..147f74cbd991 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,3 @@
-DIST messagelib-20.08.3.tar.xz 10531248 BLAKE2B 2a612a839fcee9c663ee8cca07e45b1d7f4ad2e268af91033862d4372ebaf0340ecc2d4f18919feaf8fb83ab2e319729ae4ade7deeeda75b8aa777ff8a3281e7 SHA512 6a66838f1810fc19ee862f7d67d69667fd5ea1c081da325b7ced20c7a19ae8bdd0354c1a0dc482bb0ee68f9d55d4505ebfb0bee95b74d7406b4ebc2cdcd29c6b
 DIST messagelib-20.12.2.tar.xz 10542352 BLAKE2B 5aba18dff341f18dd30af8fd0f76434319496f5e4d7edc047e24e865ed325f33b6651b7329c592183f641dab107bf7a9f6a4ed344cfae07d63167caf414a661b SHA512 bc75d49ea1411dd75d35150757b9f1993e4e1b4ca1347bebbdcebc8c029dc18ccd43e83abcb375622a2638997c0346e15d08a9131b232c1032430d27bc71ff89
-EBUILD messagelib-20.08.3.ebuild 2169 BLAKE2B 07fce845ee4f626f001bbdd9598389b6ec59b39d91cbe7717a5a6eb581234d48be23beb8f5472264869840292cc044ef3da1b8e25123a2577ab64a54af1e851b SHA512 0b40f98c83974be9e77994472b16b2b11d5605ffa8f70d85f6e9f91115fa9aef6b12b84c985dc4c55738d3df1dd0e2d2085fac5889ab5774e89f93517f140ea2
-EBUILD messagelib-20.12.2.ebuild 2172 BLAKE2B 1a235fe9846ca985322d8c6a88436b85604ed5aea44809c63506c64baac06549a27237987b07a59d5cfe2d021bbc1575dca58827e1577fc09cd73ab6d496471d SHA512 3461fc8285b75c4f2948cc53fcb139d8f69adf4b802217f4d8550f7b81382ab8beadd3df4a18405d56b9668b47202a0d62b1ddeddddc444c9988662c4697202c
+EBUILD messagelib-20.12.2.ebuild 2169 BLAKE2B aa49250a74f94c9505225ff92ba5d1334a4b1bb49db228f143138e6ecfd5210c688ae71a21d0a1179d70a63b8551bed28ad20409ee82af9fe3eed95e1283247c SHA512 73327a50f583f8a5ddd679f0b692587305225c869698f775956d62885daccbcdf5917f4358e59950b7b5146421b89e23a606731cea678782d7bc71863807cdb1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-20.08.3.ebuild b/kde-apps/messagelib/messagelib-20.08.3.ebuild
deleted file mode 100644
index 32954751d3f1..000000000000
--- a/kde-apps/messagelib/messagelib-20.08.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries for messaging functions"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
-	>=app-crypt/qca-2.3.0:2
-	>=dev-libs/grantlee-5.1.0:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmbox-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-# bug 579630
-RESTRICT+=" test"
diff --git a/kde-apps/messagelib/messagelib-20.12.2.ebuild b/kde-apps/messagelib/messagelib-20.12.2.ebuild
index 6bd4ccf59a35..55c8a8ec4d74 100644
--- a/kde-apps/messagelib/messagelib-20.12.2.ebuild
+++ b/kde-apps/messagelib/messagelib-20.12.2.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/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index bb667614f762..2c536c7a667e 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,3 @@
-DIST pim-data-exporter-20.08.3.tar.xz 399520 BLAKE2B 770af04d616d3c4c397074ebf3702c98b9ab1566428a0dadf7ac416c2167a465b06be0d4047f3a6acfa4e97d5fb46039e2efa0fe3dec43e5011d5484ebc39bb8 SHA512 70459c941204cafb60c1c77c107208f32b41b3d50902c8ee9d10d40f126265c8ad4745ddbaa2b3e50537248acd6883d71a568105f5a90d94bcc7b5fa9004339a
 DIST pim-data-exporter-20.12.2.tar.xz 400376 BLAKE2B ed88c2292c3a5cc70a0382cac11c77a891fe71755e2a2ab962cf2d8aa7244a6222b30759be572a58682de50f3d50a05591141e8f1147373ef6947e27fe8c4598 SHA512 a213183e6f7e6086de511c3f8171de52b705c7097c85dd149ff912959b420df20c3ac5fd96c61687dfca20e1fe6745e48e0884deba914c3cda1274db36d7d153
-EBUILD pim-data-exporter-20.08.3.ebuild 1613 BLAKE2B 674ca6a9f260cc73f15500b623c72112f96223df32427d8404d90c0328e36c223cf5722cefbe2f0d7ef0d6d64468394cdf79f28d168c1f3b41f0f659db2d0ada SHA512 ed4dffaf2ab60f026985f824499ffd033986fe587552ce3cc6fc4cc9fbf35dc577c2a1a521c8fea9efc76efec2e5bbcf0301af09e2c13bc9da6b5254b185f44e
-EBUILD pim-data-exporter-20.12.2.ebuild 1653 BLAKE2B 6c81519af9e79419eb8ceaa3408b311e3d453bb7e2a9bc7c67db12c4a00ff95ceb6129c62cd75d6ce0969aa2b1a71f3c3fe04d42b281881d0b39ccfd6ddd7d85 SHA512 5861f7f0e3424ba31f15748c2d5ae6428e3f8c428353f236aee3dea1aab81f313a29f6aee8f743e71f4a625208ac80bf33735efa37098bfa976e0236cb1d7221
+EBUILD pim-data-exporter-20.12.2.ebuild 1650 BLAKE2B 29cf82ffb999ed7e650195d7af44a245c78c2f771834412a575c4b7f5d567a8315bde9050472ad2c1be54c93a00df7ec6171b1d18d0f83507422f2e44b2eebe9 SHA512 fc979c5c55ba17ca7ab53c37292912f6336cadfabd2a71d2288df809780073df314e79e131aa6056dede138a9a740356dba58977f663af224dd502c7751765a2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-20.08.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-20.08.3.ebuild
deleted file mode 100644
index dd9808d39d5d..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-20.08.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE="https://apps.kde.org/en/pimdataexporter
-https://userbase.kde.org/KMail/Backup_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # 11 out of 21 tests fail...
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-20.12.2.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-20.12.2.ebuild
index 81a8615d4826..30091bea2315 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-20.12.2.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-20.12.2.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-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 44b55881d6d7..75aacd2ee6c5 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,3 @@
-DIST pim-sieve-editor-20.08.3.tar.xz 454436 BLAKE2B 7143e72dbec7d60564acbcf7e7599e5c2825e2f524c8e8226db9990555e8dd467bd06e73a06c7ef5559e403fe3b52e6ba40b3a6590d02f6d79d9efe286ec6c71 SHA512 2a16d2f91cfc4f5fff25f7b787c6e89dd20e8a77bc4acb409fafc2ffaeab98b2b6df638cc88a42f5823b0f77ddc6f7cf0a9719d08cbd599e1f9bd490efa9225e
 DIST pim-sieve-editor-20.12.2.tar.xz 455092 BLAKE2B f39d1436f9121d0a0e1e78ce49db91fe3dafde6f09303bdf6a58c22ff480f5c160b655ac7d24f572202ddf291e29f454873b70f943a582a5daf8977fe1a8b42c SHA512 466bf9e5411ac33737a416108583c8e6cd3497f740457d8dfbaafd1ce57a45184337a894bbb0bb5a52496a0ce93104596c3835376be11f94d78382da7a41b24f
-EBUILD pim-sieve-editor-20.08.3.ebuild 1460 BLAKE2B bfc491b1ba322767e5b82b0fb058667b6310e5ef2168f2708518180f0a5f9e13f32beecb519f69f92f0e472c6564320834bb7f151e6a0a5b5a273b99c83ec4d4 SHA512 75432c675005cc98482d4cbd05c2df005205282c792757bd5c8d64bc8bafcc219ff4661463463f66f44acc00ed110353216e3aa9690b40614bae6643554d6d00
-EBUILD pim-sieve-editor-20.12.2.ebuild 1463 BLAKE2B 83c1d7425ad3a254614fc5dbf66f62def9b41c652dbec5e6c8c936d03d035369e2bdca5c9019da9ddd76bf3664654400e722e3de3267f11a6b84841e6867d015 SHA512 4cb850edf647c9aae8e282dc6a14d28b675ce852ea3700652525de1e9111957b0be0e4cd0c127c24fcd410b67d0ab0b3dccd327e586349d539c27a7ab14b06e0
+EBUILD pim-sieve-editor-20.12.2.ebuild 1460 BLAKE2B 77bcb9e6d9350c953497b38d3df53ee4b19c1b2dd8b93e80220c277ef82c5294c0e6f7b25b78d4f6614c9a180f13a8783474cd30b31fb652caa11882ff05cb43 SHA512 c706c453440dda3b286be108b1b383e624a7817cbc6e87417e50905c13fb1931702c757510c2e746148d146289e31803042e0fe1696ea96cc2cbe5954a022f96
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.3.ebuild
deleted file mode 100644
index c338b3362f1a..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.08.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 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
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant for editing IMAP Sieve filters"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.2.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.2.ebuild
index 09f58bd5a5c3..5c0c92fed6bc 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.2.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.12.2.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/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 6c3ef69284c1..d1906f983220 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,3 @@
-DIST pimcommon-20.08.3.tar.xz 357152 BLAKE2B 9a0dd228d9997bd891b2247fdf2fc6feeefa3606234ba69d1e335234f40a7b9031285882d95cc62b3b4a380a29dbed58647aafd5e93dddbeb79d8ffd8cc4e945 SHA512 873fa273dd06eff2d488926c3d359f7fd0b56276eb6fcbb3bffb83207631902479b3751dbeae1525c07d24a2f284a05e9054f71a9497867a461040363cd75a2d
 DIST pimcommon-20.12.2.tar.xz 364268 BLAKE2B e979c3b72cc37c443d7bd29323c4277be1625e9635f20f16e90d8ebc0a5bcfcf343f91d6d88a26f25337583d270309aa66707cff141073e278b87faced43281a SHA512 268ad53f8cf44171be339e6ab4a6608581f79e7c4c08fd22f4d8ce698c20281580ed4f25a956d6b0449753273bda7b6c6d40d44189eeb5cd7c479266c706c960
-EBUILD pimcommon-20.08.3.ebuild 1724 BLAKE2B 955184fdf0ef838d924ab6a4962bf2fc1e2ee9a1bdbda508301928d533ea277be0e38964a1c9b69355f713b99f90e8e38ec3491b45aea88ad1cd78f4715183b4 SHA512 d55b12b069bd8d31b7bf90daa79a75e0fff9c616a8cea66011277a38c857324c4caa4a3c4085e82a639f3a359ac99556dd1021a3519560f4734e9ef39c1cb1b6
-EBUILD pimcommon-20.12.2.ebuild 1727 BLAKE2B ab5025f819a7b5b989d16427aa57186fd253f33970b14e523827832c9923755c21c706cfd32d5b4e7d0813ccd1a9fa2b8d5256dfead2bddc0a2bf4aa20cc5c43 SHA512 6096e79de44b7bf67f110e583f92c538c77f96fa981b1df2c3aea0a8d66ee0698eee72cfaae138881db277a87d1bcfe6a7cf3b4374cbf49495fd8fa119abef5d
+EBUILD pimcommon-20.12.2.ebuild 1724 BLAKE2B 333abe758556fc07efddbec1f3000ce1eb5ec469edf3bdd3caa37f38932c7cb363d1a1295b9e13e7174df12ec5f9f57c6ff4743fb9f5de4cecaac52251925d7f SHA512 2a3c4778bf94b3ecc75e91d0d723bd8af83f8741f97b5cf89e30e4b823b4d6ce8818aa1cceb4f786904ee861e0c5ab5dbcd94a6efcf85925b468f4ca900fe0f7
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-20.08.3.ebuild b/kde-apps/pimcommon/pimcommon-20.08.3.ebuild
deleted file mode 100644
index 2c3d15efb3fc..000000000000
--- a/kde-apps/pimcommon/pimcommon-20.08.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=kde-apps/kmime-${PVCUT}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/libkdepim-20.07.80:5
-"
-
-src_test() {
-	# bugs 641730, 661330
-	local myctestargs=(
-		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/pimcommon/pimcommon-20.12.2.ebuild b/kde-apps/pimcommon/pimcommon-20.12.2.ebuild
index bf95871a0c8e..d282c2997b4d 100644
--- a/kde-apps/pimcommon/pimcommon-20.12.2.ebuild
+++ b/kde-apps/pimcommon/pimcommon-20.12.2.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/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 4100c290bd62..ce921a927628 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
 DIST spectacle-20.08.3.tar.xz 1156220 BLAKE2B 3ebf54668fda63db6c1d938beedd287d7570749a6f9c6de89752d42abb7fe75687a6e3135a0fcd8f86b741a286518040627b2da0fc96ba029dfd1e1ede9a04ef SHA512 baae34ae4c7b3811e008ae8c1c2d6d6603fd39533279cc3ed79d4a38fa6cb3879ece30bc9ed1b1a5163691dcb2adea7e8cd3d655788f680feb94c38ad53610ac
 DIST spectacle-20.12.2.tar.xz 1164120 BLAKE2B 431176e2c42cd7cbacb3c12ea92293eca759c3c5b024214c1eb5aca5eed3123cb4c3afe44ab29b438d1677cb35fa67ca94ee7128f126859b9fcd78883d559241 SHA512 c0dfffe4a9ebd3e2e3185f4f6bde03363b63d90e771bbe0610ccb42a79178a21d413db50a1842ad7e236f2ebc736cb3915d3614194b38432289471bff39c93f9
 EBUILD spectacle-20.08.3.ebuild 1584 BLAKE2B 376e19a3c18b18179f6d3b20cea9c1826169aa6e81ff3739ba5cc25418cdec1990f2e85d68e5a0236dd03d1b2f813ee11e5edab097bc9a749e7778594a6cd87e SHA512 8eb0e28f8817101a1399d3e5e878a288a6b986bbe3b0e6939b2667f4fa8f17545cfed77814f1bba8b2e540b53243dd0ce78481a8160f575d851fb2d9867b9ab5
-EBUILD spectacle-20.12.2.ebuild 1970 BLAKE2B 01d139c962952a2b541483e2f9531ee2c7894ca05a47b042118426d5ddfc35c10408e8b38552d50669e4d0d91c70a09695adfa6f8261c9bc459a71737b57d310 SHA512 404c6c9731e8125d236563b96cad2f81a6c0c2f79aed2889a04e5a456129f55abd1f4c46be5d6f1876e35f5a6f1d209aabfded7d9d5b9af04a498ff0fc9fca58
+EBUILD spectacle-20.12.2-r1.ebuild 1978 BLAKE2B 362c37da9d8fc117e1fdcd73f8bdf3159a1473a1e6d4573db6b8faa96d26232c051f46ca9753217c259d028c71a7c1ee0935cff22ab5404298ab3b9d72a84fc6 SHA512 1fb00ab07fcc6bd531c7208efe0fc762aaa5865f494e61e13002bd634428a1e10a6c7f6ec5fb0cbef764a596a1f9fffe690b76813a67a29c0ec07ab07b447dc7
 MISC metadata.xml 558 BLAKE2B 304071c16927d1f17fb0b30c3bc71ac9cf707a9cb06816957a8382b3eaac9083d3456b142bc3e0dc745588f14641e461c20b13840258997c85b84bbdaa5659e8 SHA512 0cc62fa4faa18491636dd37eea421cfc880e8997101420e15a876e070c6c14369063f6785d1f0474b3d79fc42860455fe4ffcb90db9f7a61e0492500d19aaa44
diff --git a/kde-apps/spectacle/spectacle-20.12.2.ebuild b/kde-apps/spectacle/spectacle-20.12.2-r1.ebuild
index 6c5c1429821e..7fb30afe4ae4 100644
--- a/kde-apps/spectacle/spectacle-20.12.2.ebuild
+++ b/kde-apps/spectacle/spectacle-20.12.2-r1.ebuild
@@ -45,7 +45,7 @@ DEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-cursor
 	x11-libs/xcb-util-image
-	annotate? ( media-libs/kimageannotator )
+	annotate? ( >=media-libs/kimageannotator-0.4.1 )
 	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 "
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
commit	d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree	cf61513204d97974179580065e85df5c8009087c /kde-apps
parent	463397cf1e064185110fe57c568d73f99a06f5d1 (diff)