kde-apps: Drop KDE Release Service 20.04.1

Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
author: Andreas Sturmlechner <asturm@gentoo.org> 2020-06-14 01:04:53 +0200
committer: Andreas Sturmlechner <asturm@gentoo.org> 2020-06-14 08:51:28 +0200
commit: f526313c9eae34b8f7a41b1f02e705f6ad84c515 (patch)
tree: b1c5c0752f63d58d862f18a62c7e279c79fcdd10 /kde-apps
parent: kde-apps: Add KDE Release Service 20.04.2 (diff)
download: gentoo-f526313c9eae34b8f7a41b1f02e705f6ad84c515.tar.gz
gentoo-f526313c9eae34b8f7a41b1f02e705f6ad84c515.tar.bz2
gentoo-f526313c9eae34b8f7a41b1f02e705f6ad84c515.zip
457 files changed, 0 insertions, 11352 deletions
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index f5a6293b3ce1..43b72b804c79 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,3 +1,2 @@
 DIST akonadi-calendar-19.12.3.tar.xz 331488 BLAKE2B cbf967e03d0106cc8938f677e8a6db2fa6853ae7e2bd2661fd00f524ba6e064ac9b1dc6df425b5ab643ed6f6530924e97ffb2b0b1678e129afbad4a723642ea8 SHA512 217d525fa6f2a0cdd3ee0e9b0273c1b2058aa0fb3ac5a5dff1d1a00cf90a7ed51408c7ab22cd31207d242724dd513d45e26971ac608198e9ec25685eb2c711f1
-DIST akonadi-calendar-20.04.1.tar.xz 331508 BLAKE2B 2ceb897bbcb91164f7be534d9398865fc9f9c8d44230b18aa93b807c888435bbbdcd5d54714357a670cdca93ef1603b0dba73035e77c3714459aace29b4fbf41 SHA512 dd66915a648e4aa91f0d00a5825d4bf9ed037858ba36e1caaaeed4264e7b0316365fb60f666dbe488c6632c7294a716af0d8358212fb7efccde8e466ae90df7d
 DIST akonadi-calendar-20.04.2.tar.xz 331544 BLAKE2B 3b3e274a550b35e975750aa755b15c33d764a82827970cea1b23242b66b1ea5d23997bdd94484fd06dda2896d009541bcda5e5d3d67a8cae102cdfcfacd92348 SHA512 5b009556650d90ba027daaf9f5ba26abd855b947ec04ce9459599d07a89efe00ccccc32f1cfbaa6e032de5b032d1d0fc28d24fadd904c96caf3cf15dc0c40eb9
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-20.04.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-20.04.1.ebuild
deleted file mode 100644
index d1a3edc1f0fa..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-20.04.1.ebuild
+++ /dev/null
@@ -1,47 +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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi calendar integration"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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}
-	!<kde-apps/kdepim-runtime-18.03.80
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index ab2b0c57566c..fa98fefd1eeb 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,3 +1,2 @@
 DIST akonadi-contacts-19.12.3.tar.xz 393204 BLAKE2B 186de38805675fe1b35264a6b502215fbc7aa13a09cff7df41b8995c573180564195c06ffdb2828da31336e8b4bc6d7c8b5894ce831128dc2cb7f56c7460b18d SHA512 23f896114ba66cce06069538768559c665e6d0bf7bc24b3cd2d801d41e7421f2f79f670a0af740dfbcd3fdc48584ff77cf2e156159450e484b0b8b137cdee4c2
-DIST akonadi-contacts-20.04.1.tar.xz 393640 BLAKE2B 1d63c5fdc9ba71631a1d3fae09ef700af567800a57ea594a96f7495ef173472505878f1ab574fa584b48c8d8df0b316cb5a87be2b61c923ae1a3f859c74ecf10 SHA512 b27cc4f4a2381836f5e3d3f738590f4a77fe4f783e97bfb115f284f6ef0270ec40efcb667fb31b5a4e0d27e3c15c8be595675df65173c117003f784e10e2fc39
 DIST akonadi-contacts-20.04.2.tar.xz 393796 BLAKE2B ec580f5011833affef9428875f49a994c4787b6c0470597c2bc7aa5fb6982de23a761e437ab40b788604e79dc3bd003f13cb3e7a439f37c8e980789a4c7dee37 SHA512 886add1508397de3d726da95357f27874bb532f6652191a4b8756d3f356b4838ca1ac92d4d7feb6341a675b8697e4784e17f35573cd56d5caf6f1cdaa06690bb
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-20.04.1.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-20.04.1.ebuild
deleted file mode 100644
index 6746bb2f61e4..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-20.04.1.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="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-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}
-	!<kde-apps/kdepim-runtime-18.03.80
-"
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 445794bb7bf5..fd694301302b 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,3 +1,2 @@
 DIST akonadi-import-wizard-19.12.3.tar.xz 438932 BLAKE2B bec48de50e164982a4c8a588a9f888c0cf3b6d0b047401e6a408a95d370ffa3f321d05e4471349c65b232776779fa31d52dc44e6da63d41ed5f08b43dcdc3af7 SHA512 3bdbbd44d50497e15f0364b7ce5e50cdb44381e1c4d135a059cf0822aa3c02ea69571a0a4ad884653a1ba6ae17306c6132b4b1dc7b9ac3106103587c8719a2bf
-DIST akonadi-import-wizard-20.04.1.tar.xz 439084 BLAKE2B 80bd83c4558479a6e5f2218589e642d1861ef63cf333b10c152b57331949e4ca92cae5895200a390a113bd4b6bb4d8dd10d6da5cef00cf1b212ac3bfae3e52bd SHA512 3b1a14c8c579e785e2e50bda39d5a7224ae8d133c7a7753e961105a58cbd5e7718e22e44d754dfe05d3cf8910f18cda594d4cd7199ab5d493b815bb52f82899a
 DIST akonadi-import-wizard-20.04.2.tar.xz 439148 BLAKE2B 440f473b7ffb0f1be92e2c38e77d6a10bf1992c0da51c774b75193b0d0217feb11f8e90a1f9d3d5439450adddfb647c29e64ae875d7f3541d2f7eeebee9f2306 SHA512 b53a35cbb074a55eba661b4d55bf3547563c6d03589c802556dfbad4c35b535461baf31b90145da262ed74f5af508b899c4f0b0b554a226cdd35f47e7b6752e3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.04.1.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.04.1.ebuild
deleted file mode 100644
index d8fed441ec45..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.04.1.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"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-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 ~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/libkdepim-${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-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index ee2eb1d7fb07..77deb9bb56a9 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,3 +1,2 @@
 DIST akonadi-mime-19.12.3.tar.xz 132344 BLAKE2B c6d461675702916760e74d3fd08e7d10ad20431183acda2e9010f3056a3e8f2e736ef1d61fdb517a0fcc4dcb5ee491a9106488215010bbdb4603a9fa17816ce3 SHA512 d8c22ae1a2a349990248f209be017ceb2976bbb138ed25dc1e67993738d91c426897371f0844e6baecf095b5b39240b8dd836babb970c50b61af3aecc45dc251
-DIST akonadi-mime-20.04.1.tar.xz 132060 BLAKE2B 5771fd55282e09382a366cc30490a4fc37ee34952d7281c8c2777842154d9a697d53e21ff6459661cb20acdb495ab225086ab27106bbfa127839cf759f38bb75 SHA512 40c3bd89fd57421aa9c24f320e315fedd4c4e2f33f2a461b22cdcef29fe3bc37a4efdc5839da8346b683db3d107c7d81a8bd2f326e3a4712ef23fed03150420d
 DIST akonadi-mime-20.04.2.tar.xz 132228 BLAKE2B 70c578642f2a10cd58bc7e1c20c6441f6a5ba421fa9e72826193f501a12376927b3cfb3604d0387ad009abd28c65159e10b18d63c019b011b415b7d0d5822d08 SHA512 e00f306bea494e03b876435b1bc923649dd98549b49346f3b70448a44db9f138b826d13ebfc7eb2123f67c03eeb1a0e2e7d0b1a68f1e3566a625f19208cad432
diff --git a/kde-apps/akonadi-mime/akonadi-mime-20.04.1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-20.04.1.ebuild
deleted file mode 100644
index e05284abb6c1..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi mime types"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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}
-	!<kde-apps/kdepim-runtime-18.03.80
-"
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 3efa22ccf1b0..8fbfa66eb9a7 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,3 +1,2 @@
 DIST akonadi-notes-19.12.3.tar.xz 24572 BLAKE2B fac2a5dad7cede901bb9d2584044b74b067fcf32ad613fff0366863f8dc9078ea74fc49f3c7c4f4484801817d18d758d0aaeb3315b9c1c40f11379eb3e78ed3f SHA512 cd8a3ffe7b3b997853a10d276ebc5150169caaccfa21cc454c25f726a169785d7d2ad1c69c41c2b5cb8c4a5b30dee0b4ffbdb82f33c20b811f1245de60b39349
-DIST akonadi-notes-20.04.1.tar.xz 24488 BLAKE2B 2230c03eaa63352cc0b6b2a13d0cacbf4218f6c04e95c1fd7888e8e6d0a07dbdeccb1cebd65f84b7a5ef0f880ae36242e6b43575d45f26a1eed49545f3b51cc3 SHA512 e95bf99395b3403139cb0d642c60af3aa5cc1b265b3073d62fea92f83809a693efcf04a13bd344ae6b57f138c7dea7fd7a4c1edd5f0ab20641533817b675fec6
 DIST akonadi-notes-20.04.2.tar.xz 24520 BLAKE2B c20386d7b465e4fb7f170795a7455d69c70e391786a4c7ca9af5ef71e628c7aef16539766526b7de8402b4c8383e259c9a53d1fe68a7ae4d61bf45bef5d28929 SHA512 c9d55fd3d1c9c24be041b65cefec06e48c996f20619c706669c4f9e1de00e82cfba7fdeb3d4dea7216bd8d540d8718720c40516bc6a0ce54ebf2b6c54e7290c6
diff --git a/kde-apps/akonadi-notes/akonadi-notes-20.04.1.ebuild b/kde-apps/akonadi-notes/akonadi-notes-20.04.1.ebuild
deleted file mode 100644
index a13804004ec3..000000000000
--- a/kde-apps/akonadi-notes/akonadi-notes-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi notes integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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-search/Manifest b/kde-apps/akonadi-search/Manifest
index 80e85641dec9..8c139f064cc2 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,3 +1,2 @@
 DIST akonadi-search-19.12.3.tar.xz 83404 BLAKE2B cde6298784ae995e4b666c029f325ea4f09b2ba0265ff714005d2228410a4671932c967bf3c5edb285250d04b0d4698b91d447a04656c752f275adbb65372f57 SHA512 d51ecd671efa043994465b6f0386e0e97fa0c75e0426dc9f67c3627a0bd18141fc076382126071f27e02cec0215a05eff159cd86afeb04a267e54287d3bdeab8
-DIST akonadi-search-20.04.1.tar.xz 83168 BLAKE2B 68024f2cee61dd26a30247ac7dad7f37786a831304481b80f95c43959d764ab51da0b71466ab99cc964cfa39a9299af7ee10ac9010ed62cef6c58cf27e4a5465 SHA512 6da61fda7a3c6a7acbc6fbbc9ed92ad0e85c0553e31b557b4c364a9f0692f05d408fd2b411c14baf3026249bd06953bb11ed89f4f0448611615e7b338c395fc4
 DIST akonadi-search-20.04.2.tar.xz 83320 BLAKE2B dc776fd930238e01ab002abdb875bd8576be4e10cce8be0718ac2f1aede37c3a608fc6faa7eba11af4bd07a5f2f928b1c622234af0810004fa9f533fab0f89e5 SHA512 7a53b3747c58a514d186b75a1a8053d6fc2a5c0ddea7a9b4df1cbf013f552498219fee2c6c53d419a09d93f95621bb425b5301235a82558a2ec5b38664c02ed1
diff --git a/kde-apps/akonadi-search/akonadi-search-20.04.1.ebuild b/kde-apps/akonadi-search/akonadi-search-20.04.1.ebuild
deleted file mode 100644
index 3954149b5c36..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-20.04.1.ebuild
+++ /dev/null
@@ -1,47 +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.70.0
-QTMIN=5.12.3
-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 ~x86"
-IUSE=""
-
-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/Manifest b/kde-apps/akonadi/Manifest
index 307c6aa3df41..9361d573190b 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,3 +1,2 @@
 DIST akonadi-19.12.3.tar.xz 1583264 BLAKE2B 32bf2f3821628624216c8afe57988739a8b62808c3e17b13d907d9e88e271f5391210ec13e5620bde7550bf706ee305775b213e84032450b499b5a32fa2242fd SHA512 d8eb31948a649e4f3ba4d5d000a384d1188075aee8971fea401cfb9e392e111c4f2b19888783ea4a9430443c9c216ea7a2a8275555935cc3965335bfc07296b0
-DIST akonadi-20.04.1.tar.xz 1584156 BLAKE2B 915894745ef58f93504c5b697acac7660a105bfd401dd181fc6ee46ca8bd1a16a484f6800dd37fff1b14a9998f646c25d47042ca981d27b888c07b5ac38e1b42 SHA512 25dcc2446b7a6143a6f709b4c6becb3b316e5680d0011a44f4af617289935b21c5c35936a6ccb96e56181a7ad4d00353dc0b6bcb6abe5fd042104adcb9c3e1d2
 DIST akonadi-20.04.2.tar.xz 1584156 BLAKE2B dad205592af2d2204cac20f21ea9e9bedc7ab51d760cc77553ef889b267e1292ff1289b59ed1312bc6dcbbd43b4f2a3d87044aa08a42c964c5ab80d8b280dbe3 SHA512 9c2b5dac71bc802c2b0eeb10948818ad856880ae30473827c7b24b76947267a563eb660d559e14b7c37ed8a0b1a2fa7cd9d5ca04a5af57c96eae0b20f6274623
diff --git a/kde-apps/akonadi/akonadi-20.04.1.ebuild b/kde-apps/akonadi/akonadi-20.04.1.ebuild
deleted file mode 100644
index 05fbbcee791c..000000000000
--- a/kde-apps/akonadi/akonadi-20.04.1.ebuild
+++ /dev/null
@@ -1,130 +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.70.0
-QTMIN=5.12.3
-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"
-
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-LICENSE="LGPL-2.1+"
-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}
-	!<kde-apps/kapptemplate-17.11.80
-	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/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 61a6d1f87b82..b0e13aa6f748 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,3 +1,2 @@
 DIST akonadiconsole-19.12.3.tar.xz 194080 BLAKE2B 411c3a7610c7437b87d4488741f8768bc36b9798b8c5a9b892a523c357a31b82d887309a753022f498ea9b1623259bfd2397615a617a64d8ad33497be2f257f3 SHA512 39131877e0bc7b09141e0d218a01eaa86bd3aa9963514eaa3f44fe510aa7a88b4478ddf1461fc1ce59084d0dfa34186d3d0e4ab8d4763204ba651e8ab4c7d355
-DIST akonadiconsole-20.04.1.tar.xz 193596 BLAKE2B 0eabb7d4dabd296acf13696231ee65e0ee8671117916da88dbb673869f93f99ee83237bc05238b5cc1804e77e4e0715a39dd4f1aa193528fccb8bacaebd6703e SHA512 d0c344bcdd0f4bc8917710f771a875f6039bc0b27d86de1f49a54b7b5dd85b026f09d11e114be0090990f70560fe70768e7237268cd88deb51d3ffc2b8152ecb
 DIST akonadiconsole-20.04.2.tar.xz 193656 BLAKE2B 6e0fb55e11e954ea325b31da3eff475b95d5ed4a35a804e023cf4751bfe7be2303b7c0ddb74e6e4ef4c197535b46e9f1f9fe0bbe49b4f90918bc21fe71eb4c53 SHA512 be9f70b06e6c60a125044c433aadb82ffed745002a31456e8b6f3b6876411ecbf36d9947ad7a634e031253812e275a6392eb4feffad681d7881b3a363807daf3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-20.04.1.ebuild b/kde-apps/akonadiconsole/akonadiconsole-20.04.1.ebuild
deleted file mode 100644
index b8accc04ac1c..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-20.04.1.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.70.0
-QTMIN=5.12.3
-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 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/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
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/xapian:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 071a6997772c..b434563b1c9a 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,3 +1,2 @@
 DIST akregator-19.12.3.tar.xz 2194372 BLAKE2B ff42d62cacc7fb2d3319762a147d05e80ac9df92c4d673329cbdd222799cb6d7682696542cde2a006507f51a07a8dbc0e76dca6eca3892f847276e6da63521a2 SHA512 8670184ae7e89f60e25525a6a6046f54759e5a277b3ed85fe003c045c3cf39f3666f5327283f39a65cadd3442006478348ef6a16541b4d7474ce45158d0989fc
-DIST akregator-20.04.1.tar.xz 2196636 BLAKE2B 0ce393ffc97596ebefdc83761f39e10abe619e12ef093af4489309187aa4919af34c0b73dff99e22d5aa1036b096baa0f759af0b6f13a907f29c5711a051bd42 SHA512 0589f533e2b7ced74ca61d27a4aa606a7a8eb9437e103c56f13bee7dfd0fcbda61360a8575d6004281a742b1f5fd869a1d0db817d0d2f818ed0c84a177b1fcb9
 DIST akregator-20.04.2.tar.xz 2196800 BLAKE2B f67c0dbd4e59d0e7921a325d88f93223077d1330b3f37ed30d3a31232abe9db2d186803845106a821300f9625a6e87cef2cbcdb88a3da5ba1f8f3395a44e1249 SHA512 5176116ab66b11257fc7b562b786cbcd1189e1b2160501a4f54c731a21d63d597a1f1d201266cd42721ee3e89f1189baf6ce0ba181c08048418ad69fc1758280
diff --git a/kde-apps/akregator/akregator-20.04.1.ebuild b/kde-apps/akregator/akregator-20.04.1.ebuild
deleted file mode 100644
index 990af409bbe9..000000000000
--- a/kde-apps/akregator/akregator-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.akregator"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/analitza/Manifest b/kde-apps/analitza/Manifest
index c6cfd9404716..28b90af6da25 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,3 +1,2 @@
 DIST analitza-19.12.3.tar.xz 331472 BLAKE2B 91222cbba015ba77800aaaa55b711124478a557fb7be915d1c3ec0ea7297e7b2cfe975482b70fffaba1fef8deb86aa988f55bcdf046ea4e70ff0218fe84fe950 SHA512 3b858af0a79174ec8c7ae28a703d067a6d2545dd5319a2d37d72831bba9f6196c6a6cedf6d277eb5ede812fb39ffab297f966da6c40926b26c0943ca10426eb9
-DIST analitza-20.04.1.tar.xz 332852 BLAKE2B 012dad1d32c7a0c4931d7032e818518df4ef3277a25605e6732d8e6cb7657b568818b987cd9c4f176e394366f0cf7ca1da8a9d7191e43d628172827dabf5f160 SHA512 1ae972bba40f90372fb2f22ccc3fe3bdf38e7954b67d2c3eea0ab9d3bd1943af1cecdf2c75d6fbbd673095f8af851644ba8e390d0b7115119480990059eaeb43
 DIST analitza-20.04.2.tar.xz 332632 BLAKE2B 8609601a68e51fefa8e6885dc83ddc85259c03492d8bdf1db969ad726f1500c70def456feece8ff846255e77da0b515110e25c552663afdb600bc3c936e43d15 SHA512 9bd7b746e819e629a6fb1d04054dbcd014e73e99f118bce7297f9df3d33819878ebddc1526a400a2f892c39a963104d37efa4ad0575e2d4bbdfae9be3aedc006
diff --git a/kde-apps/analitza/analitza-20.04.1.ebuild b/kde-apps/analitza/analitza-20.04.1.ebuild
deleted file mode 100644
index 68e3b648b9bb..000000000000
--- a/kde-apps/analitza/analitza-20.04.1.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_TEST="forceoptional-recursive"
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE library for mathematical features"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="eigen nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	eigen? ( dev-cpp/eigen:3 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use test; then
-		sed -i \
-			-e "/add_subdirectory(examples)/ s/^/#DONT/" \
-			analitzaplot/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package eigen Eigen3)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index d6b24a87dc6c..4557542a2ebf 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,3 +1,2 @@
 DIST ark-19.12.3.tar.xz 2586112 BLAKE2B c4bde5469dde1ac7cc48b4ecfec260596e2bd3123d9b7c83a5281f45d17675477c2641b708469301e536f04f0e2b469e733c9f95053201682e4af1c2bf378226 SHA512 0f1a155bcfaca1b28b5035943a3d881de89a68c5e8bac156dd1304aa431c5700b6da6dc70e43e82560594bc5aab0ee1d3f3ec50ed4dd15e7f3dd053acbb1a14a
-DIST ark-20.04.1.tar.xz 2587528 BLAKE2B 0efd30d203fb7ab48464a119515fe6588d37804efca866fa91c660c0e946a568b8692dc916a2831bd1f626b17df0b7cad46824fb71fde2bb3094f7226546cfad SHA512 4433b6aee95a88f7a57cca1275a25194cd721b26d38b60059b907c5f7949e75ddc76337f33ed4e07c095622f8e8ee20e9ce1158e02ff620d386fefd6e3472ff1
 DIST ark-20.04.2.tar.xz 2587052 BLAKE2B d05e72bd38070376abf1a69ca46c7d5223c3bcfb25469a5b287a2d124c76249c53cd0b5d3923d9f7205a439767acc5cfd443a0dbf8a75cf834df4ea0e43367c6 SHA512 35f0d17655e9a38c4d9ff4d9777a4198416258cb73d368085d8eaa6eb40622a3e8f8573826789fb978794b84519f131f9e0193b8b279598015dcd89597187cb5
diff --git a/kde-apps/ark/ark-20.04.1.ebuild b/kde-apps/ark/ark-20.04.1.ebuild
deleted file mode 100644
index 31a8d6fb96ac..000000000000
--- a/kde-apps/ark/ark-20.04.1.ebuild
+++ /dev/null
@@ -1,83 +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="optional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Archiving tool"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.ark
-https://utils.kde.org/projects/ark/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="bzip2 lzma zip"
-
-BDEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	app-arch/libarchive:=[bzip2?,lzma?,zlib]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}: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/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${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/kpty-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	sys-libs/zlib
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-# bug #560548, last checked with 16.04.1
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package bzip2 BZip2)
-		$(cmake_use_find_package lzma LibLZMA)
-		$(cmake_use_find_package zip LibZip)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if ! has_version app-arch/rar; then
-			elog "For creating/extracting rar archives, installing app-arch/rar is required."
-			if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
-				elog "Alternatively, for only extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
-			fi
-		fi
-
-		has_version app-arch/p7zip || \
-			elog "For handling 7-Zip archives, install app-arch/p7zip."
-
-		has_version app-arch/lrzip || \
-			elog "For handling lrz archives, install app-arch/lrzip."
-	fi
-}
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index d4a9e616088b..f3116822392b 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,3 +1,2 @@
 DIST artikulate-19.12.3.tar.xz 4012108 BLAKE2B ea108b73b297af31cd145cba0617a726b5c62f6b7fb9f9787579c7195d2a9d39c71eb52229345c2df604c269659e1e8b455d895705e55b26057ade24b579c80b SHA512 aaf8054d928a7e76ac868ca0bbf99edde6d3402dd175880cb04088f18b8b23d15c7281775d694be0b0bef4ec37a2101f5cf1873a6d933ff5a3cdf4352b017e32
-DIST artikulate-20.04.1.tar.xz 1077996 BLAKE2B ecda1677e9756ec8c0791bf8f26dfb975ddb2116e793f5fb4fb2004ee969a03b4a6125afd13b32f77377323fc458ec46707a932246eaa92e3eed8fc6984256b3 SHA512 c852de7663f70a41a68d0dfd013d16f9e219b1b2637a53966462c617bb679867b25a7ab2d92671a8dc0c8878dc48076b549e0b76e4df77ee7cc17cd6baa46494
 DIST artikulate-20.04.2.tar.xz 1079440 BLAKE2B d6c0b02be280b4b79cbbbd5aa3282c4a0ed9c9de698af135db4f75bbe2640e81cf62205d1b2dd4d62f08d911c421a57ff7bd3263ec237c8bcc39bd9ebfeb1bf7 SHA512 031ed50318c5aabc31fb141e880a1f08cfdeb025f8ce109de50ed7727be6224c99f2d4931491e15e3b799c3afcf6ecaecdcd9b29c518d29b1811fb60f1df04a6
diff --git a/kde-apps/artikulate/artikulate-20.04.1.ebuild b/kde-apps/artikulate/artikulate-20.04.1.ebuild
deleted file mode 100644
index aad18110e16e..000000000000
--- a/kde-apps/artikulate/artikulate-20.04.1.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="optional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Language learning application that helps improving pronunciation skills"
-HOMEPAGE="https://kde.org/applications/education/org.kde.artikulate"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+gstreamer qtmedia"
-
-REQUIRED_USE="|| ( gstreamer qtmedia )"
-
-DEPEND="
-	>=kde-frameworks/karchive-${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/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
-		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex qtmedia)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 6aa519f4fd57..cc42bdf2afd6 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,3 +1,2 @@
 DIST audiocd-kio-19.12.3.tar.xz 358248 BLAKE2B 06f600e152409ad9d1912afd4a23f5f0839d91d10b45dbd2cdd7908b13bf69bc11fa0b49a6bc84b3d78120b01f461b9ce337f6d831d799af7d228b8f0974a396 SHA512 dc89cbf8707bd47f533cc30174d197ea7a479d03ac69512de03d5ddf0d5361f25c2075d30781ac3a0fe2a04eaa7ce99a0dc2f36d9e9515a8b89aae33dcca0f4e
-DIST audiocd-kio-20.04.1.tar.xz 358584 BLAKE2B 5b2814e76e9862cf98da22860dca2450fdc79343cd7925b4637fe348baddb0c6b783fd28b23af24bfa8789105a1384b73dc87ee477430e82d22a3484d9b9595a SHA512 9307473a305099ef5a5a1df7358b0165eefcef004589a5a0c61ccbfc19ddb2a62f0dfb36a96270a2a453b6f92562ac067039c399a3898482a3538f8fa337d01f
 DIST audiocd-kio-20.04.2.tar.xz 489304 BLAKE2B 8f9c79edfe760466f5c116c57382dec315046a62e2b054ca4b9612c5df3c745fd79097c597d2c567ca17941890008b95a981a245a624e47bcd9255b50ef7ce0d SHA512 7ac63505a243ca67d41ad6035eda247ea15d4494b54bce70f92333eb3754dc458415c7f6465fa89137b6283d97b91b174e4fe0615af82881081edab1d82e2c6b
diff --git a/kde-apps/audiocd-kio/audiocd-kio-20.04.1.ebuild b/kde-apps/audiocd-kio/audiocd-kio-20.04.1.ebuild
deleted file mode 100644
index 9e6efb95d008..000000000000
--- a/kde-apps/audiocd-kio/audiocd-kio-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="kioslave for accessing audio CDs"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="flac vorbis"
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-apps/libkcddb-${PVCUT}:5
-	>=kde-apps/libkcompactdisc-${PVCUT}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-sound/cdparanoia
-	flac? ( >=media-libs/flac-1.1.2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-19.04.0-handbook.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package flac FLAC)
-		$(cmake_use_find_package vorbis OggVorbis)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 9840192b65b5..f076c93656ac 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,3 +1,2 @@
 DIST baloo-widgets-19.12.3.tar.xz 259264 BLAKE2B fdc384d9b856d99e63cab88cd1a1cd723af84fb5c96ef97c1434b6fbeca7c925f5c79deda28de68902fc6eb3f1defb572f6995a0322163d5b51d30ddf6153031 SHA512 99c4f0aef513015371c9dce10e25e64b3eb7bf2e9dd741451332d141459bce777a0b0be29f2fb5cb198193ce6055d53744e84e9e5be089d958e829c39eb79f0f
-DIST baloo-widgets-20.04.1.tar.xz 261524 BLAKE2B bd2c76eee8933a7c1fbd7d24e85ecfa660f04f90a7bb24af44d08f7f258ac9d9f9cb22101fadeccbdbfaf57cfc5a44a60ab5ba5fe989a23fa10628334ac6621a SHA512 f38671acb7e892af0b6d4136e98d6bdb8f42cda937c8dc04de284fd892998c0201b3d48b7d6b313f9dbd214999ec8203fa64e138fb709e81cc8c6877635d93cf
 DIST baloo-widgets-20.04.2.tar.xz 261536 BLAKE2B cbd9ce92a10b41cf95e5da0ade9f0d7d3a1a1b070a1fc5dfced5f3b2561929c686d771bd8df1d6dcf6e1fbc533bc941352cdbbd8ded91a3100909a547284ae00 SHA512 48a769b9ab7666135158c1fb205f4eee6cbfb1d81162a0d173b9268d47018015174b2227001d357ee83af6eac9afda47fbb7667089252295ac47cd1a131310d2
diff --git a/kde-apps/baloo-widgets/baloo-widgets-20.04.1.ebuild b/kde-apps/baloo-widgets/baloo-widgets-20.04.1.ebuild
deleted file mode 100644
index c1ef54e3ca7d..000000000000
--- a/kde-apps/baloo-widgets/baloo-widgets-20.04.1.ebuild
+++ /dev/null
@@ -1,31 +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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Widget library for baloo"
-
-LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/baloo-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index bbb9ead39cf7..c946f5aacfb0 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,3 +1,2 @@
 DIST blinken-19.12.3.tar.xz 2821156 BLAKE2B 4830acf962e6a1770175d8ce1e003e9ff6f11aeaf1b30a6f7590974137cab2dd9f4e2e67ca1b1e9c1f042b8a62bad98396693525bd00e78d52086569d1ae2220 SHA512 2903269216465affa06a82bab2e91bc81be98e780ee6005b652a3f08781911d4fff5a441b835780711cda9f765e9b1008c1a38ac5ba379ceb08f424cfa7f3938
-DIST blinken-20.04.1.tar.xz 2821432 BLAKE2B 4f525c5f4072ac281aeea3d41a22fcafa84b04f7dca44c30c7c4ec56f017054afdf628373caf03b7ea8f706c8b514c46fa83c49b14be184de2359e5598ccbf34 SHA512 f2d69713e8bb6f60367bf21c1ae3dbbb8a572cf0561ff060cb654bcacfa5ad7a4304ab5c2835a0775d31a7a94c29efa3006bd40b8bf4abe22830b6628769ce9e
 DIST blinken-20.04.2.tar.xz 2821680 BLAKE2B 68b6f33e21a8b99931658073f6eea7c1a9e81e8dfdb1a81de2e87b5c09d743ec651c324064ebab44ecd37580a21a9e9462526ac4ced32ed45dbacdc8d98a696b SHA512 b465c16b6fcab3ad6e427cb2276d737f949ef7d68f3414399af622296b5a019511cfb9113b5ad7447539cbc3dbeb939ddc989a87a69c8478443119768dd63d19
diff --git a/kde-apps/blinken/blinken-20.04.1.ebuild b/kde-apps/blinken/blinken-20.04.1.ebuild
deleted file mode 100644
index a49d65184639..000000000000
--- a/kde-apps/blinken/blinken-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Memory enhancement game based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/education/org.kde.blinken
-https://edu.kde.org/blinken/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${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/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	ecm_src_install
-	rm "${ED}"/usr/share/${PN}/README.packagers || die
-}
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 2de4c454af13..7c571c330baa 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,3 +1,2 @@
 DIST bomber-19.12.3.tar.xz 821352 BLAKE2B e87fbb90a57eeb8c2b724786212959a0247070bc48ce684af4c789faad9b6558ee95c7bedb36bb0745659d0765d4d5fbc5d6f24e4424f24e6cafb02987e842a3 SHA512 09eed297e60bf05aa2197c70deb4b5c67c59a4bef61a78496a90a03241eb379a950f56ac1102d89cba6f4abd15a528f79b5496d90ceab4831f08aa0108ed90fb
-DIST bomber-20.04.1.tar.xz 820240 BLAKE2B 781c2dab62e44579d6449897eba136d3027d49bfb786d53b4c92bd22bd29569ed83d3985cc429b641ab5d27bc36c739b9d2a60cef1aefb47aa3f8beecf333435 SHA512 cf2bdd227370ae735a4c786241fd9ffb0c06669e9409f0995e7cbf6ce38c66e661e2377c4d59a77a45d3007d86da151d0c4cc2aae897b58914d04005786f433d
 DIST bomber-20.04.2.tar.xz 820384 BLAKE2B 4e86cca13a7662cd36d011f24af9c8e3f8492c5e252354ce2aea94c6cb61008bf59b6407e7b6c4e6137e062b3d2feb1dbef1c5a17be1ca6c9c241376e95b6ec4 SHA512 1551c235eae2e9e1c4a781b5985f1a4fca7fb58050cb8843738832e3a34825802f59fbb2151a79de61ebb0e3f3646f1eed407770dac0a9d6e7344e5f60269a98
diff --git a/kde-apps/bomber/bomber-20.04.1.ebuild b/kde-apps/bomber/bomber-20.04.1.ebuild
deleted file mode 100644
index 61f50d0e6b8a..000000000000
--- a/kde-apps/bomber/bomber-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Single player arcade bombing game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.bomber"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!games-action/xbomber
-"
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index 334f04fcd525..890fad8217cb 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,3 +1,2 @@
 DIST bovo-19.12.3.tar.xz 200496 BLAKE2B 108096398dfd1cc8d394b8b216f14360d7d58f4eaf62c0a7c1fff8cf72e9ea896ce235d147fb6c374f0870194c0393bfa1e57d9a3f669e4ca01166e4c086ad03 SHA512 a2b13a7e59c39188b642c7c5d43b071a7702cd770497ffef5f0f4b44d8b6117c3aa61e0e7d8db3fcf4c9f8db72d1a57c7cb4afc5831d13eb56aa723b35763855
-DIST bovo-20.04.1.tar.xz 200220 BLAKE2B 46da52281beb2dfd8cd5062f2f85c0b1c300e238370f62a5cc731cbabbc7f712686a0274c8491e7c1d2a802062cbfc19da36ac054901fd057f63fa63301e94ee SHA512 6f450dfc72168abd5d6b6c2c542536bdf1ff4e3c7cc2f39d75f24c0121cbf7d5d541f2268cb99fab6d9efd6629d8bdd46c8d2f48c1367611b82d670bdbbd895b
 DIST bovo-20.04.2.tar.xz 200268 BLAKE2B 5e90cf83caaf8b7a55e8c5e9b9642195d8cbd3bfcebf48c6122dc01b9d783a5cf62e2592a9c6290f7577c53f7203b80e9f2db20cf9240b091e4c036a014736ef SHA512 914249bb6a4af4c2586aba204c353f97dc72b0a2d8085f54bef6af063a07417d4b889522ec2f367d43f52efc8219c71487b48533fd817025424e0516578591b1
diff --git a/kde-apps/bovo/bovo-20.04.1.ebuild b/kde-apps/bovo/bovo-20.04.1.ebuild
deleted file mode 100644
index 61555c90cd18..000000000000
--- a/kde-apps/bovo/bovo-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Five-in-a-row Board Game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.bovo"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS HISTORY TODO )
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 3484d23c6b4b..c12d9a756313 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,3 +1,2 @@
 DIST akonadi-calendar-tools-19.12.3.tar.xz 223340 BLAKE2B b438f392618d919440fddf0ba5d48ab52a0c509507018d7f546b477aa83a34e8f86551c44998337ba2cfba8050d31cde9dc6f672b1a9ce6b558b292bb960d483 SHA512 eac1400ff742199908daf765b5cf14efd12b630a34e6fe0ac6bb17072b05902e746af5740a8e0db82a5ea7535a413140e9b6d4ea029f2abe684aff05098a8b39
-DIST akonadi-calendar-tools-20.04.1.tar.xz 224572 BLAKE2B c56c28b5743006ce2b1b65b1c662b15dbcf261ca9ad062aa3169aa00d3c57bacb525a4ad278d3cdc37f8f1f0df1bd042874480be50a14ba46ebfb4e775f24b3a SHA512 b10597ae99a69a23f7387c9f74ec7d15dfb0ba9322c67238654c794e9698c5920a6b19001607a3495475438ea4c8a23d2d6b17d7acedba37ecf04082f6dab2b3
 DIST akonadi-calendar-tools-20.04.2.tar.xz 224616 BLAKE2B 199175ac1324f53e8aed802e0c153d0eff9846d6cb3ac251c1e4c6b4a486547e98686d7c7499356d82cb93a5efa767edd01e3a1ae349ad72f824ebcdf79296d3 SHA512 8e571a0a68927794b61915677a46220402deeda06dc8ddc1a7c1480d8185ed6d719a7047b034f6120402ea3d213f224659f04074cc528ce8b75f461ee866604d
diff --git a/kde-apps/calendarjanitor/calendarjanitor-20.04.1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-20.04.1.ebuild
deleted file mode 100644
index 61987459eacd..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-20.04.1.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.70.0
-QTMIN=5.12.3
-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 ~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/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index cb5019df97a1..acc734755cf9 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,3 +1,2 @@
 DIST calendarsupport-19.12.3.tar.xz 648448 BLAKE2B ce0390118e53a2b796c5a99e80c8c58132499e45e0cff96369780059b9bca12a1caf2a4f4a84c2df5bed9bfbce6620fee1857957dcba1f0a42a2aacb59f225a9 SHA512 2f66d9e9f7db1215726bd79255ace156fbad18a0db1a8465e713ac3df7cd39efa104dfbed0e3d84f556a46ba3771124e044430ecbead048d0cff7401d5236dbb
-DIST calendarsupport-20.04.1.tar.xz 651560 BLAKE2B 153a55472762b4c3035600afdb75d603c06ed19dfa59988062b064345f80fa219048f78cdc0ad5ea6e4397cd3183be9700757201036b211b5aefdf23836b5e32 SHA512 20683b00caa3cc91457517e8f68b01a52c75952383887d0c9f9e41f49cb794246701da92194fbf43e25b67b99f852a4a4443e28b20bd955921678c53c980ec9d
 DIST calendarsupport-20.04.2.tar.xz 651552 BLAKE2B 759e09fdf393af25a49175d35e24b623f5eaaaac5029f226f8927566fa58fb08106e68ef88ca7e91fa641ffb6de9879e70e92987c1d0a73876f6f5d958de5926 SHA512 122b08ab130ded4337a969bd9269ece331927e63231f5b4f9634fb625dfc0bdb6e63145dd13556da1901ab1cc839a5bdbd8a820750e1e2650c836f4a51d128e9
diff --git a/kde-apps/calendarsupport/calendarsupport-20.04.1.ebuild b/kde-apps/calendarsupport/calendarsupport-20.04.1.ebuild
deleted file mode 100644
index a9d2398cc053..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-20.04.1.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="false"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Calendar support library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/kcalutils-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 2adf1858f90d..66311fdfb836 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,3 +1,2 @@
 DIST cantor-19.12.3.tar.xz 9014164 BLAKE2B d88c820a36806facc76197ba2e29fece503fba2e3bafe5d856c64243b6d098babc4ae6da082e7c07f20b499f9ed2373aeccfbb5dcede196214d8a2c582de302a SHA512 83324f7a1702b5ed5d74ecab7664b653b8f318b03b6c856c7a70133b2aaf0927cf8b16a8ba9e27a7224d4d8d5900f1dcdbc89e70f40871f000db29f6f072668a
-DIST cantor-20.04.1.tar.xz 9026456 BLAKE2B 1cbe160242e2932e8048cb3b43676cae6118fb7d9d80136a77cfdc8b02c4b50124919977075393bd5b64a8be775ac133e88deca846c24165eb32672f595cba97 SHA512 fa948ab806a051d7cd820becae72c10042e9de6535401dcd2617b4558c4353a7594ff75e75e37587b6d1064c36044863fe93c701f1c869145e38be870216d17c
 DIST cantor-20.04.2.tar.xz 9028088 BLAKE2B ff2b8ed723f0c1bf05b93b12af75b358663e5ad6fb3d9ea1d5209637ff581216b0687fe0bd9d4bab42399d07035f0f9e99cd2f2ca8909a8488ac1ee55ff5e0cb SHA512 f2f65a1cecfbb2edc2ade5fcecc80f9ccfba92a61960ba2e7038f30ef7260220eb2b6c20cefe74a9cedf96160baaf0a4b8b6b99693db45031210733d492c4196
diff --git a/kde-apps/cantor/cantor-20.04.1.ebuild b/kde-apps/cantor/cantor-20.04.1.ebuild
deleted file mode 100644
index f9f62055145a..000000000000
--- a/kde-apps/cantor/cantor-20.04.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{6,7,8} )
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Interface for doing mathematics and scientific computing"
-HOMEPAGE="https://kde.org/applications/education/org.kde.cantor
-https://edu.kde.org/cantor/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+analitza julia lua postscript python qalculate R"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}: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/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	analitza? ( >=kde-apps/analitza-${PVCUT}:5 )
-	julia? ( dev-lang/julia )
-	lua? ( dev-lang/luajit:2 )
-	qalculate? (
-		sci-libs/cln
-		sci-libs/libqalculate:=
-	)
-	postscript? ( app-text/libspectre )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-qt/qtdbus-${QTMIN}:5
-	)
-	R? ( dev-lang/R )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
-
-pkg_pretend() {
-	ecm_pkg_pretend
-
-	if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
-		! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then
-		elog "You have decided to build ${PN} with no backend."
-		elog "To have this application functional, please enable one of the backends via USE flag:"
-		elog "    analitza, lua, python, qalculate, R"
-		elog "Alternatively, install one of these:"
-		elog "    # emerge sci-mathematics/maxima (bug #619534)"
-		elog "    # emerge sci-mathematics/octave"
-		elog "Experimental available USE flag:"
-		elog "    julia (not stable, bug #613576)"
-		elog
-	fi
-
-	if ! has_version virtual/latex-base; then
-		elog "For LaTeX support:"
-		elog "    # emerge virtual/latex-base"
-	fi
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	use julia && addpredict /proc/self/mem # bug 602894
-
-	local mycmakeargs=(
-		$(cmake_use_find_package analitza Analitza5)
-		$(cmake_use_find_package julia Julia)
-		$(cmake_use_find_package lua LuaJIT)
-		$(cmake_use_find_package postscript LibSpectre)
-		$(cmake_use_find_package python PythonLibs3)
-		$(cmake_use_find_package qalculate Qalculate)
-		$(cmake_use_find_package R R)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 37e8b8173819..4e238efe3441 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,3 +1,2 @@
 DIST cervisia-19.12.3.tar.xz 1894600 BLAKE2B 6673ad0bf5cfb448ff245bb8c5f6ea00cfec7fe68e74f5f3b3e9b48bd9ab0fce0d902669ce658adfe8f942c495a2afd74e9a1b1e3475a4e4a2dd37656abdd0b1 SHA512 32ce40a39f3f3db1b1b55838209baf676508b6c6ddbb74e4fd50a178d48d1dc68f3ca95962a49035bfd192711ce87a6ea2af48ebb81d9d2ab726e38132fe7749
-DIST cervisia-20.04.1.tar.xz 1896684 BLAKE2B a17b19dc14793c2f74cf074bac971f90cc511ba35f72a7f91813b14336224d05be351a5a8524a27a72e6382545615ab0b6ca794d82baad76965807645c63ac97 SHA512 58dace37962ab4a64b9245272c62886d1ba3b27cb2837e0d1e67f24d53ae15f4970f691286f0cc382495404e76def936c6c24256c52b54930e42719e4b20046b
 DIST cervisia-20.04.2.tar.xz 1896544 BLAKE2B 4e0a77c294d9af39c9433838e4fcf30ee9a827cc223db709fedcfbf1f3987edc521878a1bd5e71e77509cb78921c9b2770e037931acc77cee68c4278c4f14b83 SHA512 7a71a27b8ec215b5c0619b1cd615fee6f56049fb85a64b9c320ad412deb122e52c7f39b99ae403749a9f2e7df4673056c4622f89f7b41b5da8131da713518026
diff --git a/kde-apps/cervisia/cervisia-20.04.1.ebuild b/kde-apps/cervisia/cervisia-20.04.1.ebuild
deleted file mode 100644
index daeece6dc62a..000000000000
--- a/kde-apps/cervisia/cervisia-20.04.1.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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="CVS frontend by KDE"
-HOMEPAGE="https://kde.org/applications/development/org.kde.cervisia"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${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
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-vcs/cvs
-"
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index d4742aae170f..e806914ad228 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,3 +1,2 @@
 DIST dolphin-plugins-19.12.3.tar.xz 195464 BLAKE2B b60be81fcb9932f9f645bc614ab74c2e862ef70df6958242dc67de2b9cb570cc8961c2ac593ad99db636f19bec1793316dab21b9cee9a59cf2764b67234c312a SHA512 f6d1ce129095d0ae608b2da4d91f55b93bb8fe94795c09217cc87607bb50cd8dcc5a7dac21b8655f9993da56ef90fa705520c7ac928295edb5254050af9c4a1e
-DIST dolphin-plugins-20.04.1.tar.xz 210668 BLAKE2B 5f52ae238e7a4a063b4ef91b092567348c6091c2c29d5ee45d9ce6e31412c257864b4030dbdfb8a9eb536393d0cbc76b38880be753ac0a20d65886f224b21dba SHA512 5dab9c10f3ed93dab83a401c4317dc5f0d4252016d5157a0bb69ff82b2f3f8d4f78a0c65941203b5aaf92d7de8ed8efc903841cffc0024513b8e0e106edc32e3
 DIST dolphin-plugins-20.04.2.tar.xz 211048 BLAKE2B 4ebf63bd4013b0f8bdd7a7548e67d48f4d408fc3d2b76b7ac74b5aee2a792e230f87168b9ce4df4d1788feb46768255e52707c6b2906648bb769e39349943ec1 SHA512 95545db533d2491345cf12f08eb2a615ce5c0aa62550fd49149771c13da3117e670b3e4b86b374631a7b9a404c9cb2ebecfa20ab77d026e1dd94dfde340835cd
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.04.1.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.04.1.ebuild
deleted file mode 100644
index 49c833514619..000000000000
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-20.04.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="dropbox"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Dropbox service integration"
-HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	net-misc/dropbox-cli
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index d4742aae170f..e806914ad228 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,3 +1,2 @@
 DIST dolphin-plugins-19.12.3.tar.xz 195464 BLAKE2B b60be81fcb9932f9f645bc614ab74c2e862ef70df6958242dc67de2b9cb570cc8961c2ac593ad99db636f19bec1793316dab21b9cee9a59cf2764b67234c312a SHA512 f6d1ce129095d0ae608b2da4d91f55b93bb8fe94795c09217cc87607bb50cd8dcc5a7dac21b8655f9993da56ef90fa705520c7ac928295edb5254050af9c4a1e
-DIST dolphin-plugins-20.04.1.tar.xz 210668 BLAKE2B 5f52ae238e7a4a063b4ef91b092567348c6091c2c29d5ee45d9ce6e31412c257864b4030dbdfb8a9eb536393d0cbc76b38880be753ac0a20d65886f224b21dba SHA512 5dab9c10f3ed93dab83a401c4317dc5f0d4252016d5157a0bb69ff82b2f3f8d4f78a0c65941203b5aaf92d7de8ed8efc903841cffc0024513b8e0e106edc32e3
 DIST dolphin-plugins-20.04.2.tar.xz 211048 BLAKE2B 4ebf63bd4013b0f8bdd7a7548e67d48f4d408fc3d2b76b7ac74b5aee2a792e230f87168b9ce4df4d1788feb46768255e52707c6b2906648bb769e39349943ec1 SHA512 95545db533d2491345cf12f08eb2a615ce5c0aa62550fd49149771c13da3117e670b3e4b86b374631a7b9a404c9cb2ebecfa20ab77d026e1dd94dfde340835cd
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.04.1.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.04.1.ebuild
deleted file mode 100644
index dcf1c482848d..000000000000
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-20.04.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="git"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Git integration"
-HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${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-apps/dolphin-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	dev-vcs/git
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_bogus_dep Qt5 Network
-	ecm_punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index d4742aae170f..e806914ad228 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,3 +1,2 @@
 DIST dolphin-plugins-19.12.3.tar.xz 195464 BLAKE2B b60be81fcb9932f9f645bc614ab74c2e862ef70df6958242dc67de2b9cb570cc8961c2ac593ad99db636f19bec1793316dab21b9cee9a59cf2764b67234c312a SHA512 f6d1ce129095d0ae608b2da4d91f55b93bb8fe94795c09217cc87607bb50cd8dcc5a7dac21b8655f9993da56ef90fa705520c7ac928295edb5254050af9c4a1e
-DIST dolphin-plugins-20.04.1.tar.xz 210668 BLAKE2B 5f52ae238e7a4a063b4ef91b092567348c6091c2c29d5ee45d9ce6e31412c257864b4030dbdfb8a9eb536393d0cbc76b38880be753ac0a20d65886f224b21dba SHA512 5dab9c10f3ed93dab83a401c4317dc5f0d4252016d5157a0bb69ff82b2f3f8d4f78a0c65941203b5aaf92d7de8ed8efc903841cffc0024513b8e0e106edc32e3
 DIST dolphin-plugins-20.04.2.tar.xz 211048 BLAKE2B 4ebf63bd4013b0f8bdd7a7548e67d48f4d408fc3d2b76b7ac74b5aee2a792e230f87168b9ce4df4d1788feb46768255e52707c6b2906648bb769e39349943ec1 SHA512 95545db533d2491345cf12f08eb2a615ce5c0aa62550fd49149771c13da3117e670b3e4b86b374631a7b9a404c9cb2ebecfa20ab77d026e1dd94dfde340835cd
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.04.1.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.04.1.ebuild
deleted file mode 100644
index db947321db79..000000000000
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-20.04.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="hg"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Mercurial integration"
-HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	dev-vcs/mercurial
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_bogus_dep Qt5 Network
-	ecm_punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index d4742aae170f..e806914ad228 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,3 +1,2 @@
 DIST dolphin-plugins-19.12.3.tar.xz 195464 BLAKE2B b60be81fcb9932f9f645bc614ab74c2e862ef70df6958242dc67de2b9cb570cc8961c2ac593ad99db636f19bec1793316dab21b9cee9a59cf2764b67234c312a SHA512 f6d1ce129095d0ae608b2da4d91f55b93bb8fe94795c09217cc87607bb50cd8dcc5a7dac21b8655f9993da56ef90fa705520c7ac928295edb5254050af9c4a1e
-DIST dolphin-plugins-20.04.1.tar.xz 210668 BLAKE2B 5f52ae238e7a4a063b4ef91b092567348c6091c2c29d5ee45d9ce6e31412c257864b4030dbdfb8a9eb536393d0cbc76b38880be753ac0a20d65886f224b21dba SHA512 5dab9c10f3ed93dab83a401c4317dc5f0d4252016d5157a0bb69ff82b2f3f8d4f78a0c65941203b5aaf92d7de8ed8efc903841cffc0024513b8e0e106edc32e3
 DIST dolphin-plugins-20.04.2.tar.xz 211048 BLAKE2B 4ebf63bd4013b0f8bdd7a7548e67d48f4d408fc3d2b76b7ac74b5aee2a792e230f87168b9ce4df4d1788feb46768255e52707c6b2906648bb769e39349943ec1 SHA512 95545db533d2491345cf12f08eb2a615ce5c0aa62550fd49149771c13da3117e670b3e4b86b374631a7b9a404c9cb2ebecfa20ab77d026e1dd94dfde340835cd
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.04.1.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.04.1.ebuild
deleted file mode 100644
index 8294a7381211..000000000000
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-20.04.1.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_HANDBOOK="false"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="svn"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Subversion integration"
-HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	>=kde-apps/kompare-${PVCUT}:5
-	dev-vcs/subversion
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_bogus_dep Qt5 Network
-	ecm_punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 1a341fad061d..f165154b445a 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,3 +1,2 @@
 DIST dolphin-19.12.3.tar.xz 4781456 BLAKE2B 310d0ea5e25b5d934bd501ac0c9bed15a4545b6b16299ad138715b6a33f20edd91675af679bb4249fd523fbf5ffe57c12cc1d7691a167e1783648698a533d584 SHA512 d4922774adea1aa5f68654f5fc0db5e2da653487ffbf8bc519d1b03f141355cedfb4d52aebf6570ab2fb40a0edac2bba42ecece983cbf31dca2ee02fa3b98fb5
-DIST dolphin-20.04.1.tar.xz 4799472 BLAKE2B 60678d2c4392e534e433d1b2b4c26cd1a89d730015b7f41a2247cd5546ef5c87eb417e3a9a56b99f3378334b24000d05a9c3fbcc3105b677e69f458996fa91bc SHA512 41aa8c95f6159bdfe24ab6adc7a2aa774cc67ddbd074662deb4f459b93d43d7a3c96e958c88d0f437cc52ece37ed1409696eea2bddf0ee2b9bcb8920ad97d5c8
 DIST dolphin-20.04.2.tar.xz 4799692 BLAKE2B e6ac4b8001665b540e2b5920d384ab8da794b4dbda7d611c02d7ec8e2c38060d809eba97d4084fdd89b3eb1f5b5deb9acfd673968afe40fabafd24cad8402b17 SHA512 7896dcbd8a476b4c1c6ff4d6b0696c345aad8fd3611f7dedd9ec412d1bab9579651ce72c3802c83adbde373b9df400116ba785e0c7b4d905b6f79d60a5547802
diff --git a/kde-apps/dolphin/dolphin-20.04.1.ebuild b/kde-apps/dolphin/dolphin-20.04.1.ebuild
deleted file mode 100644
index b3ab3031c1bb..000000000000
--- a/kde-apps/dolphin/dolphin-20.04.1.ebuild
+++ /dev/null
@@ -1,97 +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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin
-https://userbase.kde.org/Dolphin"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities semantic-desktop"
-
-DEPEND="
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${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/solid-${KFMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	media-libs/phonon[qt5(+)]
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	semantic-desktop? (
-		>=kde-frameworks/baloo-${KFMIN}:5
-		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-		>=kde-apps/baloo-widgets-${PVCUT}:5
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kio-extras-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "kde-apps/ark:${SLOT}" || \
-			elog "For compress/extract and other actions install kde-apps/ark:${SLOT}"
-
-		has_version "kde-apps/kleopatra:${SLOT}" || \
-			elog "For crypto actions install kde-apps/kleopatra:${SLOT}"
-
-		has_version "kde-apps/ffmpegthumbs:${SLOT}" || \
-			elog "For video file thumbnails install kde-apps/ffmpegthumbs:${SLOT}"
-
-		has_version "kde-apps/thumbnailers:${SLOT}" || \
-			elog "For graphics file thumbnails install kde-apps/thumbnailers:${SLOT}"
-
-		has_version "kde-frameworks/purpose:${SLOT}" || \
-			elog "For 'Share' context menu actions install kde-frameworks/purpose:${SLOT}"
-	fi
-}
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index d5e91b1551eb..6d8689cb312b 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,3 +1,2 @@
 DIST dragon-19.12.3.tar.xz 1351808 BLAKE2B 45854afdd7ecad01903745bab18b47e21b69efc1cf3ad5a34d11ae323d6b877539e2145f9cea2414eb22e59578cc2f996b1ddfe59ee9230e03fe807e824b1032 SHA512 29ba89a2292842e47f47dbbe313a6c8d4bfae22d6d7563336f4614f6ea561187e714baf76ac830c65bf5c5ce97077865a04418f905bd6ec902d10631e93a66b8
-DIST dragon-20.04.1.tar.xz 1352004 BLAKE2B a6ef9f4198fb9a8b21b3f86e31b9b3c5b3b929dfbd27df3c4137e84a533794e14a3b51d32726a090283c97db36103efd328803471a943c1b828f1120407b3010 SHA512 3d194e518c6cef32d0d46269faddaf1e82414454c4b527bd6e3f3dfeb4f83ae74ca42803544f7f9e44c6e618e6146655abf2567c316b2cd16e88506dbb54767b
 DIST dragon-20.04.2.tar.xz 1351692 BLAKE2B 9f33bb46210fe2fb56e84608eb44e67b31e04adfc5003539dc685a9cd8e32a372944f0c95295a2fc58ba3f18cab15def95bced830aa982320894c520edd53cf2 SHA512 b22aad43fab5fbdf6b332f10abe9c34e8ca085418cb5ae3ae2c235f4dc98d2da489e1ab57e16a2f67bfea9e4416a53e9062fc490a18d74ae6a004422b5b90a08
diff --git a/kde-apps/dragon/dragon-20.04.1.ebuild b/kde-apps/dragon/dragon-20.04.1.ebuild
deleted file mode 100644
index f988bf4cdc56..000000000000
--- a/kde-apps/dragon/dragon-20.04.1.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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Simple video player"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.dragonplayer"
-
-LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	>=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/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${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
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index a53d03bb950c..3c83941b20db 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,3 +1,2 @@
 DIST eventviews-19.12.3.tar.xz 444608 BLAKE2B 253e0d9bffc854ec3a8b8b9a9e1c8c4275d24e20d4d4fee418fe08f3f6e62fa245ffb818e306d49042773ec9966e71d9f8311a58abda64f298802fb5265b040a SHA512 1d7f846070c8e55c00f4f4869fb9207a3b23533aead9dc305cea6e970e7de52904ee1e723c726d36d04e03debdea9cf62747cc6283dc1fd1c53ff1bc77b3d128
-DIST eventviews-20.04.1.tar.xz 443928 BLAKE2B a501926f1c0f8deb9a3fe7d60626b9704e9e2e9387d50ce77e2160b829a84e63ce6593f484d7213765a6bbeb4e04db5bcf41574bd7c2eb00502e012efae695ef SHA512 a9e653be1b94aff0813d799f275381c15373151b0bf35885c385c54877323b52d0b1b90acf2960e08f9a726a57c430055b31685b613792de61d0148bc37c97b6
 DIST eventviews-20.04.2.tar.xz 443864 BLAKE2B 88f226d402fdcb6d7a954b3a8f3dd6c6995638f36d49624ab142411a29ff068b81fd03d13b23a83e189ec089191794f70c93566818e7ad76ceece9f50f82aa3a SHA512 006fe59a405876f8b7a257005c93197107ebc6fbdc8a359bd1666e4311908ad7e37e265afe69c0bfd93487518b6a74720567f4e4b935c1e873d0c51425107ec2
diff --git a/kde-apps/eventviews/eventviews-20.04.1.ebuild b/kde-apps/eventviews/eventviews-20.04.1.ebuild
deleted file mode 100644
index 17c4098b6a84..000000000000
--- a/kde-apps/eventviews/eventviews-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-DEPEND="
-	dev-libs/kdiagram:5
-	dev-libs/libical
-	>=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/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 79c23b43385b..9623052b0b5e 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,3 +1,2 @@
 DIST ffmpegthumbs-19.12.3.tar.xz 27108 BLAKE2B ced8612dbabcc4368cc3152d28f49cca3c6f501ca0ea80c6c9542a811f8368d8cbff882d5a63931c096344bad715dbae5541f62956aeff709e2893a48113d693 SHA512 4364902f570dad6d6cbb814e64c31d4a39aebd3a82aeb81598f3484464f5f0ce6da1c16f8a57f3bc6075f0e91ecacf60ffbffc6b76c6582f6859c1a52af35191
-DIST ffmpegthumbs-20.04.1.tar.xz 27372 BLAKE2B 0c952ee9f74923bebf39587ce0a0a5191ef5936b9847f4b5c09c70b4e10ff12fd196b1d0142a601b4d9f9ed68095e38a7360e2d93a0f85977529d7ace998c0dc SHA512 12e365401b415c5495bac0a9bed733c71f002dbf5060609d182aa41db7eada8ccc92f8e0cf99e5d0ea31338be42cb359d08f67215760341eb4b73b0b50a990eb
 DIST ffmpegthumbs-20.04.2.tar.xz 27564 BLAKE2B f86583db2524df146aa1b550d180d819f8962893f764d34753761f3942f78f960b7979979af56c224b3593fce87a9fa16ad861f2f3179d5bed582ced7aee4d1e SHA512 dde766b8ed1e57a1ab575a5eff031202a1bdc22883c84855391ccc7b17fffeb36af15509204360d0ed7aa6a34bbae0daa9a479a84dfb006589a46fbeba045499
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.04.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-20.04.1.ebuild
deleted file mode 100644
index 9ccc3e04bdc2..000000000000
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.04.1.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
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="FFmpeg based thumbnail generator for video files"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	media-video/ffmpeg:0=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 931b786993f9..8d656d12bbac 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,3 +1,2 @@
 DIST filelight-19.12.3.tar.xz 661684 BLAKE2B 52c3543a438d860eb29524d8e706a9db1d28a3d10bd17150aba0c4137076ef441f00809cd5239fef25f4661b820baf889bb7056d0d196edd5180d72871a63347 SHA512 4227606a8ac4403876aca89b8f8b57c74bc6911983bd40f68441f6c73efc2d8853c422d15b3cf0089be74bc95b4fe530057a586a9711b74dcd98f1e53bc17e02
-DIST filelight-20.04.1.tar.xz 661760 BLAKE2B f6a818f3bad44e51f361fb4bc8262a63f352677dade82b93f37a228a68ca852638722a2ac457f107d07585d23577c49af3e4baab3493d33662c4959b787fbf77 SHA512 93b7d8fdd09d84582d9ec41d6c4c7e60a03997f94f8c56ae72eec42c5ef79cc8fb75f310a195c97a3b386f3bed3257874f26955a29928941c5dd895aa556b8c4
 DIST filelight-20.04.2.tar.xz 661752 BLAKE2B 45ef8f575265e01a09d1cd8f127775cb24b4a04b33405ea5e7596e12ca0f80693ebbfaa7dad5543a4be73174edd72406094e41f1dab74776593c28ec8e1a9b7a SHA512 fae3d6e11eed4601aee3024808b090ce9a9de80d20957c05d1e15a9427f1b0472683bb4a1fe7baffeaf62ee4dd911b860f16efac5176f9382da3795fb5c39a24
diff --git a/kde-apps/filelight/filelight-20.04.1.ebuild b/kde-apps/filelight/filelight-20.04.1.ebuild
deleted file mode 100644
index 7929f1b8578a..000000000000
--- a/kde-apps/filelight/filelight-20.04.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.filelight
-https://utils.kde.org/projects/filelight/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index 179fe497d08b..a2db4754d60f 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,3 +1,2 @@
 DIST granatier-19.12.3.tar.xz 1943900 BLAKE2B c699dc84f8b56f44130d238618f40d6ec690261b34c6a4ba2fe83481b1208c4b06694ac949d6076065f9c955b579d81dcfe437ce7520a5424baec60e6283414a SHA512 efdc0c67c9b7539add2c8bcf6816b13087e5eb0712e739d97fc0947ec7667b10c9e33b02856d742e41ae73128bef28da225a0d228e39a747a4f76e74eadf5eb5
-DIST granatier-20.04.1.tar.xz 1944576 BLAKE2B c78f75dee2afae8907834d4e30f3db93eb4f58eb12089e3a66d59f5751a32f6ad7b7fa33ceb64910fb10ceec297d6e2f70858bfbc60636d5620efcd2e1ebba8e SHA512 6be2708b414f8e93499edd7c22453a9f4a7699481a8ea89add3dba9d4f1c738ad23d5d16f317474dfcc2f536b9064f9b185e25497305eb8f3d3f2f7b03525ac4
 DIST granatier-20.04.2.tar.xz 1944564 BLAKE2B d26cd70468552bdc9fd637eea9fe7a16326762bf1bb3b8bfa2cede77201be44281e37732d0d40c3a7fe2f499e334e22818f8d87aa0d79b7f0a66521fb20c9249 SHA512 6b207cec8e279c63f79541ce670b1666553a87399a3de35c7ad60d145225af398b039737f27448a2bb03d7c7325a31c4db98b621d17ba8b62d81532eb16f1b12
diff --git a/kde-apps/granatier/granatier-20.04.1.ebuild b/kde-apps/granatier/granatier-20.04.1.ebuild
deleted file mode 100644
index 609c7580d078..000000000000
--- a/kde-apps/granatier/granatier-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Bomberman game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.granatier"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 9e644d8f183f..5ba2fae15e9e 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,3 +1,2 @@
 DIST grantlee-editor-19.12.3.tar.xz 111728 BLAKE2B d4902a1feab7970266ce4e9f23bcbbdabea9e5f7a747dec60255925313a842633796f7894e0a4f7b439b135a585873db3e8b64de0f92f7c8a12f43b619190248 SHA512 03279e4bd93a50d09d724baee931ec7f3b6827e44f7408555ac00fff1d04b2a6b60fd8c18d4dc8480b32c878d367b8c012e030b77a127d863280a07039517f29
-DIST grantlee-editor-20.04.1.tar.xz 111228 BLAKE2B c9ff73b0b546ba5fdb45431f0bed1bba3d846746843e198d2496ccd42a8c2cc1aa862aba5a8813e3270017c791c159020711988b3f52cad63392110541195e25 SHA512 5f1a3141b3a43d8778a4af29b611ce53f75a0b8eeafff0fe5464e376f336825a4d4b9fc4dff74dfab25de618e81114d576ed984a14fd4db97a6b37e6d00f9d34
 DIST grantlee-editor-20.04.2.tar.xz 111212 BLAKE2B ae71e1360f2ba8c3644a3837c81925bf87ebeaf8f4b6d72afc532d14598dd894bddf288ccb96bd34271acc170d67cf0268c72fc285cf93b82776c3f1148bb571 SHA512 2d26464ade72042e8c769f267f9b90ec5316bca38f3edf0a474253859abc29d848bca032006e20022d5c826f10669774248db6e8c97c88ced87d7617b8e82c48
diff --git a/kde-apps/grantlee-editor/grantlee-editor-20.04.1.ebuild b/kde-apps/grantlee-editor/grantlee-editor-20.04.1.ebuild
deleted file mode 100644
index 01680467677e..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-20.04.1.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.70.0
-QTMIN=5.12.3
-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 ~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/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index b222f16dcdfa..08fd813edfda 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,3 +1,2 @@
 DIST grantleetheme-19.12.3.tar.xz 55168 BLAKE2B a2b0ea3df4184745b27f90f086e0366df0b279e3f0163f846cccd444725d45b550b19fd30d63ae687ace980accb9eec774ea6994ea0362abb037216e4a4d34c4 SHA512 466e5f32189373ae356a95285fbedffeb97ac759a056aa2fcb87068ada3cd30afbbfa2520b4c91fc6ec4a2408e2cb1adeacd1658ee8b4e1714d42ddd4be011a7
-DIST grantleetheme-20.04.1.tar.xz 54964 BLAKE2B 4631dabe03845bbb9313bf40d04e881708974e9be9a5f358e386a964091067fe0009389ab0057326ebcb648ac8688dc2274e94e9fe386678a96aef4c079b165d SHA512 9521b239844c10729e74bcb0ab218563ce6d1a987608348f9f8e02fea745579a9f5a203f56cefecf4842c092f14b1aa881951cb7c91aa8ac7fc6faf370f23b39
 DIST grantleetheme-20.04.2.tar.xz 55008 BLAKE2B 977d23115b63fe0efee22bde60a0552fc8a08de5aeb460cc891fbb351391f47e5333d80241710545eaeeb90204d6741b50ef4241480b46518c6799e85387845b SHA512 4d3f0144fae8f01aad2d9d6a2ca664edfdd3d7f5f8feb1091e6df2b35472309695aa77f2b2688c8dc4bb17f16576e4ff58609a74997caf3690d4150435289bcd
diff --git a/kde-apps/grantleetheme/grantleetheme-20.04.1.ebuild b/kde-apps/grantleetheme/grantleetheme-20.04.1.ebuild
deleted file mode 100644
index d9c7d9abdf6a..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for Grantlee plugins"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 3549d667238b..64ee5fee82c9 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,3 +1,2 @@
 DIST gwenview-19.12.3.tar.xz 5735304 BLAKE2B b962718ce83f33c4f7f4ebe0d3372497495f661670b9ba0e1423e3ee87914af83d5e9221e90e02ba7ef83b007768d088bd6e2ee5f08252c357e88a74ac470bed SHA512 a93cf6a992b76e84d8e33e570aab7bff410404539a8ce4ea55ba86c4487d5d1139dea170c449ac4cfb8755be30bc4fd7903cfa890374231b88d763ae44a29ff0
-DIST gwenview-20.04.1.tar.xz 5741100 BLAKE2B 9eaa038bb8b770bfe181a5393b33b69f3ece2f7bb3f5820cfb85439e7ab2c5de4d2d53a0b055a4fadab2a4b01f245d015b1226bcefde3ed072202185b6643c62 SHA512 4bc915d12858ac4aeaf4890b027282d0c86350103defb8ee7dcad8678a10cf27067feee75eb9280fa0c33d73954fa0916506f7872a79ce9b7a26eee648d8dc39
 DIST gwenview-20.04.2.tar.xz 5741168 BLAKE2B 1507e03399af45f13cab4bdc02eb21c84e55edb7dec5f09e28078bda5f93b5cdf692bcb24a1874f571e088998fc9b59227025fcb902d4bf2330410d7da3d7e86 SHA512 28e152dd353273a19c31e5fb324e6ed09586a70ca96a5e4071ef70d8afc795eaad1b8907519acc4144b11d69eb88afb155e8585cbb59d0330560c6525e3d3baf
diff --git a/kde-apps/gwenview/gwenview-20.04.1.ebuild b/kde-apps/gwenview/gwenview-20.04.1.ebuild
deleted file mode 100644
index 8e060be076d5..000000000000
--- a/kde-apps/gwenview/gwenview-20.04.1.ebuild
+++ /dev/null
@@ -1,110 +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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Image viewer by KDE"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.gwenview
-https://userbase.kde.org/Gwenview"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities fits kipi +mpris raw semantic-desktop share X"
-
-# requires running environment
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=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/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtopengl-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/phonon[qt5(+)]
-	virtual/jpeg:0
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	fits? ( sci-libs/cfitsio )
-	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
-	mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-	raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
-	semantic-desktop? (
-		>=kde-frameworks/baloo-${KFMIN}:5
-		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	)
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kimageformats-${KFMIN}:5
-	>=dev-qt/qtimageformats-${QTMIN}:5
-	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use mpris; then
-		# FIXME: upstream a better solution
-		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package fits CFitsio)
-		$(cmake_use_find_package kipi KF5Kipi)
-		$(cmake_use_find_package raw KF5KDcraw)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package X X11)
-	)
-
-	if use semantic-desktop; then
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
-	else
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
-	fi
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version kde-apps/svgpart:${SLOT} ; then
-		elog "For SVG support, install kde-apps/svgpart:${SLOT}"
-	fi
-}
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index 2af5e29fe7e0..7083e4425a4f 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,3 +1,2 @@
 DIST incidenceeditor-19.12.3.tar.xz 548988 BLAKE2B f1bfa216461f2cd479e779314f2fc0bd6f557ec1f198985ec08ad257a7c82a0b57e9259ff047036621dc18e729ab11f90697274f5ea6ed65f1023e62bdc17272 SHA512 c550a48b7ebdf97eb3bce9d962c6401c22ac64065edc61868279aced5d1ef1a99d39857db249d3affa8caf76e8d8a3b0824aa0cb915f3dbfbfce3175fbf97dbe
-DIST incidenceeditor-20.04.1.tar.xz 550032 BLAKE2B cb55b8ae945202f58d34b50bed48d6a68656cfbb3d36abdb7999ec00a316d4adccf83a2ee03ecd9ff1ade065d8b0c14415068dddad277f1ba1b7b09e54d90c1d SHA512 f9a578f1fb79f1bbc106668621116dbb7284dd955673a09d1affa994d094069820da53db9f032bc79850efc8ae021fdc2c81c2732dc84b1cf082e31df08b01c6
 DIST incidenceeditor-20.04.2.tar.xz 550048 BLAKE2B 90dff5ce325474510ed7b6a435bf8b56425f966489784df5b422635f704e605be892e09e6bea016030ff723f18656f567771203b3bacc264c5d4d5a3a625c79f SHA512 eca0abbfcb0049e4f71af3f71a65fd4bfc20610b3d90ab6bd38111186eb2aab2a8e8a85162061ba9618b154d4b925398a677e6822fdfa10749152b17b7823d91
diff --git a/kde-apps/incidenceeditor/incidenceeditor-20.04.1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-20.04.1.ebuild
deleted file mode 100644
index 4791e282f6ec..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-20.04.1.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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Incidence editor for korganizer"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/kdepim-apps-libs-${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-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/juk/Manifest b/kde-apps/juk/Manifest
index bea2b1a09826..4b8eb445a752 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,3 +1,2 @@
 DIST juk-19.12.3.tar.xz 1867052 BLAKE2B ada5f5591e649cb856d3dadea902c60ef85b16a9cbe38a2080ea61813b556fbfb94fc76e4a31860ac1415f55f02f8bf1b9f483196e6c9acbb467b3c3cf312792 SHA512 39fcfeba4e2616390ac55414bfe9030285765335973fc881b6fc83657ed868e354e0935b00acf669e6bc11e8f6f1daec6c67873d1de71eb14e7f75d1c05ffedb
-DIST juk-20.04.1.tar.xz 1869896 BLAKE2B c01a6792da226e726be84257033f4109ac272e162f433f541be4c7a88beba10cb05dfb0849b14a922b41426a6d40bc723e341d2075fbc496114de4d5d71df9b3 SHA512 eedae21df52ac055e2628c57a80dc17ab6f1c9f0907b5c9cff812b0b8e60acf9b21436849622b320fc6642cc4b658b2965042fe7249c9866e6027d870410bd60
 DIST juk-20.04.2.tar.xz 1869788 BLAKE2B 279bd441faa7bc91710cb3d08d38304a6e9c57c9e5209a0e8c59ffecbc4d03ab0e8539444a163a42254bf70fce1bb286b536f95b9632f896ea5076d579457261 SHA512 ee503ae6119823ea66f187e9bf84ee68c9ec0b2b0620624a5916ea006e25cbf7b7bcbafe32fb496d43db8473e1672ae7841f377acd1a2223a665ec4d1cd62a96
diff --git a/kde-apps/juk/juk-20.04.1.ebuild b/kde-apps/juk/juk-20.04.1.ebuild
deleted file mode 100644
index bbe8556507bb..000000000000
--- a/kde-apps/juk/juk-20.04.1.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_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Jukebox and music manager by KDE"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.juk"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=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
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	media-libs/phonon[qt5(+)]
-	>=media-libs/taglib-1.6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 3aa90e4c45f1..574b377b8f28 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,3 +1,2 @@
 DIST k3b-19.12.3.tar.xz 10518156 BLAKE2B d80b53a23183b1f33aa2cc78f1a60a10210dd017862c244a5f792b68d5f40f00a5fd0906d2468b0f23541a2fc9c498ae877d2def7eac93df5c6f86319a97659b SHA512 732526da1f8ad735d221bd8412e26462ad0a4a8a8bca6a2588d31d58f4345b8dac49b9c07fd464c95ca65f4e901df0bbb1ab404956f5c06c8216a1c6f07bc8d8
-DIST k3b-20.04.1.tar.xz 10510332 BLAKE2B c72e8c49f283e873b0cbd5ddaf3306052f408e351580fed472ee9b6fd3c221d47df581e07d697410fd8b7e0f085ffc566d5f4b46b5413919c1e742e9d76d09db SHA512 6d9a8fe3860e996c6e2291933d5912b4a1bd36ebdd73e6de3486082052b21f5d00b7e7329cc5f17ccbe1f46120f5a77cfb9ab789968e7c48ae2e950a1f611bcc
 DIST k3b-20.04.2.tar.xz 10512196 BLAKE2B 532f8207ff09b2e77cd1eedc7e8ce01f9ebd062a5750553d41297c78c38220eb6adfc82253cbb508883f6a7f427c9e22713783bc2e9b7d6ed5a58237b9334e5d SHA512 50796d319206f33f8eea1ed939d1015814bb0b34144ce6024a756a75e75e312e343dd685189bc6efbeaf89883d68b4c27e7b086211618b55e6ffbdfbe39181ea
diff --git a/kde-apps/k3b/k3b-20.04.1.ebuild b/kde-apps/k3b/k3b-20.04.1.ebuild
deleted file mode 100644
index 282005a07848..000000000000
--- a/kde-apps/k3b/k3b-20.04.1.ebuild
+++ /dev/null
@@ -1,122 +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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.k3b
-https://userbase.kde.org/K3b"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
-
-REQUIRED_USE="
-	flac? ( taglib )
-	mp3? ( encode taglib )
-	sox? ( encode taglib )
-"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkcddb-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}: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/kfilemetadata-${KFMIN}:5[taglib?]
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread:= )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( >=media-libs/flac-1.2[cxx] )
-	mp3? ( media-sound/lame )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	sndfile? ( media-libs/libsndfile )
-	taglib? ( >=media-libs/taglib-1.5 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-"
-RDEPEND="${DEPEND}
-	app-cdr/cdrdao
-	dev-libs/libburn
-	media-sound/cdparanoia
-	virtual/cdrtools
-	dvd? (
-		>=app-cdr/dvd+rw-tools-7
-		encode? ( media-video/transcode[dvd] )
-	)
-	sox? ( media-sound/sox )
-	vcd? ( media-video/vcdimager )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DK3B_BUILD_API_DOCS=OFF
-		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-		-DK3B_ENABLE_HAL_SUPPORT=OFF
-		-DK3B_ENABLE_MUSICBRAINZ=OFF
-		-DK3B_DEBUG=$(usex debug)
-		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
-		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
-		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
-		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
-		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
-		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
-		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
-		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
-		-DK3B_ENABLE_TAGLIB=$(usex taglib)
-		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
-		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-		$(cmake_use_find_package webkit Qt5WebKitWidgets)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	echo
-	elog "If you get warnings on start-up, uncheck the \"Check system"
-	elog "configuration\" option in the \"Misc\" settings window."
-	echo
-
-	local group=cdrom
-	use kernel_linux || group=operator
-	elog "Make sure you have proper read/write permissions on optical device(s)."
-	elog "Usually, it is sufficient to be in the ${group} group."
-	echo
-}
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index fda801afbcc4..1c7fb7741a1d 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,3 +1,2 @@
 DIST kaccounts-integration-19.12.3.tar.xz 65792 BLAKE2B f965bfd94b4f5a7270474f7646fae0f5477df9ed9a0e504e9214ba2334dd2ab2ae5fe71a3e6c2d1ae5213f77434ad98ff05fe867bbbce43592e4cbbf05d5c018 SHA512 3bf8850d9d81001c30bf6fb62178501bd45e6e447093fa63f32cba0b17cb83eadc518f439653c6212e80f20be7cb76a912a632a286e94b15fa8d9c2c6ad9e681
-DIST kaccounts-integration-20.04.1.tar.xz 65804 BLAKE2B 8bec57c523c002e489b00cf93507944ffba96ddc980ccd52de340141db8db9b366225c91568f7928bb03090463dc65c3a102d6da5c4bb522adcf5d79737f678b SHA512 7339d1e877503b436e1af3a3efed047d7c646cc6e342330e691b6314eed8f13a355ad69ec691ab442bfd1d7490fec82d2a2f6f87edec0f682941ec88b41d65b0
 DIST kaccounts-integration-20.04.2.tar.xz 65944 BLAKE2B d202179846664dccdf1f216be59cd3093f07d40dd29890bb86ea5f4f9624a40a098c2b7e2454d5b38bf3f0d432ea22a3fbde7a6b9750f977177af0d8a109c7eb SHA512 c488584e10d3c25205dff2b3f502cb85ac28a31084b9e7d7b5a50609405f2c8182fe72e313e3d3eb19de68c03a65f6a577e85f249c3d2d1744775e368a63c12b
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-20.04.1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-20.04.1.ebuild
deleted file mode 100644
index b08b454d9aac..000000000000
--- a/kde-apps/kaccounts-integration/kaccounts-integration-20.04.1.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_TEST="forceoptional"
-KFMIN=5.70.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.12.3
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org
-
-DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	net-libs/accounts-qt
-	>=net-libs/libaccounts-glib-1.21:=
-	net-libs/signond
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-"
-
-# bug #549444
-RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 5dfed8dc3dee..80ae6556ce02 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,3 +1,2 @@
 DIST kaccounts-providers-19.12.3.tar.xz 31840 BLAKE2B a5731f7d88c1ca5da34ec18380835e8324203d0ce65d259fc0fd6efd3365fd38ddc4396fae595e148628eff9f169f1fb4b8cb57224f6617a6bbdc15bdb87814a SHA512 8eeecde574d7e9c34e0d9d418c198ede558c6b89417ee11d0a623bc5bae113ee1e7255847df4dfd8abd455bb1cd2dd9da68baf2b45afa2d5a54b6da1b2d872a5
-DIST kaccounts-providers-20.04.1.tar.xz 35796 BLAKE2B 0916132d902af08c31e68bcc2fc309e63675d3bb41c85d2ddab6ae3d697aac921c7c3e1b49cf01250b151aebc7379e1f3b667d727106a0bffa0d5a95fd96b99b SHA512 6105d73a9cf1e9e04edfc1ec5854f8406e5d7e8ef7a2ff1f751f02876dcf173d8b1343bb5d680edd9d0160c968594bc6bceba5a9e885a8db2ad29dfd88996665
 DIST kaccounts-providers-20.04.2.tar.xz 35884 BLAKE2B 03cd5fb8b9df545eabedd474a16595d3da0f4490756d523e1d39adb3e963e30b1f3162afb35e1632db9141dcde6e0ef78da2dbd44c14dadef3468c3edc7fa220 SHA512 c2561015d397a58f19f9ef4314fa71ee595cb9cab5247dc2ac2f3bcf4f6a2d0179e6eaee7bc562a93323ba360c2dec0915324d55d44f5f71968300692b2a0764
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-20.04.1.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-20.04.1.ebuild
deleted file mode 100644
index feb892adc969..000000000000
--- a/kde-apps/kaccounts-providers/kaccounts-providers-20.04.1.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
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE accounts providers"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-util/intltool
-"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/kaccounts-integration-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	net-libs/signon-oauth2
-	net-libs/signon-ui
-"
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 00dfd73e5834..fe1d4abf4142 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,3 +1,2 @@
 DIST kaddressbook-19.12.3.tar.xz 2418004 BLAKE2B 73932d0ae81bc16715a137ebf8d6464d657a623c9bae1ee0d6066478ade39b2c88b80f52994ee4221a545732970f63f6c524cef65c4d368f6640632f97c2ea16 SHA512 e08cd6ce8b1583431ea2ee79818f82183c9d3109852277b80ea6e1ff84b0ed921eef1b443617128bd67e4240834f63722f8b4a60c4195bb9ac96810fc0bb4719
-DIST kaddressbook-20.04.1.tar.xz 2427612 BLAKE2B 8cb58a3aba429af9d69a311d5c051a1da9a3a0667272f4b1f1a4527b8c19ec89f10535bd4526aa77393d69075a7d5b75df1f737de7d8fb247986df4d97e7b2f5 SHA512 e74ac9d5cec29cab9be2a1a69868927a2f95e8556edbf278af1a7230823c81b5a0680f97b22b653153f880b59e9a41bdbcf41a29cb46999e929a25fdf27d9afb
 DIST kaddressbook-20.04.2.tar.xz 2427676 BLAKE2B 7e8e4ca0bd153c7732b11e8c1270f5cee384f9d5d4a81570212e10bb362095e2cb335373e9c28dce113eb90e26c693e991a157a4af623631b33140025cdffedf SHA512 6cfa68b09ae2cc0cbd1499676ea327cfdbe49784e872ec0451f77951f499277f48a2ee86d861f70b1bc20bc27d46de49c6680785906f6ddc663b344de95090a0
diff --git a/kde-apps/kaddressbook/kaddressbook-20.04.1.ebuild b/kde-apps/kaddressbook/kaddressbook-20.04.1.ebuild
deleted file mode 100644
index 75a2eed57e39..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-20.04.1.ebuild
+++ /dev/null
@@ -1,77 +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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "kde-apps/kdepim-addons:${SLOT}" || \
-			elog "${PN} is not complete without kde-apps/kdepim-addons:${SLOT}!"
-	fi
-}
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index aa6a39509562..6da824b6341c 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,3 +1,2 @@
 DIST kajongg-19.12.3.tar.xz 4464436 BLAKE2B 7ba749f4c1ef538200f5a818762487b4857670a284989f84820130f3a93e758f327e082d98291647675f60ff6efa6c7a1028f66688bc396f984c5d83ae8fc02a SHA512 2529ef77aaa4eee8c3245caecbb48316b797dc517e3a27dfbf2582ca3833c54d3e9b65f89b6bebd6d0565956ef87c130fc5dde338e03e2ed978913841cb981c3
-DIST kajongg-20.04.1.tar.xz 4468252 BLAKE2B b38ecf100218082a75007e2888b52f212728e0c33c3283160a81914dd7e68cb777b6526fe3930d6496196d4cd26c90509e61193198cfce4ccd764a6935cd040a SHA512 18934682b375eda4320b8e891c9db5965ef75c191ca5668cd9f6753c632cee45088eee76c2b9150ab058ba4276028dbf90c1a99fb6842da7b7ed0416ef517d7d
 DIST kajongg-20.04.2.tar.xz 4468304 BLAKE2B b3af945a73098aa0dda9f14460c1d41edba34f5837c60a7f6e4534bc350f97bed1bc3156f446abdcc231700c880c78df1f54045bcb2bde387b962ac1d49b3323 SHA512 6fc575554c374a5fb33bf47ad43d96a67ce6c721ee6451f228a8e8a34265039287822143b1923eabe3d6680bf79b6f37350f38a92c81a0caa82eb845520de4c6
diff --git a/kde-apps/kajongg/kajongg-20.04.1.ebuild b/kde-apps/kajongg/kajongg-20.04.1.ebuild
deleted file mode 100644
index c398fceee579..000000000000
--- a/kde-apps/kajongg/kajongg-20.04.1.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"
-PYTHON_COMPAT=( python3_{6,7,8} )
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="Classical Mah Jongg for four players"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kajongg"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-db/sqlite:3
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
-	')
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/libkmahjongg-${PVCUT}:5
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang src
-	ecm_src_prepare
-}
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index b1b62d4ce196..67dfe78afadb 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,3 +1,2 @@
 DIST kalarm-19.12.3.tar.xz 1836596 BLAKE2B 118ac7e471d242444d0fb34c5e1ad20556c2d2c433a3fbee2eb781d25a62ccfca0edd22bb3f9a44b67e3dbbf3dbfe2692c507c70f6de4616ad87fbcfa6ae9b2e SHA512 b004d2bf8433589857e9ba25774ccbfe3e1ebe6f3f3e098cba9178db99cc5fa40e32406abde0092fe5c6db979831abe4d78aa10a20156490796ade5c634e3042
-DIST kalarm-20.04.1.tar.xz 1840592 BLAKE2B 4b91aab6dc31146420a41cbbc345388767083cf6851ae00f26c5a23212e6bad255367ce28f3297ec0450b6b2175788a6f315f11dadd5febe569f448c315490dd SHA512 7c803e244edfb041403eedfd3924ab6d4e0d56d74ce6f5c046928c0d925d7d2677113d43892251c3a103b5f5ff0e8ad851bee2ea04a0256545d85835c57977a1
 DIST kalarm-20.04.2.tar.xz 1840924 BLAKE2B 70687adbff44cce3f36ef695d220d2f073d6ca22ee609f24ac6d21edb0237d14430cde1a0b0e19d7d9d7857a205801035d2da47efb86eb4a7dbb4fb125c2051f SHA512 7af71b65369c10ad73860e2c3600a8b700d4b5144e475ce1df6e4c1b98fa966695b683c7d1b7be748bf99cfa2dcc1a2bcd1371e5ce3d2922fa800367f89ccd9e
diff --git a/kde-apps/kalarm/kalarm-20.04.1.ebuild b/kde-apps/kalarm/kalarm-20.04.1.ebuild
deleted file mode 100644
index e47671a439c9..000000000000
--- a/kde-apps/kalarm/kalarm-20.04.1.ebuild
+++ /dev/null
@@ -1,85 +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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kalarm
-https://userbase.kde.org/KAlarm"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/kdepim-apps-libs-${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/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[qt5(+)]
-	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/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 5f8761833f3b..74be589bcf11 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,3 +1,2 @@
 DIST kalarmcal-19.12.3.tar.xz 573860 BLAKE2B 378e037ec062fb44183c8b8edccb3c3eff7a30ddca21b05336a21e51e6119f82c79682de95943fc80bb44c058b7859d5e01ce103e14d45e859e13e22e78153aa SHA512 6af77aab21fdef66132f0a0459ae61a4b81fa7c141bfa3cf062489673ab9bb87326aad05db4810113192c7ca129e3d6ebbfee045b8edea159404823c9aeacd4b
-DIST kalarmcal-20.04.1.tar.xz 574452 BLAKE2B 63bc636440e578bfb57bc9ec1409fdedc0dfccdbb5b49f5bd0b6b4292b852853e74b420ab8a63d2c859494e252b11e65cd10bbc1d5ee8be68a7f4d3b6ff2690a SHA512 3c88c75fc9e1b248aa157b55b97c1c24b010cf9eb4ec0f6974fc50611a21599625fc7d8932148f11508c7b084eba1bd9c9b6ce64544bb4500daa81723a457c97
 DIST kalarmcal-20.04.2.tar.xz 574456 BLAKE2B fc4cce89f442eae4fa1f85256a751066276381f2d00a02ab3b9c262ec9a0eb971885b74389c04cb8e96f62071bafa1ec513ff015c6d41700dca4b9e5dbe4d534 SHA512 05c7f9102182c8d2ce1009913d87104b8e4dff1849ea4a116d23c30a05f3e203403c85de6d68f18596d579f6fee7f82228ccf438dae38b458a019602178c9b0d
diff --git a/kde-apps/kalarmcal/kalarmcal-20.04.1.ebuild b/kde-apps/kalarmcal/kalarmcal-20.04.1.ebuild
deleted file mode 100644
index 986c21430895..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-20.04.1.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_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-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 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=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="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kdepim-runtime-18.03.80
-"
-
-src_test() {
-	LANG="C" ecm_src_test #bug 665626
-}
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 6ad96157cff9..686e029c3d37 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,3 +1,2 @@
 DIST kalgebra-19.12.3.tar.xz 1156672 BLAKE2B 6d3001fecf419f4bbf3f3f129631759739f9b41a0f6daf7961d1e941c1624cd19a5d785dc7e7096abcf31f8a27c96286b369e1f9d8724443c5bb137e15164cd9 SHA512 9bc1957f8e851bc0d39a6e8953913d23f245f0bb1338c34e465d1cdddafd144bf80677335f1ae43530754530a2fd75c4bec8f6b3904082fee18bb235011611ab
-DIST kalgebra-20.04.1.tar.xz 1158236 BLAKE2B d738efbffbd41a1bb971e85a44528f6fc0527e0b933fd734ce7db659bbb3105558266f76f322eecd61021782bb33a48f96d83235539c81c16343a127797059cb SHA512 9ed48488b448da004d52f49dba28c67a2a0fe83db9f72d37f1beed1751b53cff407e201ba3d72ba90a8082c77ff0a2d57b6524351a171e5631c1fa2bf5d28c30
 DIST kalgebra-20.04.2.tar.xz 1158340 BLAKE2B ac561f785716e3a1473ab5c62b2c7452d1e9d201bf65371f909a19a0085acadba7feed8819ff6d612c99451d7285d5c260e8e6e8396bd5889693883c3d37b61f SHA512 6160e4c2da6f5bf739c66972429868535e011aa05a93fe7550492b36a5801ceadaebf2e3c453d50e50da002280881a00f53aaa0067ed9f60022f92bb231c5600
diff --git a/kde-apps/kalgebra/kalgebra-20.04.1.ebuild b/kde-apps/kalgebra/kalgebra-20.04.1.ebuild
deleted file mode 100644
index fe426a42d4ac..000000000000
--- a/kde-apps/kalgebra/kalgebra-20.04.1.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="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="MathML-based 2D and 3D graph calculator by KDE"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kalgebra
-https://edu.kde.org/kalgebra/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="readline"
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/analitza-${PVCUT}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package readline Readline)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 3bf7c983a755..315ddc0353db 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,3 +1,2 @@
 DIST kalzium-19.12.3.tar.xz 24586760 BLAKE2B a8d09473de9d9036a3096da3c27dc3a7478a85a5bb6f76ee133e5c958703ae004c4620e7a1847c9f7c62fb62843171f20d39c294184463209a6763523467f592 SHA512 fb8389937c605cd681295a16a87795caa317c8362c6704406adc3b67adf1c426019b6d52cc08d71248a9c705971248ed1b93e972741db917757bc479bff1af7b
-DIST kalzium-20.04.1.tar.xz 24595836 BLAKE2B 9823377c15631497557a38b48544523738930c1a23a1d513c6c6bb093ce3e66f841a912db59ebd56109736f2adb6214bbec11dcf0ba437719e1c69bb7c565c32 SHA512 3413f7e4ad0630f0463664cc24329ad64044e2624e7781b77ca5cdd195e06cb6aa4f11a92a326e41d0908a72f5202e5215435de63bfce758ccc55ecacbff53a5
 DIST kalzium-20.04.2.tar.xz 24597040 BLAKE2B bf1b4527f4305b9f645e963a2f6c80ab0ffe6bd6811e60d05acb93501d7f228fa4b5d3f1cdc4e9961aea5f33b94d61067c1cff1d4c5154de260d075432a75da3 SHA512 92af798e642832967ba01305fbabf6b31f56d56cfbac5d1593ee203aca04e7569f7d01eb58fabc6cdfc5dd3c8b091d20fe1b8d46058156e13fc581ce8b714db2
diff --git a/kde-apps/kalzium/kalzium-20.04.1.ebuild b/kde-apps/kalzium/kalzium-20.04.1.ebuild
deleted file mode 100644
index a242acd4116f..000000000000
--- a/kde-apps/kalzium/kalzium-20.04.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org flag-o-matic
-
-DESCRIPTION="Periodic table of the elements"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kalzium
-https://edu.kde.org/kalzium/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="editor solver"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kplotting-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	editor? (
-		>=dev-qt/qtopengl-${QTMIN}:5
-		dev-cpp/eigen:3
-		>=kde-frameworks/knewstuff-${KFMIN}:5
-		sci-chemistry/openbabel
-		>=sci-libs/avogadrolibs-1.93[qt5]
-	)
-	solver? ( dev-ml/facile[ocamlopt] )
-"
-RDEPEND="${DEPEND}
-	sci-chemistry/chemical-mime-data
-"
-
-src_configure(){
-	# Fix missing finite()
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
-
-	local mycmakeargs=(
-		$(cmake_use_find_package editor Eigen3)
-		$(cmake_use_find_package editor AvogadroLibs)
-		$(cmake_use_find_package editor OpenBabel2)
-		$(cmake_use_find_package solver OCaml)
-		$(cmake_use_find_package solver Libfacile)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index bace494621d6..b712daea17dc 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,3 +1,2 @@
 DIST kamera-19.12.3.tar.xz 103760 BLAKE2B d83b59f45249d99edf8c47461b7bfaa74d300fc658a0a8df437baf50d42db4654660cdc1f01e0377dfb7434834788cd094e9bc5c09ccf68fb56cdb15aecb38ec SHA512 9b7783bec9eecaa032adec76452f1a972f03bf97f919c6b354c176c7bf2fb99324e3de9d1928622cd079f4bee089d97d099f201735fa6637188b81dc45a746da
-DIST kamera-20.04.1.tar.xz 103728 BLAKE2B e97b88a2dfcdbea3478dfd359749421993d6d872c415ba04ed9d10906eef8d427c944363ef30ae94698333551b4588996ce9dbd648aa799bc01a95c77336acfc SHA512 f37d3c5ab786b6883cd97bbce9b877f6367fee308f90a2ae220b2703b76943dcb7b37817cf89a1cec86009cc5df299e8156c06319661069d9b07184b4e3fc49d
 DIST kamera-20.04.2.tar.xz 103824 BLAKE2B ad5c0596f25667374f90b86085c1747b675418f725b2b1ed956b829f524c0f5908bd1960b2c6c7dc7b4b83cacd14a2989d05a5c8022d4647aa5c5e018dab4a0e SHA512 a79b0a6c270f07f679ac62d830e50ffd24b01d355b3355c60d40f7edfde230e7e3cd1b8967254d400410d894a440c9bd61e49bedf605c2b165b672146874b884
diff --git a/kde-apps/kamera/kamera-20.04.1.ebuild b/kde-apps/kamera/kamera-20.04.1.ebuild
deleted file mode 100644
index cdbe4eee005c..000000000000
--- a/kde-apps/kamera/kamera-20.04.1.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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma integration for gphoto2 cameras"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kamera"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-libs/libgphoto2:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index bd17f52c3117..c0b5c2576699 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,3 +1,2 @@
 DIST kamoso-19.12.3.tar.xz 201284 BLAKE2B 95b5ff07db8cfea912f21a2b8101a5ca93d9156ca18d84903c884c0d2ad8246f451289ee1458a5e4308c23edcf4a72a4570537bc0c29a05d64e3aca0a5a377c5 SHA512 6960c109bd7840a2dbfe901f857b560c67d422accf5d0649e81a31e45b0126133886e71ac558b4718dec639e49050d1f28572c57dfafbd8b2ca4cce6d2c8bd66
-DIST kamoso-20.04.1.tar.xz 202408 BLAKE2B fa02d3aa2f16245dc84d15196b04496bb70bce361abdb709f6c18536d732a4f98aaef6cffdd129a7710c6ac33cd0b95381d3219adb9096c97851541332e71dbd SHA512 317da00abe7b9140dfc0306a0dbe300195e48820bd1c5e7ca6e928821f822aab792352f4a8b61d20ed6b154092b13fdc8b8f3da1f871dc13d71b82e3bf2432d6
 DIST kamoso-20.04.2.tar.xz 202680 BLAKE2B 43d865baf4c149c0ebbbfc812d38c23cd138cbf6bfa88cd63a6e56cf1fee6c87d6c1316f87d156051eb33cf40f98c68250da89b1066512c764f15adae2362616 SHA512 c1977de0302d9ebf6366af506f0dc0a245b4a29c1aa85ddb69a028497ccd03d98e0de1d3b1dc320828529ea173021dd9fa46ae62cf9deb4da1b5be8547b3d72c
diff --git a/kde-apps/kamoso/kamoso-20.04.1.ebuild b/kde-apps/kamoso/kamoso-20.04.1.ebuild
deleted file mode 100644
index 4257b7116021..000000000000
--- a/kde-apps/kamoso/kamoso-20.04.1.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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.kamoso
-https://userbase.kde.org/Kamoso"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/glib:2
-	media-libs/gst-plugins-base:1.0
-	virtual/opengl
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	media-plugins/gst-plugins-jpeg:1.0
-	media-plugins/gst-plugins-libpng:1.0
-	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
-"
-
-RESTRICT+=" test" # bug 653674
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 1e3d9c9a0abd..874419c9d17a 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,3 +1,2 @@
 DIST kanagram-19.12.3.tar.xz 8033280 BLAKE2B af86f75c6621a7100f76697a17b8500eb9cc3af0fa8e219277dfe78e67bf86bd1bb13d91ae5949ea50812aa799d527a27ce6f5450040153cec5fdc88d48e53d3 SHA512 cf48cc5ff84a033a9fecef0f2d8fc01de12e8fbed4c8055d6c0fc2bac75166d5044889eed61a32e71639413d336dd69e50878785beede40934f77706125fb6b0
-DIST kanagram-20.04.1.tar.xz 8024164 BLAKE2B b1b6946893c0d4c85efd74ed8ef915d23bf374e72e119c927d924024dcbf5544071f0d73e58b01abb4129311b79d63ffe3c156b6888e8c95e87c441342f93940 SHA512 ad91300db779926302220767aefb01220b4feb91e028c1842561845b3456b2415e64f558334ac604fd16738b1acdcded6ad8649900cd667af0931b058912bc98
 DIST kanagram-20.04.2.tar.xz 8025664 BLAKE2B d1110714581e6741e4c49866f156ac4b96e643d39c6b9555800a0c28addd19babb512885ba44b1fc5bfd4a36a4ec3b579cccf0b02af4ea0f119a77ed64530104 SHA512 055042d1cfb1a1e61ce711ceccd5592068beb06f597bd4aff3ba3bf394405ac009a8910813e42d7ff83f88d430f89c1c449f0c6491b6f3fdc10d799af5479f0a
diff --git a/kde-apps/kanagram/kanagram-20.04.1.ebuild b/kde-apps/kanagram/kanagram-20.04.1.ebuild
deleted file mode 100644
index 7070bf2466ee..000000000000
--- a/kde-apps/kanagram/kanagram-20.04.1.ebuild
+++ /dev/null
@@ -1,51 +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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Game based on anagrams of words"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kanagram
-https://edu.kde.org/kanagram/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-apps/libkeduvocdocument-${PVCUT}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-libs/phonon[qt5(+)]
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdeedu-data-${PVCUT}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index a9726a33ca57..4be808cda525 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,3 +1,2 @@
 DIST kapman-19.12.3.tar.xz 2527596 BLAKE2B d89c676e374e57b31b6c39f3ca3cdeee1b60d2077def93b511fce6fc7e94e1f4601dbcc9be8c10167902b68b374f72439e6c494be73317afb7556c2dcf8eda47 SHA512 c29f5398bc930d768ba09035a57d51ea0ec53d265c7f30edeb67d887024918627b635433cce897c4b6b701400101b11ffb5b56b66e4f67c07dd6d4318c13ba34
-DIST kapman-20.04.1.tar.xz 2526156 BLAKE2B 1a93749d164908f3a199412dd69b31e7f408c10a21dc51efa11242eafcd7b1e06e6716d5eb359f4868bfff1798df5391be26a64628a8e6ca4b80a82542eaf1f8 SHA512 e05f36c94535b3bca1c6465eaaa0d90d938cffaad8d4968d566edf1b16954d0408cfd95b7de6376d54ee9c047ef0a4db9ec8ba37e84bfa7c927cfe463c7836f5
 DIST kapman-20.04.2.tar.xz 2526184 BLAKE2B 842f5495b30dac75fe3fc8c08c80d620010cbbef79ba969edb856324c9b4edbc1c7c7eb5e73ff378d969d9913d9f10c5871992a1802546d66721bfe8a69d34ec SHA512 e649c1a94e3f3d5d7179c42083a596a2bd8617889d9e6d4bdf6710ab9b7083c16461f5e50f486f22678202b7d00cc6b55b726c77b6d00fdd7da4e60c1b14318d
diff --git a/kde-apps/kapman/kapman-20.04.1.ebuild b/kde-apps/kapman/kapman-20.04.1.ebuild
deleted file mode 100644
index 40c5857a8e46..000000000000
--- a/kde-apps/kapman/kapman-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Pac-Man clone by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kapman"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index c5243685f389..7b5a912bea17 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,3 +1,2 @@
 DIST kapptemplate-19.12.3.tar.xz 316724 BLAKE2B 3fa6322bd1f31e441da5bc87fd89d64641128e6eacb3e139e926ad47091f3decccaa0f665bb6ce64748d1d8615085fb59867cdc93de774bf5f24f10329b3c7e3 SHA512 0054e404e18ce151805ec375a68e66042963ebdcff465b26d46b134cbb495a6d1e232bf9975137cf8db85f96bc74f97e64370acc757bb5e9ad85d8737b8e7b9b
-DIST kapptemplate-20.04.1.tar.xz 325440 BLAKE2B d1ed49af249d4e77d935a3e1fb4d5241ad31c2ecf44dd5a20c2c8229923a21165ab6c6d131d9df6a1ac82011bc7f65286a1459c5f568264b848b3c73160bbbac SHA512 0ade84bd88eaac09a4ce5eaaec97ab2bb30ed8f37653452977cdcb0d37d33f16dd07134132a684345e3c0a45930a4647c353c2e405de4968b08e9da39ca3275b
 DIST kapptemplate-20.04.2.tar.xz 325468 BLAKE2B 9e5f2433ad90d776c5e0c693fd05629c54b16dbbcd2384d18d5e0791a8546063285165ef395183338a0b0a083d0b219c9cf817c5865b043d1d555be3b50bf1fc SHA512 ed70751479d272d2af8a7e0258ef1c4cb4ed885028c9b51522988677d814884e64474e3f4bbe60bc17b328e3b24cc63e727fe172c7aaa32cbbfaf583759da4bd
diff --git a/kde-apps/kapptemplate/kapptemplate-20.04.1.ebuild b/kde-apps/kapptemplate/kapptemplate-20.04.1.ebuild
deleted file mode 100644
index 9ba55019f11d..000000000000
--- a/kde-apps/kapptemplate/kapptemplate-20.04.1.ebuild
+++ /dev/null
@@ -1,32 +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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Shell script to create the necessary framework to develop KDE applications"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kapptemplate"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index a978beda3876..3c26e48733c0 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,3 +1,2 @@
 DIST kate-19.12.3.tar.xz 5795816 BLAKE2B 567b0c37f0b50533eeb19a527f7527ae050b62c8a50d46bbfac06226f109cd024b7626abc7defa32b9a654e231f6f04246a3410ace92f40fc25fb22a6f893c82 SHA512 aa6a2c44a8c5892e61ac80df676da6059e61dd93f5e2934e0547040d89379f9f3ae90f46b8e043edf463228ef5b0ab3f795b8ab3dd6c488d0ba0c55cf20bd817
-DIST kate-20.04.1.tar.xz 5826720 BLAKE2B 0c35a3fc88fe7a318d2aa369fdc70a40c6967de7712419fbde846cad89ffb653a87618631cdf731947f1cdff21d50f4fa5d64b0fd8fb45245daaf2983e021de6 SHA512 b1b07b9ca25809afe316319f890e3a6eff2604f91779c2e1e942dbb16ce082f4a4d3bc6e72dea28a35fc2f31dc615eaa750f74c0528458d1397ae6cd651b7e47
 DIST kate-20.04.2.tar.xz 5829952 BLAKE2B 839a069bac00ecc7e7158875570a9d7bf95e5f10cc2041b6178c47ccd3c3ee6ac7426a55da72d468657fbd09694714bd44e0be97411b1bbc0ab58582c0f0df95 SHA512 eee887549ed22b5d0bab966936f1d509bb47a79cad4162cf44ef5a44b97f9c4ea5aac2316e234def6bbf6cae506347e309b26fb24e20c7ac1cc582c12ad6f911
diff --git a/kde-apps/kate/kate-20.04.1.ebuild b/kde-apps/kate/kate-20.04.1.ebuild
deleted file mode 100644
index cb25f6672c14..000000000000
--- a/kde-apps/kate/kate-20.04.1.ebuild
+++ /dev/null
@@ -1,110 +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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
-HOMEPAGE="https://kate-editor.org/
-https://kde.org/applications/utilities/org.kde.kate"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
-
-# only addons/externaltools depends on kiconthemes, too small for USE
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${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/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/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	filebrowser? ( >=kde-frameworks/kbookmarks-${KFMIN}:5 )
-	lspclient? ( >=kde-frameworks/kitemmodels-${KFMIN}:5 )
-	plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
-	projects? (
-		>=kde-frameworks/knewstuff-${KFMIN}:5
-		>=kde-frameworks/threadweaver-${KFMIN}:5
-	)
-	snippets? ( >=kde-frameworks/knewstuff-${KFMIN}:5 )
-	sql? (
-		>=dev-qt/qtsql-${QTMIN}:5
-		>=kde-frameworks/kwallet-${KFMIN}:5
-	)
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	!kde-misc/ktexteditorpreviewplugin
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# delete colliding kwrite translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kwrite || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		-DBUILD_filebrowser=$(usex filebrowser)
-		-DBUILD_lspclient=$(usex lspclient)
-		-DBUILD_sessionapplet=$(usex plasma)
-		-DBUILD_project=$(usex projects)
-		-DBUILD_snippets=$(usex snippets)
-		-DBUILD_katesql=$(usex sql)
-		-DBUILD_kwrite=FALSE
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# tests hang
-	local myctestargs=(
-		-E "(session_manager_test|sessions_action_test)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The functionality of ktexteditorpreview plugin can be extended with:"
-		elog "  kde-misc/kmarkdownwebview"
-		elog "  media-gfx/kgraphviewer"
-	fi
-}
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index e878c8226f06..dccf09104d48 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,3 +1,2 @@
 DIST katomic-19.12.3.tar.xz 1423176 BLAKE2B a561565d20e89333d77cee1eda74f615c3a66a2cc2dc170fa3cd64015fddd825ac3d930ce2aa890079a3d4fe4c00fb83f822d58c057fc70ff8a61fdb61cef16f SHA512 32f90755f0e85996a6949a306c8d20e610c049f18c916240750a70006d2f625dcee41b915a93e9bf2ae3ff128df1066124a8a899e980fcf834995c558e3f6411
-DIST katomic-20.04.1.tar.xz 1424088 BLAKE2B 2260f84d7ca74951e62a90e6831e3cfb60da6acc4eff285c4cf6a96c3d58a824ead8a52a912c1c8e80a11a566991b7a5c3b83106fff888befababfd77dc24879 SHA512 46ebaefe8e9fbd6e09193a688f278687b5e593b589caabb9b171c3035cac3e608f3864afa1844c198245635bf0c28787aeed0923672b761a66291a25a6484485
 DIST katomic-20.04.2.tar.xz 1424152 BLAKE2B d824a722f6ef0954a0acb639397856590ad67f9ab0483b7fba37e74a6306c77fd5d5fb77b4a7bcfc8f1d06359847c46a2467983c473980ea592d3d4b2afd3c7a SHA512 0ffa63eee6a267d801b606f552857f926f43ffdf7bb353c99010e9a05123ad75af3bae0a6b30c6efbe7b0954e149da1d5df3779dc7a182700de2f5d29723511d
diff --git a/kde-apps/katomic/katomic-20.04.1.ebuild b/kde-apps/katomic/katomic-20.04.1.ebuild
deleted file mode 100644
index 08c376d0753d..000000000000
--- a/kde-apps/katomic/katomic-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.katomic
-https://games.kde.org/game.php?game=katomic"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index 27f1ac5abdb7..55198aab9387 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,3 +1,2 @@
 DIST kbackup-19.12.3.tar.xz 358584 BLAKE2B 0fc26c37e8ff9f8e50b829dd6730ac573fa9affe3b976b73dd279c98e8cf82af681162188ff367b30e7b6031a6bc13193453e492ddebf4a51e8932f752b3cfa1 SHA512 09f8b7ae80fb87fa3340e455414c5d6bd9e70e7414754f3e628c0b9b26e49f5c664fab018b9c1d06343ecc567643697075311572f5215ac413dc6b778c7346bc
-DIST kbackup-20.04.1.tar.xz 360780 BLAKE2B 7a86056f1fb493300d94403830a7a85782b86d526b860bb469dfe0e88f43214429d2915d3c1d57eb72e735218f10e093bcb8e608a59dc0b48bef08bebdd2984d SHA512 8ec6a41612397ebed18abcb762c12ef6f0e3a84ca4ded6de3498efb94b550d6eaa0acb376abdb9aa4c19ff99380c86c595d35682592ea3d491fad2a178213cbd
 DIST kbackup-20.04.2.tar.xz 362176 BLAKE2B e2c0fc46ada3355f68705f9c625439d59f126c1885681d236d7091c23131ad4f7f3f453abad05dbda0622792b1ffe235bcc6e9f4e2cbf081454018aba638793b SHA512 cc496d836e6f9da134883a1ddcab808c0a9443f794b5e6671751d52375a4d51936827c93703149892e5585cf31556934dcaee432998fdea567f88fc7e93e1e0d
diff --git a/kde-apps/kbackup/kbackup-20.04.1.ebuild b/kde-apps/kbackup/kbackup-20.04.1.ebuild
deleted file mode 100644
index 2c6380630206..000000000000
--- a/kde-apps/kbackup/kbackup-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Program that lets you back up any directories or files"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kbackup"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index 97bbd644243b..65da7da82d4a 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,3 +1,2 @@
 DIST kblackbox-19.12.3.tar.xz 446988 BLAKE2B 0f527ce553fd6b5634c6435b3eec56983af6980fc58faeec87912522274a38598b998a1f20b52206dc03672ffd09ea6e908bc61f939927666e276ea4f23593ef SHA512 a41aec30b0b193536526f0177a7efae247fa62e100240718e8b86befe7183ca6068b9546aa0f2d7ffc233618b8e8408612c94365ccca7388d18e97687d27fa43
-DIST kblackbox-20.04.1.tar.xz 447044 BLAKE2B f4304f9df4684dc49d1349d73bb6b56ab90d99614d87cf4c9a5bfdb109f793d27bae7f2216265bddfe4521e4d71d632dfe62e0aa51a71afd3625e02f30ad7c15 SHA512 a2419de46914828350f6c3bce35ba0515f305c98ebcc704283c1f1d6f647b80959e92e8bbf50b8da6dc2563d5284d81ba085357767711cc3ea7c0a0118bf0efb
 DIST kblackbox-20.04.2.tar.xz 446952 BLAKE2B 6c8bb0b8da4d743551c6afa23ce3c6b19cb05e465c2da88c0acab6ff74a54cf00a69efc4abe9b0206cdfb3f8036c2a8b136665f62f6eabb125df1f36178cf7f5 SHA512 08a26e1b56148acaf0ce7a645ac15257bbed1864960f673aebea981d354c60d3c1e30585926b4e578485c5da640c5ba2e98f21e13b0b0069408e32b1f804326d
diff --git a/kde-apps/kblackbox/kblackbox-20.04.1.ebuild b/kde-apps/kblackbox/kblackbox-20.04.1.ebuild
deleted file mode 100644
index 385d3e86fadb..000000000000
--- a/kde-apps/kblackbox/kblackbox-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Game of hide and seek played on a grid of boxes"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kblackbox"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${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/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index 7de21cf42fff..1a029075f709 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,3 +1,2 @@
 DIST kblocks-19.12.3.tar.xz 1907128 BLAKE2B 1824422d671c3a6d8798ffbc910d15bbbf5690d277ab377e95ea34ce55503cd718f50fe4ad602033daf7bf4132bf97433b964167276aba571ef86031b2a810e1 SHA512 ae38d99354c840b7e9f6e6419be0bd238770103b46cc9eebdd73a60120ac31e9bc268977aad725eec536cc46717278ba948043b2cefa3dbe19ea382b6d7a58d6
-DIST kblocks-20.04.1.tar.xz 1907076 BLAKE2B 9ce01f98739afd09ff793c277c720f7e852bb7377dab89b4b8b313a583d48c8b752366866cb5e94620eca42cfc3124f9dd3603592d0bacafe85a798c2826b618 SHA512 e16b90b2035df17392b6ce7a444e7c996778aab78d80015cd3594b88d7d19603d6f7b97cdc8819858338448c8ae8434d74181bf94e3e329d700ec7f39c8e4b41
 DIST kblocks-20.04.2.tar.xz 1906856 BLAKE2B 57a2338a0eeb8d9b91b50bfb3c3a586c774b5982950695093ed6c1541d9d580f6cb0713958741c341eba81c12345c969ee99acfa26762c217bb9bbe01074b091 SHA512 ccd3a63e5d2f9fa12ac7adaf6d26e9285400e51e355c428427ebd1fbf8ea449e4a2f02b9be827764183c41f27aff5b85148066661652962e3eb49a151c6de10c
diff --git a/kde-apps/kblocks/kblocks-20.04.1.ebuild b/kde-apps/kblocks/kblocks-20.04.1.ebuild
deleted file mode 100644
index d08794b05844..000000000000
--- a/kde-apps/kblocks/kblocks-20.04.1.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"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Single-player Tetris-like KDE game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kblocks"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index 856f14962fab..54c218c2ec32 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,3 +1,2 @@
 DIST kblog-19.12.3.tar.xz 72860 BLAKE2B 884c2bcd20df233599382ebf970fe4ebb5289c3bd3ac87f5a06c2b07591a0a63f14d8c6e62f09f2327da4093ab45dc9b0b9047c946ff1b92b2bcc9f862224d5d SHA512 faae3b9e804f5848e75609273607efb725e924549778f6395b80f7405569b3b6286190e368e15d2d42d5171ec75133112144c87cf01c6e7e0bd623f0d4b6414d
-DIST kblog-20.04.1.tar.xz 72864 BLAKE2B 067d71896843504dc396637c1f61d22570191edcf069f15d114d27abea598960608a1fba3c71c1741e59ac08b7df40ec475a690e6898b6609d8a8875f345eb88 SHA512 a99b2113570ae3e45ea9f34b7921b27274c9e116c23a1490c392ffb1d4870cfaccc69b1e9798c609d6b4207e057d4856f85dbb17442d27fed1312762a6dbdb8e
 DIST kblog-20.04.2.tar.xz 72860 BLAKE2B 8df12706758229acb4488a492f52b8d54d3d056a909f35e316eb05bbf36f5d3c1cf6464bffcbd5ee3b08cb7f306447753ae1f7a04be2df4bff3e0fa73c00d3c9 SHA512 e988d7ba649cf48dba77053ebee150963ce90432bf3d533b8f0a6c7defa96a89a5a13844b220dcb39360501965bb62dcc19c0c5d79ed83eebdaa6e7c2ec49653
diff --git a/kde-apps/kblog/kblog-20.04.1.ebuild b/kde-apps/kblog/kblog-20.04.1.ebuild
deleted file mode 100644
index 50d257e65f14..000000000000
--- a/kde-apps/kblog/kblog-20.04.1.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.70.0
-inherit ecm kde.org
-
-DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
-HOMEPAGE="https://api.kde.org/kdepim/kblog/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kxmlrpcclient-${KFMIN}:5
-	>=kde-frameworks/syndication-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index 9fffeefcb68e..59aa40ed9764 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,3 +1,2 @@
 DIST kbounce-19.12.3.tar.xz 3469176 BLAKE2B 0a4185195e4655053dbae86e82963b4276bba954165ec1814ea46aeb2286ba4df2f9fe8a1d877b018dcac8c2ba36fad9ca095394042bba860d6f37ecab4b7602 SHA512 0acae3dfcf082efdf6b79c044685abee9c8b0334a5271ca78bf91ffaafef7c2d2ebe2e7ffbfb78735247b88090a07fb20d11e94e2315b357cba9d9b500764b79
-DIST kbounce-20.04.1.tar.xz 3467240 BLAKE2B 535426577ece82ae6467deb5196969c11483d8f81441294dc1e202d62e0d5e63b9dd3aa956140c88a4f85bf7c3035787a21dae9b69d7d697d24ad3df29504550 SHA512 78ae8e10702c7c464da5c736c056353150dca9ea18607b852d799680072cabbc116871977caaf1893cf00b8164842cd9c8583eb305c13f7b4027aa00ebad2f40
 DIST kbounce-20.04.2.tar.xz 3467060 BLAKE2B a3e2da217e286a3b25d2ed6028aa91298341ba4a152ae7f6d6295446beb3601c6b764ac0a9798b54e62f51c924c720150ce8ac61b1e93388b84714890b6b73e9 SHA512 d47954ae3d664cde22e54239f55b4b7962e131b9b5ffdc21c3a568a96a0c8c1a2bf0f722dff0e02244e34a86192150958aee4138a41f5c98c1e6fb7a8a0966c7
diff --git a/kde-apps/kbounce/kbounce-20.04.1.ebuild b/kde-apps/kbounce/kbounce-20.04.1.ebuild
deleted file mode 100644
index 203a1cebe6fd..000000000000
--- a/kde-apps/kbounce/kbounce-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Bounce Ball Game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kbounce
-https://games.kde.org/game.php?game=kbounce"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index e3ee43c53344..cd295e84d288 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,3 +1,2 @@
 DIST kbreakout-19.12.3.tar.xz 2281368 BLAKE2B eb995ef7dedb3e96f13860ba61742bfe883bd41478ff3a2f9b141d6a6a05a7adf3df81702977d4aa695e8ae10a8ef4fb5c54de6305a0bda6b5f5618e8bb2a5fc SHA512 983c9c034708c0af0012bdf47788b5b70c36ff1f6b24552f0c6ee8d088f805886ef89d81694750c302e6d254ed13672151f7122c6ba55f68821c62405cf28e9d
-DIST kbreakout-20.04.1.tar.xz 2280264 BLAKE2B 1183f8fc3ca2358f912cce21af2fe51f9749db0e541cc16612876162bf279b17101b79e5d3b8dc468c7cf35d0bf2ce68909b5ed9503627a95fd2ae64b19f233b SHA512 a7a1cfd626db43fa645316dc40a521231e0925b5b44340aa0ebe3bb1e3140d764fed05e73cd8c4a8e981f30b044255041ec564662303220190b57f650cf9a3e4
 DIST kbreakout-20.04.2.tar.xz 2281044 BLAKE2B e6d61c9635b93c7e3f900c5117be89e453a57f92971dea56d5cd402d52945a3b47ce78b7aeccb4c02f34654ab63144e9c87a22d649a9e9841a54ff57b5727f30 SHA512 008bedf2baf1444beb7a72133f1d86518db3f9f5801a7929431c045098ea3d30760760ef3eb1964f4e2fb565a17e926bc677c31a57a61f237b61c175456211db
diff --git a/kde-apps/kbreakout/kbreakout-20.04.1.ebuild b/kde-apps/kbreakout/kbreakout-20.04.1.ebuild
deleted file mode 100644
index 328acca61559..000000000000
--- a/kde-apps/kbreakout/kbreakout-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Breakout-like game by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kbreakout
-https://games.kde.org/game.php?game=kbreakout"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 2a93a8a6ea24..6aacf5960309 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,3 +1,2 @@
 DIST kbruch-19.12.3.tar.xz 5603944 BLAKE2B 23e02967d85ab5b9cc23fe852fccff2f8823de2fdcb19c50d9eda8d80386373ae811dc54ddef633ad1657e46cf4aaac451ff2da147fe6da9e3aa91c596d105af SHA512 b660706d6132b0b2aa9e91a09a2f132e40de76ae956308926ff83890fab1bf2e171fbd29a8b1b78979929556931b6b1e4f52cacc3fc2db4248d5f95be5af9c61
-DIST kbruch-20.04.1.tar.xz 5605636 BLAKE2B ad06351b4414d3cc1b6a2b55f34cd943704704db0b7c4464cb13868fd8fdf7539042023ab673955cb28a1554643485aa58386cce2509ef573c16684f6b5f13a0 SHA512 5cea8fbed160780abd1b3ecc2db80e7d0bb321d5bbe4138cf2a9062e127b55e4842bc49f592786dfe0b31bc68788812cba5fcfbd8886bd7c4cd7dc48b9e493df
 DIST kbruch-20.04.2.tar.xz 5606300 BLAKE2B bba6a19c2d5620cf93b46145d5d65171f34b6608e79f3e4d189223ff8e84bf1475b48068a8e1f9e7598d379763e9f9829443c4cc1606db14375e6c6a3858daca SHA512 b1ce5068c6fbfecb57bea475cb7207322ff4060fb79d6d696b9ce816ff278c63fbce561bd3e6d5f3507490360cf454e1588f97502e6128fb3d114138297163eb
diff --git a/kde-apps/kbruch/kbruch-20.04.1.ebuild b/kde-apps/kbruch/kbruch-20.04.1.ebuild
deleted file mode 100644
index 3fe3c5b5a18d..000000000000
--- a/kde-apps/kbruch/kbruch-20.04.1.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="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Educational application to learn calculating with fractions"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kbruch
-https://edu.kde.org/kbruch/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 90ec7439d2c1..5fd0b4747871 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,3 +1,2 @@
 DIST kcachegrind-19.12.3.tar.xz 814324 BLAKE2B fce55a61f4a61bb545a2c2e5f75aab979f636c84c796e01fcc9ce5094e7f070deea6915ae960db841c4037f6764cafaebfec6ae26a803944f70870c4a21f2d0c SHA512 c00474637775a100832d787ddf5d09aafa7dd40bdc58a3d9c596af0215f85011602078fd03d02e5ee3725cb65af1b8aafca390f851caac59bc79b8860f074013
-DIST kcachegrind-20.04.1.tar.xz 810100 BLAKE2B 2eb033622cc0a12c75c62b44a2bf963a098e9fa0ee208743e531b4c94ef2fde1029c4833de44471a1f8c31c1ab461da111c9121815f0b781746b0f212b6d3e09 SHA512 6ee56b674568cc1f6ae82e4df0ce7a0329394f45299535db1d0c3a9a3d30dc707db0420bf49fd20c3c61df75f998a1c04bb7a23613b990804e38feb2a554ff89
 DIST kcachegrind-20.04.2.tar.xz 810032 BLAKE2B 85112b2dcec5019442205ce65fe64e472f471e3ef708ebd4375283ee3d526afb7786d3b95cd12d3bc7a5eaf526005b62e86f24f5c63aec3f071dc228d317dcb8 SHA512 bb41afcb7190bff86489403402ea057386b4bcc8a6e33fe6acfba200c8bccf88db4927fcb11beab63d566d83f464d0b11f6da1e400e79b80906024e07a948a88
diff --git a/kde-apps/kcachegrind/kcachegrind-20.04.1.ebuild b/kde-apps/kcachegrind/kcachegrind-20.04.1.ebuild
deleted file mode 100644
index 21dc41cdb354..000000000000
--- a/kde-apps/kcachegrind/kcachegrind-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend for Cachegrind by KDE"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kcachegrind
-https://kcachegrind.github.io/html/Home.html"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=kde-frameworks/karchive-${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/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	media-gfx/graphviz
-"
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index a2a2cdd46031..65a5fc97c7ed 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,3 +1,2 @@
 DIST kcalc-19.12.3.tar.xz 374372 BLAKE2B 43653486490d77a5a13f84a7676cda40b0f2a4d96797bb38b2587c87d13af378863a00b614df9021e9ff9616b14860375228573161b2ce86631821fe4f76f1d2 SHA512 7323acc0e71186a2ce83ab5596a97adc122d6a95a343f5c1f7176330e93b3ee5e23108ab79186f842c7c04a91d31bee592846e44b9dad8ba2e334f244cafe2eb
-DIST kcalc-20.04.1.tar.xz 374372 BLAKE2B 016e2a9ecf7de78cbf00fb1be01ae7ec28fbfa6e359b038454f81f27fd38d7339334ee4bdfa8001eb168170cd5ae3b6b49c48742320c16835a8d6896edd98806 SHA512 5e89748b6df60db826d2f0981d78159be3e69c24f27be0bba0983190e33e9ecd1b982a121a20a527b43a59fe9d3860bcfe3bac2f80560d23d1a03185a2fd13c8
 DIST kcalc-20.04.2.tar.xz 374404 BLAKE2B 78f18285c66481f1e9046d1bfec9039d0c4f31094bda469e64016e3f56ca362714da26742e70256ac41bdada407e3e23f2f3fea9ff769117721b7f2ca407246f SHA512 33c92a0fa652a9351c8a265000203417aa398aeb1b5b29d8fdc7029a705956d6d495c1317c09f782c2978efb75f68b1ba1bd2c816818d868a96e8958491a8ee3
diff --git a/kde-apps/kcalc/kcalc-20.04.1.ebuild b/kde-apps/kcalc/kcalc-20.04.1.ebuild
deleted file mode 100644
index 5fb787103e66..000000000000
--- a/kde-apps/kcalc/kcalc-20.04.1.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"
-ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE calculator"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kcalc
-https://utils.kde.org/projects/kcalc/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index fc83d05aed6d..49dc2082e51e 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,3 +1,2 @@
 DIST kcalutils-19.12.3.tar.xz 319596 BLAKE2B d1fb848ffdd935089a9f4de458d2ee264d15aa50bc9da5c4a5373f2eaec3bc32d0484a2360017e55f380b8ac024c766f25d4caacbae7655d00dbe2091abcab83 SHA512 a1e9369cecfad93738b6a1c5d4dfd92ef56deb2db70a1297a5de82749e1f87d8ac198bc944eaa0825f601e6008d827b355df315a138aec9c0c1688805648eced
-DIST kcalutils-20.04.1.tar.xz 320892 BLAKE2B 420504c8829f483a42fb615822a9c19e2b51f103ec88c56e3d0884ede7336cdf3db1619f730306f6fef223387df4bdcecc486aff404e9496a2c08aea9ac19d6d SHA512 dddc1ef32ba0f2c5516e6e8c92c6c0e9f212a7d302d1a64e6907524dc3ee364ca01cf712417af2375c4017ff805f4b328500d8467772cbfcd0c4972f54d2f2c6
 DIST kcalutils-20.04.2.tar.xz 320976 BLAKE2B a1d483a2e1a1c7fc5a221f0476f47c017116c4819366a674be5dbe3975072f8dfbbcb0c1264ef483f4f79f8b4088caee1f7a6e78796642079cc9c3dce993737c SHA512 263f4d34fe86f49e11c00207246b410c4e89ed68efc6955b5958cfaa9c87c45456c92cb962e69c7ee0a6ce253547aef6b8f0541d42d220e0cc35fad19baa8a1c
diff --git a/kde-apps/kcalutils/kcalutils-20.04.1.ebuild b/kde-apps/kcalutils/kcalutils-20.04.1.ebuild
deleted file mode 100644
index e17bd1055697..000000000000
--- a/kde-apps/kcalutils/kcalutils-20.04.1.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.70.0
-QTMIN=5.12.3
-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 ~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}"
-
-src_test() {
-	# bug 653616
-	local myctestargs=(
-		-E "(kcalutils-testincidenceformatter)"
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 1089c906c4b4..052b335fca61 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,3 +1,2 @@
 DIST kcharselect-19.12.3.tar.xz 334996 BLAKE2B 894618ae1e3837169247a3ad4a79b9f74ef7771a19ad0d3615c52039b0f2821e7e21175dd4b9a64a7eba852b0228324b93eb51273902326da53e8891a28f55c8 SHA512 85851910deb6c9eab2b02ce7d18fa703c78175f029469500f064e4af86d58b914287da33aeab9372db8919da7a509137849a3038e29e0d03bc125cfae9745006
-DIST kcharselect-20.04.1.tar.xz 335584 BLAKE2B b1f5e98324f9fa70b17fcffd33af8f96a6cfca8068c9699079450d866c80dfdc6a73af272ff7d8731eb04cc71073b64662942b35fd05bb2f0d2d22422dbadbd9 SHA512 d1981d63b2e650691bbeac7c8e6b1d5f79e082d31ad1a256363f1d9b4cf849dbbe20b35096904f8e9f81d8c89c8e15cda8be74e912b66a0056cf001da59f4f70
 DIST kcharselect-20.04.2.tar.xz 335648 BLAKE2B bc7d550dc2ae552975b5fbf8a2f68756ef3626e13f8b9b73811066c90b5f8859a34dec889c3724eeb800d8e6fa9b9e0ac5f7e610430d0c91fb4725633c1ac484 SHA512 47f84a4e193accb13febf3270bf2c00e52e0d5c70fa19d2b345ce6dcb9a54332ea3b29fcbdf449d78e00b49fd1b4d6f91b506c41d77bf4777c17d721fa39792b
diff --git a/kde-apps/kcharselect/kcharselect-20.04.1.ebuild b/kde-apps/kcharselect/kcharselect-20.04.1.ebuild
deleted file mode 100644
index 2e78b4b745a2..000000000000
--- a/kde-apps/kcharselect/kcharselect-20.04.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE character selection utility"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kcharselect
-https://utils.kde.org/projects/kcharselect/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index f521993b6232..7c66a77ffccd 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,3 +1,2 @@
 DIST kcolorchooser-19.12.3.tar.xz 21708 BLAKE2B 54f5206d98a4c4c396e01b1db2b52e2dbf6215d0e3ab413831599cd46499413df5f381ab6c14a68099fd57e7220a1f621596d3dbaf34b392c314e4bbe893aab6 SHA512 ffffd9a945be3f24813f92fb1f9ec434c045fc3225977de45a4ca6fc9b15926ae3786a573ce05e16acd254e5e3bafd078cae940737517fcf7144302a435605ca
-DIST kcolorchooser-20.04.1.tar.xz 21780 BLAKE2B feb6be3557f576d83273112823c2d93da3ee7199c2ecf52923e58096a98049171b043f7374a190aaac80d669c5f24e8da84c95e9abecb5a37f9419bc1f4af6c8 SHA512 a48af27b981107f917ec519f242e555aef387f0d9ae111ef8b87ac014cffc35735d8676f0f3cf008098703c6a98615827a7fe9fa7d2d1674722f201685741d53
 DIST kcolorchooser-20.04.2.tar.xz 21828 BLAKE2B 6859264c619600c9ae1bb5d7da4ec359df85e8ab1d03589845a00f4bb895cb4e588d104c08b748c5dd0ec3c97f96dfe0ba403d7f999bc9f544e9d2ff84734bc8 SHA512 520843dccf02287811ab7ebb1142655ff46ba1524ec779ef3d291a19f84a407ebc9b9a0d92f0b03beb25de93ae7c20625a7d90704463eb7dc19955d815d25eff
diff --git a/kde-apps/kcolorchooser/kcolorchooser-20.04.1.ebuild b/kde-apps/kcolorchooser/kcolorchooser-20.04.1.ebuild
deleted file mode 100644
index 45ed98bb5966..000000000000
--- a/kde-apps/kcolorchooser/kcolorchooser-20.04.1.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
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE color selector/editor"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.kcolorchooser"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index e6b3cfd305fd..661f9f3d5788 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,3 +1,2 @@
 DIST kcron-19.12.3.tar.xz 891656 BLAKE2B 0b8bf306201e4e6f50caa9965b54449fd2440d69cd65675f016c6b73ae48341c77128de27c059965d066e6a08ad395b692f96fd7201df29eb41e79361389bcef SHA512 dd659c90afe9dada554aecb2e7b283661bc1e0969278e86bf20c9c8ba4717ad44ec4a70ddec0cd5f114846836f796ce43b0232a0f4b51ce67f3ec4e8392a47f0
-DIST kcron-20.04.1.tar.xz 892108 BLAKE2B 1d4690117a8669ad6b91226662e6057d787d5a38d8e259f3f3b94165b630cbaff4718d9503da6fd34cfefc1388efd92267ad8883f23908cea12474d445eb9820 SHA512 b7e3d7f1dddfe6b7c8a4e93722c20770a48ae306bda4de68423d07492d9643af4a39e00d6a739b86bc0d54f9b19f28f2940529ed44c427a2944d2eb300922950
 DIST kcron-20.04.2.tar.xz 892188 BLAKE2B bcb98acf3da4247ecb8f286f0b5cdc2fe9831ffc3e8abec565c382725d8f0ac501d35b02f1b92fae29f5ad18b03475dff49adde9b65f30d8c5b84e177f8ed8a3 SHA512 b8965af54eaa6b016ea45ad702214a233b4fedab158d4948b25bcc98be0a83003f864b6f9774de7d72c9eddb46baf65b7d7eb358a155c1dcd7148762a31c3b69
diff --git a/kde-apps/kcron/kcron-20.04.1.ebuild b/kde-apps/kcron/kcron-20.04.1.ebuild
deleted file mode 100644
index b21f89146eb0..000000000000
--- a/kde-apps/kcron/kcron-20.04.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Task Scheduler"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kcron"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	virtual/cron
-"
diff --git a/kde-apps/kdav/Manifest b/kde-apps/kdav/Manifest
index d44dc5436ac9..75c9809a69a6 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1,3 +1,2 @@
 DIST kdav-19.12.3.tar.xz 54740 BLAKE2B 3793ad5ada3f7585ab8a6ee0a8d6e5dc8016a893076559df471534660fcf778006071ace667f7cdd06fd72c598acbd6c74c59691a2ac65fe8aad8ba6dc407319 SHA512 058599407c943421c977c22633b1a8c5c50dfd690ea669dc45d0821c115b6f3b8577f656c523fa600a342a5d19880e1485bbb41a28eb39046d26dba447657859
-DIST kdav-20.04.1.tar.xz 58340 BLAKE2B 84e240868c52aa6a0f7e810a3f2ddb700cd1fef2a0f2c87cd58ea5643522371fa1a9f6c7eef629d0f5517ee63328b574a8e6f10e0f2ee50e88a867d2cca5197d SHA512 ba16d48f2f94e98c80e99ba15845e7c69802da36db6eb268db9ad2a0529f06a7f6eebf06b0098a0951e4d586aa98739ea66e3222a487a1dd4abc552e915997e8
 DIST kdav-20.04.2.tar.xz 58300 BLAKE2B c026acc40d75d71cc56cb4ec83708155eb76be97700d371b6662d1e44a20817b1c6b6c9768465d59581786cad93f29b689cee9b210a134e0cfe4f42f0c2861dc SHA512 d4b35935110009b6f0520cc0f20c8d57ea2f1ad9929e5281670293ce10080acd7b1801927eee60f2fbcf6946af864e68f1932bb6f9d46ac4f1311a950f52e241
diff --git a/kde-apps/kdav/kdav-20.04.1.ebuild b/kde-apps/kdav/kdav-20.04.1.ebuild
deleted file mode 100644
index fa4ea2fd7ed0..000000000000
--- a/kde-apps/kdav/kdav-20.04.1.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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="DAV protocol implemention with KJobs"
-HOMEPAGE="https://api.kde.org/kdepim/kdav/html/index.html"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 616808 - DavItemFetchJobTest requires D-Bus
-	# bug 653602 - DavItemsListJobTest mimetypes unsupported
-	local myctestargs=(
-		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-20.04.1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-20.04.1.ebuild
deleted file mode 100644
index 02fb05e6b0ad..000000000000
--- a/kde-apps/kde-apps-meta/kde-apps-meta-20.04.1.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
-
-DESCRIPTION="Meta package for the KDE Applications collection"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="accessibility pim sdk"
-
-RDEPEND="
-	>=kde-apps/kdeadmin-meta-${PV}:${SLOT}
-	>=kde-apps/kdecore-meta-${PV}:${SLOT}
-	>=kde-apps/kdeedu-meta-${PV}:${SLOT}
-	>=kde-apps/kdegames-meta-${PV}:${SLOT}
-	>=kde-apps/kdegraphics-meta-${PV}:${SLOT}
-	>=kde-apps/kdemultimedia-meta-${PV}:${SLOT}
-	>=kde-apps/kdenetwork-meta-${PV}:${SLOT}
-	>=kde-apps/kdeutils-meta-${PV}:${SLOT}
-	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:${SLOT} )
-	pim? ( >=kde-apps/kdepim-meta-${PV}:${SLOT} )
-	sdk? ( >=kde-apps/kdesdk-meta-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 9ecd55b22fa0..8abcbb484494 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,3 +1,2 @@
 DIST kde-dev-scripts-19.12.3.tar.xz 378992 BLAKE2B 1a462c4aed21958672c889874a58ffa8491798bd5594c95ff6c8fe1929a53002ce09d7633eb96f419d50321e82a28c31d4236e05a17e40555a45eb17ffec9304 SHA512 dc80229cdaf22cfa218d4a247b5e9bc651c0e2ff534dbd71026806a002d838abc19a36bf436c2c903a6951c01e29b251282abfac6d711b1518c106c91b760e40
-DIST kde-dev-scripts-20.04.1.tar.xz 378476 BLAKE2B a6749c23fb9034822d9fffd49ff511fb8fa291f5f0ba7631854b3695215a3be53e8abb97c1a542531973f94e97ba65d4196f943320f0d1438664ad375131655d SHA512 317589fbd6f0aae06d8043c970eda408c0c323ea059f555559f7569ebbf5e60813da06fa9f7d43e144c7c05bcdc16fb1f8aa9768e7f35cd36c9471bab15cb817
 DIST kde-dev-scripts-20.04.2.tar.xz 378448 BLAKE2B a2a569fbaff9649b815696501b30aee75b78bd67313f588da51a3baa62133eb78bab2df2659f9c08e03c7c8c017311bd3cc7df9eb0f5f6802c46302868ec05b7 SHA512 5cd25b4585a273b46a87d2c2eb5868bf30c20708a0fcc1b32c1509d07f2d765393a36f0f83fa4a61756dfd0c87cb913744b5a64de62238e891bd394dff7e83fa
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-20.04.1.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-20.04.1.ebuild
deleted file mode 100644
index 76c50687a0cf..000000000000
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-20.04.1.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="true"
-KFMIN=5.70.0
-inherit ecm kde.org
-
-DESCRIPTION="KDE Development Scripts"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# kdelibs4support - required for kdex.dtd
-# kdoctools - to use ECM instead of kdelibs4
-DEPEND="
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kdoctools-${KFMIN}:5
-"
-RDEPEND="
-	app-arch/advancecomp
-	media-gfx/optipng
-	dev-perl/XML-DOM
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# bug 275069
-	sed -e 's:colorsvn::' -i CMakeLists.txt || die
-}
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index a3f2ef9d8098..a23015850dca 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,3 +1,2 @@
 DIST kde-dev-utils-19.12.3.tar.xz 64448 BLAKE2B c59fb741cfb921563ffe152121e4e673b2a78e3b46d4b4ae4542a66f5d7130c19dfadc0578389bd3a57cc6c7afd37983d20c5fa4523fdb3fc17f70a8b1e92682 SHA512 9e00078c83a3304fdac99700974d80e3e1983fb615d3e226979693982cc6aacec0ced2ed3a15a400cfc9a63997fc0528799bc13b475c8bf938c56b68c6ae05d4
-DIST kde-dev-utils-20.04.1.tar.xz 64452 BLAKE2B 91a4cead133719ba8cfa10ddf29e382b3bebeee6df81f66223efb4180b94b64444fba657470371027bcdc9036e0b709e4c4b8b9f658028723e338a00477cb5d4 SHA512 e2e60e2c32a35d30eceb7fff0a8d93d8f446313b8b5e48084de20f5f0cd6066c8c2a52cb821d06541de2503830cd0ac67468a7c1103e21f3268a834596274474
 DIST kde-dev-utils-20.04.2.tar.xz 64540 BLAKE2B ee6fe2de2e1d83eace56121f723ae7b9d45ba76a61e02bfa3c6d47911ba38298c0f00d6004c42cf78a6fcd9131af9717453f427c0652f7a763d2cc4747ee0746 SHA512 6178d3c185c80c690f20e2825d199b1550784a66411959733b5dd702b7b756570efce374bd7a86551b77407cc83948da835ad53a94a56100b5c236593d79ebf2
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-20.04.1.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-20.04.1.ebuild
deleted file mode 100644
index ab6b11a090dd..000000000000
--- a/kde-apps/kde-dev-utils/kde-dev-utils-20.04.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Development Utilities"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kde-meta/kde-meta-20.04.1.ebuild b/kde-apps/kde-meta/kde-meta-20.04.1.ebuild
deleted file mode 100644
index 3b632bae0982..000000000000
--- a/kde-apps/kde-meta/kde-meta-20.04.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-apps/kde-apps-meta-${PV}:${SLOT}
-	kde-plasma/plasma-meta:5
-"
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.04.1.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.04.1.ebuild
deleted file mode 100644
index f2be0489e41e..000000000000
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-20.04.1.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
-
-DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-apps/kmag-${PV}:${SLOT}
-	>=kde-apps/kmousetool-${PV}:${SLOT}
-	>=kde-apps/kmouth-${PV}:${SLOT}
-"
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-20.04.1.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-20.04.1.ebuild
deleted file mode 100644
index 5269699a76dd..000000000000
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-20.04.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+cron"
-
-RDEPEND="
-	>=kde-apps/ksystemlog-${PV}:${SLOT}
-	cron? ( >=kde-apps/kcron-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-20.04.1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-20.04.1.ebuild
deleted file mode 100644
index 14a98591b16d..000000000000
--- a/kde-apps/kdebase-meta/kdebase-meta-20.04.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-apps/kdecore-meta-${PV}:${SLOT}
-	kde-plasma/plasma-meta
-"
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index 6bc4d904ae32..c8b261dce883 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,3 +1,2 @@
 DIST kdebugsettings-19.12.3.tar.xz 63692 BLAKE2B c2572f802e532f806473e36f083bfec12527db845d2c0c6f2ad601d1c4401516bcd47e73e2ce7b8fab4e694fd9b3fd0ee41bc70ec8b76898775bb90d220483bb SHA512 232574382ce1b06e4374e51fba064cd5468e7842ae00a4f4af1f12eb19e5743d3ba3a23760896e19c02dca408d67dea8d8b6fbe82f90715b84daaf6af79c67de
-DIST kdebugsettings-20.04.1.tar.xz 65428 BLAKE2B 3d7eb090576c57c7b2f98441884dc6e91c8d309df2c7a51175a2753df87992c9acb6d306779f2318b16674eb45120643bfb2904cdb6d803ac89f0341a8748f1f SHA512 5793e0a370fd59dd01d3d79e2c6c658f250d7ee338feb8f94aa140804bbd6af5d50ccd98827305de2eb6c292f7ec31903664a35cf0c020005d3a5ebe862449b0
 DIST kdebugsettings-20.04.2.tar.xz 65464 BLAKE2B 7bceb41bddfaf1770f9402591b19d8fe2cc39eda558e60bc1951ef6051e0edaba39ff7e37414ed58cedc6dd3b7eb31a105840535fdf2b2b1290dc6613cfb3bf9 SHA512 f0ea32d70c5078f14b968501bddc42a61c239dbe173b133288de4e93068cad1f70f758f06f6e4f2b5bbee80b6c6ee0dfb4d43ad46630e76f9af636201a37f70b
diff --git a/kde-apps/kdebugsettings/kdebugsettings-20.04.1.ebuild b/kde-apps/kdebugsettings/kdebugsettings-20.04.1.ebuild
deleted file mode 100644
index 1c7a9f09f511..000000000000
--- a/kde-apps/kdebugsettings/kdebugsettings-20.04.1.ebuild
+++ /dev/null
@@ -1,33 +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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Application to enable/disable qCDebug"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kdebugsettings"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kdecore-meta/kdecore-meta-20.04.1.ebuild b/kde-apps/kdecore-meta/kdecore-meta-20.04.1.ebuild
deleted file mode 100644
index c9ab667d262a..000000000000
--- a/kde-apps/kdecore-meta/kdecore-meta-20.04.1.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
-
-DESCRIPTION="kdecore - merge this to pull in the most basic applications"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+handbook +share +thumbnail +webengine"
-
-RDEPEND="
-	>=kde-apps/dolphin-${PV}:${SLOT}
-	>=kde-apps/kdialog-${PV}:${SLOT}
-	>=kde-apps/keditbookmarks-${PV}:${SLOT}
-	>=kde-apps/kfind-${PV}:${SLOT}
-	>=kde-apps/konsole-${PV}:${SLOT}
-	>=kde-apps/kwrite-${PV}:${SLOT}
-	handbook? ( >=kde-apps/khelpcenter-${PV}:${SLOT} )
-	webengine? ( || (
-		www-client/falkon
-		>=kde-apps/konqueror-${PV}:${SLOT}
-	) )
-"
-# Optional runtime deps: kde-apps/dolphin
-RDEPEND="${RDEPEND}
-	share? ( kde-frameworks/purpose:${SLOT} )
-	thumbnail? (
-		>=kde-apps/ffmpegthumbs-${PV}:${SLOT}
-		>=kde-apps/thumbnailers-${PV}:${SLOT}
-	)
-"
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 97a9b86ccec7..a9e17715c909 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,3 +1,2 @@
 DIST kdeedu-data-19.12.3.tar.xz 326932 BLAKE2B e8df4914ed10879dc88a2b5f20306920349b6fb2a1b2e8dc6af540880d78a5ce84a1219ff2822cc372b68832daa87e4d9449db48616d691b4c122747de9bbfec SHA512 8714bd241275e777b1bbe2bd698386c9e533ce45557ff834d9dfd7ac84eae97f7d355ec0c1e743ca266e8e109a19a397e307d3124e59cb51ba7ce491b60c7d22
-DIST kdeedu-data-20.04.1.tar.xz 328620 BLAKE2B 506dffd79a53a5a5f95029fb64a3cf8289e4fe97099ae14cf0d5489628d5d8263d52ad5ed5a8b9d772ba67c068c27c1c0db3adc961ef5de343ab84d0dfc8c3fe SHA512 dee3a3566eba452421c24900dfa1fdeddd31d14c036c70d5c693a12130a30c0840268e7bac71074d28cbcb278d9e00d7b98eef74f30a3e6dc6483d23e135658a
 DIST kdeedu-data-20.04.2.tar.xz 328796 BLAKE2B a1b9ef7505c5765146c3f0eb272d374a043f29a122e96dd3e6cb0ef5e3bd090173669c834ca77edbcbb7cef8c611ef52a2a3434d29120514af5f9fe7262718f7 SHA512 45346fcc87e2c70ea74fb510753232c30b45ba907dd0144ec4b4e3625d99f7cff9f5b3339ddedab608c757530c28564a4da287f47dbe985a6c6f2af777938d9d
diff --git a/kde-apps/kdeedu-data/kdeedu-data-20.04.1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-20.04.1.ebuild
deleted file mode 100644
index 78a371325103..000000000000
--- a/kde-apps/kdeedu-data/kdeedu-data-20.04.1.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
-
-inherit kde.org cmake
-
-DESCRIPTION="Shared icons, artwork and data files for educational applications"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/qtcore:5
-	kde-frameworks/extra-cmake-modules:5
-"
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-20.04.1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-20.04.1.ebuild
deleted file mode 100644
index 238a89a64e8e..000000000000
--- a/kde-apps/kdeedu-meta/kdeedu-meta-20.04.1.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
-
-DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
-HOMEPAGE="https://edu.kde.org"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+webengine"
-
-RDEPEND="
-	>=kde-apps/analitza-${PV}:${SLOT}
-	>=kde-apps/artikulate-${PV}:${SLOT}
-	>=kde-apps/blinken-${PV}:${SLOT}
-	>=kde-apps/cantor-${PV}:${SLOT}
-	>=kde-apps/kalzium-${PV}:${SLOT}
-	>=kde-apps/kanagram-${PV}:${SLOT}
-	>=kde-apps/kbruch-${PV}:${SLOT}
-	>=kde-apps/kdeedu-data-${PV}:${SLOT}
-	>=kde-apps/kgeography-${PV}:${SLOT}
-	>=kde-apps/khangman-${PV}:${SLOT}
-	>=kde-apps/kig-${PV}:${SLOT}
-	>=kde-apps/kiten-${PV}:${SLOT}
-	>=kde-apps/klettres-${PV}:${SLOT}
-	>=kde-apps/kmplot-${PV}:${SLOT}
-	>=kde-apps/kqtquickcharts-${PV}:${SLOT}
-	>=kde-apps/ktouch-${PV}:${SLOT}
-	>=kde-apps/kturtle-${PV}:${SLOT}
-	>=kde-apps/kwordquiz-${PV}:${SLOT}
-	>=kde-apps/libkeduvocdocument-${PV}:${SLOT}
-	>=kde-apps/marble-${PV}:${SLOT}
-	>=kde-apps/minuet-${PV}:${SLOT}
-	>=kde-apps/rocs-${PV}:${SLOT}
-	>=kde-apps/step-${PV}:${SLOT}
-	webengine? (
-		>=kde-apps/kalgebra-${PV}:${SLOT}
-		>=kde-apps/parley-${PV}:${SLOT}
-	)
-"
diff --git a/kde-apps/kdegames-meta/kdegames-meta-20.04.1.ebuild b/kde-apps/kdegames-meta/kdegames-meta-20.04.1.ebuild
deleted file mode 100644
index ccae75912e5f..000000000000
--- a/kde-apps/kdegames-meta/kdegames-meta-20.04.1.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
-
-DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
-HOMEPAGE="https://games.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="opengl python"
-
-RDEPEND="
-	>=kde-apps/bomber-${PV}:${SLOT}
-	>=kde-apps/bovo-${PV}:${SLOT}
-	>=kde-apps/granatier-${PV}:${SLOT}
-	>=kde-apps/kapman-${PV}:${SLOT}
-	>=kde-apps/katomic-${PV}:${SLOT}
-	>=kde-apps/kblackbox-${PV}:${SLOT}
-	>=kde-apps/kblocks-${PV}:${SLOT}
-	>=kde-apps/kbounce-${PV}:${SLOT}
-	>=kde-apps/kbreakout-${PV}:${SLOT}
-	>=kde-apps/kdiamond-${PV}:${SLOT}
-	>=kde-apps/kfourinline-${PV}:${SLOT}
-	>=kde-apps/kgoldrunner-${PV}:${SLOT}
-	>=kde-apps/kigo-${PV}:${SLOT}
-	>=kde-apps/killbots-${PV}:${SLOT}
-	>=kde-apps/kiriki-${PV}:${SLOT}
-	>=kde-apps/kjumpingcube-${PV}:${SLOT}
-	>=kde-apps/klickety-${PV}:${SLOT}
-	>=kde-apps/klines-${PV}:${SLOT}
-	>=kde-apps/kmahjongg-${PV}:${SLOT}
-	>=kde-apps/kmines-${PV}:${SLOT}
-	>=kde-apps/knavalbattle-${PV}:${SLOT}
-	>=kde-apps/knetwalk-${PV}:${SLOT}
-	>=kde-apps/knights-${PV}:${SLOT}
-	>=kde-apps/kolf-${PV}:${SLOT}
-	>=kde-apps/kollision-${PV}:${SLOT}
-	>=kde-apps/konquest-${PV}:${SLOT}
-	>=kde-apps/kpat-${PV}:${SLOT}
-	>=kde-apps/kreversi-${PV}:${SLOT}
-	>=kde-apps/kshisen-${PV}:${SLOT}
-	>=kde-apps/ksirk-${PV}:${SLOT}
-	>=kde-apps/ksnakeduel-${PV}:${SLOT}
-	>=kde-apps/kspaceduel-${PV}:${SLOT}
-	>=kde-apps/ksquares-${PV}:${SLOT}
-	>=kde-apps/ktuberling-${PV}:${SLOT}
-	>=kde-apps/libkdegames-${PV}:${SLOT}
-	>=kde-apps/libkmahjongg-${PV}:${SLOT}
-	>=kde-apps/lskat-${PV}:${SLOT}
-	>=kde-apps/palapeli-${PV}:${SLOT}
-	>=kde-apps/picmi-${PV}:${SLOT}
-	opengl? (
-		>=kde-apps/ksudoku-${PV}:${SLOT}
-		>=kde-apps/kubrick-${PV}:${SLOT}
-	)
-	python? ( >=kde-apps/kajongg-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-20.04.1.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-20.04.1.ebuild
deleted file mode 100644
index 5a67dfbf5567..000000000000
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-20.04.1.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
-
-DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-HOMEPAGE="https://kde.org/applications/graphics/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="scanner"
-
-RDEPEND="
-	>=kde-apps/gwenview-${PV}:${SLOT}
-	>=kde-apps/kamera-${PV}:${SLOT}
-	>=kde-apps/kcolorchooser-${PV}:${SLOT}
-	>=kde-apps/kdegraphics-mobipocket-${PV}:${SLOT}
-	>=kde-apps/kipi-plugins-${PV}:${SLOT}
-	>=kde-apps/kolourpaint-${PV}:${SLOT}
-	>=kde-apps/kruler-${PV}:${SLOT}
-	>=kde-apps/libkdcraw-${PV}:${SLOT}
-	>=kde-apps/libkexiv2-${PV}:${SLOT}
-	>=kde-apps/libkipi-${PV}:${SLOT}
-	>=kde-apps/okular-${PV}:${SLOT}
-	>=kde-apps/spectacle-${PV}:${SLOT}
-	>=kde-apps/svgpart-${PV}:${SLOT}
-	>=kde-apps/thumbnailers-${PV}:${SLOT}
-	scanner? ( >=kde-apps/libksane-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index c2d9151ec077..1cd63c6abb13 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-mobipocket-19.12.3.tar.xz 16164 BLAKE2B 0d3a1bf33751214114d35cf460bdc3dd56303db366eef804afd2b769fe095bc743f422dcd921ed36d7c8cd7967d41a4b6ff74f2195666ec67c3464d80ea8cabe SHA512 9932ac9e3a1f2824818f308097366e07444c02fa6e875120500a91212fc6366e2e2cd03f0b1ccda44939a707ab044a3fec0a67a8fdb620a2767121caa47686c5
-DIST kdegraphics-mobipocket-20.04.1.tar.xz 16456 BLAKE2B 7236a80083b73a207a7d56e1a65824c70c8ad2fdd8d2876887d2552b6dd9b4cf1bd5ce5e8082e6367af81990a622203f7462f37dec639531beb9e5a9d96af2bf SHA512 3aa3b87d4498a1fecd756674f0a916b95765339b0f60cde4c02fa59b6472fdccd2c2bd53ddcfc9f9f54fc60172455ae267f7120b860ca1b47ae153ec100624bd
 DIST kdegraphics-mobipocket-20.04.2.tar.xz 16528 BLAKE2B e0aa3814ec0729e09a1c27518df2d0afe8cfe9d657b78e8da766a4bba71a01e538e2614ccfb47be2a7c3320931433abbbd4c9c32d0b24c61939223f9c0b7ca3f SHA512 451f0a97f552c2705d630e35cf0297472db235f70db2598fdf1e4d6478491d178013312d02143edde2ddeddc5a8290a4a6d95a86c4d91b79a184216adca87649
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.04.1.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.04.1.ebuild
deleted file mode 100644
index d59a9a9c1d57..000000000000
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library to support mobipocket ebooks"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+thumbnail"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	thumbnail? ( >=kde-frameworks/kio-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_thumbnailers=$(usex thumbnail)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.04.1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.04.1.ebuild
deleted file mode 100644
index 733e3f5f93a2..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-20.04.1.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
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="https://kde.org/applications/multimedia/
-https://multimedia.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+cdrom +ffmpeg gstreamer"
-
-RDEPEND="
-	>=kde-apps/dragon-${PV}:${SLOT}
-	>=kde-apps/juk-${PV}:${SLOT}
-	>=kde-apps/kdenlive-${PV}:${SLOT}
-	>=kde-apps/kmix-${PV}:${SLOT}
-	>=kde-apps/kwave-${PV}:${SLOT}
-	>=media-sound/elisa-${PV}:${SLOT}
-	cdrom? (
-		>=kde-apps/audiocd-kio-${PV}:${SLOT}
-		>=kde-apps/k3b-${PV}:${SLOT}
-		>=kde-apps/libkcddb-${PV}:${SLOT}
-		>=kde-apps/libkcompactdisc-${PV}:${SLOT}
-	)
-	ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:${SLOT} )
-	gstreamer? ( >=kde-apps/kamoso-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 706128f7e45e..945082d7cac8 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,3 +1,2 @@
 DIST kdenetwork-filesharing-19.12.3.tar.xz 318360 BLAKE2B 4d303c811c55699cfedcd20223dd56def78a4057985865ee8a7b582e2fbb514c809f2bff23e2f0a4209bea74c6c813b5d94d13d38590905ece93e30fd2aadceb SHA512 31d55dff6935f6cc9cde7b435e80fe016d87706bb636f1cc6d49ee2c30ac395ead07f51edb5c6fdccea64f0e2b466bba9a5336e14a25186fb22edd6d986b39de
-DIST kdenetwork-filesharing-20.04.1.tar.xz 320340 BLAKE2B 7ad9ac04b5061f4575ce8db84e2426db3f0719917884cf4f0bf5ea9bee87ff8286e20e23c118d34bf22feca5f10a604313063151a9bef6bb2aa73a0f8feef230 SHA512 e4f26b9ede4b163351e4f68a15b39ed8b1701b9f5fe72a5c0bd37a818514b9b8078763a59bb05206a4c3b5b141eb71c979b4f26f240dcbeb3ed18a51450fb3c2
 DIST kdenetwork-filesharing-20.04.2.tar.xz 320524 BLAKE2B 706a0598fd9ce999b91c30c3dc7025726c17158af17e0acdff409800436d2b8ce026849152173fdbf5dadd2449021acb7cbf6f7c56dd5097325581e985f54d47 SHA512 a76a7009ed8277e7a0cdf7f4d3fe761c9b9a91136c1eefb482a0297ca1a418af64912aef5a6f0a783f603b83537a67dc8662adae95a7cb65056e7109e074f847
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.04.1.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.04.1.ebuild
deleted file mode 100644
index 4e44fb56cd7f..000000000000
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-20.04.1.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
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="SMB filesharing config module for systemsettings"
-HOMEPAGE="https://kde.org/applications/system/org.kde.kdenetwork_filesharing"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-20.04.1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-20.04.1.ebuild
deleted file mode 100644
index 0a11dcd2224d..000000000000
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-20.04.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="dropbox +telepathy"
-
-RDEPEND="
-	>=kde-apps/kdenetwork-filesharing-${PV}:${SLOT}
-	>=kde-apps/kget-${PV}:${SLOT}
-	>=kde-apps/krdc-${PV}:${SLOT}
-	>=kde-apps/kopete-${PV}:${SLOT}
-	>=kde-apps/krfb-${PV}:${SLOT}
-	>=kde-apps/zeroconf-ioslave-${PV}:${SLOT}
-	>=kde-misc/kdeconnect-${PV}:${SLOT}
-	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:${SLOT} )
-	telepathy? ( >=kde-apps/plasma-telepathy-meta-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index d39bcde2688b..c53db80d4315 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,3 +1,2 @@
 DIST kdenlive-19.12.3.tar.xz 11393740 BLAKE2B a41d52a028204ad689b947aa0964afa5edb521f5560c2c6702df0a66d85ff9e3bbd31fcd2339b6586cdb2559d9041b6551bbbaf65a1cccde554f4bf2c1ac4492 SHA512 f3e96ec336fdbecfb1c98eef8af87ce98c32ebd16f9810c9d12d1bbe7b23af3c1272396f46799b68d455a243500a3fb0532ad935bde0f25fd5e14e318c3530ad
-DIST kdenlive-20.04.1.tar.xz 11278316 BLAKE2B 87f88f55e9bb988404c8eab081ca67d85507edd429823fed791562c68605a507a13aad7f7116886895621a470718e5bd265c349e1b191f3f6af0a22f3520decc SHA512 2d412c2041937213346d96a16c975f7e8770b22b70abfffe655f16c752ae33a8f85d2870e8343fc25b3aea8ba7ad8323e32bf076404f907879fb2cb8107cda0c
 DIST kdenlive-20.04.2.tar.xz 11289748 BLAKE2B 6979274f8f703416f09db2e1746bc9a2ec9cfaf813ea26d0834a90601147c2276d1b7708031a19178f2719efc57aa8987863bcf41340911b1bb17638d879d913 SHA512 f7bfc35121f5a27b01ab7c16b0911f90b758eb113bd55ca22783a5142d3df92493b7170c6bf31352aa44d4ca8d8a7fd12491d75f44a137551dfc531c4c1a5d10
diff --git a/kde-apps/kdenlive/kdenlive-20.04.1.ebuild b/kde-apps/kdenlive/kdenlive-20.04.1.ebuild
deleted file mode 100644
index f2860e9c705a..000000000000
--- a/kde-apps/kdenlive/kdenlive-20.04.1.ebuild
+++ /dev/null
@@ -1,90 +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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://kdenlive.org/en/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="freesound gles2-only semantic-desktop share v4l"
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	dev-cpp/rttr
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/mlt-6.20.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
-	freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	v4l? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	media-video/ffmpeg[encode,sdl,X]
-"
-
-RESTRICT+=" test" # segfaults, bug 684132
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package freesound Qt5WebKitWidgets)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package v4l LibV4L2)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	# Gentoo bug 603168
-	if ! has_version "media-libs/mlt[fftw]" ; then
-		elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
-	fi
-}
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 54fdd603a2f8..f7a46619aeca 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-addons-19.12.3.tar.xz 2113300 BLAKE2B e9d412b592bded4acf6d14bd0e80addd28c0691782e6aacc80bd61908298aa0d2adb4f4bc25cd6aced11e36f23a1bc84850a22b9305f7bbd6156b6395e3f211e SHA512 f2c80c2ad9921da7739ced9faa63a371ddb9b0dd9e2c03e4e48e04ec7b183b1f368ae51b9904a7e4fd9047fd1489082b82a75c28cc69cb21d26d95dc8ef4c3d4
-DIST kdepim-addons-20.04.1.tar.xz 2064784 BLAKE2B 7aed83283c3710a1f5f0377130cc921af1de629aefe56b28bca54fb3176707ab86bae33d02f857115e892cdad4a5b33517536b3fc2915b5b737ccff65f17877d SHA512 83c0a4f31e32ffab38b674e39f7fe38e07b6bbe4f1c0f6f1cd86e47cb6dce0c9a3559d0da59a2534b6d4e4ffc045a69de41ef51108710d0ecd5d038b40fbd4b5
 DIST kdepim-addons-20.04.2.tar.xz 2065332 BLAKE2B 148c2e992822d63b7575135c0c4db9caeee2224fe33bb7a338b129190f51f209f38937d639833d5fcb8207c82f2b71e22ac7637b3f71c9257c431af62010551a SHA512 9d66e87861415635b925314815a0addee56a81f400d25906c2ee5aba22459e923a9067046ec6e101e0a3a6eac38395544a6430ddd6107df7e7fdce87de67224e
diff --git a/kde-apps/kdepim-addons/kdepim-addons-20.04.1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-20.04.1.ebuild
deleted file mode 100644
index 21474233561b..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-20.04.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional-recursive"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="importwizard markdown"
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-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() {
-	ecm_pkg_postinst
-
-	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
-		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
-	fi
-}
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index 1b73f7578866..b473d220f467 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-apps-libs-19.12.3.tar.xz 83720 BLAKE2B 086f27724b0bae42d381e9f8499d4bcd880dae0309ddf7fbf178a34ddb560f19424ef6a550893223149c153eb19ad847ae20bd82a8afd6b248f98af64f1ef343 SHA512 22f9e055db3466fcf6d7835e240b81f965a8cedfa54cbc8a226ed2a784e416dcd87705130b4dcaeca2ac43bd237a7963e48a4d47a4b548f503387288c93a1997
-DIST kdepim-apps-libs-20.04.1.tar.xz 84752 BLAKE2B 9ae77acb2b2d9113e645937c2cdf9dd00873bfb7ef84e4fcff1b219ad8d811ae22ef0d5d5753e496b2321851074415ae9e7e8522e8a91ac4bc7fc7a6bc97456b SHA512 2ab38f74f6ee68b70656c0bd86776c2b50165ed5461d26d5e61861de9e73144856a1c4b943999615448efd8edd5c2b54f03c8da09380d26e0a823b8ad4a9808f
 DIST kdepim-apps-libs-20.04.2.tar.xz 84836 BLAKE2B 65f8398aef2b262160985775eb7f5eeb70b6b45cda255241b60579613d90c7a8e82b0d7c88adcc942e8f5ee7af3b2096a00ede420f84db484f0fffcae862ec4d SHA512 852155d49d5f8200bcb517b839a9a003a1c73202954245db930a8ad0d6035d419d04328f8eafa23ccab95faebebef400ee16701f6268716ea82cfd0a19f6a2c7
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.04.1.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.04.1.ebuild
deleted file mode 100644
index 0707745f9af3..000000000000
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-20.04.1.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_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries for KDE PIM applications"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/grantlee-5.2.0:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}: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/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-20.04.1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-20.04.1.ebuild
deleted file mode 100644
index 490f98b87d38..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-20.04.1.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://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 7cdb49c5ead6..f328070798a5 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,3 +1,2 @@
 DIST kdepim-runtime-19.12.3.tar.xz 1736984 BLAKE2B fdb6e010a6944738ea3618183e709ed8ff93e199be18c5a7a3695f8ec83d23e1a92e181d73decefb6266e24ec1f149933620aae236c24769f26d4db1e656c154 SHA512 0a851ac588ac8b78f31344712badcf8770e5d1effe488aaa70baf695034bfa75fd08d6a2b30fa43856b800f9d016551213960495ba1ef4687ae38f88fad08b3b
-DIST kdepim-runtime-20.04.1.tar.xz 1740016 BLAKE2B d12def3da10a7512bc83312443e30b0878a3f3ae39330b2dcf3981113f91e1852c9972fc235bd66f1b0cdee0cbf3cd6101f5bf97a09a3b0738fa7075ccd3cd00 SHA512 cca6f80a95ad5a64327b02353c1ef09a84a6a443d99b08d96688f0aa02f5fc920deb03f8f3c221f304bd4bfe29a0a365aa93d2051f957266ce2adc2f1d0dfb62
 DIST kdepim-runtime-20.04.2.tar.xz 1740368 BLAKE2B eec5bf64ab66462c87f5890c902e30e8b3d182a932bc6137f6eb68f785cc0c0c351e3674d55c4c3c889f46b9c42934290629936b4913e7c385a93a43f0b47d51 SHA512 03d1b846ba7fbe5fd61b592bf94500973f3843776c7f8b7b51c0e6843aaad6fa97a8be1e76622d3b93a615518ffb49eb8fc09ecd3d344ca334082125ec0b7e34
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.04.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.04.1.ebuild
deleted file mode 100644
index 65124125555e..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-20.04.1.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_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/kdav-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmbox-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkgapi-${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/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/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index d28253c6b9b9..642fdbf41199 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-kioslaves-19.12.3.tar.xz 37324 BLAKE2B 6d74d5a5e56a12666147cd954299ce94d9bb70e79792ba30ae11dc9555814858652f4b0abc3aa38e7694f15c36a1cb34bb956883fa60e14bc339a9e9bb146a9a SHA512 16087128494f85e4ce0effffa6efe1177af380790eb430c547d3a358b0860be674fb227d4548f1042d00a93bdd9c8b54c427f93e72900b0df7aeb3b85feeeb9e
-DIST kdesdk-kioslaves-20.04.1.tar.xz 37268 BLAKE2B 13095ef38f3345920ccd1633dac0ae28736af34b14da8a5bd6a07c41d33755263e9e44f673bc3d350d2914f5a3c2ba1f31d7f0409e12a51e44b66c3dfc4a5d19 SHA512 56a81cbd08614b4f0ea59a1e3a93e8ddf865b2634445088f797a066e7372fffea7268c0bfa14fbe7e2c963ddc03e8e8e713dd5deef40f6127d12070c49c924c3
 DIST kdesdk-kioslaves-20.04.2.tar.xz 37308 BLAKE2B 2af5fb6189eea4be86dc6a4a35d3a835f8a750db25db163689a06ea4c2d3c917dd55796d9f05d8215640239ac13049e13f87b80c75f9166fea47478008d7b54d SHA512 17c4cd601df6b92c58a4d751780f7cc90446d1414d748302ffc30c36d19686adbff27af04a8426db2d4d1dee45b67c571bef442f03bf4423da31ee8eb96a1b7d
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.04.1.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.04.1.ebuild
deleted file mode 100644
index 3f32b7f51d3a..000000000000
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.04.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.70.0
-inherit ecm kde.org
-
-DESCRIPTION="kioslaves from kdesdk package"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	dev-lang/perl
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-20.04.1.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-20.04.1.ebuild
deleted file mode 100644
index 971a072c7a58..000000000000
--- a/kde-apps/kdesdk-meta/kdesdk-meta-20.04.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
-HOMEPAGE="https://kde.org/applications/development"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="cvs git mercurial python subversion +webkit"
-
-RDEPEND="
-	>=kde-apps/kapptemplate-${PV}:${SLOT}
-	>=kde-apps/kcachegrind-${PV}:${SLOT}
-	>=kde-apps/kde-dev-scripts-${PV}:${SLOT}
-	>=kde-apps/kde-dev-utils-${PV}:${SLOT}
-	>=kde-apps/kdesdk-kioslaves-${PV}:${SLOT}
-	>=kde-apps/kdesdk-thumbnailers-${PV}:${SLOT}
-	>=kde-apps/kompare-${PV}:${SLOT}
-	>=kde-apps/kross-interpreters-${PV}:${SLOT}
-	>=kde-apps/libkomparediff2-${PV}:${SLOT}
-	>=kde-apps/poxml-${PV}:${SLOT}
-	cvs? ( >=kde-apps/cervisia-${PV}:${SLOT} )
-	git? ( >=kde-apps/dolphin-plugins-git-${PV}:${SLOT} )
-	mercurial? ( >=kde-apps/dolphin-plugins-mercurial-${PV}:${SLOT} )
-	python? ( >=kde-apps/lokalize-${PV}:${SLOT} )
-	subversion? ( >=kde-apps/dolphin-plugins-subversion-${PV}:${SLOT} )
-	webkit? ( >=kde-apps/umbrello-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index c0c3a5c3d776..5a126742cbb6 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,3 +1,2 @@
 DIST kdesdk-thumbnailers-19.12.3.tar.xz 17364 BLAKE2B 1634b70d8fc5335bccf565e66d164769cf48988825896f232c7cd88374040160b4bf9f49089e9408183ba2457918fa542db1887405a8ebf0fd13f075b7833d60 SHA512 9193464f2f4ccae0876067ee957e6b3cc5f4bb4d9739769dc98604afedad522083ab8d06c96699a8a75876bc76c638e7cd146c349d528d824333beb8305acf8f
-DIST kdesdk-thumbnailers-20.04.1.tar.xz 17492 BLAKE2B fd82be69376417a7e702fe7b55fdca10a742bd43b9a01aafc0a3b815d53123ce01fd5f822e343ec3d026da3e6439efa90b079c56396e6768d7f000ee40f14421 SHA512 26fa4c6a8f1eb029310af06c3356e6d27bee9ad5b789eeccf5b52882f88661663bddcbd7809e8d0f89d35f1092721ce1c596ad5fae33cfe1f13d9ea19206bd28
 DIST kdesdk-thumbnailers-20.04.2.tar.xz 17464 BLAKE2B 0e997811b0f233b9e95292e2f021b6c7815c0b0b3cf12c53e4bfec6adc78adbf98703d60beb06024b5f51445ff90ebd72c13bceb7ef8abdb50785e62768891fe SHA512 ef27461627c2b02f9487bb3fa2ed69f993628e942f240fafb9ffd00ff2cb255b9408d6e9f3b1e09e047346c858c788706f5d293df62e0d4f2e2fb06526e1317a
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.04.1.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.04.1.ebuild
deleted file mode 100644
index 94900127d394..000000000000
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-20.04.1.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
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Thumbnail generator for PO files"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-20.04.1.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-20.04.1.ebuild
deleted file mode 100644
index 7f7d9347c3da..000000000000
--- a/kde-apps/kdeutils-meta/kdeutils-meta-20.04.1.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
-
-DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
-HOMEPAGE="https://kde.org/applications/utilities https://utils.kde.org"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="7zip cups floppy gpg lrz rar +webengine"
-
-RDEPEND="
-	>=kde-apps/ark-${PV}:${SLOT}
-	>=kde-apps/filelight-${PV}:${SLOT}
-	>=kde-apps/kate-${PV}:${SLOT}
-	>=kde-apps/kbackup-${PV}:${SLOT}
-	>=kde-apps/kcalc-${PV}:${SLOT}
-	>=kde-apps/kcharselect-${PV}:${SLOT}
-	>=kde-apps/kdebugsettings-${PV}:${SLOT}
-	>=kde-apps/kdf-${PV}:${SLOT}
-	>=kde-apps/kteatime-${PV}:${SLOT}
-	>=kde-apps/ktimer-${PV}:${SLOT}
-	>=kde-apps/kwalletmanager-${PV}:${SLOT}
-	>=kde-apps/sweeper-${PV}:${SLOT}
-	>=kde-apps/yakuake-${PV}:${SLOT}
-	cups? ( >=kde-apps/print-manager-${PV}:${SLOT} )
-	floppy? ( >=kde-apps/kfloppy-${PV}:${SLOT} )
-	gpg? ( >=kde-apps/kgpg-${PV}:${SLOT} )
-	webengine? ( >=kde-apps/kimagemapeditor-${PV}:${SLOT} )
-"
-# Optional runtime deps: kde-apps/ark
-RDEPEND="${RDEPEND}
-	7zip? ( app-arch/p7zip )
-	lrz? ( app-arch/lrzip )
-	rar? ( || (
-		app-arch/rar
-		app-arch/unrar
-		app-arch/unar
-	) )
-"
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 937eab2264f1..28f583b88c68 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,3 +1,2 @@
 DIST kdf-19.12.3.tar.xz 462016 BLAKE2B d2893ecad001362b6433afdad89065b8eecb1c0a57fd6d36e8b5ede70b65c4716822c99b8817a50e9a680d4ce3408f013cfd1fd784278742f572684e59dcec0e SHA512 46639acdaca1f29d215bde691a2844ae24234fe747081a5d6cca1c81a0c09f862b1f6eb066e1d301a8b57345b82096a4c9c7a771a2a29e7bbf21dd1b62d2582a
-DIST kdf-20.04.1.tar.xz 462316 BLAKE2B efacab8289bf253071ba70ae7b8541cd14ca20f2deda8b39f87c160531f7f9cab040082b22616145c4a32609df69d0bf30a8f9976779e213e2241e05b5400f94 SHA512 60c4914e66ec09726ed14b280243c88c6ba063a633c462489f8b29fc851b151dc0e3efd9c6821c99b62aa4a0847cef8f13efa836684349f911148f2aa32dd65c
 DIST kdf-20.04.2.tar.xz 462444 BLAKE2B 3d5d359117347b9669e21dffab0a60de9bca7301dc384cf57d624591f03e18ee76d1669ce746bebe49c2dc777ea9c2c3ba42dc9831abf1f1e74a1e6ee69e524b SHA512 56e944cd96c4c2114bfda85f61f8889070f7575a3bdf27b273407abb5ffdc2b5649517342469c93caa42b78654021c009503fa7cbb431ebf973fc9ca3753700e
diff --git a/kde-apps/kdf/kdf-20.04.1.ebuild b/kde-apps/kdf/kdf-20.04.1.ebuild
deleted file mode 100644
index ff098f0722bb..000000000000
--- a/kde-apps/kdf/kdf-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE free disk space utility"
-HOMEPAGE="https://kde.org/applications/system/org.kde.kdf
-https://utils.kde.org/projects/kdf/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index a34f36544843..65edc8bd23ec 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,3 +1,2 @@
 DIST kdialog-19.12.3.tar.xz 104136 BLAKE2B ba1968a00d9e7cc49de2b878adc72c4c66199bf3868a3f05c0669e4e2225ccc2cfa0a4053a803842c2c5ab0dd0ba69fc2a31804e8b762a0d7862fd8ad423417a SHA512 c0cd70bd3d732249dffc03eff6762182df26d200b84088c56327d1fb6ec1b07f03352a0baafa8c7c3f91eff457f2c5b5a84c22e7f7b29c3543133b946c8c3352
-DIST kdialog-20.04.1.tar.xz 103916 BLAKE2B 96be1799768a6fb5533297c6b24ac11acf2213431b8a61657e8b9c36f6e4f6825a6f4022cbee494cb8f7222d2d9d53fad9ae5cbd3f642ce4ea9e23c06431d205 SHA512 b86bc303abf83b55742d516db127bac5b4d9cebb0a54188723eb05506c845cc4150d36cc5e8fddae9487d374251a4f2947f6e0e5e26fa3074213653d91b0fee6
 DIST kdialog-20.04.2.tar.xz 103988 BLAKE2B bd255c0a954bf5b922bce41991446dbb6665fb7e2ed9f31f2491c3f41985f57656bd453e91c84462d16d92d6bea12c0bd781037c35f8045fc2321334e560f971 SHA512 17a1ace50c18fe3b56cf8046e964128e294d93275b589b2d46f8346885b523606ba4462bfef1f78bdcffec2fa33a3d5250894e2c275179bb2265e18f93873bcc
diff --git a/kde-apps/kdialog/kdialog-20.04.1.ebuild b/kde-apps/kdialog/kdialog-20.04.1.ebuild
deleted file mode 100644
index 46096a805df6..000000000000
--- a/kde-apps/kdialog/kdialog-20.04.1.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
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kdialog"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 2c4a7207be8b..f3a057e6de18 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,3 +1,2 @@
 DIST kdiamond-19.12.3.tar.xz 4693824 BLAKE2B 042f04eb16e3bb45fbf909fe1f683c26a5d06c20267393157ec21d0bd725e8d7c4a6ca0af14bde6ff2147f35618723b488297adc050a0d1dc90289be46eb3297 SHA512 7ed8b8dacdd5e134bd0b6c292d54423680f5613da9fd934690703bb735b5c531bfd9ded79fb43903094b80c0a266dcebc0848148e12f957afcec3cc327104268
-DIST kdiamond-20.04.1.tar.xz 4693952 BLAKE2B f8fd29940e521d132e33511bf40454ac85b78637e60334c612547da68a3b2f72d1c2d5c5f029cf1efe93dced9d31d4280ff112610991594a297453231f56121c SHA512 d39e2b55aad444dbbc8e10631b3a9061222a887f055678aa70c43ca3b57a5e99321948662f3dc1b7d5402a8f7ccd5c2b73301856ff389664671c142c7ba2d7f9
 DIST kdiamond-20.04.2.tar.xz 4694188 BLAKE2B 4e9eccc2280a9bf7a82a1859c2a1f208307701d147888ffb26cbfe9cea20b8621b3381b78551c89df586ffc3e3f83a65b75a33de56e6c5ff422aab9277f3795c SHA512 ba5a0c0e39d8b3ccb19b93e526792e4336228b1d08272a9badb30a88495876cb5b0659a31dce24613923f6d3ad91330ab40a1b43dac099c6185b6b49bdf27528
diff --git a/kde-apps/kdiamond/kdiamond-20.04.1.ebuild b/kde-apps/kdiamond/kdiamond-20.04.1.ebuild
deleted file mode 100644
index 5118895b4d7c..000000000000
--- a/kde-apps/kdiamond/kdiamond-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Single player three-in-a-row game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kdiamond
-https://games.kde.org/game.php?game=kdiamond"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 7a5091774215..c310694a0acb 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,3 +1,2 @@
 DIST keditbookmarks-19.12.3.tar.xz 187716 BLAKE2B d8aef132f4c0da9315fad5b2d929a21e7184e24f72f9c78516a514a5685994131cb7cf7f33837fedb9ca9bbf3813cc8fbe206273745a8297f9d50e0d74b83afa SHA512 60fad667b0414c9041fe9eac405833e909e1a7a56997451227385b168cce2142dcaa7390c9e4974f0c32999951c0e3507aaf2487f377851b54b4c9848c3190ef
-DIST keditbookmarks-20.04.1.tar.xz 187732 BLAKE2B 2e52d3255fc718f694a900e45fd4b2af8c28fb4c250d0a0fe8af5c353ca296e6facd8d542d05f1b02bb0f178abde0120daf071df2d9f679d43f67a14da7d4890 SHA512 626efc79a94194617b71d136a5ceae24c73c15fd164292108985ad826ebe1b2336029569d5857475a40e1649f26c3251f68cb97a12358b18920eb6dd273ba519
 DIST keditbookmarks-20.04.2.tar.xz 187064 BLAKE2B 7f717561ab16a3327da79e37f1d26938968b008bbbee5e89371662b42d25e9497683171940f3d1b601bf6a5b39c9f4e302eea9d9ce9ec5442db55335e760294e SHA512 0c0b3b039968c8fb6bba470a1c81246dfcb1fe33b54fbd30a9907a7020f85451c7da8d8e0b6b56db87fde2115140fe47b7d97c699b7baf82386e7dacc249d422
diff --git a/kde-apps/keditbookmarks/keditbookmarks-20.04.1.ebuild b/kde-apps/keditbookmarks/keditbookmarks-20.04.1.ebuild
deleted file mode 100644
index eaf804e660d0..000000000000
--- a/kde-apps/keditbookmarks/keditbookmarks-20.04.1.ebuild
+++ /dev/null
@@ -1,47 +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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Bookmarks editor based on KDE Frameworks"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+man"
-
-DEPEND="
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=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
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-	ecm_src_prepare
-
-	if ! use man ; then
-		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
-	fi
-}
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 5b35f6b78ddc..b68256b3798e 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,3 +1,2 @@
 DIST kfind-19.12.3.tar.xz 270244 BLAKE2B 577a022e0426d1c28484ad8928c48aa57da22aa662d6ddb1e57fa2351cfa4f68b0e0a07f0702d0e23d7d0ce19be016e93ca6ca2edc9aca210431bbb8188eb249 SHA512 a3e0572d12c0ffb4ca60774e91237f82ae2d424558ac91636a83075d1a1c11c2ff8848f1093360a4c3149b3c4d8233dff9bd5ac0914547af873aa9f1bba8dff5
-DIST kfind-20.04.1.tar.xz 272016 BLAKE2B 0112604183adcc31238375031dc6b17e9cafcf9ad3c3a2549717f9fc15a1140d49a98a31fff4154501fd62380acdbd5420ce5fdc3c3992ed4da360ab53c6ff4d SHA512 b8bd613d41d3b7b74a7768c2a4ab7300a782506fd58d9a291d81355a0e4f41417cbf5c2aa72a2452321780d194282f41c12b8e9d68a538f7e4d94e4db59036cc
 DIST kfind-20.04.2.tar.xz 271592 BLAKE2B 4f98c514d2e3ebc477b1b01a810b00ab086ff83f7c105620e481ac85e52b1e58ab9e052b3851bf443dad9bd830e2db782cdd142eca72e3ab04267ddcaec67e9c SHA512 9e02fb3179752aed72ccc6e4ca56024b653ce6e97a16708446d500f8a8bfa00f34f95036812b65360a8ca20511587b29c99feb3cbc5dc0d3c9b0be44742a7046
diff --git a/kde-apps/kfind/kfind-20.04.1.ebuild b/kde-apps/kfind/kfind-20.04.1.ebuild
deleted file mode 100644
index 187f8ac06f39..000000000000
--- a/kde-apps/kfind/kfind-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="File finder utility based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kfind"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=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/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 7ec031fccbaf..b0c1c6432efd 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,3 +1,2 @@
 DIST kfloppy-19.12.3.tar.xz 199040 BLAKE2B 87f9f6c90dcc18c683421c40f87c25a62593713163f8e4458b886d1707612f7770bd80300e70447661e098f6b08dcddf8c1fdfc748b1fafdd2d239d292dc7f25 SHA512 26a3664af62ac5b39bb527c4b1c3b16ea34f68b5e8a28368747dc563bdcfac850aba488c5362616f93e5a60555540aadb2607fe5570341c0eb14f3844cb0aeba
-DIST kfloppy-20.04.1.tar.xz 199028 BLAKE2B 70e299a7fa38b0243cc381e7487b281284be337ea4c8281de326c9a501282dfd6838e75ac87aab224ab6c8543e71739595f98c26ef6f0d71582de65cd80d80f1 SHA512 dfba3d4ac8befd1bb1f89c59d0067f9c393400c276bac666ded37b8fc5195936babc6cf9fbf18545baf63657bfd9e1322e3bdedc030516d3e52211b41f9d334b
 DIST kfloppy-20.04.2.tar.xz 199064 BLAKE2B f02bf88acda30fc8cd173d991ec9584db4b4ee4b50c3611e40fe440ba45a231aab032d36227b8eabd2a1bbf71323fdd427401c9515ec6cbaf14dab7029d78651 SHA512 9ade1519ab0c546dece22925de449a73d741aedd0be78e404057cb0aba01f9317a00c338e5ea9a6bc1d8b4ff490ed1c33af2af0854857ba400064a2215a11a9e
diff --git a/kde-apps/kfloppy/kfloppy-20.04.1.ebuild b/kde-apps/kfloppy/kfloppy-20.04.1.ebuild
deleted file mode 100644
index 07d924307600..000000000000
--- a/kde-apps/kfloppy/kfloppy-20.04.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kfloppy
-https://utils.kde.org/projects/kfloppy/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index d0cea7db1991..5230fa238fef 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,3 +1,2 @@
 DIST kfourinline-19.12.3.tar.xz 639224 BLAKE2B 588df5c0db6aa75be9692d4aa92c918ea5b00be0f446fb599b1de3248ea2b6e07f957e88d0d62b747c0c7072193ed2c6338b9caf7cc55598762dd29721f229c7 SHA512 8738836d6f0a850f3fa563f1f6571757ec8b8001b31ac122ced617a4b64a311fa710cb449655bf3ae3fc170ce1c53c0126d023c089a03c94b8b8ef1a6e9097df
-DIST kfourinline-20.04.1.tar.xz 640040 BLAKE2B 9510fa08768319db4414eab495055898bb963dab2474677d370ce4ef4268d886387643b0585bdfc7b37c4a415dee1e1d2ea3b4a0bcba9e61c725000f10555124 SHA512 47189ddac4cd9dc85e612615e7c4f2adb2bfb6d2fa1fd766832380f31bf0f7498e1ac8aa7b7cafc0113dba64fbac7c3e2f633e0966fe383f517e98fe74799c9a
 DIST kfourinline-20.04.2.tar.xz 639740 BLAKE2B fb310d3128ccea98364f7bbec84f3011abe075ae14e6ee159d78e3b713a4ee3abd775fe6d62ccd1233e024926257b8f4243dda5b65261ae99ad40b2a5ced0373 SHA512 d8dacd537043387deca39d8ac5ba101c519d0f399ca0f6c7f1b183ae5e1fa0617faf6e1e789f69ed0951673b3674651787b8630241e29204c05f376ca9f3c34d
diff --git a/kde-apps/kfourinline/kfourinline-20.04.1.ebuild b/kde-apps/kfourinline/kfourinline-20.04.1.ebuild
deleted file mode 100644
index df9476658311..000000000000
--- a/kde-apps/kfourinline/kfourinline-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE four-in-a-row game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kfourinline
-https://games.kde.org/game.php?game=kfourinline"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index c1633dfa01bf..45fb501f48a0 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,3 +1,2 @@
 DIST kgeography-19.12.3.tar.xz 10854552 BLAKE2B bb579c4f0257108db7471853264803cde0a9c963eaa780ea155ed658799329cdb409603a0ca5fecfe23ec90193a0cb4849f6ad81684bf8343aae120a48a5ec26 SHA512 fcd99351c80750c79b50ec78bfb0864f5f3fb08d9ec94af5d2fb6907a537c02bae9ff2c70437eb58f22c4a873ecdce4ac7e1ab0d55a8140d2671d6ed89b743d3
-DIST kgeography-20.04.1.tar.xz 10871664 BLAKE2B 0e65db6a405d286030cc77afaa85ae31894aadc7961c0728502e68be183c171762a757ffb4c8760e91b56b30632fa626a0d03cb14cb9986fb43e0ac6b23c6d37 SHA512 4777b72a25e06ae2d04d2b21b0a97342f06681cd16169c84e017b4ada2bee55ea1dee4f7dd7df2afb8717d4cadd2e94162d96506785b68a45cadd46fa9962435
 DIST kgeography-20.04.2.tar.xz 10870332 BLAKE2B 902fb52e932b0471ffe4e9a8808e3dc994f577e113ce89a8708795eecfcee20448f60e88733d04d810ad91f51cc03fe56370cc3d8217a58a5cfa3f4a5b19457d SHA512 6a115dae1c0a29dfa83f6c34ae31e6529679dc7003f2a4c653978107a0903d5237053076bd8e58f1c031ba1f913286c877e12907c7ab332df953503c5f81b505
diff --git a/kde-apps/kgeography/kgeography-20.04.1.ebuild b/kde-apps/kgeography/kgeography-20.04.1.ebuild
deleted file mode 100644
index 6250d4bbc9e9..000000000000
--- a/kde-apps/kgeography/kgeography-20.04.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Geography learning tool"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kgeography"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 6a32b9976579..10efddb979c1 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,3 +1,2 @@
 DIST kget-19.12.3.tar.xz 5240612 BLAKE2B df7540d8f1b92204b9604cf9f0380339833d88267a3831dcef8dbf504532cffc7aa0fd10a1ef5c18c271116d25f05039a5a6cd20fe40a14d70fd185c89c2c977 SHA512 67adf59577ab08895d8107b9ae828db34174efe5546d53bcec48cfa273cf4443ae2e2dfc1c189781a48305fdbd0aa1e2d2aedbacd242a6e14d0ac1ad9b3aa887
-DIST kget-20.04.1.tar.xz 5238960 BLAKE2B 090142aeda6a5bc3aa30bd79689d03ad30b23cb0fa177bb5a445502695ab3815942703856546b7cd72c5648e04c329a6eeed47dfddb8ba7cbcb0755aed3ed9db SHA512 100bd20d89e06372477c9ac7cbf4869aa5ed330863c52e4d2d08210b7b318356ff94837fb2a6310c6bbdf78e1404c3011e3eed8ab97751d95f37cbd173a621d8
 DIST kget-20.04.2.tar.xz 5238908 BLAKE2B 9f5aeff24e47100b299c976cf25ff6b1fc328880781afea601a76919e8fe687065e42a020f453a31677e3d99eb69768be5ab737f119ed2aca7aaf181e681cc1f SHA512 28fff868dd9a6bd778dc540bafd8ec3fd7f05e3c33ec9a174535be8c0b22ad725a1614e4426b7a1c2574fa1bdfc7dd02ecba701e83a02e1537c66e49fe7c1a99
diff --git a/kde-apps/kget/kget-20.04.1.ebuild b/kde-apps/kget/kget-20.04.1.ebuild
deleted file mode 100644
index bf7592252420..000000000000
--- a/kde-apps/kget/kget-20.04.1.ebuild
+++ /dev/null
@@ -1,70 +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"
-KFMIN=5.70.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced download manager by KDE"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.kget"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="bittorrent gpg kde mms sqlite"
-
-RDEPEND="
-	>=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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${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/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	app-crypt/qca:2[qt5(+)]
-	bittorrent? ( net-libs/libktorrent:5 )
-	gpg? ( app-crypt/gpgme[qt5] )
-	kde? ( >=kde-plasma/libkworkspace-${PLASMA_MINIMAL}:5 )
-	mms? ( media-libs/libmms )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package bittorrent KF5Torrent)
-		$(cmake_use_find_package gpg Gpgmepp)
-		$(cmake_use_find_package kde LibKWorkspace)
-		$(cmake_use_find_package mms LibMms)
-		$(cmake_use_find_package sqlite Sqlite)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index cfff660df278..02ef16243c69 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,3 +1,2 @@
 DIST kgoldrunner-19.12.3.tar.xz 4435648 BLAKE2B f0188b8b43c7592f28609284a898f758ad7a6062ccd430f41274abb63865f9ed21ad1a4933f8ff23fbbdb7fb16e12eac393fc753f74185f82e43802be0a82692 SHA512 af90c483e94a335080d4091264213df33c5bfe5b4abbf95336dfb5c0885037caed8fd844371c1b1bcba41a8cc5de88ee8bef9feeb91a22a087c56e44e85abbd3
-DIST kgoldrunner-20.04.1.tar.xz 4429500 BLAKE2B 6e03bef207a666c2d744c2ae278e10a500bcc4b5dc9ad99b9050a50c9e9fa57a3090c1683035a20f8cb3e7be150ad95a421ed06108f5a9b9bffdca8afa00a58e SHA512 2187162615889cc10e1a869d10300384a330b6d100983907c697cd9a444f244d743a9d90fbe8528a3542ae5e26965df06f987aa6d5892dd2ef3f23bf81224c38
 DIST kgoldrunner-20.04.2.tar.xz 4429508 BLAKE2B 44c1d61d3e74cff19ae8996cedeb308899037eafef6c2e7d7a220730fd314d0fdb60ebe7abac6fea2de4ee2cea7bfd424fe3104ed73ad231dd6a64414a1485f8 SHA512 a27670d2282ce8eac1965e9480fbea34ca92d1d1b4a81ebb76c31b1d13d8ffd2bb07ac183f2c7f31b4feb3cc18216ac47d84767bf522ff9cafc80c6a0f147fdd
diff --git a/kde-apps/kgoldrunner/kgoldrunner-20.04.1.ebuild b/kde-apps/kgoldrunner/kgoldrunner-20.04.1.ebuild
deleted file mode 100644
index 0568b702c82c..000000000000
--- a/kde-apps/kgoldrunner/kgoldrunner-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Game of action and puzzle solving by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kgoldrunner
-https://games.kde.org/game.php?game=kgoldrunner"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 4c9809086485..1e0211b4507f 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,3 +1,2 @@
 DIST kgpg-19.12.3.tar.xz 2789548 BLAKE2B c8a41c51a97ef82c4c77030ad1bcb15d4d4b949ff958d44ca715726c18b20dc33d37b8fd3370c1eb569199c47459b020beb0c19a5096025f60b7f42dd670f93b SHA512 465d0b57ed96be41b226bfdc484c5472c0866f293eb0c57816ac3536aef20d81cf320b2244f1d20110d8b86e1014ff578be730dac84331896b41ae9dc7960109
-DIST kgpg-20.04.1.tar.xz 2790884 BLAKE2B 81064e2256b6dc82da138ec9702d5beff5fd1e785db97c46d8f23aded6d85043477485753b6ca6b753e01e5213a04c5be63a6e072f0707795d9bbf7f1b2ee32b SHA512 77851b0bd28e46073c14eab0845080b9adac7db17a139012342a46dd07b73d5ac97c4cac3ac31ff8bd9b50d0a3eb93eff19b4c7bf75ad86617ac55602518209d
 DIST kgpg-20.04.2.tar.xz 2791288 BLAKE2B 66dfab4ee44b45902bb3958aef9ea7a07898200c521f90c7d64b43bf08d8c3e505638a9736e48603a7b35b01634c0b14c7bf1ba2e669591136f029f74ce29d4d SHA512 7b01374cd9c70c48fb79567c929eb02ca1f4a3b4ea5abdaecc6a4bafb80e3ce74b0526766218a67a6c0d4bba25d68a419e0263f400590f6ea34f35b9c2b50b5b
diff --git a/kde-apps/kgpg/kgpg-20.04.1.ebuild b/kde-apps/kgpg/kgpg-20.04.1.ebuild
deleted file mode 100644
index 55e6658f4f17..000000000000
--- a/kde-apps/kgpg/kgpg-20.04.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="gpg"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kgpg
-https://utils.kde.org/projects/kgpg/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=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
-"
-DEPEND="${COMMON_DEPEND}
-	app-crypt/gpgme
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/gnupg
-"
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 98a70e25184d..076c9df76afb 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,3 +1,2 @@
 DIST khangman-19.12.3.tar.xz 7116072 BLAKE2B ab2899f1b469c7dd3dd85c351a951981e26091516344c8279b5d5ff32ef350cb473520deee8a190b1d3d37babef1f6528baab0026b577c4c68bd2024c4798b13 SHA512 d653bc8c48d84a46634ed4c3fb711a80ace9b5e3b12c8ba05cc6d76e71978b98f85f28f1d4454b1960b1edf589dcebf1788c22451383a85a395c2f7e1cd0b526
-DIST khangman-20.04.1.tar.xz 7110768 BLAKE2B fc80f8cc757a678c44f04a36bc283072f5648c34b4a98008449aaefc1e63803741cdd1b2c0f655d87f7076b1221b0900ebd8f8dabf2ffe2d689cb23c72eca445 SHA512 f7bff33094c866e0d11c2c855f49f816dc99b0af0dbd09698a3b61c352379218eb1767c0ead252ed6b48c99e4f216d712203915c41a96a4fcc3d9795f557ce2f
 DIST khangman-20.04.2.tar.xz 7112988 BLAKE2B ecdea11926924f3953c3b3aa2fac7fff8a27bd245760c6452ae82a9aadd460f352fbaf756888e126542deb7b086901ab3a2ac277edb6b0cfb455ea2d37312735 SHA512 3bef4b5aaea2bb2a650fbc2093380d66971c90d6b75db7d421e08b5a0e5026da578f1832deb8a01c39a5f9ad4e0cb1cdace586639d2f5b1292500e132244dc80
diff --git a/kde-apps/khangman/khangman-20.04.1.ebuild b/kde-apps/khangman/khangman-20.04.1.ebuild
deleted file mode 100644
index eb0c027caf9b..000000000000
--- a/kde-apps/khangman/khangman-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Classical hangman game by KDE"
-HOMEPAGE="https://kde.org/applications/education/org.kde.khangman
-https://edu.kde.org/khangman/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkeduvocdocument-${PVCUT}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdeedu-data-${PVCUT}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-"
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index dd75d35e7041..8d7b850e28c9 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,3 +1,2 @@
 DIST khelpcenter-19.12.3.tar.xz 3845600 BLAKE2B cc7298588110184cbcf0379e1b5654c1c895c7b3c1b679a8a30e6d638336c28fffe237b54b7e017509a5e4f9bc137e40bc364c191732fca6acbb0e69b4daf782 SHA512 d8aef5f562a23a65f807218f5c7746afdd4f97e74de127bfd81037b5bba9d1024337082954752b33fd478896f462e565796ec567f32ebf0d006e2c73de3880c6
-DIST khelpcenter-20.04.1.tar.xz 3842560 BLAKE2B 891e4e4ece418cdf1a085ef58b16d1dce26246fca238cb0bd52c039d443be7ff74b610c7c5927826195a4938492385c4893c4cdc0c550266a2e01a829fc89d1e SHA512 84741f17a0e45629b0a2a10dae5193e0554a857883e00c098b28ccad1b868183f66ce50ec2ad8b2d68114288adb21a4ed3eea4fff389db2a88bbcb3823912b11
 DIST khelpcenter-20.04.2.tar.xz 3847336 BLAKE2B 31f2f58c5fa280366048c74bdd89d07a402ede0a80f371855b4cb13501c6a08ade95eac6eca59f4560a6c2fdff3b6203a9543ba088495ad07406d55bca95315d SHA512 0b7c62f1b7305fbf5ef03aa92f1a4d3ac9be50dc8c061f10613892dc54b380a2c916ec3ceeadf20563a0ae84afdaf1410c3630eeeefe4579921b648a75c60d1f
diff --git a/kde-apps/khelpcenter/khelpcenter-20.04.1.ebuild b/kde-apps/khelpcenter/khelpcenter-20.04.1.ebuild
deleted file mode 100644
index 5fe4e2862afb..000000000000
--- a/kde-apps/khelpcenter/khelpcenter-20.04.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.70.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Application to read documentation for KDE Plasma, Applications, Utilities"
-HOMEPAGE="https://kde.org/applications/system/org.kde.Help
-https://userbase.kde.org/KHelpCenter"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/grantlee:5
-	dev-libs/libxml2
-	dev-libs/xapian:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdoctools-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	sed -e "/^install.*kde4\/services/s/^/#DONT/" -i CMakeLists.txt || die
-}
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index c70140e620dc..a0ace2a9333a 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,3 +1,2 @@
 DIST kidentitymanagement-19.12.3.tar.xz 149756 BLAKE2B 6773e673578f1abfdad815ac5f435bd535bae15d397e166da6ae367e431ec88ae67dbf8771ad5d25768e3844952024448a510c9af8792c5ed70a1dd405dced7c SHA512 54bac6b4903d705112573a00c45a912fb532cfa2cbbe4c8766bd17cf652eff32bc329225cc61d3148771388852bc8b2533211bf6bc3b8ee44590d73d35e05599
-DIST kidentitymanagement-20.04.1.tar.xz 149224 BLAKE2B ab10693bba22681b92791a76fee4f827fa1186bb4256561a0fe08ceb4ea803d227bfeeb91280c10af36463a51db02d2b01bdbae8575aab4f04297a010bb741c9 SHA512 c5506c3efa3510358163c8be87383bd201f031ef7724c082d51ae85ae6e998c2bf2d8aaa6bf12a84b31723b2a735c1fe139cfd30aa03b2faf1eeacd655bc9f5e
 DIST kidentitymanagement-20.04.2.tar.xz 149572 BLAKE2B 0adc176bead88d8f9a3d5be0aeb5fa54bc89921fbd8fc2016cc37f78d5fc3511d4dea45982bd2f67cbe934664fb44c12e95a876398854ae0b79355844a91a4e2 SHA512 1854d541ade7781db60774d55fd0ef88820ed8cd097ef5adcfe6cce316dd14822f57a9321abfe412ba7c003f63fd55ce3515fe47b0375da342d0b7b96297f9a6
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-20.04.1.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-20.04.1.ebuild
deleted file mode 100644
index 0f7b2c69c96c..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-20.04.1.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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for managing identitites"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/kig/Manifest b/kde-apps/kig/Manifest
index f4ad07de6cf7..9c1b6e7972eb 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,3 +1,2 @@
 DIST kig-19.12.3.tar.xz 3500260 BLAKE2B 45ae92dae8927201f8a11f4c2087143e3301a4aef4d6e263644aab130957e5f98d334dc3ea65208783f587235fe217b4e03fa351232e469296b0c9e38b69430b SHA512 554b70c1ec7e62b52bdfb736cf17d685df68ffee00ebd4253e838f753e274c275a5df774f37240b2cb4778bfdc16b28c37f087772e61c82409397e92982e4109
-DIST kig-20.04.1.tar.xz 3500292 BLAKE2B e8728e371d4597866594f323abe47e98cbae68ab4683aaf73bd2d0c4400ef1c01c3c5195fc20b32cfbd1201875616ba9e0697a22b19adbcb1fb236c91cddc0f0 SHA512 a3801243c03a08ae8f012f00e42dbbf434e2572cfcf06e163402b304ded9073ac1bfacd524aec6d50b8049bf6d490c6d78e6839d6aaba8648be87bf406a57257
 DIST kig-20.04.2.tar.xz 3482912 BLAKE2B 298ccdaeebedd6647ffe6cb53269c90483481633ae5f476578c32a31bd893cf0bace60f28bd2381a3caeb5bc44d85c2197d3842516cccb46735b994d6e9893ed SHA512 54055ceae86d780b6be44b97cd56dfe252db5a8e3b9d9bdd66320a500fbec3769b79731260f2b5a40f5c6cd9deb8c26fa0e2cab5dbb9ccf0b7c0da19c4b31fa5
diff --git a/kde-apps/kig/kig-20.04.1.ebuild b/kde-apps/kig/kig-20.04.1.ebuild
deleted file mode 100644
index af8bcd2bb333..000000000000
--- a/kde-apps/kig/kig-20.04.1.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_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kig
-https://edu.kde.org/kig/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
-	scripting? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.48:=[python,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.12.0-boostpython.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake_use_find_package scripting BoostPython)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index b688fc41be99..dc16f6eed22a 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,3 +1,2 @@
 DIST kigo-19.12.3.tar.xz 5227780 BLAKE2B 59abba2676aa5e22f35521752e4e560c11880e981120b70767a5a7a9a1114f11a9187661a6c73458503249bc0008e9e1ec1408cb5e9fff622006c1c2f87945a7 SHA512 ebb8b7fd3da4b47c1a26642b894e57d174a0046fce7123cd222d1a527a2158cf1cca42a7e54ab029a11d2419f0c8cb69f3f8343fa07454593d293f7d84d252ce
-DIST kigo-20.04.1.tar.xz 5227080 BLAKE2B af0b7537eea0807ceda351361882d8e0b4b3a304ef0b39a36a215b0701ddb499241e34a9a18eeb127883dd8c6eee08c46b8c5f4ac04aafc5d411c9a2380ab40f SHA512 3e95cff3d4f16c453be8a44fc96573dfd495ddc381cf3dbba9e6f2b40e01a0a02f0324f70b1f347d6bfc469be3611860dc4fc31736643b56a69ceff39965e8bc
 DIST kigo-20.04.2.tar.xz 5227300 BLAKE2B 7e9485fe57d7c68aa33a3722a8a65afc92ecf99354fe1fd533f7961583345e2a73b38dca83b2b84d970b97d8eee14d3c805f48361174045f563faf88cce2bdc8 SHA512 f15d88a7cc4ff1644e3bd1da3217f983f005940d251934b1932f7f32378c4ec8bca33bab20c0e21185d7f36caa21fc46363008bc516a6df5bd3d931a962bdb79
diff --git a/kde-apps/kigo/kigo-20.04.1.ebuild b/kde-apps/kigo/kigo-20.04.1.ebuild
deleted file mode 100644
index 4fbbb70d1c5e..000000000000
--- a/kde-apps/kigo/kigo-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Go game by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kigo"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	games-board/gnugo
-"
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 97023be5bd23..ba40df7de151 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,3 +1,2 @@
 DIST killbots-19.12.3.tar.xz 1174028 BLAKE2B 73329c2beab0953bc61c5ee02365b2920a6aca69ee6f0f2a90ee586676c941f419a8147e5526a4d8a47c47c49d5aa36f9b3f3aef4b20f29819fab7f267b17c79 SHA512 7e5554f03f91210ceb25429bd6f4917100bcf9246db563058c31f10a2ed2cd5b095898320f742db021b2f8d3ee211a9271364544fbad1cdc3de9f39fd2827514
-DIST killbots-20.04.1.tar.xz 1173648 BLAKE2B c0b57365b8e04c281d6c33a1a07488d28b9c68f9710657b597cd3cb1dfea783751071075a00e3eccaf2476cc97f85b45cc7f068ceb6087a237d698dab32f8f88 SHA512 874387489c5744a26c2d40261f8cc8b6e06d12b18ecaf4956b37426b0dccddc9a71c58b9345e6d4e17f9aa396da8c5b09dc6d86117c46ee6dd3a369670aa4cba
 DIST killbots-20.04.2.tar.xz 1173688 BLAKE2B 3510fe4bad0dbb269f3fccb0834aac7407cf9ef8afc1fc0e879e773237a1e918bd6fa425a60288552c04143239a3bc300a00c28e222270e0e94881bb835f6435 SHA512 9ee56d3a71df17b75cf76bb8ce4ca27ce8877518bf86f94f3a5c7c9af21f5bc8afd8a3a056165d555caec9f281772685b3ebd8cab8759962dceb0223dc46a9d3
diff --git a/kde-apps/killbots/killbots-20.04.1.ebuild b/kde-apps/killbots/killbots-20.04.1.ebuild
deleted file mode 100644
index 36ba9d7d8bc1..000000000000
--- a/kde-apps/killbots/killbots-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Kill the bots or they kill you!"
-HOMEPAGE="https://kde.org/applications/games/org.kde.killbots"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index cd76bb1c328e..4b27d8671cb1 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,3 +1,2 @@
 DIST kimagemapeditor-19.12.3.tar.xz 1071416 BLAKE2B 8b32472b5f93fa534b4c62de3de2689016959f0dc33c8b0abf5c49fd3a68e5f20bff49cdd919eaac00e71c45cc7f2123724b90a0092d26b0dcf90d0edc7892fe SHA512 d284f07c83b02e2541c805b71495dd602916041becc709ea2a19d0031c54c44ff48f22c2d51b397b2863e94214be5055ef195b209078e8e2f9438e1c04cbeae1
-DIST kimagemapeditor-20.04.1.tar.xz 1071240 BLAKE2B 7589161869a1c72343959314e29fdb7b79ac760613bb8b707ec44b02cc1eac49b1f320b7c03fd07c987538883decad1713c925e6ff9b0807081cd431f3d2bab1 SHA512 f223954ba5e0a922cb288fd953d861850494b2714215a88c824f90ff27ed7edb96cf421815a48a61d359654b931c2bb393f40410c0e78b089c6c0eba74ed884f
 DIST kimagemapeditor-20.04.2.tar.xz 1071284 BLAKE2B 3e9e1c45265171f63136bda16179b1e8a53c60d4cd9c922bf085d07b8011b1ce9398a0497bf19558d4b931e0dbbaad9a45ce7da41afca3134e7d59bf7023db12 SHA512 4446a82583f34be311e4c350ee760e09282416c43f9b0a179824c8de3d2c207de2a0817fe1051fd43be135d18fbf9e78d8895a903980440f7c49d943d03d5763
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-20.04.1.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-20.04.1.ebuild
deleted file mode 100644
index a9596c819df2..000000000000
--- a/kde-apps/kimagemapeditor/kimagemapeditor-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Generator of HTML image maps"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kimagemapeditor"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 4773565e8813..9e07f6baf48a 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,3 +1,2 @@
 DIST kimap-19.12.3.tar.xz 120164 BLAKE2B 95cf0f1903441f27d43eeec1cdebe94cb93f8683cc40a29858ae64aaf82491b5b1b624aaaba3ccfe844871f57af68ce3d34323439f31255b9d7b3f9f3f0975e3 SHA512 08b49e089f78ace659f09fff9772629164dd391f25384979e09e96f781b9e224cfcc4818ce6643ea1edde1e2d64ae7343445d169ef76d042deba0b16765d083e
-DIST kimap-20.04.1.tar.xz 119700 BLAKE2B befba22f60388bf690017d18df38cfd704b1d0d49433a5874b4d8d3aeef9ed18fe5bd54141a4a27f76fd2edf5099257ba908b47e75eb1eeffeb73900d2a0de12 SHA512 ce7647a7d962994594d27dc431216282a918d0141669382189b5230010a026855149f576e74f0dcd6d80d31b1aeba12ec26d177cac43eaac7e171f0ad4787163
 DIST kimap-20.04.2.tar.xz 119744 BLAKE2B 7bc708f4fb87844e851a6cb027af062018504e682380383d4764be46ae92bbae2e12aa6771782f3a55d37eff8c66393648205ed8a9997112b98a6162d7b09380 SHA512 fc5bdb55f5090cf32cffa7b3992bfea5767f1d7244a45c546286d1c56691e6d68a4f8b9a1ae5bc5e721a1b1db228db4e163d3a226c2ab55a7828d0c76d7b165a
diff --git a/kde-apps/kimap/kimap-20.04.1.ebuild b/kde-apps/kimap/kimap-20.04.1.ebuild
deleted file mode 100644
index ae2459300d5a..000000000000
--- a/kde-apps/kimap/kimap-20.04.1.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.70.0
-QTMIN=5.12.3
-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 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cyrus-sasl
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-# TODO: Convince upstream not to install stuff with tests
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
-"
-
-src_test() {
-	# tests cannot be run in parallel #605586
-	local myctestargs=(
-		-j1
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index bdbd2b8455d4..2a0dd63ee91f 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,3 +1,2 @@
 DIST kio-extras-19.12.3.tar.xz 581020 BLAKE2B b4f9ca0812d535222c1a156ef2ce056df95dfab0786b108418fc98da860617c272ffaab044d0faf8559dee04d8bbc799da6eb004bea170c41a1b3bd30e91a40f SHA512 289d4336e563ee38be20f40c146172111ebeb3893edd15c76ad42435b8b1b0967864d8764519cd5c0aaa2580c56b76283076a3598917876b5e22acdf75ba9da7
-DIST kio-extras-20.04.1.tar.xz 617460 BLAKE2B 135414e66510471d57b5397655b4bcea765ce8265e5c02f4d2ddf833faeea2616aac61c936311e1867a34593ebde81c5465774302c050db25224b1a0dd824296 SHA512 1f057280046cff817c0fce57c6d25d7dbbf658da193f5a8f21c1f68157b686783bf41d8b5963fc3538f682c81fee928aae500517dc6fe26dc1a8a0d39efee00c
 DIST kio-extras-20.04.2.tar.xz 618236 BLAKE2B 9e42bd1dab0e7e2258cb5b68f7debfb1e4c8fa362a12ca2e8799b67dc54a47a91b5a0c9a9dd2885442145a10ddf00d7c19fddbc4fcd56300e11d1fcefdb53c13 SHA512 50c895f678ca4b8b7b60e1b7dd4821fc5e665159a0b48cf5d1fbccef8ef83ef129e08cb0792cf2d4b243ccff021269ed47b9bfa4c4f8628cfa424a06071e16a1
diff --git a/kde-apps/kio-extras/kio-extras-20.04.1-r1.ebuild b/kde-apps/kio-extras/kio-extras-20.04.1-r1.ebuild
deleted file mode 100644
index 6035d930bb7e..000000000000
--- a/kde-apps/kio-extras/kio-extras-20.04.1-r1.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="optional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://invent.kde.org/network/kio-extras"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
-
-BDEPEND="
-	man? ( dev-util/gperf )
-"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5[bzip2(+),lzma(+)]
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	activities? (
-		>=dev-qt/qtsql-${QTMIN}:5
-		>=kde-frameworks/kactivities-${KFMIN}:5
-		>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	)
-	mtp? ( >=media-libs/libmtp-1.1.16:= )
-	nfs? ( net-libs/libtirpc:= )
-	openexr? ( media-libs/openexr:= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	samba? (
-		net-fs/samba[client]
-		net-libs/kdsoap-ws-discovery-client
-	)
-	sftp? ( net-libs/libssh:=[sftp] )
-	taglib? ( >=media-libs/taglib-1.11.1 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kded-${KFMIN}:5
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package activities KF5ActivitiesStats)
-		$(cmake_use_find_package man Gperf)
-		$(cmake_use_find_package mtp Mtp)
-		$(cmake_use_find_package nfs TIRPC)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		$(cmake_use_find_package samba Samba)
-		$(cmake_use_find_package sftp libssh)
-		$(cmake_use_find_package taglib Taglib)
-		$(cmake_use_find_package X X11)
-	)
-	use samba && mycmakeargs+=(
-		-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kipi-plugins/Manifest b/kde-apps/kipi-plugins/Manifest
index 4449f7d040c0..35e07a9d0cb3 100644
--- a/kde-apps/kipi-plugins/Manifest
+++ b/kde-apps/kipi-plugins/Manifest
@@ -1,3 +1,2 @@
 DIST kipi-plugins-19.12.3.tar.xz 1637136 BLAKE2B b2bb97c152a093d070ccd2ab455cf41cb86ac656f3aba1b54615d5dab21fea79d6ef43435886f514cf3260e183f4c1777cb584c6627cf806c0ad931d416bd061 SHA512 1a641bdd3d4c792cd09ce256fdf62ad88f48b2d85c6e2debda2db47bdac0185ac7b9a7ef6ca531923d1988530a1791ec4fe8316031ce6fdc6bc4a77980e39b82
-DIST kipi-plugins-20.04.1.tar.xz 1642932 BLAKE2B cca9e365f5f2857bdc73c1afaa790d4a6d144c2a85080e49896e67c4bd663c7851d0b9e6eb1700969632472b1dddebc287c1135694ead299fdb56dc29715cda8 SHA512 7afeeef2fc6b3d75e9c3208345eb97c8be53e018d005265de594b8575afeb2820df55e23706abdaf3f29052d8f6301b3b89826dd42f1a20243d200e79d3e0d8c
 DIST kipi-plugins-20.04.2.tar.xz 1643080 BLAKE2B 12a104e4f16708bd37baf39bf25a851f80d7510c7ca9f6d5b8533e1f094f15f0480574efff29894b2bcd9c3d64e18a12692b0b64b7dca44f984322269b812188 SHA512 ff16276beffbfca4407166c355f95203473df1a74687f72171754b8658f91eab5c84736e1943c991bef05bf0b708132ba8fe85c10822a04a484e0baf2e999055
diff --git a/kde-apps/kipi-plugins/kipi-plugins-20.04.1.ebuild b/kde-apps/kipi-plugins/kipi-plugins-20.04.1.ebuild
deleted file mode 100644
index c88db0223daf..000000000000
--- a/kde-apps/kipi-plugins/kipi-plugins-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="https://userbase.kde.org/KIPI https://invent.kde.org/graphics/kipi-plugins"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="flashexport mediawiki +remotestorage vkontakte"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="
-	>=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/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkipi-${PVCUT}:5=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	flashexport? ( >=kde-frameworks/karchive-${KFMIN}:5 )
-	mediawiki? ( net-libs/libmediawiki:5 )
-	remotestorage? ( >=kde-frameworks/kio-${KFMIN}:5 )
-	vkontakte? ( net-libs/libkvkontakte:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package flashexport KF5Archive)
-		$(cmake_use_find_package mediawiki KF5MediaWiki)
-		$(cmake_use_find_package remotestorage KF5KIO)
-		$(cmake_use_find_package vkontakte KF5Vkontakte)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 55fbf58d81cd..1c6b93076687 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,3 +1,2 @@
 DIST kiriki-19.12.3.tar.xz 373160 BLAKE2B b627c798b552151094135b3acc9a90d407b8a582d9883ad958dd899cfc36960648b0dcfdfe5a7110af20e3740e715458ff30186cdbe13c1652e97ba4fe90b90e SHA512 1f225e0761b4e57141731ba7ae093fcc74f0c435fcf7f812c713652fd47115f93e89a3b6275509a8d90de3abf8755c9c3078b7f4510724420921c207a84f0ece
-DIST kiriki-20.04.1.tar.xz 373420 BLAKE2B da5c66c5c9756f7f599e926745a27884d359c2b31db8293aab98399f1329ec3cfa4159705821d6da6d089d0df654e740a55a6fc666595764ef07c8d538a9c764 SHA512 8a7f94b0dedfcfd30a3697afcf7dec763252b21d1e61097d6170ad1e9b1216216eebc6dc547e4f65aadb33cde6e2009d20992a6e40799502e02646f6c27412f1
 DIST kiriki-20.04.2.tar.xz 373500 BLAKE2B 5e8e1a8d60ab754a0468cb826f185d0b4a23a0b49eafaf06afee2abd1d1bc9cf09adba72db35d485c64c603ca49800156e27f9edec8580962284857c3091440e SHA512 212afd8007464f476a3960190f5a5ca08d915b0bdd45148e5b5fe4830d92f8836e1f3ae808324f681cc9add98c25073a30624f875ead28a0c5d0a06808d36b99
diff --git a/kde-apps/kiriki/kiriki-20.04.1.ebuild b/kde-apps/kiriki/kiriki-20.04.1.ebuild
deleted file mode 100644
index 02d05f231d50..000000000000
--- a/kde-apps/kiriki/kiriki-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="An addictive and fun dice game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kiriki
-https://games.kde.org/game.php?game=kiriki"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index 1a6d4065f5d2..a1aba1bbcbd9 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,3 +1,2 @@
 DIST kiten-19.12.3.tar.xz 11288156 BLAKE2B 0a7b1ac0b8cb1c7afa6d3daaf5402367eb8a00bdf1663422e042613f67c8e66ca6804658fe9a4661af2872fd63550a9db16009e8d6e2f34ac5b62852b4fa2897 SHA512 74481a65c0823d2da598544fef6b5a8b7c5788adaf8804af29a0d4092767e67ff788a0a294f910ea63bc1ee7ceedb3ccf25fe8e929cc453e5ee85307fe851526
-DIST kiten-20.04.1.tar.xz 11282712 BLAKE2B a38f4d1395db354465b4196e45c51f849c06a96a21fe3b6e934e3f51877bc0f97e13c6c16e9afc5e38e1b3627f23644b04b7c28be024b923984255a3af69b29e SHA512 e78697baeb88fcee9abe3c0b27336786cf28ede45c39c943817c41d51d7c8e66137834429fafafa8a9523cb63b0cfe754f9ceedcfea924287b479cd1a366c14c
 DIST kiten-20.04.2.tar.xz 11286976 BLAKE2B c53f2024aa62542edaf7ddc67e1c5301f8aaa6ca62715d598ee322fd34535c61bc0e5e2d92fe265d78789225d439818a131991d1aa5782bf999ff27504a0443b SHA512 dfe8c3ae54dd2534a5f0f9183ec9f1c0757319922699e6b8c3d3482dd4aef292aca5b5b82fa122745fa7e3f91e41b039b7dafc6276ed9f7e07156b800187e6f6
diff --git a/kde-apps/kiten/kiten-20.04.1.ebuild b/kde-apps/kiten/kiten-20.04.1.ebuild
deleted file mode 100644
index 3c4bd335482a..000000000000
--- a/kde-apps/kiten/kiten-20.04.1.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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Japanese dictionary and reference"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kiten
-https://edu.kde.org/kiten/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}: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/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	media-fonts/kanjistrokeorders
-"
-
-src_prepare() {
-	ecm_src_prepare
-	cmake_comment_add_subdirectory data/font
-}
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index cd7cd8509e62..265ff58763ec 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,3 +1,2 @@
 DIST kitinerary-19.12.3.tar.xz 1179152 BLAKE2B 628242b1dc7a5f4f4ac4140e5cd6174a19fc0e03dbbb0d3fe41a4530b8b2af7ea96ca8900d858be04e0bc5c98918ff680d694a3692135fe0aa96dc9281317748 SHA512 3c546d5154eccbbb46a7d21787c12cadd282b46bddf11d773857f34e03b221fc70ac6e7a630dc143e31e25deedbda1fb66088c9a0b461a54ae960b1019082917
-DIST kitinerary-20.04.1.tar.xz 1279460 BLAKE2B 289565020e74dbdd5d767e90126a48c6044b42537ba8a1db85a779295cf36060e5bafe339ab22a08b531c239c4dbcaf9280d7262bb9cee00b7bc97b7551c33a5 SHA512 73e272e9502637f003be247ac44a4109d3278b3894fbe683028bbd9bd4ba1890d8b9e9113b6f755a71f79c98a26f0bb216b806d4b169ad548efe352504648fec
 DIST kitinerary-20.04.2.tar.xz 1282012 BLAKE2B 0f478a07afb003538013c583caaa33efbe26c763c87ab4648dd59c7e823444aaae8d8884ba3692b9706c03bdaf8f0671c61f5b63e0ff24c7c223e5bd444d9e6b SHA512 e3d2ee23e6d139d2606c19488cb99dfb0a7598329f8f32f1d1979e4100db3850b62400d3c487db3e61fe8d725094641435aa7493eb4dfc216887809dfc4a0eae
diff --git a/kde-apps/kitinerary/kitinerary-20.04.1.ebuild b/kde-apps/kitinerary/kitinerary-20.04.1.ebuild
deleted file mode 100644
index e64edff8102f..000000000000
--- a/kde-apps/kitinerary/kitinerary-20.04.1.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_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+barcode pdf"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	sys-libs/zlib
-	barcode? ( media-libs/zxing-cpp )
-	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/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index 62801ea25026..113c4d99dcb8 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,3 +1,2 @@
 DIST kjumpingcube-19.12.3.tar.xz 288924 BLAKE2B 1e00f13657b43b8ebb5f5ef24ec4512dabc3b811d24160829edbf97cc219b012ae3fd5120c0c9f98b6215f71199f7986af123169fba3ad817fca2818df82f763 SHA512 e2ca3330a6775393f7512b17ae3072b6586109450ae07689bcb4db00bc90c77e0d2c53406cfef766aabacae04a2c3d3fc989b382e8b45cf0daf22fd8a3a8f5ca
-DIST kjumpingcube-20.04.1.tar.xz 288992 BLAKE2B 4db8e38053949906fd59d2e0c5f6804a5f010b0c1c501ef53b9c0ef729d4719f9b01a408242ad11d74b3c8c94f15bf3c473c889fed20de480a829fda550ec889 SHA512 8e39aae54ee2387bf2d733b09a833a9009e8d9ee3bd32c5da8414560dd08fc598ca31275893059cf0e0fae3a218d2688d522bd179d0dead17bea374dee8df983
 DIST kjumpingcube-20.04.2.tar.xz 289000 BLAKE2B fab6dde64b6b49d90689c420934ab951a7a362e94bfd824546ccd415bfecc686cf74bd8d37025d72c109a1e5d01f0d88eb432eb21992a2345548897fe65b7d65 SHA512 ca38c7508518be4c6c6e155a092ce282fd563614d2c539c75266e7330577262a05014bbe392232b038c9d77cca7bc6979eb9dbfc4badcf576c7962a1b4273749
diff --git a/kde-apps/kjumpingcube/kjumpingcube-20.04.1.ebuild b/kde-apps/kjumpingcube/kjumpingcube-20.04.1.ebuild
deleted file mode 100644
index 3434ce5d9ec0..000000000000
--- a/kde-apps/kjumpingcube/kjumpingcube-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tactical one or two player game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kjumpingcube
-https://games.kde.org/game.php?game=kjumpingcube"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index b4e9d3021be0..111cd2354d28 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,3 +1,2 @@
 DIST kldap-19.12.3.tar.xz 155404 BLAKE2B 978e693f19f0ff0258d963d758d18ea865d76b552a7f6fb10afeaec409f558fbc5f459447c491f226891351cf254cb081091dbd8ee4644dd1a70013fa024af86 SHA512 5c0446d31c34d018910f50d0edc947400798a33af3a41b77989dd80f8657b13f71472aa3a2eafd5d51c703f7e72a76a6279bb9c93b1cdc4fc7dc8c676ef17435
-DIST kldap-20.04.1.tar.xz 148996 BLAKE2B a5fc3d3bebef69c326001288a3500ae8261c20155887ee50bb03c422e91e4ef2d4c37bfac33e870ed62e560efa39fb112b2e138c8acbae7f2cd9f8ac8511838c SHA512 d56e63815128606d539ed6cad3e25e05f7636df9f31cf019f792025acbb72ac66d05714497196f8e81641a26c24a4942011efc399113d6ae4b8d55f45f242ad1
 DIST kldap-20.04.2.tar.xz 149168 BLAKE2B c7c763ea761426c38c02129385652609cbf1c1966da961eb63abda7edd5eaab5f4e8c826c5dcee9c98af5f0782952a657b7e4a1f57eea421d8935a74b46e7fd2 SHA512 df8450abe6a3f735e0b5accfe4a520f9e5db0df149b4fbd6c1ef78c9938bbb2a5a0625f8e3250fc467928931b6928516547a07e02c89abeef9a5b3677a38ce09
diff --git a/kde-apps/kldap/kldap-20.04.1.ebuild b/kde-apps/kldap/kldap-20.04.1.ebuild
deleted file mode 100644
index ed3d2dead7e1..000000000000
--- a/kde-apps/kldap/kldap-20.04.1.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_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.12.3
-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 ~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/kwidgetsaddons-${KFMIN}:5
-	net-nds/openldap
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 934e26f246ed..6b9fa86ab453 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,3 +1,2 @@
 DIST kleopatra-19.12.3.tar.xz 1930628 BLAKE2B 41c4116868f91760c54a5abbd85f8746cc1b046a25ff5745d0d657c49db8767fca784acd535505d00c1ec0f3aff1c29390e9149587d418953ef01471cd934f1c SHA512 e217a7a05d4ab22ba520c02a3a09abbcf3711de1ad2f42c79f3d375580fafbc3aa33a3cab05a5b6c201fb11c0b0b92a655a9566043dd0c400acbe3ead913f85a
-DIST kleopatra-20.04.1.tar.xz 1935748 BLAKE2B 463854b3a22db23abbd0503504ad0baaaa91e5baf8269a42cdc231831bc53d03013bb20980208e7fe20765248098b9b64e08a634405ef92bc0c6f510d4699bb2 SHA512 6d2e3033bb9a507287787278f65598d74603ab31a11dfb581fd5f1abedfa8ab1d48fd2973290e1283ba187cd03a89bd30578e202cffb466d2122504ef4bc5f6f
 DIST kleopatra-20.04.2.tar.xz 1935748 BLAKE2B be4802965cfadcc63f6378e5419b8f9ce08cabb647f2f22fd9e3d33872943c82f9892f52e70d3d360ecd80be777f2f6ff7ca2c7aaa4d9285b83277fa815a40ef SHA512 3dc7367469ec590f4aa63bd1a16e26415058cb67c97f5991e88baff0669ef726fdd3d8fa06fa7358210a4e9103337f8ce527b279e14eb2241a80d67d149b994b
diff --git a/kde-apps/kleopatra/kleopatra-20.04.1.ebuild b/kde-apps/kleopatra/kleopatra-20.04.1.ebuild
deleted file mode 100644
index 0e3fea9813d4..000000000000
--- a/kde-apps/kleopatra/kleopatra-20.04.1.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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kleopatra"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/klettres/Manifest b/kde-apps/klettres/Manifest
index d54219e03836..22bce672d2d6 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,3 +1,2 @@
 DIST klettres-19.12.3.tar.xz 40140252 BLAKE2B ab672113fd89f3e868b8de27ddf1d5307eb2e4f42e2274fac7dcee45c1b61f49588ee4256d1a77afff789965e3b8c337314f54a36bcc075461e5f7d7e23913d8 SHA512 1b26f5d4e3424e3870f8165736d21abcbf22cddd6d122cff8c0fa4fade58d1345052bfb4bd14bc8215bcd62fa490b92945f0c25b147fdd7facbabcb33e7cf8f3
-DIST klettres-20.04.1.tar.xz 40137668 BLAKE2B f093d22d932910a1dabfd2015ed8959a80d56572f1e49f991094bd4cb8660d5cf6b5504df7bd6ca02f21089bdd7da22ed919429bf76b094937d0cbaf500dcc56 SHA512 c155eb7aece8dacf95f478d0214bdf1530fe053f1cc00c9be995cf2cda12ef442ab3c3f86a50b4f8ff49dcee863254200b2ac2d87980abdfe47db234158ae04c
 DIST klettres-20.04.2.tar.xz 46842972 BLAKE2B 5248fc9785a0a35e4ff6e8407e80c5c2d11bfcfdc4072883ea596cd01eaad6f2b7e995c9896e90e0cb69c62728316d1bed42a6b69622248111406c650d3275d9 SHA512 d51841e81c6fe0acc00d3e947c438864efdc415b9c5e739af1788e146162f34b8da5f49229c9c72c0bdb2edc6d96261e979daf7ea43da3f2774bd6a67511138e
diff --git a/kde-apps/klettres/klettres-20.04.1.ebuild b/kde-apps/klettres/klettres-20.04.1.ebuild
deleted file mode 100644
index 759a408e66b7..000000000000
--- a/kde-apps/klettres/klettres-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Alphabet learning application"
-HOMEPAGE="https://kde.org/applications/education/org.kde.klettres
-https://edu.kde.org/klettres/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=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/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index 1613b83cf564..fdc2fc897418 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,3 +1,2 @@
 DIST klickety-19.12.3.tar.xz 1390092 BLAKE2B f6bcab262b39649e50907e524d773996f630cffbb9810f18ad420a4e971d95b6de2ca957637630d00667887021cae757220920e25043aee8675281cf464295dc SHA512 d1b4f59e3fd4ebaaf5f36fc4f3e4f7385fdc126df9fb3e1cb38104ed886a447995fed3e286c3e706318affcbb3572f41ea118d5b7a08afab6c571b6fa04110b0
-DIST klickety-20.04.1.tar.xz 1390580 BLAKE2B 371993df2503d8617982af6093424a6e49060d70ef1ed1afae1eebc1918100552a540d24536ebd875095b99efc94f36815788a114e26d27c28f3e4ff936855dd SHA512 8a409f3ad658245a9967fb43ad1b63ee960ca63c3a0b168516c82fc6990918091bb4a141ac94cc2c0300ee7a4cc6f5e29495d7dea655aa2a638cbf8aa69a53c3
 DIST klickety-20.04.2.tar.xz 1390764 BLAKE2B ea926eb7da4286e8051f1c373cd0493a70b42b5fe6b2467a682a66224ccd5afb75fab8a8a1dd9a7d8c8ca79aadf0a58e7befdcafc7a914ac568fb385539fa2f1 SHA512 21a7b864cfbc44593e8e8320a538c3b194311a4ff236c52bbc8c3243a0a9620bae566db59b57dffd19d5f6b0f916ea4baa955da79b7f59f244d4618d19fefba2
diff --git a/kde-apps/klickety/klickety-20.04.1.ebuild b/kde-apps/klickety/klickety-20.04.1.ebuild
deleted file mode 100644
index 010364f938cc..000000000000
--- a/kde-apps/klickety/klickety-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="An adaptation of the Clickomania game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.klickety
-https://games.kde.org/game.php?game=klickety"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index e42871116fc2..8afc6613329e 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,3 +1,2 @@
 DIST klines-19.12.3.tar.xz 1781784 BLAKE2B 542526af35eca6b9e771b67e0a28eb1c54b0a85b3a0b2475b69e8ba4eb7eed9df296cb4cd658a442cfb786ac1c1f1a4b95bfa4ce1660a70b5410de687673503c SHA512 2e272cbdffa530cefffa74726a46cc937b5d09307b69e98477a07d1eb61889d5b280a72a0ef129fb192733b284f86fe1e86f7128f15ca2f79f320633b4f7bcbf
-DIST klines-20.04.1.tar.xz 1782048 BLAKE2B 38d04dd4833a5de66d8e9d3fd24c4f8cb3bb90bbfc69dcf3ccdb72353843b9ffb20289db1ae9578d4435c674def6014720c8e68c009c44bc54e51bf22695ec8a SHA512 fd286956ca383b55a366782f2550eac67776a1e4a329dc64e65bc122145e9f88e009efabe5a3c34b7f23b8f220375feb8a0d8a3596a3b65c02c68f9706aefefb
 DIST klines-20.04.2.tar.xz 1782400 BLAKE2B b6fa0a4ca6ee0d8a8b1ac4d4cb3c9683498341d864aa10a53ccf55862c347ac54f67c862920796343b6bc5d38a1939f9ac842493414c4477358f0745175f2683 SHA512 e6b2065daed386548d49883cea637396204539efebe291bd1fd3e3bc5fb990d7a2c5085f394782302bd3b82b9ec333e4735389807f96745270104a2e1db36c76
diff --git a/kde-apps/klines/klines-20.04.1.ebuild b/kde-apps/klines/klines-20.04.1.ebuild
deleted file mode 100644
index 82ed96e9ff2e..000000000000
--- a/kde-apps/klines/klines-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="A little KDE game about balls and how to get rid of them"
-HOMEPAGE="https://kde.org/applications/games/org.kde.klines
-https://games.kde.org/game.php?game=klines"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 7edab58f6437..923548d0aa70 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,3 +1,2 @@
 DIST kmag-19.12.3.tar.xz 674316 BLAKE2B 1064c7657ea92400d79bf92e9c5579f87facfc254509a904d33ed0de512d595c5b4294d835437c918076165ba2bd612eb65bd98f9dcab6b96e030a7f6bf4896e SHA512 6f3dc983be2efe249e77b30429d4fb01f7b9c28552c56db27c1906de0312f1071658b9bc5fa9c5b5de35df54d7d50e9f1f540eec13cb40255b1ea9441db5afe3
-DIST kmag-20.04.1.tar.xz 674652 BLAKE2B 1d2820b94d2eaddfe1f281e2867e9e9108bf86c7a57e3b41f0dd5671540fda7517e2e3c87a2fe93a9949c8ba93b746241b542eea279685ba84bee0b39365b061 SHA512 ab1eb2c157a8d9d997f2b6cc6ffb865a66a7048d134774da087801075ea95ffab6d7359e1d2d7cf0eb20ab7645ffee1b5d562b8960dc1c4fc68dc096fa763c2a
 DIST kmag-20.04.2.tar.xz 674500 BLAKE2B dbba03bea3e8e608cb0e964b35c2cd20f5c7791c705db99b9fdc84920a16ae0b84d0a586d30f86dd7c79f24b81c62fe541fe66bad3eae662ff37ce5dd09ac5ed SHA512 e1ea0637b793989ae8733974de51f754483e21539e37e61f787bade8166f420878b4fe120b1d92fed87f66983866bb52704e495a02344150188ce05bb9bcfd4a
diff --git a/kde-apps/kmag/kmag-20.04.1.ebuild b/kde-apps/kmag/kmag-20.04.1.ebuild
deleted file mode 100644
index b89a0cc27173..000000000000
--- a/kde-apps/kmag/kmag-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE screen magnifier"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kmag"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="keyboardfocus"
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package keyboardfocus QAccessibilityClient)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 8fc6eca499e2..b454421c5527 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,3 +1,2 @@
 DIST kmahjongg-19.12.3.tar.xz 3427012 BLAKE2B ba064105dae1ad2da683508d280feb060a7a94f9b762f0631516ee957dcf833d0dd8d662edf4f584c8062962ef314ca34307ec09d136ecd32a0434da9a824e2d SHA512 5f62a61b221ff6059a95c781a04364e60023bcf3a450648b9cb831f29d545973d171422d9f26c2ea6a6765bbdbdeb78ce9f60f412c7d1e2564d91d285bfb77c5
-DIST kmahjongg-20.04.1.tar.xz 3427948 BLAKE2B a22495f6cbf8a5ccef4219d05cd12b2bda449ed2d9df06fb5bb9630152957a1904fcf9420b2e21143ee22c4c0604e0803645389bad7a464ab95707ba28a934dc SHA512 75123ccc80091f93126753ca748464bb939c1209655604fcf0f37be3e5f9f100a993c337671deab56851aadc00afc12a8f9508bcefe10908573216b432896782
 DIST kmahjongg-20.04.2.tar.xz 3428040 BLAKE2B be87e4278c48a778e764852bd7fc94b8db8d8635f2ddaa4aeb888def8f4b1b7a90b798e1e9e93cab7b7fc92d9b98994aae30a035155a145dd7c73ffb65827a44 SHA512 017fe9d1224e5e3a153efb2a76262959c16cdc05842cb28f8a22e2bccf30e6f1fb86d9a0c058ed7dbb62e627cba656df012087fc2f874091241a467d882ddf99
diff --git a/kde-apps/kmahjongg/kmahjongg-20.04.1.ebuild b/kde-apps/kmahjongg/kmahjongg-20.04.1.ebuild
deleted file mode 100644
index 555a602bed4f..000000000000
--- a/kde-apps/kmahjongg/kmahjongg-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="A tile matching game for one or two players"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kmahjongg
-https://games.kde.org/game.php?game=kmahjongg"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-apps/libkmahjongg-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 5099a7c26474..cde46bb327fc 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,3 +1,2 @@
 DIST kmail-account-wizard-19.12.3.tar.xz 158392 BLAKE2B 0d7bbe070ecf50665915c3e353eb7c0bda7208989f5702a8ac11d1419e471568db62491bf335f468798665d8fff99166f5cb716527caf35adce2089f28f0f02b SHA512 07bbf4f935c411cf1a7b25654af2b2123d763b0136880a814a310e689ad7ea508f6b943743980ce3bff339c56f9157c35368ff77401ca7b6b50ce1409286b216
-DIST kmail-account-wizard-20.04.1.tar.xz 158288 BLAKE2B 3273d5e37a2bcf0f5f687777f51b6dcf08fa569739af722f3956ef0e475804f3b55b4773b7b4d28ee31a26e51d97f9f653e3c78942073f7024d145e9d010a16a SHA512 c3c7b74668544ef7e47524ca61f273abdf8a4ba8168bc4903a22d56e5174eb1ae0dbaffcfcf5763371b2d70ef51f59e98698d716629dbfc28fe60302158bb09d
 DIST kmail-account-wizard-20.04.2.tar.xz 158268 BLAKE2B 3fb06a6fa649e62026cbae16572b33f8b6c107b587a7e3c6854fb05421e9612d000c726fabf83bb27b20c458156d7dae72347a1195719bee7a0aa0daa057f053 SHA512 bffe8d51766c305d3884020c602f0708c800686f994c7a1a4d6dd3433865d51772ec0ee78043864f8db97763ac22b26339f4623c65dd82bb2ce18867c7a3e5b0
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.1.ebuild
deleted file mode 100644
index 080954f51256..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.1.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.70.0
-QTMIN=5.12.3
-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 ~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/Manifest b/kde-apps/kmail/Manifest
index 0552b9e00071..c7b4d1389135 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,3 +1,2 @@
 DIST kmail-19.12.3.tar.xz 4711336 BLAKE2B 781c12d9f6e3ef975aad9915e006b0a9bed465c3da26d48c733636179b12c062d9446660bb3fe3283a31632d67b4841626c2b7d046b8ba50309fc3466d40f874 SHA512 274c2675da6ddf97732dfe0c2b7f9daff1df88735711291f52ee3d359c07ad349686b498909a358c4a091aa70bd7dc77d239536f9757093979bebc9328dc7601
-DIST kmail-20.04.1.tar.xz 4721272 BLAKE2B 081c1222eb1e57881483db13de4bfdc857cc9c525502476f89e6af6422fc923257c40f77bc343b35822b09d7b88d7cc8980df7dd9cf52b277cebfaa7802dc937 SHA512 2babbdec5b4c825aaad8d1f8e31797cdaeb8cacd366bd450c608ccc2cc004c074e417935e6312ae1afe6c447786217e673d6a026cc361c34cefafeebc6b2d602
 DIST kmail-20.04.2.tar.xz 4721788 BLAKE2B c889b86890a6dc39759ff1050f3009b2076ac649c43412e7f6226f6b49156c327377f742865e1f37bdef52e0122a43def674020ed8e529e2f2ee042afe6389d7 SHA512 96d510b12fb1806f878261571ffac03193d67b2707b9d4195ab278bdf96f81a60d07e0c35ef431ecb939425d72ecf5a4154a3acb609f02461fcc4020411ea368
diff --git a/kde-apps/kmail/kmail-20.04.1.ebuild b/kde-apps/kmail/kmail-20.04.1.ebuild
deleted file mode 100644
index e878dbb06887..000000000000
--- a/kde-apps/kmail/kmail-20.04.1.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_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://kde.org/applications/office/org.kde.kmail2
-https://kontact.kde.org/components/kmail.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="telemetry"
-
-# drop qtcore subslot operator when QT_MINIMAL >= 5.14.0
-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/kdepim-apps-libs-${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
-
-	if ! use handbook; then
-		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	pkg_is_installed() {
-		echo "${1} ($(has_version ${1} || echo "not ")installed)"
-	}
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "KMail supports the following runtime dependencies:"
-		elog "  Virus detection:"
-		elog "    $(pkg_is_installed app-antivirus/clamav)"
-		elog "  Spam filtering:"
-		elog "    $(pkg_is_installed mail-filter/bogofilter)"
-		elog "    $(pkg_is_installed mail-filter/spamassassin)"
-		elog "  Fancy e-mail headers and various useful plugins:"
-		elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
-		elog "  Crypto config and certificate details GUI:"
-		elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
-	fi
-}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 07d9e0785020..ac901fb02031 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,3 +1,2 @@
 DIST kmailtransport-19.12.3.tar.xz 166316 BLAKE2B 641837844bd1dac12540ff90f52f8f8242569a5bf8e2ed7f54cf7b57b8cada2215c0fadb768ebfbf40a305fd92d36c02750454a9b5f33c269a19b8d3b332c911 SHA512 2dde87d833fc693f6cd58b010e86eaa68d66123be9b4eb2d42230b965be8409196d4fb25287fc7ad2f11b66e9fd00bd4e781ccbc21a3b8194e2b3d3331ef1c11
-DIST kmailtransport-20.04.1.tar.xz 166368 BLAKE2B e05ea86b1f05521f05ca982a8eda0af783aa16c27784c4f1c8f6c7d07a0f03310118f0afd5d969f330d03a7750cbf6f2d1543f028a4d7ec27830caf64ed40c9b SHA512 80c2208e187949c3521281897cc24d4b3ad92e5551639a15776a2539860af44d9937cbb897e0bae1480b5863c2cae1b6462253d114a775693a4401fbe703770e
 DIST kmailtransport-20.04.2.tar.xz 166336 BLAKE2B 06a7f86a8b0712a32d814d20e9f3841930d8a3868f67b86dd35e86489d51b09909b1f50362f8f63a18cb998b0eada9ac4faf25a1383d670769cb871558c69642 SHA512 c20b65d9990634d6b0da8f542cfb252bd55357a23460daea9f784b99493d2d61f9511aec26ffbb963bd30577d57228fc8c6fa2bea39dc2a94b2be5cbb21f7a61
diff --git a/kde-apps/kmailtransport/kmailtransport-20.04.1.ebuild b/kde-apps/kmailtransport/kmailtransport-20.04.1.ebuild
deleted file mode 100644
index 2f0ff62ee01c..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Mail transport service"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 74859560745f..3824409942bb 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,3 +1,2 @@
 DIST kmbox-19.12.3.tar.xz 24708 BLAKE2B 279d15a403c6c51f6ac035e073297fde68bc0cd470afe2f91f90b3541b2ac78d68318837a4fa52e69b5933b19d4b06a40a1cb0ddf0707fb74bbe97c3feb32d9a SHA512 73ddbac34608b761d28638eec782f6a76642c39255c21d1795540a8cbab2e776c6641a5f87a27108f90657c4a7fdb9ad9d143a84800e2e134dfe43c2509fa400
-DIST kmbox-20.04.1.tar.xz 24680 BLAKE2B 666b5f01ceb6d2f803fb2e23f2ba62fbdd827aad350053cbe5dd91a56b80aba235bbce9d3cc935d3bbc0fa4d2735531074997997633134bc325717dd6d553227 SHA512 dacd7d9b5d2dfd3001786fb490ec26fc6ee29ed5c2ca048022d5922bbc686f7b0bb8ec7b5ec5d86f89ab377e6c1cf34b13a9be088047750a3c734f1e83b1b3ce
 DIST kmbox-20.04.2.tar.xz 24684 BLAKE2B 7ccbbb1c41ce52cc286a0a4a37dab6d0d04a38dd091d50fda2bad948cb02a558dc9035992aed4c5b6023a0d35b0a69a54e154ccb58f3c8eb98e4cfe9dde38603 SHA512 918ceae7e21dd621856ae772771bd939c4c949f8ea85c8c86a489f43cd228aef8e8d160a5df5cbb5ae1752cc666a1c1b4a315f224a830aeaf5a16b7a6ff25172
diff --git a/kde-apps/kmbox/kmbox-20.04.1.ebuild b/kde-apps/kmbox/kmbox-20.04.1.ebuild
deleted file mode 100644
index 68363a4586b4..000000000000
--- a/kde-apps/kmbox/kmbox-20.04.1.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 ~x86"
-IUSE=""
-
-DEPEND=">=kde-apps/kmime-${PVCUT}:5"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 6343e099fecc..858de083d51f 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,3 +1,2 @@
 DIST kmime-19.12.3.tar.xz 147372 BLAKE2B 95a9ae3bf3444738709685fc6d29f17851abb223ed689e84b87f7344154bbf98a75d140d62710fe1f7db2270bba21a3148d16fd85bff87eea239090931e3625d SHA512 ff150d983432cf8fff336f5dc24e02b798a26d51f0fb86ded1a04899bde529c1fde11f46202961b88f357aa311819fc876de5500f0d4cc29b43e28d048c15cb5
-DIST kmime-20.04.1.tar.xz 147916 BLAKE2B 808751fbab7946e2f8e455d7871a956eb621648c45be7084fd08fa0d7b885a7a3b0ec67bf907fad331e31c965a5006b589655a7686b95b90657c627b041f7f0a SHA512 abc21cb63d379bffc3cb3d52e74eca37d576f390e57098a2fe9f00777289099f02f47f0e542562105fefe7bfefb4da4f772352baa1f0b74be81c9d9d1b76adac
 DIST kmime-20.04.2.tar.xz 148596 BLAKE2B 4ed6082f32f8604d0fcb9fc294519cdd793f8614621ed406a84c9cb7aae20482c305daa274dd7ba5206713b0a9d853730e6979e0499e82436cd1fd4fc8b92da2 SHA512 976262d2852ac54267fd66e463c6d56985fdcd7fb6ffbc691c000a7189ceb213c32b786b752b9af03b3b35a3bc76c8129b8180b3ff5f7bc5837eeb2e4ac15922
diff --git a/kde-apps/kmime/kmime-20.04.1.ebuild b/kde-apps/kmime/kmime-20.04.1.ebuild
deleted file mode 100644
index a32e1d886ac9..000000000000
--- a/kde-apps/kmime/kmime-20.04.1.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.70.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/kmines/Manifest b/kde-apps/kmines/Manifest
index 32201234f996..e8596af61ff1 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,3 +1,2 @@
 DIST kmines-19.12.3.tar.xz 898148 BLAKE2B 3420c2966de498cdac23e9fa9c121112bc4a6eb252a7aaff51083048144bd85dfa31f838e7dfbb832ea8e84b58a8299a854cb548e18069dd3174566d23858d55 SHA512 a0ab3ea04071887d6778caa846ecdd6bfbd16b54d1da8e4629bfe446261a7adfe0366255f8ff96364722db50b5a7fffd838537e6e4947bee7ab38c60bb39871b
-DIST kmines-20.04.1.tar.xz 899972 BLAKE2B 062726667cce77927e381e966f6cd20609b292d8b5012aeeb2b2d181e519900f560b7649488028a11cc931faa0a29553a1b72ef6329e307a3d6e568176925915 SHA512 00756285fb2810bd02e1f3ab41a122a537e1c7de10641af5265149460be61f87375efeed3f623382368e343e61abbbdb20b6769ba755fb2eb6780531815e7084
 DIST kmines-20.04.2.tar.xz 899980 BLAKE2B 6b7e913f2bf8557be4443c398ca32fe6e2593dbefd72f18240fe8e8446bfe963337625669337d7e139f7a844b1b177c53501c19a3253fa9b3d8100b0f5f1d263 SHA512 be1ad8fa06f39d459d50ca07da623655e026b63c841d2096217a56d6fd5ba3f43d3318d5f1078854f3be0f4ca5ddaa656bc2875b43ec23cc2ef3ea91a34269de
diff --git a/kde-apps/kmines/kmines-20.04.1.ebuild b/kde-apps/kmines/kmines-20.04.1.ebuild
deleted file mode 100644
index 6a2cf33ca4ca..000000000000
--- a/kde-apps/kmines/kmines-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Classic mine sweeper game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kmines
-https://games.kde.org/game.php?game=kmines"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 53bb71f9b747..da9f1fb8c8a3 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,3 +1,2 @@
 DIST kmix-19.12.3.tar.xz 1007752 BLAKE2B afca6f55b7c4bf63514226e9c969e92a927c84e3d1812835ab280218fa860fb8b7e83f47290bbfca8bacd6d9f9a68a5fce83ad6d0cc45c06228d245486e7cf75 SHA512 bcf2cfabfd6832bab153c7c05ca3811dc6109629af524820f5ca0ffdc779d6dbbe1ddd4457ad289987bd97bcdebf59d55cd47d94e9af75c1cea89d62b233b5e2
-DIST kmix-20.04.1.tar.xz 1006916 BLAKE2B 942993bec7f5c3fd751bb88985c5da0a6cad84dadb83e79c40e750af840fbdc33272677c783619a717e85e73d528224f39930c70750d2672490f11798bd5161c SHA512 11a5191288f55600d6accaf4d1b811a735b80acd8289cdfe2f3ee3d7d292b2f7895196d47a7893c5e3e710a9f902ac77a82cdf65ba2592b8e2bfd958f7b2f63d
 DIST kmix-20.04.2.tar.xz 1007080 BLAKE2B 1533751cd3d66bc786a791b45938ab80e5dbd51b4e6d95955dfbd63a64319fbb8759e341642fa16544524ac5ecd71d9312abc26fe7521a1f3a4bf31acd172b2e SHA512 b68fbb0c737182ca229623ffb58c427dbf0bf9a1ce26308007743b9b4ca4c8d4ba04405547af34281abd15444b000762e022447fb541de73b17ae3e5320abcb0
diff --git a/kde-apps/kmix/kmix-20.04.1.ebuild b/kde-apps/kmix/kmix-20.04.1.ebuild
deleted file mode 100644
index cb86accf9865..000000000000
--- a/kde-apps/kmix/kmix-20.04.1.ebuild
+++ /dev/null
@@ -1,60 +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="false"
-KFMIN=5.70.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Volume control gui based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.kmix"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="alsa plasma pulseaudio"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		>=media-sound/pulseaudio-0.9.12
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-19.12.3-no-more-kcm_phonon.patch" ) # bug 716092
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package alsa ALSA)
-		$(cmake_use_find_package plasma KF5Plasma)
-		$(cmake_use_find_package pulseaudio Canberra)
-		$(cmake_use_find_package pulseaudio PulseAudio)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index b74736c9b04c..a0882ad6bdaf 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,3 +1,2 @@
 DIST kmousetool-19.12.3.tar.xz 114184 BLAKE2B a1210838c71ce807a885af2ea8f23658617dba8f1a4da006c91b6684dea21920941cbca2c333ea1c5cfff1e9c04ef1e3646bc80ae9a74e6ca0efa5bcefa527f9 SHA512 bf453675ffa67c8be5e8d5da1ed99b4b803f7b34da483055442468b1fa55ebc0a5910813c2bb1654653807c637f43fd313a769448de85d5e16d3be7d066a9f00
-DIST kmousetool-20.04.1.tar.xz 113716 BLAKE2B fa62bfb9a3c4dedf35b46b407caf9d476eb2567a740c061338c7ee1f883e9ca319ce097a84e0f9b5a09a6f3f8343bb9f91a9ec7df94eae049146ca8d95f42abd SHA512 b4a349ae6f8ae7fc036e27e76d45ccfd80052aa88865d9b6e4cde6541b62be8ab427623106b813dcba322eb633a52c479439e764b40489ffdc3db2e2c6fdbc2d
 DIST kmousetool-20.04.2.tar.xz 113348 BLAKE2B cb1fb7f415782debc404f01ea2b502305862de648cdcc4713c489034d603c318fd701a2ab4fc3f5a9d91f36cf24ec09f2af870d372bc75abe87f24e94bf644c2 SHA512 85f8b0c1e33062a7f26b6bc3822499bdfb82bf2c3cdef7cc9f8a1c2262d9f35f385b30250b50276677a296c52732ec6d053db2300a9d9057462d6b6fa57061b0
diff --git a/kde-apps/kmousetool/kmousetool-20.04.1.ebuild b/kde-apps/kmousetool/kmousetool-20.04.1.ebuild
deleted file mode 100644
index 5735d90830a9..000000000000
--- a/kde-apps/kmousetool/kmousetool-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE program that clicks the mouse for you"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kmousetool"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXext
-	x11-libs/libXt
-"
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index e64621d1c55d..9e4c960a96e9 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,3 +1,2 @@
 DIST kmouth-19.12.3.tar.xz 1965380 BLAKE2B 942e35f5cf952ffe92e1e2a987c871c5b762d2da4682e4f9f7a7e680b8de6c18cae34eab0e9bad281edf55ae59b1b7d3c1855b200bd8ff1a3703b8e794698654 SHA512 5b45ca6a831d1c27c8962fbe6b61494f08bc74e3b6d2858c80f224ada157f1ba39e5f859497dd197429a76f1b224adbdb2c5b6dd34d7a1ac9c4f82f199f2bec3
-DIST kmouth-20.04.1.tar.xz 1964488 BLAKE2B b902e44f21194cc802fe16eff650c285175c7f6c4f5396e2261c1cb89cb212c22979f1d3a398f3ac067593c1e2a8626de97e809d75e94bfe39fe3a0c7c8c4c51 SHA512 5b4333cc2b57c88b73dc35b6fb23c90066c0f956ef4a19a6c517b1f283d44065bde49bf3f873565eb10745b6502e84462d3d96f618605800d883053b1fcabb39
 DIST kmouth-20.04.2.tar.xz 1964676 BLAKE2B 22900a4c443645ece710eb93b71978f988cf52846e49b73e69f52f8000199d9d411cdf5608dfeee678676f575800e621aabcdced9fd5b70b2fbafd3a0617e104 SHA512 5c8aa506876d39c4b6ed077b97d56bf624eda7b865a5bef40a95c3ecf1e6291555e9155b33e3e655dc524ae0b103f0bf618b6d09c333e0432c0547b57cef1209
diff --git a/kde-apps/kmouth/kmouth-20.04.1.ebuild b/kde-apps/kmouth/kmouth-20.04.1.ebuild
deleted file mode 100644
index 29899efe4928..000000000000
--- a/kde-apps/kmouth/kmouth-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Text-to-speech synthesizer front end"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kmouth"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 3be30f67b52e..8466c9ee7d84 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,3 +1,2 @@
 DIST kmplot-19.12.3.tar.xz 3055216 BLAKE2B 3b3b172718341248796f64c8090bfc0d63bdc541b12bc41c7814b128690e249fb29020dd06590cc42036c1c33775eba79b872e960ff16d42781e6c5a4d325104 SHA512 33a72a15d2b6045bd95d75dd70d44b75b2e045b55dacf787dbc4427e9ee26918b2dcce2a45ef98a9ff1d4ae2c1faf6fd69bcd21b18d3fac302687ac1872c9d95
-DIST kmplot-20.04.1.tar.xz 3056716 BLAKE2B 56edf714b3de37dd400a79c096fca3fd9f3295ef321f4e48ffc26654389e4d9073efa627cbf95f373d6e570f619cdcb0b46e35da7542843ba31907ca56770234 SHA512 633b4a351454d4583ecbc36ca6ab41ea7f474f427a8ee12c43f19ca268a3007acea52c8622c9777a5d44ecb545d2aa60c6cfbf636622b101ea08a66b1d0950a6
 DIST kmplot-20.04.2.tar.xz 3056336 BLAKE2B 7e379adcb9ad56520fbab6d8bb9ade54ba434a2f8908451ddc5d87db757e4cd2833d614a83b70a0dd5a14f7a5c95f97c024e9e9c6c80c00566480e19e55fd0d1 SHA512 bb77a61b98ebcd8f40bee0fe957c25c69ae4f14fe2000e65ffdce389ad9bac848b3a601f6f1c3133749eb24acf439c67bc4b067a66bd1c100ea7cea3c0861a7d
diff --git a/kde-apps/kmplot/kmplot-20.04.1.ebuild b/kde-apps/kmplot/kmplot-20.04.1.ebuild
deleted file mode 100644
index 3867899dc10d..000000000000
--- a/kde-apps/kmplot/kmplot-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Mathematical function plotter"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kmplot
-https://edu.kde.org/kmplot/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${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
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index 977f6bcaf0d4..480c9d20815c 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,3 +1,2 @@
 DIST knavalbattle-19.12.3.tar.xz 1281276 BLAKE2B 85064012d39311f8bc3ff8ef4d17cee553c53a12ea4f9ed4838c63a60941ef98257b8390cfb3e80797e5ce4c2fd0e9bc593cce489210c456bcb5bce3afd56bab SHA512 01475c680c012324767f69c95582b14f913cd5f61d4e1bd4d05099949031ec396c5bc5904cc1d690ade4bf982f3d0c246c2859dfaefc6a6d93e7bda263703100
-DIST knavalbattle-20.04.1.tar.xz 1282476 BLAKE2B 0a8e9e398fb1834f35e9bcde0e88e75c8452959c308435789448fa2884bd18f0ca3b26f61da24de9f2da806ba94d66e5516f1c737780b0337c3f482ec1c133d4 SHA512 dc4eaaaccf5fd53f361a1d57af2cfe7c565438f716aac3a6ccab80ecb279dce4b91e8f59ba1b3009457102191ec05fa2bdfd6eb60ea0a3181552436a933cf664
 DIST knavalbattle-20.04.2.tar.xz 1282552 BLAKE2B dad056103a449c7d971bd833d45f8f69d327c1716adffd29ca5174a3f5edf8bccab4e7884e4742eb0c66dad3b11ff7648de782454fb3730119305e478d84f8a5 SHA512 d592191a0804625e6ef840c5c984d8b839013e22d57ab02c5c251ea2cf6ec1566d8f86e808310e3ccc528d2eb1cfe1d05907c140af278db5aef1b32e8d2e8734
diff --git a/kde-apps/knavalbattle/knavalbattle-20.04.1.ebuild b/kde-apps/knavalbattle/knavalbattle-20.04.1.ebuild
deleted file mode 100644
index 17f0c5589347..000000000000
--- a/kde-apps/knavalbattle/knavalbattle-20.04.1.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_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Battleship clone by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.knavalbattle
-https://games.kde.org/game.php?game=kbattleship"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 95a014647a32..94be20a0024a 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,3 +1,2 @@
 DIST knetwalk-19.12.3.tar.xz 1041720 BLAKE2B 13b80189310360487f367bf6013ccea0a7acb33c795610b3ed591f6b8306e6808ff68e7cc26bb9a3e8ca99410d78428c530048db7338c889f17880537a96ac41 SHA512 7b7d74d18f32d613ea32fb4bdd36d3b9c8523a6d93d88fff9ec34ea3eeef4bccd17922e177eee25720a0886b93cf1ffbab3a663a6a9c217181b180766504040e
-DIST knetwalk-20.04.1.tar.xz 1259220 BLAKE2B 0124fbb757918066bdc56c2876daec9869c1dea6bde2ff8f17b28881d8fc01cb0160b23f214c6827ef1508cbe5f14e36085453f23ea88eb87dadb05a87fa6830 SHA512 240bdad5be7364186f55cb0f9d492e0e617e14642a2c089d464ebef19be70b1743f66da9a831384e9697d8681fbc444069174feb09d1dea61568eecd3a894f43
 DIST knetwalk-20.04.2.tar.xz 1259128 BLAKE2B 5eceb28bba3793dcb98542c8f1ed9f6cb577498a4e1413ff4f17699be623dd29b167ac4a2fea5bf92156d4e2b3872823515bbd32318d56a317aad070a1c2df10 SHA512 bac83300dc0a441d3870be0431901ced822a746551149d99753ee8eeebc79fd8f2ef97a04c3a5a13911461d35f27090ef43f9065f8113786c7f919d2eab42879
diff --git a/kde-apps/knetwalk/knetwalk-20.04.1.ebuild b/kde-apps/knetwalk/knetwalk-20.04.1.ebuild
deleted file mode 100644
index e9f7e21fbb64..000000000000
--- a/kde-apps/knetwalk/knetwalk-20.04.1.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_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
-HOMEPAGE="https://kde.org/applications/games/org.kde.knetwalk
-https://games.kde.org/game.php?game=knetwalk"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/knights/Manifest b/kde-apps/knights/Manifest
index c3ab9915644b..faa79df2248a 100644
--- a/kde-apps/knights/Manifest
+++ b/kde-apps/knights/Manifest
@@ -1,3 +1,2 @@
 DIST knights-19.12.3.tar.xz 3519912 BLAKE2B ae81e54a0fbb33f29b778a0f1fdb9bb5caf0d3106ee9c5454810c4d8cef3e6e7e3c5b008acc181621ee2c1e1354b7b9810cd7ae75242b7a89877f838b5f5935c SHA512 3a691e6d663267062d14a629239fe307762591c705034ff876205e6bbc40b7f5e499f458b9f7762b7bc9c12e751631f5e82fd87f27bd497154e4792095dde2d7
-DIST knights-20.04.1.tar.xz 3522956 BLAKE2B d32268c3204b1c2db83062212f393f3f28aa119cb688d2a3065683da7363fd0a204d2612109ff9b4b1ae4c82436fdd74b146180801c088379a70b3a452541bfc SHA512 860d95ac743f75cb30a0a4f16be90ad7b0d52cd43b398094d4a345feddf34f6bfaa52b85e1f443965672656cbf07e2722529f5ea41499cc9cc6dddae5f3c28df
 DIST knights-20.04.2.tar.xz 3523004 BLAKE2B f068476a6edb1a4c99f33f72e27bc3d69872190761bdd05385424523ba2090ae4775b7daf0f181eca7834fdad7f383f44dd085458f04ff3903f0b0adbb14a680 SHA512 11cf416aba784b1a4c2bb096f91afc7c86de9d17c66201586b017d2e2a4607f0ee8179de09b535f13aa9c2cb31546317ecf21269e19693e33f8f8e1f9aecbcf5
diff --git a/kde-apps/knights/knights-20.04.1.ebuild b/kde-apps/knights/knights-20.04.1.ebuild
deleted file mode 100644
index fc119de5c9d3..000000000000
--- a/kde-apps/knights/knights-20.04.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Simple chess board based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/games/org.kde.knights"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	>=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/kio-${KFMIN}:5
-	>=kde-frameworks/kplotting-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	|| (
-		games-board/gnuchess
-		games-board/crafty
-		games-board/stockfish
-		games-board/sjeng
-	)
-"
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 4cd7db4ffd75..28074b45a8d0 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,3 +1,2 @@
 DIST knotes-19.12.3.tar.xz 320948 BLAKE2B c71f32a12e4d5ff2e3596c8426fa4393d2baaa46876b449fcb18ce28a72b89f5ebc27757f5e1174807d1301c092b491f52232deb91f33c363def697ffb7eb12c SHA512 356b91ebef3e6218403c373d23f5af34f27d5e196c2fc156b4d00786c104d245e269914860deb358919dac576251e2e36c041b44717ad8fd7cc29fe29233d6a2
-DIST knotes-20.04.1.tar.xz 320772 BLAKE2B e6ae361b4239e4ef441106bdbdebe9810952d60b8419ca63574ca45639ec67452d660060f6fe58b315af291d69dfc39ee187be4934aaaaf37c541a3c8af09ddb SHA512 36b04a7b72508c9be22da68935e91f4636f4ded4c7291e77f84b1060aedf6c4f740c1c05f436fb57cfe772bb4e6c1024ffd06fac533c9e0f7736a517df15de36
 DIST knotes-20.04.2.tar.xz 320968 BLAKE2B dd9802e5d578a79a375226837a3e290f3390718206388e50a863c3d35f2761d8fcaf036fd194251b40bcbd808cd43904378a368a16d50e7b02b775bd0de808c8 SHA512 11899f32b9ced249ef0862eadd93f0a33e32d05088d144706d053042fa7f545d9f39314497029419e04707790c5c33776c6898825b68f124cafd507f402888cd
diff --git a/kde-apps/knotes/knotes-20.04.1.ebuild b/kde-apps/knotes/knotes-20.04.1.ebuild
deleted file mode 100644
index 21b970b2a816..000000000000
--- a/kde-apps/knotes/knotes-20.04.1.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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.knotes
-https://kontact.kde.org/components/knotes.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/kolf/Manifest b/kde-apps/kolf/Manifest
index 56db72b541ac..ca64c8e545f2 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,3 +1,2 @@
 DIST kolf-19.12.3.tar.xz 1027336 BLAKE2B 97888f26c35507e5332ad8c3a0fa40362977a6b888545766906207cedd016df068f2eac01a4eead1952b2eef8940d119106ec8f6d9011375af8049c68787faff SHA512 447f8b8966bb8549802fbb5129f5178e182b12b546731c2cb7abf95a8777eb1ba7148cb155fe2428d5df3a47134b3dc695fb9b8bd60af5fba0dcdaeb483031ee
-DIST kolf-20.04.1.tar.xz 1020064 BLAKE2B fe9111976966cf5a597f79735d18c93366f0f87c1bc63e7e15dbc89ec88890ebe705290a27092ce4f3c6e2b3277752a5693b346bbe737161333a9adcdfcf41f6 SHA512 471a00152be62a68144f42ba854524e1c50df044b461a7e5c5e52af5fcd5aee2a81d7f58932b1ac9cb50316f79106872e4af48776ad5a19b722cef4d617e71ff
 DIST kolf-20.04.2.tar.xz 1020792 BLAKE2B 78ce90af31f36de89cebed8aae91343aae68802bbc737d1cba84af4ecc363ca167d09e1a30351a48e68e3abd5e7555a9017b6adadf47cc3a41beb6a3ca54da13 SHA512 26d319fd851361e41a930de5b748d7bc765adaa6c71a3b7dc4f9efcf27d795e9d583fd1aaf4653225a8840a7beada2663ae3ffc49908dbaf3a99499ab347f279
diff --git a/kde-apps/kolf/kolf-20.04.1.ebuild b/kde-apps/kolf/kolf-20.04.1.ebuild
deleted file mode 100644
index 380630f39935..000000000000
--- a/kde-apps/kolf/kolf-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Minigolf game by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kolf
-https://games.kde.org/game.php?game=kolf"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 01cd0bdbe298..63cc66af0392 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,3 +1,2 @@
 DIST kollision-19.12.3.tar.xz 280964 BLAKE2B 5f74c6c4f845981f30848c9efb9f714134dbe4a7fd34900b732d3d7c91b34751af2731188732fab9f836fc3c4997245ad73adcdefbd97962527f17590eec14f4 SHA512 ee37178bdae73db5f0b854dc892100306d9e53afaff8b631555ee50dfd198dee948bac68ad3839c4372055ac1cbf4a6c7610b62fdf511aa9ad5ded47bfdc8141
-DIST kollision-20.04.1.tar.xz 280916 BLAKE2B 59ae6438df9da49a599d88503a462c72f0b8586749033cc0c7501c149f767dc0eadbaf11d36ed144716db333f1880e6a5e671c902b25908b23e9f444c6ce25ec SHA512 d0eb8ed714b9992a064ed15eadf5a9cae53744f63e1f1ae8ff00e379a394881dc5dc347a6acbf6ca7e22ccfecc35b7c14ce0219b2bab5a4a83ebc355f02ebd4b
 DIST kollision-20.04.2.tar.xz 280928 BLAKE2B 9d4e1673a817eb13a79a7cb674e6376fe0193bb76577a5703267daab53e1392e0e4da51e0a5335d0fa2d52459c9281cfdd539c1e38d0c7d0cc2c04683184bde8 SHA512 72002fa09dc4f8ce4c6ab3bd67e6943507157bc595b5625024bb7df1ae8c75a3f0849b7a4e8dc14f7248918e89ca76ab26b50e835317fa287f5d6b44458e8f5d
diff --git a/kde-apps/kollision/kollision-20.04.1.ebuild b/kde-apps/kollision/kollision-20.04.1.ebuild
deleted file mode 100644
index f8c97be9bf94..000000000000
--- a/kde-apps/kollision/kollision-20.04.1.ebuild
+++ /dev/null
@@ -1,33 +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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Simple ball dodging game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kollision
-https://games.kde.org/game.php?game=kollision"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index 1d95acee9d8a..6138bb9e0074 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,3 +1,2 @@
 DIST kolourpaint-19.12.3.tar.xz 5654284 BLAKE2B 55e22e4081a3a4cba8c2c3dc1abfe40de104fe2aea22a473f496296d181772aa21cc03dea6f2c4ff7b676e7aa948b93019e7a30136f53f4f23036d3385c7261f SHA512 8697ada6f407426bb48e8f62dcc9337630631a0aed17d5efd3390dfedd7039c3c7a9f7c88e46dfe2475fea5f25f73387a4dd40b624c8811fdb019e1e5f6e85bf
-DIST kolourpaint-20.04.1.tar.xz 5652164 BLAKE2B 93999abc79a2693bdfc956504b0ca244202c2a11b6d0959ea4961957488587d866eba1d44bac5a92f4aa0d7eb34f0348cbe2b89646dbe62c91d6af2bcb682a46 SHA512 891a0d28273c289c9ffa7a2efdb7c390c7dcee0de77df500f6e3660d9a868c2132957c1fc1dfbb524086fba4326800a624e3d5e657c09c0fd6aadcf29b11d9a6
 DIST kolourpaint-20.04.2.tar.xz 5652284 BLAKE2B d03adf3eb9c514db776926518c29bc0d89264e6c287dc1d3c9cb7956166f291e1763ad8767f7c969d941b1a0bfbb343ddf585b56658665784d0aaf52e0389c95 SHA512 b08b14b6dc92d8c1df16edd552ecd5701c8cf6d8ed6d28319c7aa623d0a3b3386c2a81f79d92654c1c304bebef13b9ab13bfb1a60d1fe8b0002d6250eede8f1c
diff --git a/kde-apps/kolourpaint/kolourpaint-20.04.1.ebuild b/kde-apps/kolourpaint/kolourpaint-20.04.1.ebuild
deleted file mode 100644
index 757e3de6463a..000000000000
--- a/kde-apps/kolourpaint/kolourpaint-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Paint Program by KDE"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.kolourpaint"
-
-LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="scanner"
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${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
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	scanner? ( >=kde-apps/libksane-${PVCUT}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package scanner KF5Sane)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index 629436d1a6a4..85d36c00362a 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,3 +1,2 @@
 DIST kompare-19.12.3.tar.xz 800976 BLAKE2B 42b65f4f02b62cd29d928e74d0aec914bde9b847e18417c214d6baf79fb550fffd81ed20606d672a879a3c8251f54162ed32d2c2479f80bc99ff921a26f8a762 SHA512 b90d1949f88da55c4e8bdc147605d20fa52bd9c4d815b0704ad175a75dafc51dff7e913ec051b8832c0ffeb7d7dba57305520829621eb273181d988f03fa61c3
-DIST kompare-20.04.1.tar.xz 802176 BLAKE2B 7d7cd0ad458dfc365edcbba65198d17ca5e3fc40725f5a2f0c177b8de43699b65cc120742b92a71a13149db0c46c8e0237783689c32fbe42a2168bd016d11be1 SHA512 a8a6aec9af8f12e06b7428cde4f8a6db2621c809f23ccd02cef0e667c9b81b3eafdb440c2d56875052a5a9262914cc364c39560cb774127b3d39903b51935591
 DIST kompare-20.04.2.tar.xz 802300 BLAKE2B 016334bfa9a51a3fa7de5af186adb46c971d011777480a1764a221a782400557df1de15a0c4e4ac7d5745d3079bce889cff7d58be68f7c4854298c463eb2c14c SHA512 7af7d708cb09e9d844e1cb645c7ef014cc29d7276906f21a237dbd7042fae9c30644a4de63fe88a210def33c822b909dc4d793552b2bae1a11db375b0aa91155
diff --git a/kde-apps/kompare/kompare-20.04.1.ebuild b/kde-apps/kompare/kompare-20.04.1.ebuild
deleted file mode 100644
index c7390f6f08d5..000000000000
--- a/kde-apps/kompare/kompare-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="A program to view the differences between files"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kompare"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${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/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkomparediff2-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index c60c3226d150..0d2cd080cab7 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,3 +1,2 @@
 DIST konqueror-19.12.3.tar.xz 7369676 BLAKE2B 0f36f016b3b1d556faf247574f8d9a94ca2e72e6c4d2010739179eeab0aa2c71f9970487db349dc063295b94dbd83ded57e1dae30a62c2f269350155ef1801d7 SHA512 50550af334f7b9e848f7568092b89f927053a2c421da08a40357ae3732a8663b969a3babdab764146195c83b08bccf6834ea07c67e6064262e27dc8288cef420
-DIST konqueror-20.04.1.tar.xz 7375952 BLAKE2B c0a9476b77c3f96c40e468d1ad169c3971f3122fcf2872a1c6e1061c698e5d0bb9f744338e68beff1b6a380bcd7f8a1625249dd9adb56fcd060b61e3d7c05679 SHA512 e97224405ae81238bb8642d6a9db25c326300edb339ed47fd21acc516600013ae3fec8c3e311f9e32fbc3fd973a03f9955391e83d075a53db3719b41ab676ca2
 DIST konqueror-20.04.2.tar.xz 7376012 BLAKE2B 71afe56f3943f40516a66a8d88acc357112425e3ef8259771b086f480bd43ef38cfdb5f3da62ec5cca61cd06d25387aa80c3a5848f7b8c3ff4509118cccd7d9c SHA512 cb53e348ecd15a4a7d277b4f4529fb8b8f7c0fa7afb65ec408e8a1fdf09e169a34fe78053c28e346bbfbbc186a426783ca4dd11eb1c74d10e38d49d8a2d94a5a
diff --git a/kde-apps/konqueror/konqueror-20.04.1.ebuild b/kde-apps/konqueror/konqueror-20.04.1.ebuild
deleted file mode 100644
index 1b962865633a..000000000000
--- a/kde-apps/konqueror/konqueror-20.04.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic ecm kde.org
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="activities speech X"
-
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	sys-libs/zlib
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/kfind:5
-	kde-plasma/kde-cli-tools:5
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	ecm_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package X X11)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-			elog "For bookmarks support, install keditbookmarks:"
-			elog "kde-apps/keditbookmarks:${SLOT}"
-		fi
-
-		if ! has_version kde-apps/dolphin:${SLOT} ; then
-			elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
-			elog "kde-apps/dolphin:${SLOT}"
-		fi
-
-		if ! has_version kde-apps/svg:${SLOT} ; then
-			elog "For konqueror to view SVGs, install the svg kpart:"
-			elog "kde-apps/svgpart:${SLOT}"
-		fi
-
-		if ! has_version virtual/jre ; then
-			elog "To use Java on webpages install virtual/jre."
-		fi
-	fi
-}
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 522182b0bffe..963d5273062b 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,3 +1,2 @@
 DIST konquest-19.12.3.tar.xz 658712 BLAKE2B abb6f58730b43b911c8b0b0638e1b453ae2d27aa618b7a79b84f364c27a1ea2f4f9758d2f4456a50f1ee23a69f165c154126ceb3163a09f908d2daee1fe8968e SHA512 0be29664cc43f647caf0c4dea5f92e1f38bf708bb67923b8ff916a0e0aacb1e8896cb2c38279f803b368ff09ab253ec67e785964ccb23d32fac9bc4af5af4dd7
-DIST konquest-20.04.1.tar.xz 660064 BLAKE2B 907b5ed19c54ffb8bbd9e8b27ba25fd4a8a675b229960398df683a10fb763704b8df1c9a58af14f554404a259a186e0b09ccea8c3e23e19ea4dc468843407e85 SHA512 0450276287b39c671d5054f9608a0b063fc6a2ac2529d75924811bb5f5231162b6bec7dd937e48fce4246e990d2494ff982a33f38a5dae8b36149cd137db88d1
 DIST konquest-20.04.2.tar.xz 660312 BLAKE2B 84a8c010ca8bb419c40e1e175a9ba3104549ffd6373a6c4fbd6d0ddbc3cbea0c4e3ab2bb5d8e153e832bf90656d28fe833cde4f6f1e942b4bc0d2507cf591140 SHA512 fb5f3687129ab2b18c0fd74fa5c5b37f3e543825aaf3a17b4f302b19cca79e366bf58d0c5da39509ad10007c37d21a65a3e3f24a798b8c7477c9e376ed805b3c
diff --git a/kde-apps/konquest/konquest-20.04.1.ebuild b/kde-apps/konquest/konquest-20.04.1.ebuild
deleted file mode 100644
index d474ee10d0ef..000000000000
--- a/kde-apps/konquest/konquest-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Galactic Strategy KDE Game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.konquest
-https://games.kde.org/game.php?game=konquest"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${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/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 2e34a1e78fa3..dc2dba864aa5 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,3 +1,2 @@
 DIST konsole-19.12.3.tar.xz 1160780 BLAKE2B b4a6c794951081ff9354c68c1177836b8462c0e2ec19b39b08c6e90f8837b58109e5559ab93cd1f7520a6ffbbd651d0d92bcc3c359815e7264744fcfbde02cb0 SHA512 980a7eab4efb219acdda8873318980ba14cf7d3fc4f78ac171f8ed1e11400b3028150140aac192820771a0ac8e596fc0f6497c4a44d74bbd1c421f72a39da289
-DIST konsole-20.04.1.tar.xz 1165784 BLAKE2B 160dc2c0f4f5560e060e13ffc2eac0a02ed33060e66778e92eaea2c7c03060fbf2e8107d26f401ea7f96b33838f23de13737f48db11cce7b5b1eff4bae9ffc8e SHA512 608bc4e9652e1129b219867c01b40ea2aba4044b9827b6b39ef0d2fed436dfd091c3cd4f568673122761ceb3106e8304d490b0ad5b73210d1890a5ec9e516fa3
 DIST konsole-20.04.2.tar.xz 1165856 BLAKE2B 614194ace08ea69dcd2e923a41f83ad807c14f719df9b9516a99f962940af4914e7e29b5ed179ad92a85047bf72bef4e41956d16a81462c99b4b71009ebd728e SHA512 0f998c6f69bac905385b51c2d2af3b4ed1e835e1a33208c59238e3950c6c5cf3580a435ea5acacfbd031eecf2308e2c96e9df30f1ccf44154a2a637ca073906d
diff --git a/kde-apps/konsole/files/konsole-20.04.1-crash-on-close.patch b/kde-apps/konsole/files/konsole-20.04.1-crash-on-close.patch
deleted file mode 100644
index 51e1d0c5dcd2..000000000000
--- a/kde-apps/konsole/files/konsole-20.04.1-crash-on-close.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From fdfae25665731882687da8721e58c3c56a3babf8 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Thu, 28 May 2020 09:28:06 -0400
-Subject: Fix crash when closing session in KonsolePart via menu
-
-This close method is also used when closing a Konsole session
-via the X on the tabbar and tabheader.
-
-FIXED-IN: 20.08.0
-BUG: 420817
-BUG: 420695
-BUG: 415762
-
-See merge request !87
----
- src/SessionController.cpp | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/src/SessionController.cpp b/src/SessionController.cpp
-index 006ba8b..e72f342 100644
---- a/src/SessionController.cpp
-+++ b/src/SessionController.cpp
-@@ -999,16 +999,23 @@ void SessionController::closeSession()
-         return;
-     }
- 
--    if (confirmClose()) {
--        if (_session->closeInNormalWay()) {
-+    if (!confirmClose()) {
-+        return;
-+    }
-+
-+    if (!_session->closeInNormalWay()) {
-+        if (!confirmForceClose()) {
-             return;
--        } else if (confirmForceClose()) {
--            if (_session->closeInForceWay()) {
--                return;
--            } else {
--                qCDebug(KonsoleDebug) << "Konsole failed to close a session in any way.";
--            }
-         }
-+
-+        if (!_session->closeInForceWay()) {
-+            qCDebug(KonsoleDebug) << "Konsole failed to close a session in any way.";
-+            return;
-+        }
-+    }
-+
-+    if (factory()) {
-+        factory()->removeClient(this);
-     }
- }
- 
--- 
-cgit v1.1
-
diff --git a/kde-apps/konsole/files/konsole-20.04.1-qt-5.15-set-text-encoding-crash.patch b/kde-apps/konsole/files/konsole-20.04.1-qt-5.15-set-text-encoding-crash.patch
deleted file mode 100644
index 78e5559d047a..000000000000
--- a/kde-apps/konsole/files/konsole-20.04.1-qt-5.15-set-text-encoding-crash.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 72e76de072aa4c7960396856e72681a00c4f67d9 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Thu, 28 May 2020 21:40:29 +0200
-Subject: [PATCH] [SessionController] Fix crash caused by text encoding menu
-
-QMenu since 5.15 is hidden when an action is triggered, this caused a
-crash in Konsole when trying to access the text encoding menu.
-
-Now Session emits a signal when the text encoding is changed, the
-SessionController can connect to that singal to set the current codec in
-the KCodecAction object.
-
-Also fix the EditProfileDialog so that when the KCodecAction menu is
-shown the currently set codec is selected.
-
-BUG: 419526
-
-FIXED-IN: 20.08
----
- src/EditProfileDialog.cpp | 1 +
- src/Session.cpp           | 2 ++
- src/Session.h             | 5 +++++
- src/SessionController.cpp | 7 ++++---
- src/SessionController.h   | 2 +-
- 5 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
-index a64136934..f93e9e166 100644
---- a/src/EditProfileDialog.cpp
-+++ b/src/EditProfileDialog.cpp
-@@ -1725,6 +1725,7 @@ void EditProfileDialog::setupAdvancedPage(const Profile::Ptr &profile)
- 
-     // encoding options
-     auto codecAction = new KCodecAction(this);
-+    codecAction->setCurrentCodec(profile->defaultEncoding());
-     _advancedUi->selectEncodingButton->setMenu(codecAction->menu());
-     connect(codecAction,
-             QOverload<QTextCodec *>::of(&KCodecAction::triggered), this,
-diff --git a/src/Session.cpp b/src/Session.cpp
-index 1103f6e1b..483d8fd6a 100644
---- a/src/Session.cpp
-+++ b/src/Session.cpp
-@@ -252,6 +252,8 @@ void Session::setCodec(QTextCodec* codec)
-     }
- 
-     emulation()->setCodec(codec);
-+
-+    emit sessionCodecChanged(codec);
- }
- 
- bool Session::setCodec(const QByteArray& name)
-diff --git a/src/Session.h b/src/Session.h
-index 1b7da1b3b..c1af3c05d 100644
---- a/src/Session.h
-+++ b/src/Session.h
-@@ -661,6 +661,11 @@ Q_SIGNALS:
-      */
-     void currentDirectoryChanged(const QString &dir);
- 
-+    /**
-+     * Emitted when the session text encoding changes.
-+     */
-+    void sessionCodecChanged(QTextCodec *codec);
-+
-     /** Emitted when a bell event occurs in the session. */
-     void bellRequest(const QString &message);
- 
-diff --git a/src/SessionController.cpp b/src/SessionController.cpp
-index e72f342c4..f74969f85 100644
---- a/src/SessionController.cpp
-+++ b/src/SessionController.cpp
-@@ -691,7 +691,8 @@ void SessionController::setupCommonActions()
-     _codecAction = new KCodecAction(i18n("Set &Encoding"), this);
-     _codecAction->setIcon(QIcon::fromTheme(QStringLiteral("character-set")));
-     collection->addAction(QStringLiteral("set-encoding"), _codecAction);
--    connect(_codecAction->menu(), &QMenu::aboutToShow, this, &Konsole::SessionController::updateCodecAction);
-+    _codecAction->setCurrentCodec(QString::fromUtf8(_session->codec()));
-+    connect(_session.data(), &Konsole::Session::sessionCodecChanged, this, &Konsole::SessionController::updateCodecAction);
-     connect(_codecAction,
-             QOverload<QTextCodec*>::of(&KCodecAction::triggered), this,
-             &Konsole::SessionController::changeCodec);
-@@ -846,9 +847,9 @@ void SessionController::prepareSwitchProfileMenu()
-     _switchProfileMenu->menu()->clear();
-     _switchProfileMenu->menu()->addActions(_profileList->actions());
- }
--void SessionController::updateCodecAction()
-+void SessionController::updateCodecAction(QTextCodec *codec)
- {
--    _codecAction->setCurrentCodec(QString::fromUtf8(_session->codec()));
-+    _codecAction->setCurrentCodec(codec);
- }
- 
- void SessionController::changeCodec(QTextCodec* codec)
-diff --git a/src/SessionController.h b/src/SessionController.h
-index 057a31446..5062833b7 100644
---- a/src/SessionController.h
-+++ b/src/SessionController.h
-@@ -260,7 +260,7 @@ private Q_SLOTS:
-     // other
-     void setupSearchBar();
-     void prepareSwitchProfileMenu();
--    void updateCodecAction();
-+    void updateCodecAction(QTextCodec *codec);
-     void showDisplayContextMenu(const QPoint &position);
-     void movementKeyFromSearchBarReceived(QKeyEvent *event);
-     void sessionNotificationsChanged(Session::Notification notification, bool enabled);
--- 
-2.26.2
-
diff --git a/kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch b/kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch
deleted file mode 100644
index 55213878ad27..000000000000
--- a/kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5e5129d51fa85036832f1af44ec5b875d426392f Mon Sep 17 00:00:00 2001
-From: Maximilian Schiller <manimax3@outlook.de>
-Date: Thu, 28 May 2020 22:57:29 +0200
-Subject: [PATCH] Fix konsolepart Segfault when closed
-
-Assign the _view as the parent to the KXMLGuiFactory because the factory
-is referencing the view widget as its associated widget. Since the
-TerminalDisplay gets destructed first this is now a dangling pointer.
-If the view is set as the parent the factory gets cleaned up correctly.
-
-Also cleanup the created clientBuilder after destruction because it
-cant have a parent and would probably leak memory.
-
-BUG: 415762
-BUG: 421226
-BUG: 421194
-BUG: 421138
----
- src/SessionController.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/SessionController.cpp b/src/SessionController.cpp
-index e72f342c4..99e185f5e 100644
---- a/src/SessionController.cpp
-+++ b/src/SessionController.cpp
-@@ -1732,11 +1732,13 @@ void SessionController::showDisplayContextMenu(const QPoint& position)
-     if (factory() == nullptr) {
-         if (clientBuilder() == nullptr) {
-             setClientBuilder(new KXMLGUIBuilder(_view));
-+
-+            // Client builder does not get delted automatically
-+            connect(this, &QObject::destroyed, this, [this]{ delete clientBuilder(); });
-         }
- 
--        auto factory = new KXMLGUIFactory(clientBuilder(), this);
-+        auto factory = new KXMLGUIFactory(clientBuilder(), _view);
-         factory->addClient(this);
--        ////qDebug() << "Created xmlgui factory" << factory;
-     }
- 
-     QPointer<QMenu> popup = qobject_cast<QMenu*>(factory()->container(QStringLiteral("session-popup-menu"), this));
--- 
-2.26.2
-
diff --git a/kde-apps/konsole/konsole-20.04.1-r2.ebuild b/kde-apps/konsole/konsole-20.04.1-r2.ebuild
deleted file mode 100644
index c532b9d1b71b..000000000000
--- a/kde-apps/konsole/konsole-20.04.1-r2.ebuild
+++ /dev/null
@@ -1,77 +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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
-https://konsole.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/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/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-crash-on-close.patch" # bug 723214, in 20.04.2
-	"${FILESDIR}/${P}-qt-5.15-set-text-encoding-crash.patch" # KDE-Bug 419526; pending
-	"${FILESDIR}/${P}-segfault-on-close.patch" # KDE-Bug 415762; pending
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# drkonqi process interferes. bug 702690
-	local myctestargs=(
-		-E "(DBusTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 3484d23c6b4b..c12d9a756313 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,3 +1,2 @@
 DIST akonadi-calendar-tools-19.12.3.tar.xz 223340 BLAKE2B b438f392618d919440fddf0ba5d48ab52a0c509507018d7f546b477aa83a34e8f86551c44998337ba2cfba8050d31cde9dc6f672b1a9ce6b558b292bb960d483 SHA512 eac1400ff742199908daf765b5cf14efd12b630a34e6fe0ac6bb17072b05902e746af5740a8e0db82a5ea7535a413140e9b6d4ea029f2abe684aff05098a8b39
-DIST akonadi-calendar-tools-20.04.1.tar.xz 224572 BLAKE2B c56c28b5743006ce2b1b65b1c662b15dbcf261ca9ad062aa3169aa00d3c57bacb525a4ad278d3cdc37f8f1f0df1bd042874480be50a14ba46ebfb4e775f24b3a SHA512 b10597ae99a69a23f7387c9f74ec7d15dfb0ba9322c67238654c794e9698c5920a6b19001607a3495475438ea4c8a23d2d6b17d7acedba37ecf04082f6dab2b3
 DIST akonadi-calendar-tools-20.04.2.tar.xz 224616 BLAKE2B 199175ac1324f53e8aed802e0c153d0eff9846d6cb3ac251c1e4c6b4a486547e98686d7c7499356d82cb93a5efa767edd01e3a1ae349ad72f824ebcdf79296d3 SHA512 8e571a0a68927794b61915677a46220402deeda06dc8ddc1a7c1480d8185ed6d719a7047b034f6120402ea3d213f224659f04074cc528ce8b75f461ee866604d
diff --git a/kde-apps/konsolekalendar/konsolekalendar-20.04.1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-20.04.1.ebuild
deleted file mode 100644
index c7c1266bac95..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-20.04.1.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.70.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 ~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/kontact/Manifest b/kde-apps/kontact/Manifest
index 51feb197ebe2..cd9bb02dcb58 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,3 +1,2 @@
 DIST kontact-19.12.3.tar.xz 792464 BLAKE2B 3509a39532efa9b5d10250864725585fc76714a1a2b0389d711de162af03b05e2770d968cf2c844b0a54be67c21f9110a8d0bb929b340b1becf3849e3b154f6f SHA512 40bfd1fcef26b5764e8b584bd114c8b2a18f14b5b8633741d0cc107d85a32f676d8e34096fa32c2adfdb23a65537fe1a1d87d6d497622d2eac453d4e2ffb1bd2
-DIST kontact-20.04.1.tar.xz 793320 BLAKE2B 83a99a52aad9fe578d5b63bd5f26935148abd9601040285cd6d2d50a6a0dd09673b039c15e00bb821426f3cc242e1f41005199fb257bf5341a56ec8cd649ad46 SHA512 e01efd23a96cb64829acf3ce2ba9f6bdf02cf713e0fd80a3d54e108c7a7931a93f29f362511d3e7a662168970a0f3346e0bb01c05c64c9fb1384ef78881b5e27
 DIST kontact-20.04.2.tar.xz 793368 BLAKE2B e37a773102ef46c63209647e53c16b3e666cf3963e4812a4aed655a4ae145102da36d662b100f34751aa3faf3363e75d6f99bc9600581b0aecf4e0a55ab1759d SHA512 05fe0c9c62068f9acdaf6fe6d482d2b40c3bf2e4c0c97b420326fc5e895afc64ee0f9f9878ecaed4f0173e43ea514b9bbb59a1aa6ff1e3f9bad9b934f25a6c7d
diff --git a/kde-apps/kontact/kontact-20.04.1.ebuild b/kde-apps/kontact/kontact-20.04.1.ebuild
deleted file mode 100644
index 6cfffaa55a8f..000000000000
--- a/kde-apps/kontact/kontact-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-HOMEPAGE="https://kontact.kde.org/ https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${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/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index ceb15569fce0..08f9afb4aa13 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,3 +1,2 @@
 DIST kontactinterface-19.12.3.tar.xz 33368 BLAKE2B 938403f8043123391b0c6aa3d3c0388c233d24e69f3691db2fb43f8c747f534ddff03e41be1a339203e41296707b177ba312178b611562f4a3b994425fc6c212 SHA512 c1d60b2a1bc09752ae8f1156c436babc7ef24cf7d4329f9f45d8fe7d558ec7f95160742707a57fc46ec4aa8b4ab0a20f773ed351b48b3cddb3ee5afcfa86e033
-DIST kontactinterface-20.04.1.tar.xz 33048 BLAKE2B 3cf28b7e264a919c785f32831d2ba3a0cdb7bd71f64a2c414d71f13f4c4091524f9df9427fa13126c90f7110c5b639865668b825bacd524a7b2531b1129505cd SHA512 2a91d4a26a1152763915d3ff421c085b304c7edaed0b9d8f3c9946eee4f6043a95ded0d7cfb5aaf8d45a2fbeec9c53df639bbb17a9ed07559edaa221cc0a8dd4
 DIST kontactinterface-20.04.2.tar.xz 33056 BLAKE2B e14ccb2428f9bed00b4c291ad96cf6784e691a0980f68b484313ad38de0eccc4188f52242a311ec3cd506799bb35c5393d75542d0ebc4f5e1c2dab150c6556cf SHA512 10d06cbcb3dd4d474d111af3b7a2d898f443920953461cc9140aa67d61c836acf30a29518c1786f6c69a55232d4762b371458ae3384295014ea24d58a406147e
diff --git a/kde-apps/kontactinterface/kontactinterface-20.04.1.ebuild b/kde-apps/kontactinterface/kontactinterface-20.04.1.ebuild
deleted file mode 100644
index 40302fe06c3e..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-20.04.1.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.70.0
-QTMIN=5.12.3
-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 ~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/kopete/Manifest b/kde-apps/kopete/Manifest
index 4a02e1093be2..2cdee07022d2 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,3 +1,2 @@
 DIST kopete-19.12.3.tar.xz 9376816 BLAKE2B 3a8d0e76a29370f8a9acc448ec961309281513305fb0461f8bda346bfa73f86847f29937c24effab727876b489b3d6c4d92c6078928a02b4e109118080c918fa SHA512 113aee174f2a7d85da69f9a877bdcfe2818433bcb545ae39dcaadce3b34a135edcb0f9a1dd0ed34901e2485388692a26b9d136eed1e7b63c097176d371da8e96
-DIST kopete-20.04.1.tar.xz 9371776 BLAKE2B 056ce1f90994ebe21891cf527ee912dc9b3ebb6415af277fa037af66f3eeb9c00121f64d634d1f9ad5259e6295b1173287c231caa79b4e27b557314226954804 SHA512 8dc858e5eda0be3df0aed784049ba82a889ebf7161d45ecc8e4d347c2b005b76e9831d9aa10c64aaf00d7ef82282bd44f3563bf7b01d4f5b2f7a8230d2356cf6
 DIST kopete-20.04.2.tar.xz 9372040 BLAKE2B c244887c515701cb5c057cdb598a419421a779729d1f0f85205f444bd3603d553fbb244f03728a96c85131ae134f1ff431200435e81b4522b3817b08fc6ab8a9 SHA512 3281d865551b0a651f09f6abb9672f481e23ff4e6bfca498363d3bf92d1a1238b59e85f23a5b2febc5dc4c781a8db4aaa7ae4de335fc803abab12ba6a2975e53
diff --git a/kde-apps/kopete/kopete-20.04.1.ebuild b/kde-apps/kopete/kopete-20.04.1.ebuild
deleted file mode 100644
index 0665edce8020..000000000000
--- a/kde-apps/kopete/kopete-20.04.1.ebuild
+++ /dev/null
@@ -1,185 +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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.kopete
-https://userbase.kde.org/Kopete"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="ssl v4l"
-
-# Available plugins
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
-otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
-
-# Available protocols
-#	gadu: net-libs/libgadu @since 4.3
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
-#	meanwhile: net-libs/meanwhile
-#	oscar: NO DEPS
-#	telepathy: net-libs/decibel
-#	testbed: NO DEPS
-#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
-#	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf"
-
-# disabled protocols
-#	irc: NO DEPS
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	qq: NO DEPS
-#	telepathy: net-libs/decibel
-#	skype, sms (until fixed)
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-COMMON_DEPEND="
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt5(+)] )
-	meanwhile? ( net-libs/meanwhile )
-	otr? ( >=net-libs/libotr-4.0.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		app-crypt/qca:2[qt5(+)]
-		net-dns/libidn:0=
-		sys-libs/zlib
-	)
-	zeroconf? (
-		>=kde-apps/kidentitymanagement-${PVCUT}:5
-		>=kde-frameworks/kdnssd-${KFMIN}:5
-	)
-"
-#	jingle? (
-#		dev-libs/expat
-#		dev-libs/openssl:0=
-#		>=media-libs/mediastreamer-2.3.0
-#		media-libs/speex
-#		net-libs/libsrtp:0=
-#		net-libs/ortp:=
-#	)
-RDEPEND="${COMMON_DEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	ssl? ( app-crypt/qca:2[ssl] )
-"
-#	sms? ( app-mobilephone/smssend )
-#	winpopup? ( net-fs/samba )
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-#	jingle? ( dev-libs/jsoncpp )
-
-# tests hang, last checked for 4.2.96
-RESTRICT+=" test"
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DWITH_qq=OFF
-		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
-	)
-#		$(cmake_use_find_package jingle LiboRTP)
-#		$(cmake_use_find_package jingle Mediastreamer)
-#		$(cmake_use_find_package jingle Speex)
-
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			jingle) x2=libjingle ;;
-			xmpp) x2=jabber ;;
-			zeroconf) x2=bonjour ;;
-			*) x2=${x/+/} ;;
-		esac
-		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
-	done
-
-	# disable until fixed:
-	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
-	done
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! use ssl; then
-		if use xmpp ; then
-			if ! has_version "app-crypt/qca:2[ssl]" ; then
-				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca package with USE=ssl."
-			fi
-		fi
-	fi
-}
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 29baa29cc5b2..fb15aa12492d 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,3 +1,2 @@
 DIST korganizer-19.12.3.tar.xz 2221184 BLAKE2B 1db60c9021245fbcc6902bb6a64d107d8f7e941c04315aeaccf8e7f946c9f4397d8c0605660091e2c638897691641109763e53238dcd759659af1cf895265a78 SHA512 3e23871d55b3c62eae9b7cfda70b311f61fa44c998e8ad844a0b9aaab11acda5527ebc8f253392da591cb38aaac04c41aefb827972bb2eed4884dbc57715e29e
-DIST korganizer-20.04.1.tar.xz 2240224 BLAKE2B 6f580c3b0870824b9ba79f2b0f061249efb3a1f06b5d895fc15ca03e0819568131529f3d7b005ca61584d0f43a267eb6235bff31f816d57b51236a158cbca1c0 SHA512 8014164d5cebfb9fdd62554b06195003b0e788c43f8d6c0a7481b63b3ec0262748f2288abfd3298e2920836f8b7c02f44ca929c93d4c1c4a5bd716e5234e22a9
 DIST korganizer-20.04.2.tar.xz 2240516 BLAKE2B c3ab3529d4621cfa4d01912454ed236c8d3e6e9c3830ba24330afbdc10cd0d2f6ae8802f8a518276269b9834988b0da4d10ac22c5b615b676058fba280089403 SHA512 212e5816de31254ff021c38bd9886e080385b90d9af2b9f92f789f9f42c4aafb5ac4ed82fa3bc3fc72646e0f96faa1bf108f3bd2430b7742f3ee6fad6783a5ad
diff --git a/kde-apps/korganizer/korganizer-20.04.1.ebuild b/kde-apps/korganizer/korganizer-20.04.1.ebuild
deleted file mode 100644
index e0150a4ff6a6..000000000000
--- a/kde-apps/korganizer/korganizer-20.04.1.ebuild
+++ /dev/null
@@ -1,97 +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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://kde.org/applications/office/org.kde.korganizer"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/qtmultimedia-${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/kdepim-apps-libs-${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/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/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
-	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/kpat/Manifest b/kde-apps/kpat/Manifest
index cf24b389ed5d..7e13e282c888 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,3 +1,2 @@
 DIST kpat-19.12.3.tar.xz 3578148 BLAKE2B b69f62b47aa91dc2976432810f960e978d5e87bc1b4db65e169d1ae222eb48d5b50d1225b6910d79c03137320caae778df0898f6e053a7d4bf759a0be8950f24 SHA512 c19651e717b7c99ccf533c72876ee9d848cfed04680b2e580f0e61028045bc1aecdf8d449d5f40a5e4f0d2de29207cb6d1344874126fa831462805c64b6b24c7
-DIST kpat-20.04.1.tar.xz 3577156 BLAKE2B 438333ea09a019c5790b67cf9f3fd60bd713b0283ba2f4f46ff1b00d0083f59600dad20f065b807470d53ad83264dfbfb4ac5d016c33d011d8f6067fa7535c3b SHA512 f0e45f2e39d66d9df889ed9bfd72b584bda21901d80ab789041d7d1f460c6670a6389e5d640434996fcd9116162023d17476dc80f3342e60f01b7dc744fa5caf
 DIST kpat-20.04.2.tar.xz 3578676 BLAKE2B ad7a03bd68c332ba956e9ecec0740d559fc5b0281c6766deba78a815bf690a8a6560d2c06242343d678df25e3e47e9c88ea30d7fab9d288356a2987ac1bf86ae SHA512 60ebb6b4278a9dd91d34ab17b04d8adb1d4c48039527b0b86df8cfe91bcadc517462ebcbdcfb536946db3fb666be837cd31f2540ef81ed061e939d7b720485d5
diff --git a/kde-apps/kpat/kpat-20.04.1.ebuild b/kde-apps/kpat/kpat-20.04.1.ebuild
deleted file mode 100644
index c8b4451e9a00..000000000000
--- a/kde-apps/kpat/kpat-20.04.1.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_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE patience game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kpat
-https://games.kde.org/game.php?game=kpat"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-games/freecell-solver
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 33a8bf4216e5..24f3b1aeafb7 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,3 +1,2 @@
 DIST kpimtextedit-19.12.3.tar.xz 168504 BLAKE2B 2142160c72403157737c80bdf8a4e0eaabca8091b2d62e0393dfdd1778e69ec31657476761fefe803b5f53b4de02c453e3b5746e24fd5f4ef29737b9dbbf7ac0 SHA512 116d54e99f89e064acd6a699155b395327a4e64b8e63087f83cad8e652cbc8f7fa6a892f607f21bc7d6a998e5e7ba8e472a95ddfc490534602198930bac30a6a
-DIST kpimtextedit-20.04.1.tar.xz 178520 BLAKE2B a889c47758793d1c76008f2ed0d7235d7dd0242bafbd5e66e55e38981cc51b9c9c90a47cdf372c208a83fa81a3428c69bf7803c7c28e02aea3afe227c19ffddc SHA512 5007c727492530cdf43f36cca3ebc0c9a73994da8a15ca527620da36e491fba0c5d1506c0340609267e442c12ac3f04ee9424ea45b49898e02cf95e5b3387aa2
 DIST kpimtextedit-20.04.2.tar.xz 182096 BLAKE2B 78dd2b65ea32fb2cb4efc20398f97a7c6d4afe87fccd06313ccb5988bac1d3b512c972a5ea0f1baf98859795d83abe73cd287ace34a3b808390a8fdea7a4d0e8 SHA512 045fdf526c3d0d0befb48050cb7e7035e56f157ac6da96c113e1c463f020ffcf93508e9ddf35c61f9d508f948f4371957d053e1d84f0788f2612d0b6b94db0e4
diff --git a/kde-apps/kpimtextedit/kpimtextedit-20.04.1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-20.04.1.ebuild
deleted file mode 100644
index 8a50a4a1a392..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-20.04.1.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_DESIGNERPLUGIN="true"
-ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="A textedit with PIM-specific features"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/grantlee-5.2.0:5
-	>=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/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index 59a8ac6f2898..2ede311ea165 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,3 +1,2 @@
 DIST kpkpass-19.12.3.tar.xz 23264 BLAKE2B c9f092123f887a6c39eaa5ea5235d39afaed7bf1c966e7489520e0eb35e1e3374262c7c88d566abe739fc481954dcd4e1b5cc2e511ecd8ceedf1bcca1fb62dfc SHA512 970d81c7f4f4fab63005b71aa6b4b668a1e7e1301d4c6c16bddf42071d95d588e3a00f0743fcbc38844595be42a13089dffd8303a0bef61c4f26498a6f27416c
-DIST kpkpass-20.04.1.tar.xz 23340 BLAKE2B e87ecfc649d78154d39e70515b8b6fedc94e9fb50887b253043219a1bbbe2ac09030ac57fe6eaac04ff4256f88b93b62ab4c564745b0476c943bdd3e4b9c2aaf SHA512 5828cb20115e925629411d6f8803456f6d275ec33e9b6e1cff2ffe0e1a0667101781d6af3816354c0e8a72b95f87f7547e2307e5cc315b29bf24c82e6cd9f64f
 DIST kpkpass-20.04.2.tar.xz 23340 BLAKE2B 286057143a6be03d205e9d17e4feb046fb68d78b5f440875c15a68aa28885f689cfda8f7fdaafc67df72ba00f13fd6e2235b833e9cda91a58b0bb1c0f9200464 SHA512 179bd500ed33b78958f35e27fb7bddd52eea08fac6be8ddfe537dec3a07910ab1e89fb1ac7c0873e1c7f1b700c4e0058ec8c5f0876c53fa4349a0872f04981d3
diff --git a/kde-apps/kpkpass/kpkpass-20.04.1.ebuild b/kde-apps/kpkpass/kpkpass-20.04.1.ebuild
deleted file mode 100644
index fa3c2c1d3590..000000000000
--- a/kde-apps/kpkpass/kpkpass-20.04.1.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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library to deal with Apple Wallet pass files"
-HOMEPAGE="https://kde.org/applications/office/kontact/"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index 05fbc515ccda..bfe5d8266ce3 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,3 +1,2 @@
 DIST kqtquickcharts-19.12.3.tar.xz 25708 BLAKE2B 70bb6bb9a0d64fc8e7a1c74724bc4a0d17957b44601a3664b7df596009355362f2990c63582fb2783e463ef7eb4fd715d9fc6a15df5209284e9f65fa86c9d259 SHA512 9659d29bb079b9229109b75216839f2373f435b54867b8837eb2caeb1de519c127cebe2ce833ef2e03680e70e60aa42314d7a8ddc146616699aae3e04fb481c7
-DIST kqtquickcharts-20.04.1.tar.xz 25636 BLAKE2B ec62b7292804bd8d394009d49be04b83e66cd3f5dd9123811029518336012cb1e7ecf46fdb7e8847eb30f30da43ccd6d94c5b699a8defe4d0d9d3b1cc62afe6d SHA512 c121150c3e3fdf2fca20309f1c49028134c68a6a04ef5b0b73fe59260872db46992dc7096c460faccbfceed9ba4ea3f69574752906286428acec740cda46333f
 DIST kqtquickcharts-20.04.2.tar.xz 25624 BLAKE2B 42c5eba0a5bfca564b477fa437e9d8812d33f84b7fb9e30b09ad9a6f82190f7cecfd72dbdf5a7f74c5272a671a3a0e17467b4d3440ee0302cc4db3968543e073 SHA512 3d43a2e559de1739afa76bf75cf6dd7b936233509062f9ae04d763e4dc618cfcd2ec2d03abbfe5afb1ace2eb8d09fe35db896f68dd7bb778dd2c104f2107c058
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-20.04.1.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-20.04.1.ebuild
deleted file mode 100644
index 4933b8cbbdf1..000000000000
--- a/kde-apps/kqtquickcharts/kqtquickcharts-20.04.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index 9cefaf15cbcd..752e02dcc0fd 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,3 +1,2 @@
 DIST krdc-19.12.3.tar.xz 1424052 BLAKE2B b03514265d0e7af5e75dab5a224f61b43f33e36a1617dac7e99270e82e5954fc8910072e11561fb51fd1d8ee7287aaf24371d9b1d1022418e4e30defcb45ad48 SHA512 f752180980eebc9aaee92180d3bbc9e4db723ef0ed637b3ec66a5944e30eba3c224972d4e8f543ee1c32a4e62a0d90d37c4f82f575e94a3ac8d9dbe5feb63474
-DIST krdc-20.04.1.tar.xz 1425064 BLAKE2B 16aec20fa10fbbada8a604fbf05c619579c4a98db29497524e23ad0ce1d1f1b57ae816c96d6094c707e5b72a28c2b3cc84a5ea279e223013359829d6d21764e6 SHA512 1bc332e331bfae3865566fd68a4023925cba7ad62f08c1537c235e0e007bc7c4fad1816b2d1fb66ff5854db09104c407e8636a53f94a8d303479c3768f086aa9
 DIST krdc-20.04.2.tar.xz 1425020 BLAKE2B f6c7416710292511a34426f6d9b5ee6aef8c619683a581359d954fb6da556a1994d218e1544572c952f3f4e904cf33304c5e4743603488dc7b7ab7810b0d265a SHA512 b57689ac2e3a06aadfc256458b826c081717291b6d40660d736ee34cd3f2f1bcc18508697e6049248e11b9dbd6e4fa9f5a932b233659119483a6e42f26d36692
diff --git a/kde-apps/krdc/krdc-20.04.1.ebuild b/kde-apps/krdc/krdc-20.04.1.ebuild
deleted file mode 100644
index 3982b61b31e9..000000000000
--- a/kde-apps/krdc/krdc-20.04.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Remote desktop connection (RDP and VNC) client"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.krdc"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+rdp +vnc"
-
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}: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/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	vnc? ( >=net-libs/libvncserver-0.9 )
-"
-RDEPEND="${DEPEND}
-	rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package vnc LibVNCServer)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index 5b18b0f33612..81335819075f 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,3 +1,2 @@
 DIST kreversi-19.12.3.tar.xz 945460 BLAKE2B 0fc42ec2555c2d2a87651782f6f8850f1ee684c9d069b996945b09de7a9daaabefe66da5c523432fe69806004ce308f5073625d12733aae3cebf9d385df99c64 SHA512 244edb7cc223f8882b4f2ce77318f91de79d360ccace318fc3f441fde30aad2438e672693f449fcf7a27da72736d50aef26889ac13823a3b9c5517b015c5cda0
-DIST kreversi-20.04.1.tar.xz 946852 BLAKE2B f0217be08a79d7a243a5b0cc76b39b036cda2a7ccf54b63de3f9ab468dfc412073ae72b7c7681b77fd5b11d31e4b11739da20a02e3d5d3b01026bfd835e28799 SHA512 f53f85f7cca1860584367623c203fabaf6bffa556b74bd256a2fc079680eeaea4e598817ca549683da6741bbe65249b3cb06f859ef6961415d376830e289d2e5
 DIST kreversi-20.04.2.tar.xz 947024 BLAKE2B 238e2ff828cae56aeebd4740daedca17db30e1273eb141ec96f37260c2e737bd87009e69ea0031290404ab5b736adb3a377dc37558baae14157d47a9d8279595 SHA512 cd085a6079616bd830641fb94a7d840c9434338aa2cfdf95d252375097e6d68ed9be840f0398de6c4fcd2dd89c81d1836fded8ea2313ad14cb43a68fe0ff83de
diff --git a/kde-apps/kreversi/kreversi-20.04.1.ebuild b/kde-apps/kreversi/kreversi-20.04.1.ebuild
deleted file mode 100644
index 3acb6d667384..000000000000
--- a/kde-apps/kreversi/kreversi-20.04.1.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="optional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Board game by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kreversi
-https://games.kde.org/game.php?game=kreversi"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 0dc1f4696d14..3feccee6603a 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,3 +1,2 @@
 DIST krfb-19.12.3.tar.xz 1276964 BLAKE2B 59fb41031e70711888992ac91e0083f5ef5afb0590052ba5ce529073e361d6ad2656590ba2f4bb32c6129a071b0a30ef0095b061f6b075c40ca77152c02439b5 SHA512 d4cd5957034a42164756e226c8596816bcb19aca72f3b4b1af6967c4ab9881aaeed50c396630dd434dd9234fc3f8ddfd0783926f5e7f72a7de101a0c98ad4f36
-DIST krfb-20.04.1.tar.xz 1276728 BLAKE2B 2b4d00f1b9b308df6dd83ebb874db7a787584edf02865a872f9b11c81c588c1729984aec2888b25997eb8c684c0fe2ee4c1ccf20b55282b5047c488f6e74dd56 SHA512 06840c61fc5a771c1acc0e0cbea6c49aa67de5964e75bf4ee617bee0a002036e48e70fa47c3aeb7f376d71db7245cd9325c15fb5c057537d68a9752d43ae6c7c
 DIST krfb-20.04.2.tar.xz 1276828 BLAKE2B b477d7d6ba9c23bce8079450d68ea0ba35b15303eadd6c3e894fea1333882d4bf7024c6aa9eb64b5d0fe84d66b87da6262ee5d4e8e76f95eb02f34c522cc9763 SHA512 3435f095faa9e01338fc2f8937ad81aa61efe177f4efe2bf22d40dc95df5e4c100bd6f822c7a6bf788a05a40c034cbe57c00c6c478f607d846ebdf50b2c47358
diff --git a/kde-apps/krfb/krfb-20.04.1.ebuild b/kde-apps/krfb/krfb-20.04.1.ebuild
deleted file mode 100644
index 74a9900752e5..000000000000
--- a/kde-apps/krfb/krfb-20.04.1.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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="VNC-compatible server to share Plasma desktops"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.krfb"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="wayland"
-
-DEPEND="
-	>=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/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=net-libs/libvncserver-0.9.9
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-	wayland? ( media-video/pipewire:= )
-"
-RDEPEND="${DEPEND}
-	wayland? ( sys-apps/xdg-desktop-portal[screencast] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland PipeWire)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index b475749b6853..61ad4b20872a 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,3 +1,2 @@
 DIST kross-interpreters-19.12.3.tar.xz 151796 BLAKE2B 9eca212f0f1dc12b3fcc7fa2b0d2c35421c1eb13016363005702635a566f240a074032c78d3a0d238b624a75d589dfc6f44aebcb15722436705372a1506eb095 SHA512 7b905a61ffb631002b1d9ae159943f0fbb793ab7eae09d92238dc892f754ddbf7a9f189d747b93b6952204fde1b3aec874d2708782b8be6e1da7db53b805942a
-DIST kross-interpreters-20.04.1.tar.xz 151240 BLAKE2B a6795df0ab57762a3acbc8e4c43c90e3ce19a949cd8d1c08a6c2e1252599554e0894627e4c99d7d1daf7b65a5a639d5ee81d18c5de70da82e2917e4bd73d25bd SHA512 85a66323dc762f5e8ae45e02ca26dcc04275589e90f24fcd0d80d064c0ce566aeead8dedcaae7bbc645bd3a0f96b9c5b25f0d1a6ae2937cd5b44cd98ef2ce68e
 DIST kross-interpreters-20.04.2.tar.xz 151292 BLAKE2B d3b9865923dcc7b00ef782357e4173dc28a63153802691e3e71485e8560d53aace24f92171ad49e6e7867acbed78b3129601a9a0f70b43c557fcf8595100a850 SHA512 6d02a560907dda71943afe4f64bf9bbf6b90ce44800724721c98c81afbf9fe693ffea6f001f3f099871c934029d0e6dd7e38759c8dd9e0b417f10efce8f1e9d4
diff --git a/kde-apps/kross-interpreters/kross-interpreters-20.04.1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-20.04.1.ebuild
deleted file mode 100644
index 31e8be56dc0a..000000000000
--- a/kde-apps/kross-interpreters/kross-interpreters-20.04.1.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
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby25 ruby26 ruby27"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org python-single-r1 ruby-single
-
-DESCRIPTION="Kross interpreter plugins for programming languages"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+python ruby"
-
-REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_python=$(usex python)
-		-DBUILD_ruby=$(usex ruby)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 21465e84b52c..a7ca1d8c8160 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,3 +1,2 @@
 DIST kruler-19.12.3.tar.xz 250924 BLAKE2B 8c935086e01763ee4051bf9ab99fbb07296445b22ed490ae39e2fd3c1a2b633ff21bc30b2c47cb963dfcffae7e972e6482d1c4f24544f2afadc92923d44eb7b2 SHA512 34f9cd2c9076594f8984428eac971ceed91798011f6aeb7ec2ba8c8fbec1829a29da8e603a5a66a0e41e423bc81d181c549c43d2529aa23cb421f0267b5d80c0
-DIST kruler-20.04.1.tar.xz 250488 BLAKE2B 76ef3eb2624f82622db95eb2faade1683058b48f45ec33b0f4df1ac41e660ad18919b30290537f63d65187b4a70a3fae7bcf394d11c043f8980a72fa521dd7af SHA512 b2ee3e869a38729cedee86dafec1e0eb860a7fde1aae6ba9bf6625626a23cf2a5f384c3ff4279231bd560315657dbff41c01d4c6ef89dcaa39063714063d93d6
 DIST kruler-20.04.2.tar.xz 250528 BLAKE2B b6ec0dc84e63cbfc0842860dcc84cd9e12c6fda312fb85502545d792a97bd3f074c6d82ee9d6bf79194ee749bbece89d84993b56179c6f0e68ca4e99733824cf SHA512 be3b87dff820f33387493eab6cb31527b61029246b11c9506caf5c646fe8adaaa278d67a3644946f3286ce3f1b1089b3d7b803cc8794e6ad9b4554e1b3e6d14e
diff --git a/kde-apps/kruler/kruler-20.04.1.ebuild b/kde-apps/kruler/kruler-20.04.1.ebuild
deleted file mode 100644
index 51dcef143500..000000000000
--- a/kde-apps/kruler/kruler-20.04.1.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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Screen ruler for Plasma"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.kruler"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index b2b9ddf84b2d..91071efef636 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,3 +1,2 @@
 DIST kshisen-19.12.3.tar.xz 823152 BLAKE2B 820f0d1866fa769e7dbbaa806af7cd8a181594f62328ee79531641efd774e09c20816806f008927fa08409a4c48505eb3a2caefbfcb7f8ec2d3c90796e1df2cc SHA512 32e842b7c9de58ac8d9715c1f947295a73d88b940727990a8c5d7981b807171849eb95d68a623ec6c1819525cd0271777f283a40672a97b80278d4a6074557eb
-DIST kshisen-20.04.1.tar.xz 821760 BLAKE2B 9138f5bc0e5b9d039e8f587e01c2ba8c04ac85141be59c9ccf43bf369df12cfd57c1a0a83d1bb54f718b907d9989c7f8062e1408c6d1b9315f05a2596490faea SHA512 000488b94ec745641112d87f34b6d9f3db672622b9fd825e817fe23ed08cc0005f4722e7cedb6d1388fd348c378d7cada5a6954e971d59d97023d20889d81567
 DIST kshisen-20.04.2.tar.xz 821976 BLAKE2B ac9a97f2ecb82667efead3498fece8c3784d357559927d28669b98f3b77da7f5ae418a55ecea4c7c1e1a73ea9f45da803fe4b82a8abf6e7c9537425817cee4a1 SHA512 e8036e3dd535087f4b4911873302f91277211e85ddee130b522a28262b776529d46b63bacfbedf7d90bcd72ba4b76cd507d77fdebe3e0f3d64b914032b652728
diff --git a/kde-apps/kshisen/kshisen-20.04.1.ebuild b/kde-apps/kshisen/kshisen-20.04.1.ebuild
deleted file mode 100644
index e755b8389d95..000000000000
--- a/kde-apps/kshisen/kshisen-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Solitaire-like game played using the standard set of Mahjong tiles"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kshisen
-https://games.kde.org/game.php?game=kshisen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=kde-apps/libkmahjongg-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index f72606615c2a..1f88188e90b4 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,3 +1,2 @@
 DIST ksirk-19.12.3.tar.xz 6991768 BLAKE2B ff0774a555717a56b82d4aa3d9f3ef2dab9f12a69ba083a52dde86001599a5fdfede4bd28d9f364f7353e5d57d365fd00bf2bce1b9475afd9a62e984c144cfd5 SHA512 105442d9c3229cda57d4bafa5f77b5fbf639d6488eabfe405ee82ce0365781efc17526a3dc903a1c730617474c61f037fd81059b72227575920769fba7bff8bb
-DIST ksirk-20.04.1.tar.xz 6988764 BLAKE2B 2d3ea2ced80df2b1ce9e5d2dc508fe7853f158688bb0f4b39c87d91207893f01a327c18dbf65afdd10d01b0969a1ee6ec30a32fd975b576fefde0f5b48c00fcd SHA512 83035f57178207d0d01a0908995f9f299bf1548e20be75e34c7b497550626c9122f2c3cb18f5d15d0e11404179c1fbdbd0bc022733d99fcc9ca98ce89b13bb35
 DIST ksirk-20.04.2.tar.xz 6989044 BLAKE2B 6d5121f1c5c9402ddf1f5a59ea23956ba019e31eab42ae2d78cc7b04e1a19ad08e242c86444fdb134c679866527584b248fbc988ca09a0c1db58b6bb315f43e2 SHA512 fcec410a67bb2bf34a688e677b794da1b0f11afb869f79560c7e563f2f7a2a82b851c9097f5e992a9673f05bf167dd2547124c8a23aec44d2ca367c8b1de158f
diff --git a/kde-apps/ksirk/ksirk-20.04.1.ebuild b/kde-apps/ksirk/ksirk-20.04.1.ebuild
deleted file mode 100644
index aa942c98340d..000000000000
--- a/kde-apps/ksirk/ksirk-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Port of the board game risk"
-HOMEPAGE="https://kde.org/applications/games/org.kde.ksirk
-https://games.kde.org/game.php?game=ksirk"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	app-crypt/qca:2[qt5(+)]
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index e39b3a965a64..58b670d771e8 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,3 +1,2 @@
 DIST ksmtp-19.12.3.tar.xz 41044 BLAKE2B d79639d51a87500543d63e4c3b19b6e9272b590729155e1359e6518a7fe32511b82acf84b612d90f7177eef472e005cdf76215c8cdab762a63f7af7aef6f6cc0 SHA512 f3912274d4cc007b8967abd07055c539b609069c5ec0769bfa20d6a2247a4bd43d88526693aea36705b62c5a6c8d0b51ce13e9a36973ec019adef547239ff589
-DIST ksmtp-20.04.1.tar.xz 41284 BLAKE2B da797e62f207031cae2176cad986a106c9e32d9b3d37eba94fb41554b7dc79d240aab80ffb5d6a136369214312a7e97511324ba41a01832f773e804e33e2c5f1 SHA512 f8e573ec91aef270dd647795897bec368d2f0ab5d44a3e40de34b88859b03b965d7bd931e14463d74194b9de63c3cb40febbee680770b50df6c16b336213af41
 DIST ksmtp-20.04.2.tar.xz 41556 BLAKE2B 42af019cd6d8c6fcf98a7975975cb12370dd531779d67499f42f1f741fb451f5d056137fd0f79e1197f83855fd3c8bc26956d542de5db2f31e11f07599eb1cca SHA512 f8ffe8c23bbb2590efd28330cfdff2530fbc46f9b2be846a3ae110948ad4f84fb30f1aaa9758c6f0b27f6e5a1616edb097d885726255031e24f4c40941a8454e
diff --git a/kde-apps/ksmtp/ksmtp-20.04.1.ebuild b/kde-apps/ksmtp/ksmtp-20.04.1.ebuild
deleted file mode 100644
index 37b5cae6b807..000000000000
--- a/kde-apps/ksmtp/ksmtp-20.04.1.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.70.0
-QTMIN=5.12.3
-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 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	dev-libs/cyrus-sasl
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index a99cf4af58b6..827464e2c66a 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,3 +1,2 @@
 DIST ksnakeduel-19.12.3.tar.xz 605496 BLAKE2B 316330b3723cd53036c0f01aa61f1a0088df4e143f7ff895af84a50eb02c19a3d0f7b1207dca36812fe3c37c19b6d524518d2490d5845be1502fa1c0f671e762 SHA512 d3923b4614a9134595aeca0d831f473b39ea94651bd2a997b3cafc98feda141991dec273becc1dfaa9cf8651fc2a7bd13fea31b84529ca0d4966a6dd84d30da6
-DIST ksnakeduel-20.04.1.tar.xz 605604 BLAKE2B a6e193a66c54412ac7c26b1592635df1e476c0051305fbfedf93ecfeaeb87c9e8fedd48b399203a338f636e40bf8d4a6397699ba42d5a8a0f79fe96e175cd8f0 SHA512 d61accbb991ce22805dc0d0b952c0fde0559c445e0543c7b2c81627121a908a77d8472430216928fe0dbc4f9eef5c7ef7ac1955e60d07107a8438e845abc3e54
 DIST ksnakeduel-20.04.2.tar.xz 605764 BLAKE2B f6e3f8702bade30801c77326fb6248492b1824745ceb6b65ab08e7ea807fd2c36822ecfe805480a4566f16ea1ff1c4e8902669c861c39eb830780bf0740f18b1 SHA512 9e0c73aeb691a2492b08bedba30f17ea1d3441bc83cc04216ebe5c057be8501447f2a394fa83435c6100e240bd465422782caa13d63aadc422615970ab9c0ba7
diff --git a/kde-apps/ksnakeduel/ksnakeduel-20.04.1.ebuild b/kde-apps/ksnakeduel/ksnakeduel-20.04.1.ebuild
deleted file mode 100644
index 150dacfcfe66..000000000000
--- a/kde-apps/ksnakeduel/ksnakeduel-20.04.1.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_HANDBOOK="optional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Tron game"
-HOMEPAGE="https://kde.org/applications/games/org.kde.ksnakeduel"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index e005a6e30cda..1fa0e4869cde 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,3 +1,2 @@
 DIST kspaceduel-19.12.3.tar.xz 611328 BLAKE2B 25f84ec01d7d5e7eeb9d7c9b0c8343986be109e13582a9c25af8b98c5fe54530f0dab3a6ba82d9703c3a026f444270fe1cf337443e88b29cab2c82e6c5b5c0d8 SHA512 a7965b55fd521bb5aba8c9aa9dfaa1e86c3d88fddbd76176dd4fcb52db1e76fd1bf4c44aa255a46568c812729efb76e4becc532b48761adcec91f834cb610ca1
-DIST kspaceduel-20.04.1.tar.xz 612260 BLAKE2B f178e675f004b194bc31dc3fa8b1ffd0e81273c194e8a83b4c605622d9864e3d6a78793f3e8fe865ccaca83de5d9ac59599acd6ccd6775388ef9ce9a2a5f1b04 SHA512 2e94ef356445af04e3e441aba75cf7537377dc4259b5299e1d51a6f0f5d5e91675f7c4ee1844a7cdd8ce22701f1ca6ad98f942620e94ccc798e4a1e712d50cac
 DIST kspaceduel-20.04.2.tar.xz 612404 BLAKE2B 3159c0b880281eb6877f822cc0f1dffc084aefb10186bbb288320a6395730c1830bb2e0ac1d7ab01b67597f0bb12fbe1f66b40593ac27f75f6b818f272d5f1a9 SHA512 4bb5fe8fe09b12a967336b3213ff0a894e68bac076e9217634850034726aa068a19ebc0fca38e22ec1ee69b26c974fd4f85a247c404857a22e61049cb7546b70
diff --git a/kde-apps/kspaceduel/kspaceduel-20.04.1.ebuild b/kde-apps/kspaceduel/kspaceduel-20.04.1.ebuild
deleted file mode 100644
index 2303c130fb36..000000000000
--- a/kde-apps/kspaceduel/kspaceduel-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Space Game by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kspaceduel
-https://games.kde.org/game.php?game=kspaceduel"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index 76decac08283..8d966fee4ceb 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,3 +1,2 @@
 DIST ksquares-19.12.3.tar.xz 261084 BLAKE2B e4f14989c66c6b2ce8a6ea1233224b12690efffb07cdee8928304207b77755d1284cbe0d040e6e31dd12c57c373d179024e9a340c9cd09f2a19ec4a715c78332 SHA512 c0b4fd109f2873da18a9ae5df837eb0574419ae8cac0e885bcc5c3ac577a0bd2dc57105147aab46e58fab7ee66dd19e68ea1d1686f06fb8dc69d6e4e1afd6760
-DIST ksquares-20.04.1.tar.xz 261072 BLAKE2B b30a7311c7a1f739343d91399a5bc653cbba23397aeb29e23a755731da27b7584e5d36a233d328d83fcc0891eb2e8e31757abbe00718668b074e34d020face2d SHA512 7a6e892d999f458546caa199752b939987d1db129257713130b4b07554af2709817fb6b965bf2e4d3fd7bb1ddbd29adf39b9df75696efdf2fc9b6d935cad2924
 DIST ksquares-20.04.2.tar.xz 261128 BLAKE2B 14595ef4a653a361dbb8746daec292879d31551773eac583720523f1f514be4a0c9fafe964e1034e293cbf8303b8232ea2df44c8ae76050f4b4056bfc77c966d SHA512 f89f7e086867b5cba79a992b45f5b7b406adb448d1f9fa318f100df592e946bd6ed738beb308349eb5fecf14d6273f133735d69870ad343fbe96943ebf9e1069
diff --git a/kde-apps/ksquares/ksquares-20.04.1.ebuild b/kde-apps/ksquares/ksquares-20.04.1.ebuild
deleted file mode 100644
index e060ed5924d4..000000000000
--- a/kde-apps/ksquares/ksquares-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE clone of the game squares"
-HOMEPAGE="https://kde.org/applications/games/org.kde.ksquares
-https://games.kde.org/game.php?game=ksquares"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 25a321d541aa..321c74da933c 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,3 +1,2 @@
 DIST ksudoku-19.12.3.tar.xz 1647532 BLAKE2B c4cae056ae7ab70bb5b1763fdf48e24dd318e7d5fa4f7b1d9b5d05827f07d1a82e186c95c4543a8d2666f85d80c2bc53810c4ce7b220776a2af42164a04270ac SHA512 0f9bd802525ce6a3215f92c142322143532d37a82dff8f4502eb848280ee74e712fe540ad40f477e99854a23fecde777dd5de7f6b5185a277b21908703b88f64
-DIST ksudoku-20.04.1.tar.xz 1655784 BLAKE2B 8b63ed07108362b9efa9781f7f01c218c2163e81c76e2c3511736c734ef045a38e3eaa393c5c0e4954b2e9b183b5c7b873aa7bdb8d4b6982a68e8faf3cbd4e63 SHA512 1aaf7131be27299c6427f0094f06e4edddc94503bb2c0d268810363592b6b6aa666ec19d361a65844de42abe923e57351d0d15b86af2c52a2fa177d5fc84573b
 DIST ksudoku-20.04.2.tar.xz 1655696 BLAKE2B f25c556464bc15b06ca699b033537584208e39be896d9f0f420594a485ec05550580a724ebb64e0b427e904dcf02f2a0c61ea15cdb1bd4d1df2e147e5f86dcec SHA512 7555e2ecd8b9f6f73c2e4689d50658b99b4ac56c588561e84cf0b3048631f89e03a9f3ecc8c6863db336f5521f0323dbd67c4e975f27b6c416c8bc28694522a1
diff --git a/kde-apps/ksudoku/ksudoku-20.04.1.ebuild b/kde-apps/ksudoku/ksudoku-20.04.1.ebuild
deleted file mode 100644
index a87eedd82083..000000000000
--- a/kde-apps/ksudoku/ksudoku-20.04.1.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"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Logic-based symbol placement puzzle by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.ksudoku
-https://games.kde.org/game.php?game=ksudoku"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="opengl"
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	opengl? (
-		>=dev-qt/qtopengl-${QTMIN}:5
-		virtual/glu
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package opengl OpenGL)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 44b796ca5e0a..b84cc52c6cb3 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,3 +1,2 @@
 DIST ksystemlog-19.12.3.tar.xz 1927732 BLAKE2B 75dde1b342663b85c2bfced7911da3e09484e9ef94bdeecf211cc07f0f84499f820ea87ac7e8b71c5808b03fbcdce628f919bdfb1bac91f1f23f0e1d10c11beb SHA512 88b12d12210b628d6470b1a73f28f0f01946158c3bb35be6bda14cfe5d3b75990149d2bf7f2077d030f5bc34df0dfea1192161c27128927d62d11d2bde8de530
-DIST ksystemlog-20.04.1.tar.xz 1929568 BLAKE2B 722b2be42d7988ef0a62d4b378a4cca2d27c2d58d96b58eae3c8502e0d3797f910983171ddc68a64c5a777d23c738b920c678eff9589d2d799751089efe1995b SHA512 d2b2269be0beec03788982822c7cd4512338ead6de7c1080066e654253c38d6f5f4d0c6d2d301034b77b22f73083fd0570d8a8320444b542593cf0ed3771bdcf
 DIST ksystemlog-20.04.2.tar.xz 1929584 BLAKE2B 791f97af4b2a8e8c7d104bea87f3a8a99d6ad871fc860dff043f2ba685024f4ab4083740c71436486f47042b37a87c6a7d1314f594631a5d13003be10361e01d SHA512 31bd99d2e389fe10be6d33442c950bad25477b58e6df6f525b7cbda547749f40911239b2841e541c33142f7dc7b1e4ec18eb9720864cc01b90be0f3bad279a65
diff --git a/kde-apps/ksystemlog/ksystemlog-20.04.1.ebuild b/kde-apps/ksystemlog/ksystemlog-20.04.1.ebuild
deleted file mode 100644
index d196e5e0b580..000000000000
--- a/kde-apps/ksystemlog/ksystemlog-20.04.1.ebuild
+++ /dev/null
@@ -1,66 +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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="System log viewer by KDE"
-HOMEPAGE="https://kde.org/applications/system/org.kde.ksystemlog"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="systemd"
-
-# bug 378101
-RESTRICT+=" test"
-
-DEPEND="
-	>=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/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if use test; then
-		# beat this stupid test into shape: the test files contain no year, so
-		# comparison succeeds only in 2007 !!!
-		local theyear=$(date +%Y)
-		einfo Setting the current year as ${theyear} in the test files
-		sed -e "s:2007:${theyear}:g" -i tests/systemAnalyzerTest.cpp || die
-
-		# one test consistently fails, so comment it out for the moment
-		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" \
-			-i ksystemlog/tests/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package systemd Journald)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 1c09b42bc67a..f98cecd53939 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,3 +1,2 @@
 DIST kteatime-19.12.3.tar.xz 286988 BLAKE2B ff706e682f2f46c6218affcfe52c84a1bd8cf8be9cd2cf1eaf2bc47a68c9d933c3013e87ce649efce9301900f81076d504b0e7880154c560b347591a1b51b76c SHA512 e35cacc4c4fa2c1a37915134687a43225701933f15683916ae094a0cc5fa033da6dc3f34e6116490c0d6d1532755dc7ee16046e8e2e0b853529cb4626a89df77
-DIST kteatime-20.04.1.tar.xz 287152 BLAKE2B 38ea9be188dbbe78ad1943d7e3c3280af4aaf5801bda575d17de6437c9e4c2a2b3effc7720f23553fe5d582a1c304097df4e44670e55a93fedbc8cf0cdf090a7 SHA512 c0079a1df57dac090d8a33fbde270b5831dda918c51c4c339a9a557b3373b6d7cb36520a328bb8b16d97034d24c425571e823036b08f81236503812b5003e05d
 DIST kteatime-20.04.2.tar.xz 287152 BLAKE2B fa1edd4527c0073460168ff1c7653255fa07c1db005e3b1cf3737cc052de348e06250fd3cfbade0f23b9e762b2cd0b4b06f1009d1360d15032da163f81bb79e9 SHA512 b3bc1b7c737d6630ec2bd26edfbbf0960cb5c81e4d435f9e07853485df349c94d3fa58219033809f1c006660303ebfc392dede371fdb56378adf6e289c41c626
diff --git a/kde-apps/kteatime/kteatime-20.04.1.ebuild b/kde-apps/kteatime/kteatime-20.04.1.ebuild
deleted file mode 100644
index 78179b01c074..000000000000
--- a/kde-apps/kteatime/kteatime-20.04.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE timer for making a fine cup of tea"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kteatime"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 2f6cc4ce2ac0..e8fcfd7941b2 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,3 +1,2 @@
 DIST ktimer-19.12.3.tar.xz 377424 BLAKE2B bce08a71c1c3035c0b605ade48bdd43ef73157890cc1b2d3a055705a322f10c34c8841bb7541babd120776a0c430e77325f49e6c0838cd6d856fc8217fa51cae SHA512 da075774292f911cdfbc28d3ce76b53cf6e9c3a91ff42c8b18334e8c680a87d08e3f22faf9b646342a7318c7096ed14de740e9e3558a71aed6ca7449b6d11358
-DIST ktimer-20.04.1.tar.xz 377824 BLAKE2B badb4916f31a6091786c92e206f38337bd606f5daaab2797d3bdb662ecdec4f7b0239f232e9d1f6b39373c284e2123c1085cdbe218977244d73ac9e733e28615 SHA512 f1b0f4520578302e669f58641dd45a0bea203da8e4779e151edec584f45ea445e60a6047cc32513b2d7a9f5a1293f378087413008c930217a2fb2fd7eb62b984
 DIST ktimer-20.04.2.tar.xz 377852 BLAKE2B 2c9ccff3f808558405b9163887376861f286ee14a6e984c3af1d8328b46558176f67ba45d29306a1fc416ae4c8d5b2c293535c86f27df23c68b3bb11dd9037ff SHA512 9c4b9e261f6107e1e8f15b28f1c131e55596f16d094f54c7efef671571ced23288e2f2311b5fa4ed235404ff540fb6982c2635383eb8900025dddb3d6ea882e1
diff --git a/kde-apps/ktimer/ktimer-20.04.1.ebuild b/kde-apps/ktimer/ktimer-20.04.1.ebuild
deleted file mode 100644
index 4ced01fa595f..000000000000
--- a/kde-apps/ktimer/ktimer-20.04.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Little tool to execute programs after some time"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.ktimer
-https://utils.kde.org/projects/ktimer/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index d630e9f940a9..94bf7fa79e19 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,3 +1,2 @@
 DIST ktouch-19.12.3.tar.xz 4929032 BLAKE2B 349f9dee1182d9e5a221584c5fae57df516839e1ade275ed5aaec27756b8199fef0d3163918212d64939b3eb42459b59f726cd465c8399bb463a04d3e4001b7c SHA512 1a3dc798e5e5c8d63419fbc2d9a70e3f872f00527575dd04cd5a8770fce0412a5445cd57c8716b9a6d613a360895f1f1e269acd963fcb3ccc99161b4efb412c6
-DIST ktouch-20.04.1.tar.xz 4936708 BLAKE2B 1c7a8c17b590c0cf0392b6ca5c58d54711efb73e735ca5f88e49771ea37b6a7f08d265c197bd9003ee96cdfecfff47a767eae1cc61066ea4545a6abc36420721 SHA512 5953846e50259eaa2efa9c40afdce0d7c23458ea76225409d1a6a9574d80763d0686e54740427fc48de90b0cbde697fd2caea85a305b3814d52ff8a5fe8371e6
 DIST ktouch-20.04.2.tar.xz 4937240 BLAKE2B 045ddaaf539bfcb9adf7fd9739e7d9d73b4fb8f3ec26cf8e4ac148646c83581aee18e4c93ec2902395d0e9ba52c57badcc3195fc5f60df50dae79fc5db00ca89 SHA512 05711ba7bf5013f584ca2d24405e7e9d1f317db792dcab68357d4762f8de86eae44387074332bd5054fe4e59fcbd98e5b3b37881c74aa3c51f1abb4a1bd7676e
diff --git a/kde-apps/ktouch/ktouch-20.04.1.ebuild b/kde-apps/ktouch/ktouch-20.04.1.ebuild
deleted file mode 100644
index d4637446f888..000000000000
--- a/kde-apps/ktouch/ktouch-20.04.1.ebuild
+++ /dev/null
@@ -1,65 +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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Program that helps to learn and practice touch typing"
-HOMEPAGE="https://kde.org/applications/education/org.kde.ktouch"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	>=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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb[xkb]
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kqtquickcharts-${PVCUT}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCOMPILE_QML=OFF
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 5d3cf8cee70c..7e77c6f3dc98 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,3 +1,2 @@
 DIST ktp-accounts-kcm-19.12.3.tar.xz 264576 BLAKE2B af1bd84b90f78d6f16824621aca7ad4b600e56e6f2ef02d70e84629761ecfb820a981811ac7bc7fd92ebb0cb44860a60304ab9c4433a69cee4fce3d0d002a4db SHA512 c7d5f80f379f2c2f7b91db17fc4d68afe2fd6744589cbbae2f8012f56ecac9b6ddcda28b01639770055e48c42e762c05d366b38c9e420a00fa08c9f1fd132ca7
-DIST ktp-accounts-kcm-20.04.1.tar.xz 262188 BLAKE2B a346215fe348f6a73dbb3453af9df0ef218a203e5ed65f07f792e82c8f1a9c4d0be221a144f6f46766cdaa1394ce27405a8bb38c24ead2d9ff983cca3aa6bbda SHA512 e446b44a63afcacf907b1d2f61883fc3f6f191246ec662f1e865b46fdb52da18fa9d545f212e94353fa18bcade9a9a0b15568b071e0f55f80f726888671b73e0
 DIST ktp-accounts-kcm-20.04.2.tar.xz 262132 BLAKE2B a8934c54a7726ddb7d90386685438623eda8a809d88b403c1e907f91a95637a6219afcc5f1c9a6ee20fffcb3f9b57a1f3558aa92762c93ff023cac43f09ebe24 SHA512 7fb74d1d7b354855fb41044353a982a375f2c10647a34a1ae9755072fc68216d0e55fff78137eb577e885e1fab0efc74b3366e05ffdef40492627ec0e820444e
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.04.1.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.04.1.ebuild
deleted file mode 100644
index c44a4c5976cc..000000000000
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-20.04.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy account management kcm"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="experimental"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/kaccounts-integration-${PVCUT}:5
-	net-libs/accounts-qt
-	net-libs/signond
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	net-libs/libaccounts-glib
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kaccounts-providers-${PVCUT}:5
-	net-im/telepathy-connection-managers
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DISABLED_PROVIDERS=$(usex experimental)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if use experimental; then
-		ewarn "Experimental providers are enabled."
-		ewarn "Most of them aren't integrated nicely and may require additional steps for account creation."
-		ewarn "Use at your own risk!"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index c3e611090c76..0b89660787a6 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,3 +1,2 @@
 DIST ktp-approver-19.12.3.tar.xz 37436 BLAKE2B cf60b196a5999532bcafe19934a3be076915559407599fb3949275b93fc6715796f15a8771921aa98c36b8d148973ae930665489a7fd575689989fa83ff78934 SHA512 48b430ee3c45522530f1497ca27b7f72c5bb990aba8ded01c6f4aff6a4352afa59bf90b0ab499a7c66bb295ede53f807f5a7b7b5628870fa5f9653d6205cbea3
-DIST ktp-approver-20.04.1.tar.xz 37296 BLAKE2B cea68f975b12b157a575c79ec3be09e599ec0f1ed49ef1fa79c5cc6c35811f77e74face1382d42497796b1ff23b5272672226167f85499aa61f457ec73f53cdc SHA512 cf3cdb269004d2905fac2a2bfa64b613fba21a882d860f8f1af260ef285d65776ad085418d0571805b97535e8b1736932ff667fba1152dfffa90bb558d91d00b
 DIST ktp-approver-20.04.2.tar.xz 37280 BLAKE2B b2f485bf236504a8e788157fb7049135000c95b5c6bbf637541ca0c22d6bb35682e164d10a06591607fa73085c104be919498f1cb57e4acebf59abab84dff9a3 SHA512 87c0f7950e415d106c637d908c31cc7ffd5b229f8bfb5e6fb44ebf1bcd5ba0da2829e926e1e374287c967ef20759f653bb2238d9b49199e998e2ced7ae1e1ae9
diff --git a/kde-apps/ktp-approver/ktp-approver-20.04.1.ebuild b/kde-apps/ktp-approver/ktp-approver-20.04.1.ebuild
deleted file mode 100644
index fc4aae462c2b..000000000000
--- a/kde-apps/ktp-approver/ktp-approver-20.04.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy notification handler"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=net-libs/telepathy-qt-0.9.8[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/ktp-contact-list-${PVCUT}:5
-"
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index 35a551bcc87d..82111636f18e 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,3 +1,2 @@
 DIST ktp-auth-handler-19.12.3.tar.xz 46400 BLAKE2B dc0edd715909a9ee902fb0a0c21cde56093f163238ebc09d1d004c70daf7618a0c6d569ec1c7f8cce1fbafe86697ad8a0f9b57806f344f1f75628700e5483a50 SHA512 f3191a7ed19628a5f9735beb0986e9aa7b519b653ac7d71dfe9b584cd0d9dfd4055ba09cdbd79fcaa6aeb6473c54358257213a7e232f3af4cc950b5d04d55ffb
-DIST ktp-auth-handler-20.04.1.tar.xz 46348 BLAKE2B 5eee10ed2323d9c3e856697fe667829cff5e45c3452f3367cafe49f9fdf84cf6cf1b05068568f080d31b59b5dc2824d400ee80effda67931a60983eee52b3943 SHA512 8128958c64f14f58259189dea9fb3eacf278c8c65eab5d553ff21b09640536767454d48f915be972d70ef330b20793fbb194372a70dd1544829e70ec374f5e75
 DIST ktp-auth-handler-20.04.2.tar.xz 46312 BLAKE2B 725662e3d27dd2d486dfffcd1a195bc4ec82c38c8f606c921cb1fe3cf171bcdfbe68e5c72d12e15b71bd243ea90da44ae857d37478b1a9e508ab92cfd0637b79 SHA512 e29b5e4aeae5aaa0498be1e7bacc5957fcf2b21fceb557c67f23e866f240e3e8abf201664d274c0efb3e1eabf55b507768a7e262bbd3aa6fec0f6243ecb5771e
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-20.04.1.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-20.04.1.ebuild
deleted file mode 100644
index f81e4102c57d..000000000000
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-20.04.1.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
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy authentication handler"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${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
-	>=kde-apps/kaccounts-integration-${PVCUT}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	app-crypt/qca:2[qt5(+)]
-	net-libs/accounts-qt
-	net-libs/signond
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	app-crypt/qca:2[ssl]
-"
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index 735004b8a587..ecfa95fbba95 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,3 +1,2 @@
 DIST ktp-call-ui-19.12.3.tar.xz 97088 BLAKE2B a7ac8c4c74cd45ee0e6de91cb92d3a73a0344bf038fbd541ec63b6562f69bec5b7ffb2c8ff1a557978287dcd8d18adf9b7bb1a000fa646716abea02853670412 SHA512 7223aa2d2f63461c6fb6e61460f7711fa86b72405110cc95ac180fe80ae92aed5d15205d0c133fc6e337427671789267cf9556f9f886f0f06cc9ccdf47c91c1d
-DIST ktp-call-ui-20.04.1.tar.xz 97152 BLAKE2B 090e2aa0ba40cfd37e56c9bdcf6cc6ff30563b4ccf04727d1b04225eb1a157f78ff31f97870519849d79ef2a08939e40f2d11ab527bd6ba4c229a81bf217385d SHA512 7f4140fe7981acb5102b6b15b29d99495c8c36128a2a4de55f8afd8469d9aa379a58224c5e315e1de06c485d406650dd38925321fa2b8ba75b450be3425a4b26
 DIST ktp-call-ui-20.04.2.tar.xz 97136 BLAKE2B 7cbfad0cabc963e8007e3c2747ffef78fd9131681ee519212cb0539a8af034512d39e8d881bea492ded09dcc68f042172f442e1bcf4bf9c1bb8c46a933ca156b SHA512 dbe87dcb9318b86863b549d9e9bd62c1d27da594d65763bc1aa1619af24587381a49bd1360095da4d7d01ee1f9cb646b663a0eb1c742cb5f4f5367f68cf7a901
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-20.04.1.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-20.04.1.ebuild
deleted file mode 100644
index 8acb8fea8226..000000000000
--- a/kde-apps/ktp-call-ui/ktp-call-ui-20.04.1.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
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy audio/video conferencing UI"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
-	media-libs/qt-gstreamer[qt5(+)]
-	net-libs/farstream:0.2
-	net-libs/telepathy-farstream
-	net-libs/telepathy-qt[farstream,qt5(+)]
-"
-# TODO: dep leak suspect
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-"
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 8a82eb9e3169..b1457f68a222 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,3 +1,2 @@
 DIST ktp-common-internals-19.12.3.tar.xz 445328 BLAKE2B 402f74d796aa85fb15190a6edc234b4c8ca2951149fc2a28a8162e55ed0af6a118bb4c38f43134e9d051afed1ce5a982d44d313a9a31f8031943b4be402b32a6 SHA512 6ba5bf496af9c55c0727fdda331bd3c05260109f4cda6f09c5a66b7fa8ced6d78d6b78c92c039371e5c260d594141941c4801a27960abe73724d35905be5c655
-DIST ktp-common-internals-20.04.1.tar.xz 449336 BLAKE2B 148b698fc6d75c4ef5b0330a9d96b47c7e4a07fa39e66f3763ab373fd81c86fd0c969afb70385804c9b1ef38025347b1729a71e2836103a8e152cd0ad8742fbd SHA512 f097ff50fbfc20b8c56172cdab4aa9d23fca3dbbecf1a37aba5201e1428f44c8cc30e563efce70a632aa5cd641503135ba046b55dd28ed093d778c49da59f206
 DIST ktp-common-internals-20.04.2.tar.xz 449420 BLAKE2B 0cc17bcfe00eaab48362f4ae7e9300a63b16bd21d71126dcbc7cb5357381679035aeb7965b7d95bc7b04b2aadda9f33b818c28012d3db6f41fc5f37f2b63453b SHA512 47aef4ffb26c1ec4a6c0890142c7a70c97f5b0a77db03c6fffa633ca6df99a7f437e362fb95a88ebaaefb3f90f7e4253592518b7a6e705da8f4f8e939bb94fff
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-20.04.1.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-20.04.1.ebuild
deleted file mode 100644
index 58692a893c4a..000000000000
--- a/kde-apps/ktp-common-internals/ktp-common-internals-20.04.1.ebuild
+++ /dev/null
@@ -1,68 +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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy common library"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="otr +sso"
-
-RDEPEND="
-	>=kde-frameworks/kcmutils-${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/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpeople-${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
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=net-libs/telepathy-logger-qt-17.08.0:5
-	>=net-libs/telepathy-qt-0.9.5[qt5(+)]
-	otr? (
-		dev-libs/libgcrypt:0=
-		>=net-libs/libotr-4.0.0
-	)
-	sso? (
-		>=kde-apps/kaccounts-integration-${PVCUT}:5
-		net-libs/accounts-qt
-		net-libs/telepathy-accounts-signon
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package sso KAccounts)
-		$(cmake_use_find_package sso AccountsQt5)
-		$(cmake_use_find_package otr Libgcrypt)
-		$(cmake_use_find_package otr LibOTR)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index 0444efd85b82..e3a9da2d15c5 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,3 +1,2 @@
 DIST ktp-contact-list-19.12.3.tar.xz 148900 BLAKE2B 4b4fe3f121a8f812f750bbcf307f3c310e1d3ab84d7470cda0dba9d5ded5256782880b529c94817a2646f52099cc4b2b15eb94cb92f16a394a565cda4ebe61f7 SHA512 6233b1d7db34ed453f5483367c30b3a5cfb84e5f76cd80c0a0dc489f46aa5326270e1f3efa94a6e1b0c798f360ba7caf73ee5a06f6db8f6285e85b17429bff10
-DIST ktp-contact-list-20.04.1.tar.xz 148696 BLAKE2B aa87e0f1e51dc5c76f30dbc334ce84eeaa4f9d7afa180c655fa2179339f0a4670aec08c7cf137ec44884ca411c78db56d1aa713d22d90b5f0c8dc0fbebe7982e SHA512 88341d2e6bc4c064b5e11dc45b906e9cab4853b23de72e4775750f56210f1129aebd26f4790a6c8687aba3b7defa43e54298100eead5d4663c30271a33459115
 DIST ktp-contact-list-20.04.2.tar.xz 148760 BLAKE2B 1d4f696277e8aee52ecfe3784e5a41238e9c218ba4008c8aab93005d42692d576e5f1beeafb62db16737ee860381cf398e25c2e9eb863a96b6e3a6de7b57621d SHA512 b748c342c9ed1dc2660275bcd4519b52f92cb6f39091cbe55b97e7b0bdab993d444c4c1761b5a683668a279ec59552dc9e4aee796eb9807e09784c2426204ae1
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-20.04.1.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-20.04.1.ebuild
deleted file mode 100644
index b57cd1b872d2..000000000000
--- a/kde-apps/ktp-contact-list/ktp-contact-list-20.04.1.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
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy contact list"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-frameworks/kcompletion-${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/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index 0380d965e61f..464c2bbd2790 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,3 +1,2 @@
 DIST ktp-contact-runner-19.12.3.tar.xz 43024 BLAKE2B 89d7ff79d3e0b2c9c9b3b54250f14ebc1bc0fcb4234e340595f9d34b1ec1a9b111149a38f8febf7641909cd3ebad6fe9d3db4bc80cdf40db448fcd0ef67e9175 SHA512 85c128522253a7b5bbb272b9e202faddafaa9f59a3171f213e08a3494002c1c674af76d3effaffc3df4175a1309cfbbc2eb48d3fd34ff2150fed1174264eab87
-DIST ktp-contact-runner-20.04.1.tar.xz 42952 BLAKE2B 7e9277777a206ad88b44cb28647ff98b4cdb3646c3da9a5cce7263e48214a3242b486d5ccb1595217318f95a0d989975086d25556e66c30224a2382bb9326bde SHA512 9e09f3968e4d2ba9d6cc1a51abcfbb71c19c50fa5b80bbdc7909f77e3388e2ed33990309b2aab0096f061a49f3cd7018fe7c2a5dea33583ed6c96693fa09203e
 DIST ktp-contact-runner-20.04.2.tar.xz 42936 BLAKE2B 74790a009fa77a671652734c31631bf913ad76e806ffc051fa1d70dca40322237f5a8edc8b70c6eae72044b5085d80a8ea2d37286ebdd14265ade5fc1a44a082 SHA512 6b0c895ac57474d9d880efd960c03c53808ad7625545a8e7c2d3dae0b9a13c4c239938768a03ad58bfd45df3c348d087180089e49485684d9f122ff21dff9504
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-20.04.1.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-20.04.1.ebuild
deleted file mode 100644
index faf43cc1b9d0..000000000000
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-20.04.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy krunner plugin"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kservice-${KFMIN}:5
-"
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index acf65f14d67c..25e7ca2ae3e4 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,3 +1,2 @@
 DIST ktp-desktop-applets-19.12.3.tar.xz 43476 BLAKE2B ea9df931ea42bf84cfd5e72128be5762fdd1b0e53a5694325afabfcd6de142681920b0cbb45f3a6ff254321e93b5cddf34b79c6340477b1396493bad0a3371b6 SHA512 36dd89bfec0f230c9bb9e309c09d9c3db33c3514360dfd8dc4898aace1c5622db33212deb1cec5529f3f5aff6e2eae19fac886f447f3932a3dacbef996247b8a
-DIST ktp-desktop-applets-20.04.1.tar.xz 43660 BLAKE2B 2636d0acd55dd29660601e2af13fcc53f11fdb614cdf7eeaa1197baa1f832183ce6f3c221714b63db2a61a290a9f908731395df0c98da5f8700fe1754abc6fb1 SHA512 f7e68421ae2cd8edb764674902e6352d7474b5221ce3827142a7583e8a2c95cdec28d5575630dab3354179328c3c2739bff9d1554a26b170c800eb846a7272a0
 DIST ktp-desktop-applets-20.04.2.tar.xz 43704 BLAKE2B 9144047d7bd80a0a3d27d5ab7ffc935998f7d7b27a661b6860fd07f2cb4f4b71b8d9d13805a7823ae92e82be028fe917cfd379c82f169517a6df82fb593d0760 SHA512 22d9974090c85e9f4814002f14cba05b89e2ce88d7129bb987e5bc2f44ccfabf0eadc986ea2c284d52a2ea7b896d074e2d3243bc24fad500d437f4b8173d1ca7
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.04.1.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.04.1.ebuild
deleted file mode 100644
index 3d265fb4fbea..000000000000
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-20.04.1.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
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index be10bd798946..b88d1b9e9285 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,3 +1,2 @@
 DIST ktp-filetransfer-handler-19.12.3.tar.xz 46164 BLAKE2B a263d1599b2901c7a30e1ddbcba3f4141d4b567394a881de6c452dc07188f7aad2e04ca1964456cdb7aca38def48a0e88d7601c673ef521f512a5cbbae573271 SHA512 11cba1daee343dc8abcb41f86887f996067900e9592426661c8d856a1515792404e0a12c7877d7f8034a700bf2c047844c3b362fa47cf4c093c53c6ed928e64c
-DIST ktp-filetransfer-handler-20.04.1.tar.xz 46132 BLAKE2B 4462f2f1d4e63d5ba055727a1fc2cd5a242ca5689702fd7d9dc62edd2f680650d17371e1bad3ca83e5f854e5ea9c55e4b224a3b1584aedcf7f39325f2d013ab9 SHA512 1870c1138202fd77849fe6a37d531aa7a54799c98c812f19eee03427ee0e3b3bb82027092da2ac248fc8273a8e24ec142fbe887f68678d2d25194aae1c5f3d79
 DIST ktp-filetransfer-handler-20.04.2.tar.xz 46096 BLAKE2B 160847cceb6c4f10a3087ca917f84d1d15961a89ed7bc12f503894153702f5d77481d46e558440eec9f38640651abd6defba7d46d69b4c9e738c3ce398185790 SHA512 4c2fff95e78824878df769f33c78cea9d397acded90ac7d4cb57348f13963bb0ec0c02e374617b0de574e9ea1b24861ce196168736b0f91820280383d26eaa6d
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.04.1.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.04.1.ebuild
deleted file mode 100644
index 446f9bc4541a..000000000000
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-20.04.1.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
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy file transfer handler"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index 4393f71647ee..76f483b5d10c 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,3 +1,2 @@
 DIST ktp-kded-module-19.12.3.tar.xz 97576 BLAKE2B 2df6b7eca1b6ba0aae4fadd1d1150cd4af881bcca95d7d00fc57ba2750decd7a79f55bc365cc6b771eca65eb12197ff834e39ecdb442ea27e552b53740f3b7ea SHA512 855f77273ce4144efd652084cbdaefa084d2582fd9eb4710eaf80c9d30e3d06438a1c67d20c9dd9a8905cb29986d4a96e34e9f7921e056147b1105abe4d93778
-DIST ktp-kded-module-20.04.1.tar.xz 97244 BLAKE2B a580c75dc9be764666cbc536551fd45c594761daac1c5c7424c1bbc48648ddbf327251ca494de792a5a4520651a02a4177cbc8f00c27c8079a0d4db3ee1f5f77 SHA512 657789a9aff9fc866f8dffdaa46aa06acd69e025216d6ea13ae141a5e61d9fb83dff2b33e89ad49a9959ef05512adb97e96513098f8a340ccf2a719ee1f61d8a
 DIST ktp-kded-module-20.04.2.tar.xz 97300 BLAKE2B a695ccf9c9f6178798429ccbcce3af111dea94cc709bde089d73aaab5a0715273a77d4a1099a1226462e7ee94f512191f1b2c3b4c405bedecec8760c5f336472 SHA512 b86fdde912c405da72c6bee128bd67fdc01ddbc5b68dda16964b109ab5921298cfbd3f45d439cdeec6108fccb5a20967ade545bf78be5a482ea0e256643c381b
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-20.04.1.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-20.04.1.ebuild
deleted file mode 100644
index d12f8c562d87..000000000000
--- a/kde-apps/ktp-kded-module/ktp-kded-module-20.04.1.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
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy workspace integration"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=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/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/signon-kwallet-extension-${PVCUT}:5
-"
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index fc8c9456f13d..761cf9a7d29d 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,3 +1,2 @@
 DIST ktp-send-file-19.12.3.tar.xz 28916 BLAKE2B 776e792582ece4dc458256eafa7140bf3a2332b2df7bd40e2c09c0d49a00a83aa83cdddaf0caddf56361e46caad5ab047b79c7ffe35abd5e50e4a5eceb40226c SHA512 2663bc8ca402d5e7eea3b47494b15c57c7978fb590ab067ab1c95975fb8ad6dc19a7e0ee3b5e8504879133275e1252a932b5b18c257d19c23ceae3e3c7c2eb86
-DIST ktp-send-file-20.04.1.tar.xz 27848 BLAKE2B ed85dcb825fa6662987d5635ff5dad9a0c52e6b8e997edc32b8834e4e781da848c50be0be0469f39783ec53560b3c1427ea43ba24a05b4e7055a52a23078a80b SHA512 3425732f70cb9f0e3638f0e317c44a77c489558d179a1a7b5fe2bd8f20752e62021ebbf6c48d5088daa00325cdc0dd64ab29300d47b9d7f1cb92cf5414484a5b
 DIST ktp-send-file-20.04.2.tar.xz 27852 BLAKE2B 2e1c0335af201648bbe2ff52d94c8890bfeeb4e85d759cc25f50ff2c7351953b29fa85d74d4e50886c63e941043b1120383f5f8864e2a7212c17a92471876e55 SHA512 8c96c276438cf3bf61220b098ad20c0ef739f488a898bfc3624dad8165611650d658e468c09dce26eeaa49e0cc0adaaf06635225ae9705daab86fdfde8a519d9
diff --git a/kde-apps/ktp-send-file/ktp-send-file-20.04.1.ebuild b/kde-apps/ktp-send-file/ktp-send-file-20.04.1.ebuild
deleted file mode 100644
index e7dc41707d8b..000000000000
--- a/kde-apps/ktp-send-file/ktp-send-file-20.04.1.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
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=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-apps/ktp-common-internals-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/ktp-contact-list-${PVCUT}:5
-	>=kde-apps/ktp-filetransfer-handler-${PVCUT}:5
-"
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index ecd650d26d6f..184ce2898664 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,3 +1,2 @@
 DIST ktp-text-ui-19.12.3.tar.xz 471048 BLAKE2B 452fdd37e4d17ceacbe230e2cc7c26a6339842e5852a411087aab96948efe88d04bf835cb4342875d74a0d797f6a27bba047e4221e6d49eb8c3658d33470b8e6 SHA512 7b6368078482f0660612f1b4f67ab07e5f1081b36a59443242059206a86d659509ce5e00a10538b145ab71ec0ae2f15dfc53f54d6b0e249c5097f881fccacf5a
-DIST ktp-text-ui-20.04.1.tar.xz 469632 BLAKE2B 4fed2bf7bf74e0f48fc2cc05c0ce7ad14f32e504aa4887f37b327567e10bdae0e9a082a0476a0eb6f56b99732f079f4a616dfa36ed54e545de0955976e2981ac SHA512 db7d45a55866475a5f0b3e3cf45b365861cfc402acbe832766b574c3aa76e4031b844d11303049037e5a14656afca70781f9b2775a129ff2d31c44f9075f2b9b
 DIST ktp-text-ui-20.04.2.tar.xz 469768 BLAKE2B 070cf6fa949ac8bfd644bb6e01a91712beb874069726edbb8f524c0fb10f5abd5a13303d643c88fae34c714634c466fa44741ff88a412c35a1580f4f24f2300b SHA512 5e2ea92e7d21c0d1b94149d80b7eb9a6b708603085fe183798c2b4324e2e8d4e094d26866c292e666aef53a0809718ef6000e9da5ec60355efb81c8c1eaf99c5
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-20.04.1.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-20.04.1.ebuild
deleted file mode 100644
index 023a3e4cbef1..000000000000
--- a/kde-apps/ktp-text-ui/ktp-text-ui-20.04.1.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
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Telepathy text chat window"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kpeople-${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-apps/ktp-common-internals-${PVCUT}:5[otr]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	net-libs/telepathy-qt[qt5(+)]
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/ktp-contact-list-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index c7c7e14e7954..735ee1403659 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,3 +1,2 @@
 DIST ktuberling-19.12.3.tar.xz 70764492 BLAKE2B 07b815d442c1d0517bf37fe8af782c6f69f66e8b9924a4bde00e6593bad4ccdbdbd23ca46067bf7af53b9d82a47575c64e655980a1b768e1316c42ebec8595fc SHA512 35d9038db7ca568d4666c126421f20eb24ff5a84c790892d1bf772f14a346cebb4761979772f5a62be4e3777698f0c866d3057dd23a24f7acf6d4a14063e818f
-DIST ktuberling-20.04.1.tar.xz 70729228 BLAKE2B b72ce70e7fd58e950f033fde7f0d515722eeeea0cb98dfc5f7f3a7455bd49d38d17aea41593e2d85cd409dc025928f234c20c4e44648679a5c6139715f144c59 SHA512 7856191445e60afe10438455999dc6a571f3f5c5569d932b71b08f190a6f7b2f06d2ee08f10102f75594e4a38877bc15171c5e333879cc73002119923c108494
 DIST ktuberling-20.04.2.tar.xz 70724068 BLAKE2B 16c21e836952b89bcf1f79661c1f554a3b12a122896ffd82bd391e7ca6ca356eb2f8fde948ae059c506c01a1128d5d9955642439238157f8ebfd222b21da2382 SHA512 5fc843114e2ddaf72613145e23420ef618d6b3d9b2a854b7a1e9fc0d637a71ae15c9495d89990fd456b6d9821491609865dbd8162e837d918775fbe87e530536
diff --git a/kde-apps/ktuberling/ktuberling-20.04.1.ebuild b/kde-apps/ktuberling/ktuberling-20.04.1.ebuild
deleted file mode 100644
index 7a64dbf3e0a4..000000000000
--- a/kde-apps/ktuberling/ktuberling-20.04.1.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"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Potato game for kids by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.ktuberling
-https://games.kde.org/game.php?game=ktuberling"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index 68b83a1d3b90..f7f527a12c6e 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,3 +1,2 @@
 DIST kturtle-19.12.3.tar.xz 1828812 BLAKE2B 1c7ee2fc549e2b7424d8356e4cf49174c41c2759191ae24865e89f2e3f7605c33bbac65502d70d1feaa4b72fda474f2956d1f17ced9784a65fe5783050f5caac SHA512 dbf30fab10d9b49b03941309013f29f1481bf4ac8db1f9d5ad10fbaddd6ec6cf3adfd5a59c35163b47cdc3fd0526050434e2f44a05e903ae3b42968bd358151a
-DIST kturtle-20.04.1.tar.xz 1833764 BLAKE2B 8e9f2c254fbeaa126ec64c45283639a88cbc1de9b96fef059eb70533931030f59cb90dffce1e9a6ce1a1872b22c549c5b87c9bfa2fb928a7833cc2119469d8d0 SHA512 e170458f478aa4a144276a08612cc090ab795b7fd284f1d96d05b5288f4498eb3357a10ff00db1cdae87dc6a2ae10b6db64d489ab29f0c0d7e47aa42c1cc97c8
 DIST kturtle-20.04.2.tar.xz 1833776 BLAKE2B b99985a1d3b7156b72bc34e6ce76eb22853c9dca76c9cc37e39badd84ef85be35adc787b83b7749e2bbb5f8a92931a9f04d8c253800b60cf7dbd4477509e4fa6 SHA512 9af77f2276448dcb4687e9b9c076047654ccd8c1990f9180d54eb53c72ca09672a52295defc95b1c4d40e90fdb35ff4a47259288159412e30019379420fab3da
diff --git a/kde-apps/kturtle/kturtle-20.04.1.ebuild b/kde-apps/kturtle/kturtle-20.04.1.ebuild
deleted file mode 100644
index c8774d192aac..000000000000
--- a/kde-apps/kturtle/kturtle-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Educational programming environment using the Logo programming language"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kturtle
-https://edu.kde.org/kturtle/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/knewstuff-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index e927ae9d5237..b408d36f9f09 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,3 +1,2 @@
 DIST kubrick-19.12.3.tar.xz 316616 BLAKE2B b29a323d1dad564cb46459c8dc8cdecfd34da0e419df21b6a5aec57ac179b1a8112363c9c2a3686e3a2373ecffad206165e6a90813bd3003d8ee264b9f7a1034 SHA512 ce6c6163f8dbc36900b02126636219c0e1c0cd150deace706b7d622786e72ee2b77e8f1764e490d3a809c293f8fa81a13783153b79fa84293a69f1e85e94a3a9
-DIST kubrick-20.04.1.tar.xz 317996 BLAKE2B 44798504e799ce020e7e63598986e3924f6138062d9c5b6ed77528f050763561699e84389cd81095351fe5d1e082b946c9ccff3432267982d0c89254e2bdb995 SHA512 ad0dcb69e06356ee5f3e39a9b61219235f95d1fa57a369e40bccccd1ef7fac0d0abc029366f3a243ddae58faa9ed1fe29100cc761b604efc01ed9bd7705810a9
 DIST kubrick-20.04.2.tar.xz 317852 BLAKE2B 3e24fd3095f2829020e29c46bc0b02479abf74a0e417adabc3b7dc525a35d77fbd8add298d7e6d4903c21aaa0d2bd4dcdc080d36293af698ed166a4763b37016 SHA512 c5c90630b64c05fa6ff55a5a6e40f35a4b6cc0596484acff9bb95e9ca86985705fc7f84d8b471e6b93bcbd69ac031cd9a45efee3ed90bdb5a9a295b8b8ceb9c3
diff --git a/kde-apps/kubrick/kubrick-20.04.1.ebuild b/kde-apps/kubrick/kubrick-20.04.1.ebuild
deleted file mode 100644
index bdcd4d427075..000000000000
--- a/kde-apps/kubrick/kubrick-20.04.1.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_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kubrick"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtopengl-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	virtual/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 331bae12339c..5b6b9d4cea89 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,3 +1,2 @@
 DIST kwalletmanager-19.12.3.tar.xz 788684 BLAKE2B dd4573c2fd2ac1f788cda50c5ea0c8f11657c31d21de0a7f1c5fa16aa7f31c25e6bc0b4ae2e106878c36c38ba252b3fc8a9f9e1064db403dc8325847a300cdad SHA512 32cf7765c68a7cd4c44e4ce081ddd02de238fafc3644c1c45c7cdca4fd7a658f34bd7473e5bcad42ca6944069a805a1b9499ce949b3c42533ad71ed566678b4e
-DIST kwalletmanager-20.04.1.tar.xz 789216 BLAKE2B 275af990cfa7731ec379aa2ab8a7c564c025812151910d2587d83b3dc1f826abfeb790a3ed961b9474a085d4afd66abab7a2421a66b08a0c86710b908d8a25ea SHA512 74655976d8e9827be5d3437aedffa06c698d1b152565b7eeb341d5bb3e4c328516c8386a695c736c6e6ff983baa090b1698f5bf8c4e56f275d212aef7c88f5b6
 DIST kwalletmanager-20.04.2.tar.xz 789352 BLAKE2B dc579058fc00c49e22927bfe4a115c9ee1c11fb01c039c3e81a2b9b3ec9dbef52911e2a1cfbb42db77969d80aa35a97422bdfa58c4238f4118e426152dce6016 SHA512 a4e7e4813c33368d86c83003e0f77388924db028204068c43ed1edfd629b48554f7588ba30268189a426522f3c102d9896c445956a9b2fbbd8fe8a69d1fc8c71
diff --git a/kde-apps/kwalletmanager/kwalletmanager-20.04.1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-20.04.1.ebuild
deleted file mode 100644
index a62d00d5fac5..000000000000
--- a/kde-apps/kwalletmanager/kwalletmanager-20.04.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tool to manage the passwords on your system using KDE Wallet"
-HOMEAGE="https://kde.org/applications/system/org.kde.kwalletmanager5
-https://utils.kde.org/projects/kwalletmanager"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}: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/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kcrash-${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
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index 46dcf483dc8f..486722e33d37 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,3 +1,2 @@
 DIST kwave-19.12.3.tar.xz 6194476 BLAKE2B 98dfcc9922757441b4fbb998f6b2c8c74c14da82ac4811e9b705ba2f6fecd812e2fab8dc840d013be79bcd9b229c432bdb3f938fa6abd933a8898a1593d373ae SHA512 33c045e85aebc4e7ef599a801ebeaf413ce4335fafce109a542cd8af5f83f3748d603698aab48586824cb12a573c6325d7ee20e78d6492a990e7a6650c67e9ba
-DIST kwave-20.04.1.tar.xz 6195960 BLAKE2B f667983abe6b62dd761a40283bffa5713b40cf34426b28e8d0d65f1c7beb6842fbaedf3453b8224067ce43a79d53ddcefd63f76b8c88ed1cc74628ec34214d5f SHA512 fbf657cc5c1246d574b28d56a305694d614ab4c88ee438920ba75ec53944171eec1ba20d7269e710979cdf406c35c1f3ace355dad3881f01bf9e3e75f03a264e
 DIST kwave-20.04.2.tar.xz 6195816 BLAKE2B 697ec18ad8d2fd1f5417629bc15cf091ba975861b297572e06f707c9dbb6878613935988c04e21d80d4f158b2a8a56f4bd11779896bfc66cc2306233a0ee4c89 SHA512 7a2697ca87533858af7bc8943c3ac1c7a31acf6d977fd311035bb129e4d8133987bc4ba2cd44d442b29bec2db9b743fde9ded39981e4d6d5d339c504719c2691
diff --git a/kde-apps/kwave/kwave-20.04.1.ebuild b/kde-apps/kwave/kwave-20.04.1.ebuild
deleted file mode 100644
index 1ee7b430136e..000000000000
--- a/kde-apps/kwave/kwave-20.04.1.ebuild
+++ /dev/null
@@ -1,85 +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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.kwave"
-
-LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
-
-BDEPEND="
-	sys-devel/gettext
-	handbook? ( || (
-		gnome-base/librsvg
-		virtual/imagemagick-tools[png,svg]
-	) )
-"
-RDEPEND="
-	>=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/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-libs/audiofile:=
-	>=sci-libs/fftw-3
-	media-libs/libsamplerate
-	alsa? ( media-libs/alsa-lib )
-	flac? ( media-libs/flac )
-	mp3? (
-		media-libs/id3lib
-		media-libs/libmad
-		|| ( media-sound/lame media-sound/toolame media-sound/twolame )
-	)
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	opus? (
-		media-libs/libogg
-		media-libs/opus
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-apps/poxml-${PVCUT}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-DOCS=( AUTHORS CHANGES LICENSES README TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEBUG=$(usex debug)
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_DOC=$(usex handbook)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_MP3=$(usex mp3)
-		-DWITH_OGG_VORBIS=$(usex vorbis)
-		-DWITH_OGG_OPUS=$(usex opus)
-		-DWITH_OSS=$(usex oss)
-		-DWITH_PULSEAUDIO=$(usex pulseaudio)
-		-DWITH_QT_AUDIO=$(usex qtmedia)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index de43b7bf05fe..d77fd2012fa2 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,3 +1,2 @@
 DIST kwordquiz-19.12.3.tar.xz 4174116 BLAKE2B ffe85030335fdfbbb7a8ad6333c25e6d2dae385a487287830f98bcfb607329e429ce10d7a33269df6528c206e2a26b9673bd5cbc091b7e8cdb12e6b26fe1a563 SHA512 cfdf267585a6bfc5de06da3a0de6372cb2beec7c6abe7482551f28356b464d4b67f092998a251991b4678131b47a6278745c409f0c4203c457fed8a38081baf6
-DIST kwordquiz-20.04.1.tar.xz 4175624 BLAKE2B 7fe0dfe8a92838e28ca15d0a2473d0c04387ace9538e0ecf7450114d3318da6594b2d7297df7eb809ca6608081d9b1c9d3c07f4b82a4ee5517c9c4c0b9c01a74 SHA512 a7bf05a7b9e552a5d112fb8acb24954b7047f2c8b617366c4945292d73a839fe6487d88b0d1ff080e2b094c0e3bb75c0e8de58c83d5819132d0d825756e0483d
 DIST kwordquiz-20.04.2.tar.xz 4176948 BLAKE2B b5c730eb490b45f21f026b3928d2e6bb00de2d5ecd625b59fa1a95cf8db34751357a07906a1d779f84311ed74f5ea43361a978587ea7184d8075f1d38d6c53dc SHA512 95d63a8e1b10cf684417d859ea387427616094e814e0afb9e33a5fcd31ee9f688ceccf42d521c15afb2eac25b99e08267001286865eb919463af028e56493404
diff --git a/kde-apps/kwordquiz/kwordquiz-20.04.1.ebuild b/kde-apps/kwordquiz/kwordquiz-20.04.1.ebuild
deleted file mode 100644
index 5dcd76560f0a..000000000000
--- a/kde-apps/kwordquiz/kwordquiz-20.04.1.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"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Powerful flashcard and vocabulary learning program"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kwordquiz
-https://edu.kde.org/kwordquiz/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkeduvocdocument-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND=${DEPEND}
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index a978beda3876..3c26e48733c0 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,3 +1,2 @@
 DIST kate-19.12.3.tar.xz 5795816 BLAKE2B 567b0c37f0b50533eeb19a527f7527ae050b62c8a50d46bbfac06226f109cd024b7626abc7defa32b9a654e231f6f04246a3410ace92f40fc25fb22a6f893c82 SHA512 aa6a2c44a8c5892e61ac80df676da6059e61dd93f5e2934e0547040d89379f9f3ae90f46b8e043edf463228ef5b0ab3f795b8ab3dd6c488d0ba0c55cf20bd817
-DIST kate-20.04.1.tar.xz 5826720 BLAKE2B 0c35a3fc88fe7a318d2aa369fdc70a40c6967de7712419fbde846cad89ffb653a87618631cdf731947f1cdff21d50f4fa5d64b0fd8fb45245daaf2983e021de6 SHA512 b1b07b9ca25809afe316319f890e3a6eff2604f91779c2e1e942dbb16ce082f4a4d3bc6e72dea28a35fc2f31dc615eaa750f74c0528458d1397ae6cd651b7e47
 DIST kate-20.04.2.tar.xz 5829952 BLAKE2B 839a069bac00ecc7e7158875570a9d7bf95e5f10cc2041b6178c47ccd3c3ee6ac7426a55da72d468657fbd09694714bd44e0be97411b1bbc0ab58582c0f0df95 SHA512 eee887549ed22b5d0bab966936f1d509bb47a79cad4162cf44ef5a44b97f9c4ea5aac2316e234def6bbf6cae506347e309b26fb24e20c7ac1cc582c12ad6f911
diff --git a/kde-apps/kwrite/kwrite-20.04.1.ebuild b/kde-apps/kwrite/kwrite-20.04.1.ebuild
deleted file mode 100644
index 021b7f175f6a..000000000000
--- a/kde-apps/kwrite/kwrite-20.04.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="kate"
-ECM_HANDBOOK="optional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Simple text editor based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kwrite"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities"
-
-DEPEND="
-	>=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/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-	# delete colliding kate translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kate* || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		-DBUILD_addons=FALSE
-		-DBUILD_kate=FALSE
-	)
-	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
-
-	ecm_src_configure
-}
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index e653f06418be..7913a7ae8a66 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,3 +1,2 @@
 DIST libgravatar-19.12.3.tar.xz 31284 BLAKE2B 393d61b945a94630db140c6245a947605326039979c00d19dc1de8bbf024561ccb4a122112dc6a72010346cd113f78b6a69e8746a785f71310432e97c79a3ee7 SHA512 cb0f0512945948862eff92db20072cb5743135160e59b534146a43712144d44ea620738d3b1fc478448086e0911c991c12bf332b9d8b6621cbe7d839ae3be562
-DIST libgravatar-20.04.1.tar.xz 31428 BLAKE2B 22ec37744439543e45fc34c5f8127ad004675922002dc61bdf013ed37cf062ae1916b9699ce4c32a60d48b69bf27e26d6e4041f11907e81c3911806a6d241502 SHA512 926676fb148a8078d7ed8ebca381c509459a6040de095ca17c9578df07b7f99442abfb6ed56168d66226eb284a5a2332ed6d1e250721e8e6a29eb399d8f0c172
 DIST libgravatar-20.04.2.tar.xz 31452 BLAKE2B 8ffe90c514b105e7157f4e67cf548ddd35ede6de3400da8d34138dd5ecac1d33f9164b96c4eb5d532f243d8a1ba5383c7b1691d8660ee755dab970ce6a7472a0 SHA512 6529d90b6dca07f25dd847710d3fc98da0889b3df75160740def1f4a3747369c11f09dc2f77dd12b082c6455b63ac5dcfecbabb4805e6a5ea87615bd22ab59ec
diff --git a/kde-apps/libgravatar/libgravatar-20.04.1.ebuild b/kde-apps/libgravatar/libgravatar-20.04.1.ebuild
deleted file mode 100644
index acf4353c067b..000000000000
--- a/kde-apps/libgravatar/libgravatar-20.04.1.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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for gravatar integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 85cd817ec51c..e753b7ef1c9b 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,3 +1,2 @@
 DIST libkcddb-19.12.3.tar.xz 425084 BLAKE2B 8b25d4bf2df32f9f1d9cdbfb5d6ea5ac3c9f606266ea22283734c31a0f642a409ec1e8b7784f9eec6ebb2b7f93aa570854ddb46409d9bac17a7bc32444df4358 SHA512 e9ecdf189c1cf6b6ec45ecacef2ca41fdfabe0738e841a1dc798c3f005ccc7dea6f75fca37bb0bb345e7989f019afe64e0043173f51f3461d89bb6ed600e1af1
-DIST libkcddb-20.04.1.tar.xz 427308 BLAKE2B 61d9245d335c243a860b797864a05adc9b9ded65011b7e57c5fdde61346c0191db6020cd302a9d8cb7593017c357f4664727101df3bd3ef90faa6076b7967c14 SHA512 e7dc1d6bca0911bbd2291c5b15d7c384908eea33093bbd1ff621d8d1d846322b28c49261c9efdf186401ac9e2eac272c8355b7a6e37f8ec286d0aa3fd8ea5379
 DIST libkcddb-20.04.2.tar.xz 427412 BLAKE2B 3260f9c87ac6d9e4ac02ea3e4d54b3638649b2b5ac4aad298e84fb299a2a69c14c50b82cb9edcf3f4f587fb3be569595973b3479f5c203ce71b9c2eb8febddce SHA512 3e2f23ae8874a2ac04f4a0e0dd50f46c35c0249d40e12d682978f2469f1a85d85f991010e90b831f5390bc3badce728cb6efbc0c256e9bfa93c38ce338214bde
diff --git a/kde-apps/libkcddb/libkcddb-20.04.1.ebuild b/kde-apps/libkcddb/libkcddb-20.04.1.ebuild
deleted file mode 100644
index df78f53d143f..000000000000
--- a/kde-apps/libkcddb/libkcddb-20.04.1.ebuild
+++ /dev/null
@@ -1,54 +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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE library for CDDB"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="musicbrainz"
-
-DEPEND="
-	>=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/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	musicbrainz? ( media-libs/musicbrainz:5 )
-"
-RDEPEND="${DEPEND}"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
-		cmake_comment_add_subdirectory doc
-		popd > /dev/null
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package musicbrainz MusicBrainz5)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 298d3365dc7f..31132b0ebdbd 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,3 +1,2 @@
 DIST libkcompactdisc-19.12.3.tar.xz 88916 BLAKE2B 6222d8b6166ba3c0b85466996cbea05c3f0bf97fec2f71f07eeb2e5ff2784717b1717817dabb57072151cba75a076d2b4bb69d2ac289e14b95cd514ce18e11c7 SHA512 d24bcd4684f66ca0a746dd15f7348a4d802655fa4389ce7b6d8c57929e1e5703f81a66cc24ac7bdadbe2e75c4b132aebcc649d879181da7d5adee21e2a20c584
-DIST libkcompactdisc-20.04.1.tar.xz 88784 BLAKE2B 6b767af550a03e15684ae597604148d191641edf167e0bb8ab2aafc4db98494da9284af8e6ea56daa522c493486f5a944dd3e72e929a03d13376cace16852fe0 SHA512 a4e6842876d942103925e940a2c57c88541cf47312661f8d996bfc4bbf659ddcd9cd8fb41fbcd1ce4a0e88a2a07a96aa8f242bf5feb265dfbfda661f320c57b5
 DIST libkcompactdisc-20.04.2.tar.xz 88720 BLAKE2B 5fbf660dfee71b89bff452f490c758ebed8018e8403040dcf2da85dadecbd0b4a927ad61a96c6e43849897a2574e6bdc9ed9c4697704cfc9e6fa989222923f55 SHA512 5f57b05b26ceae3eb190e8a9479200c96a7cfdc6ffb086115bc55678f8a528c6ad04b86a9ffe529e1242708ee6e7f7c932e566bb0af6a266f38485100e70c213
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-20.04.1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-20.04.1.ebuild
deleted file mode 100644
index e72363805501..000000000000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-20.04.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for playing & ripping CDs"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="alsa"
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	media-libs/phonon[qt5(+)]
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package alsa ALSA)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index 0382e0d29392..40396c979f1c 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,3 +1,2 @@
 DIST libkdcraw-19.12.3.tar.xz 41992 BLAKE2B 9ab3625173ed262b192ac185de9b464392262f100bed3d91d6bf59f45f10b402e6428b9b769c1a5d709c0d30e87b744dcf9b05e4d65a462e58cbb907c5e79bd3 SHA512 9a2df5e98adedb6ca79804530b0560d606c7c79aa7e4d432c97c06acd0643ea0a138bc2f30fd586ae3a7db42aaa56bf2b05f3512614a167dae42628cad87720d
-DIST libkdcraw-20.04.1.tar.xz 41944 BLAKE2B a2d1e778c4e0375c0fa211103ea65d9f75040958c14458e8e8f9ce4e5663f71271ebf55c1772b327fe30cb28539513dc96f5901b170463775b45637a4c3de901 SHA512 e0d52ef13ece5d45c64efc7e9fb0fb2f661fa21eb9c0e8e93f032276b4ad9cb75d99f808d30f09d0bb0000a1c02056be717e77359ac34b8ae9bdc6c8939e80cb
 DIST libkdcraw-20.04.2.tar.xz 41912 BLAKE2B 8593413a9c70d4c7b5eefde316ce54189acc050462e196584a00b4c4534eba3a4f5dc6bb1b8d8a4f2d66eaec53174733ff7838bbcf7a61d3b5a8e25317788ebd SHA512 938ca11e5cde85617c7bd7e4c4ad1a5fafc468323a7fa233c24832682af689d294db6cdb9b42b73b1e81a358ad717877a233ae8bcc5e4af39aa1f845d3273a13
diff --git a/kde-apps/libkdcraw/libkdcraw-20.04.1.ebuild b/kde-apps/libkdcraw/libkdcraw-20.04.1.ebuild
deleted file mode 100644
index 4d5c7dfaa31e..000000000000
--- a/kde-apps/libkdcraw/libkdcraw-20.04.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Digital camera raw image library wrapper"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=media-libs/libraw-0.16:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index 33d1e00357c5..4b8677acb789 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,3 +1,2 @@
 DIST libkdegames-19.12.3.tar.xz 6375220 BLAKE2B 1e70ad751871223351c33072a571d4b6376acc115c7544cb667f3277314e6b3c6e567a5422c172639b2fe956b1d1ab3142ad55b0851adfcb085e784639292b9a SHA512 4ef533dd126e5fe43c96749cc08ff7faee761d9f00876be5639416b02c52b7304c37dbbf31aa1cd42c737d7f2b2dcfd5d3b800c54b267e4c59ce1e08d033dd3b
-DIST libkdegames-20.04.1.tar.xz 6378952 BLAKE2B 74dcbdb5b955b24651ce41b65f81a5799272b6c3ecdb55cb1c80dde966e1defad3f2970c47ec7a99a4e5079b8b72b6025eb5efca35e9b97f0827904074f92d8b SHA512 e05828b98be4d4c3f1202da203cbe95d1f8e7ca881aeca2e726e0fc8427eae1b39388c75c10487070faaace94cec0526195c19f45a2a2bd104eef1ce8b53ce7f
 DIST libkdegames-20.04.2.tar.xz 6386556 BLAKE2B 99274e3c09fcded2311459a3eca4186e71bc8147e73005c6ab6f0bfc4760a5040862b55cb058cbcbc88d944ae07091e541e67cf0e9db8b6b2662ec42071c76d0 SHA512 15e6145dbdbc98a33e1527616ee9c2cc45e090ad5e382be62941de851d3d2621ffc696f38bf7ada0cd214fdf4c74615f4f4760adac677587b7308cbf6c20fb81
diff --git a/kde-apps/libkdegames/libkdegames-20.04.1.ebuild b/kde-apps/libkdegames/libkdegames-20.04.1.ebuild
deleted file mode 100644
index f0149cc2ba9d..000000000000
--- a/kde-apps/libkdegames/libkdegames-20.04.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional-recursive"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Base library common to many KDE games"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 2df4733eb588..9dd65d216bc3 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,3 +1,2 @@
 DIST libkdepim-19.12.3.tar.xz 334016 BLAKE2B f95c9489b0acc2fe9d3a9d9687cacb78fa25d708161c12c73c0432186387291407ef3c2b85d9e4af0c4c5c3b5b91a0f447887201295f1fc3cc99fd11b02ba61f SHA512 238f8f25d00a924d7f738603157df79577c7745d4052f7e0a5bc30901256804946cbf934d9a89a9161a071829344b4d2e1f33bb02c2bc942b174db986ed3de07
-DIST libkdepim-20.04.1.tar.xz 333836 BLAKE2B bc3920c0d1bc8a1ef47c7751eb8ff5600664f89bb3eabd60fa3c9ec241d0caaa58eddfb780faccae044ac3f59ee713fc0fe94853f353c997eb4e350c9a86db27 SHA512 9277960c017e2eeac06d672d512fb99d36e713db8c96430098bbfdc5d03f08a3b2a2330ae45a91f84ea8aa406ff653aaf4afc338b4d155a48003f9d1a171037d
 DIST libkdepim-20.04.2.tar.xz 333848 BLAKE2B 48fd3d1786ba8176f2b7dc4acf4bc52e7eba909741d91897c98bdd6103da5aaca8a09361dd5cd9cd3b2f243ed6a0399d6c6c8b36bd7338d1d07d588dfc5a5538 SHA512 e6b706ef8bccff0feaf13242aff4922454f1e55e3699d9c7dbfb9f00a267dd86b4a19c7ef3b515e46b81e87337cd04cf55ba169a9eece219fcd01968ad951ad3
diff --git a/kde-apps/libkdepim/libkdepim-20.04.1.ebuild b/kde-apps/libkdepim/libkdepim-20.04.1.ebuild
deleted file mode 100644
index f186c373b6f1..000000000000
--- a/kde-apps/libkdepim/libkdepim-20.04.1.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_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kldap-${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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index 8d50ba08d345..8cf7bdb84557 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,3 +1,2 @@
 DIST libkeduvocdocument-19.12.3.tar.xz 206656 BLAKE2B bd38b94fe03f6973820ce386d8b1bca61214c080566c0750df8826c2f173ba336c688abde95e4f5644984db74739f28a5a0396a732e9fa577c1fd7999c8d976d SHA512 f8cc3a90767710f7a93f7549257831998c6faec274e3a66ef1a40fbf9efe1234a09147c85a7f37be1cf18fa38453682a4be1b72c8631ba949ed69329b2c6d063
-DIST libkeduvocdocument-20.04.1.tar.xz 206776 BLAKE2B 4778fc61de3899331a90f95dde1ca1f327a4bea77594a36822eb2d044f9656ecbc16b3651384703521ff71ecf9634f07bbdb19621d9776de9c65e3135eb25928 SHA512 22e76b1608567eb008e88ad99e823975f26cddd5b20a270db05c30658a554c53c56833ed3c5153dd6c85e649fa4d5f2a8f0741c9223165c19fd35b7515fe42ca
 DIST libkeduvocdocument-20.04.2.tar.xz 206864 BLAKE2B 31b30d37f1bfbc1344065b168b610d93f1fa21b619ce963ee135d5c196317934dccc1f7806a6ab310e59b03fb59b3661ffaaee65980b1a26ffe6da28b9d54e8a SHA512 7366547d1118f197437e335378077408c934477939632575813d06da920966a2da875b1634a07c4f052713294b21d1f65a1269948f1cc51bb953181d993bde09
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-20.04.1.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-20.04.1.ebuild
deleted file mode 100644
index 2ce013f2793a..000000000000
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-20.04.1.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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for reading/writing KVTML"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-	ecm_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#DONT/" \
-			-e "/add_subdirectory(tests)/ s/^/#DONT/" \
-			-i keduvocdocument/CMakeLists.txt || die
-	fi
-}
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index c143e5469f46..152532662036 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,3 +1,2 @@
 DIST libkexiv2-19.12.3.tar.xz 64556 BLAKE2B 44c68387741b7b2de3a56d2acad05e02f6be07a98a9848f9c6954bf7cd766ce0b75668712d386673be06851550bdcaf6c698c1eab245f5b12d6db4f68b6b18fe SHA512 243dad5ebab2384567e3ff09d7bf49525abfc126169fcf0d20bdf42fe88b3df9c9f40f7d36c1db3c69d37be54fc633a4a44eb1a75bc5c2fe3e6cc339f5ea8644
-DIST libkexiv2-20.04.1.tar.xz 64544 BLAKE2B 15d116c5143f8319274fa1f2a056e14008d796df9135f402e6463c040639080b7e144ff0223ce0c4de469c3a26e4f9746fc4abe2653646bb23dcf71f7cd325fd SHA512 22485c4e27922cded0162a4a58c2e55c4d096554bcb02601364a51ea491c41424b2a9bda171ac5cde30940d06a6c1e472948655fe06f35fd9748d66ddf1e35ac
 DIST libkexiv2-20.04.2.tar.xz 64536 BLAKE2B c4f6c6f835a3125976bedd0730626edc91e7b686c05e88e5a2d2d0db30980ba825650491ba3fa4b43d1b0e792e9f71fa278526544ca27f8124a3abb7cf31b21d SHA512 2c03a3796b31dc98919e2d715cf50ca15845820931f79baceff66e5a8da3bcd5042594289a3c0e4e8a78b0901572881ed82bd37bf0f0b16fed8990e83459577c
diff --git a/kde-apps/libkexiv2/libkexiv2-20.04.1.ebuild b/kde-apps/libkexiv2/libkexiv2-20.04.1.ebuild
deleted file mode 100644
index 6affb264a95e..000000000000
--- a/kde-apps/libkexiv2/libkexiv2-20.04.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Wrapper around exiv2 library"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+xmp"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=media-gfx/exiv2-0.25:=[xmp=]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 1424da2446c4..dadc460106fd 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,3 +1,2 @@
 DIST libkgapi-19.12.3.tar.xz 238176 BLAKE2B aef193486a192f2f1914255e967466da31f4f68da70ddfeada144b5f508791bcb97246e68f0472006eae2b506e771407d3447d0f54ec7b0fb8ce1931b5cc58a7 SHA512 d9380e9756c6c96e955dcbfa1bc4b94f4024cd08be0a8204b74677cb3cc0fdc47ac100d661951b69db98f83fe16b2de1ded5ebb456cd9913cb8435ff0b20f845
-DIST libkgapi-20.04.1.tar.xz 239964 BLAKE2B ce3577e974e5d36d658f9f0f7106d5fbd78828856dd8466493d0d3169c3804eb5caf5bdb9875e7a2225070d5161f49afd87b2c8ab01ef096ac37620fd0429d4e SHA512 678ca1d1247954c8e772c62096aa6cec8d88299ec364b8102fd32453a376d523ac7fea1a0a00f68f49bee8b70585f8f22e5a6a6b891dc47d076d9d8dc0881f11
 DIST libkgapi-20.04.2.tar.xz 239920 BLAKE2B e7404fc3e511c507bd327159b9481be918be9ce88102d1f00ea9b39f6ae61482f39ca1d16f7688b4fe05364935936c1def0a65b2ab740e1dae4e661dd09028a0 SHA512 b27e9e05b4bf332347414dc3b0de4a5cdb5ec36f99b183a2d628b4189d00a21c0b0a0515dc31f92f8f97d6092fccd366b96b67e0f04ecd548e4695cbf7c6edbe
diff --git a/kde-apps/libkgapi/libkgapi-20.04.1.ebuild b/kde-apps/libkgapi/libkgapi-20.04.1.ebuild
deleted file mode 100644
index b8d22013c1d4..000000000000
--- a/kde-apps/libkgapi/libkgapi-20.04.1.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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-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 ~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/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-runtime-18.07.80:5
-"
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index 4633bcf245a5..349928453097 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1,3 +1,2 @@
 DIST libkgeomap-19.12.3.tar.xz 151108 BLAKE2B 18e2d08519b56c6838b1c19296680984c0db41606ccc55e8a356cc13716754355f5d6a0e377fe38292b0eb7b7a2627832ee34f3a756f690745a6c4d1a81938d2 SHA512 15102ea14b283598bb46ae8c43fdb3fa3aeaeb3304a7516497d391965eb54c6672925cab01ff07666057faa0a98106a5e704826f2c984b2c905cbe3d3068b1f0
-DIST libkgeomap-20.04.1.tar.xz 150896 BLAKE2B 97fe25f1a53b30d3822fd8164e65a23906378b197b984eb821d69f9805519a7a2e857fec22fec64982ae00d8bdd6edb6176b932df27070b2b1ba98eb87d1a9cb SHA512 093f38f0f2e7990678ccdca065a19e78830c26bf593cb688256e2db240220aabd2debf0be176f0408889bb99e0c3ac2714848a36404fe4337105b3eb956957b0
 DIST libkgeomap-20.04.2.tar.xz 150952 BLAKE2B 9626eb5224f66b2f379fed4d70dd07713f4f727e41e5fc7866dee583983392e401e64f8e700824a9f258ad809d0834de5fa345e48d62bd58abc1a5a1567d4151 SHA512 686eca214e09c498e32b9c912e375132596fc9c155b44763f233091fa9096b299d497e18c8b5629b70423cc4294adb8af2c691ca127ad6a250f421ba9f99138b
diff --git a/kde-apps/libkgeomap/libkgeomap-20.04.1.ebuild b/kde-apps/libkgeomap/libkgeomap-20.04.1.ebuild
deleted file mode 100644
index 6178eee2f1b6..000000000000
--- a/kde-apps/libkgeomap/libkgeomap-20.04.1.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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-apps/marble-${PVCUT}:5=[kde]
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	use test && local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=true )
-
-	ecm_src_configure
-}
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 59df5831bdb1..d3ce519474fc 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,3 +1,2 @@
 DIST libkipi-19.12.3.tar.xz 103312 BLAKE2B 307509e25a2bc41c3f5a1c9a524deae323aa4ae92d0e63f686ccc7f7ed509d1acc1f197130a43f16f2e395f8e7e136224b6fe2f9df1166d00269c271614bc8f8 SHA512 09e624aef5fc3de085820d8803dd5a579d2b3f5c72f8b4fba0633c9725ccfe6ff0ed552ee16dfea233c20c8b85e477272734c6c1fb4cc1e6037c725be956bac9
-DIST libkipi-20.04.1.tar.xz 103580 BLAKE2B 18982ecac706531a454b1f641e62ca70b7aeaa41f939f5518914ad38586e6c93f4ba20d292e0da870929bc2b94289c6301cebe59189d1973e2e16e3dc411498e SHA512 a7e6128f56f051f4daf01fa6b6faf0aa75d0ce8b0197a9800bf12c53d7d62e97cded0eb134e459b81162c3ed70cb9d7a6c15a0d5019ad72dc797187fdefff1cf
 DIST libkipi-20.04.2.tar.xz 103572 BLAKE2B 16d9a9efb5c3892e80f1d28b37cc4fe5af84a7ad11f4ab8e9d09a65b6d7a6e3931d4f0a4e1ec7caf02ea4c7b2a3ab23a516372ff9b7140622c701bc38f7809e2 SHA512 5b81354cff75f0970a2907a47e8f4283760d31ab885cf4796adf3930affc6b1dee5b253e7bdc0774c5a8d7c65c0c9c4c86dc1d0893fbd6077c41e0f0cd9c0d56
diff --git a/kde-apps/libkipi/libkipi-20.04.1.ebuild b/kde-apps/libkipi/libkipi-20.04.1.ebuild
deleted file mode 100644
index af4ed19e00e2..000000000000
--- a/kde-apps/libkipi/libkipi-20.04.1.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
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="A library for image plugins accross KDE applications"
-
-LICENSE="GPL-2+"
-SLOT="5/32"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 6af60bcd9df9..76ebaac6f662 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,3 +1,2 @@
 DIST libkleo-19.12.3.tar.xz 343932 BLAKE2B 90dc184aab203c6ffc1c3804c8f08ea52970b47fe167e636b487186ada29626d3d80cc81c1e629a5ebf45370ebb1a0f89c11dd4ab9a9f213e222a98668589ae5 SHA512 88dfb85673dda645c4ca9c40527907e0bdcff83be353643826c8f5e4ab113a7e93c69bca95939879fd9ec352cef4ae07795a063bd1bd927b6d915b5a566fe45e
-DIST libkleo-20.04.1.tar.xz 351752 BLAKE2B ffdd64d97f0834cf3a193aa3ee767a1c0d2442e43f5d216ebefb8ec4649055023c10155c2591d6d21009de86b0a87f09a6237485826719c1ee71166c4639fefd SHA512 c8f1bd4cc58a942f2442bfbf3b0065264eca240876f5c5e29f7dda5c79d81f0c9f414e4b6667cfe0cd6d23e45a12595139f0ce5a65864a6837de9ffc21460ca7
 DIST libkleo-20.04.2.tar.xz 351772 BLAKE2B f3a356efcc0ded6504ee4bcc3d6723021799bd61412c48a5dc18efb9a7c2cc838ebeb1b12cfb326fa983f85821cb89d97bf2da3c3c4af7865542596cf0946586 SHA512 59ed7b0775ef5781469a0c4cf28af286b2eb236878e2b80b37da6035995b7aee6a0612b86dd49bd42dae9d1dad4efce17c098f35efd6168bfec6f8a6cc88a281
diff --git a/kde-apps/libkleo/libkleo-20.04.1.ebuild b/kde-apps/libkleo/libkleo-20.04.1.ebuild
deleted file mode 100644
index 8553aa0d0707..000000000000
--- a/kde-apps/libkleo/libkleo-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for encryption handling"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index 4375bb96541c..5fe927aadb45 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,3 +1,2 @@
 DIST libkmahjongg-19.12.3.tar.xz 1684412 BLAKE2B 8c518606a52b0b32725926df744117a6e75eac6799a5afb9740b866b71267a02b669354b6ff53af1da1a2edd4cc2f440bf798e37f3c0f5c7cd7c2d86f13ca7a4 SHA512 90491bda908453aca3f5a438fbcfbbb8efbbfb5a5a625b2df84fd26b20ba2a8dfd0ee47400727b3087f435bb7d91e85cb847db708521942b931355d3b49dcc09
-DIST libkmahjongg-20.04.1.tar.xz 1684512 BLAKE2B 0871158755b578eb4246853645f402103337ce3c32cc7d03dd3e40cbdcd990105c12f933774aeaa30cd0e1ebaeff028040c83a3f14907d74a312db3697cf1189 SHA512 e58e3f3c5d6040d9d770eb9619b34f93c18e2ba88adaf4640445a7188835321792f815e7e107303c581bac6bfb6f898ebafbea2a520eb513403e5813a7002d09
 DIST libkmahjongg-20.04.2.tar.xz 1684800 BLAKE2B 637bc1311a27ac5e943a8ee09b10f124ee42aa579926af9e23b42463f02bb7a811ca4568c0f65924695133322110e20925d20c2225eb2ee9f87c4d63fbb704c1 SHA512 1578ed57934f84c1ff3119d54032f889b477da86cbe6d55e04b8f4f0c9b761550e6fd4b45e8e9036eba2c540e48098928435e48ca932611bda97d71e31bbcec9
diff --git a/kde-apps/libkmahjongg/libkmahjongg-20.04.1.ebuild b/kde-apps/libkmahjongg/libkmahjongg-20.04.1.ebuild
deleted file mode 100644
index aa3dfd1d6e5c..000000000000
--- a/kde-apps/libkmahjongg/libkmahjongg-20.04.1.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
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index abbed54a1002..44284239dd66 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,3 +1,2 @@
 DIST libkomparediff2-19.12.3.tar.xz 170628 BLAKE2B af17e55da7b57163256a248e732800b5f39acc5d605c8ce0d19324b2b8a10b02bfac33b3141ef5e45cfe037381aa07437bfef93624ba9138d4344e20d9b0bd55 SHA512 5e69a8137b7fec87b24ba313ddbdcf58d4023e05bc6166c524499df642a5b0dc07a1ff30632d74967cc98187d90ea7b36e8e60eb84214627ec44d42812c9b0ef
-DIST libkomparediff2-20.04.1.tar.xz 170692 BLAKE2B c6cc4210d3971c2635d3f8ddf8094637fb3e5c603e08a2325734e624943cb5d85a68b48cb132c91eda4371bfa71ffab08773e5449891d1c500f859bf837c8d21 SHA512 6816a87941af111c3fa8d24fe1da5d8172b89557abcba21baf0b4b1dbc2b58eb1f231a0ac0a397fe78fc4e994f7d77254f4f040d6919fe60db70052a2d8b9080
 DIST libkomparediff2-20.04.2.tar.xz 170676 BLAKE2B f70147963ad3d98e21156ac5983c0199ca3d33f72be287e1f74142034c23d55278acfabadbdd8d5d7c10be4d0944c10541c07e235ecbc94de75875d8bde612f0 SHA512 68c0422017894274878e163c2b24ebb9c446d56cde42579ad4272666d3ab62ecdd997374f601fbd41e8affb930f1921e830809155bcb64ea80601ef5cdf42266
diff --git a/kde-apps/libkomparediff2/libkomparediff2-20.04.1.ebuild b/kde-apps/libkomparediff2/libkomparediff2-20.04.1.ebuild
deleted file mode 100644
index f2f956b8c2e2..000000000000
--- a/kde-apps/libkomparediff2/libkomparediff2-20.04.1.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
-
-ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE library to compare files and strings"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/kio-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index b88988e968a2..7798f0dda925 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,3 +1,2 @@
 DIST libksane-19.12.3.tar.xz 139448 BLAKE2B d807550abed206091fb4aadfc28ea1d938c95e762e1161c90cf65c6ec98ada2229cf23825cdd472b66992453fa6e459829947e3dd36df3f8947763e0f43558b0 SHA512 83c397edcce693e0f9d82a36c16aff771d33015a78af308c00d0c815ee878c9decf558217dcc57c062aaf7bdb15fdcbf610fc3eb9a71e4710ec3208ac3696121
-DIST libksane-20.04.1.tar.xz 143612 BLAKE2B 127488ac885c885b4e9ac5092e356ad2e9522fcfd8455ebce6168b7801a486d81b6485e98bc3f0b7608e453235d048f950aaacb5101a0b771a1dc7e5c876ff10 SHA512 b40a7ffd107e6f07b00ab98240f065f12b0dc8b557c94f09203eef6979ac4fc3e17d0f98ca7653a9740e44676a87793a68c4564941265666957103313cd6773b
 DIST libksane-20.04.2.tar.xz 143664 BLAKE2B 1b623b5ebbccdfeb0a32c0c631c40b7a1b0a0db303e4331b7bdec1849c16bc2f549ecd56deadbc936234a54405a59ccebe5520ac4d9a7562d37d36db8568a247 SHA512 66ddde2eee94f9636b1835f3928bb00a514b8d430de6eba7ba19fc546af20955ea86710c96351bb8cd7bd8b930b617c66694fcb9879f7c367d031bb03576676d
diff --git a/kde-apps/libksane/libksane-20.04.1.ebuild b/kde-apps/libksane/libksane-20.04.1.ebuild
deleted file mode 100644
index 0d4dac70fd4f..000000000000
--- a/kde-apps/libksane/libksane-20.04.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="SANE Library interface based on KDE Frameworks"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="kwallet"
-
-DEPEND="
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-gfx/sane-backends
-	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kwallet KF5Wallet)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 242bc363ed55..dfd048e9ec6c 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,3 +1,2 @@
 DIST libksieve-19.12.3.tar.xz 551400 BLAKE2B 15aded9786e737917dfbcfb86b91e503b1bb966d6afeb7c5242e60ddc4f1d432df8d7c0c9dc5ac1bd8c8ee85922c0b85f8c013fb322904b144c9b9608bd93706 SHA512 46fd159f8337e7e51948d12628a80a19fc8dfaeef0e56b97ad69afde54642f526477ca551cfc9ab4082236959c84619abf9984625a4e6f2ad6d14337a1d0464b
-DIST libksieve-20.04.1.tar.xz 554840 BLAKE2B 6e0985386bd3341bcedbd0e7c3c9c6d639bbf4cb1b6c64e78d7cd4a24a99bbab82e2d39d0fc293769ed2c340a8811083e91b3998ba7f213bbb0c5859fae3e1e7 SHA512 f6be11d5487ea3b4d377702ed6d3bb09cd503ea7a043f17de52055d7608e1562330d9548d4068623c120629aa9899923aa0b432ef06900a1596f18699f9c397c
 DIST libksieve-20.04.2.tar.xz 555456 BLAKE2B 49cebc57bb64474117205d83813a285e11048654a6bb31d64dcc966ede14d985d56748041775453a93b38fc03926ad2ae0301fbdc2fe11363c0d94b3909324cd SHA512 c33d9077577745ec908d4988ec201240ecb04f735f43d6fdd1f450ed608e27f6a64a7a695f8823e26580062fef8f39a7cdeed2c2a2cdce88d73fe1d47cd64fdd
diff --git a/kde-apps/libksieve/libksieve-20.04.1.ebuild b/kde-apps/libksieve/libksieve-20.04.1.ebuild
deleted file mode 100644
index f9a24b6620a9..000000000000
--- a/kde-apps/libksieve/libksieve-20.04.1.ebuild
+++ /dev/null
@@ -1,61 +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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-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
-
-	if ! use handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 96139c009a4c..59e1cf613e46 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,3 +1,2 @@
 DIST ktnef-19.12.3.tar.xz 299760 BLAKE2B 5ac655f821f3b79f9b83c07299be7f1840cbab7ecb2bda737f9711cf903c8ce798797ccebd8ecfaa47f7ee005e2d83058a1835b5cd74a4cdd2320b97eb19f0fb SHA512 b99b9941117dd82fae9841b10e99200b5477134e190a2f2f399e4ea50547184959171bb40c7390de168d13e04f919c7793283963e7b241d3528949290fd8385a
-DIST ktnef-20.04.1.tar.xz 299916 BLAKE2B 79618ee6f84e4f4f38db4c9fce7e880190c36e628fb343367ff730027c400944e91ed73c8246aa2875ed5f1de5ccd357105dfa7cd22c564ea04a2c551b45f4b2 SHA512 d0f0b75a6a37ab8a05c20b4d0956b95e1436d3295c3358aaa080361556f4acddf4b19121319e0250f45b7ec3c36af79312670880e17cab19e6d8c2e8a5970e97
 DIST ktnef-20.04.2.tar.xz 299820 BLAKE2B 59807d491259d9e115c7ce11cb6803cd4800a8b43c0209cb36427e9af56f0a3588e7673ee4364b3607f544be6c01f38c3b7957495d8e6ebbcaa44cb5046026e6 SHA512 88785848c727ea1d3f94c760b93f25131b0414224d03b6d640505562465a0f86238241db28e79bdad3b07016a8a7d7d1cd9821e8483776ad8e3ad55997447514
diff --git a/kde-apps/libktnef/libktnef-20.04.1.ebuild b/kde-apps/libktnef/libktnef-20.04.1.ebuild
deleted file mode 100644
index 646552562035..000000000000
--- a/kde-apps/libktnef/libktnef-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for handling TNEF data"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/lokalize/Manifest b/kde-apps/lokalize/Manifest
index e08419f0a5ae..45192e1146c9 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,3 +1,2 @@
 DIST lokalize-19.12.3.tar.xz 1701784 BLAKE2B c13437204241f4f7f98b0e4b91bd8c747299e0a1848b589ce85ac1f9702c71dcf7b5038cccfb731162fa5e77106a16538b278ecb8e54290358585f712401ec19 SHA512 21f94ce7c90a4f15ab6e9361a43ee5fa5d913b1f7e0144d355add5e922676de1d642a7fb856adf5280c9821ebd79c8a96d5e93218a08b8ad2a2a8e28facf3235
-DIST lokalize-20.04.1.tar.xz 1718224 BLAKE2B 318212cf25ed57b870098d733e4365480a2c05f0cfd2045431e92d3ed225eb4857d54e083063dae9f08feec993f4e5db65e63f6c5cfa8baaf86ef5c02fbcc8d3 SHA512 b0e398a624d389335dcf12d80c7499ed412b0685b8eef75b63b5d9e126c09baa6ef6e8729172bff3238d82eb248e86c31f4c829dc17a4205cac34a24520c2161
 DIST lokalize-20.04.2.tar.xz 1719008 BLAKE2B 376cf1ecadaed1eb28f4ceff5a5d1215474264240f8e8debc0567f75a554ae79b4f2afed32886cc2e12683a0ea356642ab5170c936c43af3d23a3b74240be954 SHA512 fabb71e8db52bf2e9ed6b0dd48b5a1567648a905f9a31c6be16998375a6630957eb60555b5fc545b67ed3a57e2fa6bf34f4d9c97cd77ba77052acc84b4357ba6
diff --git a/kde-apps/lokalize/lokalize-20.04.1.ebuild b/kde-apps/lokalize/lokalize-20.04.1.ebuild
deleted file mode 100644
index c3b2227d9661..000000000000
--- a/kde-apps/lokalize/lokalize-20.04.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Applications 5 translation tool"
-HOMEPAGE="https://kde.org/applications/office/org.kde.lokalize
-https://l10n.kde.org/tools/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.2.8:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
-	')
-	>=kde-apps/kross-interpreters-${PV}:${SLOT}[python]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_install() {
-	ecm_src_install
-	python_fix_shebang "${ED}/usr/share/${PN}"
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	has_version dev-vcs/subversion || \
-		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
-}
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index a2e0193bc733..cecc4fd32cbd 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,3 +1,2 @@
 DIST lskat-19.12.3.tar.xz 1218840 BLAKE2B 4e6a352123230dcbef67f85b519ad220c7723b215c9fce2b89938c2b4b0de00326ef427fb410de3432b1e288e9e5c5d5dcb38090320c4a443ca1c78098fdc736 SHA512 84aebdbdbc3e7a85799cd4495c12c7f746a2745a353eeef48eca69242557762619fdd117fcf6581811e51700b5cde3b5c3b0cd1fbedceae529c2e925f0cc5fed
-DIST lskat-20.04.1.tar.xz 1219992 BLAKE2B 8145875a58b541261928a2ad83eed07b1df179b3657ab2093e232d5eae3a2856f41af545b8836e0f4c27564b92a394bd067afd4adf32bce22c61df6a4e395696 SHA512 30e150a91ae0eebc13b08e828154dc4c413431399ae6296a43052a5969de8b96b482534eab8b17e2da9e249cf17b849caba22ab60f929056883a7bc079d71edb
 DIST lskat-20.04.2.tar.xz 1219660 BLAKE2B ed22ec7ac1e57b03d6ad68b4496ad8f119bc4826fa5fb6e3cc3d72116bf7ce8c4bd7acda918ec3a1912c8f489624065c5a17dda9bc149addc70b1a84e77b29ca SHA512 5ac2498465b20107e3d7f46b930ca3f6d21ddae60205985174e44495315c5a866b54c79f53190cccbee6ff02e8a8cbbeec555d70cafc6e12bdd11d6e785e4f27
diff --git a/kde-apps/lskat/lskat-20.04.1.ebuild b/kde-apps/lskat/lskat-20.04.1.ebuild
deleted file mode 100644
index c2c84a1e57e8..000000000000
--- a/kde-apps/lskat/lskat-20.04.1.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_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Skat game by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.lskat
-https://games.kde.org/game.php?game=lskat"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 6fd2c406d4f8..2fddbe108bff 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,3 +1,2 @@
 DIST mailcommon-19.12.3.tar.xz 700376 BLAKE2B 2ee65d731290740288fceb72b186ff132fc66b6a6022bb112960a35597e81172dd0c0edc030e851b85c6a0d9ba2cc9f6901b6356cd55f5332dd169a51c20d116 SHA512 3f7cea9ff5f7a649f58d0c1e8404f2d9df0557e54ccb2806eb556a5ebdd3c06e2f50fe06d1916faef836f2b9c192baa958991d733523b6cb85e8f428b9663161
-DIST mailcommon-20.04.1.tar.xz 707400 BLAKE2B a23070cdca72ca4e02e162bab461db88b4baf6ed208c5da56efc3df8e7cce9bcf92507cd5896d89fc611454193e5a0be4c524deb009efcd1b851f1b8ea68663e SHA512 c1454e08c664eeada637cc26987319eab39c81307c6c6db77a57e398267de576a18a0a81b82d3ca25d6c17ef5e26f3cbbc5453c149906e8fa8ba555859751829
 DIST mailcommon-20.04.2.tar.xz 707424 BLAKE2B 4f3eb67e18ed3e4e3cb11c9bfb028b8397c4007f69732f1f2e404fdd495e5e0b9961ec2e85454b33d7c9b1837450ebb425e31d2882c11620e18d738eba264299 SHA512 c792717cc3370e18d1a4f783415080730845ed8f477a7f7a97ee5f1737cf348a47bad02a91c0e8208ed386ececce524e93121b963c8cd865cf07e4eaa27985e6
diff --git a/kde-apps/mailcommon/mailcommon-20.04.1.ebuild b/kde-apps/mailcommon/mailcommon-20.04.1.ebuild
deleted file mode 100644
index 75d0fd1d5bb6..000000000000
--- a/kde-apps/mailcommon/mailcommon-20.04.1.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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common mail library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-BDEPEND="
-	dev-libs/libxslt
-"
-DEPEND="
-	>=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.10.90
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 9400fd877f14..a50de6f83f6c 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,3 +1,2 @@
 DIST mailimporter-19.12.3.tar.xz 540656 BLAKE2B b0c7ad53f1ac04faa6123aede0178adcc0462f24a5b97f0c8568e2bef5667121e266a2b6d14e8394aa2a218e7aac38efbcbae63fd3dd017059c7b539b1518186 SHA512 c9b747a3b62e98a85f1781fc994bce899aa0d1ff2f78c3a7b295be66d375d0fdae8109e4f6899dc779e0e2802aadf06183863adf122be37a34a0ad53e44067ac
-DIST mailimporter-20.04.1.tar.xz 540412 BLAKE2B 108c35d7e74b47b8d732062ce4faf8cdd77abcf58564f31d536dbfe38a8268b459e73c725fe11325d0d57ba1a1ea6f7fcc15d7de052086e5df3c9e8a0d154b63 SHA512 da2a9e0436b542e31b1d9e9e803eac82ea3f19b82529c42da445597a566be5cdd8ed9a0db7b5e796c6bb1295dfef7e1de880f20479de851c76468176a75fa7d1
 DIST mailimporter-20.04.2.tar.xz 540364 BLAKE2B 93a052f56ddd22973e9a5e5868b95598a99ecd78d4df7e17da2033f28a819af0efc4900f1fc227095ae1529afac5e7bc2715b6de97de0d739b114e894042ac71 SHA512 9dcdfbb3152304178a17d1536472fa1cdca2ad8124b20151f7a98eba199cfe8866aeb5bac77a83e8b14021ee673b11581a6f86eba6e183b5d113b1623caf20fb
diff --git a/kde-apps/mailimporter/mailimporter-20.04.1.ebuild b/kde-apps/mailimporter/mailimporter-20.04.1.ebuild
deleted file mode 100644
index 7b69532a094a..000000000000
--- a/kde-apps/mailimporter/mailimporter-20.04.1.ebuild
+++ /dev/null
@@ -1,33 +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.70.0
-QTMIN=5.12.3
-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 ~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/libkdepim-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 8b13f87053cd..e937d981b060 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,3 +1,2 @@
 DIST marble-19.12.3.tar.xz 52306988 BLAKE2B 728b731b066c8fbec442059dbbe5697d610218b7733f365a655462f05d49f84497c6e7c4425929d2972201680d6b705f6a77652953cba937f55218d430a5bc1f SHA512 e6b693b15be53f590bbfbd97648113bad696339544350640699e890bc4f891c4a06215ee09f21cf4968dc8d2cb104c06f43380470145397fc5abc7daa0e02639
-DIST marble-20.04.1.tar.xz 52197400 BLAKE2B 33bc482ecda8d831a7f9912039587a3bd02440d71754005df295d47f51667bc5b42913e44e4593cb922459068cf4768fb62c0235e64f475157e377303e914d01 SHA512 4eb9bd5df71f0ad9d15309e43a7d12856e382bab4eecf7050451776e7fb97307b664ffe70f5c96fc589df33a1be884c68f0ed8717010545e699e3d4fb16b098f
 DIST marble-20.04.2.tar.xz 52206460 BLAKE2B ad7f9a30a8c75b4978fa5f015c9bc38a6bd16c95f4f92a9fb73f5f0126cf11a4b985aafd249052aa141365c498549db2265f50a894b4b8a95944394340cbcf75 SHA512 44a0a6ad7aa77452482d86ffc88083ed1adc187b1ecb34dd5d5c211e6a692019cfa06579647a7943c423fdc911300e0efb8352de95da84ce9c27aeb4f1365b55
diff --git a/kde-apps/marble/marble-20.04.1.ebuild b/kde-apps/marble/marble-20.04.1.ebuild
deleted file mode 100644
index 98dfaa6d9129..000000000000
--- a/kde-apps/marble/marble-20.04.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-ECM_TEST="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-BDEPEND="
-	aprs? ( dev-lang/perl )
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	sys-libs/zlib
-	aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 )
-	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-	designer? ( >=dev-qt/designer-${QTMIN}:5 )
-	geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
-	gps? ( sci-geosciences/gpsd )
-	kde? (
-		>=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/knewstuff-${KFMIN}:5
-		>=kde-frameworks/kparts-${KFMIN}:5
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-frameworks/kservice-${KFMIN}:5
-		>=kde-frameworks/kwallet-${KFMIN}:5
-	)
-	phonon? ( media-libs/phonon[qt5(+)] )
-	shapefile? ( sci-libs/shapelib:= )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-# bug 588320
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-
-	rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
-
-	if use kde; then
-		sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
-			-i src/apps/CMakeLists.txt || die "Failed to disable marble-qt"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package aprs Perl)
-		$(cmake_use_find_package geolocation Qt5Positioning)
-		-DBUILD_MARBLE_TESTS=$(usex test)
-		-DWITH_DESIGNER_PLUGIN=$(usex designer)
-		-DWITH_libgps=$(usex gps)
-		-DWITH_KF5=$(usex kde)
-		-DWITH_Phonon4Qt5=$(usex phonon)
-		-DWITH_libshp=$(usex shapefile)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DWITH_libwlocate=OFF
-		# bug 608890
-		-DKDE_INSTALL_CONFDIR="/etc/xdg"
-	)
-	if use kde; then
-		ecm_src_configure
-	else
-		cmake_src_configure
-	fi
-}
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 77ffa34420ca..09011a40e031 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,3 +1,2 @@
 DIST mbox-importer-19.12.3.tar.xz 33560 BLAKE2B 5d32a1c1251dad119ceb3c21ab2a1f54d697b20ca0fcb1ae1f389714b28e32fa3de9a1da06642d198633e1fc87c63b039bd3883f878c97fe558b3206bb7620ac SHA512 06811316105006d9e034bedca2c89dd0914c0340cf5124f270585f4562abed9a0c03ba1e40970a12c97e8ab764134d14b11b609ff5405a39735336765f25258b
-DIST mbox-importer-20.04.1.tar.xz 33516 BLAKE2B cc8ff30d07406fe1cc929feb76b28a82c1a2ce287f8a09472d048cec1ca9efa4601d3628fe264574dc88ed6237faaa7c9f734d600fca9f7dc8642ae066d43317 SHA512 525a654a5d7114a9d44004732c0d6001f327bdd7845bee04011080f46c82d94b1ec9e3aea6d136a4ef7aed033eb49b4577ce09c63782c5e45eae8a54fd778ae5
 DIST mbox-importer-20.04.2.tar.xz 33520 BLAKE2B b2d4c618e61acca014c81ffc75295f3279e661f4b7d430ff852de6ca255e5f119962d6a09a57747eb982de4d274448991f7d936a2f4ac566cbfc1b0b6d6f9add SHA512 647c85ba4cced49dba35d06134c4eaa33b8aa92aace9959a0ff266f328bba8e6e7a1c75167ac93560107614aa6479261b183c9f53bd8559cc5a249ea15e6fef4
diff --git a/kde-apps/mbox-importer/mbox-importer-20.04.1.ebuild b/kde-apps/mbox-importer/mbox-importer-20.04.1.ebuild
deleted file mode 100644
index f196a4be5a12..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-20.04.1.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.70.0
-QTMIN=5.12.3
-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 ~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/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 8da65d6ce56e..cff1d7ac57ab 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,3 +1,2 @@
 DIST messagelib-19.12.3.tar.xz 10462112 BLAKE2B c40e7eff15822287035bd3ea72d3df703803b67085a76b74d4f4eebde581de03af6da23f7cbe9ded08de5f2f0a442c2721c37ff4ddf51fc8f1e2b966dec3bb4d SHA512 d0f8c018b819a678543b42149d73bacde35461bf8fd42c7e4a7d46796a158ae665cc164d65508fb7a744ba2b2035417ce1f2daa758ffa4d0b8b8b860803d8ed9
-DIST messagelib-20.04.1.tar.xz 10483264 BLAKE2B e1abcf2fcd2e5b8e6d4c1f3e6c97053f686a9b23904f2e3b85f98300a35cfa9bd389c491ea159cecb284fcf8044268681510b9fdbe72da3192ac33fa6146752f SHA512 889a8862878eac134bd5588f3756207a82fb087f9087807e5152f31f78600794b93cd53a32427352a1df83f791f0413f3b89c0c548b9b24f3c423fb42ed839fc
 DIST messagelib-20.04.2.tar.xz 10516720 BLAKE2B 69beb4599e5ac5f73bf94f371baec93714c8c665be42d0f87dd570e0fb58995cffde4d4ffe789134940f0b5aebca95f41bd55ae8a6cf6aa471684197b2425d12 SHA512 1d0979ab7dc0ed6baf266b0c331d0f9105c06ee051cebca43965671a0c52cf3534e18d27c2bf05028b68418d4e0cb58b38f07cbe4c375089c6c6a681f0c15d4f
diff --git a/kde-apps/messagelib/files/messagelib-20.04.0-qt-5.15.patch b/kde-apps/messagelib/files/messagelib-20.04.0-qt-5.15.patch
deleted file mode 100644
index 93f632bdc690..000000000000
--- a/kde-apps/messagelib/files/messagelib-20.04.0-qt-5.15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1f2548805df60707ffba2bba27d35d441232d140 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Thu, 14 May 2020 13:27:14 +0200
-Subject: Fix load header with qt5.15
-
----
- messageviewer/src/viewer/webengine/mailwebenginepage.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
-index b9d7b9f..f1c3eab 100644
---- a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
-+++ b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
-@@ -40,7 +40,8 @@ void MailWebEnginePage::initialize()
-     settings()->setAttribute(QWebEngineSettings::LocalStorageEnabled, enableElement);
-     settings()->setAttribute(QWebEngineSettings::XSSAuditingEnabled, enableElement);
-     settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, enableElement);
--    settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, enableElement);
-+    //We need to activate it in qt5.15 otherwise we can't load local css file and co
-+    //settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, enableElement);
-     settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, enableElement);
-     settings()->setAttribute(QWebEngineSettings::HyperlinkAuditingEnabled, enableElement);
-     settings()->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, enableElement);
--- 
-cgit v1.1
diff --git a/kde-apps/messagelib/messagelib-20.04.1.ebuild b/kde-apps/messagelib/messagelib-20.04.1.ebuild
deleted file mode 100644
index fd33d8cfb00d..000000000000
--- a/kde-apps/messagelib/messagelib-20.04.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional-recursive"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries for messaging functions"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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/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"
-
-PATCHES=( "${FILESDIR}/${PN}-20.04.0-qt-5.15.patch" )
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 054ef912e30b..60fdc47b7bd1 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,3 +1,2 @@
 DIST minuet-19.12.3.tar.xz 27597900 BLAKE2B db1672eff9df0e7bb8cf45ec6933b8baf63e42e810f35b3b605f3e2389ca68a181415f8c033244d54f314cf77966d487d7f7769c478a636e7505bf6c38f9916e SHA512 545e4ef25965d8d614644b4d897382edd65a92f835b6f4a461c1dec819388608e05dbe1000f26b37430e91fd4d3949d3ff39ed92cc8f8a36d77391e01c0d0fb0
-DIST minuet-20.04.1.tar.xz 27599296 BLAKE2B c4c43547947ffa46cad1d8bb0ccc8fba304dfdbf02c2498ea459d2eab07547cd491546b6e6a30dc39db1d8852fe3b284dba6ac2e8d2290dc14997755acc99299 SHA512 2c949916e2885fffa5f472023ec2553e3513fa3e6ffeba486a75f52f1a2b5899408f6cd7d3f0cdc799b3c58316d55a573fed4c20d1ddfc926bda481f14574916
 DIST minuet-20.04.2.tar.xz 27602656 BLAKE2B 6ee6636c290906bd03b636e4093af34fe21abc8276afa40fa8173a1c974053eb581534015562e29210387862148702cfc5499a03190d6286bd67b06441bcf518 SHA512 cfb6a1eb0e4b35d49f9aef7d8665c4233761146d50a890bb03727636fbdccab49b7e429f8d34e59d653f209bd546990c0b412a2c187d7fe95a3948171d06c2bc
diff --git a/kde-apps/minuet/minuet-20.04.1.ebuild b/kde-apps/minuet/minuet-20.04.1.ebuild
deleted file mode 100644
index c5e50733bdc0..000000000000
--- a/kde-apps/minuet/minuet-20.04.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Music Education software by KDE"
-HOMEPAGE="https://minuet.kde.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	media-sound/fluidsynth:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 93627b21685a..aee2e6018000 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,3 +1,2 @@
 DIST okular-19.12.3.tar.xz 7208888 BLAKE2B c98e6708d5784ce2dc976de0b205681cc34c0a6b5684e408267da05ba335fa4e9c064eec393dc080dd97f06f38ef665aba9354787d2e42d13312b4820836f168 SHA512 ccc3c357fefe04691bba7bc803321789c3a1fdad4cfc610e9c425b2373efd94340fa2ceb2e357569ad14f1c0c69ef0db8079d9bc082a6d5708ccbfb3b65d8b3d
-DIST okular-20.04.1.tar.xz 7236580 BLAKE2B 520c2cff45525499cfc5c271d7d388069d4b563b2a444e3c914b108284fb76cee88e6896b67907ce4bf415b1ebb38a3a42d916217ab27188fe0d46ba12c26174 SHA512 c2414c16d938d06b9bf78956741a3b1f97dab1930a47ba1c822909062e0efc6c5e2faf841d045552d455dc20b2e200213906ff8a5fa888d09c881846a55316bc
 DIST okular-20.04.2.tar.xz 7237876 BLAKE2B 8b8570257d8b9548666a877b21589e9e899e2b1e99197f1dbecc53c7f3e5187331463e4c80e167a0be2f33a4b43ca241c81b1ebdfe8826a0d281a151e92ba155 SHA512 1f6f22a221701d25a0e0eef094cb60b8b66722ac158c0ac499010448504b507c72fedd33814b3920ba3ab5eb53a2c8b09505b7a7697bde589d89407e0cdbf961
diff --git a/kde-apps/okular/okular-20.04.1.ebuild b/kde-apps/okular/okular-20.04.1.ebuild
deleted file mode 100644
index c416508ff9ed..000000000000
--- a/kde-apps/okular/okular-20.04.1.ebuild
+++ /dev/null
@@ -1,112 +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.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Universal document viewer based on KDE Frameworks"
-HOMEPAGE="https://okular.kde.org https://kde.org/applications/office/org.kde.okular"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjs-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	media-libs/freetype
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	chm? (
-		dev-libs/chmlib
-		>=kde-frameworks/khtml-${KFMIN}:5
-	)
-	crypt? ( app-crypt/qca:2[qt5(+)] )
-	djvu? ( app-text/djvu )
-	epub? ( app-text/ebook-tools )
-	image-backend? (
-		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
-		>=kde-apps/libkexiv2-${PVCUT}:5
-	)
-	markdown? ( app-text/discount )
-	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-	pdf? ( app-text/poppler[qt5] )
-	plucker? ( virtual/jpeg:0 )
-	postscript? ( app-text/libspectre )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
-	mobile? (
-		>=dev-qt/qtquickcontrols-${QTMIN}:5
-		>=kde-frameworks/kirigami-${KFMIN}:5
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-18.12.0-tests.patch"
-	"${FILESDIR}/${PN}-20.03.70-tests.patch"
-)
-
-src_prepare() {
-	ecm_src_prepare
-	use mobile || cmake_comment_add_subdirectory mobile
-	use test || cmake_comment_add_subdirectory conf/autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package chm CHM)
-		$(cmake_use_find_package crypt Qca-qt5)
-		$(cmake_use_find_package djvu DjVuLibre)
-		$(cmake_use_find_package epub EPub)
-		$(cmake_use_find_package image-backend KF5KExiv2)
-		$(cmake_use_find_package markdown Discount)
-		$(cmake_use_find_package mobi QMobipocket)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package plucker JPEG)
-		$(cmake_use_find_package postscript LibSpectre)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package tiff TIFF)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728
-	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 27ec398d1f21..b9a962ab5cb7 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,3 +1,2 @@
 DIST palapeli-19.12.3.tar.xz 2070372 BLAKE2B d1745cb6ffe9c83b7f54b35634362ed6d39601c984611b9bec9d828d842297c270bb52971589c9126b161928e815009426dfb33e6bf2a4c939f545747b095f1b SHA512 4ffda823a8046f36ae2e43e556c9c780e565c98c395cf54e4ff175acce8fa96b5ffa0fc0bab06f6fa8cd533ffaa1714c5a536f4d7ce0ef898cfd638c2e655676
-DIST palapeli-20.04.1.tar.xz 2071904 BLAKE2B 9fec96bdcddfbb9e090c99804db9f4031e915ab2ce5f48e4c286ada05c58eb6949755ac0cd7eee5353c0adbd1ccd57751d5d5643cb20b0b81d1ede35904a4674 SHA512 4abccb62df6173d3e7221faa596fc098a1f0198b82a6c9b28b35b6e246409f0f33fec9b14bcce28f1f16751071be4047bf0f48ac0444855375cdca73e1ca4db9
 DIST palapeli-20.04.2.tar.xz 2072004 BLAKE2B 3f85c125628b89020afbd0be399bcf11d6dd2a05b9ee701f98e962ad611bc309bb34c867112c669730ed2f8720af0ecd96c8ed4a96e36cfdc65684684ea5ae11 SHA512 bdbe7b78e4dc63677d476377753a8f0b7a38ad7a8e86688689c4b4829be2a2fd45033354c5db754b1b80c8a21588ac587ed123d1705c1262d2ea3655825ff82f
diff --git a/kde-apps/palapeli/palapeli-20.04.1.ebuild b/kde-apps/palapeli/palapeli-20.04.1.ebuild
deleted file mode 100644
index 65124f8a40e9..000000000000
--- a/kde-apps/palapeli/palapeli-20.04.1.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="optional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Jigsaw puzzle game by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.palapeli"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=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/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 12d7731f434f..88959a660358 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,3 +1,2 @@
 DIST parley-19.12.3.tar.xz 8832292 BLAKE2B b9b391d8f4d864ed5a7c92b5a269882267c5a876a1586b6c68ef043ae5537248d961d2605d1002c98a5052b7f42ee13b0cdabd3bf5d439251da98bd3d05efe8a SHA512 9248a89bcf722ae3858ce45a2ba3328f58145e77c0c0e40d32736db654feceb8f9faf4b09d387b0f01744f71f0cb5eedb9a029ae7130083e3386c1ce8492bcaa
-DIST parley-20.04.1.tar.xz 8836220 BLAKE2B 5d154a34efc3780c4a6cc7a92f2459cfa0d505b9eadb1b7a6c757e865dbb0c02da6609404fc33902ee027b18f2190281dbc039cf7201976355115b8db4f44b47 SHA512 b62a0f3eddf7c5ca7426059a6f0da96b72bcc8d650c9a3e59fb727e9d4a5babdb7c75b6ed3b9415e91e387fe653b36db74865ea2d392e8358fab7717f56a0852
 DIST parley-20.04.2.tar.xz 8838228 BLAKE2B ccd3b4b7dd6e6e8520561e97ca9c0cf7d1531db0dab25ae2018c07e90d83c0d03764c728b65779892a645f13ae3cce8c20391ecf6812ff16b17b25b49a25ac98 SHA512 f427808bb742b214b93cef0428ee2e94f231f4987e81391008e1e74cecf2e3809ae5a1d4db9e89e76cebb2d3cf2b59b3eb6c2b44e8d7d62d70a948e1eefe5cd4
diff --git a/kde-apps/parley/parley-20.04.1.ebuild b/kde-apps/parley/parley-20.04.1.ebuild
deleted file mode 100644
index f64108d958d7..000000000000
--- a/kde-apps/parley/parley-20.04.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="A vocabulary trainer to help you memorize things"
-HOMEPAGE="https://kde.org/applications/education/org.kde.parley"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-apps/libkeduvocdocument-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kdeedu-data-${PVCUT}:5
-"
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index 7dce78bcf1ae..1e10fab1f881 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,3 +1,2 @@
 DIST picmi-19.12.3.tar.xz 1360360 BLAKE2B 299eeb51473b3ce9bb68cfd9f0ce5203f78d8bb9a8ccc7b3696bf057006cbd1556fb6c64945c41cb547f95dd4f948edf5438f07cd7147b4e374ad8253eb9ae91 SHA512 34747dafa2d7150f4519738f67c1d2b4161f184f4fc59c2e7132bc344c4219f16fc356234ac9fd64621c8ca97474a9463f5d7a147cb1d02ff3479d660c65aa83
-DIST picmi-20.04.1.tar.xz 1360824 BLAKE2B e9bd4a157e5d1a1d493ea39fbc1a36bdfe59e7595e04ccefff3232b6f1301e4268a954c55966c8cac1fe2931fe66f6367fc3088bee97728e6b4dc53ab995f356 SHA512 159a21429216e19f6c6db2d6c360a6146df1860f222234394fce0ae63af2cb85f0744d5b14a47640f69137b1c46b876b1bae67dfceb17ab95368a811d455cd90
 DIST picmi-20.04.2.tar.xz 1360832 BLAKE2B d632d5db104107b7bad6248caf5acfdf14b8fdfe8d128495361b0dc9a59ff21c27011ab81e0b6fe2ec333252296846e16e82aa63c28b0576bb4accfe0204c044 SHA512 e36169f0e8121610b8d5096f548a254c24240416bd48fdf50b49c833fb959682b6950907ad63c5d1fbb316497a7a6c0abf242551ed760ec5481516a40ae974e5
diff --git a/kde-apps/picmi/picmi-20.04.1.ebuild b/kde-apps/picmi/picmi-20.04.1.ebuild
deleted file mode 100644
index d4dd1c409649..000000000000
--- a/kde-apps/picmi/picmi-20.04.1.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"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Nonogram logic game by KDE"
-HOMEPAGE="https://kde.org/applications/games/org.kde.picmi
-https://games.kde.org/game.php?game=picmi"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 133111393944..f73456a8dcdd 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,3 +1,2 @@
 DIST pim-data-exporter-19.12.3.tar.xz 205544 BLAKE2B 47a49d495c2de7c329e9c11d9b3ea3ce9f96001105c4f36f0372c6727abff0296e70e95998f37a23c03d24bd86c12d7e5a7f68c1823cf0cbc9d4f148b3c4d944 SHA512 0b3268da97008c4708ca6e8ac9c2006055f6ef60c6e1c38d5e17b02de1c6d15fb0952d990ec804523b545448ef8c1dad3aab97bb7d6f077a8203bc4dcb3c8d97
-DIST pim-data-exporter-20.04.1.tar.xz 207792 BLAKE2B 74d7a5356a5807761b67b6536c2f83ca18fcec7d5a61ff9d6e0a5d4a3c83fa1b954d2cdc39c7b614da74ac2de120e7553a06be712d2c0ec94a2f56280787605c SHA512 16e72013c6dc62cd7a92e1a2aa319c299dc9f2ad9155f5aaad37970ce17cf903cd42bd5c2749baa46ba205cb58a6ff110f78e2fcb32acb2efd46b424d56057e8
 DIST pim-data-exporter-20.04.2.tar.xz 278028 BLAKE2B f48878ede1d889c160c1cdae10ae684b57b5f63d987c54832a48fe822345c61bbab4e1e52417a4485f2889bc1e9380f3d193ddb85ba51bea9e2d09b3202d29d3 SHA512 a4ded3cc18a85010bdc64fd6861310c73e22f2b4c9951f657a679529fcd835f8d832c245cd7ab1f786081f37010ef0e196ed0bfd1f25cc98c3471a4b90ab6bba
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-20.04.1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-20.04.1.ebuild
deleted file mode 100644
index ebd1bc6002bc..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-20.04.1.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="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~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}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 33f85422c204..cd1dcd645902 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,3 +1,2 @@
 DIST pim-sieve-editor-19.12.3.tar.xz 451404 BLAKE2B 40c0d9593b8b106a3d3990ed46a174e1b2a066b1aeb29807102d4127086f055daed48fe56c81802749dbc51dbb46ed1ad5828047c9c4d9ebd4aadd6a4fedef7c SHA512 e21c52d62a98b228aa1d1065911c8739d59b5e23c8486ddbd6360ac0a52d5a08873422bf7da4b0d12000463d16d08f8c6ef028ac12a04b69f49d4616bcea810a
-DIST pim-sieve-editor-20.04.1.tar.xz 452876 BLAKE2B b80acbad337253330a607a70c81302cbe895310557e559be7c74f3efa314a136bb9f429eeacc2ea058938d000d195dd3993e5893c02e740c3813599f523260bb SHA512 407c1c7d2803b65603ed9f464f76d3a67b3f684c43aa2804307dba4036a548a364a73df80081799e997e63feef28434a70c1ffdf9af78b8f7cf48a9d30286a08
 DIST pim-sieve-editor-20.04.2.tar.xz 452988 BLAKE2B fd1d450bee388f747dcacb555e857d2cc360a76504c68ea12171fe607e7ad410b324b8cac9fbf338e7dda3e6e107cf252698634b449c37f738c1f855dde5c53c SHA512 382e1d7cc915b33eb64fd3233611dc24606157cd072a92338aa975d370bad432ed36849bd5864fbe2499b33069cc7fc57b1e96cd5838968a788b2f7565b3f95b
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.04.1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-20.04.1.ebuild
deleted file mode 100644
index af06844e6c55..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-20.04.1.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.70.0
-QTMIN=5.12.3
-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 ~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/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 46971465ee8c..8de0d6b91940 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,3 +1,2 @@
 DIST pimcommon-19.12.3.tar.xz 293412 BLAKE2B cedd59be191fc2fc7cbe65b2e576fa8f5bc6004ddd61b38f238166e9523f0ff487f011d257fee18f05b1888e011579b2149f1efc1e36184d93de445a1ab5de72 SHA512 f1368fa5d0825087c8447651e2d878f7f1428bea2dc8372f979694cdff1f961ee3555409738b0e54c6886004a258cb3e7752fd27d3bcf867564471027ebfb6cd
-DIST pimcommon-20.04.1.tar.xz 294392 BLAKE2B 3cef3506856b6dfb59fb45299f03ae794e0c707778ccd8f06d7ea113dc11004898e5a332d7cc09039b58342af9f70ca358ea3f97bf85b7247a9e34f48fdb465f SHA512 4d62647bb88ce19e015c1d6f2f0e91635b7791b7e6289ff87688851fe960f8e908a5c75cfdfed69d3b327d061eec1229d2c3ee5ecc65f8e2c3ab03431661bfe7
 DIST pimcommon-20.04.2.tar.xz 294416 BLAKE2B f869844093fcf45827e03658bd138d17d8d7da7c5f9b1bf94c1b4e8e7a3d6cab9095cf1bb202dadd555ebb1ecc409edc851d27d6d76a3b3b2211829e090a9f1d SHA512 eeca7d414d4e5b8601c137aa22f657eb24f06adb423ce85886a525347a5bac63a4e2c9fc706d49a4986a3dc382b54bfc832953fa8ca926f713b0c01865e63f3c
diff --git a/kde-apps/pimcommon/pimcommon-20.04.1.ebuild b/kde-apps/pimcommon/pimcommon-20.04.1.ebuild
deleted file mode 100644
index b7b3480125a6..000000000000
--- a/kde-apps/pimcommon/pimcommon-20.04.1.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_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-"
-RDEPEND="
-	>=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/kimap-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${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/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="${RDEPEND}
-	test? ( >=kde-apps/kmime-${PVCUT}:5 )
-"
-
-src_test() {
-	# bugs 641730, 661330
-	local myctestargs=(
-		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.04.1.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.04.1.ebuild
deleted file mode 100644
index 61c23616dd77..000000000000
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-20.04.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Plasma Telepathy client"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="gstreamer"
-
-RDEPEND="
-	>=kde-apps/ktp-accounts-kcm-${PV}:${SLOT}
-	>=kde-apps/ktp-approver-${PV}:${SLOT}
-	>=kde-apps/ktp-auth-handler-${PV}:${SLOT}
-	>=kde-apps/ktp-common-internals-${PV}:${SLOT}
-	>=kde-apps/ktp-contact-list-${PV}:${SLOT}
-	>=kde-apps/ktp-contact-runner-${PV}:${SLOT}
-	>=kde-apps/ktp-desktop-applets-${PV}:${SLOT}
-	>=kde-apps/ktp-filetransfer-handler-${PV}:${SLOT}
-	>=kde-apps/ktp-kded-module-${PV}:${SLOT}
-	>=kde-apps/ktp-send-file-${PV}:${SLOT}
-	>=kde-apps/ktp-text-ui-${PV}:${SLOT}
-	gstreamer? ( >=kde-apps/ktp-call-ui-${PV}:${SLOT} )
-"
-
-pkg_postinst() {
-	elog "You can configure the accounts in Plasma System Settings"
-	elog "and then add the Instant Messaging plasma applet to access the contact list."
-}
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index b5a5a44d30fe..5fa95e98c8c1 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,3 +1,2 @@
 DIST poxml-19.12.3.tar.xz 43336 BLAKE2B d1c60266a38c05b3cb5a65031f50aba4cb1352f93d48937dc9ff95a87987cdc0eb02a48b9e169ff97b844cbc020e8de3899c55c472863ce5627e8016fa30a134 SHA512 30c905660db03368095a19e8b8a90c73d604fe2e4eb8df61a47a2abd11e716da94dbccd3b8bfccf134f52536eacbb7327fe08e9d00d752163f8cb61ef67c8362
-DIST poxml-20.04.1.tar.xz 43156 BLAKE2B fd52dc75c87ec45402241addd7a99ac59d551247e690f92c62d4d9ce0a155c049063b4c402144701cb77ea64f1e7d8ee848be70890ca0062e4811067777deaa4 SHA512 dee5ada910f67e9aa364fae1b6656e4882e4459463093433f6a750dece204d1e541dae65386ed3e7b6a7420625d1667d31706857e75e7619b6061ef04cade31f
 DIST poxml-20.04.2.tar.xz 43240 BLAKE2B c3a37b82c097f0854e141ad594bc6338cdb97bc699fda617cc7fe14b57884132b30292faf2b070911f0107c933ed596ef6596c70b32b9443a7ac3ffb19fe74a6 SHA512 fff4acdee1a8a4ccb8398fab68e840233c54a9b991f826be33fc7fb00d0cf69a5d84562d3b8b2c1ef08f297733364b9b8bc019fffceba38317032bf58a2dbef4
diff --git a/kde-apps/poxml/poxml-20.04.1.ebuild b/kde-apps/poxml/poxml-20.04.1.ebuild
deleted file mode 100644
index 91e463c5a3fa..000000000000
--- a/kde-apps/poxml/poxml-20.04.1.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_HANDBOOK="forceoptional"
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtxml-${QTMIN}:5
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 886ea4237512..fa01abc7579b 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,3 +1,2 @@
 DIST print-manager-19.12.3.tar.xz 251568 BLAKE2B 52f7ef3911c42c04a51ea1b7d398c312e1e77ebcac65cb29859aaaaa7250aed16035868c55738fcf1f6004d4ad7e70eefcb6bfb3e1387e18fdd3ccd4f47565fb SHA512 58b65aab504d1f51d238dad6ebbbc717573ec8a332807a3ca93a74d82d753255175a1b4609bef019209e03760e98853f0ce75bbee6a6141af72c7e77c84e3d36
-DIST print-manager-20.04.1.tar.xz 255660 BLAKE2B 86938a9942f3adc7c88dad9d46d9e971292c1faa5f62a23b3c036140e7b915e302281ec132ae4dda680bc49bdde0defbc509a6694d1187663468811163b6ceef SHA512 08cfbc946da55265a28e917727ad733b933adbe517d3d6e796c47249ddb489fcf1704cb198e653302217a1a456c5f5c4f54938338a57d7b42aedfc1ba9eca0c4
 DIST print-manager-20.04.2.tar.xz 255696 BLAKE2B add8be045e2ceb04ff2457a96bec5b601d31b4030baf4561ffd2d11189927b55c24fe8d9c374efcc6c0c73185b5f024c7ed5329083a55ff7568c9d109f6a3b61 SHA512 37343f4e99d19d83a3f997239b0b2b006d40811be299537684e57ba20c5dc2a1699946c5d92ed14b6ee7aa443c869a729b29c6934d57198dbc07ea09c70de3a3
diff --git a/kde-apps/print-manager/print-manager-20.04.1.ebuild b/kde-apps/print-manager/print-manager-20.04.1.ebuild
deleted file mode 100644
index 7c9b7cdfa924..000000000000
--- a/kde-apps/print-manager/print-manager-20.04.1.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
-
-KFMIN=5.70.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Manage print jobs and printers in Plasma"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+gtk"
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${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/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	net-print/cups
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-	gtk? ( app-admin/system-config-printer )
-"
-
-pkg_postinst(){
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then
-		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
-		ewarn "an important, though optional, runtime dependency:"
-		ewarn
-		ewarn "app-admin/system-config-printer"
-		ewarn
-		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
-		ewarn "and will show the following error status during runtime:"
-		ewarn
-		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
-		ewarn "was not provided by any .service files'\""
-	fi
-}
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index e7eac9487b69..559d2ce7553c 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,3 +1,2 @@
 DIST rocs-19.12.3.tar.xz 1517080 BLAKE2B 1dee0d7c9a5dbf7285e7ed13bc903784bd52765ec405dd41f16c59c4358026f51eaaa32fa8a5be234ada68123ff611435a2d2861bdc30cb85a5f4439fd3ff71b SHA512 1b4839197e5b40460a517221da4328c9283e4618eadf0dbeb20b7d5019a97f8fbac26dbf7c6a1b9b481bc4da8436ea6e632e38c1d6b33b1cb235055c76855984
-DIST rocs-20.04.1.tar.xz 1507368 BLAKE2B 50b49fe4b726757c7907203962a3daee9763d8c4a23f98cd2fd6b31917399987d4ff5bc5aece0dab625cded665aabd5d913d04962c3b3e1197ea52b8b64832d2 SHA512 c639800a4ecd8c0c1ee1ef7e764c30853db97572cda70c68ab519157e8a30de2b2933fb3c6cd2f6a30c984dd64391b2969072cde34b4a5daa365e073906799e5
 DIST rocs-20.04.2.tar.xz 1507436 BLAKE2B f2110a8c9e292d3b0123b2c8efaa49450308d3a91c322d87fe0a846a141437d44686296e97aba06a752503752104d1fa73b172d134a099180ab9282036fb0de9 SHA512 2baa648476076d080a56ead5c95d4d7515f937d5ac9620563af133db7456386d7d7dc946c10c9c96442196f5bf94de40cc04e6d2d22fb8a0456f65e6db6bad55
diff --git a/kde-apps/rocs/rocs-20.04.1.ebuild b/kde-apps/rocs/rocs-20.04.1.ebuild
deleted file mode 100644
index c68ba8601b69..000000000000
--- a/kde-apps/rocs/rocs-20.04.1.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="optional"
-ECM_TEST="true"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Interface to work with Graph Theory"
-HOMEPAGE="https://kde.org/applications/education/org.kde.rocs"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.49
-"
-
-RESTRICT+=" test"	# 1/10 tests currently fails
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index aebe2ad4e924..5d13b59fa381 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,3 +1,2 @@
 DIST signon-kwallet-extension-19.12.3.tar.xz 10540 BLAKE2B 4a4d17e96a1c3dbe5f6a1bb0d0811da797a9e2a5d46d3e6f1a2a219ee07073111408ea4fb25232a52f92affd87845fd68176470f2b363cba1539d8297bd774e8 SHA512 722fa5b337b45598b6118de41b815f32809ca95168277a85404d37718980360aa3c14da0d8fa1358f27d9c4f8911ea2788be0c5ee6b3fa21fe064ce79618f822
-DIST signon-kwallet-extension-20.04.1.tar.xz 10700 BLAKE2B c7b76bd3ec448adf80f1f2c0ea724c39fefa87e8bbaa7433ff120cb207df7568cc1101e9d758cc5b148f568cd381ad731ce161539436cec197de71260ff17388 SHA512 5caac8fc7f7240d7047bc57e8ff64a5ec3db9d7c3510fc2849e1200ec3c6757cc9a3d7e8e98afac1c9bd305ca20a0ddbb02748ef786967b6a85228764175708f
 DIST signon-kwallet-extension-20.04.2.tar.xz 10696 BLAKE2B 04bbe031695e10cf84dea1433b6e80c650197746bf167724afb3dd75bacf76535552f089a5560494aac172b458fcac89a8775deb9abfc14409e315dc247ded9a SHA512 14737aec7a2182f7931e11887c488c5fa503ec34c3f14582624170a693b0150b758ba2348d5cc2de70dcdc50ee45aa4224bd73af188dfe7f05752360ff630631
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.04.1.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.04.1.ebuild
deleted file mode 100644
index 088215d4618a..000000000000
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.04.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.70.0
-inherit ecm kde.org
-
-DESCRIPTION="KWallet extension for signond"
-HOMEPAGE="https://01.org/gsso/"
-
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-LICENSE="GPL-2+"
-
-DEPEND="
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	net-libs/signond
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index fe11e0a3da0d..29cae98f896e 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,3 +1,2 @@
 DIST spectacle-19.12.3.tar.xz 652872 BLAKE2B 7f6eeb98710705a2ecc8643d635d0622618df798f8a4d94872046be1a6085973faede73813cdc76b858e48882aa60e84f6b1a89524aea39a58d482c549e006e1 SHA512 6bc10c376a63d6558c478e5844c5bc1c099d58c04593d5dc9bf2d0b17543fce62c202d8c3b9c2ade144566e205d9621546b777c134d1159529e7a3bc7b9d6766
-DIST spectacle-20.04.1.tar.xz 661788 BLAKE2B 9e90002e59a63dc6f8c58e1b71fdebd329d0fdce7db09e3eb0fc1cc27b2757c2d81ffec32149dd75eed959fcb7761be677abcf5decef22756d2f1e09679b764d SHA512 72e3dbb4aed66beffc0f969d5f4a3f09584be0326a37e4da7caf2272cf2bb6a7b09237edf80c42462e476cacb9a34014a1a68e02d430638eee80974720975a00
 DIST spectacle-20.04.2.tar.xz 662260 BLAKE2B b9dfdc86f8b64ce39e65f6dcf8689a55fb1793a683f6d5e867bdacaffbe8aae9a06cd69214ef827ed07017520735515641b366a808bae42f36b8a1412fbf3f34 SHA512 acbc058c85d9d8cc38e71ac01353f2a39a75b8ff29bff8c60982b6e3ffa5952d5eaccada8ae0cf15adecaa225c9064dea7238dd7a5435c1736a2f94f36b71e99
diff --git a/kde-apps/spectacle/spectacle-20.04.1.ebuild b/kde-apps/spectacle/spectacle-20.04.1.ebuild
deleted file mode 100644
index 8f66ba775966..000000000000
--- a/kde-apps/spectacle/spectacle-20.04.1.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.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Screenshot capture utility"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.spectacle"
-
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="kipi share"
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=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
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kipi KF5Kipi)
-		$(cmake_use_find_package share KF5Purpose)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index eaa8fe4089cc..a4cd8bd6416a 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,3 +1,2 @@
 DIST step-19.12.3.tar.xz 915748 BLAKE2B 43a032bd68ad2278a0ffee22412d4e10093040934c5f68f0680164a9c3f2883d0bb826730b472c40f03b0d31b73c1792c59cb319e0645d4df67ff31e29e4d15f SHA512 af8c67a0e6678461a2536a7abdc7b27d1ed4d172bf838414c29c47ff4ed42db5e32a2c6394bfa704d3bd2de04c4186fe608da16aa6e13414de26555cbf4cd7a1
-DIST step-20.04.1.tar.xz 916932 BLAKE2B b2bc0aae753ddda62c087d59354ac79f7df4c416ee369ee9df6087291033457aad77f9d484b9af9d27f8a13f27ab9503b8916bd69b8ee0bb2fa5f68fbf1373e4 SHA512 6e82ec3aa42f511c6fbc4213e29d6d70f4643be6d43c5c655abb958479cfca3b4f7c466503c5d3a1814d1f33266d6bf9ba9ecbf9154edf7d8158f3e5e6141a7e
 DIST step-20.04.2.tar.xz 927196 BLAKE2B 789872318e7adbe22297de857b7fa7a320db7b591ad4ff1fcaa184b89d7acab84e2d84b12912013063924f8a0b5966e6534f3bc3c0d9c256d07f9c2cd1e5be57 SHA512 8186f32bc7919c2b3eb993598e397e2efdd10d16f3b8caf582d605ec836e26aa15dae4913a5f60e29ac9d0df95fee4714d7b103f4f68a755c416c3cb1fe701d7
diff --git a/kde-apps/step/step-20.04.1.ebuild b/kde-apps/step/step-20.04.1.ebuild
deleted file mode 100644
index 8bba25377add..000000000000
--- a/kde-apps/step/step-20.04.1.ebuild
+++ /dev/null
@@ -1,65 +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"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Interactive physics simulator"
-HOMEPAGE="https://kde.org/applications/education/org.kde.step
-https://edu.kde.org/step/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+gsl nls +qalculate"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=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/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kplotting-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtopengl-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-cpp/eigen-3.2:3
-	sci-libs/cln
-	gsl? ( sci-libs/gsl:= )
-	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# FIXME: Drop duplicate upstream
-	sed -e '/find_package.*Xml Test/ s/^/#/' \
-		-i stepcore/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package qalculate Qalculate)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index dbe6526ebdc6..db8bcf79f20a 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,3 +1,2 @@
 DIST svgpart-19.12.3.tar.xz 21268 BLAKE2B 928ad3370bf87c60bd939402321036b24e0d065bcedeba3adf6f6c4e898850e6302da870fb2c28a64dabd9bbb1b82202527350daa7a00b17637777dcc0b613e1 SHA512 84a9edfaa4bfb61415e971fc5daf87d117f2300a694ab00a719a450cbcf857f7246ed85e4992931cad3ce7e44b2e19ed8d1f5067ec1e12b5ffc91ca72ebe16bc
-DIST svgpart-20.04.1.tar.xz 21140 BLAKE2B bb1f02f651874d1b57ff0802f837a30206a522eac515b5e9d9142d3fb4f132f51666679d23e9b6a7d7f591e9371b57ce68edab5d5cfd26044a3455627bba5fcc SHA512 74bcc7234601feb2ee3d65a6410461ee20ac4f46b47378de53d098e92ddfa5335f1c9d931a944415e452fd8a5e85d0eaaacf7986bb181bf303e58c369c9e8aa4
 DIST svgpart-20.04.2.tar.xz 21192 BLAKE2B e5306876c894a4f7d61626b86d4a8b9869563e20c398a9a37a74d761fdf7238f32508884363595c02b8f7b58793f5f429ce6c350843fff22ff972b3fd25aac28 SHA512 62c3c6a60ac482d2b2bb0c4659283b4d2984ab0c565f75d33c6a0cb2fd994b53d38d0a4b34bd81bb5f7c560904342f88275bf8ab4a4d9f1b5a22139f5d0106af
diff --git a/kde-apps/svgpart/svgpart-20.04.1.ebuild b/kde-apps/svgpart/svgpart-20.04.1.ebuild
deleted file mode 100644
index 41caa94cbdcf..000000000000
--- a/kde-apps/svgpart/svgpart-20.04.1.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
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Kpart for viewing SVGs"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 69f392ca6898..b50c6daf95d0 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,3 +1,2 @@
 DIST sweeper-19.12.3.tar.xz 368164 BLAKE2B 1db4c3703f28adb0d331c53fe2f76b91d983750045f32babcab9880af37fbdc3cb98e6cad7c77272e4b11774c01d0e9ff5747f8d910b1cb80943480125cfefe8 SHA512 e04aaa30aca0a8689e3f6d6895d59bbd131f8e3f5be0877e856ccaceb750e85416470bde53c344559b0cbc467c2a0dcbea0b66d09c8a3159f4a9c76cc7db0f72
-DIST sweeper-20.04.1.tar.xz 368476 BLAKE2B 09f2a27049caac71a613f40ffd347c694a9086f020e7da9cdb9f6fefa42deb2cc7bfbb457b45ee0b271ea3baa67b9909323b0eb142d585bb57fab38619a95e79 SHA512 186c1684bd90bb409cb9feb10fe19bccc8f6de7586a5f903e32818e23449a80009329772d0e791017c6b6fb08ce4772b6da9eb43b94da0d18ecf21efbef95160
 DIST sweeper-20.04.2.tar.xz 368588 BLAKE2B 5e87d7a92305cf29022dddb9b892f5141e68d5a4cc47e6fcd26be2bd2c924fdffd3c6ea9bbb444dd70c6e5baec260408270187f52c1196e7ed2ff0a942182a93 SHA512 b51280b3dcc1aae8e42aa260b9a91ad1200ef36bf5792c27e66046760980198d1b9861feb8904ebe4c339c91b0d4f428420881cf2b24d7eaa7d2f90b1d508505
diff --git a/kde-apps/sweeper/sweeper-20.04.1.ebuild b/kde-apps/sweeper/sweeper-20.04.1.ebuild
deleted file mode 100644
index 30d75ef1f09f..000000000000
--- a/kde-apps/sweeper/sweeper-20.04.1.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_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Privacy settings widget to clean unwanted traces on the system"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.sweeper
-https://utils.kde.org/projects/sweeper/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index da42d7d89c85..0a166e8fcca8 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,3 +1,2 @@
 DIST kdegraphics-thumbnailers-19.12.3.tar.xz 46452 BLAKE2B d94ae769d22aeeb17b7c3bbef2bdbd3ffd7c25f66876cf73867a28950b0f1fab34a4a9d7ced59d1a71615e9b90e5f47d9f11245af76ed4cfcd48eb7f16bf78cd SHA512 515703d8a22578f09a6e6105e38fc27c0546ad0e61d9c30a052e40a9068f942d586bc8f6411eed0f057f3da0791b94a49a5e378c04ff1f6af20b8c663a154470
-DIST kdegraphics-thumbnailers-20.04.1.tar.xz 46480 BLAKE2B 57f3fbd928ef7b23fdfb6637d0e64cc6a9fd3b999f83d1aeb9b7fd6e186c6031c5854e65619f8f4984068dec281d3731f4883b9f89543bf61f8ed55db02ad19c SHA512 cba5ecac31b561931a77ccc63e274e4b03b4a2b6cc71d2a149fda378ab7f394291c624af89ae71e56e9bac6483af88589f6ba5d420e8e453d19fe394961652d6
 DIST kdegraphics-thumbnailers-20.04.2.tar.xz 46500 BLAKE2B 991153f3f3ddbd6dd5acab6c13c4fe60a4be8fb9cbaa57a2857b613881206a53788640fccecfe5a7d73913bdd21b99308e8964316e9856e56de7fab010d90059 SHA512 419c2b179d7c6d1c09cd8c0c5a7947618cac7f214d33ab3a6f8cc16877d35ba1c712cfa2bf831403b9c86c18591eced58bba12d638e7c0fa587a694681cf8786
diff --git a/kde-apps/thumbnailers/thumbnailers-20.04.1.ebuild b/kde-apps/thumbnailers/thumbnailers-20.04.1.ebuild
deleted file mode 100644
index 11cb4051dd0b..000000000000
--- a/kde-apps/thumbnailers/thumbnailers-20.04.1.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
-
-KDE_ORG_NAME="kdegraphics-thumbnailers"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="raw"
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	raw? (
-		>=kde-apps/libkdcraw-${PVCUT}:5
-		>=kde-apps/libkexiv2-${PVCUT}:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package raw KF5KExiv2)
-		$(cmake_use_find_package raw KF5KDcraw)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index fddced9fd0c0..8b40b11f8092 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,3 +1,2 @@
 DIST umbrello-19.12.3.tar.xz 3796636 BLAKE2B c145ddef20c79d4535aa2acd59bb9eac9de392642eefa66152b8059e25e903a76b113993c46216248be5417a4fc1f0624449b1b86a260d5c63622e342c8518c8 SHA512 f5edf5021bf5568053bd9f79dfc1f5ca586fa27c2b8e6660100d09f06bfd6c69867f7bbe16010a11703f30b02383edd965d0e2834e62b650504d00b76e8e269a
-DIST umbrello-20.04.1.tar.xz 4383840 BLAKE2B 4b3e2e3aa31aef806cea092009450f50cfabfa252c3a4d4d73c73ebe0519e36472b90e5ce2efff43d04de4701d39a64da98d2e2844984a71a4ed566578031d14 SHA512 3365d7c014e002da23a66b42e612bd3be8356f875ca8f7b9c8f90c9f566560bc97619de5b75788fe9c82534b8649bf459019f88a0ffb62eb9fdb407c12aad731
 DIST umbrello-20.04.2.tar.xz 5546804 BLAKE2B 8d351facc285cdf1c46a4a6c31d8a363c77426a1f572d8c4a41caf3ec50d3a7fe799034bbe36cf457bf9bdce90ef1d43402266ccad1f40b3ab7b2100c70c3487 SHA512 34a509a1899e7de82bdf0fceb74d75048f8ca5b1bcd7140a68b15d0aae9ecd61d2a63a648b22b98ba87e5ae9dd40ff73ca04218e6912bed99311e8fdf5590c5d
diff --git a/kde-apps/umbrello/umbrello-20.04.1.ebuild b/kde-apps/umbrello/umbrello-20.04.1.ebuild
deleted file mode 100644
index 2db1c6a86f54..000000000000
--- a/kde-apps/umbrello/umbrello-20.04.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="false" # TODO: figure out install error
-ECM_TEST="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://kde.org/applications/development/org.kde.umbrello
-https://umbrello.kde.org"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="php"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}: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/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	php? (
-		dev-util/kdevelop:5=
-		dev-util/kdevelop-pg-qt
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP
-		-DBUILD_APIDOC=OFF
-		-DBUILD_KF5=ON
-		-DBUILD_PHP_IMPORT=$(usex php)
-		-DBUILD_unittests=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Clang=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_CLANG=ON
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index ff4c643d9c46..6d7fca290d1e 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,3 +1,2 @@
 DIST yakuake-19.12.3.tar.xz 372684 BLAKE2B 4fdbe9d342170b485a4b1a4c282842fa746475112a6f259becf9a44bc4494900d8e90a675467b24093c4454c79b236020919d5b9082890378c289994b780b6e0 SHA512 87ed8b0088b60ea707aebbbd5d70a385759af7779f10d5a0e3590ff1490bcf34e96f3020f203c05936a122a301c7f64edf3fa86493d8c1fcff41ff2f74917df7
-DIST yakuake-20.04.1.tar.xz 374384 BLAKE2B 632154076567b307719a33a63b7c50cff5db110e06ff742dd67bb1b29593166673fcc4b7218eaa405d7967fd639a4fa6ae093aa9c4fefaa005a280ea9c690a4a SHA512 9a6cfa906c80395ec7f9f7c43a7687287ade5198b6b0d62a82537140d5f10ebf3c9ee6a28fedb6b28a18e305a6d9b68fa42d229fb24a734b10ea52df5bcb1ae7
 DIST yakuake-20.04.2.tar.xz 374448 BLAKE2B faa81e374ce1f2995664aac7f031ac5b25abcac1cec7f9556cc351b4cb006a5d47c228ad1d9fd534f70689f6a979c58dc6f7a06b0e085b6b08363de1313895b0 SHA512 b6a66ac0f228135bcf0dc2062e86e73f9873db21c02ef87882a3aa36c06822c98c0383dc965c567a92f41d330a94d39cf0272814b79782f4f3f87554ee6afedd
diff --git a/kde-apps/yakuake/yakuake-20.04.1.ebuild b/kde-apps/yakuake/yakuake-20.04.1.ebuild
deleted file mode 100644
index 82f94e478837..000000000000
--- a/kde-apps/yakuake/yakuake-20.04.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://kde.org/applications/system/org.kde.yakuake"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="absolute-position X"
-
-DEPEND="
-	>=kde-frameworks/karchive-${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/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/konsole-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package absolute-position KF5Wayland)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index 93374ebcad4d..4e1aac130c84 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,3 +1,2 @@
 DIST zeroconf-ioslave-19.12.3.tar.xz 42096 BLAKE2B 5b45d662e19d1145a329718dd237930859930b5e95c194824a2ed8350dcdcb2dc7ca25b087650708ef6c622873a4b61cd9af7ffd395f2feae0c72b75d981c05a SHA512 ef5f1070a86697fc5e197484bdbed26af727fbf81680b929551768a564481cc9447675ed75d6fc61ca3a0bdf51e1a5135fb50d499fbe3e953e997c934c920f60
-DIST zeroconf-ioslave-20.04.1.tar.xz 42472 BLAKE2B cf31fc51516642ba439c143420893882c6e047e0d8eec5e7e5a9cdbea76c641438ca19f40cb223e93431d1bae434ae669801c17b57bb6ef2935d91db453a29c5 SHA512 c917f7f86d3bdaeca760f3ec7ebfce1e02008791fc4c28c681566d93b84e1dbf62f7cb07b1559a010df82d088ef52dd8b2141e56b9a23b61df1d81cc1e9881ef
 DIST zeroconf-ioslave-20.04.2.tar.xz 42516 BLAKE2B 4496b9f6bab30628f9430691a38590ebefe966bf879accf4d89d9d595183049a611d7868143485ba7732685d15a0fea537d277b76fc76d0d6f37d199a505b8a3 SHA512 a8d2a387745fdab9d2e8949e68d7dd52fa70c0581095948e3ddc7553cc1abe9abc5e5539d46172eae34da006ff51422c2aeab7e8b3e461cc4cd947804e0efb8e
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.04.1.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.04.1.ebuild
deleted file mode 100644
index 4e023f3fdb7f..000000000000
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.04.1.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
-
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
author	Andreas Sturmlechner <asturm@gentoo.org>	2020-06-14 01:04:53 +0200
committer	Andreas Sturmlechner <asturm@gentoo.org>	2020-06-14 08:51:28 +0200
commit	f526313c9eae34b8f7a41b1f02e705f6ad84c515 (patch)
tree	b1c5c0752f63d58d862f18a62c7e279c79fcdd10 /kde-apps
parent	kde-apps: Add KDE Release Service 20.04.2 (diff)
download	gentoo-f526313c9eae34b8f7a41b1f02e705f6ad84c515.tar.gz gentoo-f526313c9eae34b8f7a41b1f02e705f6ad84c515.tar.bz2 gentoo-f526313c9eae34b8f7a41b1f02e705f6ad84c515.zip